GUVNOR-2687: Guided Decision Table: Only a single negate Pattern show…

…n when multiple defined (apache#926)
kiegroup · Sep 16, 2016 · 39419be · 39419be
1 parent cd86cd8
commit 39419be
Show file tree

Hide file tree

Showing 2 changed files with 105 additions and 1 deletion.
diff --git a/...c/main/java/org/drools/workbench/models/guided/dtable/backend/GuidedDTDRLPersistence.java b/...c/main/java/org/drools/workbench/models/guided/dtable/backend/GuidedDTDRLPersistence.java
@@ -783,7 +783,7 @@ private boolean no( String operator ) {
 
     private IPattern findByFactPattern( List<IPattern> patterns,
                                         String boundName ) {
-        if ( boundName == null ) {
+        if ( boundName == null || boundName.isEmpty() ) {
             return null;
         }
 

diff --git a/...st/java/org/drools/workbench/models/guided/dtable/backend/GuidedDTDRLPersistenceTest.java b/...st/java/org/drools/workbench/models/guided/dtable/backend/GuidedDTDRLPersistenceTest.java
@@ -860,6 +860,110 @@ public void testLHSNotPattern() {
 
     }
 
+    @Test
+    public void multipleLHSNotPatternInclusion() {
+        GuidedDTDRLPersistence p = new GuidedDTDRLPersistence();
+        Object[] row = new Object[]{ "1", "desc", "mike", true, true };
+        Object[][] data = new Object[ 1 ][];
+        data[ 0 ] = row;
+
+        List<BaseColumn> allColumns = new ArrayList<>();
+        List<CompositeColumn<? extends BaseColumn>> allPatterns = new ArrayList<>();
+        allColumns.add( new RowNumberCol52() );
+        allColumns.add( new DescriptionCol52() );
+
+        Pattern52 p1 = new Pattern52();
+        p1.setBoundName( "p1" );
+        p1.setFactType( "Person" );
+        allPatterns.add( p1 );
+
+        ConditionCol52 p1col = new ConditionCol52();
+        p1col.setFactField( "name" );
+        p1col.setConstraintValueType( BaseSingleFieldConstraint.TYPE_LITERAL );
+        p1col.setOperator( "==" );
+        p1.getChildColumns().add( p1col );
+        allColumns.add( p1col );
+
+        Pattern52 p2 = new Pattern52();
+        p2.setBoundName( "" );
+        p2.setNegated( true );
+        p2.setFactType( "Cheese" );
+        allPatterns.add( p2 );
+
+        ConditionCol52 p2col = new ConditionCol52();
+        p2col.setFactField( "this" );
+        p2col.setOperator( "" );
+        p2col.setConstraintValueType( BaseSingleFieldConstraint.TYPE_LITERAL );
+        p2.getChildColumns().add( p2col );
+        allColumns.add( p2col );
+
+        Pattern52 p3 = new Pattern52();
+        p3.setBoundName( "" );
+        p3.setNegated( true );
+        p3.setFactType( "Smurf" );
+        allPatterns.add( p3 );
+
+        ConditionCol52 p3col = new ConditionCol52();
+        p3col.setFactField( "this" );
+        p3col.setOperator( "!= null" );
+        p3col.setConstraintValueType( BaseSingleFieldConstraint.TYPE_LITERAL );
+        p3.getChildColumns().add( p3col );
+        allColumns.add( p3col );
+
+        List<DTCellValue52> rowData = DataUtilities.makeDataRowList( row );
+        TemplateDataProvider rowDataProvider = new GuidedDTTemplateDataProvider( allColumns,
+                                                                                 rowData );
+
+        RuleModel rm = new RuleModel();
+        rm.name = "r0";
+
+        p.doConditions( allColumns,
+                        allPatterns,
+                        rowDataProvider,
+                        rowData,
+                        DataUtilities.makeDataLists( data ),
+                        rm );
+
+        final String actualRuleModelDrl = RuleModelDRLPersistenceImpl.getInstance().marshal( rm );
+
+        final String expectedRuleModelDrl = "rule \"r0\"\n" +
+                "  dialect \"mvel\"\n" +
+                "  when\n" +
+                "    p1 : Person( name == \"mike\" )\n" +
+                "    not Cheese()\n" +
+                "    not Smurf( this != null )\n" +
+                "  then\n" +
+                "end\n";
+
+        assertEqualsIgnoreWhitespace( expectedRuleModelDrl,
+                                      actualRuleModelDrl );
+
+        final GuidedDecisionTable52 dt = new GuidedDecisionTable52();
+        dt.setTableName( "dt" );
+
+        dt.getConditions().add( p1 );
+        dt.getConditions().add( p2 );
+        dt.getConditions().add( p3 );
+
+        dt.getData().addAll( DataUtilities.makeDataLists( data ) );
+
+        final String actualDecisionTableDrl = GuidedDTDRLPersistence.getInstance().marshal( dt );
+
+        final String expectedDecisionTableDrl = "//from row number: 1\n" +
+                "//desc\n" +
+                "rule \"Row1dt\"\n" +
+                "  dialect \"mvel\"\n" +
+                "  when\n" +
+                "    p1 : Person( name == \"mike\" )\n" +
+                "    not Cheese()\n" +
+                "    not Smurf( this != null )\n" +
+                "  then\n" +
+                "end\n";
+
+        assertEqualsIgnoreWhitespace( expectedDecisionTableDrl,
+                                      actualDecisionTableDrl );
+    }
+
     @Test
     public void testLHSOtherwisePatternBoolean() {
         GuidedDTDRLPersistence p = new GuidedDTDRLPersistence();