This is an automated email from the ASF dual-hosted git repository. thiagohp pushed a commit to branch latest-java-tests in repository https://gitbox.apache.org/repos/asf/tapestry-5.git
commit 0a74a83cc927486675a754a4e77184c503163a14 Author: Thiago H. de Paula Figueiredo <[email protected]> AuthorDate: Mon Jan 17 14:54:05 2022 -0300 TAP5-2641: tapestry-test-constants should have its own package --- .../org/apache/tapestry5/internal/test/PageTesterContext.java | 2 +- .../org/apache/tapestry5/integration/TapestryCoreTestCase.java | 2 +- .../java/org/apache/tapestry5/integration/app1/AssetTests.java | 8 -------- .../tapestry5/internal/services/TemplateParserImplTest.java | 2 +- .../src/main/java/org/apache/tapestry5/test/JettyRunner.java | 1 + .../src/main/java/org/apache/tapestry5/test/TomcatRunner.java | 1 + .../tapestry5/test/{ => constants}/TapestryRunnerConstants.java | 2 +- .../src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java | 1 + 8 files changed, 7 insertions(+), 12 deletions(-) diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/PageTesterContext.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/PageTesterContext.java index 0b923de..c957cf2 100644 --- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/PageTesterContext.java +++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/test/PageTesterContext.java @@ -15,7 +15,7 @@ package org.apache.tapestry5.internal.test; import org.apache.tapestry5.http.services.Context; -import org.apache.tapestry5.test.TapestryRunnerConstants; +import org.apache.tapestry5.test.constants.TapestryRunnerConstants; import java.io.File; import java.net.MalformedURLException; diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/TapestryCoreTestCase.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/TapestryCoreTestCase.java index b9f71a9..76658e2 100644 --- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/TapestryCoreTestCase.java +++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/TapestryCoreTestCase.java @@ -24,7 +24,7 @@ import java.nio.file.Files; import org.apache.tapestry5.internal.TapestryInternalUtils; import org.apache.tapestry5.test.SeleniumTestCase; -import org.apache.tapestry5.test.TapestryRunnerConstants; +import org.apache.tapestry5.test.constants.TapestryRunnerConstants; public abstract class TapestryCoreTestCase extends SeleniumTestCase { diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/AssetTests.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/AssetTests.java index 444a83e..06a9245 100644 --- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/AssetTests.java +++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/AssetTests.java @@ -14,17 +14,9 @@ package org.apache.tapestry5.integration.app1; -import org.apache.tapestry5.internal.TapestryInternalUtils; -import org.apache.tapestry5.test.TapestryRunnerConstants; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -import java.io.BufferedInputStream; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.InputStream; -import java.net.URL; - public class AssetTests extends App1TestCase { @DataProvider diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/TemplateParserImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/TemplateParserImplTest.java index 7533167..ce3d014 100644 --- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/TemplateParserImplTest.java +++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/TemplateParserImplTest.java @@ -21,7 +21,7 @@ import org.apache.tapestry5.internal.parser.*; import org.apache.tapestry5.internal.test.InternalBaseTestCase; import org.apache.tapestry5.ioc.internal.util.AbstractResource; import org.apache.tapestry5.ioc.internal.util.ClasspathResource; -import org.apache.tapestry5.test.TapestryRunnerConstants; +import org.apache.tapestry5.test.constants.TapestryRunnerConstants; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; diff --git a/tapestry-runner/src/main/java/org/apache/tapestry5/test/JettyRunner.java b/tapestry-runner/src/main/java/org/apache/tapestry5/test/JettyRunner.java index ba93d07..f6da511 100644 --- a/tapestry-runner/src/main/java/org/apache/tapestry5/test/JettyRunner.java +++ b/tapestry-runner/src/main/java/org/apache/tapestry5/test/JettyRunner.java @@ -15,6 +15,7 @@ package org.apache.tapestry5.test; import org.apache.commons.cli.*; +import org.apache.tapestry5.test.constants.TapestryRunnerConstants; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ssl.SslSocketConnector; import org.eclipse.jetty.util.ssl.SslContextFactory; diff --git a/tapestry-runner/src/main/java/org/apache/tapestry5/test/TomcatRunner.java b/tapestry-runner/src/main/java/org/apache/tapestry5/test/TomcatRunner.java index f382330..e47c891 100644 --- a/tapestry-runner/src/main/java/org/apache/tapestry5/test/TomcatRunner.java +++ b/tapestry-runner/src/main/java/org/apache/tapestry5/test/TomcatRunner.java @@ -17,6 +17,7 @@ package org.apache.tapestry5.test; import org.apache.catalina.connector.Connector; import org.apache.catalina.core.StandardContext; import org.apache.catalina.startup.Tomcat; +import org.apache.tapestry5.test.constants.TapestryRunnerConstants; import java.io.File; diff --git a/tapestry-test-constants/src/main/java/org/apache/tapestry5/test/TapestryRunnerConstants.java b/tapestry-test-constants/src/main/java/org/apache/tapestry5/test/constants/TapestryRunnerConstants.java similarity index 97% rename from tapestry-test-constants/src/main/java/org/apache/tapestry5/test/TapestryRunnerConstants.java rename to tapestry-test-constants/src/main/java/org/apache/tapestry5/test/constants/TapestryRunnerConstants.java index 2abead2..d80fe22 100644 --- a/tapestry-test-constants/src/main/java/org/apache/tapestry5/test/TapestryRunnerConstants.java +++ b/tapestry-test-constants/src/main/java/org/apache/tapestry5/test/constants/TapestryRunnerConstants.java @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package org.apache.tapestry5.test; +package org.apache.tapestry5.test.constants; import java.io.File; 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 6a22bde..11a495c 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 @@ -17,6 +17,7 @@ import com.thoughtworks.selenium.Selenium; import com.thoughtworks.selenium.webdriven.WebDriverBackedSelenium; import com.thoughtworks.selenium.webdriven.WebDriverCommandProcessor; +import org.apache.tapestry5.test.constants.TapestryRunnerConstants; import org.openqa.selenium.By; import org.openqa.selenium.JavascriptExecutor; import org.openqa.selenium.NoSuchElementException;
