chore: fix access to ably-commons data

Author: ttypic

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

@@ -20,6 +20,7 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
+import io.ably.lib.test.util.AblyCommonsReader;
 import io.ably.lib.types.ChannelOptions;
 import io.ably.lib.types.MessageAction;
 import io.ably.lib.types.MessageExtras;
@@ -59,7 +60,7 @@
 
 public class RealtimeMessageTest extends ParameterizedTest {
 
-    private static final String testMessagesEncodingFile = "ably-common/test-resources/messages-encoding.json";
+    private static final String testMessagesEncodingFile = "test-resources/messages-encoding.json";
     private static Gson gson = new Gson();
 
     @Rule
@@ -532,13 +533,7 @@ public void ensure_disconnect_with_error_does_not_move_to_failed() {
     @Test
     public void messages_encoding_fixtures() {
         MessagesEncodingData fixtures;
-        try {
-            fixtures = (MessagesEncodingData) Setup.loadJson(testMessagesEncodingFile, MessagesEncodingData.class);
-        } catch(IOException e) {
-            fail();
-            return;
-        }
-
+        fixtures = AblyCommonsReader.read(testMessagesEncodingFile, MessagesEncodingData.class);
         AblyRealtime ably = null;
         try {
             ClientOptions opts = createOptions(testVars.keys[0].keyStr);
@@ -597,12 +592,7 @@ public MessagesEncodingDataItem[] handleResponse(HttpCore.Response response, Err
     @Test
     public void messages_msgpack_and_json_encoding_is_compatible() {
         MessagesEncodingData fixtures;
-        try {
-            fixtures = (MessagesEncodingData) Setup.loadJson(testMessagesEncodingFile, MessagesEncodingData.class);
-        } catch(IOException e) {
-            fail();
-            return;
-        }
+        fixtures = AblyCommonsReader.read(testMessagesEncodingFile, MessagesEncodingData.class);
 
         // Publish each data type through raw JSON POST and retrieve through MsgPack and JSON.
 
@@ -884,15 +874,10 @@ public void message_from_encoded_json_object() throws AblyException {
     public void messages_from_encoded_json_array() throws AblyException {
         JsonArray fixtures = null;
         MessagesData testMessages = null;
-        try {
-            testMessages = (MessagesData) Setup.loadJson(testMessagesEncodingFile, MessagesData.class);
-            JsonObject jsonObject = (JsonObject) Setup.loadJson(testMessagesEncodingFile, JsonObject.class);
-            //We use this as-is for decoding purposes.
-            fixtures = jsonObject.getAsJsonArray("messages");
-        } catch(IOException e) {
-            fail();
-            return;
-        }
+        testMessages = AblyCommonsReader.read(testMessagesEncodingFile, MessagesData.class);
+        JsonObject jsonObject = AblyCommonsReader.read(testMessagesEncodingFile, JsonObject.class);
+        //We use this as-is for decoding purposes.
+        fixtures = jsonObject.getAsJsonArray("messages");
 
         Message[] decodedMessages = Message.fromEncodedArray(fixtures, null);
         for(int index = 0; index < decodedMessages.length; index++) {

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

@@ -42,6 +42,7 @@
 import io.ably.lib.realtime.ConnectionStateListener;
 import io.ably.lib.realtime.Presence;
 import io.ably.lib.test.common.Setup;
+import io.ably.lib.test.util.AblyCommonsReader;
 import io.ably.lib.types.AblyException;
 import io.ably.lib.types.Capability;
 import io.ably.lib.types.ChannelOptions;
@@ -74,7 +75,7 @@
 
 public class RealtimePresenceTest extends ParameterizedTest {
 
-    private static final String testMessagesEncodingFile = "ably-common/test-resources/presence-messages-encoding.json";
+    private static final String testMessagesEncodingFile = "test-resources/presence-messages-encoding.json";
     private static final String testClientId1 = "testClientId1";
     private static final String testClientId2 = "testClientId2";
     private Auth.TokenDetails token1;
@@ -3636,15 +3637,11 @@ public void message_from_encoded_json_object() throws AblyException {
     public void messages_from_encoded_json_array() throws AblyException {
         JsonArray fixtures = null;
         MessagesData testMessages = null;
-        try {
-            testMessages = (MessagesData) Setup.loadJson(testMessagesEncodingFile, MessagesData.class);
-            JsonObject jsonObject = (JsonObject) Setup.loadJson(testMessagesEncodingFile, JsonObject.class);
-            //We use this as-is for decoding purposes.
-            fixtures = jsonObject.getAsJsonArray("messages");
-        } catch(IOException e) {
-            fail();
-            return;
-        }
+        testMessages = AblyCommonsReader.read(testMessagesEncodingFile, MessagesData.class);
+        JsonObject jsonObject = AblyCommonsReader.readAsJsonObject(testMessagesEncodingFile);
+        //We use this as-is for decoding purposes.
+        fixtures = jsonObject.getAsJsonArray("messages");
+
         PresenceMessage[] decodedMessages = PresenceMessage.fromEncodedArray(fixtures, null);
         for(int index = 0; index < decodedMessages.length; index++) {
             PresenceMessage testInputMsg = testMessages.messages[index];

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

@@ -0,0 +1,52 @@
+package io.ably.lib.test.util;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+public class AblyCommonsReader {
+    private static final String BASE_URL = "https://raw.githubusercontent.com/ably/ably-common/refs/heads/main/";
+    private static Gson gson = new Gson();
+
+    public static String readAsString(String path) throws Exception {
+        URL url = new URL(BASE_URL + path);
+        HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+        conn.setRequestMethod("GET");
+
+        if (conn.getResponseCode() != 200) {
+            throw new RuntimeException("Failed : HTTP error code : " + conn.getResponseCode());
+        }
+
+        BufferedReader br = new BufferedReader(new InputStreamReader((conn.getInputStream())));
+        StringBuilder sb = new StringBuilder();
+        String output;
+        while ((output = br.readLine()) != null) {
+            sb.append(output);
+        }
+
+        conn.disconnect();
+
+        return sb.toString();
+    }
+
+    public static JsonObject readAsJsonObject(String path) {
+        try {
+            return JsonParser.parseString(readAsString(path)).getAsJsonObject();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public static <T> T read(String path, Class<T> classOfT) {
+        try {
+            return gson.fromJson(readAsString(path), classOfT);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+}

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

@@ -9,6 +9,7 @@
 import java.io.IOException;
 import java.security.NoSuchAlgorithmException;
 
+import io.ably.lib.test.util.AblyCommonsReader;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -62,8 +63,8 @@ public enum FixtureSet {
         }
 
         private CryptoTestData loadTestData() throws IOException {
-            return (CryptoTestData)Setup.loadJson(
-                "ably-common/test-resources/" + fileName + ".json",
+            return (CryptoTestData) AblyCommonsReader.read(
+                "test-resources/" + fileName + ".json",
                 CryptoTestData.class);
         }
     }