[jboss-svn-commits] JBL Code SVN: r19106 - labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Mar 19 06:57:27 EDT 2008
Author: mingjin
Date: 2008-03-19 06:57:27 -0400 (Wed, 19 Mar 2008)
New Revision: 19106
Modified:
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java
Log:
JBRULES-1488 fixing bad merge
- RuleParserTest.java: recovered testTypeDeclaration() from previous version. All tests passed.
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java 2008-03-19 10:34:19 UTC (rev 19105)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java 2008-03-19 10:57:27 UTC (rev 19106)
@@ -16,15 +16,7 @@
* limitations under the License.
*/
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.StringReader;
-import java.util.Iterator;
-import java.util.List;
-
import junit.framework.TestCase;
-
import org.antlr.runtime.ANTLRStringStream;
import org.antlr.runtime.CharStream;
import org.antlr.runtime.CommonToken;
@@ -67,8 +59,16 @@
import org.drools.lang.descr.ReturnValueRestrictionDescr;
import org.drools.lang.descr.RuleDescr;
import org.drools.lang.descr.VariableRestrictionDescr;
+import org.drools.lang.descr.TypeDeclarationDescr;
import org.drools.lang.dsl.DefaultExpander;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.io.StringReader;
+import java.util.Iterator;
+import java.util.List;
+
public class RuleParserTest extends TestCase {
private DRLParser parser;
@@ -3253,14 +3253,20 @@
RestrictionConnectiveDescr or = (RestrictionConnectiveDescr) fieldConstr.getRestrictions().get( 0 );
LiteralRestrictionDescr gt1 = (LiteralRestrictionDescr) or.getRestrictions().get( 0 );
LiteralRestrictionDescr eq1 = (LiteralRestrictionDescr) or.getRestrictions().get( 1 );
-
- assertEquals( ">", gt1.getEvaluator() );
- assertEquals( false, gt1.isNegated() );
- assertEquals( 1, ((Number) eq1.getValue()).intValue() );
- assertEquals( "==", eq1.getEvaluator() );
- assertEquals( false, eq1.isNegated() );
- assertEquals( 1, ((Number) eq1.getValue()).intValue() );
-
+
+ assertEquals( ">",
+ gt1.getEvaluator() );
+ assertEquals( false,
+ gt1.isNegated() );
+ assertEquals( 1,
+ ((Number) eq1.getValue()).intValue() );
+ assertEquals( "==",
+ eq1.getEvaluator() );
+ assertEquals( false,
+ eq1.isNegated() );
+ assertEquals( 1,
+ ((Number) eq1.getValue()).intValue() );
+
}
public void testSemicolon() throws Exception {
@@ -3513,7 +3519,7 @@
parser.normal_lhs_block( descrs );
assertTrue( parser.hasErrors() );
}
-
+
public void testRuleSingleLine() throws Exception {
final String text = "rule \"another test\" salience 10 when eval( true ) then System.out.println(1); end";
final CharStream charStream = new ANTLRStringStream( text );
@@ -3522,12 +3528,14 @@
final DRLParser parser = new DRLParser( tokenStream );
parser.setLineOffset( 10 );
RuleDescr rule = parser.rule();
-
+
assertFalse( parser.hasErrors() );
- assertEquals( "another test", rule.getName() );
- assertEquals( "System.out.println(1); ", rule.getConsequence());
+ assertEquals( "another test",
+ rule.getName() );
+ assertEquals( "System.out.println(1); ",
+ rule.getConsequence() );
}
-
+
public void testRuleTwoLines() throws Exception {
final String text = "rule \"another test\" salience 10 when eval( true ) then System.out.println(1);\n end";
final CharStream charStream = new ANTLRStringStream( text );
@@ -3536,10 +3544,12 @@
final DRLParser parser = new DRLParser( tokenStream );
parser.setLineOffset( 10 );
RuleDescr rule = parser.rule();
-
+
assertFalse( parser.hasErrors() );
- assertEquals( "another test", rule.getName() );
- assertEquals( "System.out.println(1);\n ", rule.getConsequence());
+ assertEquals( "another test",
+ rule.getName() );
+ assertEquals( "System.out.println(1);\n ",
+ rule.getConsequence() );
}
public void testRuleParseLhs3() throws Exception {
@@ -3639,13 +3649,14 @@
assertTrue( "Parser should have raised errors",
parser.hasErrors() );
-
+
List errors = parser.getErrors();
- assertEquals( 2, errors.size() );
-
+ assertEquals( 2,
+ errors.size() );
+
assertTrue( errors.get( 0 ) instanceof MismatchedTokenException ); // "action" is a reserved word
assertTrue( errors.get( 1 ) instanceof NoViableAltException ); // no title in the rule
-
+
}
public void testCommaMisuse() throws Exception {
@@ -3655,10 +3666,11 @@
assertTrue( "Parser should have raised errors",
parser.hasErrors() );
- assertEquals( 3, parser.getErrors().size() );
-
- } catch( NullPointerException npe ) {
- fail("Should not raise NPE");
+ assertEquals( 3,
+ parser.getErrors().size() );
+
+ } catch ( NullPointerException npe ) {
+ fail( "Should not raise NPE" );
}
}
@@ -3761,8 +3773,8 @@
assertTrue( re.isNegated() );
}
- public void testEventImport() throws Exception {
- final DRLParser parser = parseResource( "import_event.drl" );
+ public void testTypeDeclaration() throws Exception {
+ final DRLParser parser = parseResource( "declare_type.drl" );
parser.compilation_unit();
assertFalse( "Parser should not raise errors: " + parser.getErrorMessages().toString(),
@@ -3770,15 +3782,20 @@
final PackageDescr pack = parser.getPackageDescr();
- final List imports = pack.getImports();
+ final List<TypeDeclarationDescr> declarations = pack.getTypeDeclarations();
assertEquals( 1,
- imports.size() );
+ declarations.size() );
- final ImportDescr descr = (ImportDescr) imports.get( 0 );
-
- assertTrue( descr.isEvent() );
-
+ final TypeDeclarationDescr descr = declarations.get( 0 );
+ assertEquals( "event",
+ descr.getAttribute( "type" ) );
+ assertEquals( "org.drools.events.Call",
+ descr.getAttribute( "class" ) );
+ assertEquals( "duration",
+ descr.getAttribute( "duration_attribute" ) );
+ assertEquals( "pseudo",
+ descr.getAttribute( "clock_strategy" ) );
}
public void testEntryPoint() throws Exception {
@@ -3797,10 +3814,11 @@
FieldConstraintDescr fcd = (FieldConstraintDescr) pattern.getDescrs().get( 0 );
assertEquals( "symbol",
fcd.getFieldName() );
-
+
assertNotNull( pattern.getSource() );
EntryPointDescr entry = (EntryPointDescr) pattern.getSource();
- assertEquals( "StreamA", entry.getEntryId() );
+ assertEquals( "StreamA",
+ entry.getEntryId() );
}
private DRLParser parse(final String text) throws Exception {
More information about the jboss-svn-commits
mailing list