Updated Branches: refs/heads/5.4-js-rewrite 64f4d9a3c -> 9627613fd
Fix tests broken by changes to ModuleManager - "simple" module initialiations may be a string, not a JSONArray - immediate inits & deferred inits have merged into just inits Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/9627613f Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/9627613f Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/9627613f Branch: refs/heads/5.4-js-rewrite Commit: 9627613fd409dc97aaef453c9f3f15920ec0775d Parents: 160816c Author: Howard M. Lewis Ship <[email protected]> Authored: Tue Nov 20 10:42:14 2012 -0800 Committer: Howard M. Lewis Ship <[email protected]> Committed: Tue Nov 20 10:42:14 2012 -0800 ---------------------------------------------------------------------- .../services/DocumentLinkerImplTest.groovy | 42 +++------------ 1 files changed, 8 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9627613f/tapestry-core/src/test/groovy/org/apache/tapestry5/internal/services/DocumentLinkerImplTest.groovy ---------------------------------------------------------------------- diff --git a/tapestry-core/src/test/groovy/org/apache/tapestry5/internal/services/DocumentLinkerImplTest.groovy b/tapestry-core/src/test/groovy/org/apache/tapestry5/internal/services/DocumentLinkerImplTest.groovy index f76defb..1c806d6 100644 --- a/tapestry-core/src/test/groovy/org/apache/tapestry5/internal/services/DocumentLinkerImplTest.groovy +++ b/tapestry-core/src/test/groovy/org/apache/tapestry5/internal/services/DocumentLinkerImplTest.groovy @@ -93,7 +93,7 @@ class DocumentLinkerImplTest extends InternalBaseTestCase { document.newRootElement("html").element("body").element("p").text("Ready to be updated with scripts.") - def manager = mockModuleManager(["core.js", "foo.js", "bar/baz.js"], [], [new JSONArray("core/pageinit:evalJavaScript", "pageInitialization();")]) + def manager = mockModuleManager(["core.js", "foo.js", "bar/baz.js"], [new JSONArray("core/pageinit:evalJavaScript", "pageInitialization();")]) DocumentLinkerImpl linker = new DocumentLinkerImpl(manager, true, "1.2.3") @@ -197,7 +197,7 @@ class DocumentLinkerImplTest extends InternalBaseTestCase { document.newRootElement("html").element("body").element("p").text("Ready to be updated with scripts.") - def manager = mockModuleManager([], [new JSONArray("core/pageinit:evalJavaScript", "doSomething();")], []) + def manager = mockModuleManager([], [new JSONArray("core/pageinit:evalJavaScript", "doSomething();")]) DocumentLinkerImpl linker = new DocumentLinkerImpl(manager, true, "1.2.3") @@ -223,7 +223,7 @@ class DocumentLinkerImplTest extends InternalBaseTestCase { document.newRootElement("html").element("notbody").element("p").text("Ready to be updated with scripts.") - def manager = mockModuleManager(["foo.js"], [], []) + def manager = mockModuleManager(["foo.js"], []) DocumentLinkerImpl linker = new DocumentLinkerImpl(manager, true, "1.2.3") @@ -250,7 +250,7 @@ class DocumentLinkerImplTest extends InternalBaseTestCase { head.element("meta") head.element("script") - def manager = mockModuleManager([], [new JSONArray("['immediate/module:myfunc', {'fred':'barney'}]")], []) + def manager = mockModuleManager([], [new JSONArray("['immediate/module:myfunc', {'fred':'barney'}]")]) DocumentLinkerImpl linker = new DocumentLinkerImpl(manager, true, "1.2.3") @@ -269,31 +269,6 @@ class DocumentLinkerImplTest extends InternalBaseTestCase { @Test - void other_initialization() throws Exception { - Document document = new Document() - - Element head = document.newRootElement("html").element("head") - - head.element("meta") - head.element("script") - - def manager = mockModuleManager([], [], [new JSONArray("['my/module', 'barney']")]) - - DocumentLinkerImpl linker = new DocumentLinkerImpl(manager, true, "1.2.3") - - replay() - - linker.addInitialization(InitializationPriority.NORMAL, "my/module", null, new JSONArray("['barney']")) - - linker.updateDocument(document) - - check document, ''' -<html><head><meta/><script></script></head><body><!--MODULE-MANAGER-INITIALIZATION--></body></html> -''' - verify() - } - - @Test void ie_conditional_stylesheet() throws Exception { Document document = new Document() @@ -341,7 +316,7 @@ class DocumentLinkerImplTest extends InternalBaseTestCase { head.element("meta") - def manager = mockModuleManager([], [], [new JSONArray("['my/module']"), + def manager = mockModuleManager([], ["my/module", new JSONArray("my/other/module:normal", 111, 222), new JSONArray("my/other/module:late", 333, 444)]) @@ -370,7 +345,7 @@ class DocumentLinkerImplTest extends InternalBaseTestCase { head.element("meta") - def manager = mockModuleManager([], [], [new JSONArray("['my/module']"), + def manager = mockModuleManager([], ["my/module", new JSONArray("my/other/module:normal", 111, 222)]) DocumentLinkerImpl linker = new DocumentLinkerImpl(manager, true, "1.2.3") @@ -390,14 +365,13 @@ class DocumentLinkerImplTest extends InternalBaseTestCase { verify() } - private ModuleManager mockModuleManager(def libraryURLs, def immediateInits, def deferredInits) { + private ModuleManager mockModuleManager(def libraryURLs, def inits) { ModuleManager mock = newMock(ModuleManager); expect(mock.writeInitialization(isA(Element), eq(libraryURLs), - eq(immediateInits), - eq(deferredInits))).andAnswer({ + eq(inits))).andAnswer({ def body = EasyMock.currentArguments[0] body.comment("MODULE-MANAGER-INITIALIZATION")
