You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by pv...@apache.org on 2018/10/11 09:47:51 UTC
nifi git commit: NIFI-5681: Fix a locale-dependent test in
TestVersionedFlowSnapshotMetadataResult
Repository: nifi
Updated Branches:
refs/heads/master 6c17685cb -> 83ca67649
NIFI-5681: Fix a locale-dependent test in TestVersionedFlowSnapshotMetadataResult
Signed-off-by: Pierre Villard <pi...@gmail.com>
This closes #3061.
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/83ca6764
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/83ca6764
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/83ca6764
Branch: refs/heads/master
Commit: 83ca67649263bd5451807c446e03fa02a2429410
Parents: 6c17685
Author: Kotaro Terada <ko...@yahoo-corp.jp>
Authored: Tue Oct 9 18:31:41 2018 +0900
Committer: Pierre Villard <pi...@gmail.com>
Committed: Thu Oct 11 11:47:39 2018 +0200
----------------------------------------------------------------------
.../result/TestVersionedFlowSnapshotMetadataResult.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/83ca6764/nifi-toolkit/nifi-toolkit-cli/src/test/java/org/apache/nifi/toolkit/cli/impl/result/TestVersionedFlowSnapshotMetadataResult.java
----------------------------------------------------------------------
diff --git a/nifi-toolkit/nifi-toolkit-cli/src/test/java/org/apache/nifi/toolkit/cli/impl/result/TestVersionedFlowSnapshotMetadataResult.java b/nifi-toolkit/nifi-toolkit-cli/src/test/java/org/apache/nifi/toolkit/cli/impl/result/TestVersionedFlowSnapshotMetadataResult.java
index 7f6f6d6..c364096 100644
--- a/nifi-toolkit/nifi-toolkit-cli/src/test/java/org/apache/nifi/toolkit/cli/impl/result/TestVersionedFlowSnapshotMetadataResult.java
+++ b/nifi-toolkit/nifi-toolkit-cli/src/test/java/org/apache/nifi/toolkit/cli/impl/result/TestVersionedFlowSnapshotMetadataResult.java
@@ -69,13 +69,13 @@ public class TestVersionedFlowSnapshotMetadataResult {
//System.out.println(resultOut);
// can't get the time zone to line up on travis, so ignore this for now
- final String expected = "\n" +
- "Ver Date Author Message \n" +
- "--- -------------------------- ------ ---------------------------------------- \n" ;//+
+ final String expectedPattern = "^\\n" +
+ "Ver +Date + Author + Message +\\n" +
+ "-+ +-+ +-+ +-+ +\\n" +
//"1 Wed, Feb 14 2018 12:00 EST user1 This is a long comment, longer than t... \n" +
//"2 Wed, Feb 14 2018 12:30 EST user2 This is v2 \n" +
- //"\n";
+ "(.|\\n)+$";
- Assert.assertTrue(resultOut.startsWith(expected));
+ Assert.assertTrue(resultOut.matches(expectedPattern));
}
}