tests: try to use the test database to save creating files.

Author: Christian Hergert

tests/test-libmongoc.c

@@ -63,6 +63,16 @@ log_handler (mongoc_log_level_t  log_level,
 char MONGOC_TEST_HOST [1024];
 char MONGOC_TEST_UNIQUE [32];
 
+char *
+gen_collection_name (const char *str)
+{
+   return bson_strdup_printf ("%s_%u_%u",
+                              str,
+                              (unsigned)time(NULL),
+                              (unsigned)gettestpid());
+
+}
+
 static void
 set_mongoc_test_host(void)
 {

tests/test-libmongoc.h

@@ -19,6 +19,7 @@
 #define TEST_LIBMONGOC_H
 
 extern char MONGOC_TEST_HOST [1024];
-extern char MONGOC_TEST_UNIQUE [32];
+
+char *gen_collection_name (const char *prefix);
 
 #endif

tests/test-mongoc-client.c

@@ -10,7 +10,6 @@
 #include "test-libmongoc.h"
 
 static char *gTestUri;
-static char *gTestUriWithPassword;
 static char *gTestUriWithBadPassword;
 
 
@@ -38,6 +37,39 @@ usleep (int64_t usec)
 #endif
 
 
+static mongoc_collection_t *
+get_test_collection (mongoc_client_t *client,
+                     const char      *name)
+{
+   mongoc_collection_t *ret;
+   char *str;
+
+   str = gen_collection_name (name);
+   ret = mongoc_client_get_collection (client, "test", str);
+   bson_free (str);
+
+   return ret;
+}
+
+
+static char *
+gen_test_user (void)
+{
+   return bson_strdup_printf ("testuser_%u_%u",
+                              (unsigned)time(NULL),
+                              (unsigned)gettestpid());
+}
+
+
+static char *
+gen_good_uri (const char *username)
+{
+   return bson_strdup_printf("mongodb://%s:testpass@%s:27017/test",
+                             username,
+                             MONGOC_TEST_HOST);
+}
+
+
 static void
 test_mongoc_client_authenticate (void)
 {
@@ -47,16 +79,21 @@ test_mongoc_client_authenticate (void)
    mongoc_cursor_t *cursor;
    const bson_t *doc;
    bson_error_t error;
+   char *username;
+   char *uri;
    bool r;
    bson_t q;
 
+   username = gen_test_user ();
+   uri = gen_good_uri (username);
+
    /*
     * Add a user to the test database.
     */
    client = mongoc_client_new(gTestUri);
    database = mongoc_client_get_database(client, "test");
-   mongoc_database_remove_user (database, "testuser", &error);
-   r = mongoc_database_add_user(database, "testuser", "testpass", NULL, NULL, &error);
+   mongoc_database_remove_user (database, username, &error);
+   r = mongoc_database_add_user(database, username, "testpass", NULL, NULL, &error);
    ASSERT_CMPINT(r, ==, 1);
    mongoc_database_destroy(database);
    mongoc_client_destroy(client);
@@ -65,7 +102,7 @@ test_mongoc_client_authenticate (void)
     * Try authenticating with that user.
     */
    bson_init(&q);
-   client = mongoc_client_new(gTestUriWithPassword);
+   client = mongoc_client_new(uri);
    collection = mongoc_client_get_collection(client, "test", "test");
    cursor = mongoc_collection_find(collection, MONGOC_QUERY_NONE, 0, 1, 0,
                                    &q, NULL, NULL);
@@ -80,6 +117,9 @@ test_mongoc_client_authenticate (void)
    mongoc_cursor_destroy(cursor);
    mongoc_collection_destroy(collection);
    mongoc_client_destroy(client);
+
+   bson_free (username);
+   bson_free (uri);
 }
 
 
@@ -342,6 +382,7 @@ test_mongoc_client_command (void)
 static void
 test_exhaust_cursor (void)
 {
+   mongoc_write_concern_t *wr;
    mongoc_client_t *client;
    mongoc_collection_t *collection;
    mongoc_cursor_t *cursor;
@@ -356,19 +397,18 @@ test_exhaust_cursor (void)
    bool r;
    bson_error_t error;
    bson_oid_t oid;
-   char dbname [32];
 
    client = mongoc_client_new (gTestUri);
    assert (client);
 
-   bson_snprintf (dbname, sizeof dbname, "tests%u_%d",
-                  (unsigned)time (NULL), gettestpid ());
-
-   collection = mongoc_client_get_collection(client, dbname, "test_exhaust_cursor");
-   assert(collection);
+   collection = get_test_collection (client, "test_exhaust_cursor");
+   assert (collection);
 
    mongoc_collection_drop(collection, &error);
 
+   wr = mongoc_write_concern_new ();
+   mongoc_write_concern_set_journal (wr, true);
+
    /* bulk insert some records to work on */
    {
       bson_init(&q);
@@ -382,7 +422,7 @@ test_exhaust_cursor (void)
       }
 
       r = mongoc_collection_insert_bulk (collection, MONGOC_INSERT_NONE,
-                                         (const bson_t **)bptr, 10, NULL, &error);
+                                         (const bson_t **)bptr, 10, wr, &error);
 
       if (!r) {
          MONGOC_WARNING("Insert bulk failure: %s\n", error.message);
@@ -449,7 +489,7 @@ test_exhaust_cursor (void)
    /* make sure writes fail as well */
    {
       r = mongoc_collection_insert_bulk (collection, MONGOC_INSERT_NONE,
-                                         (const bson_t **)bptr, 10, NULL, &error);
+                                         (const bson_t **)bptr, 10, wr, &error);
       assert (!r);
       assert (error.domain == MONGOC_ERROR_CLIENT);
       assert (error.code == MONGOC_ERROR_CLIENT_IN_EXHAUST);
@@ -496,6 +536,7 @@ test_exhaust_cursor (void)
    r = mongoc_collection_drop (collection, &error);
    assert (r);
 
+   mongoc_write_concern_destroy (wr);
    mongoc_cursor_destroy (cursor2);
    mongoc_collection_destroy(collection);
    mongoc_client_destroy (client);
@@ -506,7 +547,6 @@ static void
 cleanup_globals (void)
 {
    bson_free(gTestUri);
-   bson_free(gTestUriWithPassword);
    bson_free(gTestUriWithBadPassword);
 }
 
@@ -517,7 +557,6 @@ test_client_install (TestSuite *suite)
    bool local;
 
    gTestUri = bson_strdup_printf("mongodb://%s:27017/", MONGOC_TEST_HOST);
-   gTestUriWithPassword = bson_strdup_printf("mongodb://testuser:testpass@%s:27017/test", MONGOC_TEST_HOST);
    gTestUriWithBadPassword = bson_strdup_printf("mongodb://baduser:badpass@%s:27017/test", MONGOC_TEST_HOST);
 
    local = !getenv ("MONGOC_DISABLE_MOCK_SERVER");

tests/test-mongoc-collection.c

@@ -12,7 +12,22 @@ static char *gTestUri;
 static mongoc_database_t *
 get_test_database (mongoc_client_t *client)
 {
-   return mongoc_client_get_database (client, MONGOC_TEST_UNIQUE);
+   return mongoc_client_get_database (client, "test");
+}
+
+
+static mongoc_collection_t *
+get_test_collection (mongoc_client_t *client,
+                     const char      *prefix)
+{
+   mongoc_collection_t *ret;
+   char *str;
+
+   str = gen_collection_name (prefix);
+   ret = mongoc_client_get_collection (client, "test", str);
+   bson_free (str);
+
+   return ret;
 }
 
 
@@ -36,7 +51,7 @@ test_insert (void)
    database = get_test_database (client);
    ASSERT (database);
 
-   collection = mongoc_database_get_collection (database, "test_insert");
+   collection = get_test_collection (client, "test_insert");
    ASSERT (collection);
 
    mongoc_collection_drop(collection, &error);
@@ -99,7 +114,7 @@ test_insert_bulk (void)
    database = get_test_database (client);
    ASSERT (database);
 
-   collection = mongoc_database_get_collection(database, "test_insert_bulk");
+   collection = get_test_collection (client, "test_insert_bulk");
    ASSERT (collection);
 
    mongoc_collection_drop(collection, &error);
@@ -189,10 +204,10 @@ test_save (void)
    database = get_test_database (client);
    ASSERT (database);
 
-   collection = mongoc_database_get_collection (database, "test_save");
+   collection = get_test_collection (client, "test_save");
    ASSERT (collection);
 
-   mongoc_collection_drop(collection, &error);
+   mongoc_collection_drop (collection, &error);
 
    context = bson_context_new(BSON_CONTEXT_NONE);
    ASSERT (context);
@@ -241,7 +256,7 @@ test_regex (void)
    database = get_test_database (client);
    ASSERT (database);
 
-   collection = mongoc_database_get_collection (database, "test_regex");
+   collection = get_test_collection (client, "test_regex");
    ASSERT (collection);
 
    wr = mongoc_write_concern_new ();
@@ -299,7 +314,7 @@ test_update (void)
    database = get_test_database (client);
    ASSERT (database);
 
-   collection = mongoc_database_get_collection (database, "test_update");
+   collection = get_test_collection (client, "test_update");
    ASSERT (collection);
 
    context = bson_context_new(BSON_CONTEXT_NONE);
@@ -389,7 +404,7 @@ test_delete (void)
    database = get_test_database (client);
    ASSERT (database);
 
-   collection = mongoc_database_get_collection (database, "test_delete");
+   collection = get_test_collection (client, "test_delete");
    ASSERT (collection);
 
    context = bson_context_new(BSON_CONTEXT_NONE);
@@ -447,7 +462,7 @@ test_index (void)
    database = get_test_database (client);
    ASSERT (database);
 
-   collection = mongoc_database_get_collection (database, "test_index");
+   collection = get_test_collection (client, "test_index");
    ASSERT (collection);
 
    bson_init(&keys);
@@ -518,7 +533,7 @@ test_drop (void)
    database = get_test_database (client);
    ASSERT (database);
 
-   collection = mongoc_database_get_collection (database, "test_drop");
+   collection = get_test_collection (client, "test_drop");
    ASSERT (collection);
 
    doc = BCON_NEW("hello", "world");
@@ -568,7 +583,7 @@ test_aggregate (void)
    database = get_test_database (client);
    ASSERT (database);
 
-   collection = mongoc_database_get_collection (database, "test_aggregate");
+   collection = get_test_collection (client, "test_aggregate");
    ASSERT (collection);
 
    mongoc_collection_drop(collection, &error);

tests/test-mongoc-database.c

@@ -133,22 +133,14 @@ test_create_collection (void)
    mongoc_collection_t *collection;
    mongoc_client_t *client;
    bson_error_t error = { 0 };
-   unsigned t;
-   unsigned p;
    bson_t options;
-   char dbname [32];
+   char *name;
    bool r;
 
    client = mongoc_client_new (gTestUri);
    assert (client);
 
-   t = time (NULL);
-
-   p = gettestpid ();
-   bson_snprintf (dbname, sizeof dbname, "test%u_%u", t, p);
-   dbname [sizeof dbname - 1] = '\0';
-
-   database = mongoc_client_get_database (client, dbname);
+   database = mongoc_client_get_database (client, "test");
    assert (database);
 
    bson_init (&options);
@@ -157,8 +149,10 @@ test_create_collection (void)
    BSON_APPEND_BOOL (&options, "capped", true);
    BSON_APPEND_BOOL (&options, "autoIndexId", true);
 
-   collection = mongoc_database_create_collection (database, "createCollectionTest", &options, &error);
+   name = gen_collection_name ("create_collection");
+   collection = mongoc_database_create_collection (database, name, &options, &error);
    assert (collection);
+   bson_free (name);
 
    r = mongoc_collection_drop (collection, &error);
    assert (r);