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 2013/11/04 19:05:31 UTC
[1/2] git commit: Add additional logging when shutting down test
infrastructure
Updated Branches:
refs/heads/master d11b50bc3 -> c1c2d0bbe
Add additional logging when shutting down test infrastructure
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/f5daf487
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/f5daf487
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/f5daf487
Branch: refs/heads/master
Commit: f5daf4879f668a54f1b58c0eeb1c4c598f9949e8
Parents: d11b50b
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Mon Nov 4 10:03:41 2013 -0800
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Mon Nov 4 10:04:08 2013 -0800
----------------------------------------------------------------------
.../java/org/apache/tapestry5/test/SeleniumTestCase.java | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/f5daf487/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java
----------------------------------------------------------------------
diff --git a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java
index fa748cb..c2b6232 100644
--- a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java
+++ b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java
@@ -221,8 +221,16 @@ public abstract class SeleniumTestCase extends Assert implements Selenium
{
try
{
+ System.err.println("Shutting down selenium client ...");
+
selenium.stop();
+
+ System.err.println("Shutting down selenium server ...");
+
seleniumServer.stop();
+
+ System.err.println("Shutting web server ...");
+
stopWebServer.run();
// Output, at the end of the Test, any html capture or screen shots (this makes it much easier
@@ -272,6 +280,7 @@ public abstract class SeleniumTestCase extends Assert implements Selenium
if (r != null)
{
+ System.err.println("Shutting down integration tests ...");
r.run();
}
}
[2/2] git commit: Turn off unwanted overrides of the browser to Chrome
Posted by hl...@apache.org.
Turn off unwanted overrides of the browser to Chrome
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/c1c2d0bb
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/c1c2d0bb
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/c1c2d0bb
Branch: refs/heads/master
Commit: c1c2d0bbe1d9ace80085993e9fd2ac08209e153f
Parents: f5daf48
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Mon Nov 4 10:05:23 2013 -0800
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Mon Nov 4 10:05:23 2013 -0800
----------------------------------------------------------------------
.../integration/app1/ModuleConfigurationCallbackTests.groovy | 4 ++--
.../java/org/apache/tapestry5/integration/app1/App1TestCase.java | 2 +-
.../org/apache/tapestry5/integration/app1/BeanEditorTests.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/c1c2d0bb/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/ModuleConfigurationCallbackTests.groovy
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/ModuleConfigurationCallbackTests.groovy b/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/ModuleConfigurationCallbackTests.groovy
index fbe9cdb..c305d71 100644
--- a/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/ModuleConfigurationCallbackTests.groovy
+++ b/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/ModuleConfigurationCallbackTests.groovy
@@ -14,10 +14,10 @@
package org.apache.tapestry5.integration.app1
-import org.apache.tapestry5.test.TapestryTestConfiguration;
+import org.apache.tapestry5.test.TapestryTestConfiguration
import org.testng.annotations.Test
-@TapestryTestConfiguration(webAppFolder = "src/test/app1", browserStartCommand="*googlechrome")
+@TapestryTestConfiguration(webAppFolder = "src/test/app1")
class ModuleConfigurationCallbackTests extends App1TestCase {
@Test
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/c1c2d0bb/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/App1TestCase.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/App1TestCase.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/App1TestCase.java
index 633b657..6ca5457 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/App1TestCase.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/App1TestCase.java
@@ -7,7 +7,7 @@ import org.apache.tapestry5.test.TapestryTestConfiguration;
* Base class for tests that use the src/test/app1 application; this makes it possible
* to run the test class directly, as it will have the correct configuration.
*/
-@TapestryTestConfiguration(webAppFolder = "src/test/app1", browserStartCommand = "*googlechrome")
+@TapestryTestConfiguration(webAppFolder = "src/test/app1")
public abstract class App1TestCase extends TapestryCoreTestCase
{
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/c1c2d0bb/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/BeanEditorTests.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/BeanEditorTests.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/BeanEditorTests.java
index 3dd1e69..b926736 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/BeanEditorTests.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/BeanEditorTests.java
@@ -24,7 +24,7 @@ import org.testng.annotations.Test;
* Tests for the {@link BeanEditor} component, often embedded inside
* a {@link BeanEditForm} component.
*/
-@TapestryTestConfiguration(webAppFolder = "src/test/app1", browserStartCommand = "*googlechrome")
+@TapestryTestConfiguration(webAppFolder = "src/test/app1")
@Test
public class BeanEditorTests extends App1TestCase
{
[2/2] git commit: Turn off unwanted overrides of the browser to Chrome
Posted by hl...@apache.org.
Turn off unwanted overrides of the browser to Chrome
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/c1c2d0bb
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/c1c2d0bb
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/c1c2d0bb
Branch: refs/heads/master
Commit: c1c2d0bbe1d9ace80085993e9fd2ac08209e153f
Parents: f5daf48
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Mon Nov 4 10:05:23 2013 -0800
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Mon Nov 4 10:05:23 2013 -0800
----------------------------------------------------------------------
.../integration/app1/ModuleConfigurationCallbackTests.groovy | 4 ++--
.../java/org/apache/tapestry5/integration/app1/App1TestCase.java | 2 +-
.../org/apache/tapestry5/integration/app1/BeanEditorTests.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/c1c2d0bb/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/ModuleConfigurationCallbackTests.groovy
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/ModuleConfigurationCallbackTests.groovy b/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/ModuleConfigurationCallbackTests.groovy
index fbe9cdb..c305d71 100644
--- a/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/ModuleConfigurationCallbackTests.groovy
+++ b/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/app1/ModuleConfigurationCallbackTests.groovy
@@ -14,10 +14,10 @@
package org.apache.tapestry5.integration.app1
-import org.apache.tapestry5.test.TapestryTestConfiguration;
+import org.apache.tapestry5.test.TapestryTestConfiguration
import org.testng.annotations.Test
-@TapestryTestConfiguration(webAppFolder = "src/test/app1", browserStartCommand="*googlechrome")
+@TapestryTestConfiguration(webAppFolder = "src/test/app1")
class ModuleConfigurationCallbackTests extends App1TestCase {
@Test
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/c1c2d0bb/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/App1TestCase.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/App1TestCase.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/App1TestCase.java
index 633b657..6ca5457 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/App1TestCase.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/App1TestCase.java
@@ -7,7 +7,7 @@ import org.apache.tapestry5.test.TapestryTestConfiguration;
* Base class for tests that use the src/test/app1 application; this makes it possible
* to run the test class directly, as it will have the correct configuration.
*/
-@TapestryTestConfiguration(webAppFolder = "src/test/app1", browserStartCommand = "*googlechrome")
+@TapestryTestConfiguration(webAppFolder = "src/test/app1")
public abstract class App1TestCase extends TapestryCoreTestCase
{
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/c1c2d0bb/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/BeanEditorTests.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/BeanEditorTests.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/BeanEditorTests.java
index 3dd1e69..b926736 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/BeanEditorTests.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/BeanEditorTests.java
@@ -24,7 +24,7 @@ import org.testng.annotations.Test;
* Tests for the {@link BeanEditor} component, often embedded inside
* a {@link BeanEditForm} component.
*/
-@TapestryTestConfiguration(webAppFolder = "src/test/app1", browserStartCommand = "*googlechrome")
+@TapestryTestConfiguration(webAppFolder = "src/test/app1")
@Test
public class BeanEditorTests extends App1TestCase
{