Skip to content

Commit 9385d46

Browse files
committed
[ECO-4567] Fixed unity editmode and playmode tests
1 parent e0b038c commit 9385d46

File tree

6 files changed

+11
-10
lines changed

6 files changed

+11
-10
lines changed

src/IO.Ably.Shared/Transport/MsWebSocketTransport.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ private void HandleMessageReceived(RealtimeTransportData data)
171171
{
172172
// Always available - no conditional compilation
173173
var message = MsgPackHelper.DecodeMsgPackObject(data.Data);
174-
Logger.Debug("Websocket data message received. Raw: " + message);
174+
Logger.Debug("Websocket data message received. MsgPack Decoded: " + message);
175175
}
176176
catch (Exception)
177177
{

unity/Assets/Tests/AblySandbox/AblySandboxFixture.cs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ public class AblySandboxFixture
1414

1515
private static Dictionary<string, TestEnvironmentSettings> _settings = new Dictionary<string, TestEnvironmentSettings>();
1616

17+
private static Protocol sandboxJsonProtocol = Protocol.Json;
18+
1719
public async Task<TestEnvironmentSettings> GetSettings(string environment = null)
1820
{
1921
environment = environment ?? "sandbox";
@@ -47,11 +49,11 @@ private static async Task<TestEnvironmentSettings> Initialise(string environment
4749
CipherMode.CBC,
4850
((string)cipher["iv"]).FromBase64());
4951

50-
var request = new AblyRequest("/apps", HttpMethod.Post);
52+
var request = new AblyRequest("/apps", HttpMethod.Post, sandboxJsonProtocol);
5153
request.Headers.Add("Accept", "application/json");
5254
request.Headers.Add("Content-Type", "application/json");
5355
request.RequestBody = testAppSpec["post_apps"].ToString().GetBytes();
54-
request.Protocol = Protocol.Json;
56+
request.Protocol = sandboxJsonProtocol;
5557

5658
AblyHttpClient client = settings.GetHttpClient(environment);
5759
var response = await RetryExecute(() => client.Execute(request));
@@ -114,8 +116,8 @@ private static async Task SetupSampleStats(TestEnvironmentSettings settings)
114116
json = json.Replace("[[Interval3]]", interval3.ToString("yyyy-MM-dd:HH:mm"));
115117

116118
AblyHttpClient client = settings.GetHttpClient();
117-
var request = new AblyRequest("/stats", HttpMethod.Post);
118-
request.Protocol = Protocol.Json;
119+
var request = new AblyRequest("/stats", HttpMethod.Post, sandboxJsonProtocol);
120+
request.Protocol = sandboxJsonProtocol;
119121
request.Headers.Add("Accept", "application/json");
120122
request.Headers.Add("Content-Type", "application/json");
121123

unity/Assets/Tests/EditMode/AblyRealtimeSpecs.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ public IEnumerator TestHttpUnityAgentHeader([ValueSource(nameof(_protocols))] Pr
217217
var handler = new FakeHttpMessageHandler(response);
218218
var client = new AblyHttpClient(new AblyHttpOptions(), handler);
219219

220-
await client.Execute(new AblyRequest("/test", HttpMethod.Get));
220+
await client.Execute(new AblyRequest("/test", HttpMethod.Get, protocol));
221221
string[] values = handler.LastRequest.Headers.GetValues("Ably-Agent").ToArray();
222222
Assert.AreEqual(1, values.Length);
223223
string[] agentValues = values[0].Split(' ');

unity/Assets/Tests/EditMode/AuthSpecs.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
using IO.Ably;
1010
using IO.Ably.Realtime;
1111
using NUnit.Framework;
12-
using UnityEngine;
1312
using UnityEngine.TestTools;
1413

1514
namespace Assets.Tests.EditMode
@@ -374,7 +373,7 @@ public IEnumerator RealTimeWithAuthUrl_WhenTokenExpired_And_WithServerTime_And_N
374373
};
375374
await Task.Delay(2000);
376375
// This makes sure we get server time
377-
((AblyAuth) mainClient.Auth).SetServerTime();
376+
await ((AblyAuth) mainClient.Auth).SetServerTime();
378377

379378
var ex = await E7Assert.ThrowsAsync<AblyException>(mainClient.StatsAsync());
380379
Assert.AreSame(ErrorInfo.NonRenewableToken, ex.ErrorInfo);

unity/Assets/Tests/PlayMode/AblyRealtimeSpecs.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ public IEnumerator TestHttpUnityAgentHeader([ValueSource(nameof(_protocols))] Pr
217217
var handler = new FakeHttpMessageHandler(response);
218218
var client = new AblyHttpClient(new AblyHttpOptions(), handler);
219219

220-
await client.Execute(new AblyRequest("/test", HttpMethod.Get));
220+
await client.Execute(new AblyRequest("/test", HttpMethod.Get, protocol));
221221
string[] values = handler.LastRequest.Headers.GetValues("Ably-Agent").ToArray();
222222
Assert.AreEqual(1, values.Length);
223223
string[] agentValues = values[0].Split(' ');

unity/Assets/Tests/PlayMode/AuthSpecs.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ public IEnumerator RealTimeWithAuthUrl_WhenTokenExpired_And_WithServerTime_And_N
375375
};
376376
await Task.Delay(2000);
377377
// This makes sure we get server time
378-
((AblyAuth) mainClient.Auth).SetServerTime();
378+
await ((AblyAuth) mainClient.Auth).SetServerTime();
379379

380380
var ex = await E7Assert.ThrowsAsync<AblyException>(mainClient.StatsAsync());
381381
Assert.AreSame(ErrorInfo.NonRenewableToken, ex.ErrorInfo);

0 commit comments

Comments
 (0)