From fdadb123a62025597e6b29c9ccd6a432884e8535 Mon Sep 17 00:00:00 2001
From: Yury-Fridlyand <yury.fridlyand@improving.com>
Date: Wed, 2 Oct 2024 12:18:10 -0700
Subject: [PATCH]

---
 .../glide/managers/ConnectionManagerTest.java |  4 +-
 .../src/test/java/glide/PubSubTests.java      | 39 +++++++++----------
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/java/client/src/test/java/glide/managers/ConnectionManagerTest.java b/java/client/src/test/java/glide/managers/ConnectionManagerTest.java
index 5920ff0fde..cb503c1fdd 100644
--- a/java/client/src/test/java/glide/managers/ConnectionManagerTest.java
+++ b/java/client/src/test/java/glide/managers/ConnectionManagerTest.java
@@ -144,7 +144,7 @@ public void connection_request_protobuf_generation_with_all_fields_set() {
                                         .build())
                         .databaseId(DATABASE_ID)
                         .clientName(CLIENT_NAME)
-                        .protocol(ProtocolVersion.RESP2)
+                        .protocol(ProtocolVersion.RESP3)
                         .subscriptionConfiguration(
                                 StandaloneSubscriptionConfiguration.builder()
                                         .subscription(EXACT, gs("channel_1"))
@@ -178,7 +178,7 @@ public void connection_request_protobuf_generation_with_all_fields_set() {
                                         .build())
                         .setDatabaseId(DATABASE_ID)
                         .setClientName(CLIENT_NAME)
-                        .setProtocol(ConnectionRequestOuterClass.ProtocolVersion.RESP2)
+                        .setProtocol(ConnectionRequestOuterClass.ProtocolVersion.RESP3)
                         .setPubsubSubscriptions(
                                 PubSubSubscriptions.newBuilder()
                                         .putAllChannelsOrPatternsByType(
diff --git a/java/integTest/src/test/java/glide/PubSubTests.java b/java/integTest/src/test/java/glide/PubSubTests.java
index 62277691c0..bb6b4cebf0 100644
--- a/java/integTest/src/test/java/glide/PubSubTests.java
+++ b/java/integTest/src/test/java/glide/PubSubTests.java
@@ -285,26 +285,25 @@ private void skipTestsOnMac() {
     @ParameterizedTest(name = "standalone = {0}")
     @ValueSource(booleans = {true, false})
     public void config_error_on_resp2(boolean standalone) {
-        final GlideString channel = gs(UUID.randomUUID().toString());
-
-        Map<? extends ChannelMode, Set<GlideString>> subscriptions =
-                standalone
-                        ? Map.of(PubSubChannelMode.EXACT, Set.of(channel))
-                        : Map.of(PubSubClusterChannelMode.EXACT, Set.of(channel));
-
-        var exception =
-                assertThrows(
-                        ConfigurationError.class,
-                        () ->
-                                GlideClient.createClient(
-                                        commonClientConfig()
-                                                .subscriptionConfiguration(
-                                                        StandaloneSubscriptionConfiguration
-                                                                .builder() /*.subscriptions(subscriptions)*/
-                                                                .build())
-                                                .protocol(ProtocolVersion.RESP2)
-                                                .build()));
-        assertTrue(exception.getMessage().contains("PubSub subscriptions require RESP3 protocol"));
+        if (standalone) {
+            var config =
+                    commonClientConfig()
+                            .subscriptionConfiguration(StandaloneSubscriptionConfiguration.builder().build())
+                            .protocol(ProtocolVersion.RESP2)
+                            .build();
+            var exception =
+                    assertThrows(ConfigurationError.class, () -> GlideClient.createClient(config));
+            assertTrue(exception.getMessage().contains("PubSub subscriptions require RESP3 protocol"));
+        } else {
+            var config =
+                    commonClusterClientConfig()
+                            .subscriptionConfiguration(ClusterSubscriptionConfiguration.builder().build())
+                            .protocol(ProtocolVersion.RESP2)
+                            .build();
+            var exception =
+                    assertThrows(ConfigurationError.class, () -> GlideClusterClient.createClient(config));
+            assertTrue(exception.getMessage().contains("PubSub subscriptions require RESP3 protocol"));
+        }
     }
 
     /** Similar to `test_pubsub_exact_happy_path` in python client tests. */