[jboss-svn-commits] JBL Code SVN: r32124 - in labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier: redundancy and 1 other directory.

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

Author: Rikkola
Date: 2010-03-17 03:46:09 -0400 (Wed, 17 Mar 2010)
New Revision: 32124

Modified:
   labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/ConsequenceTest.java
   labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/redundancy/NotesTest.java
Log:
GUVNOR-101 : Validation enhancements
-Fixed broken verifier tests

Modified: labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/ConsequenceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/ConsequenceTest.java	2010-03-17 06:14:11 UTC (rev 32123)
+++ labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/ConsequenceTest.java	2010-03-17 07:46:09 UTC (rev 32124)
@@ -8,7 +8,6 @@
 
 import org.drools.StatelessSession;
 import org.drools.base.RuleNameMatchesAgendaFilter;
-import org.drools.verifier.components.VerifierRule;
 import org.drools.verifier.data.VerifierReport;
 import org.drools.verifier.data.VerifierReportFactory;
 import org.drools.verifier.report.components.Severity;
@@ -46,8 +45,8 @@
         while ( iter.hasNext() ) {
             Object o = (Object) iter.next();
             if ( o instanceof VerifierMessage ) {
-                VerifierRule rule = (VerifierRule) ((VerifierMessage) o).getFaulty();
-                rulesThatHadErrors.add( rule.getRuleName() );
+                VerifierMessage message = (VerifierMessage) o;
+                rulesThatHadErrors.addAll( message.getImpactedRules().values() );
             }
         }
 

Modified: labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/redundancy/NotesTest.java
===================================================================
--- labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/redundancy/NotesTest.java	2010-03-17 06:14:11 UTC (rev 32123)
+++ labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/redundancy/NotesTest.java	2010-03-17 07:46:09 UTC (rev 32124)
@@ -2,6 +2,7 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Iterator;
 
 import org.drools.StatelessSession;
 import org.drools.base.RuleNameMatchesAgendaFilter;
@@ -11,6 +12,7 @@
 import org.drools.verifier.components.SubRule;
 import org.drools.verifier.data.VerifierReport;
 import org.drools.verifier.data.VerifierReportFactory;
+import org.drools.verifier.report.components.Cause;
 import org.drools.verifier.report.components.Redundancy;
 import org.drools.verifier.report.components.Severity;
 import org.drools.verifier.report.components.VerifierMessageBase;
@@ -52,7 +54,12 @@
                       notes.size() );
 
         VerifierMessageBase note = notes.iterator().next();
-        assertTrue( note.getFaulty().equals( redundancy ) );
+        Iterator<Cause> causes = note.getCauses().iterator();
+
+        assertEquals( left,
+                      causes.next() );
+        assertEquals( right,
+                      causes.next() );
     }
 
     public void testRedundantPatternPossibilitiesInRulePossibilities() throws Exception {
@@ -90,6 +97,11 @@
                       notes.size() );
 
         VerifierMessageBase note = notes.iterator().next();
-        assertTrue( note.getFaulty().equals( redundancy ) );
+        Iterator<Cause> causes = note.getCauses().iterator();
+
+        assertEquals( left,
+                      causes.next() );
+        assertEquals( right,
+                      causes.next() );
     }
 }