Changeset 640

Timestamp:

08/27/12 16:15:11 (12 years ago)

Author:

sherbold

Message:

• updated CMDexecTest to fit new outputs

File:

• trunk/java-utils-test/src/test/java/de/ugoe/cs/util/console/defaultcommands/CMDexecTest.java (modified) (3 diffs)

trunk/java-utils-test/src/test/java/de/ugoe/cs/util/console/defaultcommands/CMDexecTest.java

@@ -44 +44 @@
                 parameters
                                 .add("testdata/de.ugoe.cs.util.console.defaultcommands.CMDexecTest/script1");
-                String expected = "mockCommand";
+                String exepctedCommand = "mockCommand";
+                String expectedTrace = "Executing \"mockCommand\"";
 
                 fixture.run(parameters);
 
-                assertEquals(expected, mockCommandListener.getLastCommand());
-                assertEquals(expected + ENDLINE, mockTraceListener.getLastTrace());
+                assertEquals(exepctedCommand, mockCommandListener.getLastCommand());
+                assertEquals(expectedTrace + ENDLINE, mockTraceListener.getLastTrace());
         }
 
@@ -62 +63 @@
                 parameters
                                 .add("testdata/de.ugoe.cs.util.console.defaultcommands.CMDexecTest/script2");
-                String expected = "mockCommand param1";
+                String expectedCommand = "mockCommand param1";
+                String expectedTrace = "Executing \"mockCommand param1\"";
 
                 fixture.run(parameters);
 
-                assertEquals(expected, mockCommandListener.getLastCommand());
-                assertEquals(expected + ENDLINE, mockTraceListener.getLastTrace());
+                assertEquals(expectedCommand, mockCommandListener.getLastCommand());
+                assertEquals(expectedTrace + ENDLINE, mockTraceListener.getLastTrace());
         }
 
@@ -93 +95 @@
                                 .add("testdata/de.ugoe.cs.util.console.defaultcommands.CMDexecTest/script2");
                 parameters.add(Integer.parseInt("1"));
-                String expected = "mockCommand param1";
+                String expectedCommand = "mockCommand param1";
+                String expectedTrace = "Executing \"mockCommand param1\"";
 
                 fixture.run(parameters);
 
-                assertEquals(expected, mockCommandListener.getLastCommand());
-                assertEquals(expected + ENDLINE, mockTraceListener.getLastTrace());
+                assertEquals(expectedCommand, mockCommandListener.getLastCommand());
+                assertEquals(expectedTrace + ENDLINE, mockTraceListener.getLastTrace());
         }