[jboss-svn-commits] JBL Code SVN: r7111 - labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests

[jboss-svn-commits at lists.jboss.org]

Author: michael.neale at jboss.com
Date: 2006-10-25 11:49:16 -0400 (Wed, 25 Oct 2006)
New Revision: 7111

Modified:
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java
Log:
fixed test for error message from explicitly thrown exception

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java	2006-10-25 15:43:00 UTC (rev 7110)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java	2006-10-25 15:49:16 UTC (rev 7111)
@@ -178,12 +178,26 @@
         assertEquals( new Integer( 5 ),
                       list.get( 0 ) );
     }
+    
+    public void testNotWithModify() throws Exception {
+        final Reader reader = new InputStreamReader( getClass().getResourceAsStream( "test_NotWithModify.drl" ) );
+        
+        Cheese c = new Cheese("stilton", 13);
+        Cheese c2 = new Cheese("cheddar", 42);
+        Person p = new Person("michael");
+        WorkingMemory wm = loadRuleBase( reader ).newWorkingMemory();
+        wm.assertObject( c );
+        wm.assertObject( p );
+        wm.assertObject( c2 );
+        wm.fireAllRules();
+        
+    }
 
-    public void testExplicitAnd() throws Exception {
-        final Reader reader = new InputStreamReader( getClass().getResourceAsStream( "test_ExplicitAnd.drl" ) );
+    private RuleBase loadRuleBase(final Reader reader) throws IOException,
+                                                      DroolsParserException,
+                                                      Exception {
         final DrlParser parser = new DrlParser();
         final PackageDescr packageDescr = parser.parse( reader );
-
         // pre build the package
         final PackageBuilder builder = new PackageBuilder();
         builder.addPackage( packageDescr );
@@ -193,7 +207,13 @@
         final RuleBase ruleBase = getRuleBase();
         ruleBase.addPackage( pkg );
         // load up the rulebase
+        return ruleBase;
+    }
 
+    public void testExplicitAnd() throws Exception {
+        final Reader reader = new InputStreamReader( getClass().getResourceAsStream( "test_ExplicitAnd.drl" ) );
+        final RuleBase ruleBase = loadRuleBase( reader );
+
         final WorkingMemory workingMemory = ruleBase.newWorkingMemory();
         List list = new ArrayList();
         workingMemory.setGlobal( "list",
@@ -216,19 +236,8 @@
 
         // read in the source
         final Reader reader = new InputStreamReader( getClass().getResourceAsStream( "HelloWorld.drl" ) );
-        final DrlParser parser = new DrlParser();
-        final PackageDescr packageDescr = parser.parse( reader );
+        final RuleBase ruleBase = loadRuleBase( reader );
 
-        // pre build the package
-        final PackageBuilder builder = new PackageBuilder();
-        builder.addPackage( packageDescr );
-        final Package pkg = builder.getPackage();
-
-        // add the package to a rulebase
-        final RuleBase ruleBase = getRuleBase();
-        ruleBase.addPackage( pkg );
-        // load up the rulebase
-
         final WorkingMemory workingMemory = ruleBase.newWorkingMemory();
 
         final List list = new ArrayList();
@@ -1419,8 +1428,7 @@
             workingMemory.fireAllRules();
             fail( "Should throw an Exception from the ReturnValue" );
         } catch ( final Exception e ) {
-            assertEquals( "this should throw an exception",
-                          e.getCause().getMessage() );
+            assertTrue( e.getCause().getMessage().endsWith( "this should throw an exception"));
         }
     }
 
@@ -3069,19 +3077,8 @@
 
         // read in the source
         final Reader reader = new InputStreamReader( getClass().getResourceAsStream( "test_JoinNodeModifyTuple.drl" ) );
-        final DrlParser parser = new DrlParser();
-        final PackageDescr packageDescr = parser.parse( reader );
+        final RuleBase ruleBase = loadRuleBase( reader );
 
-        // pre build the package
-        final PackageBuilder builder = new PackageBuilder();
-        builder.addPackage( packageDescr );
-        final Package pkg = builder.getPackage();
-
-        // add the package to a rulebase
-        final RuleBase ruleBase = getRuleBase();
-        ruleBase.addPackage( pkg );
-        // load up the rulebase
-
         final WorkingMemory wm = ruleBase.newWorkingMemory();
 
         try {
@@ -3178,19 +3175,8 @@
 
         // read in the source
         final Reader reader = new InputStreamReader( getClass().getResourceAsStream( "test_Accumulate.drl" ) );
-        final DrlParser parser = new DrlParser();
-        final PackageDescr packageDescr = parser.parse( reader );
+        final RuleBase ruleBase = loadRuleBase( reader );
 
-        // pre build the package
-        final PackageBuilder builder = new PackageBuilder();
-        builder.addPackage( packageDescr );
-        final Package pkg = builder.getPackage();
-
-        // add the package to a rulebase
-        final RuleBase ruleBase = getRuleBase();
-        ruleBase.addPackage( pkg );
-        // load up the rulebase
-
         final WorkingMemory wm = ruleBase.newWorkingMemory();
         List results = new ArrayList();
 
@@ -3223,19 +3209,8 @@
     public void testAccumulateModify() throws Exception {
         // read in the source
         final Reader reader = new InputStreamReader( getClass().getResourceAsStream( "test_AccumulateModify.drl" ) );
-        final DrlParser parser = new DrlParser();
-        final PackageDescr packageDescr = parser.parse( reader );
+        final RuleBase ruleBase = loadRuleBase( reader );
 
-        // pre build the package
-        final PackageBuilder builder = new PackageBuilder();
-        builder.addPackage( packageDescr );
-        final Package pkg = builder.getPackage();
-
-        // add the package to a rulebase
-        final RuleBase ruleBase = getRuleBase();
-        ruleBase.addPackage( pkg );
-        // load up the rulebase
-
         final WorkingMemory wm = ruleBase.newWorkingMemory();
         List results = new ArrayList();
 
@@ -3303,19 +3278,8 @@
 
         // read in the source
         final Reader reader = new InputStreamReader( getClass().getResourceAsStream( "test_Collect.drl" ) );
-        final DrlParser parser = new DrlParser();
-        final PackageDescr packageDescr = parser.parse( reader );
+        final RuleBase ruleBase = loadRuleBase( reader );
 
-        // pre build the package
-        final PackageBuilder builder = new PackageBuilder();
-        builder.addPackage( packageDescr );
-        final Package pkg = builder.getPackage();
-
-        // add the package to a rulebase
-        final RuleBase ruleBase = getRuleBase();
-        ruleBase.addPackage( pkg );
-        // load up the rulebase
-
         final WorkingMemory wm = ruleBase.newWorkingMemory();
         List results = new ArrayList();
 
@@ -3352,19 +3316,8 @@
     public void testCollectModify() throws Exception {
         // read in the source
         final Reader reader = new InputStreamReader( getClass().getResourceAsStream( "test_Collect.drl" ) );
-        final DrlParser parser = new DrlParser();
-        final PackageDescr packageDescr = parser.parse( reader );
+        final RuleBase ruleBase = loadRuleBase( reader );
 
-        // pre build the package
-        final PackageBuilder builder = new PackageBuilder();
-        builder.addPackage( packageDescr );
-        final Package pkg = builder.getPackage();
-
-        // add the package to a rulebase
-        final RuleBase ruleBase = getRuleBase();
-        ruleBase.addPackage( pkg );
-        // load up the rulebase
-
         final WorkingMemory wm = ruleBase.newWorkingMemory();
         List results = new ArrayList();
 
@@ -3434,19 +3387,8 @@
         try {
             // read in the source
             final Reader reader = new InputStreamReader( getClass().getResourceAsStream( "test_Assert_Retract_Noloop.drl" ) );
-            final DrlParser parser = new DrlParser();
-            final PackageDescr packageDescr = parser.parse( reader );
+            final RuleBase ruleBase = loadRuleBase( reader );
 
-            // pre build the package
-            final PackageBuilder builder = new PackageBuilder();
-            builder.addPackage( packageDescr );
-            final Package pkg = builder.getPackage();
-
-            // add the package to a rulebase
-            final RuleBase ruleBase = getRuleBase();
-            ruleBase.addPackage( pkg );
-            // load up the rulebase
-
             final WorkingMemory wm = ruleBase.newWorkingMemory();
             wm.assertObject( new Cheese( "stilton",
                                          15 ) );