From 45d19296e7fb68181de045b2e567fa4a15137013 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Mon, 7 Aug 2017 14:51:03 +0100 Subject: [PATCH 1/2] REPO-1995 Another go at fixing TransformerDebugTest on Bamboo. --- .../repo/content/transform/TransformerDebugTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/java/org/alfresco/repo/content/transform/TransformerDebugTest.java b/src/test/java/org/alfresco/repo/content/transform/TransformerDebugTest.java index db49f0295f..194b428a4c 100644 --- a/src/test/java/org/alfresco/repo/content/transform/TransformerDebugTest.java +++ b/src/test/java/org/alfresco/repo/content/transform/TransformerDebugTest.java @@ -118,8 +118,8 @@ public class TransformerDebugTest { for (int i = actual.length-1; i >= 0; i--) { - StringJoiner sj = new StringJoiner("\n"); - String[] bits = actual[i].split("\n"); + StringJoiner sj = new StringJoiner(System.lineSeparator()); + String[] bits = actual[i].split(System.lineSeparator()); for (String bit: bits) { Pattern p = Pattern.compile("^[0-9.]*"); @@ -168,7 +168,7 @@ public class TransformerDebugTest "0 --a) [---] transformer1<> > 50 KB\n"+ "0 --b) [---] transformer3<> > 50 KB\n"+ "0 --c) [---] transformer4<> > 50 KB\n"+ - "0 Finished in NN ms Transformer NOT called"}, unnumbered(untimed(debug.getEntries(10)))); + "0 Finished in NN ms Transformer NOT called\n"}, unnumbered(untimed(debug.getEntries(10)))); assertLogEntriesEquals(new String[] { "0 pdf txt WARN 1.5 MB NN ms No transformers as file is > 50 KB"}, unnumbered(untimed(log.getEntries(10)))); } From 049526f4d19f00dbd777505bb253d1b12ae43560 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Mon, 7 Aug 2017 15:51:41 +0100 Subject: [PATCH 2/2] REPO-1995 TransformerDebugTest appears to be failing because there are CRLF even though the build agents are Linux. --- .../content/transform/TransformerDebugTest.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/test/java/org/alfresco/repo/content/transform/TransformerDebugTest.java b/src/test/java/org/alfresco/repo/content/transform/TransformerDebugTest.java index 194b428a4c..5b1c65b1f0 100644 --- a/src/test/java/org/alfresco/repo/content/transform/TransformerDebugTest.java +++ b/src/test/java/org/alfresco/repo/content/transform/TransformerDebugTest.java @@ -118,8 +118,8 @@ public class TransformerDebugTest { for (int i = actual.length-1; i >= 0; i--) { - StringJoiner sj = new StringJoiner(System.lineSeparator()); - String[] bits = actual[i].split(System.lineSeparator()); + StringJoiner sj = new StringJoiner("\n"); + String[] bits = actual[i].split("\n"); for (String bit: bits) { Pattern p = Pattern.compile("^[0-9.]*"); @@ -142,6 +142,15 @@ public class TransformerDebugTest return actual; } + private String[] stripCR(String[] actual) + { + for (int i = actual.length-1; i >= 0; i--) + { + actual[i] = actual[i].replaceAll(" \r", ""); + } + return actual; + } + @Test public void alf18373Test() { @@ -168,8 +177,8 @@ public class TransformerDebugTest "0 --a) [---] transformer1<> > 50 KB\n"+ "0 --b) [---] transformer3<> > 50 KB\n"+ "0 --c) [---] transformer4<> > 50 KB\n"+ - "0 Finished in NN ms Transformer NOT called\n"}, unnumbered(untimed(debug.getEntries(10)))); + "0 Finished in NN ms Transformer NOT called"}, unnumbered(untimed(stripCR(debug.getEntries(10))))); assertLogEntriesEquals(new String[] { - "0 pdf txt WARN 1.5 MB NN ms No transformers as file is > 50 KB"}, unnumbered(untimed(log.getEntries(10)))); + "0 pdf txt WARN 1.5 MB NN ms No transformers as file is > 50 KB"}, unnumbered(untimed(stripCR(log.getEntries(10))))); } }