Author: hlship
Date: Thu Sep 1 19:01:47 2011
New Revision: 1164209
URL: http://svn.apache.org/viewvc?rev=1164209&view=rev
Log:
TAP5-743: Add basic tests for application folder support
Added:
tapestry/tapestry5/trunk/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/appfolder/AppFolderTests.groovy
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/appfolder/static.html
tapestry/tapestry5/trunk/tapestry-core/src/test/appfolder/t5app/ContextTemplate.tml
tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng.xml
tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry5/integration/appfolder/pages/Index.tml
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/appfolder/static.html
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/appfolder/static.html?rev=1164209&r1=1164208&r2=1164209&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/appfolder/static.html
(original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/appfolder/static.html Thu
Sep 1 19:01:47 2011
@@ -1,4 +1,7 @@
<html>
+<head><title>Static File</title></head>
+
+<body>
<h1>Static File in Context</h1>
@@ -6,4 +9,5 @@
<a href="t5app">to Tapestry application</a>
</p>
+</body>
</html>
\ No newline at end of file
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/appfolder/t5app/ContextTemplate.tml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/appfolder/t5app/ContextTemplate.tml?rev=1164209&r1=1164208&r2=1164209&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/appfolder/t5app/ContextTemplate.tml
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/appfolder/t5app/ContextTemplate.tml
Thu Sep 1 19:01:47 2011
@@ -1,9 +1,11 @@
<html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_3.xsd";>
+<head><title>Context Template</title></head>
+<body>
<h1>Context Template Demo</h1>
<img src="${context:images/t5-logo.png}" alt="Logo"/>
<t:pagelink page="index">back to index</t:pagelink>
-
+</body>
</html>
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng.xml?rev=1164209&r1=1164208&r2=1164209&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng.xml Thu Sep 1
19:01:47 2011
@@ -8,93 +8,100 @@
<!-- The suite may no longer be run in parallel, because of some tricky issues
related to locking of class loaders. Running
in parallel causes thread deadlocks, when unmanaged tests run at the same
time as Selenium-based integration tests. See TAPESTRY-2561. -->
<suite name="Tapestry Core" annotations="1.5" verbose="2">
- <test name="Component Unit Tests" enabled="true">
- <packages>
- <package name="org.apache.tapestry5.integration.pagelevel"/>
- <package name="org.apache.tapestry5.corelib.base"/>
- <package name="org.apache.tapestry5.corelib.components"/>
- <package name="org.apache.tapestry5.corelib.mixins"/>
- <package name="org.apache.tapestry5.corelib.internal"/>
- </packages>
- </test>
-
- <test name="Service Unit Tests" enabled="true">
- <packages>
- <package name="org.apache.tapestry5.root"/>
- <package name="org.apache.tapestry5.dom"/>
- <package name="org.apache.tapestry5.runtime"/>
- <package name="org.apache.tapestry5.services"/>
- <package name="org.apache.tapestry5.services.javascript"/>
- <package name="org.apache.tapestry5.util"/>
- <package name="org.apache.tapestry5.validator"/>
- <package name="org.apache.tapestry5.internal"/>
- <package name="org.apache.tapestry5.internal.beaneditor"/>
- <package name="org.apache.tapestry5.internal.bindings"/>
- <package name="org.apache.tapestry5.internal.grid"/>
- <package name="org.apache.tapestry5.internal.model"/>
- <package name="org.apache.tapestry5.internal.pageload"/>
- <package name="org.apache.tapestry5.internal.services"/>
- <package name="org.apache.tapestry5.internal.services.assets"/>
- <package name="org.apache.tapestry5.internal.services.messages"/>
- <package name="org.apache.tapestry5.internal.services.meta"/>
- <package name="org.apache.tapestry5.internal.services.templates"/>
- <package name="org.apache.tapestry5.internal.structure"/>
- <package name="org.apache.tapestry5.internal.test"/>
- <package name="org.apache.tapestry5.internal.transform"/>
- <package name="org.apache.tapestry5.internal.translator"/>
- <package name="org.apache.tapestry5.internal.util"/>
- <package name="org.apache.tapestry5.internal.services.ajax"/>
- </packages>
- </test>
-
- <!-- We break these out by which of the test applications they apply to. We
have a bunch. -->
- <test name="Core Integration Tests" enabled="true">
- <parameter name="tapestry.web-app-folder" value="src/test/app1"/>
-
- <packages>
- <package name="org.apache.tapestry5.integration.app1"/>
- </packages>
- </test>
-
- <test name="Additional Integration Tests" enabled="true">
- <parameter name="tapestry.web-app-folder" value="src/test/app3"/>
-
- <packages>
- <package name="org.apache.tapestry5.integration.app3"/>
- </packages>
- </test>
-
- <test name="Immediate Mode Integration Tests" enabled="true">
- <parameter name="tapestry.web-app-folder" value="src/test/app4"/>
-
- <packages>
- <package name="org.apache.tapestry5.integration.app4"/>
- </packages>
- </test>
-
- <test name="Live Reload Tests" enabled="true">
- <packages>
- <package name="org.apache.tapestry5.integration.reload"/>
- </packages>
- </test>
-
- <test name="LinkTransformer Tests" enabled="true">
- <parameter name="tapestry.web-app-folder" value="src/test/linktrans"/>
- <packages>
- <package name="org.apache.tapestry5.integration.linktrans"/>
- </packages>
- </test>
-
- <test name="App Skinning Tests" enabled="true">
- <parameter name="tapestry.web-app-folder" value="src/test/app5"/>
- <packages>
- <package name="org.apache.tapestry5.integration.app5"/>
- </packages>
- </test>
-
- <test name="PageTester Tests" enabled="true">
- <packages>
- <package name="org.apache.tapestry5.integration.pagetester"/>
- </packages>
- </test>
+ <test name="Component Unit Tests" enabled="true">
+ <packages>
+ <package name="org.apache.tapestry5.integration.pagelevel"/>
+ <package name="org.apache.tapestry5.corelib.base"/>
+ <package name="org.apache.tapestry5.corelib.components"/>
+ <package name="org.apache.tapestry5.corelib.mixins"/>
+ <package name="org.apache.tapestry5.corelib.internal"/>
+ </packages>
+ </test>
+
+ <test name="Service Unit Tests" enabled="true">
+ <packages>
+ <package name="org.apache.tapestry5.root"/>
+ <package name="org.apache.tapestry5.dom"/>
+ <package name="org.apache.tapestry5.runtime"/>
+ <package name="org.apache.tapestry5.services"/>
+ <package name="org.apache.tapestry5.services.javascript"/>
+ <package name="org.apache.tapestry5.util"/>
+ <package name="org.apache.tapestry5.validator"/>
+ <package name="org.apache.tapestry5.internal"/>
+ <package name="org.apache.tapestry5.internal.beaneditor"/>
+ <package name="org.apache.tapestry5.internal.bindings"/>
+ <package name="org.apache.tapestry5.internal.grid"/>
+ <package name="org.apache.tapestry5.internal.model"/>
+ <package name="org.apache.tapestry5.internal.pageload"/>
+ <package name="org.apache.tapestry5.internal.services"/>
+ <package name="org.apache.tapestry5.internal.services.assets"/>
+ <package name="org.apache.tapestry5.internal.services.messages"/>
+ <package name="org.apache.tapestry5.internal.services.meta"/>
+ <package name="org.apache.tapestry5.internal.services.templates"/>
+ <package name="org.apache.tapestry5.internal.structure"/>
+ <package name="org.apache.tapestry5.internal.test"/>
+ <package name="org.apache.tapestry5.internal.transform"/>
+ <package name="org.apache.tapestry5.internal.translator"/>
+ <package name="org.apache.tapestry5.internal.util"/>
+ <package name="org.apache.tapestry5.internal.services.ajax"/>
+ </packages>
+ </test>
+
+ <!-- We break these out by which of the test applications they apply to.
We have a bunch. -->
+ <test name="Core Integration Tests" enabled="true">
+ <parameter name="tapestry.web-app-folder" value="src/test/app1"/>
+
+ <packages>
+ <package name="org.apache.tapestry5.integration.app1"/>
+ </packages>
+ </test>
+
+ <test name="Additional Integration Tests" enabled="true">
+ <parameter name="tapestry.web-app-folder" value="src/test/app3"/>
+
+ <packages>
+ <package name="org.apache.tapestry5.integration.app3"/>
+ </packages>
+ </test>
+
+ <test name="Immediate Mode Integration Tests" enabled="true">
+ <parameter name="tapestry.web-app-folder" value="src/test/app4"/>
+
+ <packages>
+ <package name="org.apache.tapestry5.integration.app4"/>
+ </packages>
+ </test>
+
+ <test name="Live Reload Tests" enabled="true">
+ <packages>
+ <package name="org.apache.tapestry5.integration.reload"/>
+ </packages>
+ </test>
+
+ <test name="LinkTransformer Tests" enabled="true">
+ <parameter name="tapestry.web-app-folder" value="src/test/linktrans"/>
+ <packages>
+ <package name="org.apache.tapestry5.integration.linktrans"/>
+ </packages>
+ </test>
+
+ <test name="App Skinning Tests" enabled="true">
+ <parameter name="tapestry.web-app-folder" value="src/test/app5"/>
+ <packages>
+ <package name="org.apache.tapestry5.integration.app5"/>
+ </packages>
+ </test>
+
+ <test name="AppFolder Tests" enabled="true">
+ <parameter name="tapestry.web-app-folder" value="src/test/appfolder"/>
+ <packages>
+ <package name="org.apache.tapestry5.integration.appfolder"/>
+ </packages>
+ </test>
+
+ <test name="PageTester Tests" enabled="true">
+ <packages>
+ <package name="org.apache.tapestry5.integration.pagetester"/>
+ </packages>
+ </test>
</suite>
Added:
tapestry/tapestry5/trunk/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/appfolder/AppFolderTests.groovy
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/appfolder/AppFolderTests.groovy?rev=1164209&view=auto
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/appfolder/AppFolderTests.groovy
(added)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/appfolder/AppFolderTests.groovy
Thu Sep 1 19:01:47 2011
@@ -0,0 +1,48 @@
+package org.apache.tapestry5.integration.appfolder
+
+import org.apache.tapestry5.integration.TapestryCoreTestCase
+import org.testng.annotations.Test
+
+class AppFolderTests extends TapestryCoreTestCase
+{
+
+ /**
+ * Tests basic navigation, and also tests ability to place a page template
in the context, under the configured
+ * application folder.
+ */
+ @Test
+ void page_navigation()
+ {
+ openLinks "t5app/"
+
+ assertTitle "Index Page"
+
+ clickAndWait "link=context template demo"
+
+ assertTitle "Context Template"
+
+ clickAndWait "link=back to index"
+
+ assertTitle "Index Page"
+ }
+
+ @Test
+ void component_event_request()
+ {
+ openLinks "t5app/", "show index page alert"
+
+ assertText "css=div.t-message-container", "index page alert"
+ }
+
+ @Test
+ void static_pages()
+ {
+ openLinks "static.html"
+
+ assertTitle "Static File"
+
+ clickAndWait "link=to Tapestry application"
+
+ assertTitle "Index Page"
+ }
+}
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry5/integration/appfolder/pages/Index.tml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry5/integration/appfolder/pages/Index.tml?rev=1164209&r1=1164208&r2=1164209&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry5/integration/appfolder/pages/Index.tml
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/test/resources/org/apache/tapestry5/integration/appfolder/pages/Index.tml
Thu Sep 1 19:01:47 2011
@@ -1,4 +1,8 @@
<html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_3.xsd";>
+<head>
+ <title>Index Page</title>
+</head>
+<body>
<h1>App Folder Demo Application</h1>
@@ -15,5 +19,5 @@
<p>
<t:actionlink t:id="showAlert">show index page alert</t:actionlink>
</p>
-
+</body>
</html>
