Minor updater test improvements/additions

Change-Id: I83f60d4bc11aac49a86f50d3aea66e6ab508386a
Reviewed-on: http://gerrit.dmdirc.com/3205
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

test/com/dmdirc/updater/checking/NaiveConsolidatorTest.java

@@ -31,103 +31,89 @@ import java.util.Map;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
 
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.when;
 
+@RunWith(MockitoJUnitRunner.class)
 public class NaiveConsolidatorTest {
 
     private NaiveConsolidator consolidator;
-    private List<UpdateComponent> components;
-    private List<UpdateCheckResult> positiveResults;
-    private List<UpdateCheckResult> negativeResults;
+
+    @Mock private UpdateComponent component1;
+    @Mock private UpdateComponent component2;
+    @Mock private UpdateComponent component3;
+    @Mock private UpdateCheckResult availableResult;
+    @Mock private UpdateCheckResult unavailableResult;
 
     @Before
     public void setUp() {
+        when(availableResult.isUpdateAvailable()).thenReturn(true);
+        when(unavailableResult.isUpdateAvailable()).thenReturn(false);
         consolidator = new NaiveConsolidator();
-        components = new ArrayList<>();
-        positiveResults = new ArrayList<>();
-        negativeResults = new ArrayList<>();
-
-        for (int i = 0; i < 4; i++) {
-            final UpdateComponent component = mock(UpdateComponent.class);
-            final UpdateCheckResult negative = mock(UpdateCheckResult.class);
-            final UpdateCheckResult positive = mock(UpdateCheckResult.class);
-            when(negative.getComponent()).thenReturn(component);
-            when(negative.isUpdateAvailable()).thenReturn(false);
-            when(positive.getComponent()).thenReturn(component);
-            when(positive.isUpdateAvailable()).thenReturn(true);
-
-            components.add(component);
-            negativeResults.add(negative);
-            positiveResults.add(negative);
-        }
     }
 
     @Test
     public void testIncludesAllComponentsFromAllMaps() {
-        final Map<UpdateComponent, UpdateCheckResult> map1
-                = new HashMap<>();
-        final Map<UpdateComponent, UpdateCheckResult> map2
-                = new HashMap<>();
-        final List<Map<UpdateComponent, UpdateCheckResult>> maps
-                = new ArrayList<>();
+        final Map<UpdateComponent, UpdateCheckResult> map1 = new HashMap<>();
+        map1.put(component1, unavailableResult);
+        map1.put(component2, unavailableResult);
 
-        map1.put(components.get(0), negativeResults.get(0));
-        map1.put(components.get(1), negativeResults.get(1));
-        map2.put(components.get(2), negativeResults.get(2));
+        final Map<UpdateComponent, UpdateCheckResult> map2 = new HashMap<>();
+        map2.put(component3, unavailableResult);
 
+        final List<Map<UpdateComponent, UpdateCheckResult>> maps = new ArrayList<>();
         maps.add(map1);
         maps.add(map2);
 
         final Map<UpdateComponent, UpdateCheckResult> res = consolidator.consolidate(maps);
         assertEquals(3, res.size());
-        assertTrue(res.containsKey(components.get(0)));
-        assertTrue(res.containsKey(components.get(1)));
-        assertTrue(res.containsKey(components.get(2)));
+        assertTrue(res.containsKey(component1));
+        assertTrue(res.containsKey(component2));
+        assertTrue(res.containsKey(component3));
     }
 
     @Test
     public void testIncludesPositiveResultsForKnownNegativeComponents() {
-        final Map<UpdateComponent, UpdateCheckResult> map1
-                = new HashMap<>();
-        final Map<UpdateComponent, UpdateCheckResult> map2
-                = new HashMap<>();
-        final List<Map<UpdateComponent, UpdateCheckResult>> maps
-                = new ArrayList<>();
-
-        map1.put(components.get(0), negativeResults.get(0));
-        map1.put(components.get(1), negativeResults.get(1));
-        map2.put(components.get(1), positiveResults.get(1));
-        map2.put(components.get(2), negativeResults.get(2));
+        final Map<UpdateComponent, UpdateCheckResult> map1 = new HashMap<>();
+        map1.put(component2, unavailableResult);
+        map1.put(component1, unavailableResult);
+
+        final Map<UpdateComponent, UpdateCheckResult> map2 = new HashMap<>();
+        map2.put(component2, availableResult);
+        map2.put(component3, unavailableResult);
 
+        final List<Map<UpdateComponent, UpdateCheckResult>> maps = new ArrayList<>();
         maps.add(map1);
         maps.add(map2);
 
         final Map<UpdateComponent, UpdateCheckResult> res = consolidator.consolidate(maps);
-        assertTrue(res.containsKey(components.get(1)));
-        assertSame(positiveResults.get(1), res.get(components.get(1)));
+        assertTrue(res.containsKey(component2));
+        assertSame(availableResult, res.get(component2));
     }
 
     @Test
     public void testIgnoresNegativeResultsForKnownPositiveComponents() {
-        final Map<UpdateComponent, UpdateCheckResult> map1
-                = new HashMap<>();
-        final Map<UpdateComponent, UpdateCheckResult> map2
-                = new HashMap<>();
-        final List<Map<UpdateComponent, UpdateCheckResult>> maps
-                = new ArrayList<>();
-
-        map1.put(components.get(0), negativeResults.get(0));
-        map1.put(components.get(1), positiveResults.get(1));
-        map2.put(components.get(1), negativeResults.get(1));
-        map2.put(components.get(2), negativeResults.get(2));
+        final Map<UpdateComponent, UpdateCheckResult> map1 = new HashMap<>();
+        map1.put(component1, unavailableResult);
+        map1.put(component2, availableResult);
 
+        final Map<UpdateComponent, UpdateCheckResult> map2 = new HashMap<>();
+        map2.put(component2, unavailableResult);
+        map2.put(component3, unavailableResult);
+
+        final List<Map<UpdateComponent, UpdateCheckResult>> maps = new ArrayList<>();
         maps.add(map1);
         maps.add(map2);
 
         final Map<UpdateComponent, UpdateCheckResult> res = consolidator.consolidate(maps);
-        assertTrue(res.containsKey(components.get(1)));
-        assertSame(positiveResults.get(1), res.get(components.get(1)));
+        assertTrue(res.containsKey(component2));
+        assertSame(availableResult, res.get(component2));
     }
+
 }

test/com/dmdirc/updater/manager/CachingUpdateManagerImplTest.java

@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2006-2014 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.updater.manager;
+
+import com.dmdirc.updater.UpdateComponent;
+import com.dmdirc.updater.checking.CheckResultConsolidator;
+
+import java.util.concurrent.Executor;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.when;
+
+@RunWith(MockitoJUnitRunner.class)
+public class CachingUpdateManagerImplTest {
+
+    @Mock private CheckResultConsolidator consolidator;
+    @Mock private UpdateComponentPolicy policy;
+    @Mock private UpdateComponent checkableComponent;
+    @Mock private UpdateComponent uncheckableComponent;
+    private CachingUpdateManagerImpl manager;
+
+    @Before
+    public void setup() {
+        manager = new CachingUpdateManagerImpl(new CurrentThreadExecutor(), consolidator, policy);
+        when(policy.canCheck(checkableComponent)).thenReturn(true);
+        when(policy.canCheck(uncheckableComponent)).thenReturn(false);
+        when(checkableComponent.getName()).thenReturn("checkable");
+        when(uncheckableComponent.getName()).thenReturn("uncheckable");
+    }
+
+    @Test
+    public void testCheckableComponentShownAsIdleWhenAdded() {
+        manager.addComponent(checkableComponent);
+        assertEquals(UpdateStatus.IDLE, manager.getStatus(checkableComponent));
+    }
+
+    @Test
+    public void testUncheckableComponentShownAsNotPermittedWhenAdded() {
+        manager.addComponent(uncheckableComponent);
+        assertEquals(UpdateStatus.CHECKING_NOT_PERMITTED, manager.getStatus(uncheckableComponent));
+    }
+
+    private static class CurrentThreadExecutor implements Executor {
+
+        @Override
+        public void execute(final Runnable r) {
+            r.run();
+        }
+
+    }
+
+}