You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2015/12/31 14:01:46 UTC

svn commit: r1722442 - in /sling/trunk/tooling/support/provisioning-model/src/test: java/org/apache/sling/provisioning/model/io/IOTest.java resources/configadmin.txt

Author: bdelacretaz
Date: Thu Dec 31 13:01:46 2015
New Revision: 1722442

URL: http://svn.apache.org/viewvc?rev=1722442&view=rev
Log:
SLING-5355 - test multiline strings in configs

Modified:
    sling/trunk/tooling/support/provisioning-model/src/test/java/org/apache/sling/provisioning/model/io/IOTest.java
    sling/trunk/tooling/support/provisioning-model/src/test/resources/configadmin.txt

Modified: sling/trunk/tooling/support/provisioning-model/src/test/java/org/apache/sling/provisioning/model/io/IOTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/support/provisioning-model/src/test/java/org/apache/sling/provisioning/model/io/IOTest.java?rev=1722442&r1=1722441&r2=1722442&view=diff
==============================================================================
--- sling/trunk/tooling/support/provisioning-model/src/test/java/org/apache/sling/provisioning/model/io/IOTest.java (original)
+++ sling/trunk/tooling/support/provisioning-model/src/test/java/org/apache/sling/provisioning/model/io/IOTest.java Thu Dec 31 13:01:46 2015
@@ -93,7 +93,7 @@ public class IOTest {
             configs.add(c);
         }
 
-        assertEquals(3, configs.size());
+        assertEquals(4, configs.size());
 
         final Configuration cfgA = configs.get(0);
         assertEquals("org.apache.test.A", cfgA.getPid());
@@ -114,6 +114,11 @@ public class IOTest {
         assertEquals(2, cfgC.getProperties().size());
         assertEquals("C", cfgC.getProperties().get("name"));
         assertArrayEquals(new Integer[] {1,2,3}, (Integer[])cfgC.getProperties().get("array"));
+        
+        final Configuration cfgD = configs.get(3);
+        assertEquals("org.apache.test.D", cfgD.getPid());
+        assertEquals("Here is\na multiline\nstring", cfgD.getProperties().get("textA"));
+        assertEquals("Another one\nusing\nescaped newlines", cfgD.getProperties().get("textB"));
     }
 
     @Test public void testAddition() throws Exception {

Modified: sling/trunk/tooling/support/provisioning-model/src/test/resources/configadmin.txt
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/support/provisioning-model/src/test/resources/configadmin.txt?rev=1722442&r1=1722441&r2=1722442&view=diff
==============================================================================
--- sling/trunk/tooling/support/provisioning-model/src/test/resources/configadmin.txt (original)
+++ sling/trunk/tooling/support/provisioning-model/src/test/resources/configadmin.txt Thu Dec 31 13:01:46 2015
@@ -41,4 +41,9 @@ org.apache.test.C
       "3"
     ]
     name="C"    
-    
\ No newline at end of file
+    
+org.apache.test.D
+  textA="Here is
+    a multiline
+    string"     
+  textB="Another one\nusing\nescaped newlines"     
\ No newline at end of file