Fixes to predicate JUnit tests

git-svn-id: http://dev.eclipse.org/svnroot/technology/org.eclipse.stem/trunk@2769 92a21009-5b66-0410-b83a-dc787c41c6e9

3 files changed, 25 insertions, 51 deletions

diff --git a/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/IdentifiablePredicateTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/IdentifiablePredicateTest.java
index de8c23d09..4eac748f6 100644
--- a/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/IdentifiablePredicateTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/IdentifiablePredicateTest.java
@@ -57,12 +57,14 @@ public abstract class IdentifiablePredicateTest extends IdentifiableTest {
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see org.eclipse.stem.core.predicate.Predicate#evaluate(org.eclipse.stem.core.model.STEMTime, long, org.eclipse.stem.core.graph.Graph)
-	 * @generated
+	 * @generated NOT
 	 */
 	public void testEvaluate__STEMTime_long_Graph() {
-		// TODO: implement this operation test method
-		// Ensure that you remove @generated or mark it @generated NOT
-		fail();
+		final Predicate fixture = getFixture();
+		final STEMTime currentTime = getCurrentTimetoTest();
+		final long elapsedTime = getElapsedTimeToTest();
+		final boolean result = fixture.evaluate(currentTime, elapsedTime,  null);
+		assertTrue (result == getExpectedResult());
 	}
 
 	/**
@@ -70,28 +72,13 @@ public abstract class IdentifiablePredicateTest extends IdentifiableTest {
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see org.eclipse.stem.core.predicate.Predicate#reset()
-	 * @generated
-	 */
-	public void testReset() {
-		// TODO: implement this operation test method
-		// Ensure that you remove @generated or mark it @generated NOT
-		fail();
-	}
-
-	/**
-	 * Tests the '{@link org.eclipse.stem.core.predicate.Predicate#evaluate(org.eclipse.stem.core.model.STEMTime, long, org.eclipse.stem.core.model.Decorator) <em>Evaluate</em>}' operation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.stem.core.predicate.Predicate#evaluate(org.eclipse.stem.core.model.STEMTime, long, org.eclipse.stem.core.model.Decorator)
 	 * @generated NOT
 	 */
-	public void testEvaluate__STEMTime_long_Decorator() {
-		final Predicate fixture = getFixture();
-		final STEMTime currentTime = getCurrentTimetoTest();
-		final long elapsedTime = getElapsedTimeToTest();
-		final boolean result = fixture.evaluate(currentTime, elapsedTime,  null);
-		assertTrue (result == getExpectedResult());
-	}
+//	public void testReset() {
+//		// TODO: implement this operation test method
+//		// Ensure that you remove @generated or mark it @generated NOT
+//		fail();
+//	}
 
 	/**
 	 * @return
diff --git a/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/PredicateReferenceTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/PredicateReferenceTest.java
index 43748775a..5cc575d75 100644
--- a/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/PredicateReferenceTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/PredicateReferenceTest.java
@@ -82,7 +82,7 @@ public class PredicateReferenceTest extends PredicateTest {
 	 * @see org.eclipse.stem.core.predicate.tests.PredicateTest#testEvaluate__STEMTime_long_Decorator()
 	 */
 	@Override
-	public void testEvaluate__STEMTime_long_Decorator() {
+	public void testEvaluate__STEMTime_long_Graph() {
 		assertTrue(true);
 	}
 
diff --git a/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/PredicateTest.java b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/PredicateTest.java
index 83b10153d..83a338eb8 100644
--- a/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/PredicateTest.java
+++ b/tests/org.eclipse.stem.tests.core/src/org/eclipse/stem/core/predicate/tests/PredicateTest.java
@@ -75,41 +75,28 @@ public abstract class PredicateTest extends TestCase {
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see org.eclipse.stem.core.predicate.Predicate#evaluate(org.eclipse.stem.core.model.STEMTime, long, org.eclipse.stem.core.graph.Graph)
-	 * @generated
+	 * @generated NOT
 	 */
 	public void testEvaluate__STEMTime_long_Graph() {
-		// TODO: implement this operation test method
-		// Ensure that you remove @generated or mark it @generated NOT
-		fail();
-	}
-
+		final Predicate fixture = getFixture();
+		final STEMTime currentTime = getCurrentTimetoTest();
+		final long elapsedTime = getElapsedTimeToTest();
+		final boolean result = fixture.evaluate(currentTime, elapsedTime,  null);
+		assertTrue (result == getExpectedResult());
+	} // testEvaluate__STEMTime_long_Graph
+	
 	/**
 	 * Tests the '{@link org.eclipse.stem.core.predicate.Predicate#reset() <em>Reset</em>}' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see org.eclipse.stem.core.predicate.Predicate#reset()
-	 * @generated
-	 */
-	public void testReset() {
-		// TODO: implement this operation test method
-		// Ensure that you remove @generated or mark it @generated NOT
-		fail();
-	}
-
-	/**
-	 * Tests the '{@link org.eclipse.stem.core.predicate.Predicate#evaluate(org.eclipse.stem.core.model.STEMTime, long, org.eclipse.stem.core.model.Decorator) <em>Evaluate</em>}' operation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.stem.core.predicate.Predicate#evaluate(org.eclipse.stem.core.model.STEMTime, long, org.eclipse.stem.core.model.Decorator)
 	 * @generated NOT
 	 */
-	public void testEvaluate__STEMTime_long_Decorator() {
-		final Predicate fixture = getFixture();
-		final STEMTime currentTime = getCurrentTimetoTest();
-		final long elapsedTime = getElapsedTimeToTest();
-		final boolean result = fixture.evaluate(currentTime, elapsedTime,  null);
-		assertTrue (result == getExpectedResult());
-	} // testEvaluate__STEMTime_long_Decorator
+//	public void testReset() {
+//		// TODO: implement this operation test method
+//		// Ensure that you remove @generated or mark it @generated NOT
+//		fail();
+//	}
 
 	/**
 	 * @return