- Revision
- 521
- Author
- mward
- Date
- 2007-12-21 17:08:05 -0600 (Fri, 21 Dec 2007)
Log Message
resurrected tests that were not running (were broken and missing @Test annotation). Refactored Reference Tests
Modified Paths
- trunk/waffle-core/src/main/java/org/codehaus/waffle/bind/ognl/OgnlValueConverter.java
- trunk/waffle-core/src/test/java/org/codehaus/waffle/context/pico/PicoComponentRegistryTest.java
- trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/ComponentReferenceTest.java
- trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/RequestAttributeReferenceTest.java
- trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/RequestParameterReferenceTest.java
- trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/ServletContextAttributeReferenceTest.java
- trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/SessionAttributeReferenceTest.java
Diff
Modified: trunk/waffle-core/src/main/java/org/codehaus/waffle/bind/ognl/OgnlValueConverter.java (520 => 521)
--- trunk/waffle-core/src/main/java/org/codehaus/waffle/bind/ognl/OgnlValueConverter.java 2007-12-20 13:41:11 UTC (rev 520) +++ trunk/waffle-core/src/main/java/org/codehaus/waffle/bind/ognl/OgnlValueConverter.java 2007-12-21 23:08:05 UTC (rev 521) @@ -36,6 +36,7 @@ return true; } + @SuppressWarnings({"unchecked"}) public <T> T convertValue(String propertyName, String value, Class<T> toType) { return (T) converter.convertValue(null, null, null, propertyName, value, toType); }
Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/context/pico/PicoComponentRegistryTest.java (520 => 521)
--- trunk/waffle-core/src/test/java/org/codehaus/waffle/context/pico/PicoComponentRegistryTest.java 2007-12-20 13:41:11 UTC (rev 520) +++ trunk/waffle-core/src/test/java/org/codehaus/waffle/context/pico/PicoComponentRegistryTest.java 2007-12-21 23:08:05 UTC (rev 521) @@ -11,10 +11,10 @@ import org.codehaus.waffle.action.RequestParameterMethodNameResolver; import org.codehaus.waffle.bind.BindErrorMessageResolver; import org.codehaus.waffle.bind.DataBinder; +import org.codehaus.waffle.bind.DefaultStringTransmuter; import org.codehaus.waffle.bind.RequestAttributeBinder; import org.codehaus.waffle.bind.StringTransmuter; import org.codehaus.waffle.bind.ValueConverterFinder; -import org.codehaus.waffle.bind.DefaultStringTransmuter; import org.codehaus.waffle.bind.ognl.OgnlBindErrorMessageResolver; import org.codehaus.waffle.bind.ognl.OgnlDataBinder; import org.codehaus.waffle.bind.ognl.OgnlValueConverterFinder; @@ -255,9 +255,9 @@ assertTrue(componentRegistry.getViewResolver() instanceof StubViewResolver); } - // TODO mward this needs to be revived - public void testRegisterAdditionalComponents() { - List<String> names = new ArrayList<String>(); + @Test + public void canRegisterAdditionalComponents() { + final List<String> names = new ArrayList<String>(); names.add("register:NameCanBeAnything"); // Mock ServletContext @@ -265,8 +265,8 @@ mockery.checking(new Expectations() { { one(servletContext).getInitParameterNames(); - will(returnValue(EMPTY_ENUMERATION)); - exactly(17).of(servletContext).getInitParameter(with(any(String.class))); + will(returnValue(Collections.enumeration(names))); + exactly(26).of(servletContext).getInitParameter(with(any(String.class))); one(servletContext).getInitParameter("register:NameCanBeAnything"); will(returnValue("java.util.ArrayList")); } @@ -279,8 +279,9 @@ assertSame(list, componentRegistry.locateByKey("NameCanBeAnything")); } - public void testRegisterNonCachingCustomComponent() throws Exception { - List<String> names = new ArrayList<String>(); + @Test + public void canRegisterNonCachingCustomComponent() throws Exception { + final List<String> names = new ArrayList<String>(); names.add("registerNonCaching:FooBar"); // Mock ServletContext @@ -288,8 +289,8 @@ mockery.checking(new Expectations() { { one(servletContext).getInitParameterNames(); - will(returnValue(EMPTY_ENUMERATION)); - exactly(17).of(servletContext).getInitParameter(with(any(String.class))); + will(returnValue(Collections.enumeration(names))); + exactly(26).of(servletContext).getInitParameter(with(any(String.class))); one(servletContext).getInitParameter("registerNonCaching:FooBar"); will(returnValue("java.util.ArrayList")); }
Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/ComponentReferenceTest.java (520 => 521)
--- trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/ComponentReferenceTest.java 2007-12-20 13:41:11 UTC (rev 520) +++ trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/ComponentReferenceTest.java 2007-12-21 23:08:05 UTC (rev 521) @@ -2,12 +2,13 @@ import org.junit.Assert; import org.junit.Test; +import static org.codehaus.waffle.registrar.ComponentReference.component; public class ComponentReferenceTest { @Test public void canConstructInstanceFromComponentMethod() { - Reference reference = ComponentReference.component("foo"); + Reference reference = component("foo"); Assert.assertEquals("foo", reference.getKey()); } }
Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/RequestAttributeReferenceTest.java (520 => 521)
--- trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/RequestAttributeReferenceTest.java 2007-12-20 13:41:11 UTC (rev 520) +++ trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/RequestAttributeReferenceTest.java 2007-12-21 23:08:05 UTC (rev 521) @@ -2,12 +2,13 @@ import org.junit.Test; import org.junit.Assert; +import static org.codehaus.waffle.registrar.RequestAttributeReference.requestAttribute; public class RequestAttributeReferenceTest { @Test public void canConstructInstanceFromRequestMethod() { - Reference reference = RequestAttributeReference.requestAttribute("foo"); + Reference reference = requestAttribute("foo"); Assert.assertEquals("foo", reference.getKey()); } }
Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/RequestParameterReferenceTest.java (520 => 521)
--- trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/RequestParameterReferenceTest.java 2007-12-20 13:41:11 UTC (rev 520) +++ trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/RequestParameterReferenceTest.java 2007-12-21 23:08:05 UTC (rev 521) @@ -2,12 +2,13 @@ import org.junit.Test; import org.junit.Assert; +import static org.codehaus.waffle.registrar.RequestParameterReference.requestParameter; public class RequestParameterReferenceTest { @Test public void canConstructInstanceFromParameterMethod() { - Reference reference = RequestParameterReference.requestParameter("foo"); + Reference reference = requestParameter("foo"); Assert.assertEquals("foo", reference.getKey()); } }
Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/ServletContextAttributeReferenceTest.java (520 => 521)
--- trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/ServletContextAttributeReferenceTest.java 2007-12-20 13:41:11 UTC (rev 520) +++ trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/ServletContextAttributeReferenceTest.java 2007-12-21 23:08:05 UTC (rev 521) @@ -2,12 +2,13 @@ import org.junit.Test; import org.junit.Assert; +import static org.codehaus.waffle.registrar.ServletContextAttributeReference.servletContextAttribute; public class ServletContextAttributeReferenceTest { @Test public void canConstructInstanceFromParameterMethod() { - Reference reference = ServletContextAttributeReference.servletContextAttribute("foo"); + Reference reference = servletContextAttribute("foo"); Assert.assertEquals("foo", reference.getKey()); } }
Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/SessionAttributeReferenceTest.java (520 => 521)
--- trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/SessionAttributeReferenceTest.java 2007-12-20 13:41:11 UTC (rev 520) +++ trunk/waffle-core/src/test/java/org/codehaus/waffle/registrar/SessionAttributeReferenceTest.java 2007-12-21 23:08:05 UTC (rev 521) @@ -2,12 +2,13 @@ import org.junit.Test; import org.junit.Assert; +import static org.codehaus.waffle.registrar.SessionAttributeReference.sessionAttribute; public class SessionAttributeReferenceTest { @Test public void canConstructInstanceFromSessionMethod() { - Reference reference = SessionAttributeReference.sessionAttribute("foo"); + Reference reference = sessionAttribute("foo"); Assert.assertEquals("foo", reference.getKey()); } }
To unsubscribe from this list please visit:
