BUG-305: remove the use of System.out

Change-Id: Id1975d58a432223666ac57b15bd1753cdba27996
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeHelper.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeHelper.java
index 0a0848665ef3dbad824d9db1518467dfe6aad56c..6a8810aa8dc5b674d2aa80a6a24dd6918e90fb03 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeHelper.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeHelper.java
@@ -27,6 +27,7 @@ import java.util.Set;
 \r
 import javax.xml.transform.OutputKeys;\r
 import javax.xml.transform.Transformer;\r
+import javax.xml.transform.TransformerException;\r
 import javax.xml.transform.TransformerFactory;\r
 import javax.xml.transform.dom.DOMSource;\r
 import javax.xml.transform.stream.StreamResult;\r
@@ -128,24 +129,31 @@ public abstract class NodeHelper {
       "    </network-elements>\n" +\r
       "</network>";\r
 \r
+    private static String domTreeString(Document domTree) throws TransformerException {\r
+        TransformerFactory transformerFact = TransformerFactory.newInstance();\r
+        transformerFact.setAttribute("indent-number", 4);\r
+        Transformer transformer = transformerFact.newTransformer();\r
+        transformer.setOutputProperty(OutputKeys.INDENT, "yes");\r
+        //initialize StreamResult with File object to save to file\r
+        StreamResult result = new StreamResult(new StringWriter());\r
+        DOMSource source = new DOMSource(domTree);\r
+        transformer.transform(source, result);\r
+        return result.getWriter().toString();\r
+    }\r
+\r
     /**\r
      * @param domTree\r
      * @param out\r
      * @throws Exception\r
      */\r
-    public static void dumpDoc(Document domTree, PrintStream out) throws Exception {\r
-      TransformerFactory transformerFact = TransformerFactory.newInstance();\r
-      transformerFact.setAttribute("indent-number", 4);\r
-      Transformer transformer = transformerFact.newTransformer();\r
-      transformer.setOutputProperty(OutputKeys.INDENT, "yes");\r
-      //initialize StreamResult with File object to save to file\r
-      StreamResult result = new StreamResult(new StringWriter());\r
-      DOMSource source = new DOMSource(domTree);\r
-      transformer.transform(source, result);\r
-      String xmlString = result.getWriter().toString();\r
-      out.println(xmlString);\r
+    private static void dumpDoc(Document domTree, PrintStream out) throws Exception {\r
+      out.println(domTreeString(domTree));\r
     }\r
 \r
+       public static void dumpDoc(Document domTree, Logger logger) throws TransformerException {\r
+               logger.info("{}", domTreeString(domTree));\r
+       }\r
+\r
     /**\r
      * @param qName\r
      * @return example tree, see {@link #NETWORK_XML}\r
@@ -403,9 +411,8 @@ public abstract class NodeHelper {
 \r
         boolean similar = myDiff.similar();\r
         if (! similar) {\r
-            System.out.println(new String(actualRaw.toByteArray()));\r
+            LOG.info("{}", new String(actualRaw.toByteArray()));\r
         }\r
         Assert.assertEquals(myDiff.toString(), true, similar);\r
     }\r
-\r
 }\r

diff --git a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeModificationBuilderImplTest.java b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeModificationBuilderImplTest.java
index f7fc7c22b8537663c70d10569c1fd3c6d679ec1b..fe0e5d71aab970dc7156cba8fff97ef10c7f0e89 100644 (file)
--- a/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeModificationBuilderImplTest.java
+++ b/yang/yang-data-impl/src/test/java/org/opendaylight/yangtools/yang/data/impl/NodeModificationBuilderImplTest.java
@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 
 /**
  * @author michal.rehak
- * 
+ *
  */
 public class NodeModificationBuilderImplTest {
 
@@ -48,12 +48,12 @@ public class NodeModificationBuilderImplTest {
         CompositeNode diffTreeImmutable = NodeFactory.copyDeepAsImmutable(diffTree, null);
 
         Document diffShadow = NodeUtils.buildShadowDomTree(diffTreeImmutable);
-        NodeHelper.dumpDoc(diffShadow, System.out);
+        NodeHelper.dumpDoc(diffShadow, LOG);
     }
 
     /**
      * prepare schemaContext
-     * 
+     *
      * @throws Exception
      */
     @Before
@@ -87,7 +87,7 @@ public class NodeModificationBuilderImplTest {
      * Test method for
      * {@link org.opendaylight.yangtools.yang.data.impl.NodeModificationBuilderImpl#buildDiffTree()}
      * .
-     * 
+     *
      * @throws Exception
      */
     @Test
@@ -111,7 +111,7 @@ public class NodeModificationBuilderImplTest {
      * Test method for
      * {@link org.opendaylight.yangtools.yang.data.impl.NodeModificationBuilderImpl#buildDiffTree()}
      * .
-     * 
+     *
      * @throws Exception
      */
     @Test
@@ -140,7 +140,7 @@ public class NodeModificationBuilderImplTest {
      * Test method for
      * {@link org.opendaylight.yangtools.yang.data.impl.NodeModificationBuilderImpl#buildDiffTree()}
      * .
-     * 
+     *
      * @throws Exception
      */
     @Test
@@ -162,7 +162,7 @@ public class NodeModificationBuilderImplTest {
      * Test method for
      * {@link org.opendaylight.yangtools.yang.data.impl.NodeModificationBuilderImpl#buildDiffTree()}
      * .
-     * 
+     *
      * @throws Exception
      */
     @Test
@@ -184,7 +184,7 @@ public class NodeModificationBuilderImplTest {
      * Test method for
      * {@link org.opendaylight.yangtools.yang.data.impl.NodeModificationBuilderImpl#buildDiffTree()}
      * .
-     * 
+     *
      * @throws Exception
      */
     @Test
@@ -207,7 +207,7 @@ public class NodeModificationBuilderImplTest {
      * Test method for
      * {@link org.opendaylight.yangtools.yang.data.impl.NodeModificationBuilderImpl#buildDiffTree()}
      * .
-     * 
+     *
      * @throws Exception
      */
     @Test
@@ -229,7 +229,7 @@ public class NodeModificationBuilderImplTest {
      * Test method for
      * {@link org.opendaylight.yangtools.yang.data.impl.NodeModificationBuilderImpl#buildDiffTree()}
      * .
-     * 
+     *
      * @throws Exception
      */
     @Test
@@ -251,7 +251,7 @@ public class NodeModificationBuilderImplTest {
      * Test method for
      * {@link org.opendaylight.yangtools.yang.data.impl.NodeModificationBuilderImpl#buildDiffTree()}
      * .
-     * 
+     *
      * @throws Exception
      */
     @Test
@@ -274,7 +274,7 @@ public class NodeModificationBuilderImplTest {
      * Test method for
      * {@link org.opendaylight.yangtools.yang.data.impl.NodeModificationBuilderImpl#buildDiffTree()}
      * .
-     * 
+     *
      * @throws Exception
      */
     @Test