TAP5-2641: tapestry-test-constants should have its own package

apache · Mar 4, 2022 · 44ec16a · 44ec16a
1 parent 7f4057e
commit 44ec16a
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 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
@@ -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
@@ -24,7 +24,7 @@
 
 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
@@ -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/...try-core/src/test/java/org/apache/tapestry5/internal/services/TemplateParserImplTest.java b/...try-core/src/test/java/org/apache/tapestry5/internal/services/TemplateParserImplTest.java
@@ -21,7 +21,7 @@
 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
@@ -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
@@ -17,6 +17,7 @@
 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/...pestry5/test/TapestryRunnerConstants.java → ...st/constants/TapestryRunnerConstants.java b/...pestry5/test/TapestryRunnerConstants.java → ...st/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
@@ -17,6 +17,7 @@
 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;