commit 28b15ae6e0d2e2f603e2a7492f23cf0445580df8
author Ray Milkey <ray@opennetworking.org> Thu Oct 18 11:36:10 2018 -0700
committer Thomas Vachuska <tom@opennetworking.org> Fri Oct 19 17:08:37 2018 +0000
tree 2d358546206c780b7d4aec5c3dae8d6777d63298
parent 4a3476322db0060dca1802e1e7740c3043516f1f

Fixes to allow ONOS to build using built in bazel Java 9 JDK

Change-Id: I57b7b3b9a8a28a824b196a72a24c42cd9d04cc59

drivers/utilities/src/test/java/org/onosproject/drivers/utilities/YangXmlUtilsTest.java

diff --git a/drivers/utilities/src/test/java/org/onosproject/drivers/utilities/YangXmlUtilsTest.java b/drivers/utilities/src/test/java/org/onosproject/drivers/utilities/YangXmlUtilsTest.java
index f7d898e..7668684 100644
--- a/drivers/utilities/src/test/java/org/onosproject/drivers/utilities/YangXmlUtilsTest.java
+++ b/drivers/utilities/src/test/java/org/onosproject/drivers/utilities/YangXmlUtilsTest.java
@@ -66,6 +66,18 @@
 
     }
 
+    private String canonicalXml(String s) {
+        String[] lines = s.split("\n");
+        StringBuilder xml = new StringBuilder();
+        for (String line : lines) {
+            if (line.contains("<")) {
+                xml.append(line);
+                xml.append("\n");
+            }
+        }
+        return xml.toString().trim();
+    }
+
     /**
      * Tests getting a single object configuration via passing the path and the map of the desired values.
      *
@@ -85,8 +97,8 @@
         assertEquals("Wrong configuaration", IteratorUtils.toList(testCreateConfig.getKeys()),
                      IteratorUtils.toList(cfg.getKeys()));
 
-        assertEquals("Wrong string configuaration", utils.getString(testCreateConfig),
-                     utils.getString(cfg));
+        assertEquals("Wrong string configuaration", canonicalXml(utils.getString(testCreateConfig)),
+                     canonicalXml(utils.getString(cfg)));
     }
 
     /**
@@ -115,8 +127,8 @@
                                              .getXmlConfiguration(OF_CONFIG_XML_PATH, elements));
         assertEquals("Wrong configuaration", IteratorUtils.toList(testCreateConfig.getKeys()),
                      IteratorUtils.toList(cfg.getKeys()));
-        assertEquals("Wrong string configuaration", utils.getString(testCreateConfig),
-                     utils.getString(cfg));
+        assertEquals("Wrong string configuaration", canonicalXml(utils.getString(testCreateConfig)),
+                     canonicalXml(utils.getString(cfg)));
     }
 
     /**