Skip to content

Commit 49978fa

Browse files
ttypicttypic
committed
chore: fix access to ably-commons data
1 parent 93d9b31 commit 49978fa

4 files changed

Lines changed: 70 additions & 42 deletions

File tree

‎lib/src/test/java/io/ably/lib/test/realtime/RealtimeMessageTest.java‎

Lines changed: 8 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import static org.junit.Assert.assertTrue;
99
import static org.junit.Assert.fail;
1010

11-
import java.io.IOException;
1211
import java.util.ArrayList;
1312
import java.util.HashMap;
1413
import java.util.List;
@@ -20,6 +19,7 @@
2019
import com.google.gson.JsonElement;
2120
import com.google.gson.JsonObject;
2221
import com.google.gson.JsonPrimitive;
22+
import io.ably.lib.test.util.AblyCommonsReader;
2323
import io.ably.lib.types.ChannelOptions;
2424
import io.ably.lib.types.MessageAction;
2525
import io.ably.lib.types.MessageExtras;
@@ -47,7 +47,6 @@
4747
import io.ably.lib.test.common.Helpers.MessageWaiter;
4848
import io.ably.lib.test.common.Helpers;
4949
import io.ably.lib.test.common.ParameterizedTest;
50-
import io.ably.lib.test.common.Setup;
5150
import io.ably.lib.transport.ConnectionManager;
5251
import io.ably.lib.types.AblyException;
5352
import io.ably.lib.types.Callback;
@@ -59,7 +58,7 @@
5958

6059
public class RealtimeMessageTest extends ParameterizedTest {
6160

62-
private static final String testMessagesEncodingFile = "ably-common/test-resources/messages-encoding.json";
61+
private static final String testMessagesEncodingFile = "test-resources/messages-encoding.json";
6362
private static Gson gson = new Gson();
6463

6564
@Rule
@@ -532,13 +531,7 @@ public void ensure_disconnect_with_error_does_not_move_to_failed() {
532531
@Test
533532
public void messages_encoding_fixtures() {
534533
MessagesEncodingData fixtures;
535-
try {
536-
fixtures = (MessagesEncodingData) Setup.loadJson(testMessagesEncodingFile, MessagesEncodingData.class);
537-
} catch(IOException e) {
538-
fail();
539-
return;
540-
}
541-
534+
fixtures = AblyCommonsReader.read(testMessagesEncodingFile, MessagesEncodingData.class);
542535
AblyRealtime ably = null;
543536
try {
544537
ClientOptions opts = createOptions(testVars.keys[0].keyStr);
@@ -597,12 +590,7 @@ public MessagesEncodingDataItem[] handleResponse(HttpCore.Response response, Err
597590
@Test
598591
public void messages_msgpack_and_json_encoding_is_compatible() {
599592
MessagesEncodingData fixtures;
600-
try {
601-
fixtures = (MessagesEncodingData) Setup.loadJson(testMessagesEncodingFile, MessagesEncodingData.class);
602-
} catch(IOException e) {
603-
fail();
604-
return;
605-
}
593+
fixtures = AblyCommonsReader.read(testMessagesEncodingFile, MessagesEncodingData.class);
606594

607595
// Publish each data type through raw JSON POST and retrieve through MsgPack and JSON.
608596

@@ -884,15 +872,10 @@ public void message_from_encoded_json_object() throws AblyException {
884872
public void messages_from_encoded_json_array() throws AblyException {
885873
JsonArray fixtures = null;
886874
MessagesData testMessages = null;
887-
try {
888-
testMessages = (MessagesData) Setup.loadJson(testMessagesEncodingFile, MessagesData.class);
889-
JsonObject jsonObject = (JsonObject) Setup.loadJson(testMessagesEncodingFile, JsonObject.class);
890-
//We use this as-is for decoding purposes.
891-
fixtures = jsonObject.getAsJsonArray("messages");
892-
} catch(IOException e) {
893-
fail();
894-
return;
895-
}
875+
testMessages = AblyCommonsReader.read(testMessagesEncodingFile, MessagesData.class);
876+
JsonObject jsonObject = AblyCommonsReader.read(testMessagesEncodingFile, JsonObject.class);
877+
//We use this as-is for decoding purposes.
878+
fixtures = jsonObject.getAsJsonArray("messages");
896879

897880
Message[] decodedMessages = Message.fromEncodedArray(fixtures, null);
898881
for(int index = 0; index < decodedMessages.length; index++) {

‎lib/src/test/java/io/ably/lib/test/realtime/RealtimePresenceTest.java‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import static org.junit.Assert.assertTrue;
1818
import static org.junit.Assert.fail;
1919

20-
import java.io.IOException;
2120
import java.util.ArrayList;
2221
import java.util.Arrays;
2322
import java.util.Collections;
@@ -41,7 +40,7 @@
4140
import io.ably.lib.realtime.ConnectionState;
4241
import io.ably.lib.realtime.ConnectionStateListener;
4342
import io.ably.lib.realtime.Presence;
44-
import io.ably.lib.test.common.Setup;
43+
import io.ably.lib.test.util.AblyCommonsReader;
4544
import io.ably.lib.types.AblyException;
4645
import io.ably.lib.types.Capability;
4746
import io.ably.lib.types.ChannelOptions;
@@ -74,7 +73,7 @@
7473

7574
public class RealtimePresenceTest extends ParameterizedTest {
7675

77-
private static final String testMessagesEncodingFile = "ably-common/test-resources/presence-messages-encoding.json";
76+
private static final String testMessagesEncodingFile = "test-resources/presence-messages-encoding.json";
7877
private static final String testClientId1 = "testClientId1";
7978
private static final String testClientId2 = "testClientId2";
8079
private Auth.TokenDetails token1;
@@ -3636,15 +3635,11 @@ public void message_from_encoded_json_object() throws AblyException {
36363635
public void messages_from_encoded_json_array() throws AblyException {
36373636
JsonArray fixtures = null;
36383637
MessagesData testMessages = null;
3639-
try {
3640-
testMessages = (MessagesData) Setup.loadJson(testMessagesEncodingFile, MessagesData.class);
3641-
JsonObject jsonObject = (JsonObject) Setup.loadJson(testMessagesEncodingFile, JsonObject.class);
3642-
//We use this as-is for decoding purposes.
3643-
fixtures = jsonObject.getAsJsonArray("messages");
3644-
} catch(IOException e) {
3645-
fail();
3646-
return;
3647-
}
3638+
testMessages = AblyCommonsReader.read(testMessagesEncodingFile, MessagesData.class);
3639+
JsonObject jsonObject = AblyCommonsReader.readAsJsonObject(testMessagesEncodingFile);
3640+
//We use this as-is for decoding purposes.
3641+
fixtures = jsonObject.getAsJsonArray("messages");
3642+
36483643
PresenceMessage[] decodedMessages = PresenceMessage.fromEncodedArray(fixtures, null);
36493644
for(int index = 0; index < decodedMessages.length; index++) {
36503645
PresenceMessage testInputMsg = testMessages.messages[index];

‎lib/src/test/java/io/ably/lib/test/util/AblyCommonsReader.java‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
package io.ably.lib.test.util;
2+
3+
import com.google.gson.Gson;
4+
import com.google.gson.JsonObject;
5+
import com.google.gson.JsonParser;
6+
7+
import java.io.BufferedReader;
8+
import java.io.InputStreamReader;
9+
import java.net.HttpURLConnection;
10+
import java.net.URL;
11+
12+
public class AblyCommonsReader {
13+
private static final String BASE_URL = "https://raw.githubusercontent.com/ably/ably-common/refs/heads/main/";
14+
private static Gson gson = new Gson();
15+
16+
public static String readAsString(String path) throws Exception {
17+
URL url = new URL(BASE_URL + path);
18+
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
19+
conn.setRequestMethod("GET");
20+
21+
if (conn.getResponseCode() != 200) {
22+
throw new RuntimeException("Failed : HTTP error code : " + conn.getResponseCode());
23+
}
24+
25+
BufferedReader br = new BufferedReader(new InputStreamReader((conn.getInputStream())));
26+
StringBuilder sb = new StringBuilder();
27+
String output;
28+
while ((output = br.readLine()) != null) {
29+
sb.append(output);
30+
}
31+
32+
conn.disconnect();
33+
34+
return sb.toString();
35+
}
36+
37+
public static JsonObject readAsJsonObject(String path) {
38+
try {
39+
return JsonParser.parseString(readAsString(path)).getAsJsonObject();
40+
} catch (Exception e) {
41+
throw new RuntimeException(e);
42+
}
43+
}
44+
45+
public static <T> T read(String path, Class<T> classOfT) {
46+
try {
47+
return gson.fromJson(readAsString(path), classOfT);
48+
} catch (Exception e) {
49+
throw new RuntimeException(e);
50+
}
51+
}
52+
}

‎lib/src/test/java/io/ably/lib/util/CryptoMessageTest.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,16 @@
99
import java.io.IOException;
1010
import java.security.NoSuchAlgorithmException;
1111

12+
import io.ably.lib.test.util.AblyCommonsReader;
1213
import org.junit.Ignore;
1314
import org.junit.Test;
1415
import org.junit.runner.RunWith;
1516
import org.junit.runners.Parameterized;
1617
import org.junit.runners.Parameterized.Parameters;
1718

18-
import io.ably.lib.test.common.Setup;
1919
import io.ably.lib.types.AblyException;
2020
import io.ably.lib.types.ChannelOptions;
2121
import io.ably.lib.types.Message;
22-
import io.ably.lib.util.Base64Coder;
23-
import io.ably.lib.util.Crypto;
2422
import io.ably.lib.util.Crypto.CipherParams;
2523

2624
@Ignore("FIXME: Initialization is failing")
@@ -62,8 +60,8 @@ public enum FixtureSet {
6260
}
6361

6462
private CryptoTestData loadTestData() throws IOException {
65-
return (CryptoTestData)Setup.loadJson(
66-
"ably-common/test-resources/" + fileName + ".json",
63+
return (CryptoTestData) AblyCommonsReader.read(
64+
"test-resources/" + fileName + ".json",
6765
CryptoTestData.class);
6866
}
6967
}

0 commit comments

Comments
 (0)