rename URLClient/Client classes

Signed-off-by: Olivier Lamy <olamy@apache.org>
jakartaee · Oct 19, 2023 · fd5a9a8 · fd5a9a8
1 parent 3643568
commit fd5a9a8
Show file tree

Hide file tree

Showing 225 changed files with 1,770 additions and 1,945 deletions.
diff --git a/...karta_servlet/asynccontext/URLClient.java → ...rvlet/asynccontext/AsyncContextTests.java b/...karta_servlet/asynccontext/URLClient.java → ...rvlet/asynccontext/AsyncContextTests.java
@@ -27,7 +27,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-public class URLClient extends AbstractUrlClient {
+public class AsyncContextTests extends AbstractUrlClient {
 
   @BeforeEach
   public void setupServletName() throws Exception {
@@ -41,10 +41,10 @@ public void setupServletName() throws Exception {
   public static WebArchive getTestArchive() throws Exception {
     return ShrinkWrap.create(WebArchive.class, "servlet_js_asynccontext_web.war")
             .addClasses(ACListener.class, ACListener1.class, ACListener2.class)
-            .addClasses(ACListenerBad.class, AsyncTests.class, AsyncTestServlet.class)
+            .addClasses(ACListenerBad.class, AsyncTestsServlet.class, AsyncTestServlet.class)
             .addClasses(RequestWrapper.class, ResponseWrapper.class)
             .addAsLibraries(CommonServlets.getCommonServletsArchive())
-            .setWebXML(URLClient.class.getResource("servlet_js_asynccontext_web.xml"));
+            .setWebXML(AsyncContextTests.class.getResource("servlet_js_asynccontext_web.xml"));
   }
 
 

diff --git a/...arta_servlet/asynccontext/AsyncTests.java → ...rvlet/asynccontext/AsyncTestsServlet.java b/...arta_servlet/asynccontext/AsyncTests.java → ...rvlet/asynccontext/AsyncTestsServlet.java
@@ -28,7 +28,7 @@
 import jakarta.servlet.ServletRequest;
 import jakarta.servlet.ServletResponse;
 
-public class AsyncTests extends GenericServlet {
+public class AsyncTestsServlet extends GenericServlet {
 
   private static final String TEST_HEADER = "testname";
 

diff --git a/...rc/main/java/servlet/tck/api/jakarta_servlet/asynccontext/servlet_js_asynccontext_web.xml b/...rc/main/java/servlet/tck/api/jakarta_servlet/asynccontext/servlet_js_asynccontext_web.xml
@@ -26,7 +26,7 @@
     </servlet>
     <servlet>
         <servlet-name>AsyncTests</servlet-name>
-        <servlet-class>servlet.tck.api.jakarta_servlet.asynccontext.AsyncTests</servlet-class>
+        <servlet-class>servlet.tck.api.jakarta_servlet.asynccontext.AsyncTestsServlet</servlet-class>
         <async-supported>true</async-supported>
     </servlet>
     <servlet-mapping>

diff --git a/...jakarta_servlet/asyncevent/URLClient.java → ...a_servlet/asyncevent/AsynceventTests.java b/...jakarta_servlet/asyncevent/URLClient.java → ...a_servlet/asyncevent/AsynceventTests.java
@@ -26,7 +26,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-public class URLClient extends AbstractUrlClient {
+public class AsynceventTests extends AbstractUrlClient {
 
   @BeforeEach
   public void setupServletName() throws Exception {
@@ -41,7 +41,7 @@ public static WebArchive getTestArchive() throws Exception {
     return ShrinkWrap.create(WebArchive.class, "servlet_js_asyncevent_web.war")
             .addAsLibraries(CommonServlets.getCommonServletsArchive())
             .addClasses(AsyncTestServlet.class, GenericTCKServlet.class, GenericServlet.class)
-            .setWebXML(URLClient.class.getResource("servlet_js_asyncevent_web.xml"));
+            .setWebXML(AsynceventTests.class.getResource("servlet_js_asyncevent_web.xml"));
   }
 
   /*

diff --git a/...rta_servlet/dispatchertype/URLClient.java → ...t/dispatchertype/DispatcherTypeTests.java b/...rta_servlet/dispatchertype/URLClient.java → ...t/dispatchertype/DispatcherTypeTests.java
@@ -28,7 +28,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-public class URLClient extends AbstractUrlClient {
+public class DispatcherTypeTests extends AbstractUrlClient {
 
   @BeforeEach
   public void setupServletName() throws Exception {
@@ -43,7 +43,7 @@ public static WebArchive getTestArchive() throws Exception {
     return ShrinkWrap.create(WebArchive.class, "servlet_js_dispatchertype_web.war")
             .addAsLibraries(CommonServlets.getCommonServletsArchive())
             .addClass(TestServlet.class)
-            .setWebXML(URLClient.class.getResource("servlet_js_dispatchertype_web.xml"));
+            .setWebXML(DispatcherTypeTests.class.getResource("servlet_js_dispatchertype_web.xml"));
   }
 
   /*