addl test case

lmcalpin · Mar 5, 2012 · 4b0c404 · 4b0c404
1 parent a5916df
commit 4b0c404
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 1 deletion.
diff --git a/sidrat-core/pom.xml b/sidrat-core/pom.xml
@@ -40,6 +40,12 @@
             <artifactId>commons-io</artifactId>
             <version>1.3.2</version>
         </dependency>
+        <dependency>
+        	<groupId>org.easymock</groupId>
+        	<artifactId>easymock</artifactId>
+        	<version>3.1</version>
+        	<scope>test</scope>
+        </dependency>
 	</dependencies>
 	<repositories>
 		<repository>

diff --git a/sidrat-core/src/main/java/com/sidrat/SidratDebugger.java b/sidrat-core/src/main/java/com/sidrat/SidratDebugger.java
@@ -25,7 +25,12 @@ public class SidratDebugger {
     public static ThreadLocal<SidratDebugger> DEBUGGER_CONTEXT = new ThreadLocal<SidratDebugger>();
 
     public static SidratDebugger instance() {
-        return DEBUGGER_CONTEXT.get();
+        SidratDebugger debugger = DEBUGGER_CONTEXT.get();
+        if (debugger == null) {
+            debugger = new SidratDebugger();
+            DEBUGGER_CONTEXT.set(debugger);
+        }
+        return debugger;
     }
 
     public SidratDebugger includePackage(String pkg) {

diff --git a/sidrat-core/src/test/java/com/sidrat/event/SidratCallbackTest.java b/sidrat-core/src/test/java/com/sidrat/event/SidratCallbackTest.java
@@ -1,12 +1,24 @@
 package com.sidrat.event;
 
+import static org.easymock.EasyMock.capture;
+import static org.easymock.EasyMock.isA;
+
+import com.sidrat.SidratDebugger;
+import com.sidrat.event.store.EventStore;
+
+import org.easymock.Capture;
+import org.easymock.EasyMock;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
 public class SidratCallbackTest {
+    EventStore mockedEventStore;
+
     @Before
     public void init() {
+        mockedEventStore = EasyMock.createMock(EventStore.class);
+        SidratDebugger.instance().store(mockedEventStore);
         while (SidratCallback.currentFrame() != null) {
             SidratCallback.popFrame();
         }
@@ -27,4 +39,23 @@ public void testExitPopsCurrentFrameToStack() {
         SidratCallback.exit();
         Assert.assertNull(SidratCallback.currentFrame());
     }
+
+    @Test
+    public void testExec() {
+        // expectations
+        Capture<SidratExecutionEvent> captured = new Capture<SidratExecutionEvent>();
+        mockedEventStore.store(capture(captured));
+
+        EasyMock.replay(mockedEventStore);
+
+        SidratCallback.enter("com.Test", "foo");
+        SidratCallback.exec(10);
+
+        EasyMock.verify(mockedEventStore);
+
+        Assert.assertEquals("com.Test", captured.getValue().getClassName());
+        Assert.assertEquals("foo", captured.getValue().getMethodName());
+        Assert.assertEquals(10, captured.getValue().getLineNumber());
+    }
+
 }