[jboss-svn-commits] JBL Code SVN: r30917 - labs/jbossrules/branches/true_modify_20100104/drools-core/src/test/java/org/drools/reteoo/test.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Jan 4 20:10:55 EST 2010
Author: tirelli
Date: 2010-01-04 20:10:54 -0500 (Mon, 04 Jan 2010)
New Revision: 30917
Added:
labs/jbossrules/branches/true_modify_20100104/drools-core/src/test/java/org/drools/reteoo/test/ReteDslTestEngineHelper.java
Modified:
labs/jbossrules/branches/true_modify_20100104/drools-core/src/test/java/org/drools/reteoo/test/ExistsNodeTest.java
labs/jbossrules/branches/true_modify_20100104/drools-core/src/test/java/org/drools/reteoo/test/JoinNodeTest.java
labs/jbossrules/branches/true_modify_20100104/drools-core/src/test/java/org/drools/reteoo/test/NotNodeTest.java
labs/jbossrules/branches/true_modify_20100104/drools-core/src/test/java/org/drools/reteoo/test/ReteDslTestEngine.java
Log:
JBRULES-2339: quick refactory to avoid code duplication
Modified: labs/jbossrules/branches/true_modify_20100104/drools-core/src/test/java/org/drools/reteoo/test/ExistsNodeTest.java
===================================================================
--- labs/jbossrules/branches/true_modify_20100104/drools-core/src/test/java/org/drools/reteoo/test/ExistsNodeTest.java 2010-01-05 00:11:34 UTC (rev 30916)
+++ labs/jbossrules/branches/true_modify_20100104/drools-core/src/test/java/org/drools/reteoo/test/ExistsNodeTest.java 2010-01-05 01:10:54 UTC (rev 30917)
@@ -1,26 +1,19 @@
package org.drools.reteoo.test;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.SequenceInputStream;
-import java.util.Arrays;
-
import junit.framework.TestCase;
-import org.drools.reteoo.test.ReteDslTestEngine.DslStep;
-
public class ExistsNodeTest extends TestCase {
public void testAssertRetract() {
- executeDsl( "ExistsNodeAssertRetractTest.data" );
+ ReteDslTestEngineHelper.executeDsl( "ExistsNodeAssertRetractTest.data" );
}
public void testModify() {
- executeDsl( "ExistsNodeModifyTest.data" );
+ ReteDslTestEngineHelper.executeDsl( "ExistsNodeModifyTest.data" );
}
public void testindex() {
- executeDsl( "ExistsNodeIndexTest.data" );
+ ReteDslTestEngineHelper.executeDsl( "ExistsNodeIndexTest.data" );
}
/*
@@ -55,37 +48,4 @@
}
*/
- public void executeDsl(String[] strings) {
- InputStream[] inputStreams = new InputStream[strings.length];
- for ( int i = 0; i < strings.length; i++ ) {
- inputStreams[i] = getClass().getResourceAsStream( strings[i] );
- assertNotNull( strings[i], inputStreams[i] );
- }
- executeDsl( inputStreams );
- }
-
- public void executeDsl(InputStream[] inputStreams) {
- InputStream inputStream = inputStreams[0];
-
- for ( int i = 1; i < inputStreams.length; i++ ) {
- assertNotNull( inputStreams[i] );
- inputStream = new SequenceInputStream( inputStream,
- inputStreams[i] );
- }
-
- executeDsl( inputStream );
- }
-
- public void executeDsl(String string) {
- executeDsl( getClass().getResourceAsStream( string ) );
- }
-
- public void executeDsl(InputStream inputStream) {
- assertNotNull( inputStream );
- DslStep[] steps = (DslStep[]) ReteDslTestEngine.buildDslCommands( new InputStreamReader( inputStream ) ).toArray( new DslStep[0] );
-
- ReteDslTestEngine tester = new ReteDslTestEngine();
- tester.run( Arrays.asList( steps ) );
- }
-
}
\ No newline at end of file
Modified: labs/jbossrules/branches/true_modify_20100104/drools-core/src/test/java/org/drools/reteoo/test/JoinNodeTest.java
===================================================================
--- labs/jbossrules/branches/true_modify_20100104/drools-core/src/test/java/org/drools/reteoo/test/JoinNodeTest.java 2010-01-05 00:11:34 UTC (rev 30916)
+++ labs/jbossrules/branches/true_modify_20100104/drools-core/src/test/java/org/drools/reteoo/test/JoinNodeTest.java 2010-01-05 01:10:54 UTC (rev 30917)
@@ -1,26 +1,19 @@
package org.drools.reteoo.test;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.SequenceInputStream;
-import java.util.Arrays;
-
import junit.framework.TestCase;
-import org.drools.reteoo.test.ReteDslTestEngine.DslStep;
-
public class JoinNodeTest extends TestCase {
public void testAssertRetract() {
- executeDsl( "JoinNodeAssertRetractTest.data" );
+ ReteDslTestEngineHelper.executeDsl( "JoinNodeAssertRetractTest.data" );
}
public void testModify() {
- executeDsl( "JoinNodeModifyTest.data" );
+ ReteDslTestEngineHelper.executeDsl( "JoinNodeModifyTest.data" );
}
public void testindex() {
- executeDsl( "JoinNodeIndexTest.data" );
+ ReteDslTestEngineHelper.executeDsl( "JoinNodeIndexTest.data" );
}
/*
@@ -55,37 +48,5 @@
}
*/
- public void executeDsl(String[] strings) {
- InputStream[] inputStreams = new InputStream[strings.length];
- for ( int i = 0; i < strings.length; i++ ) {
- inputStreams[i] = getClass().getResourceAsStream( strings[i] );
- assertNotNull( strings[i], inputStreams[i] );
- }
- executeDsl( inputStreams );
- }
- public void executeDsl(InputStream[] inputStreams) {
- InputStream inputStream = inputStreams[0];
-
- for ( int i = 1; i < inputStreams.length; i++ ) {
- assertNotNull( inputStreams[i] );
- inputStream = new SequenceInputStream( inputStream,
- inputStreams[i] );
- }
-
- executeDsl( inputStream );
- }
-
- public void executeDsl(String string) {
- executeDsl( getClass().getResourceAsStream( string ) );
- }
-
- public void executeDsl(InputStream inputStream) {
- assertNotNull( inputStream );
- DslStep[] steps = (DslStep[]) ReteDslTestEngine.buildDslCommands( new InputStreamReader( inputStream ) ).toArray( new DslStep[0] );
-
- ReteDslTestEngine tester = new ReteDslTestEngine();
- tester.run( Arrays.asList( steps ) );
- }
-
}
\ No newline at end of file
Modified: labs/jbossrules/branches/true_modify_20100104/drools-core/src/test/java/org/drools/reteoo/test/NotNodeTest.java
===================================================================
--- labs/jbossrules/branches/true_modify_20100104/drools-core/src/test/java/org/drools/reteoo/test/NotNodeTest.java 2010-01-05 00:11:34 UTC (rev 30916)
+++ labs/jbossrules/branches/true_modify_20100104/drools-core/src/test/java/org/drools/reteoo/test/NotNodeTest.java 2010-01-05 01:10:54 UTC (rev 30917)
@@ -1,26 +1,19 @@
package org.drools.reteoo.test;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.SequenceInputStream;
-import java.util.Arrays;
-
import junit.framework.TestCase;
-import org.drools.reteoo.test.ReteDslTestEngine.DslStep;
-
public class NotNodeTest extends TestCase {
public void testAssertRetract() {
- executeDsl( "NotNodeAssertRetractTest.data" );
+ ReteDslTestEngineHelper.executeDsl( "NotNodeAssertRetractTest.data" );
}
public void testModify() {
- executeDsl( "NotNodeModifyTest.data" );
+ ReteDslTestEngineHelper.executeDsl( "NotNodeModifyTest.data" );
}
public void testindex() {
- executeDsl( "NotNodeIndexTest.data" );
+ ReteDslTestEngineHelper.executeDsl( "NotNodeIndexTest.data" );
}
/*
@@ -55,37 +48,4 @@
}
*/
- public void executeDsl(String[] strings) {
- InputStream[] inputStreams = new InputStream[strings.length];
- for ( int i = 0; i < strings.length; i++ ) {
- inputStreams[i] = getClass().getResourceAsStream( strings[i] );
- assertNotNull( strings[i], inputStreams[i] );
- }
- executeDsl( inputStreams );
- }
-
- public void executeDsl(InputStream[] inputStreams) {
- InputStream inputStream = inputStreams[0];
-
- for ( int i = 1; i < inputStreams.length; i++ ) {
- assertNotNull( inputStreams[i] );
- inputStream = new SequenceInputStream( inputStream,
- inputStreams[i] );
- }
-
- executeDsl( inputStream );
- }
-
- public void executeDsl(String string) {
- executeDsl( getClass().getResourceAsStream( string ) );
- }
-
- public void executeDsl(InputStream inputStream) {
- assertNotNull( inputStream );
- DslStep[] steps = (DslStep[]) ReteDslTestEngine.buildDslCommands( new InputStreamReader( inputStream ) ).toArray( new DslStep[0] );
-
- ReteDslTestEngine tester = new ReteDslTestEngine();
- tester.run( Arrays.asList( steps ) );
- }
-
}
\ No newline at end of file
Modified: labs/jbossrules/branches/true_modify_20100104/drools-core/src/test/java/org/drools/reteoo/test/ReteDslTestEngine.java
===================================================================
--- labs/jbossrules/branches/true_modify_20100104/drools-core/src/test/java/org/drools/reteoo/test/ReteDslTestEngine.java 2010-01-05 00:11:34 UTC (rev 30916)
+++ labs/jbossrules/branches/true_modify_20100104/drools-core/src/test/java/org/drools/reteoo/test/ReteDslTestEngine.java 2010-01-05 01:10:54 UTC (rev 30917)
@@ -25,14 +25,12 @@
import org.drools.base.evaluators.Operator;
import org.drools.common.InternalFactHandle;
import org.drools.common.InternalWorkingMemory;
-import org.drools.common.NodeMemory;
import org.drools.common.PropagationContextImpl;
import org.drools.common.SingleBetaConstraints;
import org.drools.reteoo.BetaMemory;
import org.drools.reteoo.BetaNode;
import org.drools.reteoo.EntryPointNode;
import org.drools.reteoo.ExistsNode;
-import org.drools.reteoo.ForallNotNode;
import org.drools.reteoo.JoinNode;
import org.drools.reteoo.LeftInputAdapterNode;
import org.drools.reteoo.LeftTuple;
@@ -56,7 +54,6 @@
import org.drools.rule.Pattern;
import org.drools.rule.Rule;
import org.drools.rule.VariableConstraint;
-import org.drools.spi.Activation;
import org.drools.spi.BetaNodeFieldConstraint;
import org.drools.spi.Consequence;
import org.drools.spi.Evaluator;
@@ -66,8 +63,6 @@
import org.drools.util.StringUtils;
import org.mvel2.MVEL;
-import com.sun.org.apache.xml.internal.utils.Hashtree2Node;
-
public class ReteDslTestEngine {
private ReteTesterHelper reteTesterHelper;
Added: labs/jbossrules/branches/true_modify_20100104/drools-core/src/test/java/org/drools/reteoo/test/ReteDslTestEngineHelper.java
===================================================================
--- labs/jbossrules/branches/true_modify_20100104/drools-core/src/test/java/org/drools/reteoo/test/ReteDslTestEngineHelper.java (rev 0)
+++ labs/jbossrules/branches/true_modify_20100104/drools-core/src/test/java/org/drools/reteoo/test/ReteDslTestEngineHelper.java 2010-01-05 01:10:54 UTC (rev 30917)
@@ -0,0 +1,48 @@
+package org.drools.reteoo.test;
+
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.SequenceInputStream;
+import java.util.Arrays;
+
+import junit.framework.TestCase;
+
+import org.drools.reteoo.test.ReteDslTestEngine.DslStep;
+
+public class ReteDslTestEngineHelper {
+
+ public static void executeDsl(String[] strings) {
+ InputStream[] inputStreams = new InputStream[strings.length];
+ for ( int i = 0; i < strings.length; i++ ) {
+ inputStreams[i] = ReteDslTestEngineHelper.class.getResourceAsStream( strings[i] );
+ TestCase.assertNotNull( strings[i], inputStreams[i] );
+ }
+ executeDsl( inputStreams );
+ }
+
+ public static void executeDsl(InputStream[] inputStreams) {
+ InputStream inputStream = inputStreams[0];
+
+ for ( int i = 1; i < inputStreams.length; i++ ) {
+ TestCase.assertNotNull( inputStreams[i] );
+ inputStream = new SequenceInputStream( inputStream,
+ inputStreams[i] );
+ }
+
+ executeDsl( inputStream );
+ }
+
+ public static void executeDsl(String string) {
+ executeDsl( ReteDslTestEngineHelper.class.getResourceAsStream( string ) );
+ }
+
+ public static void executeDsl(InputStream inputStream) {
+ TestCase.assertNotNull( inputStream );
+ DslStep[] steps = (DslStep[]) ReteDslTestEngine.buildDslCommands( new InputStreamReader( inputStream ) ).toArray( new DslStep[0] );
+
+ ReteDslTestEngine tester = new ReteDslTestEngine();
+ tester.run( Arrays.asList( steps ) );
+ }
+
+
+}
Property changes on: labs/jbossrules/branches/true_modify_20100104/drools-core/src/test/java/org/drools/reteoo/test/ReteDslTestEngineHelper.java
___________________________________________________________________
Name: svn:executable
+ *
More information about the jboss-svn-commits
mailing list