s4-smbtorture: Make test names lowercase and dot-separated.

[sfrench/samba-autobuild/.git] / source4 / torture / rpc / oxidresolve.c

diff --git a/source4/torture/rpc/oxidresolve.c b/source4/torture/rpc/oxidresolve.c
index 02edb306b3a298383007973fb4fb4255bc3c4f1c..33865d7e022b3081cdcabeddb8ace09bba04e162 100644 (file)
--- a/source4/torture/rpc/oxidresolve.c
+++ b/source4/torture/rpc/oxidresolve.c
@@ -19,11 +19,10 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_oxidresolver_c.h"
 #include "librpc/gen_ndr/ndr_remact_c.h"
 #include "librpc/gen_ndr/epmapper.h"
-#include "torture/rpc/rpc.h"
+#include "torture/rpc/torture_rpc.h"
 
 #define CLSID_IMAGEDOC "02B01C80-E03D-101A-B294-00DD010F2BF9"
 
@@ -39,6 +38,7 @@ static bool test_RemoteActivation(struct torture_context *tctx,
        struct GUID iids[2];
        uint16_t protseq[3] = { EPM_PROTOCOL_TCP, EPM_PROTOCOL_NCALRPC, EPM_PROTOCOL_UUID };
        struct dcerpc_pipe *p;
+       struct dcerpc_binding_handle *b;
 
        status = torture_rpc_connection(tctx, &p, 
                                        &ndr_table_IRemoteActivation);
@@ -46,11 +46,12 @@ static bool test_RemoteActivation(struct torture_context *tctx,
        if (!NT_STATUS_IS_OK(status)) {
                return false;
        }
+       b = p->binding_handle;
 
        ZERO_STRUCT(r.in);
-       r.in.this.version.MajorVersion = 5;
-       r.in.this.version.MinorVersion = 1;
-       r.in.this.cid = GUID_random();
+       r.in.this_object.version.MajorVersion = 5;
+       r.in.this_object.version.MinorVersion = 1;
+       r.in.this_object.cid = GUID_random();
        GUID_from_string(CLSID_IMAGEDOC, &r.in.Clsid);
        r.in.ClientImpLevel = RPC_C_IMP_LEVEL_IDENTIFY;
        r.in.num_protseqs = 3;
@@ -61,7 +62,7 @@ static bool test_RemoteActivation(struct torture_context *tctx,
        r.out.pOxid = oxid;
        r.out.ipidRemUnknown = oid;
 
-       status = dcerpc_RemoteActivation(p, tctx, &r);
+       status = dcerpc_RemoteActivation_r(b, tctx, &r);
        if(NT_STATUS_IS_ERR(status)) {
                fprintf(stderr, "RemoteActivation: %s\n", nt_errstr(status));
                return false;
@@ -91,10 +92,11 @@ static bool test_SimplePing(struct torture_context *tctx,
        struct SimplePing r;
        NTSTATUS status;
        uint64_t setid;
+       struct dcerpc_binding_handle *b = p->binding_handle;
 
        r.in.SetId = &setid;
 
-       status = dcerpc_SimplePing(p, tctx, &r);
+       status = dcerpc_SimplePing_r(b, tctx, &r);
        torture_assert_ntstatus_ok(tctx, status, "SimplePing");
        torture_assert_werr_ok(tctx, r.out.result, "SimplePing");
 
@@ -109,6 +111,7 @@ static bool test_ComplexPing(struct torture_context *tctx,
        uint64_t setid;
        struct GUID oid;
        uint64_t oxid;
+       struct dcerpc_binding_handle *b = p->binding_handle;
 
        if (!test_RemoteActivation(tctx, &oxid, &oid))
                return false;
@@ -121,7 +124,7 @@ static bool test_ComplexPing(struct torture_context *tctx,
        r.in.cAddToSet = 1;
        r.in.AddToSet = &oid;
 
-       status = dcerpc_ComplexPing(p, tctx, &r);
+       status = dcerpc_ComplexPing_r(b, tctx, &r);
        if(NT_STATUS_IS_ERR(status)) {
                fprintf(stderr, "ComplexPing: %s\n", nt_errstr(status));
                return 0;
@@ -142,8 +145,9 @@ static bool test_ServerAlive(struct torture_context *tctx,
 {
        struct ServerAlive r;
        NTSTATUS status;
+       struct dcerpc_binding_handle *b = p->binding_handle;
 
-       status = dcerpc_ServerAlive(p, tctx, &r);
+       status = dcerpc_ServerAlive_r(b, tctx, &r);
        torture_assert_ntstatus_ok(tctx, status, "ServerAlive");
        torture_assert_werr_ok(tctx, r.out.result, "ServerAlive");
 
@@ -158,6 +162,7 @@ static bool test_ResolveOxid(struct torture_context *tctx,
        uint16_t protseq[2] = { EPM_PROTOCOL_TCP, EPM_PROTOCOL_SMB };   
        uint64_t oxid;
        struct GUID oid;
+       struct dcerpc_binding_handle *b = p->binding_handle;
 
        if (!test_RemoteActivation(tctx, &oxid, &oid))
                return false;
@@ -166,7 +171,7 @@ static bool test_ResolveOxid(struct torture_context *tctx,
        r.in.cRequestedProtseqs = 2;
        r.in.arRequestedProtseqs = protseq;
 
-       status = dcerpc_ResolveOxid(p, tctx, &r);
+       status = dcerpc_ResolveOxid_r(b, tctx, &r);
        torture_assert_ntstatus_ok(tctx, status, "ResolveOxid");
        torture_assert_werr_ok(tctx, r.out.result, "ResolveOxid");
 
@@ -181,6 +186,7 @@ static bool test_ResolveOxid2(struct torture_context *tctx,
        uint16_t protseq[2] = { EPM_PROTOCOL_TCP, EPM_PROTOCOL_SMB };   
        uint64_t oxid;
        struct GUID oid;
+       struct dcerpc_binding_handle *b = p->binding_handle;
 
        if (!test_RemoteActivation(tctx, &oxid, &oid))
                return false;
@@ -189,7 +195,7 @@ static bool test_ResolveOxid2(struct torture_context *tctx,
        r.in.cRequestedProtseqs = 2;
        r.in.arRequestedProtseqs = protseq;
 
-       status = dcerpc_ResolveOxid2(p, tctx, &r);
+       status = dcerpc_ResolveOxid2_r(b, tctx, &r);
        torture_assert_ntstatus_ok(tctx, status, "ResolveOxid2");
 
        torture_assert_werr_ok(tctx, r.out.result, "ResolveOxid2");
@@ -204,8 +210,9 @@ static bool test_ServerAlive2(struct torture_context *tctx,
 {
        struct ServerAlive2 r;
        NTSTATUS status;
+       struct dcerpc_binding_handle *b = p->binding_handle;
 
-       status = dcerpc_ServerAlive2(p, tctx, &r);
+       status = dcerpc_ServerAlive2_r(b, tctx, &r);
        torture_assert_ntstatus_ok(tctx, status, "ServerAlive2");
        torture_assert_werr_ok(tctx, r.out.result, "ServerAlive2");
 
@@ -214,8 +221,7 @@ static bool test_ServerAlive2(struct torture_context *tctx,
 
 struct torture_suite *torture_rpc_oxidresolve(TALLOC_CTX *mem_ctx)
 {
-       struct torture_suite *suite = torture_suite_create(mem_ctx, 
-                                                          "OXIDRESOLVE");
+       struct torture_suite *suite = torture_suite_create(mem_ctx, "oxidresolve");
        struct torture_rpc_tcase *tcase;
 
        tcase = torture_suite_add_rpc_iface_tcase(suite, "oxidresolver",