SDKQE-2596: Search query testing for CB++

Author: jrawsthorne

.github/workflows/sanitizers.yml

@@ -28,6 +28,7 @@ jobs:
         with:
           submodules: recursive
       - name: Initialize couchbase
+        env: CB_BEER_SAMPLE=true
         run: ./bin/init-cluster
       - name: Build tests
         env:
@@ -67,6 +68,7 @@ jobs:
         with:
           submodules: recursive
       - name: Initialize couchbase
+        env: CB_BEER_SAMPLE=true
         run: ./bin/init-cluster
       - name: Build tests
         env:
@@ -106,6 +108,7 @@ jobs:
         with:
           submodules: recursive
       - name: Initialize couchbase
+        env: CB_BEER_SAMPLE=true
         run: ./bin/init-cluster
       - name: Build tests
         env:
@@ -145,6 +148,7 @@ jobs:
         with:
           submodules: recursive
       - name: Initialize couchbase
+        env: CB_BEER_SAMPLE=true
         run: ./bin/init-cluster
       - name: Build tests
         env:

.github/workflows/tests.yml

@@ -24,6 +24,7 @@ jobs:
         with:
           submodules: recursive
       - name: Initialize couchbase
+        env: CB_BEER_SAMPLE=true
         run: ./bin/init-cluster
       - name: Build tests
         run: ./bin/build-tests
@@ -54,6 +55,7 @@ jobs:
         with:
           submodules: recursive
       - name: Initialize couchbase
+        env: CB_BEER_SAMPLE=true
         run: ./bin/init-cluster
       - name: Build tests
         run: ./bin/build-tests

test/CMakeLists.txt

@@ -10,6 +10,7 @@ integration_test(durability)
 integration_test(arithmetic)
 integration_test(collections)
 integration_test(subdoc)
+integration_test(search)
 
 unit_test(connection_string)
 unit_test(utils)

test/test_integration_management.cxx

@@ -1970,30 +1970,6 @@ TEST_CASE("integration: search index management", "[integration]")
     }
 }
 
-bool
-wait_for_search_pindexes_ready(test::utils::integration_test_guard& integration, const std::string& index_name)
-{
-    return test::utils::wait_until(
-      [&integration, &index_name]() {
-          couchbase::operations::management::search_index_stats_request req{};
-          auto resp = test::utils::execute(integration.cluster, req);
-          if (resp.ctx.ec || resp.stats.empty()) {
-              return false;
-          }
-          auto stats = couchbase::utils::json::parse(resp.stats);
-          const auto* num_pindexes_actual = stats.find(fmt::format("{}:{}:num_pindexes_actual", integration.ctx.bucket, index_name));
-          if (num_pindexes_actual == nullptr || !num_pindexes_actual->is_number()) {
-              return false;
-          }
-          const auto* num_pindexes_target = stats.find(fmt::format("{}:{}:num_pindexes_target", integration.ctx.bucket, index_name));
-          if (num_pindexes_target == nullptr || !num_pindexes_target->is_number()) {
-              return false;
-          }
-          return num_pindexes_actual->get_unsigned() == num_pindexes_target->get_unsigned();
-      },
-      std::chrono::minutes(3));
-}
-
 TEST_CASE("integration: search index management analyze document", "[integration]")
 {
     test::utils::integration_test_guard integration;
@@ -2016,7 +1992,7 @@ TEST_CASE("integration: search index management analyze document", "[integration
         REQUIRE_FALSE(resp.ctx.ec);
     }
 
-    REQUIRE(wait_for_search_pindexes_ready(integration, index_name));
+    REQUIRE(test::utils::wait_for_search_pindexes_ready(integration.cluster, integration.ctx.bucket, index_name));
 
     couchbase::operations::management::search_index_analyze_document_response resp;
     bool operation_completed = test::utils::wait_until([&integration, &index_name, &resp]() {