Merge branch 'master' of https://github.com/tmc-cli/tmc-cli into cli-context-aleksi

Author: Aleksi Salmela

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

@@ -2,6 +2,7 @@
 
 import static fi.helsinki.cs.tmc.cli.io.Color.AnsiColor.ANSI_BLUE;
 import static fi.helsinki.cs.tmc.cli.io.Color.AnsiColor.ANSI_GREEN;
+import static fi.helsinki.cs.tmc.cli.io.Color.AnsiColor.ANSI_PURPLE;
 import static fi.helsinki.cs.tmc.cli.io.Color.AnsiColor.ANSI_RED;
 
 import fi.helsinki.cs.tmc.cli.CliContext;
@@ -155,12 +156,18 @@ private void printOneExercise(boolean showAll) {
     private void printExerciseShort() {
         io.println("Exercise: " + exercise.getName());
         io.println("Deadline: " + getDeadline(exercise));
-        io.println(formatString("completed", exercise.isCompleted()));
-        if (!exercise.isCompleted() && exercise.isAttempted()) {
-            io.println(Color.colorString("attempted", ANSI_BLUE));
-        }
-        if (exercise.requiresReview()) {
-            io.println(formatString("reviewed", exercise.isReviewed()));
+
+        if (exercise.hasDeadlinePassed() && !exercise.isCompleted()) {
+            io.println(Color.colorString("deadline passed", ANSI_PURPLE));
+        } else {
+            if (!exercise.isCompleted() && exercise.isAttempted()) {
+                io.println(Color.colorString("attempted", ANSI_BLUE));
+            } else {
+                io.println(formatString("completed", exercise.isCompleted()));
+            }
+            if (exercise.requiresReview()) {
+                io.println(formatString("reviewed", exercise.isReviewed()));
+            }
         }
     }
 

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

@@ -91,6 +91,11 @@ public void run(CommandLine args, Io io) {
         CourseInfo info = ctx.getCourseInfo();
         Exercise exercise = info.getExercise(exerciseName);
         URI uri = TmcUtil.sendPaste(ctx, exercise, message);
+        if (uri == null && exercise.hasDeadlinePassed()) {
+            io.println("Unable to send the paste."
+                    + " The deadline for submitting this exercise has passed");
+            return;
+        }
         if (uri == null) {
             io.println("Unable to send the paste");
             return;

src/test/java/fi/helsinki/cs/tmc/cli/io/TestIo.java

@@ -89,18 +89,22 @@ public void print(String str) {
     @Override
     public String readLine(String prompt) {
         usePrompt(PromptType.TEXT_PROMPT);
+        this.printedText.append(prompt + "\n");
         return textPrompts.pop();
     }
 
     @Override
     public String readPassword(String prompt) {
         usePrompt(PromptType.PASSWORD_PROMPT);
+        this.printedText.append(prompt + "\n");
         return passwordPrompts.pop();
     }
 
     @Override
     public boolean readConfirmation(String prompt, boolean defaultToYes) {
         usePrompt(PromptType.CONFIRM_PROMPT);
+        String yesNo = (defaultToYes) ? " [Y/n] " : " [y/N] ";
+        this.printedText.append(prompt + yesNo);
         return (boolean) confirmationPrompts.pop();
     }
 

src/test/java/fi/helsinki/cs/tmc/cli/tmcstuff/FeedbackHandlerTest.java

@@ -1,19 +1,92 @@
 package fi.helsinki.cs.tmc.cli.tmcstuff;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.powermock.api.mockito.PowerMockito.mockStatic;
+import static org.powermock.api.mockito.PowerMockito.verifyStatic;
+import static org.powermock.api.mockito.PowerMockito.when;
+
+import fi.helsinki.cs.tmc.cli.CliContext;
 import fi.helsinki.cs.tmc.cli.io.ExternalsUtil;
+import fi.helsinki.cs.tmc.cli.io.TestIo;
+import fi.helsinki.cs.tmc.core.domain.submission.FeedbackAnswer;
+import fi.helsinki.cs.tmc.core.domain.submission.FeedbackQuestion;
 
-import org.junit.Ignore;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mockito;
+import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
+import java.net.URI;
+import java.util.Arrays;
+import java.util.List;
+
 @RunWith(PowerMockRunner.class)
-@PrepareForTest(ExternalsUtil.class)
+@PrepareForTest({ExternalsUtil.class, TmcUtil.class})
 public class FeedbackHandlerTest {
+    private List<FeedbackQuestion> questions;
+    private String a1;
+    private String a2;
+    private String a3;
+    private TestIo io;
+    private CliContext ctx;
+    @Captor ArgumentCaptor<List<FeedbackAnswer>> answerCaptor;
+
+    @Before
+    public void setup() {
+        a1 = a2 = a3 = "";
+        mockStatic(ExternalsUtil.class);
+        mockStatic(TmcUtil.class);
+        when(ExternalsUtil.getUserEditedMessage(anyString(), anyString(), anyBoolean()))
+                .thenReturn("you're programm sucks");
+        FeedbackQuestion q1 = new FeedbackQuestion();
+        q1.setQuestion("What's your opinion on TMC-CLI?");
+        q1.setKind("text");
+        FeedbackQuestion q2 = new FeedbackQuestion();
+        q2.setQuestion("Please rate this program.");
+        q2.setKind("intrange\\[0\\.\\.4]");
+        FeedbackQuestion q3 = new FeedbackQuestion();
+        q3.setQuestion("This type of question doesn't really exist but whatever");
+        q3.setKind("misc");
+        questions = Arrays.asList(q1, q2, q3);
+        io = new TestIo();
+        ctx = mock(CliContext.class);
+        Mockito.when(ctx.getIo()).thenReturn(io);
+    }
 
-    @Ignore
     @Test
-    public void todo() {
+    public void sendingFeedbackWorks() {
+        PowerMockito.when(
+                TmcUtil.sendFeedback(any(CliContext.class), any(List.class), any(URI.class)))
+                .thenReturn(true);
+        io.addLinePrompt("1");
+        io.addLinePrompt("who cars");
+        io.addConfirmationPrompt(true);
+        FeedbackHandler handler = new FeedbackHandler(ctx);
+        handler.sendFeedback(questions, URI.create("https://eeeeeeeeeee.com"));
+
+        verifyStatic();
+        TmcUtil.sendFeedback(any(CliContext.class), answerCaptor.capture(), any(URI.class));
+        List<FeedbackAnswer> answers = answerCaptor.getValue();
+        assertThat(answers.get(0).getQuestion().getQuestion()).isEqualTo(
+                "What's your opinion on TMC-CLI?");
+        assertThat(answers.get(0).getAnswer()).isEqualTo("you're programm sucks");
+        io.assertContains("Please rate this program.");
+        assertThat(answers.get(1).getQuestion().getQuestion()).isEqualTo(
+                "Please rate this program.");
+        assertThat(answers.get(1).getAnswer()).isEqualTo("1");
+        io.assertContains(
+                "Feedback question: This type of question doesn't really exist but whatever");
+        assertThat(answers.get(2).getQuestion().getQuestion()).isEqualTo(
+                "This type of question doesn't really exist but whatever");
+        assertThat(answers.get(2).getAnswer()).isEqualTo("who cars");
     }
 }