Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSourceImplTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSourceImplTest.java?rev=744203&r1=744202&r2=744203&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSourceImplTest.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ComponentInstantiatorSourceImplTest.java Fri Feb 13 18:18:49 2009 @@ -51,7 +51,7 @@ private static final ClassLoader contextLoader = Thread.currentThread().getContextClassLoader(); private static final String SYNTH_COMPONENT_CLASSNAME = "org.apache.tapestry5.internal.transform.pages.SynthComponent"; - + private final ClasspathURLConverter converter = new ClasspathURLConverterImpl(); private File extraClasspath; @@ -240,7 +240,7 @@ replay(); - Instantiator inst = source.findInstantiator(classname); + Instantiator inst = source.getInstantiator(classname); Component target = inst.newInstance(resources);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestImplTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestImplTest.java?rev=744203&r1=744202&r2=744203&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestImplTest.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestImplTest.java Fri Feb 13 18:18:49 2009 @@ -1,4 +1,4 @@ -// Copyright 2006, 2007, 2008 The Apache Software Foundation +// Copyright 2006, 2007, 2008, 2009 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -125,11 +125,11 @@ verify(); } - @DataProvider(name = "xhr_inputs") + @DataProvider public Object[][] xhr_inputs() { - return new Object[][] {{null, false}, {"", false}, {"some other value", false}, - {"XMLHttpRequest", true}}; + return new Object[][] { { null, false }, { "", false }, { "some other value", false }, + { "XMLHttpRequest", true } }; } @Test Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestPathOptimizerImplTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestPathOptimizerImplTest.java?rev=744203&r1=744202&r2=744203&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestPathOptimizerImplTest.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestPathOptimizerImplTest.java Fri Feb 13 18:18:49 2009 @@ -1,4 +1,4 @@ -// Copyright 2008 The Apache Software Foundation +// Copyright 2008, 2009 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -22,89 +22,89 @@ public class RequestPathOptimizerImplTest extends InternalBaseTestCase { - @DataProvider(name = "uri_optimization") + @DataProvider public Object[][] uri_optimization_data() { - return new Object[][]{{"/context", "/foo/bar.png", "/context/foo/baz.png", "baz.png"}, + return new Object[][] { { "/context", "/foo/bar.png", "/context/foo/baz.png", "baz.png" }, - {"/context", "/foo/bar.gif", "/context/foo//baz.gif", "baz.gif"}, + { "/context", "/foo/bar.gif", "/context/foo//baz.gif", "baz.gif" }, - {"/context", "/foo//bar.css", "/context/foo/baz.css", "baz.css"}, + { "/context", "/foo//bar.css", "/context/foo/baz.css", "baz.css" }, - {"", "/foo/bar.css", "/foo/baz.css", "baz.css"}, + { "", "/foo/bar.css", "/foo/baz.css", "baz.css" }, - {"/reallylongcontexttoensureitisrelative", "/foo/bar/baz/biff.gif", - "/reallylongcontexttoensureitisrelative/gnip/gnop.gif", "../../../gnip/gnop.gif"}, + { "/reallylongcontexttoensureitisrelative", "/foo/bar/baz/biff.gif", + "/reallylongcontexttoensureitisrelative/gnip/gnop.gif", "../../../gnip/gnop.gif" }, - {"", "/foo/bar/baz/biff/yepthisissolongthatabsoluteurlisshorter/dude", "/gnip/gnop", - "/gnip/gnop"}, + { "", "/foo/bar/baz/biff/yepthisissolongthatabsoluteurlisshorter/dude", "/gnip/gnop", + "/gnip/gnop" }, - {"", "/foo/bar", "/foo/bar/baz/bif", "bar/baz/bif"}, + { "", "/foo/bar", "/foo/bar/baz/bif", "bar/baz/bif" }, - {"", "/foo/bar/baz/bif", "/foo", "/foo"}, + { "", "/foo/bar/baz/bif", "/foo", "/foo" }, - {"/ctx", "/foo/bar/baz/bif", "/ctx/foo", "/ctx/foo"}, + { "/ctx", "/foo/bar/baz/bif", "/ctx/foo", "/ctx/foo" }, - {"/anotherobnoxiouslylongcontextthatiwllforcerelative", "/foo/bar/baz/bif", - "/anotherobnoxiouslylongcontextthatiwllforcerelative/foo", "../../../foo"}, + { "/anotherobnoxiouslylongcontextthatiwllforcerelative", "/foo/bar/baz/bif", + "/anotherobnoxiouslylongcontextthatiwllforcerelative/foo", "../../../foo" }, // A couple of better examples, see TAPESTRY-2033 - {"/manager", "", "/manager/asset/foo.gif", "asset/foo.gif"}, + { "/manager", "", "/manager/asset/foo.gif", "asset/foo.gif" }, - {"", "", "/asset/foo.gif", "asset/foo.gif"}, + { "", "", "/asset/foo.gif", "asset/foo.gif" }, - {"", "/griddemo.grid.columns.sort/title", "/assets/default.css", "/assets/default.css"}, + { "", "/griddemo.grid.columns.sort/title", "/assets/default.css", "/assets/default.css" }, - {"/example", "/", "/example/assets/tapestry/default.css", "assets/tapestry/default.css"}, + { "/example", "/", "/example/assets/tapestry/default.css", "assets/tapestry/default.css" }, - {"/example", "/newaccount", "/example/assets/tapestry/default.css", - "assets/tapestry/default.css"}, + { "/example", "/newaccount", "/example/assets/tapestry/default.css", + "assets/tapestry/default.css" }, - {"/verylongcontextname", "/style/app.css", "/verylongcontextname/asset/foo.gif", - "../asset/foo.gif"}, + { "/verylongcontextname", "/style/app.css", "/verylongcontextname/asset/foo.gif", + "../asset/foo.gif" }, - {"", "/eventhandlerdemo.barney/one", "/eventhandlerdemo.clear/anything", - "/eventhandlerdemo.clear/anything"}, + { "", "/eventhandlerdemo.barney/one", "/eventhandlerdemo.clear/anything", + "/eventhandlerdemo.clear/anything" }, - {"/verylongcontextname", "/eventhandlerdemo.barney/one", + { "/verylongcontextname", "/eventhandlerdemo.barney/one", "/verylongcontextname/eventhandlerdemo.clear/anything", - "../eventhandlerdemo.clear/anything"}, + "../eventhandlerdemo.clear/anything" }, - {"/verylongcontextname", "/page", "/verylongcontextname/page:sort/foo", - "./page:sort/foo"}, + { "/verylongcontextname", "/page", "/verylongcontextname/page:sort/foo", + "./page:sort/foo" }, - {"", "/page", "/page:sort/foo", "/page:sort/foo"}, + { "", "/page", "/page:sort/foo", "/page:sort/foo" }, // TAPESTRY-2046 - {"/attendance", "/view/sites", "/attendance/assets/tapestry/tapestry.js", - "../assets/tapestry/tapestry.js"}, + { "/attendance", "/view/sites", "/attendance/assets/tapestry/tapestry.js", + "../assets/tapestry/tapestry.js" }, // TAPESTRY-2095 - {"", "/", "/component:event", "/component:event"}, + { "", "/", "/component:event", "/component:event" }, // TAPESTRY-2333 - {"", "/nested/actiondemo/", "/nested/actiondemo.actionlink/2", "../actiondemo.actionlink/2"}, + { "", "/nested/actiondemo/", "/nested/actiondemo.actionlink/2", "../actiondemo.actionlink/2" }, // Make sure the ./ prefix is added even when the relative path doesn't contain // a slash ... otherwise, invalid URL component:event (i.e., "component" protocol, not "http"). - {"/verylongcontextname", "/", "/verylongcontextname/component:event", "./component:event"}, + { "/verylongcontextname", "/", "/verylongcontextname/component:event", "./component:event" }, // Don't optimize away base64-data ('//'). TAPESTRY-2522 - {"/context", "/mypage/action1", "/context/start?t:state:client=Hasc//asc==", - "../start?t:state:client=Hasc//asc=="}, - {"/context", "/mypage/action1", + { "/context", "/mypage/action1", "/context/start?t:state:client=Hasc//asc==", + "../start?t:state:client=Hasc//asc==" }, + { "/context", "/mypage/action1", "/context/start?t:state:client=H4sIAAAAAAAAAE2OsUoDQRCGJ2rQIFgEwRewnthYWYmeEHKIEvMA4+242bA7u+6uMWeR1tIX8YWsre2srNwDkUz1D//Mx/f+Bf3nHQDopQgTHzVSoGbOmClwyrE9RSOZo5DFxHFpGk54YQ1LvuGYTMolXRm2app9JM1jF+zxhNuP76O33c+f1y3YrmG/8S54KadjlWFYL2hJI0uiR9McjeizGgYPHeSaHD/CGno17IVC+99XIWQYuMvidNcGznDYRSOUjZd0Li9sNMs6wkkzx3tWpLGo4cIl5wWVd2QEnVdsceOxQ8HfDAFWEQ46NezUsJInt1kWgf7trJpVv/V1i1c0AQAA", - "../start?t:state:client=H4sIAAAAAAAAAE2OsUoDQRCGJ2rQIFgEwRewnthYWYmeEHKIEvMA4+242bA7u+6uMWeR1tIX8YWsre2srNwDkUz1D//Mx/f+Bf3nHQDopQgTHzVSoGbOmClwyrE9RSOZo5DFxHFpGk54YQ1LvuGYTMolXRm2app9JM1jF+zxhNuP76O33c+f1y3YrmG/8S54KadjlWFYL2hJI0uiR9McjeizGgYPHeSaHD/CGno17IVC+99XIWQYuMvidNcGznDYRSOUjZd0Li9sNMs6wkkzx3tWpLGo4cIl5wWVd2QEnVdsceOxQ8HfDAFWEQ46NezUsJInt1kWgf7trJpVv/V1i1c0AQAA"}, + "../start?t:state:client=H4sIAAAAAAAAAE2OsUoDQRCGJ2rQIFgEwRewnthYWYmeEHKIEvMA4+242bA7u+6uMWeR1tIX8YWsre2srNwDkUz1D//Mx/f+Bf3nHQDopQgTHzVSoGbOmClwyrE9RSOZo5DFxHFpGk54YQ1LvuGYTMolXRm2app9JM1jF+zxhNuP76O33c+f1y3YrmG/8S54KadjlWFYL2hJI0uiR9McjeizGgYPHeSaHD/CGno17IVC+99XIWQYuMvidNcGznDYRSOUjZd0Li9sNMs6wkkzx3tWpLGo4cIl5wWVd2QEnVdsceOxQ8HfDAFWEQ46NezUsJInt1kWgf7trJpVv/V1i1c0AQAA" }, }; } - @Test(dataProvider = "uri_optimization") + @Test(dataProvider = "uri_optimization_data") public void uri_optimization(String contextPath, String requestPath, String path, String expectedURI) { Request request = mockRequest(); Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestSecurityManagerImplTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestSecurityManagerImplTest.java?rev=744203&r1=744202&r2=744203&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestSecurityManagerImplTest.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RequestSecurityManagerImplTest.java Fri Feb 13 18:18:49 2009 @@ -112,14 +112,14 @@ verify(); } - @DataProvider(name = "base_URL_data") + @DataProvider public Object[][] base_URL_data() { return new Object[][] { - {true, true, null}, - {false, false, null}, - {true, false, "http://example.org"}, - {false, true, "https://example.org"} + { true, true, null }, + { false, false, null }, + { true, false, "http://example.org"; }, + { false, true, "https://example.org"; } }; } Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/TemplateParserImplTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/TemplateParserImplTest.java?rev=744203&r1=744202&r2=744203&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/TemplateParserImplTest.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/TemplateParserImplTest.java Fri Feb 13 18:18:49 2009 @@ -1,4 +1,4 @@ -// Copyright 2006, 2007, 2008 The Apache Software Foundation +// Copyright 2006, 2007, 2008, 2009 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -625,7 +625,7 @@ assertEquals(token5.getComment(), "anon block content"); } - @DataProvider(name = "parse_failure_data") + @DataProvider public Object[][] parse_failure_data() { return new Object[][] { @@ -678,7 +678,7 @@ } } - @DataProvider(name = "doctype_parsed_correctly_data") + @DataProvider public Object[][] doctype_parsed_correctly_data() { return new Object[][] { { "xhtml1_strict_doctype.tml" }, { "xhtml1_transitional_doctype.tml" }, @@ -694,7 +694,7 @@ assertEquals(t.getText().trim(), "<Test>"); } - @DataProvider(name = "doctype_token_added_correctly_data") + @DataProvider public Object[][] doctype_token_added_correctly_data() { return new Object[][] { Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/TranslatorSourceImplTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/TranslatorSourceImplTest.java?rev=744203&r1=744202&r2=744203&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/TranslatorSourceImplTest.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/TranslatorSourceImplTest.java Fri Feb 13 18:18:49 2009 @@ -1,4 +1,4 @@ -// Copyright 2007, 2008 The Apache Software Foundation +// Copyright 2007, 2008, 2009 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -83,24 +83,24 @@ } - @DataProvider(name = "to_client_data") + @DataProvider public Object[][] to_client_data() { return new Object[][] { - {Byte.class, (byte) 65, "65"}, + { Byte.class, (byte) 65, "65" }, - {Integer.class, 997, "997"}, + { Integer.class, 997, "997" }, - {Long.class, 12345l, "12345"}, + { Long.class, 12345l, "12345" }, - {Double.class, 123.45d, "123.45"}, + { Double.class, 123.45d, "123.45" }, - {String.class, "abcd", "abcd"}, + { String.class, "abcd", "abcd" }, - {Short.class, (short) 95, "95"}, + { Short.class, (short) 95, "95" }, - {Float.class, (float) -22.7, "-22.7"} + { Float.class, (float) -22.7, "-22.7" } }; } @@ -114,24 +114,24 @@ assertEquals(actual, expected); } - @DataProvider(name = "parse_client_success_data") + @DataProvider public Object[][] parse_client_success_data() { return new Object[][] { - {Byte.class, " 23 ", (byte) 23}, + { Byte.class, " 23 ", (byte) 23 }, - {Short.class, " -121 ", (short) -121}, + { Short.class, " -121 ", (short) -121 }, - {Integer.class, " 123 ", 123}, + { Integer.class, " 123 ", 123 }, - {Long.class, " -1234567 ", -1234567l}, + { Long.class, " -1234567 ", -1234567l }, - {Double.class, " 3.14 ", 3.14d}, + { Double.class, " 3.14 ", 3.14d }, - {String.class, " abcdef ", " abcdef "}, + { String.class, " abcdef ", " abcdef " }, - {Float.class, " 28.95 ", (float) 28.95}, + { Float.class, " 28.95 ", (float) 28.95 }, }; } @@ -145,7 +145,7 @@ assertEquals(actual, expected); } - @DataProvider(name = "parse_client_failure_data") + @DataProvider public Object[][] parse_client_failure_data() { String intError = "You must provide an integer value for Fred."; @@ -153,17 +153,17 @@ return new Object[][] { - {Byte.class, "fred", intError}, + { Byte.class, "fred", intError }, - {Integer.class, "fred", intError}, + { Integer.class, "fred", intError }, - {Long.class, "fred", intError}, + { Long.class, "fred", intError }, - {Double.class, "fred", floatError}, + { Double.class, "fred", floatError }, - {Float.class, "fred", floatError}, + { Float.class, "fred", floatError }, - {Short.class, "fred", intError} + { Short.class, "fred", intError } }; } Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/URLEncoderImplTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/URLEncoderImplTest.java?rev=744203&r1=744202&r2=744203&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/URLEncoderImplTest.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/URLEncoderImplTest.java Fri Feb 13 18:18:49 2009 @@ -24,36 +24,36 @@ { private final URLEncoder encoder = new URLEncoderImpl(); - @DataProvider(name = "encoder_inputs") + @DataProvider public Object[][] encoder_inputs() { return new Object[][] { - {"simple", "simple"}, - {"lettersAndNumbers123456", "lettersAndNumbers123456"}, - {"simplePunctuation-_.", "simplePunctuation-_."}, - {"a-lone-$", "a-lone-$$"}, - {"a-slash-/", "a-slash-$002f"}, - {"a-space_ _", "a-space_$0020_"}, - {"unicode-\u027C-", "unicode-$027c-"}, - {null, URLEncoderImpl.ENCODED_NULL}, - {"", URLEncoderImpl.ENCODED_BLANK} + { "simple", "simple" }, + { "lettersAndNumbers123456", "lettersAndNumbers123456" }, + { "simplePunctuation-_.", "simplePunctuation-_." }, + { "a-lone-$", "a-lone-$$" }, + { "a-slash-/", "a-slash-$002f" }, + { "a-space_ _", "a-space_$0020_" }, + { "unicode-\u027C-", "unicode-$027c-" }, + { null, URLEncoderImpl.ENCODED_NULL }, + { "", URLEncoderImpl.ENCODED_BLANK } }; } - @DataProvider(name = "failures") + @DataProvider public Object[][] failures() { return new Object[][] { - {"trailing-dollar-$", - "Input string 'trailing-dollar-$' is not valid; the '$' character at position 17 should be followed by another '$' or a four digit hex number (a unicode value)."}, - {"not-hex-after-$xyzq-", - "Input string 'not-hex-after-$xyzq-' is not valid; the '$' character at position 15 should be followed by another '$' or a four digit hex number (a unicode value)."}, - {"not-enough-after-$-ab", - "Input string 'not-enough-after-$-ab' is not valid; the '$' character at position 18 should be followed by another '$' or a four digit hex number (a unicode value)."}, - {"unsa...@-", - "Input string 'unsa...@-' is not valid; the character '@' at position 8 is not valid."} + { "trailing-dollar-$", + "Input string 'trailing-dollar-$' is not valid; the '$' character at position 17 should be followed by another '$' or a four digit hex number (a unicode value)." }, + { "not-hex-after-$xyzq-", + "Input string 'not-hex-after-$xyzq-' is not valid; the '$' character at position 15 should be followed by another '$' or a four digit hex number (a unicode value)." }, + { "not-enough-after-$-ab", + "Input string 'not-enough-after-$-ab' is not valid; the '$' character at position 18 should be followed by another '$' or a four digit hex number (a unicode value)." }, + { "unsa...@-", + "Input string 'unsa...@-' is not valid; the character '@' at position 8 is not valid." } }; } Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/ComponentPageElementImplTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/ComponentPageElementImplTest.java?rev=744203&r1=744202&r2=744203&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/ComponentPageElementImplTest.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/structure/ComponentPageElementImplTest.java Fri Feb 13 18:18:49 2009 @@ -1,4 +1,4 @@ -// Copyright 2006, 2007, 2008 The Apache Software Foundation +// Copyright 2006, 2007, 2008, 2009 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -546,7 +546,7 @@ ComponentPageElement cpe = new ComponentPageElementImpl(page, ins, elementResources); - cpe.addMixin(mixinIns); + cpe.addMixin("Bar", mixinIns); assertSame(cpe.getMixinByClassName(mixinClassName), mixin); @@ -575,7 +575,7 @@ ComponentPageElement cpe = new ComponentPageElementImpl(page, ins, elementResources); - cpe.addMixin(mixinIns); + cpe.addMixin("Bar", mixinIns); try { @@ -607,13 +607,11 @@ Instantiator ins = newInstantiator(component, model); Instantiator mixinInstantiator = newInstantiator(mixin, mixinModel); - train_getComponentClassName(mixinModel, "foo.Fred"); - replay(); ComponentPageElement cpe = new ComponentPageElementImpl(page, ins, elementResources); - cpe.addMixin(mixinInstantiator); + cpe.addMixin("Bar", mixinInstantiator); try { @@ -622,8 +620,8 @@ } catch (TapestryException ex) { - assertTrue(ex.getMessage().contains( - "does not contain a mixin named 'Wilma' (setting parameter 'Wilma.barney')")); + assertMessageContains(ex, + "does not contain a mixin named 'Wilma'"); } verify(); Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/CodeEqTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/CodeEqTest.java?rev=744203&r1=744202&r2=744203&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/CodeEqTest.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/CodeEqTest.java Fri Feb 13 18:18:49 2009 @@ -1,4 +1,4 @@ -// Copyright 2006 The Apache Software Foundation +// Copyright 2006, 2009 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,7 +26,7 @@ assertEquals(CodeEq.strip(input), expected); } - @DataProvider(name = "stripValues") + @DataProvider public Object[][] stripValues() { return new Object[][] @@ -58,7 +58,7 @@ assertEquals(ceq.matches(parameter), matches); } - @DataProvider(name = "matchValues") + @DataProvider public Object[][] matchValues() { return new Object[][] Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/InternalBaseTestCase.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/InternalBaseTestCase.java?rev=744203&r1=744202&r2=744203&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/InternalBaseTestCase.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/test/InternalBaseTestCase.java Fri Feb 13 18:18:49 2009 @@ -308,9 +308,9 @@ } protected final void train_newRootComponentElement(PageElementFactory elementFactory, String className, - ComponentPageElement rootElement, Locale locale) + ComponentPageElement rootElement) { - expect(elementFactory.newRootComponentElement(isA(Page.class), eq(className), eq(locale))).andReturn( + expect(elementFactory.newRootComponentElement(isA(Page.class), eq(className))).andReturn( rootElement); } Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/json/JSONObjectTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/json/JSONObjectTest.java?rev=744203&r1=744202&r2=744203&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/json/JSONObjectTest.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/json/JSONObjectTest.java Fri Feb 13 18:18:49 2009 @@ -1,4 +1,4 @@ -// Copyright 2007 The Apache Software Foundation +// Copyright 2007, 2009 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -89,7 +89,7 @@ assertEquals(object.getBoolean("mykey"), expected); } - @DataProvider(name = "boolean_inputs") + @DataProvider public Object[][] boolean_inputs() { return new Object[][] { { "true", true }, { "TRUE", true }, { "false", false }, { "FALSE", false }, @@ -198,7 +198,7 @@ } } - @Test(dataProvider = "double_inputs") + @Test(dataProvider = "double_to_string_data") public void double_to_string(double input, String expected) { String actual = JSONObject.doubleToString(input); @@ -206,14 +206,14 @@ assertEquals(actual, expected); } - @DataProvider(name = "double_inputs") - public Object[][] double_inputs() + @DataProvider + public Object[][] double_to_string_data() { return new Object[][] { { 3d, "3" }, { -22.5d, "-22.5" }, { 0d, "0" }, { Double.NEGATIVE_INFINITY, "null" }, { Double.POSITIVE_INFINITY, "null" }, { Double.NaN, "null" }, }; } - @Test(dataProvider = "get_double_inputs") + @Test(dataProvider = "get_double_data") public void get_double(Object value, double expected) { JSONObject object = new JSONObject(); @@ -223,8 +223,8 @@ assertEquals(object.getDouble("key"), expected); } - @DataProvider(name = "get_double_inputs") - public Object[][] getDoubleInputs() + @DataProvider + public Object[][] get_double_data() { return new Object[][] { { new Double(3.5), 3.5d }, { new Long(1000), 1000d }, { "-101.7", -101.7d } }; } @@ -275,7 +275,7 @@ assertEquals(object.getInt("intkey"), expected); } - @DataProvider(name = "get_int_inputs") + @DataProvider public Object[][] get_int_inputs() { return new Object[][] { { "3", 3 }, { new Long(97), 97 }, { "-8.76", -8 } }; Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/GlobPatternMatcherTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/GlobPatternMatcherTest.java?rev=744203&r1=744202&r2=744203&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/GlobPatternMatcherTest.java (original) +++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/GlobPatternMatcherTest.java Fri Feb 13 18:18:49 2009 @@ -1,4 +1,4 @@ -// Copyright 2006, 2008 The Apache Software Foundation +// Copyright 2006, 2008, 2009 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -25,26 +25,26 @@ return new GlobPatternMatcher(pattern).matches(input); } - @DataProvider(name = "matches") + @DataProvider public Object[][] matches() { return new Object[][] { - {"fred", "fred"}, - {"fred", "FRED"}, - {"fred", "*"}, - {"", "*"}, - {"fred.Barney", "*Barney"}, - {"fred.Barney", "*BARNEY"}, - {"fred.Barney", "fred*"}, - {"fred.Barney", "FRED*"}, - {"fredBarney", "*dB*"}, - {"fredBarney", "*DB*"}, - {"fred.Barney", "*Barney*"}, - {"fred.Barney", "*fred*"}, - {"fred.Barney", "*FRED*"}, - {"MyEntityDAO", ".*dao"}, - {"FredDAO", "(fred|barney)dao"} + { "fred", "fred" }, + { "fred", "FRED" }, + { "fred", "*" }, + { "", "*" }, + { "fred.Barney", "*Barney" }, + { "fred.Barney", "*BARNEY" }, + { "fred.Barney", "fred*" }, + { "fred.Barney", "FRED*" }, + { "fredBarney", "*dB*" }, + { "fredBarney", "*DB*" }, + { "fred.Barney", "*Barney*" }, + { "fred.Barney", "*fred*" }, + { "fred.Barney", "*FRED*" }, + { "MyEntityDAO", ".*dao" }, + { "FredDAO", "(fred|barney)dao" } }; } @@ -55,24 +55,24 @@ } - @DataProvider(name = "mismatches") + @DataProvider public Object[][] mismatches() { return new Object[][] { - {"xfred", "fred"}, - {"fredx", "fred"}, - {"fred", "xfred"}, - {"fred", "fredx"}, - {"fred.Barneyx", "*Barney"}, - {"fred.Barney", "*Barneyx"}, - {"fred.Barney", "*xBarney"}, - {"xfred.Barney", "fred*"}, - {"fred.Barney", "fredx*"}, - {"fred.Barney", "xfred*"}, - {"fred.Barney", "*flint*"}, - {"MyEntityDAL", ".*dao"}, - {"WilmaDAO", "(fred|barney)dao"} + { "xfred", "fred" }, + { "fredx", "fred" }, + { "fred", "xfred" }, + { "fred", "fredx" }, + { "fred.Barneyx", "*Barney" }, + { "fred.Barney", "*Barneyx" }, + { "fred.Barney", "*xBarney" }, + { "xfred.Barney", "fred*" }, + { "fred.Barney", "fredx*" }, + { "fred.Barney", "xfred*" }, + { "fred.Barney", "*flint*" }, + { "MyEntityDAL", ".*dao" }, + { "WilmaDAO", "(fred|barney)dao" } }; } Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/TypeCoercerImplTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/TypeCoercerImplTest.java?rev=744203&r1=744202&r2=744203&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/TypeCoercerImplTest.java (original) +++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/services/TypeCoercerImplTest.java Fri Feb 13 18:18:49 2009 @@ -1,4 +1,4 @@ -// Copyright 2006, 2007, 2008 The Apache Software Foundation +// Copyright 2006, 2007, 2008, 2009 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -128,7 +128,7 @@ } @SuppressWarnings("unchecked") - @DataProvider(name = "coercions_inputs") + @DataProvider public Object[][] coercions_inputs() { String bigDecimalValue = "12345656748352435842385234598234958234574358723485.35843534285293857298457234587"; @@ -144,97 +144,97 @@ return new Object[][] { // There's a lot of these! - {this, String.class, toString()}, + { this, String.class, toString() }, - {55l, Integer.class, 55}, + { 55l, Integer.class, 55 }, - {"", Boolean.class, false}, + { "", Boolean.class, false }, - {" ", Boolean.class, false}, + { " ", Boolean.class, false }, - {"x", Boolean.class, true}, + { "x", Boolean.class, true }, - {" z ", Boolean.class, true}, + { " z ", Boolean.class, true }, - {"false", Boolean.class, false}, + { "false", Boolean.class, false }, - {" False ", Boolean.class, false}, + { " False ", Boolean.class, false }, - {null, Boolean.class, false}, + { null, Boolean.class, false }, - {new Double(256), Integer.class, new Integer(256)}, + { new Double(256), Integer.class, new Integer(256) }, - {new Double(22.7), Integer.class, new Integer(22)}, + { new Double(22.7), Integer.class, new Integer(22) }, - {new Integer(0), Boolean.class, false}, + { new Integer(0), Boolean.class, false }, - {new Long(32838), Boolean.class, true}, + { new Long(32838), Boolean.class, true }, - {new Integer(127), Byte.class, new Byte("127")}, + { new Integer(127), Byte.class, new Byte("127") }, - {new Double(58), Short.class, new Short("58")}, + { new Double(58), Short.class, new Short("58") }, - {new Integer(33), Long.class, new Long(33)}, + { new Integer(33), Long.class, new Long(33) }, - {new Integer(22), Float.class, new Float(22)}, + { new Integer(22), Float.class, new Float(22) }, - {new Integer(1234), Double.class, new Double(1234)}, + { new Integer(1234), Double.class, new Double(1234) }, - {floatValue, Double.class, floatValue.doubleValue()}, + { floatValue, Double.class, floatValue.doubleValue() }, - {Collections.EMPTY_LIST, Boolean.class, false}, + { Collections.EMPTY_LIST, Boolean.class, false }, - {Collections.singleton(this), Boolean.class, true}, + { Collections.singleton(this), Boolean.class, true }, - {bigDecimalValue, BigDecimal.class, new BigDecimal(bigDecimalValue)}, + { bigDecimalValue, BigDecimal.class, new BigDecimal(bigDecimalValue) }, - {new BigDecimal(bigDecimalValue), Double.class, 1.2345656748352436E49}, + { new BigDecimal(bigDecimalValue), Double.class, 1.2345656748352436E49 }, - {bigIntegerValue, BigInteger.class, new BigInteger(bigIntegerValue)}, + { bigIntegerValue, BigInteger.class, new BigInteger(bigIntegerValue) }, - {new BigInteger("12345678"), Long.class, 12345678l}, + { new BigInteger("12345678"), Long.class, 12345678l }, - {-12345678l, BigInteger.class, new BigInteger("-12345678")}, + { -12345678l, BigInteger.class, new BigInteger("-12345678") }, - {object, List.class, Collections.singletonList(object)}, + { object, List.class, Collections.singletonList(object) }, - {null, Iterable.class, null}, + { null, Iterable.class, null }, - {null, List.class, null}, + { null, List.class, null }, - {null, Collection.class, null}, + { null, Collection.class, null }, - {null, String.class, null}, + { null, String.class, null }, - {new Object[] {"a", 123}, List.class, Arrays.asList("a", 123)}, + { new Object[] { "a", 123 }, List.class, Arrays.asList("a", 123) }, - {new String[] {"a", "b"}, List.class, Arrays.asList("a", "b")}, + { new String[] { "a", "b" }, List.class, Arrays.asList("a", "b") }, - {new byte[] {byte1, byte2}, List.class, Arrays.asList(byte1, byte2)}, + { new byte[] { byte1, byte2 }, List.class, Arrays.asList(byte1, byte2) }, - {new short[] {short1, short2}, List.class, Arrays.asList(short1, short2)}, + { new short[] { short1, short2 }, List.class, Arrays.asList(short1, short2) }, - {new int[] {1, 2}, List.class, Arrays.asList(1, 2)}, + { new int[] { 1, 2 }, List.class, Arrays.asList(1, 2) }, - {new long[] {123L, 321L}, List.class, Arrays.asList(123L, 321L)}, + { new long[] { 123L, 321L }, List.class, Arrays.asList(123L, 321L) }, - {new float[] {3.4f, 7.777f}, List.class, Arrays.asList(3.4f, 7.777f)}, + { new float[] { 3.4f, 7.777f }, List.class, Arrays.asList(3.4f, 7.777f) }, - {new double[] {3.4, 7.777}, List.class, Arrays.asList(3.4, 7.777)}, + { new double[] { 3.4, 7.777 }, List.class, Arrays.asList(3.4, 7.777) }, - {new char[] {'a', 'b'}, List.class, Arrays.asList('a', 'b')}, + { new char[] { 'a', 'b' }, List.class, Arrays.asList('a', 'b') }, - {new boolean[] {true, false}, List.class, Arrays.asList(true, false)}, + { new boolean[] { true, false }, List.class, Arrays.asList(true, false) }, - {"foo/bar/baz.txt", File.class, new File("foo/bar/baz.txt")}, + { "foo/bar/baz.txt", File.class, new File("foo/bar/baz.txt") }, - {new TimeInterval("2 h"), Long.class, 2 * 60 * 60 * 1000l}, + { new TimeInterval("2 h"), Long.class, 2 * 60 * 60 * 1000l }, - {"2 h", TimeInterval.class, new TimeInterval("120 m")}, + { "2 h", TimeInterval.class, new TimeInterval("120 m") }, // null to arbitrary object is still null - {null, XMLReader.class, null}}; + { null, XMLReader.class, null } }; } @Test(dataProvider = "explain_inputs") @@ -243,15 +243,15 @@ assertEquals(coercer.explain(inputType, outputType), expected); } - @DataProvider(name = "explain_inputs") + @DataProvider public Object[][] explain_inputs() { return new Object[][] { - {StringBuffer.class, Integer.class, "Object --> String, String --> Long, Long --> Integer"}, - {void.class, Map.class, "null --> null"}, {void.class, Boolean.class, "null --> Boolean"}, - {String[].class, List.class, "Object[] --> java.util.List"}, - {Float.class, Double.class, "Float --> Double"}, - {Double.class, BigDecimal.class, "Object --> String, String --> java.math.BigDecimal"}, + { StringBuffer.class, Integer.class, "Object --> String, String --> Long, Long --> Integer" }, + { void.class, Map.class, "null --> null" }, { void.class, Boolean.class, "null --> Boolean" }, + { String[].class, List.class, "Object[] --> java.util.List" }, + { Float.class, Double.class, "Float --> Double" }, + { Double.class, BigDecimal.class, "Object --> String, String --> java.math.BigDecimal" }, }; } @@ -262,7 +262,7 @@ Object[] result = coercer.coerce(input, Object[].class); - assertArraysEqual(result, new Object[] {input}); + assertArraysEqual(result, new Object[] { input }); } @Test Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/InternalUtilsTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/InternalUtilsTest.java?rev=744203&r1=744202&r2=744203&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/InternalUtilsTest.java (original) +++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/internal/util/InternalUtilsTest.java Fri Feb 13 18:18:49 2009 @@ -107,7 +107,7 @@ @Test public void array_size_when_non_null() { - Object[] array = {1, 2, 3}; + Object[] array = { 1, 2, 3 }; assertEquals(InternalUtils.size(array), 3); } @@ -118,18 +118,18 @@ assertEquals(InternalUtils.stripMemberName(input), expected); } - @DataProvider(name = "memberNameData") + @DataProvider public Object[][] memberNameData() { return new Object[][] { - {"simple", "simple"}, - {"_name", "name"}, - {"$name", "name"}, - {"ruby_style", "ruby_style"}, - {"__$ruby_style_", "ruby_style"}, - {"$_$__$__$_$___$_$_$_$$name$", "name"}, - {"foo_", "foo"}, - {"_foo_", "foo"} + { "simple", "simple" }, + { "_name", "name" }, + { "$name", "name" }, + { "ruby_style", "ruby_style" }, + { "__$ruby_style_", "ruby_style" }, + { "$_$__$__$_$___$_$_$_$$name$", "name" }, + { "foo_", "foo" }, + { "_foo_", "foo" } }; } @@ -218,8 +218,8 @@ @DataProvider(name = "capitalize_inputs") public Object[][] capitalize_inputs() { - return new Object[][] {{"hello", "Hello"}, {"Goodbye", "Goodbye"}, {"", ""}, {"a", "A"}, - {"A", "A"}}; + return new Object[][] { { "hello", "Hello" }, { "Goodbye", "Goodbye" }, { "", "" }, { "a", "A" }, + { "A", "A" } }; } @Test @@ -364,7 +364,7 @@ try { - InternalUtils.validateMarkerAnnotations(new Class[] {Inject.class, NotRetainedRuntime.class}); + InternalUtils.validateMarkerAnnotations(new Class[] { Inject.class, NotRetainedRuntime.class }); unreachable(); } catch (IllegalArgumentException ex) Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/services/ClassFabUtilsTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/services/ClassFabUtilsTest.java?rev=744203&r1=744202&r2=744203&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/services/ClassFabUtilsTest.java (original) +++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/services/ClassFabUtilsTest.java Fri Feb 13 18:18:49 2009 @@ -1,4 +1,4 @@ -// Copyright 2006, 2007, 2008 The Apache Software Foundation +// Copyright 2006, 2007, 2008, 2009 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -21,7 +21,7 @@ public class ClassFabUtilsTest extends IOCTestCase { - @Test(dataProvider = "provider") + @Test(dataProvider = "createInputs") public void to_jvm_binary_name(String input, String expected) { String actual = ClassFabUtils.toJVMBinaryName(input); @@ -29,7 +29,7 @@ assertEquals(actual, expected); } - @DataProvider(name = "provider") + @DataProvider public Object[][] createInputs() { return new Object[][] { { "java.lang.Object", "java.lang.Object" }, @@ -51,8 +51,8 @@ assertEquals(ClassFabUtils.getTypeCode(input), expected); } - @DataProvider(name = "typeCodeProvider") - public Object[][] get_type_code_provider() + @DataProvider + public Object[][] typeCodeProvider() { return new Object[][] { { int.class, "I" }, Modified: tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/TimeIntervalTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/TimeIntervalTest.java?rev=744203&r1=744202&r2=744203&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/TimeIntervalTest.java (original) +++ tapestry/tapestry5/trunk/tapestry-ioc/src/test/java/org/apache/tapestry5/ioc/util/TimeIntervalTest.java Fri Feb 13 18:18:49 2009 @@ -1,4 +1,4 @@ -// Copyright 2007, 2008 The Apache Software Foundation +// Copyright 2007, 2008, 2009 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -80,7 +80,7 @@ assertEquals(TimeInterval.parseMilliseconds(input), expected); } - @DataProvider(name = "mix_of_units_data") + @DataProvider public Object[][] mix_of_units_data() { return new Object[][] { { "54321", 54321 },
