Reload CommandFactory for every unit test.

Author: Aleksi Salmela

src/main/java/fi/helsinki/cs/tmc/cli/core/CommandFactory.java

@@ -45,9 +45,10 @@ public static void addCommand(String name, String packageName, Class commandClas
     /**
      * Merge this method implementation with the above version.
      *
+     * @param packageName The package/category of the command
      * @param commandClass The class of the command
      */
-    public static void addCommand(Class commandClass) {
+    protected static void addCommand(String packageName, Class commandClass) {
         Class<Command> klass = castToCommandClass(commandClass);
         Annotation annotation = klass.getAnnotation(Command.class);
         if (annotation == null) {
@@ -57,7 +58,7 @@ public static void addCommand(Class commandClass) {
         if (!AbstractCommand.class.isAssignableFrom(commandClass)) {
             throw new RuntimeException("Command must implement CommandInterface");
         }
-        CommandFactory.commands.put(command.name(), klass);
+        CommandFactory.addCommand(command.name(), packageName, commandClass);
     }
 
     /**

src/test/java/fi/helsinki/cs/tmc/cli/core/CommandFactoryTest.java

@@ -1,10 +1,13 @@
 package fi.helsinki.cs.tmc.cli.core;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import fi.helsinki.cs.tmc.cli.Application;
+import fi.helsinki.cs.tmc.cli.command.HelpCommand;
 import fi.helsinki.cs.tmc.cli.io.TestIo;
 
 import org.apache.commons.cli.CommandLine;
@@ -26,6 +29,7 @@ public class CommandFactoryTest {
     @Before
     public void setUp() {
         ctx = new CliContext(new TestIo());
+        CommandFactory.reload();
     }
 
     @Test
@@ -34,12 +38,12 @@ public void constructorAddsCommands() {
     }
 
     @Test
-    public void createCommandWorksWithRealCommand() {
+    public void createHelpCommand() {
         assertNotNull(CommandFactory.createCommand("help"));
     }
 
     @Test
-    public void createCommandWorksWithBadCommand() {
+    public void createNonexistingCommand() {
         assertNull(CommandFactory.createCommand("foobar"));
     }
 
@@ -59,7 +63,7 @@ public void run(CliContext context, CommandLine args) {
 
     @Test
     public void addGoodCommand() {
-        CommandFactory.addCommand(GoodCommand.class);
+        CommandFactory.addCommand("category", GoodCommand.class);
         //TODO check the all the stuff in the command
         assertNotNull(CommandFactory.createCommand("good"));
     }
@@ -82,7 +86,7 @@ public void addCommandWithoutProperAnnotation() {
         //WARNING The exception code leads to unpredicatble test results
         //exception.expect(RuntimeException.class);
         //exception.expectMessage(contains("annotation"));
-        CommandFactory.addCommand(BadCommand.class);
+        CommandFactory.addCommand("category", BadCommand.class);
     }
 
     private static class ReallyBadCommand {}
@@ -92,6 +96,6 @@ public void addCommandThatDoesntExtendInterface() {
         //WARNING The exception code leads to unpredicatble test results
         //exception.expect(RuntimeException.class);
         //exception.expectMessage(contains("Interface"));
-        CommandFactory.addCommand(ReallyBadCommand.class);
+        CommandFactory.addCommand("category", ReallyBadCommand.class);
     }
 }