svn commit: r1859979 - in /ofbiz/ofbiz-framework/trunk/framework/base: src/main/java/org/apache/ofbiz/base/util/test/IndentingWriterTests.java src/test/java/org/apache/ofbiz/base/util/IndentingWriterTests.java testdef/basetests.xml

[mthl]

Author: mthl
Date: Sat May 25 14:23:12 2019
New Revision: 1859979

URL: http://svn.apache.org/viewvc?rev=1859979&view=rev
Log:
Turn ‘IndentingWriterTests’ into a unit test class
(OFBIZ-11067)

Added:
    ofbiz/ofbiz-framework/trunk/framework/base/src/test/java/org/apache/ofbiz/base/util/IndentingWriterTests.java   (with props)
Removed:
    ofbiz/ofbiz-framework/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/test/IndentingWriterTests.java
Modified:
    ofbiz/ofbiz-framework/trunk/framework/base/testdef/basetests.xml

Added: ofbiz/ofbiz-framework/trunk/framework/base/src/test/java/org/apache/ofbiz/base/util/IndentingWriterTests.java
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/src/test/java/org/apache/ofbiz/base/util/IndentingWriterTests.java?rev=1859979&view=auto
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/src/test/java/org/apache/ofbiz/base/util/IndentingWriterTests.java (added)
+++ ofbiz/ofbiz-framework/trunk/framework/base/src/test/java/org/apache/ofbiz/base/util/IndentingWriterTests.java Sat May 25 14:23:12 2019
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.ofbiz.base.util;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+
+import java.io.StringWriter;
+
+import org.apache.ofbiz.base.util.IndentingWriter;
+import org.junit.Test;
+
+public class IndentingWriterTests {
+
+    private static void doTest(String label, boolean doSpace, boolean doNewline, String wanted) throws Exception {
+        StringWriter sw = new StringWriter();
+        IndentingWriter iw;
+        if (!doSpace || !doNewline) {
+            iw = new IndentingWriter(sw, doSpace, doNewline);
+        } else {
+            iw = new IndentingWriter(sw);
+        }
+        iw.write('a');
+        iw.push();
+        iw.write("b\nm");
+        iw.newline();
+        iw.write(new char[] {'1', '\n', '2'});
+        iw.space();
+        iw.write('\n');
+        iw.pop();
+        iw.write("e");
+        iw.close();
+        assertEquals(label, wanted, sw.toString());
+    }
+
+    @Test
+    public void testIndentingWriter() throws Exception {
+        StringWriter sw = new StringWriter();
+        IndentingWriter iw = IndentingWriter.makeIndentingWriter(sw);
+        assertSame("makeIndentingWriter - pass-thru", iw, IndentingWriter.makeIndentingWriter(iw));
+        doTest("IndentingWriter doSpace:doNewline", true, true, "ab\n m\n 1\n 2 \n e");
+        doTest("IndentingWriter doNewline", false, true, "ab\nm\n1\n2\ne");
+        doTest("IndentingWriter doSpace", true, false, "ab\n m 1\n 2 \n e");
+        doTest("IndentingWriter", false, false, "ab\nm1\n2\ne");
+    }
+}

Propchange: ofbiz/ofbiz-framework/trunk/framework/base/src/test/java/org/apache/ofbiz/base/util/IndentingWriterTests.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/ofbiz-framework/trunk/framework/base/src/test/java/org/apache/ofbiz/base/util/IndentingWriterTests.java
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/ofbiz-framework/trunk/framework/base/src/test/java/org/apache/ofbiz/base/util/IndentingWriterTests.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ofbiz/ofbiz-framework/trunk/framework/base/testdef/basetests.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/base/testdef/basetests.xml?rev=1859979&r1=1859978&r2=1859979&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/framework/base/testdef/basetests.xml (original)
+++ ofbiz/ofbiz-framework/trunk/framework/base/testdef/basetests.xml Sat May 25 14:23:12 2019
@@ -23,7 +23,6 @@
         xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/test-suite.xsd">
     <test-group case-name="basetests">
         <junit-test-suite class-name="org.apache.ofbiz.base.util.test.AssertTests"/>
-        <junit-test-suite class-name="org.apache.ofbiz.base.util.test.IndentingWriterTests"/>
         <junit-test-suite class-name="org.apache.ofbiz.base.util.test.ObjectTypeTests"/>
         <!--junit-test-suite class-name="org.apache.ofbiz.base.util.test.ReferenceCleanerTests"/-->
         <junit-test-suite class-name="org.apache.ofbiz.base.util.test.UtilMiscTests"/>