Fine tuning some tests

Author: theSlyest

Parse.Tests/LiveQueryMessageBuilderTests.cs

@@ -1,8 +1,11 @@
 using System;
 using System.Collections.Generic;
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Parse.Abstractions.Platform.Objects;
+using Moq;
+using Parse.Abstractions.Infrastructure;
+using Parse.Abstractions.Platform.Users;
 using Parse.Infrastructure;
 using Parse.Platform.LiveQueries;
 
@@ -11,12 +14,26 @@ namespace Parse.Tests;
 [TestClass]
 public class LiveQueryMessageBuilderTests
 {
-    private ParseClient Client { get; } = new ParseClient(
-        new ServerConnectionData { Test = true },
-        new LiveQueryServerConnectionData { ApplicationID = "TestApp", Key = "t3stK3y", Test = true });
+    private readonly Mock<IParseCurrentUserController> _mockCurrentUserController;
+    private readonly MutableServiceHub _hub;
+
+    private ParseClient Client { get; }
 
     public LiveQueryMessageBuilderTests()
     {
+        _mockCurrentUserController = new Mock<IParseCurrentUserController>();
+
+        _mockCurrentUserController
+            .Setup(controller => controller.GetCurrentSessionTokenAsync(It.IsAny<IServiceHub>(), It.IsAny<CancellationToken>()))
+            .ReturnsAsync("s3ss!0nT0k3n");
+
+        _hub = new MutableServiceHub { CurrentUserController = _mockCurrentUserController.Object };
+
+        Client = new ParseClient(
+            new ServerConnectionData { Test = true },
+            new LiveQueryServerConnectionData { ApplicationID = "TestApp", Key = "t3stK3y", Test = true },
+            _hub);
+
         Client.Publicize();
     }
 
@@ -38,10 +55,12 @@ public async Task TestBuildConnectMessage()
         Assert.IsTrue(message.ContainsKey("op"));
         Assert.IsTrue(message.ContainsKey("applicationId"));
         Assert.IsTrue(message.ContainsKey("windowsKey"));
-        Assert.HasCount(3, message);
+        Assert.IsTrue(message.ContainsKey("sessionToken"));
+        Assert.HasCount(4, message);
         Assert.AreEqual("connect", message["op"]);
         Assert.AreEqual(Client.Services.LiveQueryServerConnectionData.ApplicationID, message["applicationId"]);
         Assert.AreEqual(Client.Services.LiveQueryServerConnectionData.Key, message["windowsKey"]);
+        Assert.AreEqual(await Client.Services.GetCurrentSessionToken(), message["sessionToken"]);
     }
 
     [TestMethod]
@@ -75,7 +94,7 @@ public async Task TestBuildSubscribeMessage()
         IDictionary<string, object> message = await builder.BuildSubscribeMessage<ParseObject>(requestId, liveQuery);
 
         Assert.IsNotNull(message);
-        Assert.HasCount(3, message);
+        Assert.HasCount(4, message);
 
         Assert.IsTrue(message.ContainsKey("op"));
         Assert.AreEqual("subscribe", message["op"]);
@@ -126,7 +145,7 @@ public async Task TestBuildUpdateSubscriptionMessage()
         IDictionary<string, object> message = await builder.BuildUpdateSubscriptionMessage<ParseObject>(requestId, liveQuery);
 
         Assert.IsNotNull(message);
-        Assert.HasCount(3, message);
+        Assert.HasCount(4, message);
 
         Assert.IsTrue(message.ContainsKey("op"));
         Assert.AreEqual("update", message["op"]);

Parse.Tests/LiveQueryMessageParserTests.cs

@@ -86,6 +86,7 @@ public void TestGetObjectState()
 
         Assert.ThrowsExactly<ArgumentNullException>(() => parser.GetObjectState(null));
         Assert.ThrowsExactly<ArgumentException>(() => parser.GetObjectState(new Dictionary<string, object> { { "wrongKey", objData } }));
+        Assert.ThrowsExactly<ArgumentException>(() => parser.GetObjectState(new Dictionary<string, object> { { "object", null } }));
         Assert.ThrowsExactly<ArgumentException>(() => parser.GetObjectState(new Dictionary<string, object> { { "object", "notADictionary" } }));
     }
 
@@ -116,6 +117,7 @@ public void TestGetOriginalState()
 
         Assert.ThrowsExactly<ArgumentNullException>(() => parser.GetOriginalState(null));
         Assert.ThrowsExactly<ArgumentException>(() => parser.GetOriginalState(new Dictionary<string, object> { { "wrongKey", objData } }));
+        Assert.ThrowsExactly<ArgumentException>(() => parser.GetOriginalState(new Dictionary<string, object> { { "original", null } }));
         Assert.ThrowsExactly<ArgumentException>(() => parser.GetOriginalState(new Dictionary<string, object> { { "original", "notADictionary" } }));
     }
 
@@ -134,14 +136,18 @@ public void TestGetError()
         };
 
         (int code, string error, bool shouldReconnect) = parser.GetError(message);
+        Assert.HasCount(3, message);
         Assert.AreEqual(errorCode, code);
         Assert.AreEqual(errorMessage, error);
         Assert.AreEqual(reconnect, shouldReconnect);
 
         Assert.ThrowsExactly<ArgumentNullException>(() => parser.GetError(null));
         Assert.ThrowsExactly<ArgumentException>(() => parser.GetError(new Dictionary<string, object> { { "wrongField", 123 } }));
+        Assert.ThrowsExactly<ArgumentException>(() => parser.GetError(new Dictionary<string, object> { { "error", errorMessage }, { "reconnect", reconnect } }));
         Assert.ThrowsExactly<ArgumentException>(() => parser.GetError(new Dictionary<string, object> { { "code", "notALong" }, { "error", errorMessage }, { "reconnect", reconnect } }));
+        Assert.ThrowsExactly<ArgumentException>(() => parser.GetError(new Dictionary<string, object> { { "code", (long) errorCode }, { "reconnect", reconnect } }));
         Assert.ThrowsExactly<ArgumentException>(() => parser.GetError(new Dictionary<string, object> { { "code", (long) errorCode }, { "error", 12345 }, { "reconnect", reconnect } }));
+        Assert.ThrowsExactly<ArgumentException>(() => parser.GetError(new Dictionary<string, object> { { "code", (long) errorCode }, { "error", errorMessage } }));
         Assert.ThrowsExactly<ArgumentException>(() => parser.GetError(new Dictionary<string, object> { { "code", (long) errorCode }, { "error", errorMessage }, { "reconnect", "notABoolean" } }));
     }
 }

Parse/Platform/LiveQueries/ParseLiveQueryMessageParser.cs

@@ -40,9 +40,6 @@ public int GetRequestId(IDictionary<string, object> message)
 
     private IDictionary<string, object> GetDictionary(IDictionary<string, object> message, string key)
     {
-        if (message is null)
-            throw new ArgumentNullException(nameof(message));
-
         if (!(message.TryGetValue(key, out object obj) && obj is IDictionary<string, object> dict))
             throw new ArgumentException(@"Message does not contain a valid %{key}.", nameof(message));
 
@@ -54,9 +51,8 @@ public IObjectState GetObjectState(IDictionary<string, object> message)
         if (message is null)
             throw new ArgumentNullException(nameof(message));
 
-        IDictionary<string, object> current = GetDictionary(message, "object");
-        if (current is null)
-            throw new ArgumentException("Message does not contain a valid object state.", nameof(message));
+        IDictionary<string, object> current = GetDictionary(message, "object")
+            ?? throw new ArgumentException("Message does not contain a valid object state.", nameof(message));
 
         return ParseObjectCoder.Instance.Decode(current, Decoder, ParseClient.Instance.Services);
     }
@@ -66,9 +62,8 @@ public IObjectState GetOriginalState(IDictionary<string, object> message)
         if (message is null)
             throw new ArgumentNullException(nameof(message));
 
-        IDictionary<string, object> original = GetDictionary(message, "original");
-        if (original is null)
-            throw new ArgumentException("Message does not contain a valid original object state.", nameof(message));
+        IDictionary<string, object> original = GetDictionary(message, "original")
+            ?? throw new ArgumentException("Message does not contain a valid original object state.", nameof(message));
 
         return ParseObjectCoder.Instance.Decode(original, Decoder, ParseClient.Instance.Services);
     }

Parse/Platform/LiveQueries/ParseLiveQuerySubscription.cs

@@ -16,7 +16,7 @@ public class ParseLiveQuerySubscription<T> : IParseLiveQuerySubscription where T
     string ClassName { get; }
     IServiceHub Services { get; }
 
-    private int RequestId { get; set; }
+    private readonly int RequestId;
 
     /// <summary>
     /// Represents the Create event for a live query subscription.