fix: test implementation of customMessageType

pubnub · Nov 20, 2024 · a868459 · a868459
1 parent 43dee13
commit a868459
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 15 deletions.
diff --git a/src/UnitTests/AcceptanceTests/Steps/FilesCustomMessageTypeSteps.cs b/src/UnitTests/AcceptanceTests/Steps/FilesCustomMessageTypeSteps.cs
@@ -129,8 +129,8 @@ public void GivenTheDemoKeyset()
         {
             Origin = acceptance_test_origin,
             Secure = false,
-            PublishKey = System.Environment.GetEnvironmentVariable("PN_PUB_KEY"),
-            SubscribeKey = System.Environment.GetEnvironmentVariable("PN_SUB_KEY")
+            PublishKey = System.Environment.GetEnvironmentVariable("PN_PUB_KEY")??"test",
+            SubscribeKey = System.Environment.GetEnvironmentVariable("PN_SUB_KEY")??"test""
         };
     }
 
@@ -143,7 +143,6 @@ public async Task WhenSendFileWithCustomMessageType(string customMessageType)
         fileResult = result.Result;
     }
 
-    //I receive a successful response
     [Then(@"I receive a successful response")]
     public void ThenIReceiveASuccessfulResponse()
     {

diff --git a/src/UnitTests/AcceptanceTests/Steps/HistoryCustomMessageTypeSteps.cs b/src/UnitTests/AcceptanceTests/Steps/HistoryCustomMessageTypeSteps.cs
@@ -129,8 +129,8 @@ public void GivenTheDemoKeysetWithEnabledStorage()
         {
             Origin = acceptance_test_origin,
             Secure = false,
-            PublishKey = System.Environment.GetEnvironmentVariable("PN_PUB_KEY"),
-            SubscribeKey = System.Environment.GetEnvironmentVariable("PN_SUB_KEY")
+            PublishKey = System.Environment.GetEnvironmentVariable("PN_PUB_KEY")??"test",
+            SubscribeKey = System.Environment.GetEnvironmentVariable("PN_SUB_KEY")??"test"
         };
     }
 
@@ -152,7 +152,6 @@ public async Task WhenIFetchMessageHistoryWithCustomMessageTypeForChannel(string
         pnStatus = historyResult.Status;
     }
 
-    // I fetch message history with 'include_custom_message_type' set to 'false' for 'some-channel' channel
     [When(@"I fetch message history with 'include_custom_message_type' set to '(.*)' for '(.*)' channel")]
     public async Task WhenIFetchMessageHistoryWithCustomMessageTypeForChannel(bool include,string channel)
     {
@@ -171,13 +170,16 @@ public async Task ThenIReceiveASuccessfulResponse()
     public void ThenHistoryResponseContainsMessageTypes(string valueOne, string valueTwo)
     {
         var channelMessages = historyResult.Result.Messages[channel];
-        if (currentContract == "fetchHistoryWithPubNubMessageTypes"){
             Assert.IsTrue(channelMessages.Where(m=> m.MessageType == int.Parse(valueOne)).ToList().Count >0);
             Assert.IsTrue(channelMessages.Where(m=> m.MessageType == int.Parse(valueTwo)).ToList().Count >0);
-        } else {
-            Assert.IsTrue(channelMessages.Where(m=> m.CustomMessageType == valueOne).ToList().Count >0);
-            Assert.IsTrue(channelMessages.Where(m=> m.CustomMessageType == valueTwo).ToList().Count >0);
-        }
+    }
+
+    [Then(@"history response contains messages with '(.*)' and '(.*)' types")]
+    public void ThenHistoryResponseContainsTypes(string valueOne, string valueTwo)
+    {
+        var channelMessages = historyResult.Result.Messages[channel];
+        Assert.IsTrue(channelMessages.Where(m=> m.CustomMessageType == valueOne).ToList().Count >0);
+        Assert.IsTrue(channelMessages.Where(m=> m.CustomMessageType == valueTwo).ToList().Count >0);
     }
 
     [Then(@"history response contains messages without customMessageType")]
@@ -186,4 +188,5 @@ public void ThenHistoryMessagesDoNotContainCustomMessageType()
         var channelMessages = historyResult.Result.Messages[channel];
         Assert.IsTrue(channelMessages.Where(m=> m.CustomMessageType != null).ToList().Count == 0);
     }
+
 }
diff --git a/src/UnitTests/AcceptanceTests/Steps/PublishCustomMessageTypeSteps.cs b/src/UnitTests/AcceptanceTests/Steps/PublishCustomMessageTypeSteps.cs
@@ -132,8 +132,8 @@ public void GivenTheDemoKeyset()
         {
             Origin = acceptance_test_origin,
             Secure = false,
-            PublishKey = System.Environment.GetEnvironmentVariable("PN_PUB_KEY"),
-            SubscribeKey = System.Environment.GetEnvironmentVariable("PN_SUB_KEY")
+            PublishKey = System.Environment.GetEnvironmentVariable("PN_PUB_KEY")??"test",
+            SubscribeKey = System.Environment.GetEnvironmentVariable("PN_SUB_KEY")??"test"
         };
     }
 

diff --git a/src/UnitTests/AcceptanceTests/Steps/SubscribeCustomMessageTypeSteps.cs b/src/UnitTests/AcceptanceTests/Steps/SubscribeCustomMessageTypeSteps.cs
@@ -126,8 +126,8 @@ public void WhenISubscribe(string channel)
         {
             Origin = acceptance_test_origin,
             Secure = false,
-            PublishKey = System.Environment.GetEnvironmentVariable("PN_PUB_KEY"),
-            SubscribeKey = System.Environment.GetEnvironmentVariable("PN_SUB_KEY")
+            PublishKey = System.Environment.GetEnvironmentVariable("PN_PUB_KEY")??"test",
+            SubscribeKey = System.Environment.GetEnvironmentVariable("PN_SUB_KEY")??"test"
         };
         pn = new Pubnub(config);