You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by jk...@apache.org on 2006/09/23 03:43:44 UTC
svn commit: r449143 - in /tapestry/tapestry4/trunk/tapestry-framework/src:
js/tapestry/ test/org/apache/tapestry/services/impl/
test/org/apache/tapestry/util/
Author: jkuhnert
Date: Fri Sep 22 18:43:43 2006
New Revision: 449143
URL: http://svn.apache.org/viewvc?view=rev&rev=449143
Log:
Fixed bug in tapestry.load() function where includescripts elements weren't continuing the element block.
Fixed unit tests relying on old dojo.event.connect() on window object instead of the new dojo.addOnLoad which should
load pages up dramatically faster than seen previously.
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/core.js
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DefaultResponseBuilderTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DojoAjaxResponseBuilderTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/util/TestPageRenderSupport.java
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/core.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/core.js?view=diff&rev=449143&r1=449142&r2=449143
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/core.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/core.js Fri Sep 22 18:43:43 2006
@@ -97,6 +97,7 @@
} else if (id == "includescript") {
// includes get processed immediately (syncrhonously)
tapestry.loadScriptContent(elms[i], false);
+ continue;
}
}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DefaultResponseBuilderTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DefaultResponseBuilderTest.java?view=diff&rev=449143&r1=449142&r2=449143
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DefaultResponseBuilderTest.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DefaultResponseBuilderTest.java Fri Sep 22 18:43:43 2006
@@ -26,7 +26,7 @@
import org.apache.tapestry.markup.MarkupWriterImpl;
import org.apache.tapestry.markup.UTFMarkupFilter;
import org.apache.tapestry.services.ResponseBuilder;
-import org.testng.annotations.Configuration;
+import org.testng.annotations.AfterClass;
import org.testng.annotations.Test;
@@ -52,8 +52,8 @@
return new PrintWriter(_writer);
}
- @Configuration(afterTestClass = true)
- protected void tearDown() throws Exception
+ @AfterClass
+ protected void cleanup() throws Exception
{
_writer = null;
}
@@ -65,7 +65,7 @@
_writer.reset();
}
- public void testNullRender()
+ public void test_Null_Render()
{
IRender render = (IRender)newMock(IRender.class);
IRequestCycle cycle = (IRequestCycle)newMock(IRequestCycle.class);
@@ -83,7 +83,7 @@
assertSame(builder.getWriter(), NullWriter.getSharedInstance());
}
- public void testNormalRender()
+ public void test_Normal_Render()
{
IRender render = (IRender)newMock(IRender.class);
IRequestCycle cycle = (IRequestCycle)newMock(IRequestCycle.class);
@@ -102,7 +102,7 @@
assertSame(builder.getWriter(), writer);
}
- public void testGetWriterType()
+ public void test_Get_Writer_Type()
{
IMarkupWriter writer = (IMarkupWriter)newMock(IMarkupWriter.class);
ResponseBuilder builder = new DefaultResponseBuilder(writer);
@@ -110,7 +110,7 @@
assertSame(builder.getWriter("test", "type"), writer);
}
- public void testAllowedScripts()
+ public void test_Allowed_Scripts()
{
IComponent component = (IComponent)newMock(IComponent.class);
ResponseBuilder builder = new DefaultResponseBuilder(null);
@@ -145,7 +145,7 @@
builder.writeImageInitializations(mw, imageInit, preload, cycle);
assertOutput(LINE_SEPARATOR
- + "dojo.event.connect(window, 'onload', function(e) {\n\n\n"
+ + "dojo.addOnLoad(function(e) {\n\n\n"
+ preload + " = [];\n"
+ "if (document.images)\n"
+ "{\n" + imageInit + "}\n"
@@ -211,7 +211,7 @@
builder.writeInitializationScript(mw, script);
assertOutput("<script type=\"text/javascript\"><!--\n"
- + "dojo.event.connect(window, 'onload', function(e) {\n"
+ + "dojo.addOnLoad(function(e) {\n"
+ script
+ "});"
+ "\n// -->"
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DojoAjaxResponseBuilderTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DojoAjaxResponseBuilderTest.java?view=diff&rev=449143&r1=449142&r2=449143
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DojoAjaxResponseBuilderTest.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/DojoAjaxResponseBuilderTest.java Fri Sep 22 18:43:43 2006
@@ -59,7 +59,7 @@
}
@AfterClass
- protected void tearDown() throws Exception
+ protected void cleanup() throws Exception
{
_writer = null;
}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/util/TestPageRenderSupport.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/util/TestPageRenderSupport.java?view=diff&rev=449143&r1=449142&r2=449143
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/util/TestPageRenderSupport.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/util/TestPageRenderSupport.java Fri Sep 22 18:43:43 2006
@@ -44,6 +44,7 @@
{
private static final String SYSTEM_NEWLINE= (String)java.security.AccessController.doPrivileged(
new sun.security.action.GetPropertyAction("line.separator"));
+
private static final String TEST_NEWLINE= "\n";
private AssetFactory newAssetFactory()
@@ -139,7 +140,7 @@
assertOutput(new String[]
{ "<script type=\"text/javascript\"><!--",
- "dojo.event.connect(window, 'onload', function(e) {", "","",
+ "dojo.addOnLoad(function(e) {", "","",
"tapestry._preload = [];", "if (document.images)", "{",
" tapestry._preload[0] = new Image();",
" tapestry._preload[0].src = \"/foo/bar.gif\";",
@@ -168,7 +169,7 @@
assertOutput(new String[]
{"<script type=\"text/javascript\"><!--",
- "dojo.event.connect(window, 'onload', function(e) {","","",
+ "dojo.addOnLoad(function(e) {","","",
"NAMESPACE_preload = [];", "if (document.images)", "{",
" NAMESPACE_preload[0] = new Image();",
" NAMESPACE_preload[0].src = \"/foo/bar.gif\";", "}",
@@ -252,7 +253,7 @@
assertOutput(new String[]
{ "<script type=\"text/javascript\"><!--",
- "dojo.event.connect(window, 'onload', function(e) {",
+ "dojo.addOnLoad(function(e) {",
"myInitializationScript1();", "myInitializationScript2();",
"});", "// --></script>" });