[jboss-svn-commits] JBL Code SVN: r22362 - in labs/jbossrules/trunk: drools-compiler/src/test/java/org/drools/integrationtests and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Sep 3 18:35:06 EDT 2008
Author: tirelli
Date: 2008-09-03 18:35:06 -0400 (Wed, 03 Sep 2008)
New Revision: 22362
Modified:
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/CepEspTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_CEP_TimeRelationalOperators.drl
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractRuleBase.java
Log:
Fixing regression on type declaration
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java 2008-09-03 20:23:40 UTC (rev 22361)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java 2008-09-03 22:35:06 UTC (rev 22362)
@@ -682,7 +682,7 @@
type.setDurationAttribute( duration );
ClassDefinition cd = type.getTypeClassDef();
ClassFieldAccessorStore store = pkgRegistry.getPackage().getClassFieldAccessorStore();
- InternalReadAccessor extractor = store.getReader( type.getTypeName(),
+ InternalReadAccessor extractor = store.getReader( type.getTypeClass().getName(),
duration,
type );
type.setReadAccessor( extractor );
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/CepEspTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/CepEspTest.java 2008-09-03 20:23:40 UTC (rev 22361)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/CepEspTest.java 2008-09-03 22:35:06 UTC (rev 22362)
@@ -64,8 +64,7 @@
return ruleBase;
}
- //FIXME current parser does not support declare statement
- public void FIXME_testEventAssertion() throws Exception {
+ public void testEventAssertion() throws Exception {
// read in the source
final Reader reader = new InputStreamReader( getClass().getResourceAsStream( "test_CEP_SimpleEventAssertion.drl" ) );
RuleBase ruleBase = loadRuleBase( reader );
@@ -120,8 +119,7 @@
}
- //FIXME current parser does not support declare statement
- public void FIXME_testEventAssertionWithDuration() throws Exception {
+ public void testEventAssertionWithDuration() throws Exception {
// read in the source
final Reader reader = new InputStreamReader( getClass().getResourceAsStream( "test_CEP_SimpleEventAssertionWithDuration.drl" ) );
final RuleBase ruleBase = loadRuleBase( reader );
@@ -193,7 +191,7 @@
}
//FIXME current parser does not support declare statement
- public void FIXME_testTimeRelationalOperators() throws Exception {
+ public void testTimeRelationalOperators() throws Exception {
// read in the source
final Reader reader = new InputStreamReader( getClass().getResourceAsStream( "test_CEP_TimeRelationalOperators.drl" ) );
final RuleBase ruleBase = loadRuleBase( reader );
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java 2008-09-03 20:23:40 UTC (rev 22361)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java 2008-09-03 22:35:06 UTC (rev 22362)
@@ -16,7 +16,6 @@
* limitations under the License.
*/
-import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.ObjectInput;
@@ -25,8 +24,6 @@
import java.io.StringReader;
import java.math.BigDecimal;
import java.math.BigInteger;
-import java.net.URL;
-import java.net.URLClassLoader;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
@@ -128,12 +125,15 @@
protected RuleBase getRuleBase() throws Exception {
+ RuleBaseConfiguration config = new RuleBaseConfiguration();
+ //config.setPartitionsEnabled( true );
return RuleBaseFactory.newRuleBase( RuleBase.RETEOO,
- null );
+ config );
}
protected RuleBase getRuleBase(final RuleBaseConfiguration config) throws Exception {
+ //config.setPartitionsEnabled( true );
return RuleBaseFactory.newRuleBase( RuleBase.RETEOO,
config );
}
Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_CEP_TimeRelationalOperators.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_CEP_TimeRelationalOperators.drl 2008-09-03 20:23:40 UTC (rev 22361)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_CEP_TimeRelationalOperators.drl 2008-09-03 22:35:06 UTC (rev 22362)
@@ -32,7 +32,7 @@
rule "before operator"
when
$a : StockTick( company == "DROO" )
- $b : StockTick( company == "ACME", this before[5,8] $a )
+ $b : StockTick( company == "ACME", this `before[5,8] $a )
then
results_before.add( $b );
end
@@ -40,7 +40,7 @@
rule "after operator"
when
$a : StockTick( company == "DROO" )
- $b : StockTick( company == "ACME", this after[5,8] $a )
+ $b : StockTick( company == "ACME", this `after[5,8] $a )
then
results_after.add( $b );
end
@@ -48,7 +48,7 @@
rule "meets operator"
when
$a : StockTick( company == "DROO" )
- $b : StockTick( company == "ACME", this meets[1] $a )
+ $b : StockTick( company == "ACME", this `meets[1] $a )
then
results_meets.add( $b );
end
@@ -56,7 +56,7 @@
rule "met-by operator"
when
$a : StockTick( company == "DROO" )
- $b : StockTick( company == "ACME", this metby[1] $a )
+ $b : StockTick( company == "ACME", this `metby[1] $a )
then
results_met_by.add( $b );
end
@@ -65,7 +65,7 @@
rule "overlaps operator"
when
$a : StockTick( company == "ACME" )
- $b : StockTick( company == "DROO", this overlaps[1] $a )
+ $b : StockTick( company == "DROO", this `overlaps[1] $a )
then
results_overlaps.add( $b );
end
@@ -73,7 +73,7 @@
rule "overlapped-by operator"
when
$a : StockTick( company == "DROO" )
- $b : StockTick( company == "ACME", this overlappedby[1] $a )
+ $b : StockTick( company == "ACME", this `overlappedby[1] $a )
then
results_overlapped_by.add( $b );
end
@@ -81,7 +81,7 @@
rule "during operator"
when
$a : StockTick( company == "DROO" )
- $b : StockTick( company == "ACME", this during[1] $a )
+ $b : StockTick( company == "ACME", this `during[1] $a )
then
results_during.add( $b );
end
@@ -89,7 +89,7 @@
rule "includes operator"
when
$a : StockTick( company == "ACME" )
- $b : StockTick( company == "DROO", this includes[1] $a )
+ $b : StockTick( company == "DROO", this `includes[1] $a )
then
results_includes.add( $b );
end
@@ -97,7 +97,7 @@
rule "starts operator"
when
$a : StockTick( company == "ACME" )
- $b : StockTick( company == "ACME", this starts[2] $a )
+ $b : StockTick( company == "ACME", this `starts[2] $a )
then
results_starts.add( $b );
end
@@ -105,7 +105,7 @@
rule "started-by operator"
when
$a : StockTick( company == "ACME" )
- $b : StockTick( company == "ACME", this startedby[2] $a )
+ $b : StockTick( company == "ACME", this `startedby[2] $a )
then
results_started_by.add( $b );
end
@@ -113,7 +113,7 @@
rule "finishes operator"
when
$a : StockTick( company == "ACME" )
- $b : StockTick( company == "ACME", this finishes[2] $a )
+ $b : StockTick( company == "ACME", this `finishes[2] $a )
then
results_finishes.add( $b );
end
@@ -121,7 +121,7 @@
rule "finished-by operator"
when
$a : StockTick( company == "ACME" )
- $b : StockTick( company == "ACME", this finishedby[2] $a )
+ $b : StockTick( company == "ACME", this `finishedby[2] $a )
then
results_finished_by.add( $b );
end
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractRuleBase.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractRuleBase.java 2008-09-03 20:23:40 UTC (rev 22361)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractRuleBase.java 2008-09-03 22:35:06 UTC (rev 22362)
@@ -481,7 +481,7 @@
}
}
} catch ( ClassNotFoundException e ) {
- throw new RuntimeDroolsException( "unable to resolve Type Declaration class '" + lastType.getTypeName() );
+ throw new RuntimeDroolsException( "unable to resolve Type Declaration class '" + lastType.getTypeName()+"'" );
}
// now merge the new package into the existing one
More information about the jboss-svn-commits
mailing list