This is an automated email from the ASF dual-hosted git repository.

hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hop.git


The following commit(s) were added to refs/heads/master by this push:
     new c96b72acc0 Fixed flaky test in SvgGraphics2DTest
     new 96cfd6aab5 Merge pull request #3421 from wang3820/fix-flaky
c96b72acc0 is described below

commit c96b72acc0f3e1bd56dbe258ab24083d335808f4
Author: Tong Wang <[email protected]>
AuthorDate: Sat Nov 18 12:01:08 2023 -0500

    Fixed flaky test in SvgGraphics2DTest
---
 core/pom.xml                                                 |  6 ++++++
 .../java/org/apache/hop/core/svg/HopSvgGraphics2DTest.java   | 12 ++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 158bb90812..3bc897af48 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -546,6 +546,12 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-xml</artifactId>
+            <version>2.13.5</version>
+            <scope>test</scope>
+        </dependency>
 
     </dependencies>
 
diff --git 
a/core/src/test/java/org/apache/hop/core/svg/HopSvgGraphics2DTest.java 
b/core/src/test/java/org/apache/hop/core/svg/HopSvgGraphics2DTest.java
index 4e45a4954c..3ffebd026c 100644
--- a/core/src/test/java/org/apache/hop/core/svg/HopSvgGraphics2DTest.java
+++ b/core/src/test/java/org/apache/hop/core/svg/HopSvgGraphics2DTest.java
@@ -17,6 +17,8 @@
 
 package org.apache.hop.core.svg;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.dataformat.xml.XmlMapper;
 import org.apache.commons.lang.SystemUtils;
 import org.junit.Before;
 import org.junit.Test;
@@ -57,7 +59,10 @@ public class HopSvgGraphics2DTest {
   @Test
   public void testNewDocumentXml() throws Exception {
     HopSvgGraphics2D graphics2D = HopSvgGraphics2D.newDocument();
-    assertEquals(BASIC_SVG_XML, graphics2D.toXml());
+    XmlMapper xmlMapper = new XmlMapper();
+    JsonNode graphic2DNode = xmlMapper.readTree(graphics2D.toXml());
+    JsonNode basicSVGNode = xmlMapper.readTree(BASIC_SVG_XML);
+    assertEquals(basicSVGNode, graphic2DNode);
   }
 
   @Test
@@ -66,6 +71,9 @@ public class HopSvgGraphics2DTest {
 
     graphics2D.drawOval(50, 50, 25, 25);
 
-    assertEquals(BASIC_CIRCLE_XML, graphics2D.toXml());
+    XmlMapper xmlMapper = new XmlMapper();
+    JsonNode graphic2DNode = xmlMapper.readTree(graphics2D.toXml());
+    JsonNode basicSVGNode = xmlMapper.readTree(BASIC_CIRCLE_XML);
+    assertEquals(basicSVGNode, graphic2DNode);
   }
 }

Reply via email to