making has_liquid unit test more clear

Author: emawby

iOS_SDK/OneSignalSDK/UnitTests/InAppMessagingTests.m

@@ -215,8 +215,10 @@ -(void)testCorrectlyParsedTriggers {
 }
 
 - (void)testCorrectlyParsedHasLiquid {
-    XCTAssertFalse(testMessage.hasLiquid);
-    XCTAssertTrue(testMessageRedisplay.hasLiquid);
+    OSInAppMessage *hasLiquidMessage = [OSInAppMessageTestHelper testMessageWithLiquid];
+    XCTAssertTrue(hasLiquidMessage.hasLiquid);
+    OSInAppMessage *noLiquidMessage = [OSInAppMessageTestHelper testMessage];
+    XCTAssertFalse(noLiquidMessage.hasLiquid);
 }
 
 - (void)testCorrectlyParsedDisplayStats {

iOS_SDK/OneSignalSDK/UnitTests/OSInAppMessagingHelpers.h

@@ -56,6 +56,7 @@ NS_ASSUME_NONNULL_BEGIN
 + (OSInAppMessage *)testMessageWithTriggersJson:(NSArray<NSDictionary *> *)triggers;
 + (OSInAppMessage *)testMessageWithTriggersJson:(NSArray *)triggers redisplayLimit:(NSInteger)limit delay:(NSNumber *)delay;
 + (OSInAppMessage *)testMessage;
++ (OSInAppMessage *)testMessageWithLiquid;
 + (OSInAppMessage *)testMessageWithRedisplayLimit:(NSInteger)limit delay:(NSNumber *)delay;
 + (OSInAppMessage *)testMessagePreview;
 + (OSInAppMessage *)testMessageWithTriggers:(NSArray <NSArray<OSTrigger *> *> *)triggers;

iOS_SDK/OneSignalSDK/UnitTests/OSInAppMessagingHelpers.m

@@ -92,6 +92,24 @@ + (NSDictionary * _Nonnull)testMessageJson {
     };
 }
 
++ (NSDictionary * _Nonnull)testMessageJsonLiquid {
+    return @{
+        @"type" : @"centered_modal", // Prevents issues with the "os_viewed_message" count trigger that lets us prevent a message from being shown > than X times
+        @"id" : [NSString stringWithFormat:@"%@_%i", OS_TEST_MESSAGE_ID, ++messageIdIncrementer],
+        @"variants" : @{
+            @"ios" : @{
+                @"default" : OS_TEST_MESSAGE_VARIANT_ID,
+                @"en" : OS_TEST_ENGLISH_VARIANT_ID
+            },
+            @"all" : @{
+                @"default" : @"should_never_be_used_by_any_test"
+            }
+        },
+        @"triggers" : @[],
+        @"has_liquid" : @true,
+    };
+}
+
 + (NSDictionary * _Nonnull)testMessageJsonRedisplay {
     return @{
         @"type" : @"centered_modal", // Prevents issues with the "os_viewed_message" count trigger that lets us prevent a message from being shown > than X times
@@ -146,7 +164,6 @@ + (OSInAppMessage *)testMessageWithTriggersJson:(NSArray *)triggers {
 + (OSInAppMessage *)testMessageWithTriggersJson:(NSArray *)triggers redisplayLimit:(NSInteger)limit delay:(NSNumber *)delay {
     let messageJson = (NSMutableDictionary *)[self.testMessageJson mutableCopy];
 
-    messageJson[@"has_liquid"] = @"1";
     messageJson[@"triggers"] = triggers;
     messageJson[@"redisplay"] =
         @{
@@ -167,6 +184,14 @@ + (OSInAppMessage *)testMessage {
     return [OSInAppMessage instanceWithData:data];
 }
 
++ (OSInAppMessage *)testMessageWithLiquid {
+    let messageJson = self.testMessageJsonLiquid;
+    
+    let data = [NSJSONSerialization dataWithJSONObject:messageJson options:0 error:nil];
+
+    return [OSInAppMessage instanceWithData:data];
+}
+
 + (OSInAppMessage *)testMessageWithPastEndTime:(BOOL)pastEndTime {
     let messageJson = self.testMessageJson;