[tomcat] 02/08: Fix spellings in unit tests

2020-09-16 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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

commit b6eb9ae5ad0e143067e4d824728e5231a7a48b9c
Author: Mark Thomas 
AuthorDate: Wed Sep 16 18:03:51 2020 +0100

Fix spellings in unit tests

Based on a PR provided by John Bampton
---
 .../el/TestImportHandlerStandardPackages.java  |  2 +-
 test/javax/servlet/http/TestHttpServlet.java   |  2 +-
 .../jaspic/TestAuthConfigFactoryImpl.java  |  8 ++---
 .../org/apache/catalina/connector/TestRequest.java |  4 +--
 .../apache/catalina/core/TestAsyncContextImpl.java |  2 +-
 .../catalina/startup/TestMultipartConfig.java  |  2 +-
 .../catalina/startup/TestTomcatNoServer.java   |  4 +--
 .../apache/catalina/valves/TestRemoteIpValve.java  |  6 ++--
 test/org/apache/coyote/TestRequest.java| 16 +-
 test/org/apache/coyote/http2/TestAsyncFlush.java   |  2 +-
 test/org/apache/juli/TestFileHandler.java  | 36 +++---
 test/org/apache/naming/TesterInjectionServlet.java |  2 +-
 .../websocket/pojo/TestEncodingDecoding.java   |  6 ++--
 13 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/test/javax/el/TestImportHandlerStandardPackages.java 
b/test/javax/el/TestImportHandlerStandardPackages.java
index 9637aa6..c3f30fb 100644
--- a/test/javax/el/TestImportHandlerStandardPackages.java
+++ b/test/javax/el/TestImportHandlerStandardPackages.java
@@ -112,7 +112,7 @@ public class TestImportHandlerStandardPackages {
 Assert.assertNotNull(files);
 for (String file : files) {
 if (!file.endsWith(".class")) {
-// Skip non-class resoucres
+// Skip non-class resources
 continue;
 }
 if (file.startsWith("Test")) {
diff --git a/test/javax/servlet/http/TestHttpServlet.java 
b/test/javax/servlet/http/TestHttpServlet.java
index 00e4036..6a011c4 100644
--- a/test/javax/servlet/http/TestHttpServlet.java
+++ b/test/javax/servlet/http/TestHttpServlet.java
@@ -213,7 +213,7 @@ public class TestHttpServlet extends TomcatBaseTest {
 
 
 /*
- * See org.aoache.coyote.http2.TestHttpServlet for the HTTP/2 version of
+ * See org.apache.coyote.http2.TestHttpServlet for the HTTP/2 version of
  * this test. It was placed in that package because it needed access to
  * package private classes.
  */
diff --git 
a/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java 
b/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
index 38fff7b..a220e99 100644
--- 
a/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
+++ 
b/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
@@ -41,19 +41,19 @@ public class TestAuthConfigFactoryImpl {
 
 @Test
 public void testRegistrationNullLayer() {
-doTestResistration(null,  "AC_1",  ":AC_1");
+doTestRegistration(null,  "AC_1",  ":AC_1");
 }
 
 
 @Test
 public void testRegistrationNullAppContext() {
-doTestResistration("L_1",  null,  "L_1:");
+doTestRegistration("L_1",  null,  "L_1:");
 }
 
 
 @Test
 public void testRegistrationNullLayerAndNullAppContext() {
-doTestResistration(null,  null,  ":");
+doTestRegistration(null,  null,  ":");
 }
 
 
@@ -151,7 +151,7 @@ public class TestAuthConfigFactoryImpl {
 }
 
 
-private void doTestResistration(String layer, String appContext, String 
expectedRegId) {
+private void doTestRegistration(String layer, String appContext, String 
expectedRegId) {
 AuthConfigFactory factory = new AuthConfigFactoryImpl();
 AuthConfigProvider acp1 = new SimpleAuthConfigProvider(null, null);
 SimpleRegistrationListener listener = new 
SimpleRegistrationListener(layer, appContext);
diff --git a/test/org/apache/catalina/connector/TestRequest.java 
b/test/org/apache/catalina/connector/TestRequest.java
index 2e43bb3..5689144 100644
--- a/test/org/apache/catalina/connector/TestRequest.java
+++ b/test/org/apache/catalina/connector/TestRequest.java
@@ -918,7 +918,7 @@ public class TestRequest extends TomcatBaseTest {
 }
 
 
-private void doTestGetReader(String userAgentCharaceterEncoding, boolean 
expect200)
+private void doTestGetReader(String userAgentCharacterEncoding, boolean 
expect200)
 throws Exception {
 
 // Setup Tomcat instance
@@ -936,7 +936,7 @@ public class TestRequest extends TomcatBaseTest {
 ByteChunk bc = new ByteChunk();
 Map> reqHeaders = new HashMap<>();
 reqHeaders.put("Content-Type",
-Arrays.asList(new String[] {"text/plain;charset=" + 
userAgentCharaceterEncoding}));
+Arrays.asList(new String[] {"text/plain;charset=" + 

[tomcat] 02/08: Fix spellings in unit tests

2020-09-16 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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

commit b6eb9ae5ad0e143067e4d824728e5231a7a48b9c
Author: Mark Thomas 
AuthorDate: Wed Sep 16 18:03:51 2020 +0100

Fix spellings in unit tests

Based on a PR provided by John Bampton
---
 .../el/TestImportHandlerStandardPackages.java  |  2 +-
 test/javax/servlet/http/TestHttpServlet.java   |  2 +-
 .../jaspic/TestAuthConfigFactoryImpl.java  |  8 ++---
 .../org/apache/catalina/connector/TestRequest.java |  4 +--
 .../apache/catalina/core/TestAsyncContextImpl.java |  2 +-
 .../catalina/startup/TestMultipartConfig.java  |  2 +-
 .../catalina/startup/TestTomcatNoServer.java   |  4 +--
 .../apache/catalina/valves/TestRemoteIpValve.java  |  6 ++--
 test/org/apache/coyote/TestRequest.java| 16 +-
 test/org/apache/coyote/http2/TestAsyncFlush.java   |  2 +-
 test/org/apache/juli/TestFileHandler.java  | 36 +++---
 test/org/apache/naming/TesterInjectionServlet.java |  2 +-
 .../websocket/pojo/TestEncodingDecoding.java   |  6 ++--
 13 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/test/javax/el/TestImportHandlerStandardPackages.java 
b/test/javax/el/TestImportHandlerStandardPackages.java
index 9637aa6..c3f30fb 100644
--- a/test/javax/el/TestImportHandlerStandardPackages.java
+++ b/test/javax/el/TestImportHandlerStandardPackages.java
@@ -112,7 +112,7 @@ public class TestImportHandlerStandardPackages {
 Assert.assertNotNull(files);
 for (String file : files) {
 if (!file.endsWith(".class")) {
-// Skip non-class resoucres
+// Skip non-class resources
 continue;
 }
 if (file.startsWith("Test")) {
diff --git a/test/javax/servlet/http/TestHttpServlet.java 
b/test/javax/servlet/http/TestHttpServlet.java
index 00e4036..6a011c4 100644
--- a/test/javax/servlet/http/TestHttpServlet.java
+++ b/test/javax/servlet/http/TestHttpServlet.java
@@ -213,7 +213,7 @@ public class TestHttpServlet extends TomcatBaseTest {
 
 
 /*
- * See org.aoache.coyote.http2.TestHttpServlet for the HTTP/2 version of
+ * See org.apache.coyote.http2.TestHttpServlet for the HTTP/2 version of
  * this test. It was placed in that package because it needed access to
  * package private classes.
  */
diff --git 
a/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java 
b/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
index 38fff7b..a220e99 100644
--- 
a/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
+++ 
b/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
@@ -41,19 +41,19 @@ public class TestAuthConfigFactoryImpl {
 
 @Test
 public void testRegistrationNullLayer() {
-doTestResistration(null,  "AC_1",  ":AC_1");
+doTestRegistration(null,  "AC_1",  ":AC_1");
 }
 
 
 @Test
 public void testRegistrationNullAppContext() {
-doTestResistration("L_1",  null,  "L_1:");
+doTestRegistration("L_1",  null,  "L_1:");
 }
 
 
 @Test
 public void testRegistrationNullLayerAndNullAppContext() {
-doTestResistration(null,  null,  ":");
+doTestRegistration(null,  null,  ":");
 }
 
 
@@ -151,7 +151,7 @@ public class TestAuthConfigFactoryImpl {
 }
 
 
-private void doTestResistration(String layer, String appContext, String 
expectedRegId) {
+private void doTestRegistration(String layer, String appContext, String 
expectedRegId) {
 AuthConfigFactory factory = new AuthConfigFactoryImpl();
 AuthConfigProvider acp1 = new SimpleAuthConfigProvider(null, null);
 SimpleRegistrationListener listener = new 
SimpleRegistrationListener(layer, appContext);
diff --git a/test/org/apache/catalina/connector/TestRequest.java 
b/test/org/apache/catalina/connector/TestRequest.java
index 2e43bb3..5689144 100644
--- a/test/org/apache/catalina/connector/TestRequest.java
+++ b/test/org/apache/catalina/connector/TestRequest.java
@@ -918,7 +918,7 @@ public class TestRequest extends TomcatBaseTest {
 }
 
 
-private void doTestGetReader(String userAgentCharaceterEncoding, boolean 
expect200)
+private void doTestGetReader(String userAgentCharacterEncoding, boolean 
expect200)
 throws Exception {
 
 // Setup Tomcat instance
@@ -936,7 +936,7 @@ public class TestRequest extends TomcatBaseTest {
 ByteChunk bc = new ByteChunk();
 Map> reqHeaders = new HashMap<>();
 reqHeaders.put("Content-Type",
-Arrays.asList(new String[] {"text/plain;charset=" + 
userAgentCharaceterEncoding}));
+Arrays.asList(new String[] {"text/plain;charset=" + 

[tomcat] 02/08: Fix spellings in unit tests

2020-09-16 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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

commit f89922186c10ba50d47b22d2690f05587340513c
Author: Mark Thomas 
AuthorDate: Wed Sep 16 18:03:51 2020 +0100

Fix spellings in unit tests

Based on a PR provided by John Bampton
---
 test/javax/el/TestArrayELResolver.java |  2 +-
 .../el/TestImportHandlerStandardPackages.java  |  2 +-
 test/javax/servlet/http/TestHttpServlet.java   |  2 +-
 .../jaspic/TestAuthConfigFactoryImpl.java  |  8 ++---
 .../org/apache/catalina/connector/TestRequest.java |  6 ++--
 .../apache/catalina/core/TestAsyncContextImpl.java |  2 +-
 .../catalina/startup/TestMultipartConfig.java  |  2 +-
 .../catalina/startup/TestTomcatNoServer.java   |  4 +--
 .../util/TestContextNameExtractFromPath.java   |  2 +-
 .../apache/catalina/valves/TestRemoteIpValve.java  |  6 ++--
 test/org/apache/coyote/TestRequest.java| 16 +-
 test/org/apache/coyote/http2/TestAsyncFlush.java   |  2 +-
 test/org/apache/juli/TestFileHandler.java  | 36 +++---
 test/org/apache/naming/TesterInjectionServlet.java |  2 +-
 .../websocket/pojo/TestEncodingDecoding.java   |  6 ++--
 15 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/test/javax/el/TestArrayELResolver.java 
b/test/javax/el/TestArrayELResolver.java
index 1280fb1..69ae176 100644
--- a/test/javax/el/TestArrayELResolver.java
+++ b/test/javax/el/TestArrayELResolver.java
@@ -520,7 +520,7 @@ public class TestArrayELResolver {
 
 
 @Test
-public void testGetFeatureDescriptiors() {
+public void testGetFeatureDescriptors() {
 // Should always return null
 ArrayELResolver resolver = new ArrayELResolver();
 Assert.assertNull(resolver.getFeatureDescriptors(null, null));
diff --git a/test/javax/el/TestImportHandlerStandardPackages.java 
b/test/javax/el/TestImportHandlerStandardPackages.java
index 4d9c01a..79972df 100644
--- a/test/javax/el/TestImportHandlerStandardPackages.java
+++ b/test/javax/el/TestImportHandlerStandardPackages.java
@@ -105,7 +105,7 @@ public class TestImportHandlerStandardPackages {
 Assert.assertNotNull(files);
 for (String file : files) {
 if (!file.endsWith(".class")) {
-// Skip non-class resoucres
+// Skip non-class resources
 continue;
 }
 if (file.startsWith("Test")) {
diff --git a/test/javax/servlet/http/TestHttpServlet.java 
b/test/javax/servlet/http/TestHttpServlet.java
index 00e4036..6a011c4 100644
--- a/test/javax/servlet/http/TestHttpServlet.java
+++ b/test/javax/servlet/http/TestHttpServlet.java
@@ -213,7 +213,7 @@ public class TestHttpServlet extends TomcatBaseTest {
 
 
 /*
- * See org.aoache.coyote.http2.TestHttpServlet for the HTTP/2 version of
+ * See org.apache.coyote.http2.TestHttpServlet for the HTTP/2 version of
  * this test. It was placed in that package because it needed access to
  * package private classes.
  */
diff --git 
a/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java 
b/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
index 38fff7b..a220e99 100644
--- 
a/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
+++ 
b/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
@@ -41,19 +41,19 @@ public class TestAuthConfigFactoryImpl {
 
 @Test
 public void testRegistrationNullLayer() {
-doTestResistration(null,  "AC_1",  ":AC_1");
+doTestRegistration(null,  "AC_1",  ":AC_1");
 }
 
 
 @Test
 public void testRegistrationNullAppContext() {
-doTestResistration("L_1",  null,  "L_1:");
+doTestRegistration("L_1",  null,  "L_1:");
 }
 
 
 @Test
 public void testRegistrationNullLayerAndNullAppContext() {
-doTestResistration(null,  null,  ":");
+doTestRegistration(null,  null,  ":");
 }
 
 
@@ -151,7 +151,7 @@ public class TestAuthConfigFactoryImpl {
 }
 
 
-private void doTestResistration(String layer, String appContext, String 
expectedRegId) {
+private void doTestRegistration(String layer, String appContext, String 
expectedRegId) {
 AuthConfigFactory factory = new AuthConfigFactoryImpl();
 AuthConfigProvider acp1 = new SimpleAuthConfigProvider(null, null);
 SimpleRegistrationListener listener = new 
SimpleRegistrationListener(layer, appContext);
diff --git a/test/org/apache/catalina/connector/TestRequest.java 
b/test/org/apache/catalina/connector/TestRequest.java
index eee3d32..2de72c9 100644
--- a/test/org/apache/catalina/connector/TestRequest.java
+++ b/test/org/apache/catalina/connector/TestRequest.java
@@ -921,7 +921,7 @@ public class TestRequest extends 

[tomcat] 02/08: Fix spellings in unit tests

2020-09-16 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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

commit f89922186c10ba50d47b22d2690f05587340513c
Author: Mark Thomas 
AuthorDate: Wed Sep 16 18:03:51 2020 +0100

Fix spellings in unit tests

Based on a PR provided by John Bampton
---
 test/javax/el/TestArrayELResolver.java |  2 +-
 .../el/TestImportHandlerStandardPackages.java  |  2 +-
 test/javax/servlet/http/TestHttpServlet.java   |  2 +-
 .../jaspic/TestAuthConfigFactoryImpl.java  |  8 ++---
 .../org/apache/catalina/connector/TestRequest.java |  6 ++--
 .../apache/catalina/core/TestAsyncContextImpl.java |  2 +-
 .../catalina/startup/TestMultipartConfig.java  |  2 +-
 .../catalina/startup/TestTomcatNoServer.java   |  4 +--
 .../util/TestContextNameExtractFromPath.java   |  2 +-
 .../apache/catalina/valves/TestRemoteIpValve.java  |  6 ++--
 test/org/apache/coyote/TestRequest.java| 16 +-
 test/org/apache/coyote/http2/TestAsyncFlush.java   |  2 +-
 test/org/apache/juli/TestFileHandler.java  | 36 +++---
 test/org/apache/naming/TesterInjectionServlet.java |  2 +-
 .../websocket/pojo/TestEncodingDecoding.java   |  6 ++--
 15 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/test/javax/el/TestArrayELResolver.java 
b/test/javax/el/TestArrayELResolver.java
index 1280fb1..69ae176 100644
--- a/test/javax/el/TestArrayELResolver.java
+++ b/test/javax/el/TestArrayELResolver.java
@@ -520,7 +520,7 @@ public class TestArrayELResolver {
 
 
 @Test
-public void testGetFeatureDescriptiors() {
+public void testGetFeatureDescriptors() {
 // Should always return null
 ArrayELResolver resolver = new ArrayELResolver();
 Assert.assertNull(resolver.getFeatureDescriptors(null, null));
diff --git a/test/javax/el/TestImportHandlerStandardPackages.java 
b/test/javax/el/TestImportHandlerStandardPackages.java
index 4d9c01a..79972df 100644
--- a/test/javax/el/TestImportHandlerStandardPackages.java
+++ b/test/javax/el/TestImportHandlerStandardPackages.java
@@ -105,7 +105,7 @@ public class TestImportHandlerStandardPackages {
 Assert.assertNotNull(files);
 for (String file : files) {
 if (!file.endsWith(".class")) {
-// Skip non-class resoucres
+// Skip non-class resources
 continue;
 }
 if (file.startsWith("Test")) {
diff --git a/test/javax/servlet/http/TestHttpServlet.java 
b/test/javax/servlet/http/TestHttpServlet.java
index 00e4036..6a011c4 100644
--- a/test/javax/servlet/http/TestHttpServlet.java
+++ b/test/javax/servlet/http/TestHttpServlet.java
@@ -213,7 +213,7 @@ public class TestHttpServlet extends TomcatBaseTest {
 
 
 /*
- * See org.aoache.coyote.http2.TestHttpServlet for the HTTP/2 version of
+ * See org.apache.coyote.http2.TestHttpServlet for the HTTP/2 version of
  * this test. It was placed in that package because it needed access to
  * package private classes.
  */
diff --git 
a/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java 
b/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
index 38fff7b..a220e99 100644
--- 
a/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
+++ 
b/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
@@ -41,19 +41,19 @@ public class TestAuthConfigFactoryImpl {
 
 @Test
 public void testRegistrationNullLayer() {
-doTestResistration(null,  "AC_1",  ":AC_1");
+doTestRegistration(null,  "AC_1",  ":AC_1");
 }
 
 
 @Test
 public void testRegistrationNullAppContext() {
-doTestResistration("L_1",  null,  "L_1:");
+doTestRegistration("L_1",  null,  "L_1:");
 }
 
 
 @Test
 public void testRegistrationNullLayerAndNullAppContext() {
-doTestResistration(null,  null,  ":");
+doTestRegistration(null,  null,  ":");
 }
 
 
@@ -151,7 +151,7 @@ public class TestAuthConfigFactoryImpl {
 }
 
 
-private void doTestResistration(String layer, String appContext, String 
expectedRegId) {
+private void doTestRegistration(String layer, String appContext, String 
expectedRegId) {
 AuthConfigFactory factory = new AuthConfigFactoryImpl();
 AuthConfigProvider acp1 = new SimpleAuthConfigProvider(null, null);
 SimpleRegistrationListener listener = new 
SimpleRegistrationListener(layer, appContext);
diff --git a/test/org/apache/catalina/connector/TestRequest.java 
b/test/org/apache/catalina/connector/TestRequest.java
index eee3d32..2de72c9 100644
--- a/test/org/apache/catalina/connector/TestRequest.java
+++ b/test/org/apache/catalina/connector/TestRequest.java
@@ -921,7 +921,7 @@ public class TestRequest extends 

[tomcat] 02/08: Fix spellings in unit tests

2020-09-16 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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

commit f89922186c10ba50d47b22d2690f05587340513c
Author: Mark Thomas 
AuthorDate: Wed Sep 16 18:03:51 2020 +0100

Fix spellings in unit tests

Based on a PR provided by John Bampton
---
 test/javax/el/TestArrayELResolver.java |  2 +-
 .../el/TestImportHandlerStandardPackages.java  |  2 +-
 test/javax/servlet/http/TestHttpServlet.java   |  2 +-
 .../jaspic/TestAuthConfigFactoryImpl.java  |  8 ++---
 .../org/apache/catalina/connector/TestRequest.java |  6 ++--
 .../apache/catalina/core/TestAsyncContextImpl.java |  2 +-
 .../catalina/startup/TestMultipartConfig.java  |  2 +-
 .../catalina/startup/TestTomcatNoServer.java   |  4 +--
 .../util/TestContextNameExtractFromPath.java   |  2 +-
 .../apache/catalina/valves/TestRemoteIpValve.java  |  6 ++--
 test/org/apache/coyote/TestRequest.java| 16 +-
 test/org/apache/coyote/http2/TestAsyncFlush.java   |  2 +-
 test/org/apache/juli/TestFileHandler.java  | 36 +++---
 test/org/apache/naming/TesterInjectionServlet.java |  2 +-
 .../websocket/pojo/TestEncodingDecoding.java   |  6 ++--
 15 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/test/javax/el/TestArrayELResolver.java 
b/test/javax/el/TestArrayELResolver.java
index 1280fb1..69ae176 100644
--- a/test/javax/el/TestArrayELResolver.java
+++ b/test/javax/el/TestArrayELResolver.java
@@ -520,7 +520,7 @@ public class TestArrayELResolver {
 
 
 @Test
-public void testGetFeatureDescriptiors() {
+public void testGetFeatureDescriptors() {
 // Should always return null
 ArrayELResolver resolver = new ArrayELResolver();
 Assert.assertNull(resolver.getFeatureDescriptors(null, null));
diff --git a/test/javax/el/TestImportHandlerStandardPackages.java 
b/test/javax/el/TestImportHandlerStandardPackages.java
index 4d9c01a..79972df 100644
--- a/test/javax/el/TestImportHandlerStandardPackages.java
+++ b/test/javax/el/TestImportHandlerStandardPackages.java
@@ -105,7 +105,7 @@ public class TestImportHandlerStandardPackages {
 Assert.assertNotNull(files);
 for (String file : files) {
 if (!file.endsWith(".class")) {
-// Skip non-class resoucres
+// Skip non-class resources
 continue;
 }
 if (file.startsWith("Test")) {
diff --git a/test/javax/servlet/http/TestHttpServlet.java 
b/test/javax/servlet/http/TestHttpServlet.java
index 00e4036..6a011c4 100644
--- a/test/javax/servlet/http/TestHttpServlet.java
+++ b/test/javax/servlet/http/TestHttpServlet.java
@@ -213,7 +213,7 @@ public class TestHttpServlet extends TomcatBaseTest {
 
 
 /*
- * See org.aoache.coyote.http2.TestHttpServlet for the HTTP/2 version of
+ * See org.apache.coyote.http2.TestHttpServlet for the HTTP/2 version of
  * this test. It was placed in that package because it needed access to
  * package private classes.
  */
diff --git 
a/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java 
b/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
index 38fff7b..a220e99 100644
--- 
a/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
+++ 
b/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
@@ -41,19 +41,19 @@ public class TestAuthConfigFactoryImpl {
 
 @Test
 public void testRegistrationNullLayer() {
-doTestResistration(null,  "AC_1",  ":AC_1");
+doTestRegistration(null,  "AC_1",  ":AC_1");
 }
 
 
 @Test
 public void testRegistrationNullAppContext() {
-doTestResistration("L_1",  null,  "L_1:");
+doTestRegistration("L_1",  null,  "L_1:");
 }
 
 
 @Test
 public void testRegistrationNullLayerAndNullAppContext() {
-doTestResistration(null,  null,  ":");
+doTestRegistration(null,  null,  ":");
 }
 
 
@@ -151,7 +151,7 @@ public class TestAuthConfigFactoryImpl {
 }
 
 
-private void doTestResistration(String layer, String appContext, String 
expectedRegId) {
+private void doTestRegistration(String layer, String appContext, String 
expectedRegId) {
 AuthConfigFactory factory = new AuthConfigFactoryImpl();
 AuthConfigProvider acp1 = new SimpleAuthConfigProvider(null, null);
 SimpleRegistrationListener listener = new 
SimpleRegistrationListener(layer, appContext);
diff --git a/test/org/apache/catalina/connector/TestRequest.java 
b/test/org/apache/catalina/connector/TestRequest.java
index eee3d32..2de72c9 100644
--- a/test/org/apache/catalina/connector/TestRequest.java
+++ b/test/org/apache/catalina/connector/TestRequest.java
@@ -921,7 +921,7 @@ public class TestRequest extends 

[tomcat] 02/08: Fix spellings in unit tests

2020-09-16 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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

commit b6eb9ae5ad0e143067e4d824728e5231a7a48b9c
Author: Mark Thomas 
AuthorDate: Wed Sep 16 18:03:51 2020 +0100

Fix spellings in unit tests

Based on a PR provided by John Bampton
---
 .../el/TestImportHandlerStandardPackages.java  |  2 +-
 test/javax/servlet/http/TestHttpServlet.java   |  2 +-
 .../jaspic/TestAuthConfigFactoryImpl.java  |  8 ++---
 .../org/apache/catalina/connector/TestRequest.java |  4 +--
 .../apache/catalina/core/TestAsyncContextImpl.java |  2 +-
 .../catalina/startup/TestMultipartConfig.java  |  2 +-
 .../catalina/startup/TestTomcatNoServer.java   |  4 +--
 .../apache/catalina/valves/TestRemoteIpValve.java  |  6 ++--
 test/org/apache/coyote/TestRequest.java| 16 +-
 test/org/apache/coyote/http2/TestAsyncFlush.java   |  2 +-
 test/org/apache/juli/TestFileHandler.java  | 36 +++---
 test/org/apache/naming/TesterInjectionServlet.java |  2 +-
 .../websocket/pojo/TestEncodingDecoding.java   |  6 ++--
 13 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/test/javax/el/TestImportHandlerStandardPackages.java 
b/test/javax/el/TestImportHandlerStandardPackages.java
index 9637aa6..c3f30fb 100644
--- a/test/javax/el/TestImportHandlerStandardPackages.java
+++ b/test/javax/el/TestImportHandlerStandardPackages.java
@@ -112,7 +112,7 @@ public class TestImportHandlerStandardPackages {
 Assert.assertNotNull(files);
 for (String file : files) {
 if (!file.endsWith(".class")) {
-// Skip non-class resoucres
+// Skip non-class resources
 continue;
 }
 if (file.startsWith("Test")) {
diff --git a/test/javax/servlet/http/TestHttpServlet.java 
b/test/javax/servlet/http/TestHttpServlet.java
index 00e4036..6a011c4 100644
--- a/test/javax/servlet/http/TestHttpServlet.java
+++ b/test/javax/servlet/http/TestHttpServlet.java
@@ -213,7 +213,7 @@ public class TestHttpServlet extends TomcatBaseTest {
 
 
 /*
- * See org.aoache.coyote.http2.TestHttpServlet for the HTTP/2 version of
+ * See org.apache.coyote.http2.TestHttpServlet for the HTTP/2 version of
  * this test. It was placed in that package because it needed access to
  * package private classes.
  */
diff --git 
a/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java 
b/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
index 38fff7b..a220e99 100644
--- 
a/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
+++ 
b/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
@@ -41,19 +41,19 @@ public class TestAuthConfigFactoryImpl {
 
 @Test
 public void testRegistrationNullLayer() {
-doTestResistration(null,  "AC_1",  ":AC_1");
+doTestRegistration(null,  "AC_1",  ":AC_1");
 }
 
 
 @Test
 public void testRegistrationNullAppContext() {
-doTestResistration("L_1",  null,  "L_1:");
+doTestRegistration("L_1",  null,  "L_1:");
 }
 
 
 @Test
 public void testRegistrationNullLayerAndNullAppContext() {
-doTestResistration(null,  null,  ":");
+doTestRegistration(null,  null,  ":");
 }
 
 
@@ -151,7 +151,7 @@ public class TestAuthConfigFactoryImpl {
 }
 
 
-private void doTestResistration(String layer, String appContext, String 
expectedRegId) {
+private void doTestRegistration(String layer, String appContext, String 
expectedRegId) {
 AuthConfigFactory factory = new AuthConfigFactoryImpl();
 AuthConfigProvider acp1 = new SimpleAuthConfigProvider(null, null);
 SimpleRegistrationListener listener = new 
SimpleRegistrationListener(layer, appContext);
diff --git a/test/org/apache/catalina/connector/TestRequest.java 
b/test/org/apache/catalina/connector/TestRequest.java
index 2e43bb3..5689144 100644
--- a/test/org/apache/catalina/connector/TestRequest.java
+++ b/test/org/apache/catalina/connector/TestRequest.java
@@ -918,7 +918,7 @@ public class TestRequest extends TomcatBaseTest {
 }
 
 
-private void doTestGetReader(String userAgentCharaceterEncoding, boolean 
expect200)
+private void doTestGetReader(String userAgentCharacterEncoding, boolean 
expect200)
 throws Exception {
 
 // Setup Tomcat instance
@@ -936,7 +936,7 @@ public class TestRequest extends TomcatBaseTest {
 ByteChunk bc = new ByteChunk();
 Map> reqHeaders = new HashMap<>();
 reqHeaders.put("Content-Type",
-Arrays.asList(new String[] {"text/plain;charset=" + 
userAgentCharaceterEncoding}));
+Arrays.asList(new String[] {"text/plain;charset=" + 

[tomcat] 02/08: Fix spellings in unit tests

2020-09-16 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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

commit b6eb9ae5ad0e143067e4d824728e5231a7a48b9c
Author: Mark Thomas 
AuthorDate: Wed Sep 16 18:03:51 2020 +0100

Fix spellings in unit tests

Based on a PR provided by John Bampton
---
 .../el/TestImportHandlerStandardPackages.java  |  2 +-
 test/javax/servlet/http/TestHttpServlet.java   |  2 +-
 .../jaspic/TestAuthConfigFactoryImpl.java  |  8 ++---
 .../org/apache/catalina/connector/TestRequest.java |  4 +--
 .../apache/catalina/core/TestAsyncContextImpl.java |  2 +-
 .../catalina/startup/TestMultipartConfig.java  |  2 +-
 .../catalina/startup/TestTomcatNoServer.java   |  4 +--
 .../apache/catalina/valves/TestRemoteIpValve.java  |  6 ++--
 test/org/apache/coyote/TestRequest.java| 16 +-
 test/org/apache/coyote/http2/TestAsyncFlush.java   |  2 +-
 test/org/apache/juli/TestFileHandler.java  | 36 +++---
 test/org/apache/naming/TesterInjectionServlet.java |  2 +-
 .../websocket/pojo/TestEncodingDecoding.java   |  6 ++--
 13 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/test/javax/el/TestImportHandlerStandardPackages.java 
b/test/javax/el/TestImportHandlerStandardPackages.java
index 9637aa6..c3f30fb 100644
--- a/test/javax/el/TestImportHandlerStandardPackages.java
+++ b/test/javax/el/TestImportHandlerStandardPackages.java
@@ -112,7 +112,7 @@ public class TestImportHandlerStandardPackages {
 Assert.assertNotNull(files);
 for (String file : files) {
 if (!file.endsWith(".class")) {
-// Skip non-class resoucres
+// Skip non-class resources
 continue;
 }
 if (file.startsWith("Test")) {
diff --git a/test/javax/servlet/http/TestHttpServlet.java 
b/test/javax/servlet/http/TestHttpServlet.java
index 00e4036..6a011c4 100644
--- a/test/javax/servlet/http/TestHttpServlet.java
+++ b/test/javax/servlet/http/TestHttpServlet.java
@@ -213,7 +213,7 @@ public class TestHttpServlet extends TomcatBaseTest {
 
 
 /*
- * See org.aoache.coyote.http2.TestHttpServlet for the HTTP/2 version of
+ * See org.apache.coyote.http2.TestHttpServlet for the HTTP/2 version of
  * this test. It was placed in that package because it needed access to
  * package private classes.
  */
diff --git 
a/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java 
b/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
index 38fff7b..a220e99 100644
--- 
a/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
+++ 
b/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
@@ -41,19 +41,19 @@ public class TestAuthConfigFactoryImpl {
 
 @Test
 public void testRegistrationNullLayer() {
-doTestResistration(null,  "AC_1",  ":AC_1");
+doTestRegistration(null,  "AC_1",  ":AC_1");
 }
 
 
 @Test
 public void testRegistrationNullAppContext() {
-doTestResistration("L_1",  null,  "L_1:");
+doTestRegistration("L_1",  null,  "L_1:");
 }
 
 
 @Test
 public void testRegistrationNullLayerAndNullAppContext() {
-doTestResistration(null,  null,  ":");
+doTestRegistration(null,  null,  ":");
 }
 
 
@@ -151,7 +151,7 @@ public class TestAuthConfigFactoryImpl {
 }
 
 
-private void doTestResistration(String layer, String appContext, String 
expectedRegId) {
+private void doTestRegistration(String layer, String appContext, String 
expectedRegId) {
 AuthConfigFactory factory = new AuthConfigFactoryImpl();
 AuthConfigProvider acp1 = new SimpleAuthConfigProvider(null, null);
 SimpleRegistrationListener listener = new 
SimpleRegistrationListener(layer, appContext);
diff --git a/test/org/apache/catalina/connector/TestRequest.java 
b/test/org/apache/catalina/connector/TestRequest.java
index 2e43bb3..5689144 100644
--- a/test/org/apache/catalina/connector/TestRequest.java
+++ b/test/org/apache/catalina/connector/TestRequest.java
@@ -918,7 +918,7 @@ public class TestRequest extends TomcatBaseTest {
 }
 
 
-private void doTestGetReader(String userAgentCharaceterEncoding, boolean 
expect200)
+private void doTestGetReader(String userAgentCharacterEncoding, boolean 
expect200)
 throws Exception {
 
 // Setup Tomcat instance
@@ -936,7 +936,7 @@ public class TestRequest extends TomcatBaseTest {
 ByteChunk bc = new ByteChunk();
 Map> reqHeaders = new HashMap<>();
 reqHeaders.put("Content-Type",
-Arrays.asList(new String[] {"text/plain;charset=" + 
userAgentCharaceterEncoding}));
+Arrays.asList(new String[] {"text/plain;charset=" + 

[tomcat] 02/08: Fix spellings in unit tests

2020-09-16 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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

commit f89922186c10ba50d47b22d2690f05587340513c
Author: Mark Thomas 
AuthorDate: Wed Sep 16 18:03:51 2020 +0100

Fix spellings in unit tests

Based on a PR provided by John Bampton
---
 test/javax/el/TestArrayELResolver.java |  2 +-
 .../el/TestImportHandlerStandardPackages.java  |  2 +-
 test/javax/servlet/http/TestHttpServlet.java   |  2 +-
 .../jaspic/TestAuthConfigFactoryImpl.java  |  8 ++---
 .../org/apache/catalina/connector/TestRequest.java |  6 ++--
 .../apache/catalina/core/TestAsyncContextImpl.java |  2 +-
 .../catalina/startup/TestMultipartConfig.java  |  2 +-
 .../catalina/startup/TestTomcatNoServer.java   |  4 +--
 .../util/TestContextNameExtractFromPath.java   |  2 +-
 .../apache/catalina/valves/TestRemoteIpValve.java  |  6 ++--
 test/org/apache/coyote/TestRequest.java| 16 +-
 test/org/apache/coyote/http2/TestAsyncFlush.java   |  2 +-
 test/org/apache/juli/TestFileHandler.java  | 36 +++---
 test/org/apache/naming/TesterInjectionServlet.java |  2 +-
 .../websocket/pojo/TestEncodingDecoding.java   |  6 ++--
 15 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/test/javax/el/TestArrayELResolver.java 
b/test/javax/el/TestArrayELResolver.java
index 1280fb1..69ae176 100644
--- a/test/javax/el/TestArrayELResolver.java
+++ b/test/javax/el/TestArrayELResolver.java
@@ -520,7 +520,7 @@ public class TestArrayELResolver {
 
 
 @Test
-public void testGetFeatureDescriptiors() {
+public void testGetFeatureDescriptors() {
 // Should always return null
 ArrayELResolver resolver = new ArrayELResolver();
 Assert.assertNull(resolver.getFeatureDescriptors(null, null));
diff --git a/test/javax/el/TestImportHandlerStandardPackages.java 
b/test/javax/el/TestImportHandlerStandardPackages.java
index 4d9c01a..79972df 100644
--- a/test/javax/el/TestImportHandlerStandardPackages.java
+++ b/test/javax/el/TestImportHandlerStandardPackages.java
@@ -105,7 +105,7 @@ public class TestImportHandlerStandardPackages {
 Assert.assertNotNull(files);
 for (String file : files) {
 if (!file.endsWith(".class")) {
-// Skip non-class resoucres
+// Skip non-class resources
 continue;
 }
 if (file.startsWith("Test")) {
diff --git a/test/javax/servlet/http/TestHttpServlet.java 
b/test/javax/servlet/http/TestHttpServlet.java
index 00e4036..6a011c4 100644
--- a/test/javax/servlet/http/TestHttpServlet.java
+++ b/test/javax/servlet/http/TestHttpServlet.java
@@ -213,7 +213,7 @@ public class TestHttpServlet extends TomcatBaseTest {
 
 
 /*
- * See org.aoache.coyote.http2.TestHttpServlet for the HTTP/2 version of
+ * See org.apache.coyote.http2.TestHttpServlet for the HTTP/2 version of
  * this test. It was placed in that package because it needed access to
  * package private classes.
  */
diff --git 
a/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java 
b/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
index 38fff7b..a220e99 100644
--- 
a/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
+++ 
b/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
@@ -41,19 +41,19 @@ public class TestAuthConfigFactoryImpl {
 
 @Test
 public void testRegistrationNullLayer() {
-doTestResistration(null,  "AC_1",  ":AC_1");
+doTestRegistration(null,  "AC_1",  ":AC_1");
 }
 
 
 @Test
 public void testRegistrationNullAppContext() {
-doTestResistration("L_1",  null,  "L_1:");
+doTestRegistration("L_1",  null,  "L_1:");
 }
 
 
 @Test
 public void testRegistrationNullLayerAndNullAppContext() {
-doTestResistration(null,  null,  ":");
+doTestRegistration(null,  null,  ":");
 }
 
 
@@ -151,7 +151,7 @@ public class TestAuthConfigFactoryImpl {
 }
 
 
-private void doTestResistration(String layer, String appContext, String 
expectedRegId) {
+private void doTestRegistration(String layer, String appContext, String 
expectedRegId) {
 AuthConfigFactory factory = new AuthConfigFactoryImpl();
 AuthConfigProvider acp1 = new SimpleAuthConfigProvider(null, null);
 SimpleRegistrationListener listener = new 
SimpleRegistrationListener(layer, appContext);
diff --git a/test/org/apache/catalina/connector/TestRequest.java 
b/test/org/apache/catalina/connector/TestRequest.java
index eee3d32..2de72c9 100644
--- a/test/org/apache/catalina/connector/TestRequest.java
+++ b/test/org/apache/catalina/connector/TestRequest.java
@@ -921,7 +921,7 @@ public class TestRequest extends 

[tomcat] 02/08: Fix spellings in unit tests

2020-09-16 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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

commit f89922186c10ba50d47b22d2690f05587340513c
Author: Mark Thomas 
AuthorDate: Wed Sep 16 18:03:51 2020 +0100

Fix spellings in unit tests

Based on a PR provided by John Bampton
---
 test/javax/el/TestArrayELResolver.java |  2 +-
 .../el/TestImportHandlerStandardPackages.java  |  2 +-
 test/javax/servlet/http/TestHttpServlet.java   |  2 +-
 .../jaspic/TestAuthConfigFactoryImpl.java  |  8 ++---
 .../org/apache/catalina/connector/TestRequest.java |  6 ++--
 .../apache/catalina/core/TestAsyncContextImpl.java |  2 +-
 .../catalina/startup/TestMultipartConfig.java  |  2 +-
 .../catalina/startup/TestTomcatNoServer.java   |  4 +--
 .../util/TestContextNameExtractFromPath.java   |  2 +-
 .../apache/catalina/valves/TestRemoteIpValve.java  |  6 ++--
 test/org/apache/coyote/TestRequest.java| 16 +-
 test/org/apache/coyote/http2/TestAsyncFlush.java   |  2 +-
 test/org/apache/juli/TestFileHandler.java  | 36 +++---
 test/org/apache/naming/TesterInjectionServlet.java |  2 +-
 .../websocket/pojo/TestEncodingDecoding.java   |  6 ++--
 15 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/test/javax/el/TestArrayELResolver.java 
b/test/javax/el/TestArrayELResolver.java
index 1280fb1..69ae176 100644
--- a/test/javax/el/TestArrayELResolver.java
+++ b/test/javax/el/TestArrayELResolver.java
@@ -520,7 +520,7 @@ public class TestArrayELResolver {
 
 
 @Test
-public void testGetFeatureDescriptiors() {
+public void testGetFeatureDescriptors() {
 // Should always return null
 ArrayELResolver resolver = new ArrayELResolver();
 Assert.assertNull(resolver.getFeatureDescriptors(null, null));
diff --git a/test/javax/el/TestImportHandlerStandardPackages.java 
b/test/javax/el/TestImportHandlerStandardPackages.java
index 4d9c01a..79972df 100644
--- a/test/javax/el/TestImportHandlerStandardPackages.java
+++ b/test/javax/el/TestImportHandlerStandardPackages.java
@@ -105,7 +105,7 @@ public class TestImportHandlerStandardPackages {
 Assert.assertNotNull(files);
 for (String file : files) {
 if (!file.endsWith(".class")) {
-// Skip non-class resoucres
+// Skip non-class resources
 continue;
 }
 if (file.startsWith("Test")) {
diff --git a/test/javax/servlet/http/TestHttpServlet.java 
b/test/javax/servlet/http/TestHttpServlet.java
index 00e4036..6a011c4 100644
--- a/test/javax/servlet/http/TestHttpServlet.java
+++ b/test/javax/servlet/http/TestHttpServlet.java
@@ -213,7 +213,7 @@ public class TestHttpServlet extends TomcatBaseTest {
 
 
 /*
- * See org.aoache.coyote.http2.TestHttpServlet for the HTTP/2 version of
+ * See org.apache.coyote.http2.TestHttpServlet for the HTTP/2 version of
  * this test. It was placed in that package because it needed access to
  * package private classes.
  */
diff --git 
a/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java 
b/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
index 38fff7b..a220e99 100644
--- 
a/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
+++ 
b/test/org/apache/catalina/authenticator/jaspic/TestAuthConfigFactoryImpl.java
@@ -41,19 +41,19 @@ public class TestAuthConfigFactoryImpl {
 
 @Test
 public void testRegistrationNullLayer() {
-doTestResistration(null,  "AC_1",  ":AC_1");
+doTestRegistration(null,  "AC_1",  ":AC_1");
 }
 
 
 @Test
 public void testRegistrationNullAppContext() {
-doTestResistration("L_1",  null,  "L_1:");
+doTestRegistration("L_1",  null,  "L_1:");
 }
 
 
 @Test
 public void testRegistrationNullLayerAndNullAppContext() {
-doTestResistration(null,  null,  ":");
+doTestRegistration(null,  null,  ":");
 }
 
 
@@ -151,7 +151,7 @@ public class TestAuthConfigFactoryImpl {
 }
 
 
-private void doTestResistration(String layer, String appContext, String 
expectedRegId) {
+private void doTestRegistration(String layer, String appContext, String 
expectedRegId) {
 AuthConfigFactory factory = new AuthConfigFactoryImpl();
 AuthConfigProvider acp1 = new SimpleAuthConfigProvider(null, null);
 SimpleRegistrationListener listener = new 
SimpleRegistrationListener(layer, appContext);
diff --git a/test/org/apache/catalina/connector/TestRequest.java 
b/test/org/apache/catalina/connector/TestRequest.java
index eee3d32..2de72c9 100644
--- a/test/org/apache/catalina/connector/TestRequest.java
+++ b/test/org/apache/catalina/connector/TestRequest.java
@@ -921,7 +921,7 @@ public class TestRequest extends