Allow setting password & small tweaks

Author: Irene

src/main/java/fi/helsinki/cs/tmc/cli/Application.java

@@ -7,7 +7,11 @@
 import fi.helsinki.cs.tmc.cli.command.SubmitCommand;
 import fi.helsinki.cs.tmc.cli.core.AbstractCommand;
 import fi.helsinki.cs.tmc.cli.core.CliContext;
-import fi.helsinki.cs.tmc.cli.io.*;
+import fi.helsinki.cs.tmc.cli.io.ShutdownHandler;
+import fi.helsinki.cs.tmc.cli.io.Io;
+import fi.helsinki.cs.tmc.cli.io.EnvironmentUtil;
+import fi.helsinki.cs.tmc.cli.io.HelpGenerator;
+import fi.helsinki.cs.tmc.cli.io.WorkDir;
 import fi.helsinki.cs.tmc.cli.updater.AutoUpdater;
 import fi.helsinki.cs.tmc.cli.core.CommandFactory;
 

src/main/java/fi/helsinki/cs/tmc/cli/analytics/AnalyticsFacade.java

@@ -2,20 +2,11 @@
 
 import fi.helsinki.cs.tmc.core.domain.Course;
 import fi.helsinki.cs.tmc.core.domain.Exercise;
-import fi.helsinki.cs.tmc.core.exceptions.UninitializedHolderException;
-import fi.helsinki.cs.tmc.core.holders.TmcSettingsHolder;
 import fi.helsinki.cs.tmc.spyware.EventSendBuffer;
-import fi.helsinki.cs.tmc.spyware.EventStore;
 import fi.helsinki.cs.tmc.spyware.LoggableEvent;
 import fi.helsinki.cs.tmc.spyware.SpywareSettings;
 import org.slf4j.LoggerFactory;
-
-import java.awt.*;
-import java.security.spec.ECField;
-import java.util.List;
-import java.util.Map;
 import java.util.Optional;
-import java.util.logging.Logger;
 
 public class AnalyticsFacade {
     private static final org.slf4j.Logger logger = LoggerFactory.getLogger(AnalyticsFacade.class);
@@ -60,15 +51,6 @@ public void saveAnalytics(Exercise exercise, String command) {
         saveEvent(event);
     }
 
-    private void saveEvent(LoggableEvent event) {
-        this.eventSendBuffer.receiveEvent(event);
-        try {
-            eventSendBuffer.saveNow(1000);
-        } catch (Exception e) {
-            logger.warn("Failed to save events: ", e.getStackTrace());
-        }
-    }
-
     public Optional<Thread> sendAnalytics() {
         if (!settings.isSpywareEnabled()) {
             return Optional.empty();
@@ -77,4 +59,13 @@ public Optional<Thread> sendAnalytics() {
         t.run();
         return Optional.of(t);
     }
+
+    private void saveEvent(LoggableEvent event) {
+        this.eventSendBuffer.receiveEvent(event);
+        try {
+            eventSendBuffer.saveNow(1000);
+        } catch (Exception e) {
+            logger.warn("Failed to save events: ", e.getStackTrace());
+        }
+    }
 }

src/main/java/fi/helsinki/cs/tmc/cli/backend/AccountList.java

@@ -1,9 +1,6 @@
 package fi.helsinki.cs.tmc.cli.backend;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
 
 /**
  * This is a class for storing all different accounts as a single array.
@@ -54,18 +51,17 @@ public void addAccount(Account newSettings) {
     }
 
     public void deleteAccount(String username) {
-        Account remove = null;
+        Set<Account> removables = new HashSet<>();
         for (Account account : this.accountArray) {
             if (!account.getUsername().isPresent()) {
-                continue;
-            }
-            if (account.getUsername().get().equals(username)) {
-                remove = account;
+                removables.add(account);
+            } else if (account.getUsername().get().equals(username)) {
+                removables.add(account);
                 break;
             }
         }
-        if (remove != null) {
-            this.accountArray.remove(remove);
+        if (!removables.isEmpty()) {
+            this.accountArray.removeAll(removables);
         }
     }
 

src/main/java/fi/helsinki/cs/tmc/cli/backend/Settings.java

@@ -124,7 +124,7 @@ public Optional<String> getPassword() {
 
     @Override
     public void setPassword(Optional<String> password) {
-            throw new RuntimeException("Using password is deprecated");
+        account.setPassword(password);
     }
 
     @Override

src/main/java/fi/helsinki/cs/tmc/cli/utils/PropertyFunctions.java

@@ -1,8 +1,5 @@
 package fi.helsinki.cs.tmc.cli.utils;
 
-/**
- * Created by nikkaire on 5.1.2018.
- */
 public interface PropertyFunctions {
 
     String getter();

src/test/java/fi/helsinki/cs/tmc/cli/analytics/AnalyticsFacadeTest.java

@@ -1,6 +1,5 @@
 package fi.helsinki.cs.tmc.cli.analytics;
 
-
 import fi.helsinki.cs.tmc.cli.Application;
 import fi.helsinki.cs.tmc.cli.backend.*;
 import fi.helsinki.cs.tmc.cli.command.SubmitCommandTest;
@@ -24,7 +23,10 @@
 
 import static junit.framework.Assert.assertNotNull;
 import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.never;
 import static org.powermock.api.mockito.PowerMockito.mock;
 import static org.powermock.api.mockito.PowerMockito.mockStatic;
 

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

@@ -4,14 +4,16 @@
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
 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.analytics.AnalyticsFacade;
-import fi.helsinki.cs.tmc.cli.backend.*;
+import fi.helsinki.cs.tmc.cli.backend.Settings;
+import fi.helsinki.cs.tmc.cli.backend.Account;
+import fi.helsinki.cs.tmc.cli.backend.SettingsIo;
+import fi.helsinki.cs.tmc.cli.backend.TmcUtil;
+import fi.helsinki.cs.tmc.cli.backend.AccountList;
 import fi.helsinki.cs.tmc.cli.core.CliContext;
 import fi.helsinki.cs.tmc.cli.io.TestIo;