From affd64938b26463b17474b25637394cb14fd60d2 Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Thu, 28 Nov 2024 06:34:39 +0530
Subject: [PATCH] Improve import/export tests

---
 .../subscription/workers/SubscriptionData.kt  |  2 +-
 .../services/ImportExportJsonHelperTest.java  | 43 +++++--------------
 2 files changed, 12 insertions(+), 33 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/workers/SubscriptionData.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/workers/SubscriptionData.kt
index dbb49508e..174ae7585 100644
--- a/app/src/main/java/org/schabi/newpipe/local/subscription/workers/SubscriptionData.kt
+++ b/app/src/main/java/org/schabi/newpipe/local/subscription/workers/SubscriptionData.kt
@@ -16,7 +16,7 @@ class SubscriptionData(
 }
 
 @Serializable
-class SubscriptionItem(
+data class SubscriptionItem(
     @SerialName("service_id")
     val serviceId: Int,
     val url: String,
diff --git a/app/src/test/java/org/schabi/newpipe/local/subscription/services/ImportExportJsonHelperTest.java b/app/src/test/java/org/schabi/newpipe/local/subscription/services/ImportExportJsonHelperTest.java
index 2ccf1f58c..3243ad9fd 100644
--- a/app/src/test/java/org/schabi/newpipe/local/subscription/services/ImportExportJsonHelperTest.java
+++ b/app/src/test/java/org/schabi/newpipe/local/subscription/services/ImportExportJsonHelperTest.java
@@ -9,7 +9,6 @@ import org.schabi.newpipe.local.subscription.workers.SubscriptionItem;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.List;
@@ -23,18 +22,14 @@ public class ImportExportJsonHelperTest {
         final String emptySource =
                 "{\"app_version\":\"0.11.6\",\"app_version_int\": 47,\"subscriptions\":[]}";
 
-        final List<SubscriptionItem> items = ImportExportJsonHelper.readFrom(
+        final var items = ImportExportJsonHelper.readFrom(
                 new ByteArrayInputStream(emptySource.getBytes(StandardCharsets.UTF_8)));
         assertTrue(items.isEmpty());
     }
 
     @Test
     public void testInvalidSource() {
-        final List<String> invalidList = Arrays.asList(
-                "{}",
-                "",
-                null,
-                "gibberish");
+        final var invalidList = Arrays.asList("{}", "", null, "gibberish");
 
         for (final String invalidContent : invalidList) {
             try {
@@ -58,38 +53,24 @@ public class ImportExportJsonHelperTest {
     @Test
     public void ultimateTest() throws Exception {
         // Read from file
-        final List<SubscriptionItem> itemsFromFile = readFromFile();
+        final var itemsFromFile = readFromFile();
 
         // Test writing to an output
         final String jsonOut = testWriteTo(itemsFromFile);
 
         // Read again
-        final List<SubscriptionItem> itemsSecondRead = readFromWriteTo(jsonOut);
+        final var itemsSecondRead = readFromWriteTo(jsonOut);
 
         // Check if both lists have the exact same items
-        if (itemsFromFile.size() != itemsSecondRead.size()) {
+        if (!itemsFromFile.equals(itemsSecondRead)) {
             fail("The list of items were different from each other");
         }
-
-        for (int i = 0; i < itemsFromFile.size(); i++) {
-            final SubscriptionItem item1 = itemsFromFile.get(i);
-            final SubscriptionItem item2 = itemsSecondRead.get(i);
-
-            final boolean equals = item1.getServiceId() == item2.getServiceId()
-                    && item1.getUrl().equals(item2.getUrl())
-                    && item1.getName().equals(item2.getName());
-
-            if (!equals) {
-                fail("The list of items were different from each other");
-            }
-        }
     }
 
     private List<SubscriptionItem> readFromFile() throws Exception {
-        final InputStream inputStream = getClass().getClassLoader().getResourceAsStream(
-                "import_export_test.json");
-        final List<SubscriptionItem> itemsFromFile = ImportExportJsonHelper.readFrom(
-                inputStream);
+        final var inputStream = getClass().getClassLoader()
+                .getResourceAsStream("import_export_test.json");
+        final var itemsFromFile = ImportExportJsonHelper.readFrom(inputStream);
 
         if (itemsFromFile.isEmpty()) {
             fail("ImportExportJsonHelper.readFrom(input) returned a null or empty list");
@@ -99,7 +80,7 @@ public class ImportExportJsonHelperTest {
     }
 
     private String testWriteTo(final List<SubscriptionItem> itemsFromFile) {
-        final ByteArrayOutputStream out = new ByteArrayOutputStream();
+        final var out = new ByteArrayOutputStream();
         ImportExportJsonHelper.writeTo(itemsFromFile, out);
         final String jsonOut = out.toString(StandardCharsets.UTF_8);
 
@@ -111,10 +92,8 @@ public class ImportExportJsonHelperTest {
     }
 
     private List<SubscriptionItem> readFromWriteTo(final String jsonOut) throws Exception {
-        final ByteArrayInputStream inputStream = new ByteArrayInputStream(
-                jsonOut.getBytes(StandardCharsets.UTF_8));
-        final List<SubscriptionItem> secondReadItems = ImportExportJsonHelper.readFrom(
-                inputStream);
+        final var inputStream = new ByteArrayInputStream(jsonOut.getBytes(StandardCharsets.UTF_8));
+        final var secondReadItems = ImportExportJsonHelper.readFrom(inputStream);
 
         if (secondReadItems.isEmpty()) {
             fail("second call to readFrom returned an empty list");