Separate the argument handling of paste.

Author: Aleksi Salmela

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

@@ -47,37 +47,12 @@ public void getOptions(Options options) {
     public void run(CliContext context, CommandLine args) {
         this.ctx = context;
         this.io = ctx.getIo();
-
-        this.message = args.getOptionValue("m");
-        this.noMessage = args.hasOption("n");
-        this.openInBrowser = args.hasOption("o");
         WorkDir workdir = ctx.getWorkDir();
-        String[] stringArgs = args.getArgs();
 
-        if (noMessage && message != null) {
-            io.errorln("You can't have the no-message flag and message set at the same time.");
-            printUsage(context);
-            return;
-        }
-        if (stringArgs.length > 1) {
-            io.errorln("Error: Too many arguments.");
-            printUsage(context);
+        if(!parseArgs(args)) {
             return;
         }
 
-        if (stringArgs.length == 1) {
-            if (!workdir.addPath(stringArgs[0])) {
-                io.errorln("The path '" + stringArgs[0] + "' is not valid exercise.");
-                return;
-            }
-        } else {
-            //TODO replace the following call with workdir.getCurrentExercise()
-            if (!workdir.addPath()) {
-                io.errorln("You are not in exercise directory.");
-                return;
-            }
-        }
-
         if (!ctx.loadBackend()) {
             return;
         }
@@ -104,6 +79,40 @@ public void run(CliContext context, CommandLine args) {
         sendPaste(message, exerciseNames.get(0));
     }
 
+    private boolean parseArgs(CommandLine args) {
+        WorkDir workdir = ctx.getWorkDir();
+        String[] stringArgs = args.getArgs();
+
+        this.message = args.getOptionValue("m");
+        this.noMessage = args.hasOption("n");
+        this.openInBrowser = args.hasOption("o");
+
+        if (noMessage && message != null) {
+            io.errorln("You can't have the no-message flag and message set at the same time.");
+            printUsage(ctx);
+            return false;
+        }
+        if (stringArgs.length > 1) {
+            io.errorln("Error: Too many arguments.");
+            printUsage(ctx);
+            return false;
+        }
+
+        if (stringArgs.length == 1) {
+            if (!workdir.addPath(stringArgs[0])) {
+                io.errorln("The path '" + stringArgs[0] + "' is not valid exercise.");
+                return false;
+            }
+        } else {
+            //TODO replace the following call with workdir.getCurrentExercise()
+            if (!workdir.addPath()) {
+                io.errorln("You are not in exercise directory.");
+                return false;
+            }
+        }
+        return true;
+    }
+
     private void sendPaste(String message, String exerciseName) {
         if (message == null) {
             message = "";

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

@@ -127,7 +127,7 @@ public void pasteRunsRightWithoutArguments() throws URISyntaxException {
     @Test
     public void pasteRunsRightwithTooManyArguments() {
         app.run(new String[] {"paste", "paste-exercise", "secondArgument"});
-        io.assertContains("Error: Too many arguments. Expected 1, got");
+        io.assertContains("Error: Too many arguments.");
     }
 
     @Test
@@ -202,7 +202,7 @@ public void failsWithNoExercise() {
         Mockito.when(workDir.addPath(anyString())).thenReturn(false);
         app.run(new String[] {"paste", "-m", "This is a message given as an argument"});
 
-        io.assertContains("The command can be used in an exercise directory");
+        io.assertContains("You are not in exercise directory.");
 
         verifyStatic(Mockito.never());
         TmcUtil.sendPaste(eq(ctx), any(Exercise.class), anyString());