You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2017/10/23 16:26:29 UTC
juneau git commit: Fix testcase failure specific to Windows.
Repository: juneau
Updated Branches:
refs/heads/master 3e381eaf4 -> 8b8531163
Fix testcase failure specific to Windows.
Project: http://git-wip-us.apache.org/repos/asf/juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/juneau/commit/8b853116
Tree: http://git-wip-us.apache.org/repos/asf/juneau/tree/8b853116
Diff: http://git-wip-us.apache.org/repos/asf/juneau/diff/8b853116
Branch: refs/heads/master
Commit: 8b8531163fa162ff024a18bd2009f46740f97dd4
Parents: 3e381ea
Author: JamesBognar <ja...@apache.org>
Authored: Mon Oct 23 12:26:26 2017 -0400
Committer: JamesBognar <ja...@apache.org>
Committed: Mon Oct 23 12:26:26 2017 -0400
----------------------------------------------------------------------
.../java/org/apache/juneau/transforms/LocalizedDatesTest.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/juneau/blob/8b853116/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/transforms/LocalizedDatesTest.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/transforms/LocalizedDatesTest.java b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/transforms/LocalizedDatesTest.java
index a808709..582dcad 100644
--- a/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/transforms/LocalizedDatesTest.java
+++ b/juneau-core/juneau-core-test/src/test/java/org/apache/juneau/transforms/LocalizedDatesTest.java
@@ -642,11 +642,12 @@ public class LocalizedDatesTest {
public void test() {
BeanSession session = ps.getBeanContext().createSession(new BeanSessionArgs(null, sessionLocale, sessionTimeZone, null));
String actual = session.convertToType(calendar, String.class);
+ String actual2 = actual;
if (expected.indexOf('(') == -1)
- actual = actual.replaceAll("\\([^\\)]+\\) ", "").replaceAll(" \\([^\\)]+\\)", ""); // Fix Windows-specific formatting difference
- assertEquals(expected, actual);
+ actual2 = actual2.replaceAll("\\([^\\)]+\\) ", "").replaceAll(" \\([^\\)]+\\)", ""); // Fix Windows-specific formatting difference
+ assertEquals(expected, actual2);
Object c2 = session.convertToType(actual, calendar.getClass());
- String actual2 = session.convertToType(c2, String.class);
+ actual2 = session.convertToType(c2, String.class);
if (expected.indexOf('(') == -1)
actual2 = actual2.replaceAll("\\([^\\)]+\\) ", "").replaceAll(" \\([^\\)]+\\)", ""); // Fix Windows-specific formatting difference
assertEquals(expected, actual2);