introduce ASSERT_OR_PRINT test macro

Author: ajdavis

tests/TestSuite.h

@@ -38,6 +38,21 @@ extern "C" {
 #define ASSERT assert
 
 
+#ifdef ASSERT_OR_PRINT
+# undef ASSERT_OR_PRINT
+#endif
+#define ASSERT_OR_PRINT(_statement, _err) \
+   do { \
+      if (!_statement) { \
+         fprintf(stderr, "FAIL:%s:%d  %s()\n  %s\n  %s\n\n", \
+                         __FILE__, __LINE__, __FUNCTION__, \
+                         #_statement, _err.message); \
+         fflush(stderr); \
+         abort(); \
+      } \
+   } while (0)
+
+
 #ifdef ASSERT_CMPINT
 # undef ASSERT_CMPINT
 #endif

tests/test-libmongoc.c

@@ -497,23 +497,17 @@ call_ismaster (bson_t *reply)
    mongoc_uri_t *uri;
    mongoc_client_t *client;
    bson_error_t error;
-   bool r;
 
    uri_str = test_framework_get_uri_str_from_env ();
    uri = mongoc_uri_new (uri_str);
    assert (uri);
    mongoc_uri_set_option_as_int32 (uri, "serverSelectionTimeoutMS", 1000);
 
    client = mongoc_client_new_from_uri (uri);
-   r = mongoc_client_command_simple (client, "admin",
-                                     tmp_bson ("{'isMaster': 1}"),
-                                     NULL, reply, &error);
-
-   if (!r) {
-      printf ("ismaster error: %s\n", error.message);
-   }
-
-   assert (r);
+   ASSERT_OR_PRINT (mongoc_client_command_simple (client, "admin",
+                                                  tmp_bson ("{'isMaster': 1}"),
+                                                  NULL, reply, &error),
+                    error);
 
    mongoc_client_destroy (client);
    mongoc_uri_destroy (uri);

tests/test-mongoc-client.c

@@ -90,8 +90,11 @@ test_mongoc_client_authenticate (void *context)
    bson_init (&roles);
    BCON_APPEND (&roles,
                 "0", "{", "role", "read", "db", "test", "}");
-   r = mongoc_database_add_user(database, username, "testpass", &roles, NULL, &error);
-   ASSERT_CMPINT(r, ==, 1);
+
+   ASSERT_OR_PRINT (mongoc_database_add_user(database, username, "testpass",
+                                             &roles, NULL, &error),
+                    error);
+
    mongoc_database_destroy(database);
 
    /*
@@ -110,7 +113,7 @@ test_mongoc_client_authenticate (void *context)
    if (!r) {
       r = mongoc_cursor_error(cursor, &error);
       if (r) {
-         MONGOC_ERROR("Authentication failure: \"%s\"", error.message);
+         printf("Authentication failure: \"%s\"", error.message);
       }
       assert(!r);
    }
@@ -704,14 +707,11 @@ test_exhaust_cursor (void *context)
       }
 
       BEGIN_IGNORE_DEPRECATIONS;
-      r = mongoc_collection_insert_bulk (collection, MONGOC_INSERT_NONE,
-                                         (const bson_t **)bptr, 10, wr, &error);
+      ASSERT_OR_PRINT (mongoc_collection_insert_bulk (
+                          collection, MONGOC_INSERT_NONE,
+                          (const bson_t **)bptr, 10, wr, &error),
+                       error);
       END_IGNORE_DEPRECATIONS;
-
-      if (!r) {
-         printf("Insert bulk failure: %s\n", error.message);
-      }
-      assert(r);
    }
 
    /* create a couple of cursors */

tests/test-mongoc-database.c

@@ -34,12 +34,9 @@ test_has_collection (void)
    bson_oid_init (&oid, NULL);
    bson_append_oid (&b, "_id", 3, &oid);
    bson_append_utf8 (&b, "hello", 5, "world", 5);
-   r = mongoc_collection_insert (collection, MONGOC_INSERT_NONE, &b, NULL,
-                                 &error);
-   if (!r) {
-      MONGOC_WARNING ("%s\n", error.message);
-   }
-   assert (r);
+   ASSERT_OR_PRINT (mongoc_collection_insert (collection, MONGOC_INSERT_NONE,
+                                              &b, NULL, &error),
+                    error);
    bson_destroy (&b);
 
    r = mongoc_database_has_collection (database, name, &error);
@@ -114,7 +111,6 @@ test_drop (void)
    mongoc_client_t *client;
    bson_error_t error = { 0 };
    char *dbname;
-   bool r;
 
    client = test_framework_client_new ();
    assert (client);
@@ -123,8 +119,7 @@ test_drop (void)
    database = mongoc_client_get_database (client, dbname);
    bson_free (dbname);
 
-   r = mongoc_database_drop (database, &error);
-   assert (r);
+   ASSERT_OR_PRINT (mongoc_database_drop (database, &error), error);
    assert (!error.domain);
    assert (!error.code);
 

tests/test-mongoc-gridfs.c

@@ -45,12 +45,9 @@ test_create (void)
    client = test_framework_client_new ();
    assert (client);
 
-   gridfs = mongoc_client_get_gridfs (client, "test", "foo", &error);
-   if (!gridfs) {
-      printf ("mongoc_client_get_gridfs err: %s\n", error.message);
-   }
-
-   assert (gridfs);
+   ASSERT_OR_PRINT (
+      (gridfs = mongoc_client_get_gridfs (client, "test", "foo", &error)),
+      error);
 
    mongoc_gridfs_drop (gridfs, &error);
 
@@ -75,7 +72,6 @@ test_remove (void)
    mongoc_gridfs_file_opt_t opts = { 0 };
    mongoc_client_t *client;
    bson_error_t error;
-   bool r;
    char name[32];
 
    client = test_framework_client_new ();
@@ -94,9 +90,7 @@ test_remove (void)
    assert (file);
    assert (mongoc_gridfs_file_save (file));
 
-   r = mongoc_gridfs_file_remove (file, &error);
-   if (!r) fprintf (stderr, "%s\n", error.message);
-   assert (r);
+   ASSERT_OR_PRINT (mongoc_gridfs_file_remove (file, &error), error);
 
    mongoc_gridfs_file_destroy (file);
 
@@ -251,8 +245,8 @@ test_create_from_stream (void)
    client = test_framework_client_new ();
    assert (client);
 
-   gridfs = get_test_gridfs (client, "from_stream", &error);
-   assert (gridfs);
+   ASSERT_OR_PRINT ((gridfs = get_test_gridfs (client, "from_stream", &error)),
+                    error);
 
    mongoc_gridfs_drop (gridfs, &error);
 
@@ -440,7 +434,6 @@ test_remove_by_filename (void)
    mongoc_gridfs_file_opt_t opt = { 0 };
    mongoc_client_t *client;
    bson_error_t error;
-   bool ret;
 
    client = test_framework_client_new ();
    assert (client);
@@ -461,9 +454,9 @@ test_remove_by_filename (void)
    assert (file);
    assert (mongoc_gridfs_file_save (file));
 
-   ret = mongoc_gridfs_remove_by_filename (gridfs, "foo_file_1.txt", &error);
-   if (!ret) fprintf (stderr, "ERROR: %s\n", error.message);
-   assert (ret);
+   ASSERT_OR_PRINT (
+      mongoc_gridfs_remove_by_filename (gridfs, "foo_file_1.txt", &error),
+      error);
    mongoc_gridfs_file_destroy (file);
 
    file = mongoc_gridfs_find_one_by_filename (gridfs, "foo_file_1.txt", &error);

tests/test-write-commands.c

@@ -64,16 +64,14 @@ test_split_insert (void)
    _mongoc_write_command_execute (&command, client, 0, collection->db,
                                   collection->collection, NULL, 0, &result);
 
-   r = _mongoc_write_result_complete (&result, &reply, &error);
-
-   assert (r);
+   ASSERT_OR_PRINT (_mongoc_write_result_complete (&result, &reply, &error),
+                    error);
    assert (result.nInserted == 3000);
 
    _mongoc_write_command_destroy (&command);
    _mongoc_write_result_destroy (&result);
 
-   r = mongoc_collection_drop (collection, &error);
-   assert (r);
+   ASSERT_OR_PRINT (mongoc_collection_drop (collection, &error), error);
 
    for (i = 0; i < 3000; i++) {
       bson_destroy (docs [i]);