From 7b5d7f8fed323e09e2256022a3d765974a919ea4 Mon Sep 17 00:00:00 2001
From: Marcus Hoffmann <bubu@bubu1.eu>
Date: Fri, 21 Feb 2020 17:16:07 +0100
Subject: [PATCH] fix tests after icon changes

---
 app/build.gradle                                |  3 ++-
 .../main/java/org/fdroid/fdroid/data/App.java   |  1 +
 .../org/fdroid/fdroid/updater/AppIconsTest.java | 17 ++++++++++-------
 .../fdroid/updater/IndexV1UpdaterTest.java      |  2 +-
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 9539e8cda..edc039c17 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -169,7 +169,8 @@ dependencies {
     testImplementation 'org.robolectric:robolectric:3.8'
     testImplementation "com.android.support.test:monitor:1.0.2"
     testImplementation 'org.bouncycastle:bcprov-jdk15on:1.60'
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13'
+    testImplementation 'org.hamcrest:hamcrest:2.2'
     testImplementation 'org.mockito:mockito-core:2.7.22'
 
     androidTestImplementation 'com.android.support:support-annotations:27.1.1'
diff --git a/app/src/main/java/org/fdroid/fdroid/data/App.java b/app/src/main/java/org/fdroid/fdroid/data/App.java
index 149552090..130267336 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/App.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/App.java
@@ -118,6 +118,7 @@ public class App extends ValueObject implements Comparable<App>, Parcelable {
     public String name = "Unknown";
 
     public String summary = "Unknown application";
+    @JsonProperty("icon")
     public String iconFromApk;
 
     public String description;
diff --git a/app/src/test/java/org/fdroid/fdroid/updater/AppIconsTest.java b/app/src/test/java/org/fdroid/fdroid/updater/AppIconsTest.java
index b2d625278..50c4a8caf 100644
--- a/app/src/test/java/org/fdroid/fdroid/updater/AppIconsTest.java
+++ b/app/src/test/java/org/fdroid/fdroid/updater/AppIconsTest.java
@@ -1,6 +1,7 @@
 package org.fdroid.fdroid.updater;
 
 import android.content.ContentValues;
+
 import org.fdroid.fdroid.BuildConfig;
 import org.fdroid.fdroid.IndexUpdater;
 import org.fdroid.fdroid.data.App;
@@ -14,7 +15,8 @@ import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
-import static org.junit.Assert.assertEquals;
+import static org.hamcrest.MatcherAssert.assertThat;
+import org.hamcrest.text.MatchesPattern;
 
 /**
  * Check whether app icons are loaded from the correct repository. The repository with the
@@ -42,7 +44,7 @@ public class AppIconsTest extends MultiIndexUpdaterTest {
         updateMain();
         updateArchive();
 
-        assertIconUrl("https://f-droid.org/repo/icons/org.adaway.54.png");
+        assertIconUrl("^https://f-droid.org/repo/icons-[0-9]{3}/org.adaway.54.png$");
     }
 
     @Test
@@ -53,7 +55,7 @@ public class AppIconsTest extends MultiIndexUpdaterTest {
         updateMain();
         updateArchive();
 
-        assertIconUrl("https://f-droid.org/archive/icons/org.adaway.54.png");
+        assertIconUrl("^https://f-droid.org/archive/icons-[0-9]{3}/org.adaway.54.png$");
     }
 
     private void setRepoPriority(String repoUri, int priority) {
@@ -66,9 +68,10 @@ public class AppIconsTest extends MultiIndexUpdaterTest {
 
     private void assertIconUrl(String expectedUrl) {
         App app = AppProvider.Helper.findHighestPriorityMetadata(context.getContentResolver(),
-                "org.adaway", new String[]{Schema.AppMetadataTable.Cols.ICON_URL});
-
-        assertEquals(app.getIconUrl(context), expectedUrl);
+                "org.adaway", new String[]{
+                        Schema.AppMetadataTable.Cols.ICON_URL,
+                        Schema.AppMetadataTable.Cols.ICON,
+                        Schema.AppMetadataTable.Cols.REPO_ID});
+        assertThat(app.getIconUrl(context), MatchesPattern.matchesPattern(expectedUrl));
     }
-
 }
diff --git a/app/src/test/java/org/fdroid/fdroid/updater/IndexV1UpdaterTest.java b/app/src/test/java/org/fdroid/fdroid/updater/IndexV1UpdaterTest.java
index c1205cc1e..3b617ed3d 100644
--- a/app/src/test/java/org/fdroid/fdroid/updater/IndexV1UpdaterTest.java
+++ b/app/src/test/java/org/fdroid/fdroid/updater/IndexV1UpdaterTest.java
@@ -312,7 +312,7 @@ public class IndexV1UpdaterTest extends FDroidProviderTest {
                 "donate",
                 "featureGraphic",
                 "flattrID",
-                "icon",
+                "iconFromApk",
                 "iconUrl",
                 "issueTracker",
                 "lastUpdated",