svn commit: r537455 - /incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/LocalizerTest.java

[jd...@apache.org]

Author: jdonnerstag
Date: Sat May 12 08:09:44 2007
New Revision: 537455

URL: http://svn.apache.org/viewvc?view=rev&rev=537455
Log:
added test for wicket-528: StringResourceModel does not use defaultValue properly

Modified:
    incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/LocalizerTest.java

Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/LocalizerTest.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/LocalizerTest.java?view=diff&rev=537455&r1=537454&r2=537455
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/LocalizerTest.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/LocalizerTest.java Sat May 12 08:09:44 2007
@@ -16,6 +16,7 @@
  */
 package org.apache.wicket;
 
+import java.util.HashMap;
 import java.util.Locale;
 import java.util.MissingResourceException;
 
@@ -23,6 +24,7 @@
 
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.model.Model;
+import org.apache.wicket.model.PropertyModel;
 import org.apache.wicket.resource.DummyApplication;
 import org.apache.wicket.resource.loader.ComponentStringResourceLoader;
 import org.apache.wicket.settings.IResourceSettings;
@@ -160,6 +162,21 @@
 
 		assertEquals("value 1", drop1);
 		assertEquals("value 2", drop2);
+	}
+
+	/**
+	 * 
+	 */
+	public void testGetStringUseModel()
+	{
+		HashMap model = new HashMap();
+		model.put("user", "juergen");
+		
+		Assert.assertEquals("Expected string should be returned", "Welcome, juergen", localizer
+				.getString("test.substitute", null, new PropertyModel(model, null), "DEFAULT {user}"));
+		
+		Assert.assertEquals("Expected string should be returned", "DEFAULT juergen", localizer
+				.getString("test.substituteDoesNotExist", null, new PropertyModel(model, null), "DEFAULT ${user}"));
 	}
 
 	/**