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 2007/11/29 05:54:51 UTC
svn commit: r599266 - in /tapestry/tapestry5/trunk: ./
tapestry-core/src/test/conf/ tapestry-test/
tapestry-test/src/main/java/org/apache/tapestry/test/ tapestry-tutorial1/
tapestry-tutorial1/src/test/conf/ tapestry-tutorial1/src/test/java/org/
tapestr...
Author: hlship
Date: Wed Nov 28 20:54:46 2007
New Revision: 599266
URL: http://svn.apache.org/viewvc?rev=599266&view=rev
Log:
TAPESTRY-1937: If a single module contains more than one integration test (subclass of AbstractIntegrationTestSuite), then the second one fails
Added:
tapestry/tapestry5/trunk/tapestry-tutorial1/src/test/conf/
tapestry/tapestry5/trunk/tapestry-tutorial1/src/test/conf/testng.xml
tapestry/tapestry5/trunk/tapestry-tutorial1/src/test/java/org/
tapestry/tapestry5/trunk/tapestry-tutorial1/src/test/java/org/apache/
tapestry/tapestry5/trunk/tapestry-tutorial1/src/test/java/org/apache/tapestry/
tapestry/tapestry5/trunk/tapestry-tutorial1/src/test/java/org/apache/tapestry/tutorial/
tapestry/tapestry5/trunk/tapestry-tutorial1/src/test/java/org/apache/tapestry/tutorial/services/
tapestry/tapestry5/trunk/tapestry-tutorial1/src/test/java/org/apache/tapestry/tutorial/services/AppSuite.java
Modified:
tapestry/tapestry5/trunk/pom.xml
tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng.xml
tapestry/tapestry5/trunk/tapestry-test/pom.xml
tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry/test/JettyRunner.java
tapestry/tapestry5/trunk/tapestry-tutorial1/pom.xml
Modified: tapestry/tapestry5/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/pom.xml?rev=599266&r1=599265&r2=599266&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/pom.xml (original)
+++ tapestry/tapestry5/trunk/pom.xml Wed Nov 28 20:54:46 2007
@@ -220,7 +220,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
+ <version>2.4-SNAPSHOT</version>
<configuration>
<suiteXmlFiles>
<suiteXmlFile>src/test/conf/testng.xml</suiteXmlFile>
@@ -364,10 +364,10 @@
<id>tapestry</id>
<url>http://tapestry.formos.com/maven-repository</url>
</pluginRepository>
- <!-- I believe a version of the surefire plugin lives here. -->
+ <!-- Needed to get surefire 2.4-SNAPSHOT -->
<pluginRepository>
- <id>howardlewisship.com</id>
- <url>http://howardlewisship.com/repository</url>
+ <id>apache.snapshots</id>
+ <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
</pluginRepository>
<!-- I believe the Cobertura plugin lives here. -->
<pluginRepository>
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=599266&r1=599265&r2=599266&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/conf/testng.xml Wed Nov 28 20:54:46 2007
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<suite name="Tapestry Core" annotations="1.5" verbose="0">
+<suite name="Tapestry Core" annotations="1.5" verbose="2">
<test name="Integration Tests">
<packages>
<package name="org.apache.tapestry.integration"/>
Modified: tapestry/tapestry5/trunk/tapestry-test/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-test/pom.xml?rev=599266&r1=599265&r2=599266&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-test/pom.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-test/pom.xml Wed Nov 28 20:54:46 2007
@@ -29,7 +29,7 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>5.1</version>
+ <version>5.7</version>
<classifier>jdk15</classifier>
<scope>compile</scope>
</dependency>
Modified: tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry/test/JettyRunner.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry/test/JettyRunner.java?rev=599266&r1=599265&r2=599266&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry/test/JettyRunner.java (original)
+++ tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry/test/JettyRunner.java Wed Nov 28 20:54:46 2007
@@ -71,14 +71,24 @@
*/
public void stop()
{
+ System.out.printf("Stopping Jetty instance on port %d\n", _port);
+
try
{
- _jetty.stop();
+ // Stop immediately and not gracefully.
+ _jetty.stop(false);
+
+ while (_jetty.isStarted())
+ {
+ Thread.sleep(100);
+ }
}
catch (Exception ex)
{
throw new RuntimeException("Error stopping Jetty instance: " + ex.toString(), ex);
}
+
+ System.out.println("Jetty instance has stopped.");
}
@Override
@@ -89,6 +99,8 @@
private Server createAndStart()
{
+ System.out.printf("Starting Jetty instance on port %d (%s mapped to %s)\n", _port, _contextPath, _warPath);
+
try
{
Server server = new Server();
Modified: tapestry/tapestry5/trunk/tapestry-tutorial1/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-tutorial1/pom.xml?rev=599266&r1=599265&r2=599266&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-tutorial1/pom.xml (original)
+++ tapestry/tapestry5/trunk/tapestry-tutorial1/pom.xml Wed Nov 28 20:54:46 2007
@@ -40,6 +40,13 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>2.3</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
<build>
<finalName>tapestry-tutorial1</finalName>
Added: tapestry/tapestry5/trunk/tapestry-tutorial1/src/test/conf/testng.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-tutorial1/src/test/conf/testng.xml?rev=599266&view=auto
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-tutorial1/src/test/conf/testng.xml (added)
+++ tapestry/tapestry5/trunk/tapestry-tutorial1/src/test/conf/testng.xml Wed Nov 28 20:54:46 2007
@@ -0,0 +1,24 @@
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<!--
+ Copyright 2007 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<suite name="Tapestry Tutorial #1" annotations="1.5" verbose="2">
+ <test name="Services">
+ <packages>
+ <package name="org.apache.tapestry.tutorial.services"/>
+ </packages>
+ </test>
+</suite>
Added: tapestry/tapestry5/trunk/tapestry-tutorial1/src/test/java/org/apache/tapestry/tutorial/services/AppSuite.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-tutorial1/src/test/java/org/apache/tapestry/tutorial/services/AppSuite.java?rev=599266&view=auto
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-tutorial1/src/test/java/org/apache/tapestry/tutorial/services/AppSuite.java (added)
+++ tapestry/tapestry5/trunk/tapestry-tutorial1/src/test/java/org/apache/tapestry/tutorial/services/AppSuite.java Wed Nov 28 20:54:46 2007
@@ -0,0 +1,27 @@
+// Copyright 2007 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.apache.tapestry.tutorial.services;
+
+import org.apache.tapestry.ioc.test.TestBase;
+import org.testng.annotations.Test;
+
+public class AppSuite extends TestBase
+{
+ @Test
+ public void alway_pass()
+ {
+ assertEquals(true, true);
+ }
+}