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/1a97747f Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/1a97747f Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/1a97747f Branch: refs/heads/master Commit: 1a97747f80a41bcac4e60afc1a61ac1ba3a9fba9 Parents: e97c402 Author: Howard M. Lewis Ship <[email protected]> Authored: Sun Apr 14 15:41:02 2013 +0100 Committer: Howard M. Lewis Ship <[email protected]> Committed: Mon Apr 15 22:11:19 2013 +0100 ---------------------------------------------------------------------- .../ModuleAssetRequestHandlerTest.groovy | 46 +++----------- 1 files changed, 10 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/1a97747f/tapestry-core/src/test/groovy/org/apache/tapestry5/services/javascript/ModuleAssetRequestHandlerTest.groovy ---------------------------------------------------------------------- diff --git a/tapestry-core/src/test/groovy/org/apache/tapestry5/services/javascript/ModuleAssetRequestHandlerTest.groovy b/tapestry-core/src/test/groovy/org/apache/tapestry5/services/javascript/ModuleAssetRequestHandlerTest.groovy index 56635c3..eed6325 100644 --- a/tapestry-core/src/test/groovy/org/apache/tapestry5/services/javascript/ModuleAssetRequestHandlerTest.groovy +++ b/tapestry-core/src/test/groovy/org/apache/tapestry5/services/javascript/ModuleAssetRequestHandlerTest.groovy @@ -3,9 +3,6 @@ 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.apache.tapestry5.services.Response import org.testng.annotations.DataProvider import org.testng.annotations.Test @@ -13,57 +10,34 @@ class ModuleAssetRequestHandlerTest extends TestBase { @Test(dataProvider = "unknownPaths") void "invalid extension is ignored"(path) { - def pc = newMock PathConstructor - - def request = newMock Request - - def response = newMock Response - - expect(request.getPath()).andReturn path - expect(pc.constructDispatchPath("modules", "")).andReturn "/modules/" - - replay() - def handler = new ModuleAssetRequestHandler(null, null, new QuietOperationTracker()) - - assertEquals handler.dispatch(request, response), false - verify() + assertEquals handler.handleAssetRequest(null, null, path), false } @DataProvider Object[][] unknownPaths() { [ - "foo/bar.xyz", - "foo", - "foo/bar", - "" - ].collect({ it -> ["/modules/$it"] as Object[] }) as Object[][] + ["foo/bar.xyz"], + ["foo"], + ["foo/bar"], + [""] + ] as Object[][] } @Test void "returns false if no module is found"() { - def pc = newMock PathConstructor - def manager = newMock ModuleManager - - def request = newMock Request - - def response = newMock Response - - expect(request.getPath()).andReturn "/modules/foo/bar.js" - - expect(pc.constructDispatchPath("modules", "")).andReturn "/modules/" - + expect(manager.findResourceForModule("foo/bar")).andReturn null - + replay() def handler = new ModuleAssetRequestHandler(manager, null, new QuietOperationTracker()) - - assertEquals handler.dispatch(request, response), false + + assertEquals handler.handleAssetRequest(null, null, "foo/bar.js"), false verify() }
