Correct unit tests broken by recent refactorings
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/05477072 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/05477072 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/05477072 Branch: refs/heads/master Commit: 05477072442e72550e2acb59c93f420140103a7f Parents: be3e581 Author: Howard M. Lewis Ship <[email protected]> Authored: Mon Apr 15 22:01:02 2013 +0100 Committer: Howard M. Lewis Ship <[email protected]> Committed: Mon Apr 15 22:11:19 2013 +0100 ---------------------------------------------------------------------- .../ModuleAssetRequestHandlerTests.groovy | 43 ++++++++++ .../javascript/ModuleDispatcherTests.groovy | 65 --------------- 2 files changed, 43 insertions(+), 65 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/05477072/tapestry-core/src/test/groovy/org/apache/tapestry5/services/javascript/ModuleAssetRequestHandlerTests.groovy ---------------------------------------------------------------------- diff --git a/tapestry-core/src/test/groovy/org/apache/tapestry5/services/javascript/ModuleAssetRequestHandlerTests.groovy b/tapestry-core/src/test/groovy/org/apache/tapestry5/services/javascript/ModuleAssetRequestHandlerTests.groovy new file mode 100644 index 0000000..5b24b1c --- /dev/null +++ b/tapestry-core/src/test/groovy/org/apache/tapestry5/services/javascript/ModuleAssetRequestHandlerTests.groovy @@ -0,0 +1,43 @@ +package org.apache.tapestry5.services.javascript + +import org.apache.tapestry5.internal.services.javascript.ModuleAssetRequestHandler +import org.apache.tapestry5.ioc.internal.QuietOperationTracker +import org.apache.tapestry5.ioc.test.TestBase +import org.testng.annotations.DataProvider +import org.testng.annotations.Test + +class ModuleAssetRequestHandlerTests extends TestBase { + + @Test(dataProvider = "unknownPaths") + void "invalid extension is ignored"(extraPath) { + def handler = new ModuleAssetRequestHandler(null, null, new QuietOperationTracker()) + + assert handler.handleAssetRequest(null, null, extraPath) == false + } + + @DataProvider + Object[][] unknownPaths() { + [ + "foo/bar.xyz", + "foo", + "foo/bar", + "" + ].collect({ it -> ["/modules/$it"] as Object[] }) as Object[][] + } + + @Test + void "returns false if no module is found"() { + + def manager = newMock ModuleManager + + expect(manager.findResourceForModule("foo/bar")).andReturn null + + replay() + + def handler = new ModuleAssetRequestHandler(manager, null, new QuietOperationTracker()) + + assert handler.handleAssetRequest(null, null, "foo/bar.js") == false + + verify() + } +} http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/05477072/tapestry-core/src/test/groovy/org/apache/tapestry5/services/javascript/ModuleDispatcherTests.groovy ---------------------------------------------------------------------- diff --git a/tapestry-core/src/test/groovy/org/apache/tapestry5/services/javascript/ModuleDispatcherTests.groovy b/tapestry-core/src/test/groovy/org/apache/tapestry5/services/javascript/ModuleDispatcherTests.groovy deleted file mode 100644 index ca72a21..0000000 --- a/tapestry-core/src/test/groovy/org/apache/tapestry5/services/javascript/ModuleDispatcherTests.groovy +++ /dev/null @@ -1,65 +0,0 @@ -package org.apache.tapestry5.services.javascript - -import org.apache.tapestry5.internal.services.javascript.ModuleAssetRequestHandler -import org.apache.tapestry5.ioc.internal.QuietOperationTracker -import org.apache.tapestry5.ioc.test.TestBase -import org.apache.tapestry5.services.PathConstructor -import org.apache.tapestry5.services.Request -import org.testng.annotations.DataProvider -import org.testng.annotations.Test - -class ModuleDispatcherTests extends TestBase { - - @Test(dataProvider = "unknownPaths") - void "invalid extension is ignored"(path) { - def pc = newMock PathConstructor - - def request = newMock Request - - expect(pc.constructDispatchPath("modules", "")).andReturn "/modules/" - - expect(request.path).andReturn path - - replay() - - def handler = new ModuleAssetRequestHandler(null, null, new QuietOperationTracker()) - - assertEquals handler.dispatch(request, null), false - - verify() - } - - @DataProvider - Object[][] unknownPaths() { - [ - "foo/bar.xyz", - "foo", - "foo/bar", - "" - ].collect({ it -> ["/modules/$it"] as Object[] }) as Object[][] - } - - @Test - void "returns false if no module is found"() { - - def pc = newMock PathConstructor - - def manager = newMock ModuleManager - - def request = newMock Request - - expect(pc.constructDispatchPath("modules", "")).andReturn "/modules/" - - expect(request.path).andReturn("/modules/foo/bar.js") - - expect(manager.findResourceForModule("foo/bar")).andReturn null - - replay() - - def handler = new ModuleAssetRequestHandler(manager, null, new QuietOperationTracker()) - - assertEquals handler.dispatch(request, null), false - - verify() - } -}
