You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by mc...@apache.org on 2014/05/29 21:37:49 UTC
svn commit: r1598381 -
/tiles/request/branches/TREQ_1_0_X/tiles-request-api/src/test/java/org/apache/tiles/request/locale/URLApplicationResourceTest.java
Author: mck
Date: Thu May 29 19:37:48 2014
New Revision: 1598381
URL: http://svn.apache.org/r1598381
Log:
fix test for windows
org.junit.ComparisonFailure: expected:<[/]> but was:<[\]>
at org.junit.Assert.assertEquals(Assert.java:123)
at org.junit.Assert.assertEquals(Assert.java:145)
at org.apache.tiles.request.locale.URLApplicationResourceTest.testGetLocalePath(URLApplicationResourceTest.java:71)
Modified:
tiles/request/branches/TREQ_1_0_X/tiles-request-api/src/test/java/org/apache/tiles/request/locale/URLApplicationResourceTest.java
Modified: tiles/request/branches/TREQ_1_0_X/tiles-request-api/src/test/java/org/apache/tiles/request/locale/URLApplicationResourceTest.java
URL: http://svn.apache.org/viewvc/tiles/request/branches/TREQ_1_0_X/tiles-request-api/src/test/java/org/apache/tiles/request/locale/URLApplicationResourceTest.java?rev=1598381&r1=1598380&r2=1598381&view=diff
==============================================================================
--- tiles/request/branches/TREQ_1_0_X/tiles-request-api/src/test/java/org/apache/tiles/request/locale/URLApplicationResourceTest.java (original)
+++ tiles/request/branches/TREQ_1_0_X/tiles-request-api/src/test/java/org/apache/tiles/request/locale/URLApplicationResourceTest.java Thu May 29 19:37:48 2014
@@ -68,7 +68,7 @@ public class URLApplicationResourceTest
assertEquals("/my/path_it_IT.html", resource.getLocalePath(Locale.ITALY));
assertEquals("/my/path_en_GB_scotland.html", resource.getLocalePath(new Locale("en", "GB", "scotland")));
assertEquals("file:/", resource.getURL().toString());
- assertEquals("/", resource.getFile().toString());
+ assertEquals(File.separator, resource.getFile().toString());
}
@Test
@@ -77,61 +77,61 @@ public class URLApplicationResourceTest
assertEquals("/my/path_en_GB_scotland.html", resource.getLocalePath());
assertEquals("/my/path.html", resource.getPath());
assertEquals("file:/", resource.getURL().toString());
- assertEquals("/", resource.getFile().toString());
+ assertEquals(File.separator, resource.getFile().toString());
assertEquals(new Locale("en", "GB", "scotland"), resource.getLocale());
resource = new TestApplicationResource("/my/path_it_IT.html", new URL("file:///"));
assertEquals("/my/path_it_IT.html", resource.getLocalePath());
assertEquals("/my/path.html", resource.getPath());
assertEquals("file:/", resource.getURL().toString());
- assertEquals("/", resource.getFile().toString());
+ assertEquals(File.separator, resource.getFile().toString());
assertEquals(Locale.ITALY, resource.getLocale());
resource = new TestApplicationResource("/my/path_it.html", new URL("file:///"));
assertEquals("/my/path_it.html", resource.getLocalePath());
assertEquals("/my/path.html", resource.getPath());
assertEquals("file:/", resource.getURL().toString());
- assertEquals("/", resource.getFile().toString());
+ assertEquals(File.separator, resource.getFile().toString());
assertEquals(Locale.ITALIAN, resource.getLocale());
resource = new TestApplicationResource("/my/path.html", new URL("file:///"));
assertEquals("/my/path.html", resource.getLocalePath());
assertEquals("/my/path.html", resource.getPath());
assertEquals("file:/", resource.getURL().toString());
- assertEquals("/", resource.getFile().toString());
+ assertEquals(File.separator, resource.getFile().toString());
assertEquals(Locale.ROOT, resource.getLocale());
resource = new TestApplicationResource("/my/path_zz.html", new URL("file:///"));
assertEquals("/my/path_zz.html", resource.getLocalePath());
assertEquals("/my/path_zz.html", resource.getPath());
assertEquals("file:/", resource.getURL().toString());
- assertEquals("/", resource.getFile().toString());
+ assertEquals(File.separator, resource.getFile().toString());
assertEquals(Locale.ROOT, resource.getLocale());
resource = new TestApplicationResource("/my/path_en_ZZ.html", new URL("file:///"));
assertEquals("/my/path_en.html", resource.getLocalePath());
assertEquals("/my/path.html", resource.getPath());
assertEquals("file:/", resource.getURL().toString());
- assertEquals("/", resource.getFile().toString());
+ assertEquals(File.separator, resource.getFile().toString());
assertEquals(new Locale("en"), resource.getLocale());
resource = new TestApplicationResource("/my/path_tiles.html", new URL("file:///"));
assertEquals("/my/path_tiles.html", resource.getLocalePath());
assertEquals("/my/path_tiles.html", resource.getPath());
assertEquals("file:/", resource.getURL().toString());
- assertEquals("/", resource.getFile().toString());
+ assertEquals(File.separator, resource.getFile().toString());
assertEquals(Locale.ROOT, resource.getLocale());
resource = new TestApplicationResource("/my/path_longwordthatbreaksISO639.html", new URL("file:///"));
assertEquals("/my/path_longwordthatbreaksISO639.html", resource.getLocalePath());
assertEquals("/my/path_longwordthatbreaksISO639.html", resource.getPath());
assertEquals("file:/", resource.getURL().toString());
- assertEquals("/", resource.getFile().toString());
+ assertEquals(File.separator, resource.getFile().toString());
assertEquals(Locale.ROOT, resource.getLocale());
resource = new TestApplicationResource("/my/path_en_tiles.html", new URL("file:///"));
assertEquals("/my/path_en.html", resource.getLocalePath());
assertEquals("/my/path.html", resource.getPath());
assertEquals("file:/", resource.getURL().toString());
- assertEquals("/", resource.getFile().toString());
+ assertEquals(File.separator, resource.getFile().toString());
assertEquals(new Locale("en"), resource.getLocale());
resource = new TestApplicationResource("/my/path_en_longwordthatbreaksISO3166.html", new URL("file:///"));
assertEquals("/my/path_en.html", resource.getLocalePath());
assertEquals("/my/path.html", resource.getPath());
assertEquals("file:/", resource.getURL().toString());
- assertEquals("/", resource.getFile().toString());
+ assertEquals(File.separator, resource.getFile().toString());
assertEquals(new Locale("en"), resource.getLocale());
}
@@ -142,24 +142,24 @@ public class URLApplicationResourceTest
assertEquals("/my/path.html", resource.getPath());
assertEquals(new Locale("en", "GB", "scotland"), resource.getLocale());
assertEquals("file:/", resource.getURL().toString());
- assertEquals("/", resource.getFile().toString());
+ assertEquals(File.separator, resource.getFile().toString());
resource = new TestApplicationResource("/my/path.html", Locale.ITALY, new URL("file:///"));
assertEquals("/my/path_it_IT.html", resource.getLocalePath());
assertEquals("/my/path.html", resource.getPath());
assertEquals(Locale.ITALY, resource.getLocale());
assertEquals("file:/", resource.getURL().toString());
- assertEquals("/", resource.getFile().toString());
+ assertEquals(File.separator, resource.getFile().toString());
resource = new TestApplicationResource("/my/path.html", Locale.ITALIAN, new URL("file:///"));
assertEquals("/my/path_it.html", resource.getLocalePath());
assertEquals("/my/path.html", resource.getPath());
assertEquals(Locale.ITALIAN, resource.getLocale());
assertEquals("file:/", resource.getURL().toString());
- assertEquals("/", resource.getFile().toString());
+ assertEquals(File.separator, resource.getFile().toString());
resource = new TestApplicationResource("/my/path.html", Locale.ROOT, new URL("file:///"));
assertEquals("/my/path.html", resource.getLocalePath());
assertEquals("/my/path.html", resource.getPath());
assertEquals(Locale.ROOT, resource.getLocale());
assertEquals("file:/", resource.getURL().toString());
- assertEquals("/", resource.getFile().toString());
+ assertEquals(File.separator, resource.getFile().toString());
}
}