You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2012/02/27 17:35:14 UTC
git commit: Fix broken build.
Updated Branches:
refs/heads/wicket-1.4.x 59ad18f74 -> 92fe5ca04
Fix broken build.
Compare Strings instead of CharSequence vs. String.
Not sure why it started failing after a commit in a .js file...
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/92fe5ca0
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/92fe5ca0
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/92fe5ca0
Branch: refs/heads/wicket-1.4.x
Commit: 92fe5ca0426d4406a7a2599b3ae80406b9e75efd
Parents: 59ad18f
Author: martin-g <mg...@apache.org>
Authored: Mon Feb 27 18:34:04 2012 +0200
Committer: martin-g <mg...@apache.org>
Committed: Mon Feb 27 18:34:04 2012 +0200
----------------------------------------------------------------------
.../org/apache/wicket/SharedResourceUrlTest.java | 30 +++++++-------
1 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/92fe5ca0/wicket/src/test/java/org/apache/wicket/SharedResourceUrlTest.java
----------------------------------------------------------------------
diff --git a/wicket/src/test/java/org/apache/wicket/SharedResourceUrlTest.java b/wicket/src/test/java/org/apache/wicket/SharedResourceUrlTest.java
index 8a57df6..b263385 100644
--- a/wicket/src/test/java/org/apache/wicket/SharedResourceUrlTest.java
+++ b/wicket/src/test/java/org/apache/wicket/SharedResourceUrlTest.java
@@ -47,11 +47,11 @@ public class SharedResourceUrlTest extends WicketTestCase
ResourceReference rr = new ResourceReference("test");
CharSequence url = cycle.urlFor(rr);
- assertEquals("resources/org.apache.wicket.Application/test", url);
+ assertEquals("resources/org.apache.wicket.Application/test", url.toString());
rr = new ResourceReference(SharedResourceUrlTest.class, "test");
url = cycle.urlFor(rr);
- assertEquals("resources/org.apache.wicket.SharedResourceUrlTest/test", url);
+ assertEquals("resources/org.apache.wicket.SharedResourceUrlTest/test", url.toString());
}
/**
@@ -64,11 +64,11 @@ public class SharedResourceUrlTest extends WicketTestCase
ResourceReference rr = new ResourceReference("test");
CharSequence url = cycle.urlFor(rr, new ValueMap("param=value", ""));
- assertEquals("resources/org.apache.wicket.Application/test?param=value", url);
+ assertEquals("resources/org.apache.wicket.Application/test?param=value", url.toString());
rr = new ResourceReference(SharedResourceUrlTest.class, "test");
url = cycle.urlFor(rr, new ValueMap("param=value", ""));
- assertEquals("resources/org.apache.wicket.SharedResourceUrlTest/test?param=value", url);
+ assertEquals("resources/org.apache.wicket.SharedResourceUrlTest/test?param=value", url.toString());
}
public void testResourceReferenceUrl_SessionLocale() throws Exception
@@ -79,11 +79,11 @@ public class SharedResourceUrlTest extends WicketTestCase
Session.get().setLocale(Locale.GERMANY);
ResourceReference rr = new ResourceReference(Application.class, "test", true, false);
CharSequence url = cycle.urlFor(rr);
- assertEquals("resources/org.apache.wicket.Application/test_de_DE", url);
+ assertEquals("resources/org.apache.wicket.Application/test_de_DE", url.toString());
Session.get().setLocale(Locale.US);
url = cycle.urlFor(rr);
- assertEquals("resources/org.apache.wicket.Application/test_en_US", url);
+ assertEquals("resources/org.apache.wicket.Application/test_en_US", url.toString());
}
/**
@@ -96,15 +96,15 @@ public class SharedResourceUrlTest extends WicketTestCase
ResourceReference rr = new ResourceReference(Application.class, "test", false, true);
CharSequence url = cycle.urlFor(rr);
- assertEquals("resources/org.apache.wicket.Application/test", url);
+ assertEquals("resources/org.apache.wicket.Application/test", url.toString());
Session.get().setStyle("foo");
url = cycle.urlFor(rr);
- assertEquals("resources/org.apache.wicket.Application/test_foo", url);
+ assertEquals("resources/org.apache.wicket.Application/test_foo", url.toString());
Session.get().setStyle("bar");
url = cycle.urlFor(rr);
- assertEquals("resources/org.apache.wicket.Application/test_bar", url);
+ assertEquals("resources/org.apache.wicket.Application/test_bar", url.toString());
}
/**
@@ -118,16 +118,16 @@ public class SharedResourceUrlTest extends WicketTestCase
ResourceReference rr = new ResourceReference(Application.class, "test", true, true);
Session.get().setLocale(Locale.GERMANY);
CharSequence url = cycle.urlFor(rr);
- assertEquals("resources/org.apache.wicket.Application/test_de_DE", url);
+ assertEquals("resources/org.apache.wicket.Application/test_de_DE", url.toString());
Session.get().setStyle("foo");
url = cycle.urlFor(rr);
- assertEquals("resources/org.apache.wicket.Application/test_foo_de_DE", url);
+ assertEquals("resources/org.apache.wicket.Application/test_foo_de_DE", url.toString());
Session.get().setStyle("bar");
Session.get().setLocale(Locale.US);
url = cycle.urlFor(rr);
- assertEquals("resources/org.apache.wicket.Application/test_bar_en_US", url);
+ assertEquals("resources/org.apache.wicket.Application/test_bar_en_US", url.toString());
}
/**
@@ -141,15 +141,15 @@ public class SharedResourceUrlTest extends WicketTestCase
ResourceReference rr = new ResourceReference(Application.class, "test", false, false);
Session.get().setLocale(Locale.GERMANY);
CharSequence url = cycle.urlFor(rr);
- assertEquals("resources/org.apache.wicket.Application/test", url);
+ assertEquals("resources/org.apache.wicket.Application/test", url.toString());
Session.get().setStyle("foo");
url = cycle.urlFor(rr);
- assertEquals("resources/org.apache.wicket.Application/test", url);
+ assertEquals("resources/org.apache.wicket.Application/test", url.toString());
Session.get().setStyle("bar");
Session.get().setLocale(Locale.US);
url = cycle.urlFor(rr);
- assertEquals("resources/org.apache.wicket.Application/test", url);
+ assertEquals("resources/org.apache.wicket.Application/test", url.toString());
}
}