Updated Branches: refs/heads/5.3 e0b1a96d9 -> feee33d73
fix compilation errors due to previous merge from master Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/7b573c70 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/7b573c70 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/7b573c70 Branch: refs/heads/5.3 Commit: 7b573c705f851c489aaa2fe0a5d64cb983f2189b Parents: e0b1a96 Author: Massimo Lusetti <[email protected]> Authored: Tue Apr 23 10:37:07 2013 +0200 Committer: Massimo Lusetti <[email protected]> Committed: Tue Apr 23 10:37:07 2013 +0200 ---------------------------------------------------------------------- .../apache/tapestry5/upload/RunJettyUpload.java | 4 ++-- .../upload/integration/UploadIntegrationTest.java | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/7b573c70/tapestry-upload/src/test/java/org/apache/tapestry5/upload/RunJettyUpload.java ---------------------------------------------------------------------- diff --git a/tapestry-upload/src/test/java/org/apache/tapestry5/upload/RunJettyUpload.java b/tapestry-upload/src/test/java/org/apache/tapestry5/upload/RunJettyUpload.java index 2b7798d..dbef600 100644 --- a/tapestry-upload/src/test/java/org/apache/tapestry5/upload/RunJettyUpload.java +++ b/tapestry-upload/src/test/java/org/apache/tapestry5/upload/RunJettyUpload.java @@ -14,7 +14,7 @@ package org.apache.tapestry5.upload; -import org.apache.tapestry5.test.JettyRunner; +import org.apache.tapestry5.test.Jetty7Runner; import java.io.File; @@ -26,6 +26,6 @@ public class RunJettyUpload new File(workingDir, "target/tmp").mkdirs(); - new JettyRunner(workingDir, "/", 8080, "src/test/webapp"); + new Jetty7Runner("src/test/webapp", "/", 8080, 9999); } } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/7b573c70/tapestry-upload/src/test/java/org/apache/tapestry5/upload/integration/UploadIntegrationTest.java ---------------------------------------------------------------------- diff --git a/tapestry-upload/src/test/java/org/apache/tapestry5/upload/integration/UploadIntegrationTest.java b/tapestry-upload/src/test/java/org/apache/tapestry5/upload/integration/UploadIntegrationTest.java index 8ed9a5c..200188f 100755 --- a/tapestry-upload/src/test/java/org/apache/tapestry5/upload/integration/UploadIntegrationTest.java +++ b/tapestry-upload/src/test/java/org/apache/tapestry5/upload/integration/UploadIntegrationTest.java @@ -14,7 +14,8 @@ package org.apache.tapestry5.upload.integration; -import org.apache.tapestry5.test.AbstractIntegrationTestSuite; +import org.apache.tapestry5.test.SeleniumTestCase; +import org.apache.tapestry5.test.TapestryTestConfiguration; import org.example.upload.pages.Start; import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; @@ -25,7 +26,8 @@ import java.io.IOException; /** * . TODO: These tests wont work because Selenium cannot enter values for input type="file' */ -public class UploadIntegrationTest extends AbstractIntegrationTestSuite +@TapestryTestConfiguration(webAppFolder = "src/test/webapp") +public class UploadIntegrationTest extends SeleniumTestCase { @BeforeTest @@ -48,8 +50,7 @@ public class UploadIntegrationTest extends AbstractIntegrationTestSuite @Test(enabled = false) public void integration_test() throws Exception { - - open(BASE_URL); + openBaseURL(); File source = new File("test/data/upload.txt");
