1 files changed, 42 insertions, 8 deletions

diff --git a/app/src/test/java/se/leap/bitmaskclient/providersetup/ProviderManagerTest.java b/app/src/test/java/se/leap/bitmaskclient/providersetup/ProviderManagerTest.java
index c48f520e..e7295452 100644
--- a/app/src/test/java/se/leap/bitmaskclient/providersetup/ProviderManagerTest.java
+++ b/app/src/test/java/se/leap/bitmaskclient/providersetup/ProviderManagerTest.java
@@ -99,33 +99,59 @@ public class ProviderManagerTest {
     }
 
     @Test
-    public void testSize_has5ProvidersWithCurrentTestSetup() {
+    public void testSize_dummyEntry_has5ProvidersWithCurrentTestSetup() {
         providerManager = ProviderManager.getInstance(assetManager, file);
+        providerManager.setAddDummyEntry(true);
         assertEquals("3 preconfigured, 1 custom provider, 1 dummy provider", 5, providerManager.size());
     }
 
     @Test
-    public void testAdd_newCustomProviderThatIsNotPartOfDefaultNorCustomList_returnTrue() throws Exception {
+    public void testSize_has4ProvidersWithCurrentTestSetup() {
         providerManager = ProviderManager.getInstance(assetManager, file);
+        assertEquals("3 preconfigured, 1 custom provider", 4, providerManager.size());
+    }
+
+
+    @Test
+    public void testAdd_dummyEntry_newCustomProviderThatIsNotPartOfDefaultNorCustomList_returnTrue() throws Exception {
+        providerManager = ProviderManager.getInstance(assetManager, file);
+        providerManager.setAddDummyEntry(true);
         Provider customProvider = new Provider("https://anewprovider.org");
         assertTrue("custom provider added: ", providerManager.add(customProvider));
         assertEquals("3 preconfigured, 2 custom providers, 1 dummy provider", 6, providerManager.providers().size());
     }
 
     @Test
-    public void testAdd_newCustomProviderThatIsNotPartOfDefaultButOfCustomList_returnFalse() throws Exception {
+    public void testAdd_newCustomProviderThatIsNotPartOfDefaultNorCustomList_returnTrue() throws Exception {
+        providerManager = ProviderManager.getInstance(assetManager, file);
+        Provider customProvider = new Provider("https://anewprovider.org");
+        assertTrue("custom provider added: ", providerManager.add(customProvider));
+        assertEquals("3 preconfigured, 2 custom providers", 5, providerManager.providers().size());
+    }
+
+    @Test
+    public void testAdd_dummyEntry_newCustomProviderThatIsNotPartOfDefaultButOfCustomList_returnFalse() throws Exception {
         providerManager = ProviderManager.getInstance(assetManager, file);
+        providerManager.setAddDummyEntry(true);
         Provider customProvider = new Provider("https://leapcolombia.org");
         assertFalse("custom provider added: ", providerManager.add(customProvider));
         assertEquals("3 preconfigured, 1 custom provider, 1 dummy provider", 5, providerManager.providers().size());
     }
 
     @Test
+    public void testAdd_newCustomProviderThatIsNotPartOfDefaultButOfCustomList_returnFalse() throws Exception {
+        providerManager = ProviderManager.getInstance(assetManager, file);
+        Provider customProvider = new Provider("https://leapcolombia.org");
+        assertFalse("custom provider added: ", providerManager.add(customProvider));
+        assertEquals("3 preconfigured, 1 custom provider", 4, providerManager.providers().size());
+    }
+
+    @Test
     public void testAdd_newCustomProviderThatIsPartOfDefaultButNotOfCustomList_returnFalse() throws Exception {
         providerManager = ProviderManager.getInstance(assetManager, file);
         Provider customProvider = new Provider("https://demo.bitmask.net");
         assertFalse("custom provider added: ", providerManager.add(customProvider));
-        assertEquals("3 preconfigured, 1 custom provider, 1 dummy provider", 5, providerManager.providers().size());
+        assertEquals("3 preconfigured, 1 custom provider", 4, providerManager.providers().size());
     }
 
     @Test
@@ -133,7 +159,7 @@ public class ProviderManagerTest {
         providerManager = ProviderManager.getInstance(assetManager, file);
         Provider customProvider = new Provider("https://demo.bitmask.net");
         assertFalse("custom provider not removed: ", providerManager.remove(customProvider));
-        assertEquals("3 preconfigured, 1 custom provider, 1 dummy provider", 5, providerManager.providers().size());
+        assertEquals("3 preconfigured, 1 custom provider", 4, providerManager.providers().size());
     }
 
     @Test
@@ -141,7 +167,7 @@ public class ProviderManagerTest {
         providerManager = ProviderManager.getInstance(assetManager, file);
         Provider customProvider = new Provider("https://leapcolombia.org");
         assertTrue("custom provider not removed: ", providerManager.remove(customProvider));
-        assertEquals("3 preconfigured, 0 custom providers, 1 dummy provider", 4, providerManager.providers().size());
+        assertEquals("3 preconfigured, 0 custom providers", 3, providerManager.providers().size());
     }
 
     @Test
@@ -149,18 +175,26 @@ public class ProviderManagerTest {
         providerManager = ProviderManager.getInstance(assetManager, file);
         Provider customProvider = new Provider("https://anotherprovider.org");
         assertFalse("custom provider not removed: ", providerManager.remove(customProvider));
-        assertEquals("3 preconfigured, 1 custom providers, 1 dummy provider", 5, providerManager.providers().size());
+        assertEquals("3 preconfigured, 1 custom providers", 4, providerManager.providers().size());
     }
 
     @Test
-    public void testClear_ProvidersListHasOnlyDummyProvider() throws Exception {
+    public void testClear_dummyEntry_ProvidersListHasOnlyDummyProvider() throws Exception {
         providerManager = ProviderManager.getInstance(assetManager, file);
+        providerManager.setAddDummyEntry(true);
         providerManager.clear();
         assertEquals("1 providers", 1, providerManager.providers().size());
         assertEquals("provider is dummy element", "https://example.net", providerManager.get(0).getMainUrlString());
     }
 
     @Test
+    public void testClear_noEntries() throws Exception {
+        providerManager = ProviderManager.getInstance(assetManager, file);
+        providerManager.clear();
+        assertEquals("no providers", 0, providerManager.providers().size());
+    }
+
+    @Test
     public void testSaveCustomProvidersToFile_CustomProviderDeleted_deletesFromDir() throws Exception {
         when(file.exists()).thenReturn(true);
         providerManager = ProviderManager.getInstance(assetManager, file);