Fix and add tests

Author: Irene

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

@@ -16,6 +16,7 @@
 
 import fi.helsinki.cs.tmc.core.domain.Course;
 import fi.helsinki.cs.tmc.core.domain.Exercise;
+import fi.helsinki.cs.tmc.core.domain.Organization;
 import fi.helsinki.cs.tmc.core.domain.submission.FeedbackQuestion;
 import fi.helsinki.cs.tmc.core.domain.submission.SubmissionResult;
 

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

@@ -88,13 +88,12 @@ public void cleanUp() {
 
     @Test
     public void doNotRunIfNotLoggedIn() {
-        ctx = spy(new CliContext(io, core, new WorkDir(), new Settings(), analyticsFacade));
+        when(SettingsIo.loadAccountList()).thenReturn(new AccountList());
         app = new Application(ctx);
-        doReturn(false).when(ctx).checkIsLoggedIn(false, true);
 
         String[] args = {"config -l"};
         app.run(args);
-        io.assertNotContains("=");
+        io.assertContains("You are not logged in");
     }
     @Test
     public void printsErrorIfNoArgumentsGiven() {
@@ -133,9 +132,9 @@ public void listsAllPropertiesWithExtraArgument() {
 
     @Test
     public void getProperty() {
-        props.put("thing", "value");
-        app.run(new String[] {"config", "--get", "thing"});
-        io.assertContains("value");
+        props.put("testresults-right", "red");
+        app.run(new String[] {"config", "--get", "testresults-right"});
+        io.assertContains("red");
         io.assertAllPromptsUsed();
     }
 
@@ -194,8 +193,8 @@ public void setsOneExistingProperty() {
     public void setsMultiplePropertiesCorrectly() {
         io.addConfirmationPrompt(true);
         io.addConfirmationPrompt(true);
-        app.run(new String[] {"config", "update-date=12345", "testresults-right=cyan"});
-        assertEquals("12345", props.get("update-date"));
+        app.run(new String[] {"config", "testresults-left=blue", "testresults-right=cyan"});
+        assertEquals("blue", props.get("testresults-left"));
         assertEquals("cyan", props.get("testresults-right"));
         io.assertAllPromptsUsed();
     }

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

@@ -94,13 +94,12 @@ public void tearDown() throws IOException {
 
     @Test
     public void doNotRunIfNotLoggedIn() {
-        ctx = spy(new CliContext(io, mockCore, workDir, new Settings(), analyticsFacade));
+        when(SettingsIo.loadAccountList()).thenReturn(new AccountList());
         app = new Application(ctx);
-        doReturn(false).when(ctx).checkIsLoggedIn(false, true);
 
         String[] args = {"download", "foo"};
         app.run(args);
-        io.assertNotContains("Course doesn't exist");
+        io.assertContains("You are not logged in");
     }
 
     @Test

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

@@ -1,6 +1,7 @@
 package fi.helsinki.cs.tmc.cli.command;
 
 import static org.junit.Assert.assertNotNull;
+import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
@@ -10,9 +11,7 @@
 
 import fi.helsinki.cs.tmc.cli.Application;
 import fi.helsinki.cs.tmc.cli.analytics.AnalyticsFacade;
-import fi.helsinki.cs.tmc.cli.backend.Account;
-import fi.helsinki.cs.tmc.cli.backend.Settings;
-import fi.helsinki.cs.tmc.cli.backend.TmcUtil;
+import fi.helsinki.cs.tmc.cli.backend.*;
 import fi.helsinki.cs.tmc.cli.core.CliContext;
 import fi.helsinki.cs.tmc.cli.io.TestIo;
 import fi.helsinki.cs.tmc.cli.io.WorkDir;
@@ -38,7 +37,7 @@
 import java.util.List;
 
 @RunWith(PowerMockRunner.class)
-@PrepareForTest(TmcUtil.class)
+@PrepareForTest({ TmcUtil.class, SettingsIo.class })
 public class InfoCommandTest {
 
     private static final String COURSE_NAME = "2016-aalto-c";
@@ -53,6 +52,7 @@ public class InfoCommandTest {
     private TmcCore mockCore;
     private WorkDir workDir;
     private Course course;
+    private AnalyticsFacade analyticsFacade;
 
     @BeforeClass
     public static void setUpClass() throws Exception {
@@ -74,7 +74,7 @@ public void setUp() {
 
         mockCore = new TmcCore(new Settings(), new TaskExecutorImpl());
         EventSendBuffer eventSendBuffer = new EventSendBuffer(new Settings(), new EventStore());
-        AnalyticsFacade analyticsFacade = new AnalyticsFacade(new Settings(), eventSendBuffer);
+        analyticsFacade = new AnalyticsFacade(new Settings(), eventSendBuffer);
         ctx = new CliContext(io, mockCore, new WorkDir(), new Settings(), analyticsFacade);
         app = new Application(ctx);
         workDir = ctx.getWorkDir();
@@ -86,15 +86,22 @@ public void setUp() {
         course.setExercises(exercises);
 
         mockStatic(TmcUtil.class);
+        mockStatic(SettingsIo.class);
+        AccountList t = new AccountList();
+        t.addAccount(new Account("username"));
+        when(SettingsIo.loadAccountList()).thenReturn(t);
+        when(SettingsIo.saveAccountList(any(AccountList.class))).thenReturn(true);
+
     }
 
     @Test
-    public void failIfBackendFails() {
+    public void doNotRunIfNotLoggedIn() {
+        when(SettingsIo.loadAccountList()).thenReturn(new AccountList());
         app = new Application(ctx);
 
         String[] args = {"info", "course", "-i"};
         app.run(args);
-        io.assertNotContains("doesn't exist on this server.");
+        io.assertContains("You haven't logged in");
     }
 
     @Test

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

@@ -62,6 +62,14 @@ public void setUp() {
         when(SettingsIo.loadAccountList()).thenReturn(accountList);
     }
 
+    @Test
+    public void failIfNotLoggedIn() {
+        when(SettingsIo.loadAccountList()).thenReturn(new AccountList());
+        String[] args = {"courses"};
+        app.run(args);
+        io.assertContains("You are not logged in");
+    }
+
     @Test
     public void failIfThereIsNoConnection() {
         when(TmcUtil.hasConnection(eq(ctx))).thenReturn(false);

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

@@ -86,13 +86,12 @@ public void setUp() {
 
     @Test
     public void doNotRunIfNotLoggedIn() {
-        ctx = spy(new CliContext(io, mockCore, new WorkDir(), new Settings(), null));
+        when(SettingsIo.loadAccountList()).thenReturn(new AccountList());
         app = new Application(ctx);
-        doReturn(false).when(ctx).checkIsLoggedIn(false, true);
 
         String[] args = {"exercises", "-n", "foo", "-i"};
         app.run(args);
-        io.assertNotContains("Course 'foo' doesn't exist");
+        io.assertContains("You are not logged in");
     }
 
     @Test

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

@@ -243,4 +243,14 @@ public void analyticsAskedOnFirstLogin() {
         app.run(args);
         io.assertContains("analytics");
     }
+
+    @Test
+    public void logInNotAllowedIfAlreadyLoggedIn() {
+        AccountList list = new AccountList();
+        list.addAccount(new Account("loggedin"));
+        when(SettingsIo.loadAccountList()).thenReturn(list);
+        String[] args = {"login"};
+        app.run(args);
+        io.assertContains("You are already logged in");
+    }
 }

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

@@ -77,13 +77,12 @@ public void setUp() {
 
     @Test
     public void doNotRunIfNotLoggedIn() {
-        ctx = spy(new CliContext(io, mockCore, new WorkDir(), new Settings(), analyticsFacade));
+        when(SettingsIo.loadAccountList()).thenReturn(new AccountList());
         app = new Application(ctx);
-        doReturn(false).when(ctx).checkIsLoggedIn(false, true);
 
         String[] args = {"organization"};
         app.run(args);
-        io.assertNotContains("slug");
+        io.assertContains("You are not logged in");
     }
 
     @Test

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

@@ -107,12 +107,12 @@ public void setup() throws URISyntaxException {
     @Test
     public void doNotRunIfNotLoggedIn() {
         when(CourseInfoIo.load(any(Path.class))).thenReturn(null);
-        list = new AccountList();
+        when(SettingsIo.loadAccountList()).thenReturn(new AccountList());
         app = new Application(ctx);
 
         String[] args = {"paste"};
         app.run(args);
-        io.assertNotContains("No exercise specified");
+        io.assertContains("You are not logged in");
     }
 
     @Test

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

@@ -11,8 +11,7 @@
 
 import fi.helsinki.cs.tmc.cli.Application;
 import fi.helsinki.cs.tmc.cli.analytics.AnalyticsFacade;
-import fi.helsinki.cs.tmc.cli.backend.Settings;
-import fi.helsinki.cs.tmc.cli.backend.TmcUtil;
+import fi.helsinki.cs.tmc.cli.backend.*;
 import fi.helsinki.cs.tmc.cli.core.CliContext;
 import fi.helsinki.cs.tmc.cli.io.TestIo;
 import fi.helsinki.cs.tmc.cli.io.WorkDir;
@@ -44,7 +43,7 @@
 
 /*TODO test the command line options */
 @RunWith(PowerMockRunner.class)
-@PrepareForTest(TmcUtil.class)
+@PrepareForTest({ TmcUtil.class, SettingsIo.class })
 public class RunTestsCommandTest {
 
     private static final String COURSE_NAME = "2016-aalto-c";
@@ -98,17 +97,22 @@ public void setUp() {
         runResult = new RunResult(status, testResults, logs);
 
         mockStatic(TmcUtil.class);
+        mockStatic(SettingsIo.class);
+        when(TmcUtil.hasConnection(eq(ctx))).thenReturn(true);
+        AccountList t = new AccountList();
+        t.addAccount(new Account("testuser"));
+        when(SettingsIo.loadAccountList()).thenReturn(t);
+        when(SettingsIo.saveAccountList(any(AccountList.class))).thenReturn(true);
     }
 
     @Test
     public void doNotRunIfNotLoggedIn() {
-        ctx = spy(new CliContext(io, mockCore, new WorkDir(), new Settings(), null));
+        when(SettingsIo.loadAccountList()).thenReturn(new AccountList());
         app = new Application(ctx);
-        doReturn(false).when(ctx).checkIsLoggedIn(false, true);
 
         String[] args = {"test"};
         app.run(args);
-        io.assertNotContains("Testing:");
+        io.assertContains("You are not logged in");
     }
 
     @Test