s4:lib: merge LDB_WRAP and LDBSAMBA and make LDBSAMBA a library.

[kamenim/samba.git] / source4 / torture / drs / unit / schemainfo_tests.c

diff --git a/source4/torture/drs/unit/schemainfo_tests.c b/source4/torture/drs/unit/schemainfo_tests.c
index 7928855fb3e726d2307e64b847017d7b86fbd858..3958eb365b6ddbeb899d2c606daac6eab468b8f0 100644 (file)
--- a/source4/torture/drs/unit/schemainfo_tests.c
+++ b/source4/torture/drs/unit/schemainfo_tests.c
@@ -24,7 +24,7 @@
 #include "torture/smbtorture.h"
 #include "dsdb/samdb/samdb.h"
 #include "dsdb/samdb/ldb_modules/util.h"
-#include "lib/ldb_wrap.h"
+#include "ldb_wrap.h"
 #include "lib/ldb/include/ldb_module.h"
 #include "torture/rpc/drsuapi.h"
 #include "librpc/ndr/libndr.h"
@@ -33,10 +33,10 @@
 
 /**
  * schemaInfo to init ldb context with
- *   Rev:  01
- *   GUID: 071c82fd-45c7-4351-a3db-51f75a630a7f
+ *   Rev:  0
+ *   GUID: 00000000-0000-0000-0000-000000000000
  */
-#define SCHEMA_INFO_INIT_STR           "FF0000000100000000000000000000000000000000"
+#define SCHEMA_INFO_INIT_STR           "FF0000000000000000000000000000000000000000"
 
 /**
  * Default schema_info string to be used for testing
@@ -65,6 +65,13 @@ static const struct {
        WERROR          werr_expected;
        bool            test_both_ways;
 } _schemainfo_test_data[] = {
+       {
+               .schema_info_str = "FF0000000000000000000000000000000000000000",
+               .revision = 0,
+               .guid_str = "00000000-0000-0000-0000-000000000000",
+               .werr_expected = WERR_OK,
+               .test_both_ways = true
+       },
        {
                .schema_info_str = "FF00000001FD821C07C7455143A3DB51F75A630A7F",
                .revision = 1,
@@ -79,13 +86,6 @@ static const struct {
                .werr_expected = WERR_OK,
                .test_both_ways = true
        },
-       { /* revision > 0 */
-               .schema_info_str = "FF00000000FD821C07C7455143A3DB51F75A630A7F",
-               .revision = 0,
-               .guid_str = "071c82fd-45c7-4351-a3db-51f75a630a7f",
-               .werr_expected = WERR_INVALID_PARAMETER,
-               .test_both_ways = true
-       },
        { /* len == 21 */
                .schema_info_str = "FF00000001FD821C07C7455143A3DB51F75A630A7F00",
                .revision = 1,
@@ -185,6 +185,39 @@ bool drsut_schemainfo_new(struct torture_context *tctx, struct dsdb_schema_info
 }
 
 
+/*
+ * Tests dsdb_schema_info_new() and dsdb_schema_info_blob_new()
+ */
+static bool test_dsdb_schema_info_new(struct torture_context *tctx,
+                                     struct drsut_schemainfo_data *priv)
+{
+       WERROR werr;
+       DATA_BLOB ndr_blob;
+       DATA_BLOB ndr_blob_expected;
+       struct dsdb_schema_info *schi;
+       TALLOC_CTX *mem_ctx;
+
+       mem_ctx = talloc_new(priv);
+       torture_assert(tctx, mem_ctx, "Not enough memory!");
+       ndr_blob_expected = strhex_to_data_blob(mem_ctx, SCHEMA_INFO_INIT_STR);
+       torture_assert(tctx, ndr_blob_expected.data, "Not enough memory!");
+
+       werr = dsdb_schema_info_new(mem_ctx, &schi);
+       torture_assert_werr_ok(tctx, werr, "dsdb_schema_info_new() failed");
+       torture_assert_int_equal(tctx, schi->revision, 0,
+                                "dsdb_schema_info_new() creates schemaInfo with invalid revision");
+       torture_assert(tctx, GUID_all_zero(&schi->invocation_id),
+                       "dsdb_schema_info_new() creates schemaInfo with not ZERO GUID");
+
+       werr = dsdb_schema_info_blob_new(mem_ctx, &ndr_blob);
+       torture_assert_werr_ok(tctx, werr, "dsdb_schema_info_blob_new() failed");
+       torture_assert_data_blob_equal(tctx, ndr_blob, ndr_blob_expected,
+                                      "dsdb_schema_info_blob_new() returned invalid blob");
+
+       talloc_free(mem_ctx);
+       return true;
+}
+
 /*
  * Tests dsdb_schema_info_from_blob()
  */
@@ -328,10 +361,6 @@ static bool test_dsdb_module_schema_info_update(struct torture_context *tctx,
        werr = dsdb_schema_info_from_blob(&blob, priv, &schema_info);
        torture_assert_werr_ok(tctx, werr, "dsdb_schema_info_from_blob() failed");
 
-       /* decrement revision to be able to compare
-        * against default schemaInfo later */
-       schema_info->revision--;
-
        /* check against default schema_info */
        torture_assert_schema_info_equal(tctx, schema_info, priv->schema_info,
                                          "schemaInfo attribute no updated correctly");
@@ -339,29 +368,6 @@ static bool test_dsdb_module_schema_info_update(struct torture_context *tctx,
        return true;
 }
 
-/*
- * Tests dsdb_schema_info_create()
- */
-static bool test_dsdb_schema_info_create(struct torture_context *tctx,
-                                        struct drsut_schemainfo_data *priv)
-{
-       WERROR werr;
-       struct dsdb_schema_info *schema_info = NULL;
-
-       werr = dsdb_schema_info_create(priv->ldb, true, priv, &schema_info);
-       torture_assert_werr_ok(tctx, werr, "dsdb_schema_info_create() failed");
-
-       torture_assert(tctx, schema_info, "schema_info is NULL after dsdb_schema_info_create()");
-       torture_assert_int_equal(tctx, schema_info->revision, 1, "Invalid schemaInfo revision");
-       torture_assert(tctx,
-                      GUID_equal(&schema_info->invocation_id, &priv->schema_info->invocation_id),
-                      "Invalid invocationId returned");
-
-       talloc_free(schema_info);
-
-       return true;
-}
-
 
 /**
  * Reset schemaInfo record to know value
@@ -383,7 +389,7 @@ static bool _drsut_ldb_schema_info_reset(struct torture_context *tctx,
        msg = ldb_msg_new(mem_ctx);
        torture_assert_goto(tctx, msg, bret, DONE, "Not enough memory!");
 
-       msg->dn = samdb_schema_dn(ldb);
+       msg->dn = ldb_get_schema_basedn(ldb);
        ldb_err = ldb_msg_add_value(msg, "schemaInfo", &blob, NULL);
        torture_assert_int_equal_goto(tctx, ldb_err, LDB_SUCCESS, bret, DONE,
                                      "ldb_msg_add_value() failed");
@@ -507,7 +513,7 @@ static bool torture_drs_unit_schemainfo_setup(struct torture_context *tctx,
        torture_assert(tctx, priv->ldb_module, "Not enough memory!");
 
        /* create schema mockup object */
-       priv->schema = dsdb_new_schema(priv, lp_iconv_convenience(tctx->lp_ctx));
+       priv->schema = dsdb_new_schema(priv);
 
        /* pre-cache invocationId for samdb_ntds_invocation_id()
         * to work with our mock ldb */
@@ -563,14 +569,14 @@ struct torture_tcase * torture_drs_unit_schemainfo(struct torture_suite *suite)
 
        tc->description = talloc_strdup(tc, "Unit tests for DRSUAPI::schemaInfo implementation");
 
+       torture_tcase_add_simple_test(tc, "dsdb_schema_info_new",
+                                     (pfn_run)test_dsdb_schema_info_new);
        torture_tcase_add_simple_test(tc, "dsdb_schema_info_from_blob",
                                      (pfn_run)test_dsdb_schema_info_from_blob);
        torture_tcase_add_simple_test(tc, "dsdb_blob_from_schema_info",
                                      (pfn_run)test_dsdb_blob_from_schema_info);
        torture_tcase_add_simple_test(tc, "dsdb_module_schema_info_blob read|write",
                                      (pfn_run)test_dsdb_module_schema_info_blob_rw);
-       torture_tcase_add_simple_test(tc, "dsdb_schema_info_create",
-                                     (pfn_run)test_dsdb_schema_info_create);
        torture_tcase_add_simple_test(tc, "dsdb_module_schema_info_update",
                                      (pfn_run)test_dsdb_module_schema_info_update);