[jboss-svn-commits] JBL Code SVN: r32926 - in labs/jbossrules/trunk/drools-factconstraint/src: test/java/org/drools/factconstraints/server/predefined and 1 other directory.

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

Author: eaa
Date: 2010-05-17 15:24:46 -0400 (Mon, 17 May 2010)
New Revision: 32926

Modified:
   labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/server/predefined/MatchesConstraint.java
   labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/server/predefined/NotMatchesConstraint.java
   labs/jbossrules/trunk/drools-factconstraint/src/test/java/org/drools/factconstraints/server/predefined/NotMatchesConstraintTest.java
Log:
JBRULES-2512:MatchesConstraint and NotMatchesConstraint create inverse verifier rules.
	- Fixed bug.

Modified: labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/server/predefined/MatchesConstraint.java
===================================================================
--- labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/server/predefined/MatchesConstraint.java	2010-05-17 19:20:11 UTC (rev 32925)
+++ labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/server/predefined/MatchesConstraint.java	2010-05-17 19:24:46 UTC (rev 32926)
@@ -16,7 +16,7 @@
 	@Override
 	protected String internalVerifierRule(ConstraintConfiguration config, Map<String, Object> context) {
 		List<String> constraints = new ArrayList<String>();
-		constraints.add("valueAsString matches \"" + config.getArgumentValue(MATCHES_ARGUMENT) + "\"");
+		constraints.add("valueAsString not matches \"" + config.getArgumentValue(MATCHES_ARGUMENT) + "\"");
 
 		return this.createVerifierRuleTemplate(config, context, 
 				"Matches_Field_Constraint", constraints,

Modified: labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/server/predefined/NotMatchesConstraint.java
===================================================================
--- labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/server/predefined/NotMatchesConstraint.java	2010-05-17 19:20:11 UTC (rev 32925)
+++ labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/server/predefined/NotMatchesConstraint.java	2010-05-17 19:24:46 UTC (rev 32926)
@@ -16,7 +16,7 @@
 	@Override
 	protected String internalVerifierRule(ConstraintConfiguration config, Map<String, Object> context) {
 		List<String> constraints = new ArrayList<String>();
-		constraints.add("valueAsString not matches \"" + config.getArgumentValue(NOT_MATCHES_ARGUMENT) + "\"");
+		constraints.add("valueAsString matches \"" + config.getArgumentValue(NOT_MATCHES_ARGUMENT) + "\"");
 
 		return this.createVerifierRuleTemplate(config, context, 
 				"Matches_Field_Constraint", constraints,

Modified: labs/jbossrules/trunk/drools-factconstraint/src/test/java/org/drools/factconstraints/server/predefined/NotMatchesConstraintTest.java
===================================================================
--- labs/jbossrules/trunk/drools-factconstraint/src/test/java/org/drools/factconstraints/server/predefined/NotMatchesConstraintTest.java	2010-05-17 19:20:11 UTC (rev 32925)
+++ labs/jbossrules/trunk/drools-factconstraint/src/test/java/org/drools/factconstraints/server/predefined/NotMatchesConstraintTest.java	2010-05-17 19:24:46 UTC (rev 32926)
@@ -78,8 +78,9 @@
     public void testUsingVerifier() {
 
         String ruleToVerify = "";
+        int fails = 0;
 
-        //OK
+        //FAIL
         ruleToVerify += "package org.drools.factconstraint.test\n\n";
         ruleToVerify += "import org.drools.factconstraint.model.*\n";
         ruleToVerify += "rule \"rule1\"\n";
@@ -88,8 +89,9 @@
         ruleToVerify += "   then\n";
         ruleToVerify += "       System.out.println(\"Rule fired\");\n";
         ruleToVerify += "end\n\n";
+        fails++;
 
-        //FAIL
+        //OK
         ruleToVerify += "rule \"rule2\"\n";
         ruleToVerify += "   when\n";
         ruleToVerify += "       Person(name == '')\n";
@@ -97,7 +99,7 @@
         ruleToVerify += "       System.out.println(\"Rule fired\");\n";
         ruleToVerify += "end\n";
 
-        //FAIL
+        //OK
         ruleToVerify += "rule \"pepe\"\n";
         ruleToVerify += "dialect \"mvel\"\n";
         ruleToVerify += "    when\n";
@@ -106,7 +108,7 @@
         ruleToVerify += "       System.out.println(\"Rule fired\");\n";
         ruleToVerify += "end\n";
         
-        //FAIL
+        //OK
         ruleToVerify += "rule \"rule3\"\n";
         ruleToVerify += "   when\n";
         ruleToVerify += "       Person(name == 'bart')\n";
@@ -114,7 +116,7 @@
         ruleToVerify += "       System.out.println(\"Rule fired\");\n";
         ruleToVerify += "end\n";
         
-        //FAIL
+        //OK
         ruleToVerify += "rule \"rule4\"\n";
         ruleToVerify += "   when\n";
         ruleToVerify += "       Person(name == '1bart')\n";
@@ -153,7 +155,7 @@
 
         System.out.println(warnings);
 
-        Assert.assertEquals(4, warnings.size());
+        Assert.assertEquals(fails, warnings.size());
 
         verifier.dispose();
     }