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

[metze/samba/wip.git] / source4 / torture / rpc / remact.c

diff --git a/source4/torture/rpc/remact.c b/source4/torture/rpc/remact.c
index 81f609e8b39aa30885bc9cb43930cd0098d698ab..c14adb8596c482f2301fb0ec43b57a88ce03fb17 100644 (file)
--- a/source4/torture/rpc/remact.c
+++ b/source4/torture/rpc/remact.c
@@ -6,7 +6,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -15,32 +15,31 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
-#include "torture/torture.h"
-#include "librpc/gen_ndr/ndr_remact.h"
 #include "librpc/gen_ndr/ndr_remact_c.h"
-#include "librpc/gen_ndr/ndr_epmapper.h"
 #include "librpc/gen_ndr/ndr_epmapper_c.h"
-#include "librpc/gen_ndr/ndr_dcom.h"
-#include "torture/rpc/rpc.h"
+#include "torture/rpc/torture_rpc.h"
 
 #define CLSID_IMAGEDOC "02B01C80-E03D-101A-B294-00DD010F2BF9"
+#define DCERPC_IUNKNOWN_UUID "00000000-0000-0000-c000-000000000046"
+#define DCERPC_ICLASSFACTORY_UUID "00000001-0000-0000-c000-000000000046"
 
-static int test_RemoteActivation(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
+static bool test_RemoteActivation(struct torture_context *tctx, 
+                                                                struct dcerpc_pipe *p)
 {
        struct RemoteActivation r;
        NTSTATUS status;
        struct GUID iids[1];
        uint16_t protseq[3] = { EPM_PROTOCOL_TCP, EPM_PROTOCOL_NCALRPC, EPM_PROTOCOL_UUID };
+       struct dcerpc_binding_handle *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;
@@ -49,77 +48,42 @@ static int test_RemoteActivation(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
        GUID_from_string(DCERPC_IUNKNOWN_UUID, &iids[0]);
        r.in.pIIDs = iids;
 
-       status = dcerpc_RemoteActivation(p, mem_ctx, &r);
-       if(NT_STATUS_IS_ERR(status)) {
-               printf("RemoteActivation: %s\n", nt_errstr(status));
-               return 0;
-       }
+       status = dcerpc_RemoteActivation_r(b, tctx, &r);
+       torture_assert_ntstatus_ok(tctx, status, "RemoteActivation");
 
-       if(!W_ERROR_IS_OK(r.out.result)) {
-               printf("RemoteActivation: %s\n", win_errstr(r.out.result));
-               return 0;
-       }
+       torture_assert_werr_ok(tctx, r.out.result, "RemoteActivation");
 
-       if(!W_ERROR_IS_OK(r.out.hr)) {
-               printf("RemoteActivation: %s\n", win_errstr(r.out.hr));
-               return 0;
-       }
+       torture_assert_werr_ok(tctx, *r.out.hr, "RemoteActivation");
 
-       if(!W_ERROR_IS_OK(r.out.results[0])) {
-               printf("RemoteActivation: %s\n", win_errstr(r.out.results[0]));
-               return 0;
-       }
+       torture_assert_werr_ok(tctx, r.out.results[0], "RemoteActivation");
 
        GUID_from_string(DCERPC_ICLASSFACTORY_UUID, &iids[0]);
        r.in.Interfaces = 1;
        r.in.Mode = MODE_GET_CLASS_OBJECT;
 
-       status = dcerpc_RemoteActivation(p, mem_ctx, &r);
-       if(NT_STATUS_IS_ERR(status)) {
-               printf("RemoteActivation(GetClassObject): %s\n", nt_errstr(status));
-               return 0;
-       }
+       status = dcerpc_RemoteActivation_r(b, tctx, &r);
+       torture_assert_ntstatus_ok(tctx, status, 
+                                                          "RemoteActivation(GetClassObject)");
 
-       if(!W_ERROR_IS_OK(r.out.result)) {
-               printf("RemoteActivation(GetClassObject): %s\n", win_errstr(r.out.result));
-               return 0;
-       }
+       torture_assert_werr_ok(tctx, r.out.result, 
+                                                  "RemoteActivation(GetClassObject)");
 
-       if(!W_ERROR_IS_OK(r.out.hr)) {
-               printf("RemoteActivation(GetClassObject): %s\n", win_errstr(r.out.hr));
-               return 0;
-       }
+       torture_assert_werr_ok(tctx, *r.out.hr, "RemoteActivation(GetClassObject)");
 
-       if(!W_ERROR_IS_OK(r.out.results[0])) {
-               printf("RemoteActivation(GetClassObject): %s\n", win_errstr(r.out.results[0]));
-               return 0;
-       }
+       torture_assert_werr_ok(tctx, r.out.results[0], 
+                                                  "RemoteActivation(GetClassObject)");
 
-       return 1;
+       return true;
 }
 
-BOOL torture_rpc_remact(void)
+struct torture_suite *torture_rpc_remact(TALLOC_CTX *mem_ctx)
 {
-       NTSTATUS status;
-       struct dcerpc_pipe *p;
-       TALLOC_CTX *mem_ctx;
-       BOOL ret = True;
-
-       mem_ctx = talloc_init("torture_rpc_remact");
-
-       status = torture_rpc_connection(mem_ctx,
-                                       &p, 
-                                       &dcerpc_table_IRemoteActivation);
-
-       if (!NT_STATUS_IS_OK(status)) {
-               talloc_free(mem_ctx);
-               return False;
-       }
+       struct torture_suite *suite = torture_suite_create(mem_ctx, "remact");
+       struct torture_rpc_tcase *tcase;
 
-       if(!test_RemoteActivation(p, mem_ctx))
-               ret = False;
+       tcase = torture_suite_add_rpc_iface_tcase(suite, "remact", &ndr_table_IRemoteActivation);
 
-       talloc_free(mem_ctx);
+       torture_rpc_tcase_add_test(tcase, "RemoteActivation", test_RemoteActivation);
 
-       return ret;
+       return suite;
 }