[jboss-svn-commits] JBL Code SVN: r11359 - in labs/jbossrules/trunk: drools-eclipse/drools-eclipse-plugin and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Apr 26 11:28:23 EDT 2007
Author: mark.proctor at jboss.com
Date: 2007-04-26 11:28:22 -0400 (Thu, 26 Apr 2007)
New Revision: 11359
Modified:
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/.classpath
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/META-INF/MANIFEST.MF
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/build.properties
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/DroolsEclipsePlugin.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/completion/RuleCompletionProcessor.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/editors/completion/IncompleteParsingTest.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/editors/completion/LocationDeterminatorTest.java
labs/jbossrules/trunk/pom.xml
Log:
JBRULES-816 Refactor Column to be Pattern
-Fixed the Pattern refactor errors in the eclipse plugin and tests
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/.classpath 2007-04-26 15:06:34 UTC (rev 11358)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/.classpath 2007-04-26 15:28:22 UTC (rev 11359)
@@ -4,7 +4,6 @@
<classpathentry kind="src" path="src/main/resources"/>
<classpathentry exported="true" kind="lib" path="lib/xercesImpl-2.4.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/antlr-2.7.7.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/antlr-3.0b5.jar"/>
<classpathentry exported="true" kind="lib" path="lib/drools-decisiontables-3.1.0-M1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/drools-jsr94-3.1.0-M1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jsr94-1.1.jar"/>
@@ -21,5 +20,6 @@
<classpathentry combineaccessrules="false" kind="src" path="/drools-compiler"/>
<classpathentry combineaccessrules="false" kind="src" path="/drools-core"/>
<classpathentry combineaccessrules="false" kind="src" path="/drools-decisiontables"/>
+ <classpathentry kind="lib" path="lib/antlr-3.0b7.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/META-INF/MANIFEST.MF 2007-04-26 15:06:34 UTC (rev 11358)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/META-INF/MANIFEST.MF 2007-04-26 15:28:22 UTC (rev 11359)
@@ -29,7 +29,6 @@
Bundle-ClassPath:
.,
lib/antlr-2.7.7.jar,
- lib/antlr-3.0b5.jar,
lib/drools-decisiontables-3.1.0-M1.jar,
lib/drools-jsr94-3.1.0-M1.jar,
lib/jsr94-1.1.jar,
@@ -42,5 +41,6 @@
lib/drools-compiler-3.1.0-M1.jar,
lib/drools-core-3.1.0-M1.jar,
drools-eclipse-plugin.jar,
- lib/xercesImpl-2.4.0.jar
+ lib/xercesImpl-2.4.0.jar,
+ lib/antlr-3.0b7.jar
Bundle-RequiredExecutionEnvironment: J2SE-1.4
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/build.properties
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/build.properties 2007-04-26 15:06:34 UTC (rev 11358)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/build.properties 2007-04-26 15:28:22 UTC (rev 11359)
@@ -5,7 +5,8 @@
lib/,\
drools-eclipse-plugin.jar,\
lib/xercesImpl-2.4.0.jar,\
- .
+ .,\
+ lib/antlr-3.0b7.jar
src.includes = .project,\
.classpath,\
build.properties,\
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/DroolsEclipsePlugin.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/DroolsEclipsePlugin.java 2007-04-26 15:06:34 UTC (rev 11358)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/DroolsEclipsePlugin.java 2007-04-26 15:28:22 UTC (rev 11359)
@@ -319,7 +319,7 @@
result = new DRLInfo(
resource.getProjectRelativePath().toString(),
packageDescr, parser.getErrors(),
- builder.getPackage(), builder.getErrors());
+ builder.getPackage(), builder.getErrors().getErrors());
} else {
result = new DRLInfo(
resource.getProjectRelativePath().toString(),
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/completion/RuleCompletionProcessor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/completion/RuleCompletionProcessor.java 2007-04-26 15:06:34 UTC (rev 11358)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/editors/completion/RuleCompletionProcessor.java 2007-04-26 15:28:22 UTC (rev 11359)
@@ -13,7 +13,7 @@
import java.util.StringTokenizer;
import java.util.regex.Pattern;
-import org.codehaus.jfdi.interpreter.ClassTypeResolver;
+import org.drools.base.ClassTypeResolver;
import org.drools.compiler.DrlParser;
import org.drools.compiler.DroolsParserException;
import org.drools.eclipse.DroolsEclipsePlugin;
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/editors/completion/IncompleteParsingTest.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/editors/completion/IncompleteParsingTest.java 2007-04-26 15:06:34 UTC (rev 11358)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/editors/completion/IncompleteParsingTest.java 2007-04-26 15:28:22 UTC (rev 11359)
@@ -6,7 +6,7 @@
import org.drools.compiler.DrlParser;
import org.drools.compiler.DroolsParserException;
-import org.drools.lang.descr.ColumnDescr;
+import org.drools.lang.descr.PatternDescr;
import org.drools.lang.descr.EvalDescr;
import org.drools.lang.descr.FieldBindingDescr;
import org.drools.lang.descr.FieldConstraintDescr;
@@ -59,7 +59,7 @@
* This is how the parsed tree should look like:
*
* RuleDescr
- * ColumnDescr [objectType = "Class"]
+ * PatternDescr [objectType = "Class"]
* FieldConstraintDescr [fieldName = "condition"]
* LiteralRestrictionDescr [evaluator = "==", text = "true"]
*/
@@ -70,15 +70,15 @@
" ";
rule = parseRuleString(input);
assertEquals(1, rule.getLhs().getDescrs().size());
- ColumnDescr column = (ColumnDescr) rule.getLhs().getDescrs().get(0);
- assertEquals("Class", column.getObjectType());
- assertTrue(column.getEndLine() != -1 || column.getEndColumn() != -1);
- assertEquals(1, column.getDescrs().size());
- assertEquals(input.indexOf( "Class" ), column.getStartCharacter());
- assertEquals(input.indexOf( "(" ), column.getLeftParentCharacter());
- assertEquals(input.indexOf( ")" ), column.getRightParentCharacter());
- assertEquals(input.indexOf( ")" ), column.getEndCharacter());
- FieldConstraintDescr field = (FieldConstraintDescr) column.getDescrs().get(0);
+ PatternDescr pattern = (PatternDescr) rule.getLhs().getDescrs().get(0);
+ assertEquals("Class", pattern.getObjectType());
+ assertTrue(pattern.getEndLine() != -1 || pattern.getEndColumn() != -1);
+ assertEquals(1, pattern.getDescrs().size());
+ assertEquals(input.indexOf( "Class" ), pattern.getStartCharacter());
+ assertEquals(input.indexOf( "(" ), pattern.getLeftParentCharacter());
+ assertEquals(input.indexOf( ")" ), pattern.getRightParentCharacter());
+ assertEquals(input.indexOf( ")" ), pattern.getEndCharacter());
+ FieldConstraintDescr field = (FieldConstraintDescr) pattern.getDescrs().get(0);
assertEquals("condition", field.getFieldName());
assertEquals(1, field.getRestrictions().size());
LiteralRestrictionDescr restriction = (LiteralRestrictionDescr) field.getRestrictions().get(0);
@@ -92,8 +92,8 @@
" ";
rule = parseRuleString(input);
assertEquals(1, rule.getLhs().getDescrs().size());
- column = (ColumnDescr) rule.getLhs().getDescrs().get(0);
- assertTrue(column.getEndCharacter() != -1);
+ pattern = (PatternDescr) rule.getLhs().getDescrs().get(0);
+ assertTrue(pattern.getEndCharacter() != -1);
input =
"rule MyRule \n" +
@@ -109,8 +109,8 @@
" Cl";
rule = parseRuleString(input);
assertEquals(1, rule.getLhs().getDescrs().size());
- column = (ColumnDescr) rule.getLhs().getDescrs().get(0);
- assertTrue(column.getEndCharacter() != -1);
+ pattern = (PatternDescr) rule.getLhs().getDescrs().get(0);
+ assertTrue(pattern.getEndCharacter() != -1);
input =
"rule MyRule \n" +
@@ -118,16 +118,16 @@
" class:";
rule = parseRuleString(input);
// KRISV: at this point we don't know if the variable will be bound to a
- // simple column, or a FROM result column, or ACCUMULATE result column, etc.
- // I tried to set a simple column as default, and changing in case it ends up
+ // simple pattern, or a FROM result pattern, or ACCUMULATE result pattern, etc.
+ // I tried to set a simple pattern as default, and changing in case it ends up
// another thing, but the code is really a hack and made the parser a lot more
// complex... can we leave as it is for now?
//
// assertEquals(1, rule.getLhs().getDescrs().size());
- // column = (ColumnDescr) rule.getLhs().getDescrs().get(0);
- // assertEquals("class", column.getIdentifier());
- // assertNull(column.getObjectType());
- // assertEquals(-1, column.getEndCharacter());
+ // pattern = (PatternDescr) rule.getLhs().getDescrs().get(0);
+ // assertEquals("class", pattern.getIdentifier());
+ // assertNull(pattern.getObjectType());
+ // assertEquals(-1, pattern.getEndCharacter());
assertEquals(0, rule.getLhs().getDescrs().size());
input =
@@ -136,12 +136,12 @@
" class: Cl";
rule = parseRuleString(input);
assertEquals(1, rule.getLhs().getDescrs().size());
- column = (ColumnDescr) rule.getLhs().getDescrs().get(0);
- assertEquals("class", column.getIdentifier());
- assertEquals("Cl", column.getObjectType());
- assertTrue(column.getEndLine() == -1 && column.getEndColumn() == -1);
- assertEquals(0, column.getDescrs().size());
- assertEquals(-1, column.getEndCharacter());
+ pattern = (PatternDescr) rule.getLhs().getDescrs().get(0);
+ assertEquals("class", pattern.getIdentifier());
+ assertEquals("Cl", pattern.getObjectType());
+ assertTrue(pattern.getEndLine() == -1 && pattern.getEndColumn() == -1);
+ assertEquals(0, pattern.getDescrs().size());
+ assertEquals(-1, pattern.getEndCharacter());
input =
"rule MyRule \n" +
@@ -149,12 +149,12 @@
" class:Cl";
rule = parseRuleString(input);
assertEquals(1, rule.getLhs().getDescrs().size());
- column = (ColumnDescr) rule.getLhs().getDescrs().get(0);
- assertEquals("class", column.getIdentifier());
- assertEquals("Cl", column.getObjectType());
- assertTrue(column.getEndLine() == -1 && column.getEndColumn() == -1);
- assertEquals(0, column.getDescrs().size());
- assertEquals(-1, column.getEndCharacter());
+ pattern = (PatternDescr) rule.getLhs().getDescrs().get(0);
+ assertEquals("class", pattern.getIdentifier());
+ assertEquals("Cl", pattern.getObjectType());
+ assertTrue(pattern.getEndLine() == -1 && pattern.getEndColumn() == -1);
+ assertEquals(0, pattern.getDescrs().size());
+ assertEquals(-1, pattern.getEndCharacter());
/** Inside of condition: start */
input =
@@ -163,11 +163,11 @@
" Class (";
rule = parseRuleString(input);
assertEquals(1, rule.getLhs().getDescrs().size());
- column = (ColumnDescr) rule.getLhs().getDescrs().get(0);
- assertEquals("Class", column.getObjectType());
- assertTrue(column.getEndLine() == -1 && column.getEndColumn() == -1);
- assertEquals(0, column.getDescrs().size());
- assertEquals(-1, column.getEndCharacter());
+ pattern = (PatternDescr) rule.getLhs().getDescrs().get(0);
+ assertEquals("Class", pattern.getObjectType());
+ assertTrue(pattern.getEndLine() == -1 && pattern.getEndColumn() == -1);
+ assertEquals(0, pattern.getDescrs().size());
+ assertEquals(-1, pattern.getEndCharacter());
input =
"rule MyRule \n" +
@@ -175,11 +175,11 @@
" Class ( na";
rule = parseRuleString(input);
assertEquals(1, rule.getLhs().getDescrs().size());
- column = (ColumnDescr) rule.getLhs().getDescrs().get(0);
- assertEquals("Class", column.getObjectType());
- assertEquals(-1, column.getEndCharacter());
- assertEquals(1, column.getDescrs().size());
- field = (FieldConstraintDescr) column.getDescrs().get(0);
+ pattern = (PatternDescr) rule.getLhs().getDescrs().get(0);
+ assertEquals("Class", pattern.getObjectType());
+ assertEquals(-1, pattern.getEndCharacter());
+ assertEquals(1, pattern.getDescrs().size());
+ field = (FieldConstraintDescr) pattern.getDescrs().get(0);
assertEquals( "na", field.getFieldName() );
assertEquals(-1, field.getEndCharacter());
@@ -189,11 +189,11 @@
" Class ( condition == true, ";
rule = parseRuleString(input);
assertEquals(1, rule.getLhs().getDescrs().size());
- column = (ColumnDescr) rule.getLhs().getDescrs().get(0);
- assertEquals("Class", column.getObjectType());
- assertEquals(-1, column.getEndCharacter());
- assertEquals(1, column.getDescrs().size());
- field = (FieldConstraintDescr) column.getDescrs().get(0);
+ pattern = (PatternDescr) rule.getLhs().getDescrs().get(0);
+ assertEquals("Class", pattern.getObjectType());
+ assertEquals(-1, pattern.getEndCharacter());
+ assertEquals(1, pattern.getDescrs().size());
+ field = (FieldConstraintDescr) pattern.getDescrs().get(0);
assertEquals(-1, field.getEndCharacter());
input =
@@ -202,14 +202,14 @@
" Class ( condition == true, na";
rule = parseRuleString(input);
assertEquals(1, rule.getLhs().getDescrs().size());
- column = (ColumnDescr) rule.getLhs().getDescrs().get(0);
- assertEquals("Class", column.getObjectType());
- assertEquals(-1, column.getEndCharacter());
- assertEquals(2, column.getDescrs().size());
- field = (FieldConstraintDescr) column.getDescrs().get(0);
+ pattern = (PatternDescr) rule.getLhs().getDescrs().get(0);
+ assertEquals("Class", pattern.getObjectType());
+ assertEquals(-1, pattern.getEndCharacter());
+ assertEquals(2, pattern.getDescrs().size());
+ field = (FieldConstraintDescr) pattern.getDescrs().get(0);
assertEquals(-1, field.getEndCharacter());
assertEquals( "condition", field.getFieldName() );
- field = (FieldConstraintDescr) column.getDescrs().get(1);
+ field = (FieldConstraintDescr) pattern.getDescrs().get(1);
assertEquals( "na", field.getFieldName() );
assertEquals(-1, field.getEndCharacter());
@@ -219,11 +219,11 @@
" Class ( name:";
rule = parseRuleString(input);
assertEquals(1, rule.getLhs().getDescrs().size());
- column = (ColumnDescr) rule.getLhs().getDescrs().get(0);
- assertEquals("Class", column.getObjectType());
- assertEquals(-1, column.getEndCharacter());
- assertEquals(1, column.getDescrs().size());
- FieldBindingDescr binding1 = (FieldBindingDescr) column.getDescrs().get(0);
+ pattern = (PatternDescr) rule.getLhs().getDescrs().get(0);
+ assertEquals("Class", pattern.getObjectType());
+ assertEquals(-1, pattern.getEndCharacter());
+ assertEquals(1, pattern.getDescrs().size());
+ FieldBindingDescr binding1 = (FieldBindingDescr) pattern.getDescrs().get(0);
assertEquals("name", binding1.getIdentifier());
assertNull(binding1.getFieldName());
@@ -233,11 +233,11 @@
" Class ( property ";
rule = parseRuleString(input);
assertEquals(1, rule.getLhs().getDescrs().size());
- column = (ColumnDescr) rule.getLhs().getDescrs().get(0);
- assertEquals("Class", column.getObjectType());
- assertEquals(-1, column.getEndCharacter());
- assertEquals(1, column.getDescrs().size());
- field = (FieldConstraintDescr) column.getDescrs().get(0);
+ pattern = (PatternDescr) rule.getLhs().getDescrs().get(0);
+ assertEquals("Class", pattern.getObjectType());
+ assertEquals(-1, pattern.getEndCharacter());
+ assertEquals(1, pattern.getDescrs().size());
+ field = (FieldConstraintDescr) pattern.getDescrs().get(0);
assertEquals("property", field.getFieldName());
assertEquals(0, field.getRestrictions().size());
assertEquals(-1, field.getEndCharacter());
@@ -248,11 +248,11 @@
" Class ( name: property ";
rule = parseRuleString(input);
assertEquals(1, rule.getLhs().getDescrs().size());
- column = (ColumnDescr) rule.getLhs().getDescrs().get(0);
- assertEquals("Class", column.getObjectType());
- assertEquals(-1, column.getEndCharacter());
- assertEquals(1, column.getDescrs().size());
- FieldBindingDescr binding = (FieldBindingDescr) column.getDescrs().get(0);
+ pattern = (PatternDescr) rule.getLhs().getDescrs().get(0);
+ assertEquals("Class", pattern.getObjectType());
+ assertEquals(-1, pattern.getEndCharacter());
+ assertEquals(1, pattern.getDescrs().size());
+ FieldBindingDescr binding = (FieldBindingDescr) pattern.getDescrs().get(0);
assertEquals("name", binding.getIdentifier());
assertEquals("property", binding.getFieldName());
@@ -262,20 +262,20 @@
" Class ( name1: property1 == \"value1\", name2: property2 ";
rule = parseRuleString(input);
assertEquals(1, rule.getLhs().getDescrs().size());
- column = (ColumnDescr) rule.getLhs().getDescrs().get(0);
- assertEquals("Class", column.getObjectType());
- assertEquals(-1, column.getEndCharacter());
- assertEquals(3, column.getDescrs().size());
- binding = (FieldBindingDescr) column.getDescrs().get(0);
+ pattern = (PatternDescr) rule.getLhs().getDescrs().get(0);
+ assertEquals("Class", pattern.getObjectType());
+ assertEquals(-1, pattern.getEndCharacter());
+ assertEquals(3, pattern.getDescrs().size());
+ binding = (FieldBindingDescr) pattern.getDescrs().get(0);
assertEquals("name1", binding.getIdentifier());
assertEquals("property1", binding.getFieldName());
- field = (FieldConstraintDescr) column.getDescrs().get(1);
+ field = (FieldConstraintDescr) pattern.getDescrs().get(1);
assertEquals("property1", field.getFieldName());
assertEquals(1, field.getRestrictions().size());
LiteralRestrictionDescr literal = (LiteralRestrictionDescr) field.getRestrictions().get(0);
assertEquals("==", literal.getEvaluator());
assertEquals("value1", literal.getText());
- binding = (FieldBindingDescr) column.getDescrs().get(2);
+ binding = (FieldBindingDescr) pattern.getDescrs().get(2);
assertEquals("name2", binding.getIdentifier());
assertEquals("property2", binding.getFieldName());
@@ -285,14 +285,14 @@
" Class(name:property==";
rule = parseRuleString(input);
assertEquals(1, rule.getLhs().getDescrs().size());
- column = (ColumnDescr) rule.getLhs().getDescrs().get(0);
- assertEquals("Class", column.getObjectType());
- assertEquals(-1, column.getEndCharacter());
- assertEquals(2, column.getDescrs().size());
- binding = (FieldBindingDescr) column.getDescrs().get(0);
+ pattern = (PatternDescr) rule.getLhs().getDescrs().get(0);
+ assertEquals("Class", pattern.getObjectType());
+ assertEquals(-1, pattern.getEndCharacter());
+ assertEquals(2, pattern.getDescrs().size());
+ binding = (FieldBindingDescr) pattern.getDescrs().get(0);
assertEquals("name", binding.getIdentifier());
assertEquals("property", binding.getFieldName());
- field = (FieldConstraintDescr) column.getDescrs().get(1);
+ field = (FieldConstraintDescr) pattern.getDescrs().get(1);
assertEquals("property", field.getFieldName());
assertEquals(1, field.getRestrictions().size());
// KRISV: you are right
@@ -312,11 +312,11 @@
" Class( property == otherPropertyN";
rule = parseRuleString(input);
assertEquals(1, rule.getLhs().getDescrs().size());
- column = (ColumnDescr) rule.getLhs().getDescrs().get(0);
- assertEquals("Class", column.getObjectType());
- assertEquals(-1, column.getEndCharacter());
- assertEquals(1, column.getDescrs().size());
- field = (FieldConstraintDescr) column.getDescrs().get(0);
+ pattern = (PatternDescr) rule.getLhs().getDescrs().get(0);
+ assertEquals("Class", pattern.getObjectType());
+ assertEquals(-1, pattern.getEndCharacter());
+ assertEquals(1, pattern.getDescrs().size());
+ field = (FieldConstraintDescr) pattern.getDescrs().get(0);
assertEquals("property", field.getFieldName());
assertEquals(1, field.getRestrictions().size());
VariableRestrictionDescr variable = (VariableRestrictionDescr) field.getRestrictions().get(0);
@@ -330,11 +330,11 @@
" Class( property == \"someth";
rule = parseRuleString(input);
assertEquals(1, rule.getLhs().getDescrs().size());
- column = (ColumnDescr) rule.getLhs().getDescrs().get(0);
- assertEquals("Class", column.getObjectType());
- assertEquals(-1, column.getEndCharacter());
- assertEquals(1, column.getDescrs().size());
- field = (FieldConstraintDescr) column.getDescrs().get(0);
+ pattern = (PatternDescr) rule.getLhs().getDescrs().get(0);
+ assertEquals("Class", pattern.getObjectType());
+ assertEquals(-1, pattern.getEndCharacter());
+ assertEquals(1, pattern.getDescrs().size());
+ field = (FieldConstraintDescr) pattern.getDescrs().get(0);
assertEquals("property", field.getFieldName());
assertEquals(1, field.getRestrictions().size());
literal = (LiteralRestrictionDescr) field.getRestrictions().get(0);
@@ -354,11 +354,11 @@
" Class( property contains ";
rule = parseRuleString(input);
assertEquals(1, rule.getLhs().getDescrs().size());
- column = (ColumnDescr) rule.getLhs().getDescrs().get(0);
- assertEquals("Class", column.getObjectType());
- assertEquals(-1, column.getEndCharacter());
- assertEquals(1, column.getDescrs().size());
- field = (FieldConstraintDescr) column.getDescrs().get(0);
+ pattern = (PatternDescr) rule.getLhs().getDescrs().get(0);
+ assertEquals("Class", pattern.getObjectType());
+ assertEquals(-1, pattern.getEndCharacter());
+ assertEquals(1, pattern.getDescrs().size());
+ field = (FieldConstraintDescr) pattern.getDescrs().get(0);
assertEquals("property", field.getFieldName());
assertEquals(1, field.getRestrictions().size());
// KRISV: you are right
@@ -378,11 +378,11 @@
" Class( property matches \"someth";
rule = parseRuleString(input);
assertEquals(1, rule.getLhs().getDescrs().size());
- column = (ColumnDescr) rule.getLhs().getDescrs().get(0);
- assertEquals("Class", column.getObjectType());
- assertEquals(-1, column.getEndCharacter());
- assertEquals(1, column.getDescrs().size());
- field = (FieldConstraintDescr) column.getDescrs().get(0);
+ pattern = (PatternDescr) rule.getLhs().getDescrs().get(0);
+ assertEquals("Class", pattern.getObjectType());
+ assertEquals(-1, pattern.getEndCharacter());
+ assertEquals(1, pattern.getDescrs().size());
+ field = (FieldConstraintDescr) pattern.getDescrs().get(0);
assertEquals("property", field.getFieldName());
assertEquals(1, field.getRestrictions().size());
literal = (LiteralRestrictionDescr) field.getRestrictions().get(0);
@@ -410,11 +410,11 @@
" Class ( property > 0 & ";
rule = parseRuleString(input);
assertEquals(1, rule.getLhs().getDescrs().size());
- column = (ColumnDescr) rule.getLhs().getDescrs().get(0);
- assertEquals("Class", column.getObjectType());
- assertEquals(-1, column.getEndCharacter());
- assertEquals(1, column.getDescrs().size());
- field = (FieldConstraintDescr) column.getDescrs().get(0);
+ pattern = (PatternDescr) rule.getLhs().getDescrs().get(0);
+ assertEquals("Class", pattern.getObjectType());
+ assertEquals(-1, pattern.getEndCharacter());
+ assertEquals(1, pattern.getDescrs().size());
+ field = (FieldConstraintDescr) pattern.getDescrs().get(0);
assertEquals("property", field.getFieldName());
assertEquals(2, field.getRestrictions().size());
literal = (LiteralRestrictionDescr) field.getRestrictions().get(0);
@@ -431,10 +431,10 @@
assertEquals(1, rule.getLhs().getDescrs().size());
FromDescr from = (FromDescr) rule.getLhs().getDescrs().get(0);
assertEquals(-1, from.getEndCharacter());
- assertNotNull( from.getReturnedColumn() );
- column = (ColumnDescr) from.getReturnedColumn();
- assertEquals("Class", column.getObjectType());
- assertTrue(column.getEndCharacter() != -1);
+ assertNotNull( from.getReturnedPattern() );
+ pattern = (PatternDescr) from.getReturnedPattern();
+ assertEquals("Class", pattern.getObjectType());
+ assertTrue(pattern.getEndCharacter() != -1);
input =
"rule MyRule \n" +
@@ -471,11 +471,11 @@
RuleDescr rule = parseRuleString(input);
assertEquals(input.indexOf( "rule" ), rule.getStartCharacter());
assertEquals(input.indexOf( "end" )+2, rule.getEndCharacter());
- ColumnDescr column = (ColumnDescr) rule.getLhs().getDescrs().get(0);
- assertEquals(input.indexOf( "Class" ), column.getStartCharacter());
- assertEquals(input.indexOf( "(" ), column.getLeftParentCharacter());
- assertEquals(input.indexOf( ")" ), column.getRightParentCharacter());
- assertEquals(input.indexOf( ")" ), column.getEndCharacter());
+ PatternDescr pattern = (PatternDescr) rule.getLhs().getDescrs().get(0);
+ assertEquals(input.indexOf( "Class" ), pattern.getStartCharacter());
+ assertEquals(input.indexOf( "(" ), pattern.getLeftParentCharacter());
+ assertEquals(input.indexOf( ")" ), pattern.getRightParentCharacter());
+ assertEquals(input.indexOf( ")" ), pattern.getEndCharacter());
}
// public void doTestRemainder() {
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/editors/completion/LocationDeterminatorTest.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/editors/completion/LocationDeterminatorTest.java 2007-04-26 15:06:34 UTC (rev 11358)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-test/src/test/java/org/drools/eclipse/editors/completion/LocationDeterminatorTest.java 2007-04-26 15:28:22 UTC (rev 11359)
@@ -12,47 +12,47 @@
public class LocationDeterminatorTest extends TestCase {
public void testColumnOperatorPattern() {
- assertTrue(LocationDeterminator.COLUMN_PATTERN_OPERATOR.matcher("( property ").matches());
- assertTrue(LocationDeterminator.COLUMN_PATTERN_OPERATOR.matcher("( property ").matches());
- assertTrue(LocationDeterminator.COLUMN_PATTERN_OPERATOR.matcher("( property ").matches());
- assertTrue(LocationDeterminator.COLUMN_PATTERN_OPERATOR.matcher("( name : property ").matches());
- assertTrue(LocationDeterminator.COLUMN_PATTERN_OPERATOR.matcher("(name:property ").matches());
- assertTrue(LocationDeterminator.COLUMN_PATTERN_OPERATOR.matcher("( name:property ").matches());
- assertTrue(LocationDeterminator.COLUMN_PATTERN_OPERATOR.matcher("( name:property ").matches());
- assertTrue(LocationDeterminator.COLUMN_PATTERN_OPERATOR.matcher("( name : property ").matches());
- assertTrue(LocationDeterminator.COLUMN_PATTERN_OPERATOR.matcher("( property1 == \"value\", property2 ").matches());
- assertTrue(LocationDeterminator.COLUMN_PATTERN_OPERATOR.matcher("( property1 == \"value\", name : property2 ").matches());
- assertTrue(LocationDeterminator.COLUMN_PATTERN_OPERATOR.matcher("( property1 == \"value\", name:property2 ").matches());
- assertTrue(LocationDeterminator.COLUMN_PATTERN_OPERATOR.matcher("( property1 == \"value\", name : property2 ").matches());
- assertFalse(LocationDeterminator.COLUMN_PATTERN_OPERATOR.matcher("( prop").matches());
- assertFalse(LocationDeterminator.COLUMN_PATTERN_OPERATOR.matcher("(prop").matches());
- assertFalse(LocationDeterminator.COLUMN_PATTERN_OPERATOR.matcher("( prop").matches());
- assertFalse(LocationDeterminator.COLUMN_PATTERN_OPERATOR.matcher("( name:prop").matches());
- assertFalse(LocationDeterminator.COLUMN_PATTERN_OPERATOR.matcher("(name:prop").matches());
- assertFalse(LocationDeterminator.COLUMN_PATTERN_OPERATOR.matcher("( name : prop").matches());
- assertFalse(LocationDeterminator.COLUMN_PATTERN_OPERATOR.matcher("( name : prop").matches());
- assertFalse(LocationDeterminator.COLUMN_PATTERN_OPERATOR.matcher("( property <= ").matches());
- assertFalse(LocationDeterminator.COLUMN_PATTERN_OPERATOR.matcher("( name : property == ").matches());
- assertFalse(LocationDeterminator.COLUMN_PATTERN_OPERATOR.matcher("(property==").matches());
- assertFalse(LocationDeterminator.COLUMN_PATTERN_OPERATOR.matcher("( property contains ").matches());
- assertFalse(LocationDeterminator.COLUMN_PATTERN_OPERATOR.matcher("( property1 == \"value\", property2 >= ").matches());
+ assertTrue(LocationDeterminator.PATTERN_PATTERN_OPERATOR.matcher("( property ").matches());
+ assertTrue(LocationDeterminator.PATTERN_PATTERN_OPERATOR.matcher("( property ").matches());
+ assertTrue(LocationDeterminator.PATTERN_PATTERN_OPERATOR.matcher("( property ").matches());
+ assertTrue(LocationDeterminator.PATTERN_PATTERN_OPERATOR.matcher("( name : property ").matches());
+ assertTrue(LocationDeterminator.PATTERN_PATTERN_OPERATOR.matcher("(name:property ").matches());
+ assertTrue(LocationDeterminator.PATTERN_PATTERN_OPERATOR.matcher("( name:property ").matches());
+ assertTrue(LocationDeterminator.PATTERN_PATTERN_OPERATOR.matcher("( name:property ").matches());
+ assertTrue(LocationDeterminator.PATTERN_PATTERN_OPERATOR.matcher("( name : property ").matches());
+ assertTrue(LocationDeterminator.PATTERN_PATTERN_OPERATOR.matcher("( property1 == \"value\", property2 ").matches());
+ assertTrue(LocationDeterminator.PATTERN_PATTERN_OPERATOR.matcher("( property1 == \"value\", name : property2 ").matches());
+ assertTrue(LocationDeterminator.PATTERN_PATTERN_OPERATOR.matcher("( property1 == \"value\", name:property2 ").matches());
+ assertTrue(LocationDeterminator.PATTERN_PATTERN_OPERATOR.matcher("( property1 == \"value\", name : property2 ").matches());
+ assertFalse(LocationDeterminator.PATTERN_PATTERN_OPERATOR.matcher("( prop").matches());
+ assertFalse(LocationDeterminator.PATTERN_PATTERN_OPERATOR.matcher("(prop").matches());
+ assertFalse(LocationDeterminator.PATTERN_PATTERN_OPERATOR.matcher("( prop").matches());
+ assertFalse(LocationDeterminator.PATTERN_PATTERN_OPERATOR.matcher("( name:prop").matches());
+ assertFalse(LocationDeterminator.PATTERN_PATTERN_OPERATOR.matcher("(name:prop").matches());
+ assertFalse(LocationDeterminator.PATTERN_PATTERN_OPERATOR.matcher("( name : prop").matches());
+ assertFalse(LocationDeterminator.PATTERN_PATTERN_OPERATOR.matcher("( name : prop").matches());
+ assertFalse(LocationDeterminator.PATTERN_PATTERN_OPERATOR.matcher("( property <= ").matches());
+ assertFalse(LocationDeterminator.PATTERN_PATTERN_OPERATOR.matcher("( name : property == ").matches());
+ assertFalse(LocationDeterminator.PATTERN_PATTERN_OPERATOR.matcher("(property==").matches());
+ assertFalse(LocationDeterminator.PATTERN_PATTERN_OPERATOR.matcher("( property contains ").matches());
+ assertFalse(LocationDeterminator.PATTERN_PATTERN_OPERATOR.matcher("( property1 == \"value\", property2 >= ").matches());
}
public void testColumnArgumentPattern() {
- assertTrue(LocationDeterminator.COLUMN_PATTERN_COMPARATOR_ARGUMENT.matcher("( property == ").matches());
- assertTrue(LocationDeterminator.COLUMN_PATTERN_COMPARATOR_ARGUMENT.matcher("( property >= ").matches());
- assertTrue(LocationDeterminator.COLUMN_PATTERN_COMPARATOR_ARGUMENT.matcher("(property== ").matches());
- assertTrue(LocationDeterminator.COLUMN_PATTERN_COMPARATOR_ARGUMENT.matcher("( property == ").matches());
- assertTrue(LocationDeterminator.COLUMN_PATTERN_COMPARATOR_ARGUMENT.matcher("( name : property == ").matches());
- assertTrue(LocationDeterminator.COLUMN_PATTERN_COMPARATOR_ARGUMENT.matcher("(name:property== ").matches());
- assertTrue(LocationDeterminator.COLUMN_PATTERN_COMPARATOR_ARGUMENT.matcher("( name : property == ").matches());
- assertTrue(LocationDeterminator.COLUMN_PATTERN_COMPARATOR_ARGUMENT.matcher("( property1 == \"value\", property2 == ").matches());
- assertTrue(LocationDeterminator.COLUMN_PATTERN_COMPARATOR_ARGUMENT.matcher("( property1 == \"value\",property2== ").matches());
- assertTrue(LocationDeterminator.COLUMN_PATTERN_COMPARATOR_ARGUMENT.matcher("( property1 == \"value\", property2 == ").matches());
- assertTrue(LocationDeterminator.COLUMN_PATTERN_COMPARATOR_ARGUMENT.matcher("( property == otherProp").matches());
- assertTrue(LocationDeterminator.COLUMN_PATTERN_COMPARATOR_ARGUMENT.matcher("(property==otherProp").matches());
- assertTrue(LocationDeterminator.COLUMN_PATTERN_CONTAINS_ARGUMENT.matcher("( property contains ").matches());
- assertTrue(LocationDeterminator.COLUMN_PATTERN_EXCLUDES_ARGUMENT.matcher("( property excludes ").matches());
+ assertTrue(LocationDeterminator.PATTERN_PATTERN_COMPARATOR_ARGUMENT.matcher("( property == ").matches());
+ assertTrue(LocationDeterminator.PATTERN_PATTERN_COMPARATOR_ARGUMENT.matcher("( property >= ").matches());
+ assertTrue(LocationDeterminator.PATTERN_PATTERN_COMPARATOR_ARGUMENT.matcher("(property== ").matches());
+ assertTrue(LocationDeterminator.PATTERN_PATTERN_COMPARATOR_ARGUMENT.matcher("( property == ").matches());
+ assertTrue(LocationDeterminator.PATTERN_PATTERN_COMPARATOR_ARGUMENT.matcher("( name : property == ").matches());
+ assertTrue(LocationDeterminator.PATTERN_PATTERN_COMPARATOR_ARGUMENT.matcher("(name:property== ").matches());
+ assertTrue(LocationDeterminator.PATTERN_PATTERN_COMPARATOR_ARGUMENT.matcher("( name : property == ").matches());
+ assertTrue(LocationDeterminator.PATTERN_PATTERN_COMPARATOR_ARGUMENT.matcher("( property1 == \"value\", property2 == ").matches());
+ assertTrue(LocationDeterminator.PATTERN_PATTERN_COMPARATOR_ARGUMENT.matcher("( property1 == \"value\",property2== ").matches());
+ assertTrue(LocationDeterminator.PATTERN_PATTERN_COMPARATOR_ARGUMENT.matcher("( property1 == \"value\", property2 == ").matches());
+ assertTrue(LocationDeterminator.PATTERN_PATTERN_COMPARATOR_ARGUMENT.matcher("( property == otherProp").matches());
+ assertTrue(LocationDeterminator.PATTERN_PATTERN_COMPARATOR_ARGUMENT.matcher("(property==otherProp").matches());
+ assertTrue(LocationDeterminator.PATTERN_PATTERN_CONTAINS_ARGUMENT.matcher("( property contains ").matches());
+ assertTrue(LocationDeterminator.PATTERN_PATTERN_EXCLUDES_ARGUMENT.matcher("( property excludes ").matches());
}
public void testCheckLocationDetermination() {
Modified: labs/jbossrules/trunk/pom.xml
===================================================================
--- labs/jbossrules/trunk/pom.xml 2007-04-26 15:06:34 UTC (rev 11358)
+++ labs/jbossrules/trunk/pom.xml 2007-04-26 15:28:22 UTC (rev 11359)
@@ -286,7 +286,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
- <version>2.1</version>
+ <version>2.1.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -296,7 +296,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.1</version>
+ <version>2.0.2</version>
<configuration>
<source>1.4</source>
<target>1.4</target>
@@ -332,7 +332,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <version>2.0.1</version>
+ <version>2.0.2</version>
<executions>
<execution>
<goals>
More information about the jboss-svn-commits
mailing list