You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2010/07/28 19:33:30 UTC
svn commit: r980131 [2/2] - in /tapestry/tapestry5/trunk/tapestry-core/src:
main/java/org/apache/tapestry5/ main/java/org/apache/tapestry5/annotations/
main/java/org/apache/tapestry5/corelib/components/
main/java/org/apache/tapestry5/corelib/mixins/ ma...
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StylesheetLink.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StylesheetLink.java?rev=980131&r1=980130&r2=980131&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StylesheetLink.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/services/javascript/StylesheetLink.java Wed Jul 28 17:33:29 2010
@@ -26,7 +26,7 @@ import org.apache.tapestry5.ioc.internal
* as part of a JSON partial page render response.
*
* @see DocumentLinker
- * @see JSStack
+ * @see JavaScriptStack
* @since 5.2.0
*/
public final class StylesheetLink
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/test/TapestryTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/test/TapestryTestCase.java?rev=980131&r1=980130&r2=980131&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/test/TapestryTestCase.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/test/TapestryTestCase.java Wed Jul 28 17:33:29 2010
@@ -83,7 +83,7 @@ import org.apache.tapestry5.model.Mutabl
import org.apache.tapestry5.model.ParameterModel;
import org.apache.tapestry5.runtime.Component;
import org.apache.tapestry5.services.*;
-import org.apache.tapestry5.services.javascript.JSSupport;
+import org.apache.tapestry5.services.javascript.JavaScriptSupport;
import org.easymock.EasyMock;
import org.easymock.IAnswer;
@@ -1244,9 +1244,9 @@ public abstract class TapestryTestCase e
return newMock(ClientInfrastructure.class);
}
- protected final JSSupport mockJavascriptSupport()
+ protected final JavaScriptSupport mockJavascriptSupport()
{
- return newMock(JSSupport.class);
+ return newMock(JavaScriptSupport.class);
}
protected final Asset mockAsset(String assetURL)
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=980131&r1=980130&r2=980131&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:29 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.JSSupport;
+import org.apache.tapestry5.services.javascript.JavaScriptSupport;
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();
- JSSupport support = mockJavascriptSupport();
+ JavaScriptSupport 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();
- JSSupport support = mockJavascriptSupport();
+ JavaScriptSupport 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();
- JSSupport support = mockJavascriptSupport();
+ JavaScriptSupport 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=980131&r1=980130&r2=980131&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:29 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.JSSupport;
+import org.apache.tapestry5.services.javascript.JavaScriptSupport;
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 JSSupport javascriptSupport;
+ private JavaScriptSupport 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=980131&r1=980130&r2=980131&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:29 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.JSSupport;
+import org.apache.tapestry5.services.javascript.JavaScriptSupport;
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");
- JSSupport js = mockJavascriptSupport();
+ JavaScriptSupport 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()
{
- JSSupport js = mockJavascriptSupport();
+ JavaScriptSupport 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()
{
- JSSupport js = mockJavascriptSupport();
+ JavaScriptSupport js = mockJavascriptSupport();
Environment environment = mockEnvironment();
FormSupport fs = mockFormSupport();
@@ -102,7 +102,7 @@ public class ClientBehaviorSupportImplTe
@Test
public void zones_with_functions()
{
- JSSupport js = mockJavascriptSupport();
+ JavaScriptSupport 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()
{
- JSSupport js = mockJavascriptSupport();
+ JavaScriptSupport 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=980131&r1=980130&r2=980131&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:29 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.JSSupport;
+import org.apache.tapestry5.services.javascript.JavaScriptSupport;
import org.apache.tapestry5.services.javascript.StylesheetLink;
import org.apache.tapestry5.services.javascript.StylesheetOptions;
import org.testng.annotations.Test;
@@ -34,10 +34,10 @@ public class RenderSupportImplTest exten
@Test
public void add_script_link_by_asset()
{
- JSSupport js = mockJavascriptSupport();
+ JavaScriptSupport js = mockJavascriptSupport();
Asset asset = mockAsset();
- js.importJavascriptLibrary(asset);
+ js.importJavaScriptLibrary(asset);
replay();
@@ -51,7 +51,7 @@ public class RenderSupportImplTest exten
@Test
public void add_script_link_by_url()
{
- JSSupport jss = mockJavascriptSupport();
+ JavaScriptSupport jss = mockJavascriptSupport();
RenderSupport support = new RenderSupportImpl(null, null, jss);
@@ -67,7 +67,7 @@ public class RenderSupportImplTest exten
@Test
public void add_script()
{
- JSSupport js = mockJavascriptSupport();
+ JavaScriptSupport js = mockJavascriptSupport();
js.addScript("doSomething();");
@@ -89,13 +89,13 @@ public class RenderSupportImplTest exten
Asset asset = mockAsset();
SymbolSource source = mockSymbolSource();
AssetSource assetSource = mockAssetSource();
- JSSupport js = mockJavascriptSupport();
+ JavaScriptSupport js = mockJavascriptSupport();
train_expandSymbols(source, path, expanded);
train_getAsset(assetSource, null, expanded, null, asset);
- js.importJavascriptLibrary(asset);
+ js.importJavaScriptLibrary(asset);
replay();
@@ -110,7 +110,7 @@ public class RenderSupportImplTest exten
public void add_stylesheet_link_by_asset()
{
String media = "print";
- JSSupport javascriptSupport = mockJavascriptSupport();
+ JavaScriptSupport 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";
- JSSupport javascriptSupport = mockJavascriptSupport();
+ JavaScriptSupport 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()
{
- JSSupport js = mockJavascriptSupport();
+ JavaScriptSupport 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()
{
- JSSupport js = mockJavascriptSupport();
+ JavaScriptSupport js = mockJavascriptSupport();
js.addInitializerCall("activate", "foo");
@@ -182,7 +182,7 @@ public class RenderSupportImplTest exten
@Test
public void first_focus_field_at_priority_wins()
{
- JSSupport js = mockJavascriptSupport();
+ JavaScriptSupport js = mockJavascriptSupport();
js.addInitializerCall("activate", "foo");
@@ -201,7 +201,7 @@ public class RenderSupportImplTest exten
@Test
public void higher_priority_wins_focus()
{
- JSSupport js = mockJavascriptSupport();
+ JavaScriptSupport js = mockJavascriptSupport();
js.addInitializerCall("activate", "bar");
@@ -222,7 +222,7 @@ public class RenderSupportImplTest exten
{
JSONObject parameter = new JSONObject("clientid", "fred");
- JSSupport js = mockJavascriptSupport();
+ JavaScriptSupport js = mockJavascriptSupport();
js.addInitializerCall("setup", parameter);
Copied: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ajax/JavaScriptSupportImplTest.java (from r980130, tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ajax/JSSupportImplTest.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ajax/JavaScriptSupportImplTest.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ajax/JavaScriptSupportImplTest.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ajax/JSSupportImplTest.java&r1=980130&r2=980131&rev=980131&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ajax/JSSupportImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ajax/JavaScriptSupportImplTest.java Wed Jul 28 17:33:29 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.JSStackPathConstructor;
+import org.apache.tapestry5.internal.services.javascript.JavaScriptStackPathConstructor;
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.JSStack;
-import org.apache.tapestry5.services.javascript.JSStackSource;
-import org.apache.tapestry5.services.javascript.JSSupport;
+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.StylesheetLink;
import org.apache.tapestry5.services.javascript.StylesheetOptions;
import org.testng.annotations.Test;
-public class JSSupportImplTest extends InternalBaseTestCase
+public class JavaScriptSupportImplTest extends InternalBaseTestCase
{
@Test
public void allocate_id_from_resources()
@@ -46,7 +46,7 @@ public class JSSupportImplTest extends I
replay();
- JSSupport jss = new JSSupportImpl(null, null, null);
+ JavaScriptSupport jss = new JavaScriptSupportImpl(null, null, null);
assertEquals(jss.allocateClientId(resources), "tracy");
assertEquals(jss.allocateClientId(resources), "tracy_0");
@@ -58,7 +58,7 @@ public class JSSupportImplTest extends I
@Test
public void commit_with_no_javascript()
{
- JSSupportImpl jss = new JSSupportImpl(null, null, null);
+ JavaScriptSupportImpl jss = new JavaScriptSupportImpl(null, null, null);
jss.commit();
}
@@ -72,7 +72,7 @@ public class JSSupportImplTest extends I
replay();
- JSSupportImpl jss = new JSSupportImpl(linker, null, null, new IdAllocator(), true);
+ JavaScriptSupportImpl jss = new JavaScriptSupportImpl(linker, null, null, new IdAllocator(), true);
jss.addScript("doSomething();");
@@ -85,8 +85,8 @@ public class JSSupportImplTest extends I
public void adding_script_will_add_stack()
{
DocumentLinker linker = mockDocumentLinker();
- JSStackSource stackSource = mockJavascriptStackSource();
- JSStackPathConstructor pathConstructor = mockJavascriptStackPathConstructor();
+ JavaScriptStackSource stackSource = mockJavaScriptStackSource();
+ JavaScriptStackPathConstructor pathConstructor = mockJavaScriptStackPathConstructor();
trainForCoreStack(linker, stackSource, pathConstructor);
linker.addScript(InitializationPriority.IMMEDIATE, "stackInit();");
@@ -94,7 +94,7 @@ public class JSSupportImplTest extends I
replay();
- JSSupportImpl jss = new JSSupportImpl(linker, stackSource, pathConstructor);
+ JavaScriptSupportImpl jss = new JavaScriptSupportImpl(linker, stackSource, pathConstructor);
jss.addScript("doSomething();");
@@ -103,10 +103,10 @@ public class JSSupportImplTest extends I
verify();
}
- private void trainForEmptyCoreStack(DocumentLinker linker, JSStackSource stackSource,
- JSStackPathConstructor pathConstructor)
+ private void trainForEmptyCoreStack(DocumentLinker linker, JavaScriptStackSource stackSource,
+ JavaScriptStackPathConstructor pathConstructor)
{
- JSStack stack = mockJavascriptStack();
+ JavaScriptStack stack = mockJavaScriptStack();
List<String> libraryPaths = Collections.emptyList();
List<StylesheetLink> stylesheets = Collections.emptyList();
@@ -119,10 +119,10 @@ public class JSSupportImplTest extends I
expect(stack.getInitialization()).andReturn(null);
}
- private void trainForCoreStack(DocumentLinker linker, JSStackSource stackSource,
- JSStackPathConstructor pathConstructor)
+ private void trainForCoreStack(DocumentLinker linker, JavaScriptStackSource stackSource,
+ JavaScriptStackPathConstructor pathConstructor)
{
- JSStack stack = mockJavascriptStack();
+ JavaScriptStack stack = mockJavaScriptStack();
StylesheetLink stylesheetLink = new StylesheetLink("style.css");
@@ -138,34 +138,34 @@ public class JSSupportImplTest extends I
linker.addStylesheetLink(stylesheetLink);
}
- protected final JSStack mockJavascriptStack()
+ protected final JavaScriptStack mockJavaScriptStack()
{
- return newMock(JSStack.class);
+ return newMock(JavaScriptStack.class);
}
- protected final JSStackPathConstructor mockJavascriptStackPathConstructor()
+ protected final JavaScriptStackPathConstructor mockJavaScriptStackPathConstructor()
{
- return newMock(JSStackPathConstructor.class);
+ return newMock(JavaScriptStackPathConstructor.class);
}
- protected final JSStackSource mockJavascriptStackSource()
+ protected final JavaScriptStackSource mockJavaScriptStackSource()
{
- return newMock(JSStackSource.class);
+ return newMock(JavaScriptStackSource.class);
}
@Test
public void add_script_passes_thru_to_document_linker()
{
DocumentLinker linker = mockDocumentLinker();
- JSStackSource stackSource = mockJavascriptStackSource();
- JSStackPathConstructor pathConstructor = mockJavascriptStackPathConstructor();
+ JavaScriptStackSource stackSource = mockJavaScriptStackSource();
+ JavaScriptStackPathConstructor pathConstructor = mockJavaScriptStackPathConstructor();
trainForEmptyCoreStack(linker, stackSource, pathConstructor);
linker.addScript(InitializationPriority.IMMEDIATE, "doSomething();");
replay();
- JSSupportImpl jss = new JSSupportImpl(linker, stackSource, pathConstructor);
+ JavaScriptSupportImpl jss = new JavaScriptSupportImpl(linker, stackSource, pathConstructor);
jss.addScript(InitializationPriority.IMMEDIATE, "doSomething();");
@@ -176,8 +176,8 @@ public class JSSupportImplTest extends I
public void import_library()
{
DocumentLinker linker = mockDocumentLinker();
- JSStackSource stackSource = mockJavascriptStackSource();
- JSStackPathConstructor pathConstructor = mockJavascriptStackPathConstructor();
+ JavaScriptStackSource stackSource = mockJavaScriptStackSource();
+ JavaScriptStackPathConstructor pathConstructor = mockJavaScriptStackPathConstructor();
trainForEmptyCoreStack(linker, stackSource, pathConstructor);
Asset library = mockAsset("mylib.js");
@@ -186,9 +186,9 @@ public class JSSupportImplTest extends I
replay();
- JSSupportImpl jss = new JSSupportImpl(linker, stackSource, pathConstructor);
+ JavaScriptSupportImpl jss = new JavaScriptSupportImpl(linker, stackSource, pathConstructor);
- jss.importJavascriptLibrary(library);
+ jss.importJavaScriptLibrary(library);
jss.commit();
@@ -199,12 +199,12 @@ public class JSSupportImplTest extends I
public void import_stack()
{
DocumentLinker linker = mockDocumentLinker();
- JSStackSource stackSource = mockJavascriptStackSource();
- JSStackPathConstructor pathConstructor = mockJavascriptStackPathConstructor();
+ JavaScriptStackSource stackSource = mockJavaScriptStackSource();
+ JavaScriptStackPathConstructor pathConstructor = mockJavaScriptStackPathConstructor();
trainForCoreStack(linker, stackSource, pathConstructor);
- JSStack stack = mockJavascriptStack();
+ JavaScriptStack stack = mockJavaScriptStack();
StylesheetLink stylesheetLink = new StylesheetLink("stack.css");
@@ -223,7 +223,7 @@ public class JSSupportImplTest extends I
replay();
- JSSupportImpl jss = new JSSupportImpl(linker, stackSource, pathConstructor);
+ JavaScriptSupportImpl jss = new JavaScriptSupportImpl(linker, stackSource, pathConstructor);
jss.importStack("custom");
@@ -239,8 +239,8 @@ public class JSSupportImplTest extends I
public void duplicate_imported_libraries_are_filtered()
{
DocumentLinker linker = mockDocumentLinker();
- JSStackSource stackSource = mockJavascriptStackSource();
- JSStackPathConstructor pathConstructor = mockJavascriptStackPathConstructor();
+ JavaScriptStackSource stackSource = mockJavaScriptStackSource();
+ JavaScriptStackPathConstructor pathConstructor = mockJavaScriptStackPathConstructor();
trainForEmptyCoreStack(linker, stackSource, pathConstructor);
Asset library1 = mockAsset("mylib1.js");
@@ -251,11 +251,11 @@ public class JSSupportImplTest extends I
replay();
- JSSupportImpl jss = new JSSupportImpl(linker, stackSource, pathConstructor);
+ JavaScriptSupportImpl jss = new JavaScriptSupportImpl(linker, stackSource, pathConstructor);
- jss.importJavascriptLibrary(library1);
- jss.importJavascriptLibrary(library2);
- jss.importJavascriptLibrary(library1);
+ jss.importJavaScriptLibrary(library1);
+ jss.importJavaScriptLibrary(library2);
+ jss.importJavaScriptLibrary(library1);
jss.commit();
@@ -266,8 +266,8 @@ public class JSSupportImplTest extends I
public void initialize_calls_are_aggregated_within_priority()
{
DocumentLinker linker = mockDocumentLinker();
- JSStackSource stackSource = mockJavascriptStackSource();
- JSStackPathConstructor pathConstructor = mockJavascriptStackPathConstructor();
+ JavaScriptStackSource stackSource = mockJavaScriptStackSource();
+ JavaScriptStackPathConstructor pathConstructor = mockJavaScriptStackPathConstructor();
trainForEmptyCoreStack(linker, stackSource, pathConstructor);
JSONObject spec1 = new JSONObject("clientId", "chuck");
@@ -279,7 +279,7 @@ public class JSSupportImplTest extends I
replay();
- JSSupportImpl jss = new JSSupportImpl(linker, stackSource, pathConstructor);
+ JavaScriptSupportImpl jss = new JavaScriptSupportImpl(linker, stackSource, pathConstructor);
jss.addInitializerCall(InitializationPriority.IMMEDIATE, "setup", spec1);
jss.addInitializerCall(InitializationPriority.IMMEDIATE, "setup", spec2);
@@ -294,8 +294,8 @@ public class JSSupportImplTest extends I
{
DocumentLinker linker = mockDocumentLinker();
- JSStackSource stackSource = mockJavascriptStackSource();
- JSStackPathConstructor pathConstructor = mockJavascriptStackPathConstructor();
+ JavaScriptStackSource stackSource = mockJavaScriptStackSource();
+ JavaScriptStackPathConstructor pathConstructor = mockJavaScriptStackPathConstructor();
trainForEmptyCoreStack(linker, stackSource, pathConstructor);
JSONObject aggregated = new JSONObject().put("setup", new JSONArray("chuck", "charley"));
@@ -304,7 +304,7 @@ public class JSSupportImplTest extends I
replay();
- JSSupportImpl jss = new JSSupportImpl(linker, stackSource, pathConstructor);
+ JavaScriptSupportImpl jss = new JavaScriptSupportImpl(linker, stackSource, pathConstructor);
jss.addInitializerCall(InitializationPriority.IMMEDIATE, "setup", "chuck");
jss.addInitializerCall(InitializationPriority.IMMEDIATE, "setup", "charley");
@@ -318,8 +318,8 @@ public class JSSupportImplTest extends I
public void default_for_init_string_is_normal_priority()
{
DocumentLinker linker = mockDocumentLinker();
- JSStackSource stackSource = mockJavascriptStackSource();
- JSStackPathConstructor pathConstructor = mockJavascriptStackPathConstructor();
+ JavaScriptStackSource stackSource = mockJavaScriptStackSource();
+ JavaScriptStackPathConstructor pathConstructor = mockJavaScriptStackPathConstructor();
trainForEmptyCoreStack(linker, stackSource, pathConstructor);
JSONObject aggregated = new JSONObject().put("setup", new JSONArray().put("chuck"));
@@ -328,7 +328,7 @@ public class JSSupportImplTest extends I
replay();
- JSSupportImpl jss = new JSSupportImpl(linker, stackSource, pathConstructor);
+ JavaScriptSupportImpl jss = new JavaScriptSupportImpl(linker, stackSource, pathConstructor);
jss.addInitializerCall("setup", "chuck");
@@ -348,7 +348,7 @@ public class JSSupportImplTest extends I
replay();
- JSSupportImpl jss = new JSSupportImpl(linker, null, null);
+ JavaScriptSupportImpl jss = new JavaScriptSupportImpl(linker, null, null);
jss.importStylesheet(stylesheet);
@@ -367,7 +367,7 @@ public class JSSupportImplTest extends I
replay();
- JSSupportImpl jss = new JSSupportImpl(linker, null, null);
+ JavaScriptSupportImpl jss = new JavaScriptSupportImpl(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/JavaScriptSupportImplTest.java
------------------------------------------------------------------------------
svn:eol-style = native