Merge pull request jpos#285 from alwyn/master

Fixed TestXmlPackager failing on Windows due to line-separator mismat…
ckstettler · Mar 6, 2020 · c998ebd · c998ebd
2 parents b9a75b4 + 3a4b715
commit c998ebd
Showing 1 changed file with 43 additions and 4 deletions.
diff --git a/jpos/src/test/java/org/jpos/iso/packagers/PackagerTestCase.java b/jpos/src/test/java/org/jpos/iso/packagers/PackagerTestCase.java
@@ -136,7 +136,7 @@ public void testF64ascii() throws Exception {
     }
     @Test
     public void testXMLPackager () throws Exception {
-        doTest (xmlPackager, "XMLPackager", "XMLPackager");
+        doTest (xmlPackager, "XMLPackager", "XMLPackager", true);
     }
 
     @Test
@@ -211,6 +211,11 @@ private ISOMsg updatePackAndUnpack (ISOMsg m, ISOPackager p) throws Exception {
     }
     private void doTest (ISOPackager packager, String msg, String img)
         throws Exception
+    {
+        doTest(packager, msg, img, false);
+    }
+    private void doTest (ISOPackager packager, String msg, String img, boolean removeCRLF)
+        throws Exception
     {
         // Logger logger = new Logger();
         // logger.addListener (new SimpleLogListener (System.out));
@@ -227,19 +232,53 @@ private void doTest (ISOPackager packager, String msg, String img)
         writeImage (img, p);
 
         byte[] b = getImage (img);
-        TestUtils.assertEquals(b, p);
+        if (removeCRLF) {
+            TestUtils.assertEquals(removeAllCRLF(b), removeAllCRLF(p));
+        } else {
+            TestUtils.assertEquals(b, p);
+        }
 
         ISOMsg m1 = new ISOMsg ();
         // packager.setLogger (logger, msg + "-m1");
         m1.setPackager (packager);
         m1.unpack (b);
-        TestUtils.assertEquals(b, m1.pack());
+        if (removeCRLF) {
+            TestUtils.assertEquals(removeAllCRLF(b), removeAllCRLF(m1.pack()));
+        } else {
+            TestUtils.assertEquals(b, m1.pack());
+        }
 
         ISOMsg m2 = new ISOMsg ();
         m2.setPackager (packager);
         // packager.setLogger (logger, msg + "-m2");
         m2.unpack (new ByteArrayInputStream (out.toByteArray()));
-        TestUtils.assertEquals(b, m2.pack());
+        if (removeCRLF) {
+            TestUtils.assertEquals(removeAllCRLF(b), removeAllCRLF(m2.pack()));
+        } else {
+            TestUtils.assertEquals(b, m2.pack());
+        }
+    }
+
+    /**
+     * Used specifically when testing XmlPackager.  When messages are generated
+     * on Windows they include a carriage return (CR) and is then compared against
+     * a version that was generated on Unix.
+     *
+     * This function is used to remove CR and LF before comparison.
+     *
+     * @param in Byte array to modify.
+     * @return Modified byte array.
+     */
+    private byte[] removeAllCRLF(byte[] in) {
+        ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(in);
+        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+        while (byteArrayInputStream.available() > 0) {
+            int b = byteArrayInputStream.read();
+            if (b != 10 && b != 13) {
+                byteArrayOutputStream.write(b);
+            }
+        }
+        return byteArrayOutputStream.toByteArray();
     }
 
     /*