Merge branch 'master' into bump-up-version-juha

juvester · web-flow · commit 1a8621c6b0a1 · 2016-07-01T14:39:05.000+03:00
diff --git a/src/main/java/fi/helsinki/cs/tmc/cli/command/DownloadExercisesCommand.java b/src/main/java/fi/helsinki/cs/tmc/cli/command/DownloadExercisesCommand.java
@@ -20,7 +20,10 @@
 
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
 
 @Command(name = "download", desc = "Download exercises for a specific course")
 public class DownloadExercisesCommand extends AbstractCommand {
@@ -85,34 +88,44 @@ public void run(CommandLine args, Io io) {
     // TODO This method could be moved somewhere else.
     private Course findCourse(String courseName) {
         Io io = ctx.getIo();
-        Course found = null;
-        boolean hasDuplicateNames = false;
 
         List<Settings> accountsList = SettingsIo.getSettingsList();
+        // LinkedHashMap is used here to preserve ordering.
+        Map<Settings, Course> matches = new LinkedHashMap<>();
 
         for (Settings settings : accountsList) {
             ctx.useSettings(settings);
             Course course = TmcUtil.findCourse(ctx, courseName);
-            if (course == null) {
-                continue;
+            if (course != null) {
+                matches.put(settings, course);
             }
-            if (found != null) {
-                if (!hasDuplicateNames) {
-                    io.println("There is multiple courses with same name at different servers.");
-                }
-                if (io.readConfirmation("Download course from "
-                        + settings.getServerAddress(), false)) {
-                    return course;
-                }
-                hasDuplicateNames = true;
-            }
-            found = course;
         }
-        if (found == null) {
+
+        if (matches.size() == 1) {
+            Entry<Settings, Course> firstEntry = matches.entrySet().iterator().next();
+            ctx.useSettings(firstEntry.getKey());
+            return firstEntry.getValue();
+        } else if (matches.isEmpty()) {
             io.println("Course doesn't exist.");
             return null;
         }
-        return found;
+
+        io.println("There is " + matches.size()
+                + " courses with same name at different servers.");
+
+        for (Entry<Settings, Course> entrySet : matches.entrySet()) {
+            Settings settings = entrySet.getKey();
+            Course course = entrySet.getValue();
+
+            if (io.readConfirmation("Download course from "
+                    + settings.getServerAddress() + " with '"
+                    + settings.getUsername() + "' account", false)) {
+                ctx.useSettings(settings);
+                return course;
+            }
+        }
+        io.println("The previous course was last that matched.");
+        return null;
     }
 
     private List<Exercise> getFilteredExercises(Course course) {
@@ -134,6 +147,7 @@ private List<Exercise> getFilteredExercises(Course course) {
     private void printStatistics(Course course, int requestCount, int downloadCount) {
         Io io = ctx.getIo();
         String courseName = course.getName();
+
         if (course.getExercises().isEmpty()) {
             io.println("The '" + courseName + "' course doesn't have any exercises.");
         } else {
diff --git a/src/main/java/fi/helsinki/cs/tmc/cli/updater/TmcCliUpdater.java b/src/main/java/fi/helsinki/cs/tmc/cli/updater/TmcCliUpdater.java
@@ -78,7 +78,9 @@ public boolean run() {
         File destination = new File(currentBinLocation + binName);
 
         io.println("Downloading...");
-        fetchTmcCliBinary(dlUrl, destination);
+        if (!fetchTmcCliBinary(dlUrl, destination)) {
+            return false;
+        }
 
         io.println("Running " + destination.getAbsolutePath());
         return runNewTmcCliBinary(destination.getAbsolutePath());
@@ -136,16 +138,18 @@ protected String fetchLatestReleaseJson() {
      * Downloads a binary file from downloadUrl and saves it to destination
      * file.
      */
-    protected void fetchTmcCliBinary(String downloadUrl, File destination) {
+    protected boolean fetchTmcCliBinary(String downloadUrl, File destination) {
         byte[] content = fetchHttpEntity(downloadUrl);
         if (content == null) {
             io.println("Failed to download tmc-cli.");
-            return;
+            return false;
         }
         try {
             FileUtils.writeByteArrayToFile(destination, content);
+            return true;
         } catch (IOException ex) {
             io.println("Failed to write the new version into \'" + destination + "\'.");
+            return false;
         }
     }
 
diff --git a/src/test/java/fi/helsinki/cs/tmc/cli/command/DocumentCommandTest.java b/src/test/java/fi/helsinki/cs/tmc/cli/command/DocumentCommandTest.java
@@ -1,12 +1,21 @@
 package fi.helsinki.cs.tmc.cli.command;
 
+import static org.mockito.Mockito.when;
+import static org.powermock.api.mockito.PowerMockito.mockStatic;
+
 import fi.helsinki.cs.tmc.cli.Application;
 import fi.helsinki.cs.tmc.cli.CliContext;
+import fi.helsinki.cs.tmc.cli.io.EnvironmentUtil;
 import fi.helsinki.cs.tmc.cli.io.TestIo;
 
 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;
 
+@RunWith(PowerMockRunner.class)
+@PrepareForTest(EnvironmentUtil.class)
 public class DocumentCommandTest {
 
     private Application app;
@@ -18,14 +27,28 @@ public void setUp() {
         io = new TestIo();
         ctx = new CliContext(io);
         app = new Application(ctx);
+
+        mockStatic(EnvironmentUtil.class);
+        when(EnvironmentUtil.getTerminalWidth()).thenReturn(100);
     }
 
     @Test
     public void run() throws InterruptedException {
+        when(EnvironmentUtil.isWindows()).thenReturn(false);
+        app = new Application(ctx);
+
+        String[] args = {"document", "-s", "0"};
+        app.run(args);
+        io.assertContains("Original dev team");
+    }
+
+    @Test
+    public void failOnWindows() throws InterruptedException {
+        when(EnvironmentUtil.isWindows()).thenReturn(true);
         app = new Application(ctx);
 
         String[] args = {"document", "-s", "0"};
         app.run(args);
-        io.assertContains("dev team");
+        io.assertContains("Command document doesn't exist");
     }
 }
diff --git a/src/test/java/fi/helsinki/cs/tmc/cli/command/DownloadExercisesCommandTest.java b/src/test/java/fi/helsinki/cs/tmc/cli/command/DownloadExercisesCommandTest.java
@@ -1,5 +1,6 @@
 package fi.helsinki.cs.tmc.cli.command;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyListOf;
@@ -9,6 +10,7 @@
 import static org.mockito.Mockito.spy;
 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.Application;
 import fi.helsinki.cs.tmc.cli.CliContext;
@@ -27,11 +29,12 @@
 
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
+import org.powermock.reflect.Whitebox;
 
 import java.io.File;
 import java.io.IOException;
@@ -205,19 +208,68 @@ public void failsToLoadExercises() throws ParseException {
         io.assertContains("and of which 1 failed.");
     }
 
-    @Ignore
     @Test
     public void findFromMultipleServer() {
-        List<Course> list1 = Arrays.asList(new Course("course1"));
-        List<Course> list2 = Arrays.asList(new Course("course2"));
-        when(TmcUtil.listCourses(eq(ctx))).thenReturn(list1).thenReturn(list2);
+        Settings settings1 = new Settings("http://test.test", "", "");
+        Settings settings2 = new Settings("http://hello.test", "", "");
+
+        when(TmcUtil.findCourse(eq(ctx), eq("course1"))).thenReturn(new Course("course1"))
+                .thenReturn(new Course("course2"));
+        when(SettingsIo.getSettingsList()).thenReturn(
+                Arrays.asList(settings1, settings2));
+
+        String[] args = {"download", "course2"};
+        app.run(args);
     }
 
-    @Ignore
     @Test
-    public void findFromMultipleServerWithSameName() {
-        List<Course> list1 = Arrays.asList(new Course("course1"));
-        List<Course> list2 = Arrays.asList(new Course("course1"));
-        when(TmcUtil.listCourses(eq(ctx))).thenReturn(list1).thenReturn(list2);
+    public void findFromMultipleServerWithSameNameWithoutTakingAny() {
+        Settings settings1 = new Settings("http://test.test", "abc", "");
+        Settings settings2 = new Settings("http://hello.test", "def", "");
+
+        when(TmcUtil.findCourse(eq(ctx), eq("course1"))).thenReturn(new Course("course1"))
+                .thenReturn(new Course("course1"));
+        when(SettingsIo.getSettingsList()).thenReturn(
+                Arrays.asList(settings1, settings2));
+
+        List<Exercise> exercises = Arrays.asList();
+        when(TmcUtil.downloadExercises(eq(ctx), anyListOf(Exercise.class),
+                any(ProgressObserver.class))).thenReturn(exercises);
+
+        String[] args = {"download", "course1"};
+        io.addConfirmationPrompt(false);
+        io.addConfirmationPrompt(false);
+        app.run(args);
+        io.assertContains("There is 2 courses with same name at different servers");
+        io.assertContains("Download course from http://test.test with 'abc' account");
+        io.assertContains("Download course from http://hello.test with 'def' account");
+        io.assertContains("The previous course was last that matched");
+        io.assertAllPromptsUsed();
+    }
+
+    @Test
+    public void findFromMultipleServerWithSameNameWithTakingFirst() {
+        Settings settings1 = new Settings("http://test.test", "abc", "");
+        Settings settings2 = new Settings("http://hello.test", "def", "");
+
+        when(TmcUtil.findCourse(eq(ctx), eq("course1"))).thenReturn(new Course("course1"))
+                .thenReturn(new Course("course1"));
+        when(SettingsIo.getSettingsList()).thenReturn(
+                Arrays.asList(settings1, settings2));
+
+        String[] args = {"download", "course1"};
+        io.addConfirmationPrompt(true);
+        app.run(args);
+        io.assertContains("There is 2 courses with same name at different servers");
+        io.assertContains("Download course from http://test.test with 'abc' account");
+        io.assertAllPromptsUsed();
+
+        ArgumentCaptor<CliContext> ctxCaptor = ArgumentCaptor.forClass(CliContext.class);
+        verifyStatic();
+        TmcUtil.downloadExercises(ctxCaptor.capture(), anyListOf(Exercise.class),
+                any(ProgressObserver.class));
+
+        Settings usedSettings = Whitebox.getInternalState(ctx, "settings");
+        assertEquals(usedSettings, settings1);
     }
 }
diff --git a/src/test/java/fi/helsinki/cs/tmc/cli/updater/TmcCliUpdaterTest.java b/src/test/java/fi/helsinki/cs/tmc/cli/updater/TmcCliUpdaterTest.java
@@ -107,7 +107,7 @@ public void downloadsAndRunsNewBinaryIfOk() {
         TmcCliUpdater updater = spy(new TmcCliUpdater(io, "0.1.0", false));
         doReturn(latestJson).when(updater).fetchLatestReleaseJson();
         //when(updater.fetchLatestReleaseJson()).thenReturn(latestJson);
-        doNothing().when(updater).fetchTmcCliBinary(any(String.class), any(File.class));
+        doReturn(true).when(updater).fetchTmcCliBinary(any(String.class), any(File.class));
         when(updater.runNewTmcCliBinary(any(String.class))).thenReturn(true);
         updater.run();
         assertThat(io.out(), containsString("A new version of tmc-cli is available!"));
