DescribeConsumer test

6 files changed, 39 insertions, 21 deletions

diff --git a/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/basic_usage_ut.cpp b/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/basic_usage_ut.cpp
index 33f33b1781d..9b3337dd1da 100644
--- a/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/basic_usage_ut.cpp
+++ b/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/basic_usage_ut.cpp
@@ -187,7 +187,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
         writeSession->Close();
 
         auto readSettings = TReadSessionSettings()
-            .ConsumerName("shared/user")
+            .ConsumerName(setup->GetTestConsumer())
             .AppendTopics(setup->GetTestTopic());
         auto readSession = client.CreateReadSession(readSettings);
 
diff --git a/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/compression_ut.cpp b/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/compression_ut.cpp
index 5ebadf19baf..506a126fc77 100644
--- a/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/compression_ut.cpp
+++ b/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/compression_ut.cpp
@@ -42,7 +42,7 @@ Y_UNIT_TEST_SUITE(Compression) {
         props->add_supported_codecs(Ydb::PersQueue::V1::CODEC_GZIP);
         props->add_supported_codecs(Ydb::PersQueue::V1::CODEC_ZSTD);
         auto rr = props->add_read_rules();
-        rr->set_consumer_name(setup.GetTestClient());
+        rr->set_consumer_name(setup.GetTestConsumer());
         rr->set_supported_format(Ydb::PersQueue::V1::TopicSettings::Format(1));
         rr->add_supported_codecs(Ydb::PersQueue::V1::CODEC_RAW);
         rr->add_supported_codecs(Ydb::PersQueue::V1::CODEC_GZIP);
diff --git a/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/ut_utils/sdk_test_setup.h b/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/ut_utils/sdk_test_setup.h
index 17e172d944b..e64aeee9525 100644
--- a/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/ut_utils/sdk_test_setup.h
+++ b/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/ut_utils/sdk_test_setup.h
@@ -86,8 +86,8 @@ public:
         return "test-topic";
     }
 
-    static TString GetTestClient() {
-        return "test-reader";
+    static TString GetTestConsumer() {
+        return "shared/user";
     }
 
     static TString GetTestMessageGroupId() {
diff --git a/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/ut_utils/ut_utils.h b/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/ut_utils/ut_utils.h
index 4de2476324d..32fba770536 100644
--- a/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/ut_utils/ut_utils.h
+++ b/ydb/public/sdk/cpp/client/ydb_persqueue_core/ut/ut_utils/ut_utils.h
@@ -56,7 +56,7 @@ public:
     NYdb::NPersQueue::TReadSessionSettings GetReadSessionSettings() {
         NYdb::NPersQueue::TReadSessionSettings settings;
         settings
-                .ConsumerName(GetTestClient())
+                .ConsumerName(GetTestConsumer())
                 .AppendTopics(GetTestTopic());
         return settings;
     }
diff --git a/ydb/public/sdk/cpp/client/ydb_topic/ut/basic_usage_ut.cpp b/ydb/public/sdk/cpp/client/ydb_topic/ut/basic_usage_ut.cpp
index 02fa68874ad..c5cd385d070 100644
--- a/ydb/public/sdk/cpp/client/ydb_topic/ut/basic_usage_ut.cpp
+++ b/ydb/public/sdk/cpp/client/ydb_topic/ut/basic_usage_ut.cpp
@@ -43,7 +43,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
         }
 
         auto readSettings = TReadSessionSettings()
-            .ConsumerName("shared/user")
+            .ConsumerName(setup->GetTestConsumer())
             .AppendTopics(setup->GetTestTopic());
         auto readSession = client.CreateReadSession(readSettings);
 
@@ -77,7 +77,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
         writeSession->Close();
 
         auto readSettings = TReadSessionSettings()
-            .ConsumerName("shared/user")
+            .ConsumerName(setup->GetTestConsumer())
             .AppendTopics(setup->GetTestTopic());
         auto readSession = client.CreateReadSession(readSettings);
 
@@ -141,7 +141,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
         // Create read session.
         NYdb::NTopic::TReadSessionSettings readSettings;
         readSettings
-            .ConsumerName("shared/user")
+            .ConsumerName(setup->GetTestConsumer())
             .MaxMemoryUsageBytes(1_MB)
             .AppendTopics(setup->GetTestTopic());
 
@@ -173,11 +173,11 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
         ReadSession->Close(TDuration::MilliSeconds(10));
         AtomicSet(check, 0);
 
-        auto status = topicClient.CommitOffset(setup->GetTestTopic(), 0, "shared/user", 50);
+        auto status = topicClient.CommitOffset(setup->GetTestTopic(), 0, setup->GetTestConsumer(), 50);
         UNIT_ASSERT(status.GetValueSync().IsSuccess());
 
         auto describeConsumerSettings = TDescribeConsumerSettings().IncludeStats(true);
-        auto result = topicClient.DescribeConsumer("/Root/PQ/rt3.dc1--" + setup->GetTestTopic(), "shared/user", describeConsumerSettings).GetValueSync();
+        auto result = topicClient.DescribeConsumer("/Root/PQ/rt3.dc1--" + setup->GetTestTopic(), setup->GetTestConsumer(), describeConsumerSettings).GetValueSync();
         UNIT_ASSERT(result.IsSuccess());
 
         auto description = result.GetConsumerDescription();
@@ -218,7 +218,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
         // Create read session.
         NYdb::NTopic::TReadSessionSettings readSettings;
         readSettings
-            .ConsumerName(setup->GetTestClient())
+            .ConsumerName(setup->GetTestConsumer())
             .MaxMemoryUsageBytes(1_MB)
             .AppendTopics(setup->GetTestTopic());
 
@@ -320,7 +320,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
         // Create read session.
         NYdb::NTopic::TReadSessionSettings readSettings;
         readSettings
-            .ConsumerName("shared/user")
+            .ConsumerName(setup->GetTestConsumer())
             .MaxMemoryUsageBytes(1_MB)
             .AppendTopics(setup->GetTestTopic())
             .DecompressionExecutor(stepByStepExecutor);
@@ -434,7 +434,7 @@ Y_UNIT_TEST_SUITE(BasicUsage) {
 
         // Create read session.
         auto readSettings = TReadSessionSettings()
-            .ConsumerName("shared/user")
+            .ConsumerName(setup->GetTestConsumer())
             .MaxMemoryUsageBytes(1_MB)
             .AppendTopics(setup->GetTestTopic());
 
diff --git a/ydb/public/sdk/cpp/client/ydb_topic/ut/describe_topic_ut.cpp b/ydb/public/sdk/cpp/client/ydb_topic/ut/describe_topic_ut.cpp
index 816e1778614..7add9826037 100644
--- a/ydb/public/sdk/cpp/client/ydb_topic/ut/describe_topic_ut.cpp
+++ b/ydb/public/sdk/cpp/client/ydb_topic/ut/describe_topic_ut.cpp
@@ -19,17 +19,35 @@ namespace NYdb::NTopic::NTests {
             auto setup = std::make_shared<NPersQueue::NTests::TPersQueueYdbSdkTestSetup>(TEST_CASE_NAME);
             TTopicClient client(setup->GetDriver());
 
-            auto result = client.DescribeTopic(setup->GetTestTopicPath()).GetValueSync();
-            UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), NYdb::EStatus::SUCCESS, result.GetIssues().ToString());
+            // DescribeTopic
+            {
+                auto result = client.DescribeTopic(setup->GetTestTopicPath()).GetValueSync();
+                UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), NYdb::EStatus::SUCCESS, result.GetIssues().ToString());
+
+                const auto& description = result.GetTopicDescription();
+
+                auto& partitions = description.GetPartitions();
+                UNIT_ASSERT_VALUES_EQUAL(partitions.size(), 1);
+
+                auto& partition = partitions[0];
+                UNIT_ASSERT(partition.GetActive());
+                UNIT_ASSERT_VALUES_EQUAL(partition.GetPartitionId(), 0);
+            }
 
-            const auto& description = result.GetTopicDescription();
+            // DescribeConsumer
+            {
+                auto result = client.DescribeConsumer(setup->GetTestTopicPath(), setup->GetTestConsumer()).GetValueSync();
+                UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), NYdb::EStatus::SUCCESS, result.GetIssues().ToString());
 
-            auto& partitions = description.GetPartitions();
-            UNIT_ASSERT_VALUES_EQUAL(partitions.size(), 1);
+                auto& description = result.GetConsumerDescription();
+
+                auto& partitions = description.GetPartitions();
+                UNIT_ASSERT_VALUES_EQUAL(partitions.size(), 1);
 
-            auto& partition = partitions[0];
-            UNIT_ASSERT(partition.GetActive());
-            UNIT_ASSERT_VALUES_EQUAL(partition.GetPartitionId(), 0);
+                auto& partition = partitions[0];
+                UNIT_ASSERT(partition.GetActive());
+                UNIT_ASSERT_VALUES_EQUAL(partition.GetPartitionId(), 0);
+            }
         }
 
         Y_UNIT_TEST(Statistics) {