From aa09d8a75f04dd2680aa7c0f06e47b6f5a36fa56 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 16 Sep 2008 18:16:49 +0200 Subject: Move ndrdump tests closer to the code they test. --- source4/librpc/tests/samr-CreateUser-in.dat | Bin 0 -> 60 bytes source4/librpc/tests/samr-CreateUser-out.dat | Bin 0 -> 32 bytes source4/librpc/tests/test_ndrdump.sh | 20 ++++++++++ source4/selftest/samba4_tests.sh | 2 +- testdata/minschema_classes.txt | 41 +++++++++++++++++++++ testprogs/blackbox/ndrdump/samr-CreateUser-in.dat | Bin 60 -> 0 bytes testprogs/blackbox/ndrdump/samr-CreateUser-out.dat | Bin 32 -> 0 bytes testprogs/blackbox/test_ndrdump.sh | 20 ---------- testprogs/ejs/minschema_classes.txt | 41 --------------------- 9 files changed, 62 insertions(+), 62 deletions(-) create mode 100644 source4/librpc/tests/samr-CreateUser-in.dat create mode 100644 source4/librpc/tests/samr-CreateUser-out.dat create mode 100755 source4/librpc/tests/test_ndrdump.sh create mode 100644 testdata/minschema_classes.txt delete mode 100644 testprogs/blackbox/ndrdump/samr-CreateUser-in.dat delete mode 100644 testprogs/blackbox/ndrdump/samr-CreateUser-out.dat delete mode 100755 testprogs/blackbox/test_ndrdump.sh delete mode 100644 testprogs/ejs/minschema_classes.txt diff --git a/source4/librpc/tests/samr-CreateUser-in.dat b/source4/librpc/tests/samr-CreateUser-in.dat new file mode 100644 index 0000000000..a5840e1f7f Binary files /dev/null and b/source4/librpc/tests/samr-CreateUser-in.dat differ diff --git a/source4/librpc/tests/samr-CreateUser-out.dat b/source4/librpc/tests/samr-CreateUser-out.dat new file mode 100644 index 0000000000..cf9131dba9 Binary files /dev/null and b/source4/librpc/tests/samr-CreateUser-out.dat differ diff --git a/source4/librpc/tests/test_ndrdump.sh b/source4/librpc/tests/test_ndrdump.sh new file mode 100755 index 0000000000..50fd76ba92 --- /dev/null +++ b/source4/librpc/tests/test_ndrdump.sh @@ -0,0 +1,20 @@ +#!/bin/sh +# Blackbox tests for masktest +# Copyright (C) 2008 Andrew Tridgell +# Copyright (C) 2008 Andrew Bartlett +# based on test_smbclient.sh + +. `dirname $0`/subunit.sh + +failed=0 + +samba4bindir=`dirname $0`/../../source4/bin +ndrdump=$samba4bindir/ndrdump +files=`dirname $0`/ndrdump + +testit "ndrdump with in" $VALGRIND $ndrdump samr samr_CreateUser in $files/samr-CreateUser-in.dat $@ || failed=`expr $failed + 1` +testit "ndrdump with out" $VALGRIND $ndrdump samr samr_CreateUser out $files/samr-CreateUser-out.dat $@ || failed=`expr $failed + 1` +testit "ndrdump with --context-file" $VALGRIND $ndrdump --context-file $files/samr-CreateUser-in.dat samr samr_CreateUser out $files/samr-CreateUser-out.dat $@ || failed=`expr $failed + 1` +testit "ndrdump with validate" $VALGRIND $ndrdump --validate samr samr_CreateUser in $files/samr-CreateUser-in.dat $@ || failed=`expr $failed + 1` + +exit $failed diff --git a/source4/selftest/samba4_tests.sh b/source4/selftest/samba4_tests.sh index 6f6ffbba60..3c292d3855 100755 --- a/source4/selftest/samba4_tests.sh +++ b/source4/selftest/samba4_tests.sh @@ -267,7 +267,7 @@ fi bbdir=$incdir/../../testprogs/blackbox -plantest "blackbox.ndrdump" dc $bbdir/test_ndrdump.sh +plantest "blackbox.ndrdump" dc $samba4srcdir/librpc/tests/test_ndrdump.sh plantest "blackbox.net" dc $samba4srcdir/utils/tests/test_net.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" plantest "blackbox.kinit" dc $bbdir/test_kinit.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$REALM" "\$DOMAIN" "$PREFIX" $CONFIGURATION plantest "blackbox.cifsdd" dc $samba4srcdir/client/tests/test_cifsdd.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" diff --git a/testdata/minschema_classes.txt b/testdata/minschema_classes.txt new file mode 100644 index 0000000000..30f5b8ce96 --- /dev/null +++ b/testdata/minschema_classes.txt @@ -0,0 +1,41 @@ +applicationSettings +builtinDomain +classSchema +computer +configuration +container +crossRef +crossRefContainer +dMD +domain +domainDNS +foreignSecurityPrincipal +group +infrastructureUpdate +leaf +nTDSDSA +nTDSService +organizationalPerson +organizationalUnit +person +primaryDomain +rIDManager +secret +server +serversContainer +site +sitesContainer +subSchema +user +displaySpecifier +foreignSecurityPrincipal +trustedDomain +attributeSchema +subSchema +queryPolicy +groupPolicyContainer +ipsecPolicy +ipsecISAKMPPolicy +ipsecNFA +ipsecFilter +ipsecNegotiationPolicy diff --git a/testprogs/blackbox/ndrdump/samr-CreateUser-in.dat b/testprogs/blackbox/ndrdump/samr-CreateUser-in.dat deleted file mode 100644 index a5840e1f7f..0000000000 Binary files a/testprogs/blackbox/ndrdump/samr-CreateUser-in.dat and /dev/null differ diff --git a/testprogs/blackbox/ndrdump/samr-CreateUser-out.dat b/testprogs/blackbox/ndrdump/samr-CreateUser-out.dat deleted file mode 100644 index cf9131dba9..0000000000 Binary files a/testprogs/blackbox/ndrdump/samr-CreateUser-out.dat and /dev/null differ diff --git a/testprogs/blackbox/test_ndrdump.sh b/testprogs/blackbox/test_ndrdump.sh deleted file mode 100755 index 50fd76ba92..0000000000 --- a/testprogs/blackbox/test_ndrdump.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -# Blackbox tests for masktest -# Copyright (C) 2008 Andrew Tridgell -# Copyright (C) 2008 Andrew Bartlett -# based on test_smbclient.sh - -. `dirname $0`/subunit.sh - -failed=0 - -samba4bindir=`dirname $0`/../../source4/bin -ndrdump=$samba4bindir/ndrdump -files=`dirname $0`/ndrdump - -testit "ndrdump with in" $VALGRIND $ndrdump samr samr_CreateUser in $files/samr-CreateUser-in.dat $@ || failed=`expr $failed + 1` -testit "ndrdump with out" $VALGRIND $ndrdump samr samr_CreateUser out $files/samr-CreateUser-out.dat $@ || failed=`expr $failed + 1` -testit "ndrdump with --context-file" $VALGRIND $ndrdump --context-file $files/samr-CreateUser-in.dat samr samr_CreateUser out $files/samr-CreateUser-out.dat $@ || failed=`expr $failed + 1` -testit "ndrdump with validate" $VALGRIND $ndrdump --validate samr samr_CreateUser in $files/samr-CreateUser-in.dat $@ || failed=`expr $failed + 1` - -exit $failed diff --git a/testprogs/ejs/minschema_classes.txt b/testprogs/ejs/minschema_classes.txt deleted file mode 100644 index 30f5b8ce96..0000000000 --- a/testprogs/ejs/minschema_classes.txt +++ /dev/null @@ -1,41 +0,0 @@ -applicationSettings -builtinDomain -classSchema -computer -configuration -container -crossRef -crossRefContainer -dMD -domain -domainDNS -foreignSecurityPrincipal -group -infrastructureUpdate -leaf -nTDSDSA -nTDSService -organizationalPerson -organizationalUnit -person -primaryDomain -rIDManager -secret -server -serversContainer -site -sitesContainer -subSchema -user -displaySpecifier -foreignSecurityPrincipal -trustedDomain -attributeSchema -subSchema -queryPolicy -groupPolicyContainer -ipsecPolicy -ipsecISAKMPPolicy -ipsecNFA -ipsecFilter -ipsecNegotiationPolicy -- cgit