Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/AnyTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/AnyTest.java?rev=980130&r1=980129&r2=980130&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/AnyTest.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/corelib/components/AnyTest.java Wed Jul 28 17:33:14 2010 @@ -18,7 +18,7 @@ import org.apache.tapestry5.ComponentRes import org.apache.tapestry5.MarkupWriter; import org.apache.tapestry5.dom.DefaultMarkupModel; import org.apache.tapestry5.internal.services.MarkupWriterImpl; -import org.apache.tapestry5.services.javascript.JavascriptSupport; +import org.apache.tapestry5.services.javascript.JSSupport; import org.apache.tapestry5.test.TapestryTestCase; import org.testng.annotations.Test; @@ -28,7 +28,7 @@ public class AnyTest extends TapestryTes public void render_simple() { ComponentResources resources = mockComponentResources(); - JavascriptSupport support = mockJavascriptSupport(); + JSSupport support = mockJavascriptSupport(); MarkupWriter writer = new MarkupWriterImpl(new DefaultMarkupModel()); @@ -52,7 +52,7 @@ public class AnyTest extends TapestryTes public void render_with_id() { ComponentResources resources = mockComponentResources(); - JavascriptSupport support = mockJavascriptSupport(); + JSSupport support = mockJavascriptSupport(); MarkupWriter writer = new MarkupWriterImpl(new DefaultMarkupModel()); @@ -87,7 +87,7 @@ public class AnyTest extends TapestryTes public void attempt_to_get_client_id_before_render() { ComponentResources resources = mockComponentResources(); - JavascriptSupport support = mockJavascriptSupport(); + JSSupport support = mockJavascriptSupport(); train_getCompleteId(resources, "Foo/bar.baz");
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/nested/AssetDemo.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/nested/AssetDemo.java?rev=980130&r1=980129&r2=980130&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/nested/AssetDemo.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/nested/AssetDemo.java Wed Jul 28 17:33:14 2010 @@ -19,7 +19,7 @@ import org.apache.tapestry5.annotations. import org.apache.tapestry5.annotations.Import; import org.apache.tapestry5.annotations.Path; import org.apache.tapestry5.ioc.annotations.Inject; -import org.apache.tapestry5.services.javascript.JavascriptSupport; +import org.apache.tapestry5.services.javascript.JSSupport; import org.apache.tapestry5.services.javascript.StylesheetLink; import org.apache.tapestry5.services.javascript.StylesheetOptions; @@ -42,7 +42,7 @@ public class AssetDemo private Asset ieOnly; @Environmental - private JavascriptSupport javascriptSupport; + private JSSupport javascriptSupport; @Import(stylesheet = "context:css/via-import.css") void afterRender() Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClientBehaviorSupportImplTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClientBehaviorSupportImplTest.java?rev=980130&r1=980129&r2=980130&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClientBehaviorSupportImplTest.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClientBehaviorSupportImplTest.java Wed Jul 28 17:33:14 2010 @@ -18,7 +18,7 @@ import org.apache.tapestry5.Link; import org.apache.tapestry5.json.JSONObject; import org.apache.tapestry5.services.Environment; import org.apache.tapestry5.services.FormSupport; -import org.apache.tapestry5.services.javascript.JavascriptSupport; +import org.apache.tapestry5.services.javascript.JSSupport; import org.apache.tapestry5.test.TapestryTestCase; import org.testng.annotations.Test; @@ -36,7 +36,7 @@ public class ClientBehaviorSupportImplTe public void add_links() { Link link1 = mockLink("/link1"); - JavascriptSupport js = mockJavascriptSupport(); + JSSupport js = mockJavascriptSupport(); js.addInitializerCall("linkZone", new JSONObject("linkId", "client1", "zoneId", "zone1", "url", "/link1")); @@ -54,7 +54,7 @@ public class ClientBehaviorSupportImplTe @Test public void add_zones() { - JavascriptSupport js = mockJavascriptSupport(); + JSSupport js = mockJavascriptSupport(); Environment environment = mockEnvironment(); expect(environment.peek(FormSupport.class)).andReturn(null).atLeastOnce(); @@ -75,7 +75,7 @@ public class ClientBehaviorSupportImplTe @Test public void add_zone_inside_form() { - JavascriptSupport js = mockJavascriptSupport(); + JSSupport js = mockJavascriptSupport(); Environment environment = mockEnvironment(); FormSupport fs = mockFormSupport(); @@ -102,7 +102,7 @@ public class ClientBehaviorSupportImplTe @Test public void zones_with_functions() { - JavascriptSupport js = mockJavascriptSupport(); + JSSupport js = mockJavascriptSupport(); Environment environment = mockEnvironment(); expect(environment.peek(FormSupport.class)).andReturn(null).atLeastOnce(); @@ -123,7 +123,7 @@ public class ClientBehaviorSupportImplTe @Test public void zone_function_names_are_converted_to_lower_case() { - JavascriptSupport js = mockJavascriptSupport(); + JSSupport js = mockJavascriptSupport(); Environment environment = mockEnvironment(); expect(environment.peek(FormSupport.class)).andReturn(null).atLeastOnce(); Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RenderSupportImplTest.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RenderSupportImplTest.java?rev=980130&r1=980129&r2=980130&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RenderSupportImplTest.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/RenderSupportImplTest.java Wed Jul 28 17:33:14 2010 @@ -22,7 +22,7 @@ import org.apache.tapestry5.ioc.services import org.apache.tapestry5.json.JSONArray; import org.apache.tapestry5.json.JSONObject; import org.apache.tapestry5.services.AssetSource; -import org.apache.tapestry5.services.javascript.JavascriptSupport; +import org.apache.tapestry5.services.javascript.JSSupport; import org.apache.tapestry5.services.javascript.StylesheetLink; import org.apache.tapestry5.services.javascript.StylesheetOptions; import org.testng.annotations.Test; @@ -34,7 +34,7 @@ public class RenderSupportImplTest exten @Test public void add_script_link_by_asset() { - JavascriptSupport js = mockJavascriptSupport(); + JSSupport js = mockJavascriptSupport(); Asset asset = mockAsset(); js.importJavascriptLibrary(asset); @@ -51,11 +51,11 @@ public class RenderSupportImplTest exten @Test public void add_script_link_by_url() { - JavascriptSupport jss = mockJavascriptSupport(); + JSSupport jss = mockJavascriptSupport(); RenderSupport support = new RenderSupportImpl(null, null, jss); - jss.importJavascriptLibrary(ASSET_URL); + jss.importJavaScriptLibrary(ASSET_URL); replay(); @@ -67,7 +67,7 @@ public class RenderSupportImplTest exten @Test public void add_script() { - JavascriptSupport js = mockJavascriptSupport(); + JSSupport js = mockJavascriptSupport(); js.addScript("doSomething();"); @@ -89,7 +89,7 @@ public class RenderSupportImplTest exten Asset asset = mockAsset(); SymbolSource source = mockSymbolSource(); AssetSource assetSource = mockAssetSource(); - JavascriptSupport js = mockJavascriptSupport(); + JSSupport js = mockJavascriptSupport(); train_expandSymbols(source, path, expanded); @@ -110,7 +110,7 @@ public class RenderSupportImplTest exten public void add_stylesheet_link_by_asset() { String media = "print"; - JavascriptSupport javascriptSupport = mockJavascriptSupport(); + JSSupport javascriptSupport = mockJavascriptSupport(); Asset asset = mockAsset("foo.css"); javascriptSupport.importStylesheet(new StylesheetLink("foo.css", new StylesheetOptions(media))); @@ -128,7 +128,7 @@ public class RenderSupportImplTest exten public void add_stylesheet_link_by_url() { String media = "print"; - JavascriptSupport javascriptSupport = mockJavascriptSupport(); + JSSupport javascriptSupport = mockJavascriptSupport(); javascriptSupport.importStylesheet(new StylesheetLink(ASSET_URL, new StylesheetOptions(media))); @@ -144,7 +144,7 @@ public class RenderSupportImplTest exten @Test public void add_multiple_string_init_parameters() { - JavascriptSupport js = mockJavascriptSupport(); + JSSupport js = mockJavascriptSupport(); JSONObject spec = new JSONObject().put("foo", new JSONArray().put(new JSONArray("fred", "barney"))); @@ -164,7 +164,7 @@ public class RenderSupportImplTest exten @Test public void field_focus() { - JavascriptSupport js = mockJavascriptSupport(); + JSSupport js = mockJavascriptSupport(); js.addInitializerCall("activate", "foo"); @@ -182,7 +182,7 @@ public class RenderSupportImplTest exten @Test public void first_focus_field_at_priority_wins() { - JavascriptSupport js = mockJavascriptSupport(); + JSSupport js = mockJavascriptSupport(); js.addInitializerCall("activate", "foo"); @@ -201,7 +201,7 @@ public class RenderSupportImplTest exten @Test public void higher_priority_wins_focus() { - JavascriptSupport js = mockJavascriptSupport(); + JSSupport js = mockJavascriptSupport(); js.addInitializerCall("activate", "bar"); @@ -222,7 +222,7 @@ public class RenderSupportImplTest exten { JSONObject parameter = new JSONObject("clientid", "fred"); - JavascriptSupport js = mockJavascriptSupport(); + JSSupport js = mockJavascriptSupport(); js.addInitializerCall("setup", parameter); Copied: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ajax/JSSupportImplTest.java (from r979956, tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ajax/JavascriptSupportImplTest.java) URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ajax/JSSupportImplTest.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ajax/JSSupportImplTest.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ajax/JavascriptSupportImplTest.java&r1=979956&r2=980130&rev=980130&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ajax/JavascriptSupportImplTest.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ajax/JSSupportImplTest.java Wed Jul 28 17:33:14 2010 @@ -21,21 +21,21 @@ import org.apache.tapestry5.Asset; import org.apache.tapestry5.ComponentResources; import org.apache.tapestry5.internal.InternalConstants; import org.apache.tapestry5.internal.services.DocumentLinker; -import org.apache.tapestry5.internal.services.javascript.JavascriptStackPathConstructor; +import org.apache.tapestry5.internal.services.javascript.JSStackPathConstructor; import org.apache.tapestry5.internal.test.InternalBaseTestCase; import org.apache.tapestry5.ioc.internal.util.CollectionFactory; import org.apache.tapestry5.ioc.util.IdAllocator; import org.apache.tapestry5.json.JSONArray; import org.apache.tapestry5.json.JSONObject; import org.apache.tapestry5.services.javascript.InitializationPriority; -import org.apache.tapestry5.services.javascript.JavascriptStack; -import org.apache.tapestry5.services.javascript.JavascriptStackSource; -import org.apache.tapestry5.services.javascript.JavascriptSupport; +import org.apache.tapestry5.services.javascript.JSStack; +import org.apache.tapestry5.services.javascript.JSStackSource; +import org.apache.tapestry5.services.javascript.JSSupport; import org.apache.tapestry5.services.javascript.StylesheetLink; import org.apache.tapestry5.services.javascript.StylesheetOptions; import org.testng.annotations.Test; -public class JavascriptSupportImplTest extends InternalBaseTestCase +public class JSSupportImplTest extends InternalBaseTestCase { @Test public void allocate_id_from_resources() @@ -46,7 +46,7 @@ public class JavascriptSupportImplTest e replay(); - JavascriptSupport jss = new JavascriptSupportImpl(null, null, null); + JSSupport jss = new JSSupportImpl(null, null, null); assertEquals(jss.allocateClientId(resources), "tracy"); assertEquals(jss.allocateClientId(resources), "tracy_0"); @@ -58,7 +58,7 @@ public class JavascriptSupportImplTest e @Test public void commit_with_no_javascript() { - JavascriptSupportImpl jss = new JavascriptSupportImpl(null, null, null); + JSSupportImpl jss = new JSSupportImpl(null, null, null); jss.commit(); } @@ -72,7 +72,7 @@ public class JavascriptSupportImplTest e replay(); - JavascriptSupportImpl jss = new JavascriptSupportImpl(linker, null, null, new IdAllocator(), true); + JSSupportImpl jss = new JSSupportImpl(linker, null, null, new IdAllocator(), true); jss.addScript("doSomething();"); @@ -85,8 +85,8 @@ public class JavascriptSupportImplTest e public void adding_script_will_add_stack() { DocumentLinker linker = mockDocumentLinker(); - JavascriptStackSource stackSource = mockJavascriptStackSource(); - JavascriptStackPathConstructor pathConstructor = mockJavascriptStackPathConstructor(); + JSStackSource stackSource = mockJavascriptStackSource(); + JSStackPathConstructor pathConstructor = mockJavascriptStackPathConstructor(); trainForCoreStack(linker, stackSource, pathConstructor); linker.addScript(InitializationPriority.IMMEDIATE, "stackInit();"); @@ -94,7 +94,7 @@ public class JavascriptSupportImplTest e replay(); - JavascriptSupportImpl jss = new JavascriptSupportImpl(linker, stackSource, pathConstructor); + JSSupportImpl jss = new JSSupportImpl(linker, stackSource, pathConstructor); jss.addScript("doSomething();"); @@ -103,31 +103,31 @@ public class JavascriptSupportImplTest e verify(); } - private void trainForEmptyCoreStack(DocumentLinker linker, JavascriptStackSource stackSource, - JavascriptStackPathConstructor pathConstructor) + private void trainForEmptyCoreStack(DocumentLinker linker, JSStackSource stackSource, + JSStackPathConstructor pathConstructor) { - JavascriptStack stack = mockJavascriptStack(); + JSStack stack = mockJavascriptStack(); List<String> libraryPaths = Collections.emptyList(); List<StylesheetLink> stylesheets = Collections.emptyList(); expect(stackSource.getStack(InternalConstants.CORE_STACK_NAME)).andReturn(stack); - expect(pathConstructor.constructPathsForJavascriptStack(InternalConstants.CORE_STACK_NAME)).andReturn( + expect(pathConstructor.constructPathsForJavaScriptStack(InternalConstants.CORE_STACK_NAME)).andReturn( libraryPaths); expect(stack.getStylesheets()).andReturn(stylesheets); expect(stack.getInitialization()).andReturn(null); } - private void trainForCoreStack(DocumentLinker linker, JavascriptStackSource stackSource, - JavascriptStackPathConstructor pathConstructor) + private void trainForCoreStack(DocumentLinker linker, JSStackSource stackSource, + JSStackPathConstructor pathConstructor) { - JavascriptStack stack = mockJavascriptStack(); + JSStack stack = mockJavascriptStack(); StylesheetLink stylesheetLink = new StylesheetLink("style.css"); expect(stackSource.getStack(InternalConstants.CORE_STACK_NAME)).andReturn(stack); - expect(pathConstructor.constructPathsForJavascriptStack(InternalConstants.CORE_STACK_NAME)).andReturn( + expect(pathConstructor.constructPathsForJavaScriptStack(InternalConstants.CORE_STACK_NAME)).andReturn( CollectionFactory.newList("stack1.js", "stack2.js")); expect(stack.getStylesheets()).andReturn(CollectionFactory.newList(stylesheetLink)); @@ -138,34 +138,34 @@ public class JavascriptSupportImplTest e linker.addStylesheetLink(stylesheetLink); } - protected final JavascriptStack mockJavascriptStack() + protected final JSStack mockJavascriptStack() { - return newMock(JavascriptStack.class); + return newMock(JSStack.class); } - protected final JavascriptStackPathConstructor mockJavascriptStackPathConstructor() + protected final JSStackPathConstructor mockJavascriptStackPathConstructor() { - return newMock(JavascriptStackPathConstructor.class); + return newMock(JSStackPathConstructor.class); } - protected final JavascriptStackSource mockJavascriptStackSource() + protected final JSStackSource mockJavascriptStackSource() { - return newMock(JavascriptStackSource.class); + return newMock(JSStackSource.class); } @Test public void add_script_passes_thru_to_document_linker() { DocumentLinker linker = mockDocumentLinker(); - JavascriptStackSource stackSource = mockJavascriptStackSource(); - JavascriptStackPathConstructor pathConstructor = mockJavascriptStackPathConstructor(); + JSStackSource stackSource = mockJavascriptStackSource(); + JSStackPathConstructor pathConstructor = mockJavascriptStackPathConstructor(); trainForEmptyCoreStack(linker, stackSource, pathConstructor); linker.addScript(InitializationPriority.IMMEDIATE, "doSomething();"); replay(); - JavascriptSupportImpl jss = new JavascriptSupportImpl(linker, stackSource, pathConstructor); + JSSupportImpl jss = new JSSupportImpl(linker, stackSource, pathConstructor); jss.addScript(InitializationPriority.IMMEDIATE, "doSomething();"); @@ -176,8 +176,8 @@ public class JavascriptSupportImplTest e public void import_library() { DocumentLinker linker = mockDocumentLinker(); - JavascriptStackSource stackSource = mockJavascriptStackSource(); - JavascriptStackPathConstructor pathConstructor = mockJavascriptStackPathConstructor(); + JSStackSource stackSource = mockJavascriptStackSource(); + JSStackPathConstructor pathConstructor = mockJavascriptStackPathConstructor(); trainForEmptyCoreStack(linker, stackSource, pathConstructor); Asset library = mockAsset("mylib.js"); @@ -186,7 +186,7 @@ public class JavascriptSupportImplTest e replay(); - JavascriptSupportImpl jss = new JavascriptSupportImpl(linker, stackSource, pathConstructor); + JSSupportImpl jss = new JSSupportImpl(linker, stackSource, pathConstructor); jss.importJavascriptLibrary(library); @@ -199,17 +199,17 @@ public class JavascriptSupportImplTest e public void import_stack() { DocumentLinker linker = mockDocumentLinker(); - JavascriptStackSource stackSource = mockJavascriptStackSource(); - JavascriptStackPathConstructor pathConstructor = mockJavascriptStackPathConstructor(); + JSStackSource stackSource = mockJavascriptStackSource(); + JSStackPathConstructor pathConstructor = mockJavascriptStackPathConstructor(); trainForCoreStack(linker, stackSource, pathConstructor); - JavascriptStack stack = mockJavascriptStack(); + JSStack stack = mockJavascriptStack(); StylesheetLink stylesheetLink = new StylesheetLink("stack.css"); expect(stackSource.getStack("custom")).andReturn(stack); - expect(pathConstructor.constructPathsForJavascriptStack("custom")).andReturn( + expect(pathConstructor.constructPathsForJavaScriptStack("custom")).andReturn( CollectionFactory.newList("stack.js")); expect(stack.getStylesheets()).andReturn(CollectionFactory.newList(stylesheetLink)); @@ -223,7 +223,7 @@ public class JavascriptSupportImplTest e replay(); - JavascriptSupportImpl jss = new JavascriptSupportImpl(linker, stackSource, pathConstructor); + JSSupportImpl jss = new JSSupportImpl(linker, stackSource, pathConstructor); jss.importStack("custom"); @@ -239,8 +239,8 @@ public class JavascriptSupportImplTest e public void duplicate_imported_libraries_are_filtered() { DocumentLinker linker = mockDocumentLinker(); - JavascriptStackSource stackSource = mockJavascriptStackSource(); - JavascriptStackPathConstructor pathConstructor = mockJavascriptStackPathConstructor(); + JSStackSource stackSource = mockJavascriptStackSource(); + JSStackPathConstructor pathConstructor = mockJavascriptStackPathConstructor(); trainForEmptyCoreStack(linker, stackSource, pathConstructor); Asset library1 = mockAsset("mylib1.js"); @@ -251,7 +251,7 @@ public class JavascriptSupportImplTest e replay(); - JavascriptSupportImpl jss = new JavascriptSupportImpl(linker, stackSource, pathConstructor); + JSSupportImpl jss = new JSSupportImpl(linker, stackSource, pathConstructor); jss.importJavascriptLibrary(library1); jss.importJavascriptLibrary(library2); @@ -266,8 +266,8 @@ public class JavascriptSupportImplTest e public void initialize_calls_are_aggregated_within_priority() { DocumentLinker linker = mockDocumentLinker(); - JavascriptStackSource stackSource = mockJavascriptStackSource(); - JavascriptStackPathConstructor pathConstructor = mockJavascriptStackPathConstructor(); + JSStackSource stackSource = mockJavascriptStackSource(); + JSStackPathConstructor pathConstructor = mockJavascriptStackPathConstructor(); trainForEmptyCoreStack(linker, stackSource, pathConstructor); JSONObject spec1 = new JSONObject("clientId", "chuck"); @@ -279,7 +279,7 @@ public class JavascriptSupportImplTest e replay(); - JavascriptSupportImpl jss = new JavascriptSupportImpl(linker, stackSource, pathConstructor); + JSSupportImpl jss = new JSSupportImpl(linker, stackSource, pathConstructor); jss.addInitializerCall(InitializationPriority.IMMEDIATE, "setup", spec1); jss.addInitializerCall(InitializationPriority.IMMEDIATE, "setup", spec2); @@ -294,8 +294,8 @@ public class JavascriptSupportImplTest e { DocumentLinker linker = mockDocumentLinker(); - JavascriptStackSource stackSource = mockJavascriptStackSource(); - JavascriptStackPathConstructor pathConstructor = mockJavascriptStackPathConstructor(); + JSStackSource stackSource = mockJavascriptStackSource(); + JSStackPathConstructor pathConstructor = mockJavascriptStackPathConstructor(); trainForEmptyCoreStack(linker, stackSource, pathConstructor); JSONObject aggregated = new JSONObject().put("setup", new JSONArray("chuck", "charley")); @@ -304,7 +304,7 @@ public class JavascriptSupportImplTest e replay(); - JavascriptSupportImpl jss = new JavascriptSupportImpl(linker, stackSource, pathConstructor); + JSSupportImpl jss = new JSSupportImpl(linker, stackSource, pathConstructor); jss.addInitializerCall(InitializationPriority.IMMEDIATE, "setup", "chuck"); jss.addInitializerCall(InitializationPriority.IMMEDIATE, "setup", "charley"); @@ -318,8 +318,8 @@ public class JavascriptSupportImplTest e public void default_for_init_string_is_normal_priority() { DocumentLinker linker = mockDocumentLinker(); - JavascriptStackSource stackSource = mockJavascriptStackSource(); - JavascriptStackPathConstructor pathConstructor = mockJavascriptStackPathConstructor(); + JSStackSource stackSource = mockJavascriptStackSource(); + JSStackPathConstructor pathConstructor = mockJavascriptStackPathConstructor(); trainForEmptyCoreStack(linker, stackSource, pathConstructor); JSONObject aggregated = new JSONObject().put("setup", new JSONArray().put("chuck")); @@ -328,7 +328,7 @@ public class JavascriptSupportImplTest e replay(); - JavascriptSupportImpl jss = new JavascriptSupportImpl(linker, stackSource, pathConstructor); + JSSupportImpl jss = new JSSupportImpl(linker, stackSource, pathConstructor); jss.addInitializerCall("setup", "chuck"); @@ -348,7 +348,7 @@ public class JavascriptSupportImplTest e replay(); - JavascriptSupportImpl jss = new JavascriptSupportImpl(linker, null, null); + JSSupportImpl jss = new JSSupportImpl(linker, null, null); jss.importStylesheet(stylesheet); @@ -367,7 +367,7 @@ public class JavascriptSupportImplTest e replay(); - JavascriptSupportImpl jss = new JavascriptSupportImpl(linker, null, null); + JSSupportImpl jss = new JSSupportImpl(linker, null, null); jss.importStylesheet(new StylesheetLink("style.css", options)); jss.importStylesheet(new StylesheetLink("style.css", new StylesheetOptions("hologram"))); Propchange: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ajax/JSSupportImplTest.java ------------------------------------------------------------------------------ svn:eol-style = native
