Updated Branches: refs/heads/master b47785dbe -> f098dc415
GitHub Pull Request #23 Remove some new line characters to not break the build on Windows Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/f098dc41 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f098dc41 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f098dc41 Branch: refs/heads/master Commit: f098dc415379f3708ff250264495f2c11d15e225 Parents: b47785d Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Wed Dec 5 08:54:48 2012 +0100 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Wed Dec 5 08:55:55 2012 +0100 ---------------------------------------------------------------------- .../MinifiedAwareResourceReferenceTest.java | 4 ++-- .../wicket/request/resource/ResouceBundleTest.java | 2 +- .../java/org/apache/wicket/request/resource/a.js | 2 +- .../java/org/apache/wicket/request/resource/b.js | 2 +- .../org/apache/wicket/request/resource/b.min.js | 2 +- .../wicket/util/tester/WicketTesterTest.java | 2 +- .../java/org/apache/wicket/util/tester/test.html | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/f098dc41/wicket-core/src/test/java/org/apache/wicket/request/resource/MinifiedAwareResourceReferenceTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/MinifiedAwareResourceReferenceTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/MinifiedAwareResourceReferenceTest.java index b61e2d5..2bade84 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/resource/MinifiedAwareResourceReferenceTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/MinifiedAwareResourceReferenceTest.java @@ -52,7 +52,7 @@ public class MinifiedAwareResourceReferenceTest extends WicketTestCase MinifiedAwareResourceReferenceTest.class, "b.js"); assertEquals("b.min.js", reference.getName()); String fileContent = renderResource(reference); - assertEquals("//minified-b\n", fileContent); + assertEquals("//minified-b", fileContent); } /** @@ -66,6 +66,6 @@ public class MinifiedAwareResourceReferenceTest extends WicketTestCase MinifiedAwareResourceReferenceTest.class, "a.js"); assertEquals("a.js", reference.getName()); String fileContent = renderResource(reference); - assertEquals("//a\n", fileContent); + assertEquals("//a", fileContent); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/f098dc41/wicket-core/src/test/java/org/apache/wicket/request/resource/ResouceBundleTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/ResouceBundleTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/ResouceBundleTest.java index e40de1a..ea60618 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/resource/ResouceBundleTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/ResouceBundleTest.java @@ -45,7 +45,7 @@ public class ResouceBundleTest extends WicketTestCase ResouceBundleTest.class, "b.js")))); tester.startResource(bundle); - assertEquals("//a\n//b\n", tester.getLastResponseAsString()); + assertEquals("//a//b", tester.getLastResponseAsString()); } /** http://git-wip-us.apache.org/repos/asf/wicket/blob/f098dc41/wicket-core/src/test/java/org/apache/wicket/request/resource/a.js ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/a.js b/wicket-core/src/test/java/org/apache/wicket/request/resource/a.js index 514f2ee..6386737 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/resource/a.js +++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/a.js @@ -1 +1 @@ -//a +//a \ No newline at end of file http://git-wip-us.apache.org/repos/asf/wicket/blob/f098dc41/wicket-core/src/test/java/org/apache/wicket/request/resource/b.js ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/b.js b/wicket-core/src/test/java/org/apache/wicket/request/resource/b.js index b69de14..8e53d35 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/resource/b.js +++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/b.js @@ -1 +1 @@ -//b +//b \ No newline at end of file http://git-wip-us.apache.org/repos/asf/wicket/blob/f098dc41/wicket-core/src/test/java/org/apache/wicket/request/resource/b.min.js ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/b.min.js b/wicket-core/src/test/java/org/apache/wicket/request/resource/b.min.js index 359786a..d97109c 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/resource/b.min.js +++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/b.min.js @@ -1 +1 @@ -//minified-b +//minified-b \ No newline at end of file http://git-wip-us.apache.org/repos/asf/wicket/blob/f098dc41/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java index aeacb41..ae4101e 100644 --- a/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/WicketTesterTest.java @@ -850,7 +850,7 @@ public class WicketTesterTest extends WicketTestCase { String url = "wicket/resource/" + BlockedResourceLinkPage.class.getName() + "/test.html"; tester.executeUrl(url); - assertEquals("This is a test!\n", tester.getLastResponseAsString()); + assertEquals("This is a test!", tester.getLastResponseAsString()); } /** http://git-wip-us.apache.org/repos/asf/wicket/blob/f098dc41/wicket-core/src/test/java/org/apache/wicket/util/tester/test.html ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/util/tester/test.html b/wicket-core/src/test/java/org/apache/wicket/util/tester/test.html index 55d5dd1..df2ccde 100644 --- a/wicket-core/src/test/java/org/apache/wicket/util/tester/test.html +++ b/wicket-core/src/test/java/org/apache/wicket/util/tester/test.html @@ -1 +1 @@ -This is a test! +This is a test! \ No newline at end of file
