ToothPickRule should reset after test method is finished

stephanenicolas · Nov 8, 2016 · 9be9aab · 9be9aab
1 parent 47f6326
commit 9be9aab
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 8 deletions.
diff --git a/toothpick-testing/src/main/java/toothpick/testing/ToothPickRule.java b/toothpick-testing/src/main/java/toothpick/testing/ToothPickRule.java
@@ -35,11 +35,7 @@ public void setScopeName(Object scopeName) {
 
   @Override
   public Statement apply(Statement base, Description description) {
-    try {
-      return base;
-    } finally {
-      Toothpick.reset();
-    }
+    return new ToothPickStatement(base);
   }
 
   public ToothPickTestModule getTestModule() {

diff --git a/toothpick-testing/src/main/java/toothpick/testing/ToothPickStatement.java b/toothpick-testing/src/main/java/toothpick/testing/ToothPickStatement.java
@@ -0,0 +1,22 @@
+package toothpick.testing;
+
+import org.junit.runners.model.Statement;
+import toothpick.Toothpick;
+
+class ToothPickStatement extends Statement {
+
+  private final Statement base;
+
+  ToothPickStatement(Statement base) {
+    this.base = base;
+  }
+
+  @Override
+  public void evaluate() throws Throwable {
+    try {
+      base.evaluate();
+    } finally {
+      Toothpick.reset();
+    }
+  }
+}
diff --git a/toothpick-testing/src/test/java/toothpick/testing/TestScopeName.java b/toothpick-testing/src/test/java/toothpick/testing/TestScopeName.java
@@ -25,6 +25,11 @@ public void testSetScopeName_shouldFail_whenScopeNameWasAlreadySet() throws Exce
     toothPickRule.setScopeName("Bar");
   }
 
+  @Test(expected = IllegalStateException.class)
+  public void testSetScopeName_shouldFail_whenScopeNameAlreadyContainsATestModule() throws Exception {
+    toothPickRuleWithoutScopeName.setScopeName("Foo");
+  }
+
   @Test
   public void testScopeNameSetByConstruction() throws Exception {
     assertThat(toothPickRule.getScope(), notNullValue());
@@ -34,9 +39,9 @@ public void testScopeNameSetByConstruction() throws Exception {
 
   @Test
   public void testSetScopeName() throws Exception {
-    toothPickRuleWithoutScopeName.setScopeName("Foo");
+    toothPickRuleWithoutScopeName.setScopeName("Bar");
     assertThat(toothPickRuleWithoutScopeName.getScope(), notNullValue());
-    assertThat(toothPickRuleWithoutScopeName.getScope().getName(), is((Object) "Foo"));
-    assertThat(toothPickRule.getTestModule(), notNullValue());
+    assertThat(toothPickRuleWithoutScopeName.getScope().getName(), is((Object) "Bar"));
+    assertThat(toothPickRuleWithoutScopeName.getTestModule(), notNullValue());
   }
 }