You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2009/12/04 09:36:02 UTC
svn commit: r887110 - in /wicket/branches/wicket-1.4.x/wicket/src:
main/java/org/apache/wicket/model/StringResourceModel.java
test/java/org/apache/wicket/model/ModelToStringTest.java
Author: ivaynberg
Date: Fri Dec 4 08:35:50 2009
New Revision: 887110
URL: http://svn.apache.org/viewvc?rev=887110&view=rev
Log:
fix tests
Modified:
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/model/StringResourceModel.java
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/model/ModelToStringTest.java
Modified: wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/model/StringResourceModel.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/model/StringResourceModel.java?rev=887110&r1=887109&r2=887110&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/model/StringResourceModel.java (original)
+++ wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/model/StringResourceModel.java Fri Dec 4 08:35:50 2009
@@ -676,4 +676,10 @@
localizer = null;
locale = null;
}
+
+ @Override
+ public void setObject(String object)
+ {
+ throw new UnsupportedOperationException();
+ }
}
\ No newline at end of file
Modified: wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/model/ModelToStringTest.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/model/ModelToStringTest.java?rev=887110&r1=887109&r2=887110&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/model/ModelToStringTest.java (original)
+++ wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/model/ModelToStringTest.java Fri Dec 4 08:35:50 2009
@@ -160,19 +160,16 @@
public void testLoadableDetachableModel()
{
LoadableDetachableModel<String> model = new MyLoadableDetachableModel();
- String expected = "Model:classname=[" + model.getClass().getName() + "]" +
- ":attached=false" + ":tempModelObject=[null]";
- assertEquals(expected, model.toString());
+ assertTrue(model.toString().contains(":attached=false"));
+ assertTrue(model.toString().contains(":tempModelObject=[null]"));
model.getObject();
- expected = "Model:classname=[" + model.getClass().getName() + "]" + ":attached=true" +
- ":tempModelObject=[foo]";
- assertEquals(expected, model.toString());
+ assertTrue(model.toString().contains(":attached=true"));
+ assertTrue(model.toString().contains(":tempModelObject=[foo]"));
model.detach();
- expected = "Model:classname=[" + model.getClass().getName() + "]" + ":attached=false" +
- ":tempModelObject=[null]";
- assertEquals(expected, model.toString());
+ assertTrue(model.toString().contains(":attached=false"));
+ assertTrue(model.toString().contains(":tempModelObject=[null]"));
}