* This is necessary in order for the rest of the world to communicate * with classes loaded via a custom classloader. As an example, junit - * testcases which are loaded via a custom classloader needs to see - * the same junit classes as the code invoking the testcase, otherwise + * tests which are loaded via a custom classloader needs to see + * the same junit classes as the code invoking the test, otherwise * they can't pass result objects back. *
* Normally, only a classloader created with a null parent needs to @@ -79,7 +79,7 @@ public class PathableClassLoader extends URLClassLoader { * totally clean; nothing but the standard java library will be * present. *
- * When using a null parent classloader with a junit testcase, it *is* + * When using a null parent classloader with a junit test, it *is* * necessary for the junit library to also be visible. In this case, it * is recommended that the following code be used: *
diff --git a/src/test/java/org/apache/commons/logging/config/FirstPriorityConfigTestCase.java b/src/test/java/org/apache/commons/logging/config/FirstPriorityConfigTestCase.java
index 62b6612..250f6e6 100644
--- a/src/test/java/org/apache/commons/logging/config/FirstPriorityConfigTestCase.java
+++ b/src/test/java/org/apache/commons/logging/config/FirstPriorityConfigTestCase.java
@@ -63,7 +63,7 @@ public class FirstPriorityConfigTestCase extends TestCase {
final URL baseUrl = dummy.findResource(thisClassPath);
// Now set up the desired classloader hierarchy. We'll put JCL
- // in the container path, the testcase in a webapp path, and
+ // in the container path, the test in a webapp path, and
// both config files into the webapp path too.
final PathableClassLoader containerLoader = new PathableClassLoader(null);
containerLoader.useExplicitLoader("junit.", Test.class.getClassLoader());
diff --git a/src/test/java/org/apache/commons/logging/security/MockSecurityManager.java b/src/test/java/org/apache/commons/logging/security/MockSecurityManager.java
index 92f1b5a..0621603 100644
--- a/src/test/java/org/apache/commons/logging/security/MockSecurityManager.java
+++ b/src/test/java/org/apache/commons/logging/security/MockSecurityManager.java
@@ -131,8 +131,8 @@ public class MockSecurityManager extends SecurityManager {
// this is the unit test code; treat this like an untrusted client
// app that is using JCL
++untrustedCodeCount;
- System.out.println("Untrusted code [testcase] found");
- throw new SecurityException("Untrusted code [testcase] found");
+ System.out.println("Untrusted code [test] found");
+ throw new SecurityException("Untrusted code [test] found");
} else if (cname.startsWith("org.apache.commons.logging.")) {
if (!permissions.implies(p)) {
System.out.println("Permission refused:" + p.getClass() + ":" + p);
diff --git a/src/test/java/org/apache/commons/logging/security/SecurityAllowedTestCase.java b/src/test/java/org/apache/commons/logging/security/SecurityAllowedTestCase.java
index d17b43b..bd30be5 100644
--- a/src/test/java/org/apache/commons/logging/security/SecurityAllowedTestCase.java
+++ b/src/test/java/org/apache/commons/logging/security/SecurityAllowedTestCase.java
@@ -39,7 +39,7 @@ import org.apache.commons.logging.PathableTestSuite;
* the static block of the LogFactory class. As that class cannot be unloaded after
* being loaded into a classloader, the only workaround is to use the
* PathableClassLoader approach to ensure each test is run in its own
- * classloader, and use a separate testcase class for each test.
+ * classloader, and use a separate test class for each test.
*/
public class SecurityAllowedTestCase extends TestCase
{
diff --git a/src/test/java/org/apache/commons/logging/security/SecurityForbiddenTestCase.java b/src/test/java/org/apache/commons/logging/security/SecurityForbiddenTestCase.java
index 6335c71..c934f4c 100644
--- a/src/test/java/org/apache/commons/logging/security/SecurityForbiddenTestCase.java
+++ b/src/test/java/org/apache/commons/logging/security/SecurityForbiddenTestCase.java
@@ -44,7 +44,7 @@ import org.apache.commons.logging.PathableTestSuite;
* the static block of the LogFactory class. As that class cannot be unloaded after
* being loaded into a classloader, the only workaround is to use the
* PathableClassLoader approach to ensure each test is run in its own
- * classloader, and use a separate testcase class for each test.
+ * classloader, and use a separate test class for each test.
*/
public class SecurityForbiddenTestCase extends TestCase
{
diff --git a/src/test/java/org/apache/commons/logging/tccl/log/TcclDisabledTestCase.java b/src/test/java/org/apache/commons/logging/tccl/log/TcclDisabledTestCase.java
index 175baea..a1d5106 100644
--- a/src/test/java/org/apache/commons/logging/tccl/log/TcclDisabledTestCase.java
+++ b/src/test/java/org/apache/commons/logging/tccl/log/TcclDisabledTestCase.java
@@ -74,7 +74,7 @@ public class TcclDisabledTestCase extends TestCase {
parentLoader.useExplicitLoader("junit.", Test.class.getClassLoader());
parentLoader.addLogicalLib("commons-logging");
parentLoader.addLogicalLib("testclasses");
- // hack to ensure that the testcase classloader can't see
+ // hack to ensure that the test classloader can't see
// the custom MyLog
parentLoader.useExplicitLoader(MY_LOG_PKG + ".", emptyLoader);
diff --git a/src/test/java/org/apache/commons/logging/tccl/log/TcclEnabledTestCase.java b/src/test/java/org/apache/commons/logging/tccl/log/TcclEnabledTestCase.java
index 8ac0e3d..ee237bf 100644
--- a/src/test/java/org/apache/commons/logging/tccl/log/TcclEnabledTestCase.java
+++ b/src/test/java/org/apache/commons/logging/tccl/log/TcclEnabledTestCase.java
@@ -74,7 +74,7 @@ public class TcclEnabledTestCase extends TestCase {
parentLoader.useExplicitLoader("junit.", Test.class.getClassLoader());
parentLoader.addLogicalLib("commons-logging");
parentLoader.addLogicalLib("testclasses");
- // hack to ensure that the testcase classloader can't see
+ // hack to ensure that the test classloader can't see
// the custom MyLogFactoryImpl
parentLoader.useExplicitLoader(MY_LOG_PKG + ".", emptyLoader);
diff --git a/src/test/java/org/apache/commons/logging/tccl/logfactory/TcclDisabledTestCase.java b/src/test/java/org/apache/commons/logging/tccl/logfactory/TcclDisabledTestCase.java
index 32afbbd..019c69d 100644
--- a/src/test/java/org/apache/commons/logging/tccl/logfactory/TcclDisabledTestCase.java
+++ b/src/test/java/org/apache/commons/logging/tccl/logfactory/TcclDisabledTestCase.java
@@ -75,7 +75,7 @@ public class TcclDisabledTestCase extends TestCase {
parentLoader.useExplicitLoader("junit.", Test.class.getClassLoader());
parentLoader.addLogicalLib("commons-logging");
parentLoader.addLogicalLib("testclasses");
- // hack to ensure that the testcase classloader can't see
+ // hack to ensure that the test classloader can't see
// the custom MyLogFactoryImpl
parentLoader.useExplicitLoader(
MY_LOG_FACTORY_PKG + ".", emptyLoader);
diff --git a/src/test/java/org/apache/commons/logging/tccl/logfactory/TcclEnabledTestCase.java b/src/test/java/org/apache/commons/logging/tccl/logfactory/TcclEnabledTestCase.java
index f6053e3..b778d8b 100644
--- a/src/test/java/org/apache/commons/logging/tccl/logfactory/TcclEnabledTestCase.java
+++ b/src/test/java/org/apache/commons/logging/tccl/logfactory/TcclEnabledTestCase.java
@@ -69,7 +69,7 @@ public class TcclEnabledTestCase extends TestCase {
parentLoader.useExplicitLoader("junit.", Test.class.getClassLoader());
parentLoader.addLogicalLib("commons-logging");
parentLoader.addLogicalLib("testclasses");
- // hack to ensure that the testcase classloader can't see
+ // hack to ensure that the test classloader can't see
// the cust MyLogFactoryImpl
parentLoader.useExplicitLoader(
"org.apache.commons.logging.tccl.custom.", emptyLoader);