Author: jkuhnert
Date: Sat May 12 13:41:44 2007
New Revision: 537511
URL: http://svn.apache.org/viewvc?view=rev&rev=537511
Log:
Fixing broken unit tests.
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestLibrary.xml
tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestSimple.xml
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/dojo/AjaxShellDelegateTest.java
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestLibrary.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestLibrary.xml?view=diff&rev=537511&r1=537510&r2=537511
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestLibrary.xml
(original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestLibrary.xml Sat
May 12 13:41:44 2007
@@ -58,7 +58,9 @@
<match>/script</match>
<match>script</match>
<match>/script</match>
- <match>link</match>
+ <match>script</match>
+ <match>/script</match>
+ <match>link</match>
<match>/head</match>
<match>body</match>
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestSimple.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestSimple.xml?view=diff&rev=537511&r1=537510&r2=537511
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestSimple.xml
(original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/scripts/TestSimple.xml Sat
May 12 13:41:44 2007
@@ -51,7 +51,9 @@
<match>/script</match>
<match>script</match>
<match>/script</match>
- <match>/head</match>
+ <match>script</match>
+ <match>/script</match>
+ <match>/head</match>
<match>body</match>
<match>br</match>
<match>a</match>
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/dojo/AjaxShellDelegateTest.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/dojo/AjaxShellDelegateTest.java?view=diff&rev=537511&r1=537510&r2=537511
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/dojo/AjaxShellDelegateTest.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/dojo/AjaxShellDelegateTest.java
Sat May 12 13:41:44 2007
@@ -13,20 +13,15 @@
// limitations under the License.
package org.apache.tapestry.dojo;
-import static org.easymock.EasyMock.expect;
-
-import java.util.Locale;
-
import org.apache.hivemind.Resource;
-import org.apache.tapestry.BaseComponentTestCase;
-import org.apache.tapestry.IAsset;
-import org.apache.tapestry.IMarkupWriter;
-import org.apache.tapestry.IPage;
-import org.apache.tapestry.IRequestCycle;
+import org.apache.tapestry.*;
import org.apache.tapestry.engine.IEngineService;
import org.apache.tapestry.engine.ILink;
+import static org.easymock.EasyMock.expect;
import org.testng.annotations.Test;
+import java.util.Locale;
+
/**
* Tests basic functionality of [EMAIL PROTECTED] AjaxShellDelegate}.
@@ -142,19 +137,20 @@
verify();
- assertBuffer("<script type=\"text/javascript\">djConfig =
{\"isDebug\":true,"
- + "\"baseRelativePath\":\"http:///dojo/path\",";
-
+"\"preventBackButtonFix\":false,\"parseWidgets\":false,\"locale\":\"en-gb\"}
</script>\n" +
- "\n" +
- " <script type=\"text/javascript\"
src=\"http:///dojo/path/dojo.js\";></script>\n"
- + "<script type=\"text/javascript\">\n" +
- "dojo.registerModulePath(\"tapestry\", \"/tapestry\");\n" +
- "</script>\n" +
- "<script type=\"text/javascript\"
src=\"/tapestry/tapestry.js\"></script>\n" +
- "<script type=\"text/javascript\">\n" +
- "dojo.require(\"dojo.debug.console\");\n" +
- "dojo.log.setLevel(dojo.log.getLevel(\"DEBUG\"));\n" +
- "dojo.require(\"tapestry.namespace\");\n" +
- "</script>" + SYSTEM_NEWLINE);
+ assertBuffer("<script type=\"text/javascript\">djConfig =
{\"isDebug\":true,\"baseRelativePath\":\"http:///dojo/path\","; +
+
"\"preventBackButtonFix\":false,\"parseWidgets\":false,\"locale\":\"en-gb\"}
</script>\n" +
+ "\n" +
+ " <script type=\"text/javascript\"
src=\"http:///dojo/path/dojo.js\";></script>\n" +
+ "<script type=\"text/javascript\">\n" +
+ "dojo.require(\"dojo.debug.console\");\n" +
+ "dojo.log.setLevel(dojo.log.getLevel(\"DEBUG\"));\n" +
+ "</script>\n" +
+ "<script type=\"text/javascript\">\n" +
+ "dojo.registerModulePath(\"tapestry\", \"/tapestry\");\n"
+
+ "</script>\n" +
+ "<script type=\"text/javascript\"
src=\"/tapestry/tapestry.js\"></script>\n" +
+ "<script type=\"text/javascript\">\n" +
+ "dojo.require(\"tapestry.namespace\");\n" +
+ "</script>" + SYSTEM_NEWLINE);
}
}
