Catch: named sections of n-way tests

C/tests/c4Test.cc

@@ -203,9 +203,6 @@ C4Test::C4Test(int num) : _storage(kC4SQLiteStorageEngine) {  // NOLINT(cppcoreg
         memcpy(_dbConfig.encryptionKey.bytes, "this is not a random key at all.", kC4EncryptionKeySizeAES256);
     }
 
-    fprintf(stderr, "        --- %s %s\n", ((_dbConfig.flags & kC4DB_VersionVectors) ? "Version-vectors" : "Rev-trees"),
-            (_dbConfig.encryptionKey.algorithm ? ", Encrypted" : ""));
-
     C4Error error;
     if ( !c4db_deleteNamed(kDatabaseName, _dbConfig.parentDirectory, ERROR_INFO(&error)) ) REQUIRE(error.code == 0);
     db = c4db_openNamed(kDatabaseName, &_dbConfig, ERROR_INFO(&error));

C/tests/c4Test.hh

@@ -188,15 +188,18 @@ class C4Test {
 #if defined(COUCHBASE_ENTERPRISE)
 #    if SkipVersionVectorTest
     static constexpr int numberOfOptions = 2;  // rev-tree, rev-tree encrypted
+    static constexpr const char* nameOfOption[numberOfOptions] = { "RevTree", "EncryptedRevTree" };
 #    else
     static constexpr int numberOfOptions = 3;  // rev-tree, version vector, rev-tree encrypted
+    static constexpr const char* nameOfOption[numberOfOptions] = { "RevTree", "VersionVector", "EncryptedRevTree" };
 #    endif
 #else
 #    if SkipVersionVectorTest
     static constexpr int numberOfOptions = 1;  // rev-tree
 #    else
     static constexpr int numberOfOptions = 2;  // rev-tree, version vector
 #    endif
+    static constexpr const char* nameOfOption[2] = { "RevTree", "VersionVector" };
 #endif
 
     static std::string sFixturesDir;            // directory where test files live

LiteCore/tests/DataFileTest.cc

@@ -32,6 +32,7 @@ using namespace std;
 class KeyStoreTestFixture : public DataFileTestFixture {
   public:
     static constexpr int numberOfOptions = 2;
+    static constexpr const char* nameOfOption[numberOfOptions] = { "SQLiteKeyStore", "BothKeyStore" };
 
     KeyStoreTestFixture(int option) {
         if ( int(option) == 0 ) {

LiteCore/tests/QueryTest.hh

@@ -31,6 +31,8 @@ using namespace fleece::impl;
 class QueryTest : public DataFileTestFixture {
   public:
     static constexpr int numberOfOptions = 5;
+    static constexpr const char* nameOfOption[numberOfOptions] = { "Collection `_default`", "Collection `_`", "Collection `Secondary`",
+    "Collection `_default.Secondary`", "Collection `scopey.subsidiary`"};
 
     string collectionName;
     int    option{0};
@@ -44,7 +46,6 @@ class QueryTest : public DataFileTestFixture {
     explicit QueryTest(int opt = 0) : option(opt) {
         Assert(option < numberOfOptions, "Test option out of valid range");
         collectionName = kCollectionNameOptions[option];
-        logSection(stringprintf("Collection `%s`", collectionName.c_str()));
         if ( slice keyStoreName = kKeyStoreNameOptions[option] ) store = &db->getKeyStore(keyStoreName);
     }
 

LiteCore/tests/SQLiteFunctionsTest.cc

@@ -31,6 +31,7 @@ class SQLiteFunctionsTest
     , DataFile::Delegate {
   public:
     static constexpr int numberOfOptions = 2;
+    static constexpr const char* nameOfOption[numberOfOptions] = { "No SharedKeys", "With SharedKeys" };
 
     explicit SQLiteFunctionsTest(int which) : db(":memory:", SQLite::OPEN_READWRITE | SQLite::OPEN_CREATE) {
         // Run test once with shared keys, once without:

REST/tests/RESTClientTest.cc

@@ -27,14 +27,13 @@ class RESTClientTest : public ReplicatorAPITest {
 #else
     static constexpr int numberOfOptions = 1;
 #endif
+    static constexpr const char* nameOfOption[2] = {"No proxy", "HTTP proxy"};
 
     explicit RESTClientTest(int option) : ReplicatorAPITest() {
         if ( option == 0 ) {
             _sg.proxy = nullptr;
-            fprintf(stderr, "        --- No proxy ---\n");
         } else if ( option == 1 ) {
             if ( _sg.proxy ) _sg.proxy = make_unique<ProxySpec>(ProxyType::HTTP, "localhost"_sl, uint16_t(8888));
-            fprintf(stderr, "        --- HTTP proxy ---\n");
         }
     }
 };