[jbehave-scm] [1002] trunk/jbehave-core/src/java/org/jbehave: JBEHAVE-144: Refactored Ensure utility class to only depend on Hamcrest.

Sun, 02 Nov 2008 01:07:11 -0800

Title: [1002] trunk/jbehave-core/src/java/org/jbehave: JBEHAVE-144: Refactored Ensure utility class to only depend on Hamcrest.
Revision
1002
Author
mauro
Date
2008-11-02 03:06:59 -0600 (Sun, 02 Nov 2008)

Log Message

JBEHAVE-144: Refactored Ensure utility class to only depend on Hamcrest. 
Removed redundant JUnit4Ensure.


Modified Paths




Removed Paths


    

  • trunk/jbehave-core/src/java/org/jbehave/util/
    •

Diff

Modified: trunk/examples/gameoflife/src/behaviour/com/lunivore/gameoflife/domain/CellBehaviour.java (1001 => 1002)

--- trunk/examples/gameoflife/src/behaviour/com/lunivore/gameoflife/domain/CellBehaviour.java	2008-10-30 08:49:17 UTC (rev 1001)
+++ trunk/examples/gameoflife/src/behaviour/com/lunivore/gameoflife/domain/CellBehaviour.java	2008-11-02 09:06:59 UTC (rev 1002)
@@ -2,7 +2,7 @@
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.not;
-import static org.jbehave.util.JUnit4Ensure.ensureThat;
+import static org.jbehave.Ensure.ensureThat;
 
 import org.junit.Test;

Modified: trunk/examples/gameoflife/src/behaviour/com/lunivore/gameoflife/domain/GameBehaviour.java (1001 => 1002)

--- trunk/examples/gameoflife/src/behaviour/com/lunivore/gameoflife/domain/GameBehaviour.java	2008-10-30 08:49:17 UTC (rev 1001)
+++ trunk/examples/gameoflife/src/behaviour/com/lunivore/gameoflife/domain/GameBehaviour.java	2008-11-02 09:06:59 UTC (rev 1002)
@@ -1,6 +1,6 @@
 package com.lunivore.gameoflife.domain;
 
-import static org.jbehave.util.JUnit4Ensure.ensureThat;
+import static org.jbehave.Ensure.ensureThat;
 
 import org.hamcrest.CoreMatchers;
 import org.junit.Test;

Modified: trunk/examples/gameoflife/src/behaviour/com/lunivore/gameoflife/view/string/StringRendererBehaviour.java (1001 => 1002)

--- trunk/examples/gameoflife/src/behaviour/com/lunivore/gameoflife/view/string/StringRendererBehaviour.java	2008-10-30 08:49:17 UTC (rev 1001)
+++ trunk/examples/gameoflife/src/behaviour/com/lunivore/gameoflife/view/string/StringRendererBehaviour.java	2008-11-02 09:06:59 UTC (rev 1002)
@@ -1,7 +1,7 @@
 package com.lunivore.gameoflife.view.string;
 
 import static org.hamcrest.CoreMatchers.equalTo;
-import static org.jbehave.util.JUnit4Ensure.ensureThat;
+import static org.jbehave.Ensure.ensureThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.stub;

Modified: trunk/examples/gameoflife/src/scenario/com/lunivore/gameoflife/steps/GridSteps.java (1001 => 1002)

--- trunk/examples/gameoflife/src/scenario/com/lunivore/gameoflife/steps/GridSteps.java	2008-10-30 08:49:17 UTC (rev 1001)
+++ trunk/examples/gameoflife/src/scenario/com/lunivore/gameoflife/steps/GridSteps.java	2008-11-02 09:06:59 UTC (rev 1002)
@@ -1,7 +1,7 @@
 package com.lunivore.gameoflife.steps;
 
 import static org.hamcrest.CoreMatchers.equalTo;
-import static org.jbehave.util.JUnit4Ensure.ensureThat;
+import static org.jbehave.Ensure.ensureThat;
 
 import org.jbehave.scenario.annotations.Given;
 import org.jbehave.scenario.annotations.Then;

Modified: trunk/examples/noughtsandcrosses/src/behaviour/com/lunivore/noughtsandcrosses/game/GameModelBehaviour.java (1001 => 1002)

--- trunk/examples/noughtsandcrosses/src/behaviour/com/lunivore/noughtsandcrosses/game/GameModelBehaviour.java	2008-10-30 08:49:17 UTC (rev 1001)
+++ trunk/examples/noughtsandcrosses/src/behaviour/com/lunivore/noughtsandcrosses/game/GameModelBehaviour.java	2008-11-02 09:06:59 UTC (rev 1002)
@@ -1,7 +1,7 @@
 package com.lunivore.noughtsandcrosses.game;
 
 import static org.hamcrest.CoreMatchers.equalTo;
-import static org.jbehave.util.JUnit4Ensure.ensureThat;
+import static org.jbehave.Ensure.ensureThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;

Modified: trunk/examples/noughtsandcrosses/src/behaviour/com/lunivore/noughtsandcrosses/game/WinningScenarioBehaviour.java (1001 => 1002)

--- trunk/examples/noughtsandcrosses/src/behaviour/com/lunivore/noughtsandcrosses/game/WinningScenarioBehaviour.java	2008-10-30 08:49:17 UTC (rev 1001)
+++ trunk/examples/noughtsandcrosses/src/behaviour/com/lunivore/noughtsandcrosses/game/WinningScenarioBehaviour.java	2008-11-02 09:06:59 UTC (rev 1002)
@@ -1,6 +1,6 @@
 package com.lunivore.noughtsandcrosses.game;
 
-import static org.jbehave.util.JUnit4Ensure.ensureThat;
+import static org.jbehave.Ensure.ensureThat;
 
 import java.util.HashMap;
 import java.util.Map;

Modified: trunk/examples/noughtsandcrosses/src/scenario/com/lunivore/noughtsandcrosses/steps/GridSteps.java (1001 => 1002)

--- trunk/examples/noughtsandcrosses/src/scenario/com/lunivore/noughtsandcrosses/steps/GridSteps.java	2008-10-30 08:49:17 UTC (rev 1001)
+++ trunk/examples/noughtsandcrosses/src/scenario/com/lunivore/noughtsandcrosses/steps/GridSteps.java	2008-11-02 09:06:59 UTC (rev 1002)
@@ -1,7 +1,7 @@
 package com.lunivore.noughtsandcrosses.steps;
 
 import static org.hamcrest.CoreMatchers.equalTo;
-import static org.jbehave.util.JUnit4Ensure.ensureThat;
+import static org.jbehave.Ensure.ensureThat;
 
 import java.awt.Component;
 import java.util.ArrayList;

Modified: trunk/examples/noughtsandcrosses/src/scenario/com/lunivore/noughtsandcrosses/steps/LolCatzSteps.java (1001 => 1002)

--- trunk/examples/noughtsandcrosses/src/scenario/com/lunivore/noughtsandcrosses/steps/LolCatzSteps.java	2008-10-30 08:49:17 UTC (rev 1001)
+++ trunk/examples/noughtsandcrosses/src/scenario/com/lunivore/noughtsandcrosses/steps/LolCatzSteps.java	2008-11-02 09:06:59 UTC (rev 1002)
@@ -1,7 +1,7 @@
 package com.lunivore.noughtsandcrosses.steps;
 
 import static org.hamcrest.CoreMatchers.equalTo;
-import static org.jbehave.util.JUnit4Ensure.ensureThat;
+import static org.jbehave.Ensure.ensureThat;
 
 import java.awt.Component;
 import java.util.ArrayList;

Modified: trunk/examples/trader/src/main/java/org/jbehave/examples/trader/scenarios/TraderContainerSteps.java (1001 => 1002)

--- trunk/examples/trader/src/main/java/org/jbehave/examples/trader/scenarios/TraderContainerSteps.java	2008-10-30 08:49:17 UTC (rev 1001)
+++ trunk/examples/trader/src/main/java/org/jbehave/examples/trader/scenarios/TraderContainerSteps.java	2008-11-02 09:06:59 UTC (rev 1002)
@@ -1,7 +1,7 @@
 package org.jbehave.examples.trader.scenarios;
 
 import static org.hamcrest.CoreMatchers.equalTo;
-import static org.jbehave.util.JUnit4Ensure.ensureThat;
+import static org.jbehave.Ensure.ensureThat;
 
 import java.util.List;

Modified: trunk/examples/trader/src/main/java/org/jbehave/examples/trader/scenarios/TraderSteps.java (1001 => 1002)

--- trunk/examples/trader/src/main/java/org/jbehave/examples/trader/scenarios/TraderSteps.java	2008-10-30 08:49:17 UTC (rev 1001)
+++ trunk/examples/trader/src/main/java/org/jbehave/examples/trader/scenarios/TraderSteps.java	2008-11-02 09:06:59 UTC (rev 1002)
@@ -2,7 +2,7 @@
 
 import static java.util.Arrays.asList;
 import static org.hamcrest.CoreMatchers.equalTo;
-import static org.jbehave.util.JUnit4Ensure.ensureThat;
+import static org.jbehave.Ensure.ensureThat;
 
 import java.util.List;

Modified: trunk/jbehave-core/src/behaviour/org/jbehave/container/pico/XMLPicoContainerStepsBehaviour.java (1001 => 1002)

--- trunk/jbehave-core/src/behaviour/org/jbehave/container/pico/XMLPicoContainerStepsBehaviour.java	2008-10-30 08:49:17 UTC (rev 1001)
+++ trunk/jbehave-core/src/behaviour/org/jbehave/container/pico/XMLPicoContainerStepsBehaviour.java	2008-11-02 09:06:59 UTC (rev 1002)
@@ -1,7 +1,7 @@
 package org.jbehave.container.pico;
 
 import static org.hamcrest.CoreMatchers.equalTo;
-import static org.jbehave.util.JUnit4Ensure.ensureThat;
+import static org.jbehave.Ensure.ensureThat;
 
 import org.jbehave.container.AComponent;
 import org.jbehave.container.AnotherComponent;

Modified: trunk/jbehave-core/src/behaviour/org/jbehave/scenario/PropertyBasedConfigurationBehaviour.java (1001 => 1002)

--- trunk/jbehave-core/src/behaviour/org/jbehave/scenario/PropertyBasedConfigurationBehaviour.java	2008-10-30 08:49:17 UTC (rev 1001)
+++ trunk/jbehave-core/src/behaviour/org/jbehave/scenario/PropertyBasedConfigurationBehaviour.java	2008-11-02 09:06:59 UTC (rev 1002)
@@ -2,7 +2,7 @@
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
-import static org.jbehave.util.JUnit4Ensure.ensureThat;
+import static org.jbehave.Ensure.ensureThat;
 
 import org.jbehave.scenario.definition.ScenarioGivenWhenThenAnd;
 import org.jbehave.scenario.errors.ErrorStrategy;

Modified: trunk/jbehave-core/src/behaviour/org/jbehave/scenario/errors/ErrorStrategyInWhichWeTrustTheReporterBehaviour.java (1001 => 1002)

--- trunk/jbehave-core/src/behaviour/org/jbehave/scenario/errors/ErrorStrategyInWhichWeTrustTheReporterBehaviour.java	2008-10-30 08:49:17 UTC (rev 1001)
+++ trunk/jbehave-core/src/behaviour/org/jbehave/scenario/errors/ErrorStrategyInWhichWeTrustTheReporterBehaviour.java	2008-11-02 09:06:59 UTC (rev 1002)
@@ -1,7 +1,7 @@
 package org.jbehave.scenario.errors;
 
 import static org.hamcrest.CoreMatchers.equalTo;
-import static org.jbehave.util.JUnit4Ensure.ensureThat;
+import static org.jbehave.Ensure.ensureThat;
 
 import org.junit.Test;

Modified: trunk/jbehave-core/src/behaviour/org/jbehave/scenario/parser/CasePreservingResolverBehaviour.java (1001 => 1002)

--- trunk/jbehave-core/src/behaviour/org/jbehave/scenario/parser/CasePreservingResolverBehaviour.java	2008-10-30 08:49:17 UTC (rev 1001)
+++ trunk/jbehave-core/src/behaviour/org/jbehave/scenario/parser/CasePreservingResolverBehaviour.java	2008-11-02 09:06:59 UTC (rev 1002)
@@ -1,7 +1,7 @@
 package org.jbehave.scenario.parser;
 
 import static org.hamcrest.CoreMatchers.equalTo;
-import static org.jbehave.util.JUnit4Ensure.ensureThat;
+import static org.jbehave.Ensure.ensureThat;
 
 import org.jbehave.scenario.JUnitScenario;
 import org.junit.Test;

Modified: trunk/jbehave-core/src/behaviour/org/jbehave/scenario/parser/PrefixCapturingPatternBuilderBehaviour.java (1001 => 1002)

--- trunk/jbehave-core/src/behaviour/org/jbehave/scenario/parser/PrefixCapturingPatternBuilderBehaviour.java	2008-10-30 08:49:17 UTC (rev 1001)
+++ trunk/jbehave-core/src/behaviour/org/jbehave/scenario/parser/PrefixCapturingPatternBuilderBehaviour.java	2008-11-02 09:06:59 UTC (rev 1002)
@@ -1,7 +1,7 @@
 package org.jbehave.scenario.parser;
 
 import static org.hamcrest.CoreMatchers.equalTo;
-import static org.jbehave.util.JUnit4Ensure.ensureThat;
+import static org.jbehave.Ensure.ensureThat;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

Modified: trunk/jbehave-core/src/behaviour/org/jbehave/scenario/parser/ScenarioClassNameFinderBehaviour.java (1001 => 1002)

--- trunk/jbehave-core/src/behaviour/org/jbehave/scenario/parser/ScenarioClassNameFinderBehaviour.java	2008-10-30 08:49:17 UTC (rev 1001)
+++ trunk/jbehave-core/src/behaviour/org/jbehave/scenario/parser/ScenarioClassNameFinderBehaviour.java	2008-11-02 09:06:59 UTC (rev 1002)
@@ -1,7 +1,7 @@
 package org.jbehave.scenario.parser;
 
 import static java.util.Arrays.asList;
-import static org.jbehave.util.JUnit4Ensure.ensureThat;
+import static org.jbehave.Ensure.ensureThat;
 
 import java.io.IOException;
 import java.io.InputStream;

Modified: trunk/jbehave-core/src/behaviour/org/jbehave/scenario/parser/UnderscoredCamelCaseResolverBehaviour.java (1001 => 1002)

--- trunk/jbehave-core/src/behaviour/org/jbehave/scenario/parser/UnderscoredCamelCaseResolverBehaviour.java	2008-10-30 08:49:17 UTC (rev 1001)
+++ trunk/jbehave-core/src/behaviour/org/jbehave/scenario/parser/UnderscoredCamelCaseResolverBehaviour.java	2008-11-02 09:06:59 UTC (rev 1002)
@@ -1,7 +1,7 @@
 package org.jbehave.scenario.parser;
 
 import static org.hamcrest.CoreMatchers.equalTo;
-import static org.jbehave.util.JUnit4Ensure.ensureThat;
+import static org.jbehave.Ensure.ensureThat;
 
 import org.jbehave.scenario.JUnitScenario;
 import org.junit.Test;

Modified: trunk/jbehave-core/src/behaviour/org/jbehave/scenario/reporters/PrintStreamScenarioReporterBehaviour.java (1001 => 1002)

--- trunk/jbehave-core/src/behaviour/org/jbehave/scenario/reporters/PrintStreamScenarioReporterBehaviour.java	2008-10-30 08:49:17 UTC (rev 1001)
+++ trunk/jbehave-core/src/behaviour/org/jbehave/scenario/reporters/PrintStreamScenarioReporterBehaviour.java	2008-11-02 09:06:59 UTC (rev 1002)
@@ -1,7 +1,7 @@
 package org.jbehave.scenario.reporters;
 
 import static org.hamcrest.CoreMatchers.equalTo;
-import static org.jbehave.util.JUnit4Ensure.ensureThat;
+import static org.jbehave.Ensure.ensureThat;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;

Modified: trunk/jbehave-core/src/behaviour/org/jbehave/scenario/steps/CandidateStepBehaviour.java (1001 => 1002)

--- trunk/jbehave-core/src/behaviour/org/jbehave/scenario/steps/CandidateStepBehaviour.java	2008-10-30 08:49:17 UTC (rev 1001)
+++ trunk/jbehave-core/src/behaviour/org/jbehave/scenario/steps/CandidateStepBehaviour.java	2008-11-02 09:06:59 UTC (rev 1002)
@@ -2,8 +2,8 @@
 
 import static java.util.Arrays.asList;
 import static org.hamcrest.CoreMatchers.equalTo;
-import static org.jbehave.util.JUnit4Ensure.ensureThat;
-import static org.jbehave.util.JUnit4Ensure.not;
+import static org.jbehave.Ensure.ensureThat;
+import static org.jbehave.Ensure.not;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;

Modified: trunk/jbehave-core/src/behaviour/org/jbehave/scenario/steps/ParameterConvertersBehaviour.java (1001 => 1002)

--- trunk/jbehave-core/src/behaviour/org/jbehave/scenario/steps/ParameterConvertersBehaviour.java	2008-10-30 08:49:17 UTC (rev 1001)
+++ trunk/jbehave-core/src/behaviour/org/jbehave/scenario/steps/ParameterConvertersBehaviour.java	2008-11-02 09:06:59 UTC (rev 1002)
@@ -1,7 +1,7 @@
 package org.jbehave.scenario.steps;
 
 import static org.hamcrest.CoreMatchers.equalTo;
-import static org.jbehave.util.JUnit4Ensure.ensureThat;
+import static org.jbehave.Ensure.ensureThat;
 
 import java.beans.IntrospectionException;
 import java.lang.reflect.Type;

Modified: trunk/jbehave-core/src/behaviour/org/jbehave/scenario/steps/StepsBehaviour.java (1001 => 1002)

--- trunk/jbehave-core/src/behaviour/org/jbehave/scenario/steps/StepsBehaviour.java	2008-10-30 08:49:17 UTC (rev 1001)
+++ trunk/jbehave-core/src/behaviour/org/jbehave/scenario/steps/StepsBehaviour.java	2008-11-02 09:06:59 UTC (rev 1002)
@@ -1,7 +1,7 @@
 package org.jbehave.scenario.steps;
 
 import static org.hamcrest.CoreMatchers.equalTo;
-import static org.jbehave.util.JUnit4Ensure.ensureThat;
+import static org.jbehave.Ensure.ensureThat;
 
 import java.util.List;

Modified: trunk/jbehave-core/src/behaviour/org/jbehave/scenario/steps/UnmatchedToPendingStepCreatorBehaviour.java (1001 => 1002)

--- trunk/jbehave-core/src/behaviour/org/jbehave/scenario/steps/UnmatchedToPendingStepCreatorBehaviour.java	2008-10-30 08:49:17 UTC (rev 1001)
+++ trunk/jbehave-core/src/behaviour/org/jbehave/scenario/steps/UnmatchedToPendingStepCreatorBehaviour.java	2008-11-02 09:06:59 UTC (rev 1002)
@@ -2,7 +2,7 @@
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.collection.IsArray.array;
-import static org.jbehave.util.JUnit4Ensure.ensureThat;
+import static org.jbehave.Ensure.ensureThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.stub;

Modified: trunk/jbehave-core/src/java/org/jbehave/Ensure.java (1001 => 1002)

--- trunk/jbehave-core/src/java/org/jbehave/Ensure.java	2008-10-30 08:49:17 UTC (rev 1001)
+++ trunk/jbehave-core/src/java/org/jbehave/Ensure.java	2008-11-02 09:06:59 UTC (rev 1002)
@@ -1,7 +1,28 @@
 package org.jbehave;
 
-import org.jbehave.util.JUnit4Ensure;
+import static org.hamcrest.MatcherAssert.assertThat;
 
-public class Ensure extends JUnit4Ensure {
+import org.hamcrest.Matcher;
+import org.hamcrest.Matchers;
 
+/**
+ * Collection of static utility ensure methods that use Hamcrest matchers
+ * 
+ * @author Elizabeth Keogh
+ * @author Mauro Talevi
+ */
+public class Ensure {
+	
+    public static void ensureThat(boolean matches) {
+    	assertThat(matches, Matchers.is(true));
+    }
+    
+    public static <T> void ensureThat(T actual, Matcher<T> matcher) {
+        assertThat(actual, matcher);
+    }
+
+    public static boolean not(boolean matches) {
+        return !matches;
+    }
+
 }

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to