Author: svenmeier
Date: Fri Jul 22 22:18:02 2011
New Revision: 1149750
URL: http://svn.apache.org/viewvc?rev=1149750&view=rev
Log:
added test for wrapped model, using default resource loading
Added:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/model/StringResourceModelTest$TestPage.properties
(contents, props changed)
- copied, changed from r1149276,
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/model/StringResourceModelTest.properties
Removed:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/model/StringResourceModelTest.properties
Modified:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/model/StringResourceModelTest.java
Copied:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/model/StringResourceModelTest$TestPage.properties
(from r1149276,
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/model/StringResourceModelTest.properties)
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/model/StringResourceModelTest%24TestPage.properties?p2=wicket/trunk/wicket-core/src/test/java/org/apache/wicket/model/StringResourceModelTest%24TestPage.properties&p1=wicket/trunk/wicket-core/src/test/java/org/apache/wicket/model/StringResourceModelTest.properties&r1=1149276&r2=1149750&rev=1149750&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/model/StringResourceModelTest.properties
(original)
+++
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/model/StringResourceModelTest$TestPage.properties
Fri Jul 22 22:18:02 2011
@@ -17,6 +17,8 @@
# limitations under the License.
#
simple.text=Simple text
+wrappedOnAssignment.text=Non-wrapped text
+resourceModelWithoutComponent.wrappedOnAssignment.text=Wrapped text
weather.sunny=It's sunny, wear sunscreen
weather.raining=It's raining, take an umbrella
weather.message=Weather station "${name}" reports that the temperature is
${currentTemperature} ${units}
Propchange:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/model/StringResourceModelTest$TestPage.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/model/StringResourceModelTest$TestPage.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/model/StringResourceModelTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/model/StringResourceModelTest.java?rev=1149750&r1=1149749&r2=1149750&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/model/StringResourceModelTest.java
(original)
+++
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/model/StringResourceModelTest.java
Fri Jul 22 22:18:02 2011
@@ -23,14 +23,14 @@ import java.util.Locale;
import junit.framework.Assert;
+import org.apache.wicket.Component;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.protocol.http.MockPage;
-import org.apache.wicket.resource.loader.BundleStringResourceLoader;
+import org.apache.wicket.markup.html.basic.Label;
import org.junit.Test;
/**
- * Test cases for the <code>StringResourceModel</code> class.
+ * Test cases for the {@link StringResourceModel}.
*
* @author Chris Turner
*/
@@ -57,11 +57,7 @@ public class StringResourceModelTest ext
protected void setUp() throws Exception
{
super.setUp();
- tester.getApplication()
- .getResourceSettings()
- .getStringResourceLoaders()
- .add(new
BundleStringResourceLoader("org.apache.wicket.model.StringResourceModelTest"));
- page = new MockPage();
+ page = new TestPage();
ws = new WeatherStation();
wsModel = new Model<WeatherStation>(ws);
}
@@ -74,7 +70,23 @@ public class StringResourceModelTest ext
StringResourceModel model = new
StringResourceModel("simple.text", page, null);
Assert.assertEquals("Text should be as expected", "Simple
text", model.getString());
Assert.assertEquals("Text should be as expected", "Simple
text", model.getObject());
-// Assert.assertEquals("Text should be as expected", "Simple text",
model.toString());
+ }
+
+ /** */
+ @Test
+ public void getWrappedOnAssignmentResource()
+ {
+ Label label1 = new Label("resourceModelWithComponent", new
StringResourceModel(
+ "wrappedOnAssignment.text", page, null));
+ page.add(label1);
+ Assert.assertEquals("Text should be as expected", "Non-wrapped
text",
+ label1.getDefaultModelObject());
+
+ Label label2 = new Label("resourceModelWithoutComponent", new
StringResourceModel(
+ "wrappedOnAssignment.text", (Component)null, null));
+ page.add(label2);
+ Assert.assertEquals("Text should be as expected", "Wrapped
text",
+ label2.getDefaultModelObject());
}
/** */
@@ -270,4 +282,19 @@ public class StringResourceModelTest ext
return name;
}
}
+
+ /**
+ * Test page.
+ */
+ public static class TestPage extends WebPage
+ {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * Construct.
+ */
+ public TestPage()
+ {
+ }
+ }
}
