Change all the login command tests into integration tests.

Author: Aleksi Salmela

src/main/java/fi/helsinki/cs/tmc/cli/command/DownloadExercisesCommand.java

@@ -24,6 +24,8 @@
 @Command(name = "download", desc = "Download exercises for a specific course")
 public class DownloadExercisesCommand extends AbstractCommand {
 
+    private boolean showAll;
+
     @Override
     public void getOptions(Options options) {
         options.addOption("a", "all", false,
@@ -36,12 +38,14 @@ public void getOptions(Options options) {
     @Override
     public void run(CommandLine args, Io io) {
         String[] stringArgs = args.getArgs();
-        if (stringArgs.length == 0) {
+        if (stringArgs.length == 0 || stringArgs.length > 1) {
             io.println("You must give course name as an argument.");
             io.println("Usage: tmc download COURSE");
             return;
         }
 
+        showAll = args.hasOption("a");
+
         Application app = getApp();
         TmcCore core = app.getTmcCore();
         WorkDir workDir = getApp().getWorkDir();
@@ -54,12 +58,13 @@ public void run(CommandLine args, Io io) {
             return;
         }
 
-        Course course = TmcUtil.findCourse(core, stringArgs[0]);
+        String courseName = stringArgs[0];
+        Course course = TmcUtil.findCourse(core, courseName);
         if (course == null) {
             io.println("Course doesn't exist.");
             return;
         }
-        List<Exercise> filtered = getFilteredExercises(course, args);
+        List<Exercise> filtered = getFilteredExercises(course);
         // todo: If -c switch, use core.downloadCompletedExercises() to download user's old
         //       submissions. Not yet implemented in tmc-core.
 
@@ -71,24 +76,38 @@ public void run(CommandLine args, Io io) {
         if (exercises == null) {
             io.println("Failed to download exercises");
             return;
-        } else if (exercises.isEmpty()) {
-            io.println("Course doesn't have any exercises.");
+        }
 
-        } else if (exercises.size() != filtered.size()) {
-            io.println(Color.colorString("Some exercises could not be downloaded",
-                    Color.AnsiColor.ANSI_RED));
+        if (course.getExercises().isEmpty()) {
+            io.println("The '" + courseName + "' course doesn't have any exercises.");
+        } else {
+            io.println("The '" + courseName + "' course has " +
+                    course.getExercises().size() + " exercises");
+
+            int failedCount = (filtered.size() - exercises.size());
+            if (failedCount > 0) {
+                io.println("  from which " +
+                        exercises.size() + " exercises were succesfully downloaded");
+                io.println(Color.colorString("  and of which " + failedCount + " failed.",
+                        Color.AnsiColor.ANSI_RED));
+                //TODO we could print the names of the not downloaded exercises here
+            } else {
+                io.println("  from which " +
+                        exercises.size() + " exercises were downloaded.");
+            }
+            io.println("Use -a flag to download also your completed exercises.");
         }
 
         Path configFile = app.getWorkDir().getWorkingDirectory()
-                .resolve(stringArgs[0])
+                .resolve(courseName)
                 .resolve(CourseInfoIo.COURSE_CONFIG);
         CourseInfo info = app.createCourseInfo(course);
         info.setExercises(course.getExercises());
         CourseInfoIo.save(info, configFile);
     }
 
-    protected List<Exercise> getFilteredExercises(Course course, CommandLine args) {
-        if (args.hasOption("a")) {
+    private List<Exercise> getFilteredExercises(Course course) {
+        if (showAll) {
             return course.getExercises();
         }
 

src/test/java/fi/helsinki/cs/tmc/cli/command/DownloadExercisesCommandTest.java

@@ -127,18 +127,23 @@ public void filtersCompletedExercisesByDefault() throws ParseException {
         completed1.setCompleted(true);
         completed2.setCompleted(true);
 
-        Course course = new Course("test-course");
+        List<Exercise> filteredExercises = Arrays.asList(notCompleted);
+
+        Course course = new Course("course1");
         course.setExercises(Arrays.asList(completed1, notCompleted, completed2));
 
-        /*TODO somehow get rid of this parser stuff */
-        GnuParser parser = new GnuParser();
-        CommandLine args = parser.parse(new Options(), new String[]{});
+        when(TmcUtil.findCourse(eq(mockCore), eq("course1"))).thenReturn(course);
+        when(TmcUtil.downloadExercises(eq(mockCore), anyListOf(Exercise.class),
+                any(ProgressObserver.class))).thenReturn(filteredExercises);
+
+        Settings settings = new Settings("server", "user", "password");
+        settings.setTmcProjectDirectory(tempDir);
+        app.setSettings(settings);
 
-        DownloadExercisesCommand dlCommand = new DownloadExercisesCommand();
-        List<Exercise> filtered = dlCommand.getFilteredExercises(course, args);
+        String[] args = {"download", "course1"};
+        app.run(args);
 
-        assertTrue(filtered.size() == 1);
-        assertEquals(notCompleted, filtered.get(0));
+        io.assertContains("which 1 exercises were downloaded");
     }
 
     @Test
@@ -151,23 +156,22 @@ public void getsAllExercisesWithAllSwitch() throws ParseException {
         completed1.setCompleted(true);
         completed2.setCompleted(true);
 
-        List<Exercise> exercises = new ArrayList<>();
-        exercises.add(completed1);
-        exercises.add(notCompleted);
-        exercises.add(completed2);
-
-        Course course = new Course("test-course");
+        List<Exercise> exercises = Arrays.asList(completed1, notCompleted,
+                completed2);
+        Course course = new Course("course1");
         course.setExercises(exercises);
 
-        /*TODO somehow get rid of this parser stuff */
-        GnuParser parser = new GnuParser();
-        Options options = new Options();
-        options.addOption("a", "all", false, "");
-        CommandLine args = parser.parse(options, new String[]{"-a"});
+        when(TmcUtil.findCourse(eq(mockCore), eq("course1"))).thenReturn(course);
+        when(TmcUtil.downloadExercises(eq(mockCore), anyListOf(Exercise.class),
+                any(ProgressObserver.class))).thenReturn(exercises);
+
+        Settings settings = new Settings("server", "user", "password");
+        settings.setTmcProjectDirectory(tempDir);
+        app.setSettings(settings);
 
-        DownloadExercisesCommand dlCommand = new DownloadExercisesCommand();
-        List<Exercise> filtered = dlCommand.getFilteredExercises(course, args);
+        String[] args = {"download", "-a", "course1"};
+        app.run(args);
 
-        assertTrue(filtered.size() == 3);
+        io.assertContains("which 3 exercises were downloaded");
     }
 }