[tomcat] branch 8.5.x updated: Move TestResolverSSL to the rewrite tests

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
     new 1abf153  Move TestResolverSSL to the rewrite tests
1abf153 is described below

commit 1abf153556fdd64129cf58e4829d0eed1724b6de
Author: remm <r...@apache.org>
AuthorDate: Thu Jun 4 14:13:40 2020 +0200

    Move TestResolverSSL to the rewrite tests
    
    Where it really belongs.
---
 .../util/net => catalina/valves/rewrite}/TestResolverSSL.java        | 5 ++---
 test/org/apache/tomcat/util/net/TesterSupport.java                   | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/test/org/apache/tomcat/util/net/TestResolverSSL.java 
b/test/org/apache/catalina/valves/rewrite/TestResolverSSL.java
similarity index 97%
rename from test/org/apache/tomcat/util/net/TestResolverSSL.java
rename to test/org/apache/catalina/valves/rewrite/TestResolverSSL.java
index c17734d..097ce6e 100644
--- a/test/org/apache/tomcat/util/net/TestResolverSSL.java
+++ b/test/org/apache/catalina/valves/rewrite/TestResolverSSL.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.tomcat.util.net;
+package org.apache.catalina.valves.rewrite;
 
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -31,9 +31,8 @@ import org.apache.catalina.connector.Response;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.startup.TomcatBaseTest;
 import org.apache.catalina.valves.ValveBase;
-import org.apache.catalina.valves.rewrite.Resolver;
-import org.apache.catalina.valves.rewrite.ResolverImpl;
 import org.apache.tomcat.util.buf.ByteChunk;
+import org.apache.tomcat.util.net.TesterSupport;
 
 public class TestResolverSSL extends TomcatBaseTest {
 
diff --git a/test/org/apache/tomcat/util/net/TesterSupport.java 
b/test/org/apache/tomcat/util/net/TesterSupport.java
index ad8c064..e144406 100644
--- a/test/org/apache/tomcat/util/net/TesterSupport.java
+++ b/test/org/apache/tomcat/util/net/TesterSupport.java
@@ -251,7 +251,7 @@ public final class TesterSupport {
         return true;
     }
 
-    protected static void configureClientCertContext(Tomcat tomcat) {
+    public static void configureClientCertContext(Tomcat tomcat) {
         TesterSupport.initSsl(tomcat);
 
         /* When running on Java 11, TLSv1.3 is enabled by default. The JSSE


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org