DROOLS-2263: Cover marshalling of enums with comma inside

apache · Jan 30, 2018 · 1a6e64a · 1a6e64a
1 parent 7c8132b
commit 1a6e64a
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 2 deletions.
diff --git a/...st/java/org/drools/workbench/models/commons/backend/rule/RuleModelDRLPersistenceTest.java b/...st/java/org/drools/workbench/models/commons/backend/rule/RuleModelDRLPersistenceTest.java
@@ -1867,6 +1867,33 @@ public void testInOperatorString() {
                          m);
     }
 
+    @Test
+    public void testInOperatorStringCommaInside() {
+
+        final RuleModel model = new RuleModel();
+        model.name = "in";
+
+        final FactPattern pattern = new FactPattern("Person");
+        final SingleFieldConstraint constraint = new SingleFieldConstraint();
+        constraint.setFieldType(DataType.TYPE_STRING);
+        constraint.setFieldName("field1");
+        constraint.setOperator("in");
+        constraint.setValue("value1, \"value2, value3\"");
+        constraint.setConstraintValueType(SingleFieldConstraint.TYPE_LITERAL);
+        pattern.addConstraint(constraint);
+
+        model.addLhsItem(pattern);
+
+        final String expected = "rule \"in\" \n"
+                + "dialect \"mvel\" \n"
+                + "when \n"
+                + "     Person(field1 in ( \"value1\", \"value2, value3\" ) ) \n"
+                + " then \n"
+                + "end";
+
+        checkMarshalling(expected, model);
+    }
+
     @Test
     public void testInOperatorNumber() {
 

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
@@ -2789,15 +2789,15 @@ public void testLHSInOperator() {
         p1.getChildColumns().add(cc2);
 
         dt.setData(DataUtilities.makeDataLists(new Object[][]{
-                new Object[]{1l, "desc", "Pupa, Brains", "55, 66"},
+                new Object[]{1l, "desc", "Pupa, Brains, \"John, Snow\"", "55, 66"},
                 new Object[]{2l, "desc", "", ""}
         }));
 
         GuidedDTDRLPersistence p = GuidedDTDRLPersistence.getInstance();
         String drl = p.marshal(dt);
 
         int index = -1;
-        index = drl.indexOf("Smurf( name in ( \"Pupa\", \"Brains\" ) , age in ( 55, 66 ) )");
+        index = drl.indexOf("Smurf( name in ( \"Pupa\", \"Brains\", \"John, Snow\" ) , age in ( 55, 66 ) )");
         assertTrue(index > -1);
 
         index = drl.indexOf("Smurf( )",