You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by ul...@apache.org on 2010/03/01 14:11:20 UTC
svn commit: r917509 - in /tapestry/tapestry5/trunk/tapestry-core/src/test:
conf/testng.xml java/org/apache/tapestry5/urlrewriter/IntegrationTests.java
Author: uli
Date: Mon Mar 1 13:11:19 2010
New Revision: 917509
URL: http://svn.apache.org/viewvc?rev=917509&view=rev
Log:
TAP5-1037: Rewrite URLRewriter integration tests to use new SeleniumTestCase instead of deprecated AbstractIntegrationTestSuite
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng.xml
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/urlrewriter/IntegrationTests.java
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=917509&r1=917508&r2=917509&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng.xml Mon Mar 1 13:11:19 2010
@@ -22,6 +22,7 @@
<package name="org.apache.tapestry5.corelib.internal"/>
</packages>
</test>
+
<test name="Service Unit Tests" enabled="true">
<packages>
<package name="org.apache.tapestry5.root"/>
@@ -29,7 +30,6 @@
<package name="org.apache.tapestry5.json"/>
<package name="org.apache.tapestry5.runtime"/>
<package name="org.apache.tapestry5.services"/>
- <package name="org.apache.tapestry5.urlrewriter"/>
<package name="org.apache.tapestry5.util"/>
<package name="org.apache.tapestry5.validator"/>
<package name="org.apache.tapestry5.internal"/>
@@ -47,9 +47,11 @@
<package name="org.apache.tapestry5.internal.services.javascript"/>
</packages>
</test>
- <!-- We break these out by which of the test applications they apply to. We have a bunch. -->
+
+<!-- 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>
@@ -57,9 +59,10 @@
<class name="org.apache.tapestry5.test.SeleniumLauncher"/>
</classes>
</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>
@@ -67,6 +70,7 @@
<class name="org.apache.tapestry5.test.SeleniumLauncher"/>
</classes>
</test>
+
<test name="Immediate Mode Integration Tests" enabled="true">
<parameter name="tapestry.web-app-folder" value="src/test/app4"/>
@@ -78,8 +82,20 @@
</classes>
</test>
+ <test name="URL Rewriter Tests" enabled="true">
+ <parameter name="tapestry.web-app-folder" value="src/test/app5"/>
+
+ <packages>
+ <package name="org.apache.tapestry5.urlrewriter"/>
+ </packages>
+ <classes>
+ <class name="org.apache.tapestry5.test.SeleniumLauncher"/>
+ </classes>
+ </test>
+
<test name="Custom App Package Tests" enabled="true">
<parameter name="tapestry.web-app-folder" value="src/test/app6"/>
+
<packages>
<package name="org.apache.tapestry5.integration.app6"/>
</packages>
@@ -93,6 +109,7 @@
<package name="org.apache.tapestry5.integration.reload"/>
</packages>
</test>
+
<test name="PageTester Tests" enabled="true">
<packages>
<package name="org.apache.tapestry5.integration.pagetester"/>
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/urlrewriter/IntegrationTests.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/urlrewriter/IntegrationTests.java?rev=917509&r1=917508&r2=917509&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/urlrewriter/IntegrationTests.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/urlrewriter/IntegrationTests.java Mon Mar 1 13:11:19 2010
@@ -13,7 +13,7 @@
// limitations under the License.
package org.apache.tapestry5.urlrewriter;
-import org.apache.tapestry5.test.AbstractIntegrationTestSuite;
+import org.apache.tapestry5.integration.TapestryCoreTestCase;
import org.testng.annotations.Test;
/**
@@ -24,7 +24,7 @@
* order to work.
*/
@Test(timeOut = 30000, sequential = true)
-public class IntegrationTests extends AbstractIntegrationTestSuite
+public class IntegrationTests extends TapestryCoreTestCase
{
final public static String DOMAIN = "somenicedomain.com";
@@ -32,16 +32,11 @@
final public static String SUBDOMAIN = LOGIN + "." + DOMAIN;
- public IntegrationTests()
- {
- super("src/test/app5", DEFAULT_WEB_BROWSER_COMMAND, SUBDOMAIN, DOMAIN, "localhost");
- }
-
@Test
public void test_link_rewriting_without_virtual_host()
{
- open(BASE_URL);
+ openBaseURL();
assertAttribute("//a[@class='self']/@href", "/");
assertAttribute("//a[@class='dummy']/@href", "/notdummy");
Re: svn commit: r917509 - in /tapestry/tapestry5/trunk/tapestry-core/src/test:
conf/testng.xml java/org/apache/tapestry5/urlrewriter/IntegrationTests.java
Posted by Ulrich Stärk <ul...@spielviel.de>.
Funny, that test wasn't failing on my machine... Did I forget to do an
svn up?
Howard Lewis Ship schrieb:
> just checked in a fix
>
>
> On Mon, Mar 1, 2010 at 12:59 PM, Igor Drobiazko
> <ig...@gmail.com> wrote:
>> The build is still broken. The url rewriter test is failing.
>>
>> On Mon, Mar 1, 2010 at 8:50 PM, Howard Lewis Ship <hl...@gmail.com> wrote:
>>
>>> Thanks!
>>>
>>> On Mon, Mar 1, 2010 at 5:11 AM, <ul...@apache.org> wrote:
>>>> Author: uli
>>>> Date: Mon Mar 1 13:11:19 2010
>>>> New Revision: 917509
>>>>
>>>> URL: http://svn.apache.org/viewvc?rev=917509&view=rev
>>>> Log:
>>>> TAP5-1037: Rewrite URLRewriter integration tests to use new
>>> SeleniumTestCase instead of deprecated AbstractIntegrationTestSuite
>>>> Modified:
>>>> tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng.xml
>>>>
>>> tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/urlrewriter/IntegrationTests.java
>>>> 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=917509&r1=917508&r2=917509&view=diff
>>> ==============================================================================
>>>> --- tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng.xml
>>> (original)
>>>> +++ tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng.xml Mon
>>> Mar 1 13:11:19 2010
>>>> @@ -22,6 +22,7 @@
>>>> <package name="org.apache.tapestry5.corelib.internal"/>
>>>> </packages>
>>>> </test>
>>>> +
>>>> <test name="Service Unit Tests" enabled="true">
>>>> <packages>
>>>> <package name="org.apache.tapestry5.root"/>
>>>> @@ -29,7 +30,6 @@
>>>> <package name="org.apache.tapestry5.json"/>
>>>> <package name="org.apache.tapestry5.runtime"/>
>>>> <package name="org.apache.tapestry5.services"/>
>>>> - <package name="org.apache.tapestry5.urlrewriter"/>
>>>> <package name="org.apache.tapestry5.util"/>
>>>> <package name="org.apache.tapestry5.validator"/>
>>>> <package name="org.apache.tapestry5.internal"/>
>>>> @@ -47,9 +47,11 @@
>>>> <package name="org.apache.tapestry5.internal.services.javascript"/>
>>>> </packages>
>>>> </test>
>>>> - <!-- We break these out by which of the test applications they apply
>>> to. We have a bunch. -->
>>>> +
>>>> +<!-- 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>
>>>> @@ -57,9 +59,10 @@
>>>> <class name="org.apache.tapestry5.test.SeleniumLauncher"/>
>>>> </classes>
>>>> </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>
>>>> @@ -67,6 +70,7 @@
>>>> <class name="org.apache.tapestry5.test.SeleniumLauncher"/>
>>>> </classes>
>>>> </test>
>>>> +
>>>> <test name="Immediate Mode Integration Tests" enabled="true">
>>>> <parameter name="tapestry.web-app-folder" value="src/test/app4"/>
>>>>
>>>> @@ -78,8 +82,20 @@
>>>> </classes>
>>>> </test>
>>>>
>>>> + <test name="URL Rewriter Tests" enabled="true">
>>>> + <parameter name="tapestry.web-app-folder" value="src/test/app5"/>
>>>> +
>>>> + <packages>
>>>> + <package name="org.apache.tapestry5.urlrewriter"/>
>>>> + </packages>
>>>> + <classes>
>>>> + <class name="org.apache.tapestry5.test.SeleniumLauncher"/>
>>>> + </classes>
>>>> + </test>
>>>> +
>>>> <test name="Custom App Package Tests" enabled="true">
>>>> <parameter name="tapestry.web-app-folder" value="src/test/app6"/>
>>>> +
>>>> <packages>
>>>> <package name="org.apache.tapestry5.integration.app6"/>
>>>> </packages>
>>>> @@ -93,6 +109,7 @@
>>>> <package name="org.apache.tapestry5.integration.reload"/>
>>>> </packages>
>>>> </test>
>>>> +
>>>> <test name="PageTester Tests" enabled="true">
>>>> <packages>
>>>> <package name="org.apache.tapestry5.integration.pagetester"/>
>>>>
>>>> Modified:
>>> tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/urlrewriter/IntegrationTests.java
>>>> URL:
>>> http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/urlrewriter/IntegrationTests.java?rev=917509&r1=917508&r2=917509&view=diff
>>> ==============================================================================
>>>> ---
>>> tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/urlrewriter/IntegrationTests.java
>>> (original)
>>>> +++
>>> tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/urlrewriter/IntegrationTests.java
>>> Mon Mar 1 13:11:19 2010
>>>> @@ -13,7 +13,7 @@
>>>> // limitations under the License.
>>>> package org.apache.tapestry5.urlrewriter;
>>>>
>>>> -import org.apache.tapestry5.test.AbstractIntegrationTestSuite;
>>>> +import org.apache.tapestry5.integration.TapestryCoreTestCase;
>>>> import org.testng.annotations.Test;
>>>>
>>>> /**
>>>> @@ -24,7 +24,7 @@
>>>> * order to work.
>>>> */
>>>> @Test(timeOut = 30000, sequential = true)
>>>> -public class IntegrationTests extends AbstractIntegrationTestSuite
>>>> +public class IntegrationTests extends TapestryCoreTestCase
>>>> {
>>>> final public static String DOMAIN = "somenicedomain.com";
>>>>
>>>> @@ -32,16 +32,11 @@
>>>>
>>>> final public static String SUBDOMAIN = LOGIN + "." + DOMAIN;
>>>>
>>>> - public IntegrationTests()
>>>> - {
>>>> - super("src/test/app5", DEFAULT_WEB_BROWSER_COMMAND, SUBDOMAIN,
>>> DOMAIN, "localhost");
>>>> - }
>>>> -
>>>> @Test
>>>> public void test_link_rewriting_without_virtual_host()
>>>> {
>>>>
>>>> - open(BASE_URL);
>>>> + openBaseURL();
>>>> assertAttribute("//a[@class='self']/@href", "/");
>>>> assertAttribute("//a[@class='dummy']/@href", "/notdummy");
>>>>
>>>>
>>>>
>>>>
>>>
>>>
>>> --
>>> Howard M. Lewis Ship
>>>
>>> Creator of Apache Tapestry
>>>
>>> The source for Tapestry training, mentoring and support. Contact me to
>>> learn how I can get you up and productive in Tapestry fast!
>>>
>>> (971) 678-5210
>>> http://howardlewisship.com
>>>
>>> ---------------------------------------------------------------------
>>> To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
>>> For additional commands, e-mail: dev-help@tapestry.apache.org
>>>
>>>
>>
>> --
>> Best regards,
>>
>> Igor Drobiazko
>> http://tapestry5.de/blog
>>
>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
For additional commands, e-mail: dev-help@tapestry.apache.org
Re: svn commit: r917509 - in /tapestry/tapestry5/trunk/tapestry-core/src/test:
conf/testng.xml java/org/apache/tapestry5/urlrewriter/IntegrationTests.java
Posted by Howard Lewis Ship <hl...@gmail.com>.
just checked in a fix
On Mon, Mar 1, 2010 at 12:59 PM, Igor Drobiazko
<ig...@gmail.com> wrote:
> The build is still broken. The url rewriter test is failing.
>
> On Mon, Mar 1, 2010 at 8:50 PM, Howard Lewis Ship <hl...@gmail.com> wrote:
>
>> Thanks!
>>
>> On Mon, Mar 1, 2010 at 5:11 AM, <ul...@apache.org> wrote:
>> > Author: uli
>> > Date: Mon Mar 1 13:11:19 2010
>> > New Revision: 917509
>> >
>> > URL: http://svn.apache.org/viewvc?rev=917509&view=rev
>> > Log:
>> > TAP5-1037: Rewrite URLRewriter integration tests to use new
>> SeleniumTestCase instead of deprecated AbstractIntegrationTestSuite
>> >
>> > Modified:
>> > tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng.xml
>> >
>> tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/urlrewriter/IntegrationTests.java
>> >
>> > 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=917509&r1=917508&r2=917509&view=diff
>> >
>> ==============================================================================
>> > --- tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng.xml
>> (original)
>> > +++ tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng.xml Mon
>> Mar 1 13:11:19 2010
>> > @@ -22,6 +22,7 @@
>> > <package name="org.apache.tapestry5.corelib.internal"/>
>> > </packages>
>> > </test>
>> > +
>> > <test name="Service Unit Tests" enabled="true">
>> > <packages>
>> > <package name="org.apache.tapestry5.root"/>
>> > @@ -29,7 +30,6 @@
>> > <package name="org.apache.tapestry5.json"/>
>> > <package name="org.apache.tapestry5.runtime"/>
>> > <package name="org.apache.tapestry5.services"/>
>> > - <package name="org.apache.tapestry5.urlrewriter"/>
>> > <package name="org.apache.tapestry5.util"/>
>> > <package name="org.apache.tapestry5.validator"/>
>> > <package name="org.apache.tapestry5.internal"/>
>> > @@ -47,9 +47,11 @@
>> > <package name="org.apache.tapestry5.internal.services.javascript"/>
>> > </packages>
>> > </test>
>> > - <!-- We break these out by which of the test applications they apply
>> to. We have a bunch. -->
>> > +
>> > +<!-- 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>
>> > @@ -57,9 +59,10 @@
>> > <class name="org.apache.tapestry5.test.SeleniumLauncher"/>
>> > </classes>
>> > </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>
>> > @@ -67,6 +70,7 @@
>> > <class name="org.apache.tapestry5.test.SeleniumLauncher"/>
>> > </classes>
>> > </test>
>> > +
>> > <test name="Immediate Mode Integration Tests" enabled="true">
>> > <parameter name="tapestry.web-app-folder" value="src/test/app4"/>
>> >
>> > @@ -78,8 +82,20 @@
>> > </classes>
>> > </test>
>> >
>> > + <test name="URL Rewriter Tests" enabled="true">
>> > + <parameter name="tapestry.web-app-folder" value="src/test/app5"/>
>> > +
>> > + <packages>
>> > + <package name="org.apache.tapestry5.urlrewriter"/>
>> > + </packages>
>> > + <classes>
>> > + <class name="org.apache.tapestry5.test.SeleniumLauncher"/>
>> > + </classes>
>> > + </test>
>> > +
>> > <test name="Custom App Package Tests" enabled="true">
>> > <parameter name="tapestry.web-app-folder" value="src/test/app6"/>
>> > +
>> > <packages>
>> > <package name="org.apache.tapestry5.integration.app6"/>
>> > </packages>
>> > @@ -93,6 +109,7 @@
>> > <package name="org.apache.tapestry5.integration.reload"/>
>> > </packages>
>> > </test>
>> > +
>> > <test name="PageTester Tests" enabled="true">
>> > <packages>
>> > <package name="org.apache.tapestry5.integration.pagetester"/>
>> >
>> > Modified:
>> tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/urlrewriter/IntegrationTests.java
>> > URL:
>> http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/urlrewriter/IntegrationTests.java?rev=917509&r1=917508&r2=917509&view=diff
>> >
>> ==============================================================================
>> > ---
>> tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/urlrewriter/IntegrationTests.java
>> (original)
>> > +++
>> tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/urlrewriter/IntegrationTests.java
>> Mon Mar 1 13:11:19 2010
>> > @@ -13,7 +13,7 @@
>> > // limitations under the License.
>> > package org.apache.tapestry5.urlrewriter;
>> >
>> > -import org.apache.tapestry5.test.AbstractIntegrationTestSuite;
>> > +import org.apache.tapestry5.integration.TapestryCoreTestCase;
>> > import org.testng.annotations.Test;
>> >
>> > /**
>> > @@ -24,7 +24,7 @@
>> > * order to work.
>> > */
>> > @Test(timeOut = 30000, sequential = true)
>> > -public class IntegrationTests extends AbstractIntegrationTestSuite
>> > +public class IntegrationTests extends TapestryCoreTestCase
>> > {
>> > final public static String DOMAIN = "somenicedomain.com";
>> >
>> > @@ -32,16 +32,11 @@
>> >
>> > final public static String SUBDOMAIN = LOGIN + "." + DOMAIN;
>> >
>> > - public IntegrationTests()
>> > - {
>> > - super("src/test/app5", DEFAULT_WEB_BROWSER_COMMAND, SUBDOMAIN,
>> DOMAIN, "localhost");
>> > - }
>> > -
>> > @Test
>> > public void test_link_rewriting_without_virtual_host()
>> > {
>> >
>> > - open(BASE_URL);
>> > + openBaseURL();
>> > assertAttribute("//a[@class='self']/@href", "/");
>> > assertAttribute("//a[@class='dummy']/@href", "/notdummy");
>> >
>> >
>> >
>> >
>>
>>
>>
>> --
>> Howard M. Lewis Ship
>>
>> Creator of Apache Tapestry
>>
>> The source for Tapestry training, mentoring and support. Contact me to
>> learn how I can get you up and productive in Tapestry fast!
>>
>> (971) 678-5210
>> http://howardlewisship.com
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
>> For additional commands, e-mail: dev-help@tapestry.apache.org
>>
>>
>
>
> --
> Best regards,
>
> Igor Drobiazko
> http://tapestry5.de/blog
>
--
Howard M. Lewis Ship
Creator of Apache Tapestry
The source for Tapestry training, mentoring and support. Contact me to
learn how I can get you up and productive in Tapestry fast!
(971) 678-5210
http://howardlewisship.com
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
For additional commands, e-mail: dev-help@tapestry.apache.org
Re: svn commit: r917509 - in /tapestry/tapestry5/trunk/tapestry-core/src/test:
conf/testng.xml java/org/apache/tapestry5/urlrewriter/IntegrationTests.java
Posted by Igor Drobiazko <ig...@gmail.com>.
The build is still broken. The url rewriter test is failing.
On Mon, Mar 1, 2010 at 8:50 PM, Howard Lewis Ship <hl...@gmail.com> wrote:
> Thanks!
>
> On Mon, Mar 1, 2010 at 5:11 AM, <ul...@apache.org> wrote:
> > Author: uli
> > Date: Mon Mar 1 13:11:19 2010
> > New Revision: 917509
> >
> > URL: http://svn.apache.org/viewvc?rev=917509&view=rev
> > Log:
> > TAP5-1037: Rewrite URLRewriter integration tests to use new
> SeleniumTestCase instead of deprecated AbstractIntegrationTestSuite
> >
> > Modified:
> > tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng.xml
> >
> tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/urlrewriter/IntegrationTests.java
> >
> > 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=917509&r1=917508&r2=917509&view=diff
> >
> ==============================================================================
> > --- tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng.xml
> (original)
> > +++ tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng.xml Mon
> Mar 1 13:11:19 2010
> > @@ -22,6 +22,7 @@
> > <package name="org.apache.tapestry5.corelib.internal"/>
> > </packages>
> > </test>
> > +
> > <test name="Service Unit Tests" enabled="true">
> > <packages>
> > <package name="org.apache.tapestry5.root"/>
> > @@ -29,7 +30,6 @@
> > <package name="org.apache.tapestry5.json"/>
> > <package name="org.apache.tapestry5.runtime"/>
> > <package name="org.apache.tapestry5.services"/>
> > - <package name="org.apache.tapestry5.urlrewriter"/>
> > <package name="org.apache.tapestry5.util"/>
> > <package name="org.apache.tapestry5.validator"/>
> > <package name="org.apache.tapestry5.internal"/>
> > @@ -47,9 +47,11 @@
> > <package name="org.apache.tapestry5.internal.services.javascript"/>
> > </packages>
> > </test>
> > - <!-- We break these out by which of the test applications they apply
> to. We have a bunch. -->
> > +
> > +<!-- 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>
> > @@ -57,9 +59,10 @@
> > <class name="org.apache.tapestry5.test.SeleniumLauncher"/>
> > </classes>
> > </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>
> > @@ -67,6 +70,7 @@
> > <class name="org.apache.tapestry5.test.SeleniumLauncher"/>
> > </classes>
> > </test>
> > +
> > <test name="Immediate Mode Integration Tests" enabled="true">
> > <parameter name="tapestry.web-app-folder" value="src/test/app4"/>
> >
> > @@ -78,8 +82,20 @@
> > </classes>
> > </test>
> >
> > + <test name="URL Rewriter Tests" enabled="true">
> > + <parameter name="tapestry.web-app-folder" value="src/test/app5"/>
> > +
> > + <packages>
> > + <package name="org.apache.tapestry5.urlrewriter"/>
> > + </packages>
> > + <classes>
> > + <class name="org.apache.tapestry5.test.SeleniumLauncher"/>
> > + </classes>
> > + </test>
> > +
> > <test name="Custom App Package Tests" enabled="true">
> > <parameter name="tapestry.web-app-folder" value="src/test/app6"/>
> > +
> > <packages>
> > <package name="org.apache.tapestry5.integration.app6"/>
> > </packages>
> > @@ -93,6 +109,7 @@
> > <package name="org.apache.tapestry5.integration.reload"/>
> > </packages>
> > </test>
> > +
> > <test name="PageTester Tests" enabled="true">
> > <packages>
> > <package name="org.apache.tapestry5.integration.pagetester"/>
> >
> > Modified:
> tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/urlrewriter/IntegrationTests.java
> > URL:
> http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/urlrewriter/IntegrationTests.java?rev=917509&r1=917508&r2=917509&view=diff
> >
> ==============================================================================
> > ---
> tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/urlrewriter/IntegrationTests.java
> (original)
> > +++
> tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/urlrewriter/IntegrationTests.java
> Mon Mar 1 13:11:19 2010
> > @@ -13,7 +13,7 @@
> > // limitations under the License.
> > package org.apache.tapestry5.urlrewriter;
> >
> > -import org.apache.tapestry5.test.AbstractIntegrationTestSuite;
> > +import org.apache.tapestry5.integration.TapestryCoreTestCase;
> > import org.testng.annotations.Test;
> >
> > /**
> > @@ -24,7 +24,7 @@
> > * order to work.
> > */
> > @Test(timeOut = 30000, sequential = true)
> > -public class IntegrationTests extends AbstractIntegrationTestSuite
> > +public class IntegrationTests extends TapestryCoreTestCase
> > {
> > final public static String DOMAIN = "somenicedomain.com";
> >
> > @@ -32,16 +32,11 @@
> >
> > final public static String SUBDOMAIN = LOGIN + "." + DOMAIN;
> >
> > - public IntegrationTests()
> > - {
> > - super("src/test/app5", DEFAULT_WEB_BROWSER_COMMAND, SUBDOMAIN,
> DOMAIN, "localhost");
> > - }
> > -
> > @Test
> > public void test_link_rewriting_without_virtual_host()
> > {
> >
> > - open(BASE_URL);
> > + openBaseURL();
> > assertAttribute("//a[@class='self']/@href", "/");
> > assertAttribute("//a[@class='dummy']/@href", "/notdummy");
> >
> >
> >
> >
>
>
>
> --
> Howard M. Lewis Ship
>
> Creator of Apache Tapestry
>
> The source for Tapestry training, mentoring and support. Contact me to
> learn how I can get you up and productive in Tapestry fast!
>
> (971) 678-5210
> http://howardlewisship.com
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
> For additional commands, e-mail: dev-help@tapestry.apache.org
>
>
--
Best regards,
Igor Drobiazko
http://tapestry5.de/blog
Re: svn commit: r917509 - in /tapestry/tapestry5/trunk/tapestry-core/src/test:
conf/testng.xml java/org/apache/tapestry5/urlrewriter/IntegrationTests.java
Posted by Howard Lewis Ship <hl...@gmail.com>.
Thanks!
On Mon, Mar 1, 2010 at 5:11 AM, <ul...@apache.org> wrote:
> Author: uli
> Date: Mon Mar 1 13:11:19 2010
> New Revision: 917509
>
> URL: http://svn.apache.org/viewvc?rev=917509&view=rev
> Log:
> TAP5-1037: Rewrite URLRewriter integration tests to use new SeleniumTestCase instead of deprecated AbstractIntegrationTestSuite
>
> Modified:
> tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng.xml
> tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/urlrewriter/IntegrationTests.java
>
> 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=917509&r1=917508&r2=917509&view=diff
> ==============================================================================
> --- tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng.xml (original)
> +++ tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng.xml Mon Mar 1 13:11:19 2010
> @@ -22,6 +22,7 @@
> <package name="org.apache.tapestry5.corelib.internal"/>
> </packages>
> </test>
> +
> <test name="Service Unit Tests" enabled="true">
> <packages>
> <package name="org.apache.tapestry5.root"/>
> @@ -29,7 +30,6 @@
> <package name="org.apache.tapestry5.json"/>
> <package name="org.apache.tapestry5.runtime"/>
> <package name="org.apache.tapestry5.services"/>
> - <package name="org.apache.tapestry5.urlrewriter"/>
> <package name="org.apache.tapestry5.util"/>
> <package name="org.apache.tapestry5.validator"/>
> <package name="org.apache.tapestry5.internal"/>
> @@ -47,9 +47,11 @@
> <package name="org.apache.tapestry5.internal.services.javascript"/>
> </packages>
> </test>
> - <!-- We break these out by which of the test applications they apply to. We have a bunch. -->
> +
> +<!-- 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>
> @@ -57,9 +59,10 @@
> <class name="org.apache.tapestry5.test.SeleniumLauncher"/>
> </classes>
> </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>
> @@ -67,6 +70,7 @@
> <class name="org.apache.tapestry5.test.SeleniumLauncher"/>
> </classes>
> </test>
> +
> <test name="Immediate Mode Integration Tests" enabled="true">
> <parameter name="tapestry.web-app-folder" value="src/test/app4"/>
>
> @@ -78,8 +82,20 @@
> </classes>
> </test>
>
> + <test name="URL Rewriter Tests" enabled="true">
> + <parameter name="tapestry.web-app-folder" value="src/test/app5"/>
> +
> + <packages>
> + <package name="org.apache.tapestry5.urlrewriter"/>
> + </packages>
> + <classes>
> + <class name="org.apache.tapestry5.test.SeleniumLauncher"/>
> + </classes>
> + </test>
> +
> <test name="Custom App Package Tests" enabled="true">
> <parameter name="tapestry.web-app-folder" value="src/test/app6"/>
> +
> <packages>
> <package name="org.apache.tapestry5.integration.app6"/>
> </packages>
> @@ -93,6 +109,7 @@
> <package name="org.apache.tapestry5.integration.reload"/>
> </packages>
> </test>
> +
> <test name="PageTester Tests" enabled="true">
> <packages>
> <package name="org.apache.tapestry5.integration.pagetester"/>
>
> Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/urlrewriter/IntegrationTests.java
> URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/urlrewriter/IntegrationTests.java?rev=917509&r1=917508&r2=917509&view=diff
> ==============================================================================
> --- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/urlrewriter/IntegrationTests.java (original)
> +++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/urlrewriter/IntegrationTests.java Mon Mar 1 13:11:19 2010
> @@ -13,7 +13,7 @@
> // limitations under the License.
> package org.apache.tapestry5.urlrewriter;
>
> -import org.apache.tapestry5.test.AbstractIntegrationTestSuite;
> +import org.apache.tapestry5.integration.TapestryCoreTestCase;
> import org.testng.annotations.Test;
>
> /**
> @@ -24,7 +24,7 @@
> * order to work.
> */
> @Test(timeOut = 30000, sequential = true)
> -public class IntegrationTests extends AbstractIntegrationTestSuite
> +public class IntegrationTests extends TapestryCoreTestCase
> {
> final public static String DOMAIN = "somenicedomain.com";
>
> @@ -32,16 +32,11 @@
>
> final public static String SUBDOMAIN = LOGIN + "." + DOMAIN;
>
> - public IntegrationTests()
> - {
> - super("src/test/app5", DEFAULT_WEB_BROWSER_COMMAND, SUBDOMAIN, DOMAIN, "localhost");
> - }
> -
> @Test
> public void test_link_rewriting_without_virtual_host()
> {
>
> - open(BASE_URL);
> + openBaseURL();
> assertAttribute("//a[@class='self']/@href", "/");
> assertAttribute("//a[@class='dummy']/@href", "/notdummy");
>
>
>
>
--
Howard M. Lewis Ship
Creator of Apache Tapestry
The source for Tapestry training, mentoring and support. Contact me to
learn how I can get you up and productive in Tapestry fast!
(971) 678-5210
http://howardlewisship.com
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
For additional commands, e-mail: dev-help@tapestry.apache.org