Fix broken test: 1. correct order of invocation: construct the ModuleDispatcher only after calling replay() 2. fix typos: it's 'modules', not 'module' 3. fix call to method under test. it's dispatch (which requires additional Request and Response mocks) not handleAssetRequest.
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/92cb9918 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/92cb9918 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/92cb9918 Branch: refs/heads/master Commit: 92cb99184bc1a5edfec04088d30541c703850352 Parents: 3af3351 Author: Ulrich Staerk <u...@apache.org> Authored: Wed Feb 27 12:32:50 2013 +0100 Committer: Ulrich Staerk <u...@apache.org> Committed: Wed Feb 27 12:32:50 2013 +0100 ---------------------------------------------------------------------- .../ModuleAssetRequestHandlerTest.groovy | 38 ++++++++++----- 1 files changed, 26 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/92cb9918/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 4940cca..2ad3b63 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 @@ -4,6 +4,8 @@ import org.apache.tapestry5.internal.services.javascript.ModuleDispatcher 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 @@ -12,14 +14,20 @@ 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 - def handler = new ModuleDispatcher(null, null, pc, "123", new QuietOperationTracker()) - - expect(pc.constructDispatchPath("module", "123", "")).andReturn "/modules/123/" + expect(pc.constructDispatchPath("modules", "123", "")).andReturn "/modules/123/" replay() - - assertEquals handler.handleAssetRequest(null, null, path), false + + def handler = new ModuleDispatcher(null, null, pc, "123", new QuietOperationTracker()) + + assertEquals handler.dispatch(request, response), false verify() } @@ -40,16 +48,22 @@ class ModuleAssetRequestHandlerTest extends TestBase { def pc = newMock PathConstructor def manager = newMock ModuleManager - - def handler = new ModuleDispatcher(manager, null, pc, "123", new QuietOperationTracker()) - - expect(pc.constructDispatchPath("module", "123", "")).andReturn "/modules/123/" - + + def request = newMock Request + + def response = newMock Response + + expect(request.getPath()).andReturn "/modules/123/foo/bar.js" + + expect(pc.constructDispatchPath("modules", "123", "")).andReturn "/modules/123/" + expect(manager.findResourceForModule("foo/bar")).andReturn null - + replay() - assertEquals handler.handleAssetRequest(null, null, "/modules/123/foo/bar.js"), false + def handler = new ModuleDispatcher(manager, null, pc, "123", new QuietOperationTracker()) + + assertEquals handler.dispatch(request, response), false verify() }
