- Revision
- 347
- Author
- mauro
- Date
- 2007-11-12 03:57:54 -0600 (Mon, 12 Nov 2007)
Log Message
Upgraded example tests to JUnit 4.x
Modified Paths
- trunk/.classpath
- trunk/examples/jruby-example/src/test/java/org/codehaus/waffle/example/jruby/RubyRegistrarTest.java
- trunk/examples/paranamer-example/src/test/java/org/codehaus/waffle/example/paranamer/DateTypeConverterTest.java
- trunk/examples/simple-example/src/test/java/org/codehaus/waffle/example/simple/AutomobileControllerValidatorTest.java
- trunk/examples/simple-example/src/test/java/org/codehaus/waffle/example/simple/DateTypeConverterTest.java
Diff
Modified: trunk/.classpath (346 => 347)
--- trunk/.classpath 2007-11-12 09:42:24 UTC (rev 346) +++ trunk/.classpath 2007-11-12 09:57:54 UTC (rev 347) @@ -18,8 +18,10 @@ <classpathentry kind="src" path="examples/migration-example/src/main/java"/> <classpathentry kind="src" path="examples/mydvds-example/src/main/java"/> <classpathentry kind="src" path="examples/paranamer-example/src/main/java"/> + <classpathentry kind="src" path="examples/paranamer-example/src/main/resources"/> <classpathentry kind="src" path="examples/paranamer-example/src/test/java"/> <classpathentry kind="src" path="examples/simple-example/src/main/java"/> + <classpathentry kind="src" path="examples/simple-example/src/main/resources"/> <classpathentry kind="src" path="examples/simple-example/src/test/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER/modules"/>
Modified: trunk/examples/jruby-example/src/test/java/org/codehaus/waffle/example/jruby/RubyRegistrarTest.java (346 => 347)
--- trunk/examples/jruby-example/src/test/java/org/codehaus/waffle/example/jruby/RubyRegistrarTest.java 2007-11-12 09:42:24 UTC (rev 346) +++ trunk/examples/jruby-example/src/test/java/org/codehaus/waffle/example/jruby/RubyRegistrarTest.java 2007-11-12 09:57:54 UTC (rev 347) @@ -1,52 +1,52 @@ package org.codehaus.waffle.example.jruby; -import junit.framework.TestCase; +import static org.junit.Assert.assertEquals; + +import java.util.Map; + import org.jruby.Ruby; import org.jruby.RubyArray; import org.jruby.RubyModule; import org.jruby.javasupport.JavaEmbedUtils; import org.jruby.javasupport.JavaUtil; import org.jruby.runtime.builtin.IRubyObject; +import org.junit.Test; -import java.util.Map; +public class RubyRegistrarTest { -public class RubyRegistrarTest extends TestCase { +// Need to create an interface that sets the PicoContainer instance onto the Ruby Controller +// +// WaffleRubyControllerProxy.__setWaffleContext(...PicoContainer...) +// +// An associated module will be mixed in with the controller +// +// module Waffle +// module Controller +// def __waffle_context=(waffle_context) +// @@__waffle_context = waffle_context +// end +// +// def method_missing +// check the waffle context ... +// end +// +// .. params, request, response +// end +// +// end +// +// class FoobarController +// +// def index +// +// end +// +// end - /* - Need to create an interface that sets the PicoContainer instance onto the Ruby Controller - - WaffleRubyControllerProxy.__setWaffleContext(...PicoContainer...) - - An associated module will be mixed in with the controller - - module Waffle - module Controller - def __waffle_context=(waffle_context) - @@__waffle_context = waffle_context - end - - def method_missing - check the waffle context ... - end - - .. params, request, response - end - - end - - class FoobarController - - def index - - end - - end - - */ - // sandbox test for figuring out JRuby - public void testJRuby() { + @Test + public void canEvalRubyScript() { Ruby runtime = Ruby.getDefaultInstance(); String script = @@ -69,7 +69,7 @@ RubyArray rubyArray = (RubyArray) runtime.evalScript("foo.instance_variables"); assertEquals("@salmon", rubyArray.get(0)); - Map iVars = foo.getInstanceVariables(); + Map<?,?> iVars = foo.getInstanceVariables(); assertEquals(JavaUtil.convertJavaToRuby(runtime, "fish"), iVars.get("@salmon")); assertEquals("HELLO fish!", runtime.evalScript("foo.bar").toString()); @@ -105,7 +105,8 @@ System.out.println("javaObj = " + javaObj); } - public void testJavaObjectExposesFieldsAsInstanceVariables() { + @Test + public void canExposeFieldsAsInstanceVariables() { Ruby runtime = Ruby.getDefaultInstance(); String script = @@ -129,7 +130,8 @@ System.out.println("o = " + o); } - public void testRubyErb() { + @Test + public void testEvalRubyErb() { String script = "require \"erb\"\n" + "\n" +
Modified: trunk/examples/paranamer-example/src/test/java/org/codehaus/waffle/example/paranamer/DateTypeConverterTest.java (346 => 347)
--- trunk/examples/paranamer-example/src/test/java/org/codehaus/waffle/example/paranamer/DateTypeConverterTest.java 2007-11-12 09:42:24 UTC (rev 346) +++ trunk/examples/paranamer-example/src/test/java/org/codehaus/waffle/example/paranamer/DateTypeConverterTest.java 2007-11-12 09:57:54 UTC (rev 347) @@ -1,46 +1,48 @@ package org.codehaus.waffle.example.paranamer; +import static org.junit.Assert.assertNotNull; + +import java.text.SimpleDateFormat; +import java.util.Date; + +import ognl.OgnlException; + import org.codehaus.waffle.bind.BindException; -import org.codehaus.waffle.example.paranamer.DateTypeConverter; import org.codehaus.waffle.i18n.DefaultMessageResources; -import junit.framework.TestCase; -import ognl.OgnlException; import org.junit.Assert; +import org.junit.Test; -import java.text.SimpleDateFormat; -import java.util.Date; -public class DateTypeConverterTest extends TestCase { +public class DateTypeConverterTest { - public void testAccept() { + @Test + public void canAccept() { DateTypeConverter converter = new DateTypeConverter(new DefaultMessageResources()); Assert.assertTrue(converter.accept(Date.class)); Assert.assertTrue(converter.accept(java.sql.Date.class)); } - public void testConvert() throws OgnlException { + @Test + public void canConvert() throws OgnlException { DateTypeConverter converter = new DateTypeConverter(new DefaultMessageResources()); Date date = (Date) converter.convert("property-name", "19-09-2004", Date.class); Assert.assertEquals("09-19-2004", new SimpleDateFormat("MM-dd-yyyy").format(date)); } - public void testConvertFails() { + @Test(expected=BindException.class) + public void cannotConvertBadValue() { DateTypeConverter converter = new DateTypeConverter(new DefaultMessageResources()); + converter.convert("property-name", "bad-value", Date.class); + } - try { - converter.convert("property-name", "bad-value", Date.class); - Assert.fail("BindException expected"); - } catch (BindException expected) { - assertEquals("The value \"bad-value\" entered in field <i>property-name</i> is not a valid date (dd-MM-yyyy).", expected.getMessage()); - } - } - - public void testDefaultFormatUsedWhenNoAlternativeProvided() { + @Test + public void canUseDefaultFormatWhenNoAlternativeProvided() { DateTypeConverter converter = new DateTypeConverter(new DefaultMessageResources()); Date date = (Date) converter.convert("property-name", "00-21-1986", Date.class); - Assert.assertNotNull(date); + assertNotNull(date); } } +
Modified: trunk/examples/simple-example/src/test/java/org/codehaus/waffle/example/simple/AutomobileControllerValidatorTest.java (346 => 347)
--- trunk/examples/simple-example/src/test/java/org/codehaus/waffle/example/simple/AutomobileControllerValidatorTest.java 2007-11-12 09:42:24 UTC (rev 346) +++ trunk/examples/simple-example/src/test/java/org/codehaus/waffle/example/simple/AutomobileControllerValidatorTest.java 2007-11-12 09:57:54 UTC (rev 347) @@ -1,19 +1,22 @@ package org.codehaus.waffle.example.simple; -import org.codehaus.waffle.example.simple.AutomobileController; -import org.codehaus.waffle.example.simple.AutomobileControllerValidator; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import java.util.List; + import org.codehaus.waffle.i18n.DefaultMessageResources; import org.codehaus.waffle.i18n.MessageResources; +import org.codehaus.waffle.validation.DefaultErrorsContext; import org.codehaus.waffle.validation.ErrorsContext; -import org.codehaus.waffle.validation.DefaultErrorsContext; import org.codehaus.waffle.validation.FieldErrorMessage; -import junit.framework.TestCase; +import org.junit.Test; -import java.util.List; +public class AutomobileControllerValidatorTest { -public class AutomobileControllerValidatorTest extends TestCase { - - public void testValidateHasNoErrors() { + @Test + public void canValidateHasNoErrors() { MessageResources messageResources = new DefaultMessageResources(); AutomobileController controller = new AutomobileController(); @@ -27,7 +30,8 @@ assertFalse(errorsContext.hasErrorMessages()); } - public void testValidateHasErrors() { + @Test + public void canValidateHasErrors() { MessageResources messageResources = new DefaultMessageResources(); AutomobileController controller = new AutomobileController();
Modified: trunk/examples/simple-example/src/test/java/org/codehaus/waffle/example/simple/DateTypeConverterTest.java (346 => 347)
--- trunk/examples/simple-example/src/test/java/org/codehaus/waffle/example/simple/DateTypeConverterTest.java 2007-11-12 09:42:24 UTC (rev 346) +++ trunk/examples/simple-example/src/test/java/org/codehaus/waffle/example/simple/DateTypeConverterTest.java 2007-11-12 09:57:54 UTC (rev 347) @@ -1,48 +1,46 @@ package org.codehaus.waffle.example.simple; -import org.codehaus.waffle.bind.BindException; -import org.codehaus.waffle.example.simple.DateTypeConverter; -import org.codehaus.waffle.i18n.DefaultMessageResources; -import junit.framework.TestCase; -import ognl.OgnlException; -import org.junit.Assert; +import static org.junit.Assert.assertNotNull; import java.text.SimpleDateFormat; import java.util.Date; -public class DateTypeConverterTest extends TestCase { +import ognl.OgnlException; - public void testAccept() { +import org.codehaus.waffle.bind.BindException; +import org.codehaus.waffle.i18n.DefaultMessageResources; +import org.junit.Assert; +import org.junit.Test; + +public class DateTypeConverterTest { + + @Test + public void canAccept() { DateTypeConverter converter = new DateTypeConverter(new DefaultMessageResources()); Assert.assertTrue(converter.accept(Date.class)); Assert.assertTrue(converter.accept(java.sql.Date.class)); } - public void testConvert() throws OgnlException { + @Test + public void canConvert() throws OgnlException { DateTypeConverter converter = new DateTypeConverter(new DefaultMessageResources()); Date date = (Date) converter.convert("property-name", "19-09-2004", Date.class); Assert.assertEquals("09-19-2004", new SimpleDateFormat("MM-dd-yyyy").format(date)); } - public void testConvertFails() { + @Test(expected=BindException.class) + public void cannotConvertBadValue() { DateTypeConverter converter = new DateTypeConverter(new DefaultMessageResources()); + converter.convert("property-name", "bad-value", Date.class); + } - try { - converter.convert("property-name", "bad-value", Date.class); - Assert.fail("BindException expected"); - } catch (BindException expected) { - assertEquals( - "The value \"bad-value\" entered in field <i>property-name</i> is not a valid date (dd-MM-yyyy).", - expected.getMessage()); - } - } - - public void testDefaultFormatUsedWhenNoAlternativeProvided() { + @Test + public void canUseDefaultFormatWhenNoAlternativeProvided() { DateTypeConverter converter = new DateTypeConverter(new DefaultMessageResources()); Date date = (Date) converter.convert("property-name", "00-21-1986", Date.class); - Assert.assertNotNull(date); + assertNotNull(date); } }
To unsubscribe from this list please visit:
