Changeset 638

Timestamp:

08/27/12 15:34:21 (12 years ago)

Author:

sherbold

Message:

• updated JUnit test of Console to test functions of new tracing API

Location:

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

Files:

• ConsoleTest.java (modified) (4 diffs)
• mock/MockTraceListener.java (modified) (1 diff)

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

@@ -1 +1 @@
 package de.ugoe.cs.util.console;
+
+import java.util.logging.Level;
 
 import org.junit.*;
@@ -317 +319 @@
         }
 
-        @Test
+        @SuppressWarnings("deprecation")
+    @Test
         public void testTrace_1()
                 throws Exception {
@@ -331 +334 @@
 
                 assertEquals(traceMsg, mockTraceListener1.getLastTrace());
+                assertEquals(Level.INFO, mockTraceListener1.getLastLevel());
                 assertEquals(traceMsg, mockTraceListener2.getLastTrace());
+                assertEquals(Level.INFO, mockTraceListener2.getLastLevel());
         }
         
-        @Test
+               @Test
+                public void testTrace_2()
+                        throws Exception {
+                        String traceMsg = "test";
+                        Level traceLevel = Level.SEVERE;
+                        
+                        MockTraceListener mockTraceListener1 = new MockTraceListener();
+                        MockTraceListener mockTraceListener2 = new MockTraceListener();
+                        
+                        Console.getInstance().registerTraceListener(mockTraceListener1);
+                        Console.getInstance().registerTraceListener(mockTraceListener2);
+
+                        Console.trace(traceLevel, traceMsg);
+
+                        assertEquals(traceMsg, mockTraceListener1.getLastTrace());
+                        assertEquals(traceLevel, mockTraceListener1.getLastLevel());
+                        assertEquals(traceMsg, mockTraceListener2.getLastTrace());
+                        assertEquals(traceLevel, mockTraceListener2.getLastLevel());
+                }
+        
+        @SuppressWarnings("deprecation")
+    @Test
         public void testTraceln_1()
                 throws Exception {
@@ -348 +374 @@
 
                 assertEquals(traceMsg+ENDLINE, mockTraceListener1.getLastTrace());
+                assertEquals(Level.INFO, mockTraceListener1.getLastLevel());
                 assertEquals(traceMsg+ENDLINE, mockTraceListener2.getLastTrace());
-
-                // add additional test code here
-        }
+                assertEquals(Level.INFO, mockTraceListener1.getLastLevel());
+        }
+        
+        @Test
+        public void testTraceln_2()
+                throws Exception {
+                String traceMsg = "test";
+                Level traceLevel = Level.SEVERE;
+
+                MockTraceListener mockTraceListener1 = new MockTraceListener();
+                MockTraceListener mockTraceListener2 = new MockTraceListener();
+                
+                Console.getInstance().registerTraceListener(mockTraceListener1);
+                Console.getInstance().registerTraceListener(mockTraceListener2);
+
+                Console.traceln(traceLevel, traceMsg);
+
+                assertEquals(traceMsg+ENDLINE, mockTraceListener1.getLastTrace());
+                assertEquals(traceLevel, mockTraceListener1.getLastLevel());
+                assertEquals(traceMsg+ENDLINE, mockTraceListener2.getLastTrace());
+                assertEquals(traceLevel, mockTraceListener2.getLastLevel());
+        }
 
         @Before

trunk/java-utils-test/src/test/java/de/ugoe/cs/util/console/mock/MockTraceListener.java

@@ -19 +19 @@
         public void traceMsg(String traceMessage, Level level) {
                 lastTrace = traceMessage;
+                lastLevel = level;
         }
 }