Improve Application unit tests.

Author: Aleksi Salmela

src/main/java/fi/helsinki/cs/tmc/cli/Application.java

@@ -48,7 +48,7 @@ public Application(CliContext context) {
 
         options.addOption("h", "help", false, "Display help information about tmc-cli");
         options.addOption("v", "version", false, "Give the version of the tmc-cli");
-        options.addOption("f", "force-update", false, "Force the auto-update");
+        options.addOption("u", "force-update", false, "Force the auto-update");
 
         //TODO implement the inTests as context.property
         if (!context.inTests()) {
@@ -73,7 +73,6 @@ private String[] parseArgs(String[] args) {
         try {
             line = this.parser.parse(this.options, args, true);
         } catch (ParseException e) {
-            io.println("Invalid command line arguments.");
             io.println(e.getMessage());
             return null;
         }
@@ -92,7 +91,7 @@ private String[] parseArgs(String[] args) {
 
         boolean showHelp = line.hasOption("h");
         boolean showVersion = line.hasOption("v");
-        boolean forceUpdate = line.hasOption("f");
+        boolean forceUpdate = line.hasOption("u");
 
         if (showHelp) {
             // don't run the help sub-command with -h switch
@@ -170,8 +169,8 @@ private boolean versionCheck() {
     public boolean runAutoUpdate() {
         Map<String, String> properties = context.getProperties();
         Date now = new Date();
-        TmcCliUpdater update = new TmcCliUpdater(io, EnvironmentUtil.getVersion(),
-                EnvironmentUtil.isWindows());
+        TmcCliUpdater update = TmcCliUpdater.createUpdater(io,
+                EnvironmentUtil.getVersion(), EnvironmentUtil.isWindows());
         boolean updated = update.run();
 
         long timestamp = now.getTime();
@@ -181,7 +180,7 @@ public boolean runAutoUpdate() {
         return updated;
     }
 
-    //TODO rename this as getColorProperty
+    //TODO rename this as getColorProperty and move it somewhere else
     public Color.AnsiColor getColor(String propertyName) {
         String propertyValue = context.getProperties().get(propertyName);
         Color.AnsiColor color = Color.getColor(propertyValue);

src/main/java/fi/helsinki/cs/tmc/cli/updater/TmcCliUpdater.java

@@ -41,6 +41,10 @@ public TmcCliUpdater(Io io, String currentVersion, boolean isWindows) {
         this.isWindows = isWindows;
     }
 
+    public static TmcCliUpdater createUpdater(Io io, String currentVersion, boolean isWindows) {
+        return new TmcCliUpdater(io, currentVersion, isWindows);
+    }
+
     /**
      * Checks if there's a newer tmc-cli version released on Github and asks if
      * the user wants to download it. TODO: split it up
@@ -61,7 +65,7 @@ public boolean run() {
 
         if (isWindows) { //just show a link for Windows users now, todo...
             io.println("Download: https://github.com/tmc-cli/tmc-cli/releases/latest");
-            return false;
+            return true;
         }
 
         if (! io.readConfirmation("Do you want to download it?", true)) {

src/test/java/fi/helsinki/cs/tmc/cli/ApplicationTest.java

@@ -1,12 +1,31 @@
 package fi.helsinki.cs.tmc.cli;
 
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.powermock.api.mockito.PowerMockito.mockStatic;
+import static org.powermock.api.mockito.PowerMockito.verifyStatic;
 
+import fi.helsinki.cs.tmc.cli.io.Io;
 import fi.helsinki.cs.tmc.cli.io.TestIo;
+import fi.helsinki.cs.tmc.cli.updater.TmcCliUpdater;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
 
+import java.util.HashMap;
+
+@RunWith(PowerMockRunner.class)
+@PrepareForTest(TmcCliUpdater.class)
 public class ApplicationTest {
 
     private Application app;
@@ -16,33 +35,71 @@ public class ApplicationTest {
     public void setUp() {
         io = new TestIo();
         app = new Application(new CliContext(io));
+        mockStatic(TmcCliUpdater.class);
     }
 
     @Test
     public void versionWorksWithRightParameter() {
-        String[] args = {"-v"};
+        String[] args = {"-v", "foo"};
         app.run(args);
         assertTrue(io.out().contains("TMC-CLI version"));
+        io.assertNotContains("Command foo doesn't exist.");
     }
 
     @Test
     public void failWhenInvalidOption() {
         String[] args = {"-a34t3"};
         app.run(args);
-        assertTrue(io.out().contains("Unrecognized option"));
+        io.assertContains("Unrecognized option");
     }
 
     @Test
     public void helpWorksWithRightParameter() {
         String[] args = {"-h"};
         app.run(args);
-        assertTrue(io.out().contains("Usage: tmc"));
+        io.assertContains("Usage: tmc");
+    }
+
+    @Test
+    public void helpOfHelpCommandIsNotGiven() {
+        String[] args = {"-h", "help"};
+        app.run(args);
+        io.assertContains("help");
+        io.assertNotContains("Usage: tmc help");
     }
 
     @Test
     public void runCommandWorksWithWrongParameter() {
         String[] args = {"foo"};
         app.run(args);
-        assertTrue(io.out().contains("Command foo doesn't exist"));
+        io.assertContains("Command foo doesn't exist");
+    }
+
+    @Test
+    public void runAutoUpdate() {
+        String[] args = {"help"};
+        TmcCliUpdater mockUpdater = mock(TmcCliUpdater.class);
+        when(TmcCliUpdater.createUpdater(any(Io.class), anyString(), any(Boolean.class)))
+                .thenReturn(mockUpdater);
+        when(mockUpdater.run()).thenReturn(true);
+
+        CliContext ctx = spy(new CliContext(null));
+        when(ctx.getProperties()).thenReturn(new HashMap<String, String>());
+
+        app = new Application(ctx);
+        app.run(args);
+
+        verifyStatic(times(1));
+        TmcCliUpdater.createUpdater(any(Io.class), anyString(), any(Boolean.class));
+    }
+
+    @Test
+    public void runWithForceUpdate() {
+        String[] args = {"--force-update", "foo"};
+        app = spy(app);
+        doReturn(true).when(app).runAutoUpdate();
+        app.run(args);
+        io.assertNotContains("Command foo doesn't exist.");
+        verify(app, times(1)).runAutoUpdate();
     }
 }