From 1aea1c930217323768d262257cf7c51f5c77c4a5 Mon Sep 17 00:00:00 2001
From: Peter Serwylo <peter@serwylo.com>
Date: Wed, 5 Apr 2017 09:09:51 +1000
Subject: [PATCH] Updated tests to work with flipped repo priorities.

---
 .../fdroid/data/CategoryProviderTest.java     | 33 ++++++++++++++-----
 .../updater/ProperMultiRepoUpdaterTest.java   | 16 ++++-----
 2 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/app/src/test/java/org/fdroid/fdroid/data/CategoryProviderTest.java b/app/src/test/java/org/fdroid/fdroid/data/CategoryProviderTest.java
index 72b5dfbe0..986491b42 100644
--- a/app/src/test/java/org/fdroid/fdroid/data/CategoryProviderTest.java
+++ b/app/src/test/java/org/fdroid/fdroid/data/CategoryProviderTest.java
@@ -44,8 +44,7 @@ public class CategoryProviderTest extends FDroidProviderTest {
         insertAppWithCategory("com.dog.rock.apple", "Dog-Rock-Apple", "Animal,Mineral,Vegetable", mainRepo);
         insertAppWithCategory("com.banana.apple", "Banana", "Vegetable,Vegetable", mainRepo);
 
-        List<String> categories = CategoryProvider.Helper.categories(context);
-        String[] expected = new String[] {
+        String[] expectedFDroid = new String[] {
                 context.getResources().getString(R.string.category_Whats_New),
                 context.getResources().getString(R.string.category_Recently_Updated),
                 context.getResources().getString(R.string.category_All),
@@ -56,13 +55,8 @@ public class CategoryProviderTest extends FDroidProviderTest {
                 "Vegetable",
                 "Writing",
         };
-        assertContainsOnly(categories, expected);
 
-        insertAppWithCategory("info.guardianproject.notepadbot", "NoteCipher", "Office,GuardianProject", gpRepo);
-        assertContainsOnly(CategoryProvider.Helper.categories(context), expected);
-
-        RepoProvider.Helper.purgeApps(context, new MockRepo(mainRepo));
-        String[] expectedGp = new String[] {
+        String[] expectedGP = new String[] {
                 context.getResources().getString(R.string.category_Whats_New),
                 context.getResources().getString(R.string.category_Recently_Updated),
                 context.getResources().getString(R.string.category_All),
@@ -70,8 +64,29 @@ public class CategoryProviderTest extends FDroidProviderTest {
                 "GuardianProject",
                 "Office",
         };
+
+        // We overwrite "Security" + "Writing" with "GuardianProject" + "Office"
+        String[] expectedBoth = new String[] {
+                context.getResources().getString(R.string.category_Whats_New),
+                context.getResources().getString(R.string.category_Recently_Updated),
+                context.getResources().getString(R.string.category_All),
+
+                "Animal",
+                "Mineral",
+                "Vegetable",
+
+                "GuardianProject",
+                "Office",
+        };
+
+        assertContainsOnly(CategoryProvider.Helper.categories(context), expectedFDroid);
+
+        insertAppWithCategory("info.guardianproject.notepadbot", "NoteCipher", "Office,GuardianProject", gpRepo);
+        assertContainsOnly(CategoryProvider.Helper.categories(context), expectedBoth);
+
+        RepoProvider.Helper.purgeApps(context, new MockRepo(mainRepo));
         List<String> categoriesAfterPurge = CategoryProvider.Helper.categories(context);
-        assertContainsOnly(categoriesAfterPurge, expectedGp);
+        assertContainsOnly(categoriesAfterPurge, expectedGP);
     }
 
     @Test
diff --git a/app/src/test/java/org/fdroid/fdroid/updater/ProperMultiRepoUpdaterTest.java b/app/src/test/java/org/fdroid/fdroid/updater/ProperMultiRepoUpdaterTest.java
index 578391376..db9e3267e 100644
--- a/app/src/test/java/org/fdroid/fdroid/updater/ProperMultiRepoUpdaterTest.java
+++ b/app/src/test/java/org/fdroid/fdroid/updater/ProperMultiRepoUpdaterTest.java
@@ -95,15 +95,15 @@ public class ProperMultiRepoUpdaterTest extends MultiRepoUpdaterTest {
 
     @Test
     public void metadataWithRepoPriority() throws RepoUpdater.UpdateException {
-        updateConflicting();
         updateMain();
         updateArchive();
+        updateConflicting();
 
-        Repo conflictingRepo = RepoProvider.Helper.findByAddress(context, REPO_CONFLICTING_URI);
+        Repo mainRepo = RepoProvider.Helper.findByAddress(context, REPO_MAIN_URI);
 
-        assertEquals(1, conflictingRepo.priority);
-        assertEquals(2, RepoProvider.Helper.findByAddress(context, REPO_MAIN_URI).priority);
-        assertEquals(3, RepoProvider.Helper.findByAddress(context, REPO_ARCHIVE_URI).priority);
+        assertEquals(1, mainRepo.priority);
+        assertEquals(2, RepoProvider.Helper.findByAddress(context, REPO_ARCHIVE_URI).priority);
+        assertEquals(3, RepoProvider.Helper.findByAddress(context, REPO_CONFLICTING_URI).priority);
 
         assertMainRepo();
         assertMainArchiveRepoMetadata();
@@ -114,9 +114,9 @@ public class ProperMultiRepoUpdaterTest extends MultiRepoUpdaterTest {
         // Make the conflicting repo less important than the main repo.
         ContentValues values = new ContentValues(1);
         values.put(Cols.PRIORITY, 5);
-        RepoProvider.Helper.update(context, conflictingRepo, values);
-        Repo updatedConflictingRepo = RepoProvider.Helper.findByAddress(context, REPO_CONFLICTING_URI);
-        assertEquals(5, updatedConflictingRepo.priority);
+        RepoProvider.Helper.update(context, mainRepo, values);
+        Repo updatedMainRepo = RepoProvider.Helper.findByAddress(context, REPO_MAIN_URI);
+        assertEquals(5, updatedMainRepo.priority);
 
         assertRepoTakesPriority("Normal");
     }