test code cleanups

Author: ajdavis

tests/test-bulk.c

@@ -2079,10 +2079,6 @@ test_bulk_edge_case_372 (bool ordered)
       mongoc_bulk_operation_replace_one (bulk, selector, update, true);
    }
 
-
-#if 0
-   printf ("%s\n", bson_as_json (&reply, NULL));
-#endif
    ASSERT_OR_PRINT (mongoc_bulk_operation_execute (bulk, &reply, &error),
                     error);
 
@@ -2135,7 +2131,7 @@ test_bulk_new (void)
    mongoc_client_t *client;
    bson_error_t error;
    bson_t empty = BSON_INITIALIZER;
-   bool r;
+   uint32_t r;
 
    client = test_framework_client_new ();
    assert (client);

tests/test-mongoc-collection.c

@@ -1557,7 +1557,8 @@ BEGIN_IGNORE_DEPRECATIONS;
 
 END_IGNORE_DEPRECATIONS;
 
-   cursor = mongoc_collection_find (collection, MONGOC_QUERY_NONE, 0, 0, 6000, &query, NULL, NULL);
+   cursor = mongoc_collection_find (collection, MONGOC_QUERY_NONE, 0, 0, 6000,
+                                    &query, NULL, NULL);
    assert (cursor);
    bson_destroy (&query);
 
@@ -1602,7 +1603,8 @@ test_command_fq (void)
 
    cmd = BCON_NEW ("query", "{", "}");
 
-   cursor = mongoc_collection_command (collection, MONGOC_QUERY_NONE, 0, 1, 0, cmd, NULL, NULL);
+   cursor = mongoc_collection_command (collection, MONGOC_QUERY_NONE, 0, 1, 0,
+                                       cmd, NULL, NULL);
    r = mongoc_cursor_next (cursor, &doc);
    assert (r);
 

tests/test-mongoc-database.c

@@ -264,7 +264,6 @@ test_get_collection_info (void)
 
    assert (1 == num_infos);
 
-   num_infos = 0;
    mongoc_cursor_destroy (cursor);
 
    ASSERT_OR_PRINT (mongoc_database_drop (database, &error),

tests/test-mongoc-gridfs.c

@@ -362,7 +362,7 @@ test_write (void)
    r = mongoc_gridfs_file_seek (file, 0, SEEK_SET);
    assert (!r);
 
-   r = mongoc_gridfs_file_tell (file);
+   r = (ssize_t) mongoc_gridfs_file_tell (file);
    assert (r == 0);
 
    r = mongoc_gridfs_file_readv (file, &riov, 1, len, 0);