MB-41719: Move ProducerNegotiatesIncludeDeletedUserXattrs to ST suite

Change-Id: I6ea27d955e27f4d032bca2895503c4c90fff8f06
Reviewed-on: http://review.couchbase.org/c/kv_engine/+/137169
Tested-by: Build Bot <[email protected]>
Reviewed-by: Dave Rigby <[email protected]>

Author: BenHuddleston

engines/ep/tests/module_tests/dcp_single_threaded_test.cc

@@ -23,7 +23,15 @@
 
 #include <programs/engine_testapp/mock_cookie.h>
 
-class STDcpTest : public STParameterizedBucketTest {};
+class STDcpTest : public STParameterizedBucketTest {
+protected:
+    /**
+     * @param producerState Are we simulating a negotiation against a Producer
+     *  that enables IncludeDeletedUserXattrs?
+     */
+    void testProducerNegotiatesIncludeDeletedUserXattrs(
+            IncludeDeletedUserXattrs producerState);
+};
 
 /*
  * The following tests that when the disk_backfill_queue configuration is
@@ -198,6 +206,47 @@ TEST_P(STDcpTest, SnapshotsAndNoData) {
     EXPECT_TRUE(connMap.isDeadConnectionsEmpty());
 }
 
+void STDcpTest::testProducerNegotiatesIncludeDeletedUserXattrs(
+        IncludeDeletedUserXattrs producerState) {
+    const void* cookie = create_mock_cookie();
+
+    uint32_t dcpOpenFlags;
+    ENGINE_ERROR_CODE expectedControlResp;
+    switch (producerState) {
+    case IncludeDeletedUserXattrs::Yes: {
+        dcpOpenFlags =
+                cb::mcbp::request::DcpOpenPayload::IncludeDeletedUserXattrs;
+        expectedControlResp = ENGINE_SUCCESS;
+        break;
+    }
+    case IncludeDeletedUserXattrs::No: {
+        dcpOpenFlags = 0;
+        expectedControlResp = ENGINE_EINVAL;
+        break;
+    }
+    }
+
+    const auto producer = std::make_shared<MockDcpProducer>(
+            *engine, cookie, "test_producer", dcpOpenFlags);
+    EXPECT_EQ(producerState, producer->public_getIncludeDeletedUserXattrs());
+    EXPECT_EQ(expectedControlResp,
+              producer->control(0, "include_deleted_user_xattrs", "true"));
+
+    destroy_mock_cookie(cookie);
+}
+
+TEST_P(STDcpTest,
+       ProducerNegotiatesIncludeDeletedUserXattrs_DisabledAtProducer) {
+    testProducerNegotiatesIncludeDeletedUserXattrs(
+            IncludeDeletedUserXattrs::No);
+}
+
+TEST_P(STDcpTest,
+       ProducerNegotiatesIncludeDeletedUserXattrs_EnabledAtProducer) {
+    testProducerNegotiatesIncludeDeletedUserXattrs(
+            IncludeDeletedUserXattrs::Yes);
+}
+
 INSTANTIATE_TEST_SUITE_P(PersistentAndEphemeral,
                          STDcpTest,
                          STParameterizedBucketTest::allConfigValues());

engines/ep/tests/module_tests/dcp_test.cc

@@ -849,13 +849,6 @@ class ConnectionTest : public DCPTest,
     void testConsumerNegotiatesIncludeDeletedUserXattrs(
             IncludeDeletedUserXattrs producerState);
 
-    /**
-     * @param producerState Are we simulating a negotiation against a Producer
-     *  that enables IncludeDeletedUserXattrs?
-     */
-    void testProducerNegotiatesIncludeDeletedUserXattrs(
-            IncludeDeletedUserXattrs producerState);
-
     /* vbucket associated with this connection */
     Vbid vbid;
 };
@@ -1781,47 +1774,6 @@ TEST_P(ConnectionTest, ConsumerNegotiatesDeletedUserXattrs_EnabledAtProducer) {
             IncludeDeletedUserXattrs::Yes);
 }
 
-void ConnectionTest::testProducerNegotiatesIncludeDeletedUserXattrs(
-        IncludeDeletedUserXattrs producerState) {
-    const void* cookie = create_mock_cookie();
-
-    uint32_t dcpOpenFlags;
-    ENGINE_ERROR_CODE expectedControlResp;
-    switch (producerState) {
-    case IncludeDeletedUserXattrs::Yes: {
-        dcpOpenFlags =
-                cb::mcbp::request::DcpOpenPayload::IncludeDeletedUserXattrs;
-        expectedControlResp = ENGINE_SUCCESS;
-        break;
-    }
-    case IncludeDeletedUserXattrs::No: {
-        dcpOpenFlags = 0;
-        expectedControlResp = ENGINE_EINVAL;
-        break;
-    }
-    }
-
-    const auto producer = std::make_shared<MockDcpProducer>(
-            *engine, cookie, "test_producer", dcpOpenFlags);
-    EXPECT_EQ(producerState, producer->public_getIncludeDeletedUserXattrs());
-    EXPECT_EQ(expectedControlResp,
-              producer->control(0, "include_deleted_user_xattrs", "true"));
-
-    destroy_mock_cookie(cookie);
-}
-
-TEST_P(ConnectionTest,
-       ProducerNegotiatesIncludeDeletedUserXattrs_DisabledAtProducer) {
-    testProducerNegotiatesIncludeDeletedUserXattrs(
-            IncludeDeletedUserXattrs::No);
-}
-
-TEST_P(ConnectionTest,
-       ProducerNegotiatesIncludeDeletedUserXattrs_EnabledAtProducer) {
-    testProducerNegotiatesIncludeDeletedUserXattrs(
-            IncludeDeletedUserXattrs::Yes);
-}
-
 TEST_P(ConnectionTest, AckCorrectPassiveStream) {
     ASSERT_EQ(ENGINE_SUCCESS, set_vb_state(vbid, vbucket_state_replica));