Revision: 1176
http://stripes.svn.sourceforge.net/stripes/?rev=1176&view=rev
Author: bengunter
Date: 2009-10-20 16:35:37 +0000 (Tue, 20 Oct 2009)
Log Message:
-----------
Re-register the default String type converter after registering a new one for
the unit test.
Modified Paths:
--------------
branches/1.5.x/tests/src/net/sourceforge/stripes/validation/ValidationAnnotationsTest.java
Modified:
branches/1.5.x/tests/src/net/sourceforge/stripes/validation/ValidationAnnotationsTest.java
===================================================================
---
branches/1.5.x/tests/src/net/sourceforge/stripes/validation/ValidationAnnotationsTest.java
2009-10-20 14:55:30 UTC (rev 1175)
+++
branches/1.5.x/tests/src/net/sourceforge/stripes/validation/ValidationAnnotationsTest.java
2009-10-20 16:35:37 UTC (rev 1176)
@@ -1,5 +1,7 @@
package net.sourceforge.stripes.validation;
+import java.util.Locale;
+
import net.sourceforge.stripes.StripesTestFixture;
import net.sourceforge.stripes.action.ActionBean;
import net.sourceforge.stripes.action.ActionBeanContext;
@@ -96,16 +98,25 @@
*
* @see http://www.stripesframework.org/jira/browse/STS-610
*/
+ @SuppressWarnings("unchecked")
@Test(groups="extensions")
public void testValidateTypeConverterDoesNotExtendStock() throws Exception
{
- MockRoundtrip trip = new
MockRoundtrip(StripesTestFixture.getServletContext(), getClass());
-
StripesFilter.getConfiguration().getTypeConverterFactory().add(String.class,
MyStringTypeConverter.class);
- trip.addParameter("shouldBeUpperCased", "test");
- trip.addParameter("shouldNotBeUpperCased", "test");
- trip.execute("validateTypeConverters");
- ValidationAnnotationsTest actionBean = trip.getActionBean(getClass());
- Assert.assertEquals(actionBean.shouldBeUpperCased, "TEST");
- Assert.assertEquals(actionBean.shouldNotBeUpperCased, "test");
+ TypeConverterFactory factory =
StripesFilter.getConfiguration().getTypeConverterFactory();
+ Class<? extends TypeConverter> oldtc = factory.getTypeConverter(//
+ String.class, Locale.getDefault()).getClass();
+ try {
+ MockRoundtrip trip = new
MockRoundtrip(StripesTestFixture.getServletContext(), getClass());
+ factory.add(String.class, MyStringTypeConverter.class);
+ trip.addParameter("shouldBeUpperCased", "test");
+ trip.addParameter("shouldNotBeUpperCased", "test");
+ trip.execute("validateTypeConverters");
+ ValidationAnnotationsTest actionBean =
trip.getActionBean(getClass());
+ Assert.assertEquals(actionBean.shouldBeUpperCased, "TEST");
+ Assert.assertEquals(actionBean.shouldNotBeUpperCased, "test");
+ }
+ finally {
+ factory.add(String.class, (Class<? extends TypeConverter<?>>)
oldtc);
+ }
}
@Validate(encrypted=true)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Stripes-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/stripes-development
