From 36a9cc5aeb8aefe003fa7cd38987cc5ca7c44dd0 Mon Sep 17 00:00:00 2001 From: markt Date: Mon, 15 Jun 2009 16:21:22 +0000 Subject: [PATCH] Partly address bug 47124: Name unit tests consistently. All JUnit test cases are named Test*. There was at least one class named Test* that was not a JUnit test case. These were renamed *Test. Helper / stub implementations are named Tester* git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@784843 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/startup/Tomcat.java | 2 +- test/org/apache/TestAll.java | 8 ++++---- .../ha/session/{TestPrincipal.java => TesterPrincipal.java} | 4 ++-- ...erializablePrincipal.java => TesterSerializablePrincipal.java} | 4 ++-- .../startup/{TomcatStartupAPITest.java => TestTomcat.java} | 2 +- .../tribes/test/{TestNioSender.java => NioSenderTest.java} | 6 +++--- test/org/apache/catalina/tribes/test/TribesTestSuite.java | 8 ++++---- .../channel/{ChannelStartStop.java => TestChannelStartStop.java} | 2 +- .../{MemberSerialization.java => TestMemberSerialization.java} | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) rename test/org/apache/catalina/ha/session/{TestPrincipal.java => TesterPrincipal.java} (90%) rename test/org/apache/catalina/ha/session/{TestSerializablePrincipal.java => TesterSerializablePrincipal.java} (96%) rename test/org/apache/catalina/startup/{TomcatStartupAPITest.java => TestTomcat.java} (98%) rename test/org/apache/catalina/tribes/test/{TestNioSender.java => NioSenderTest.java} (97%) rename test/org/apache/catalina/tribes/test/channel/{ChannelStartStop.java => TestChannelStartStop.java} (98%) rename test/org/apache/catalina/tribes/test/membership/{MemberSerialization.java => TestMemberSerialization.java} (98%) diff --git a/java/org/apache/catalina/startup/Tomcat.java b/java/org/apache/catalina/startup/Tomcat.java index e3b067243..e86678dda 100644 --- a/java/org/apache/catalina/startup/Tomcat.java +++ b/java/org/apache/catalina/startup/Tomcat.java @@ -77,7 +77,7 @@ import org.apache.catalina.session.StandardManager; * see setters for doc. It can be used for simple tests and * demo. * - * @see TomcatStartupAPITest for examples on how to use this + * @see TestTomcat for examples on how to use this * @author Costin Manolache */ public class Tomcat { diff --git a/test/org/apache/TestAll.java b/test/org/apache/TestAll.java index 0a3894801..999b332c9 100644 --- a/test/org/apache/TestAll.java +++ b/test/org/apache/TestAll.java @@ -1,7 +1,7 @@ package org.apache; -import org.apache.catalina.ha.session.TestSerializablePrincipal; -import org.apache.catalina.startup.TomcatStartupAPITest; +import org.apache.catalina.ha.session.TesterSerializablePrincipal; +import org.apache.catalina.startup.TestTomcat; import org.apache.catalina.tribes.test.TribesTestSuite; import org.apache.el.lang.TestELSupport; import org.apache.el.parser.TestELParser; @@ -16,9 +16,9 @@ public class TestAll { public static Test suite() { TestSuite suite = new TestSuite("Test for org.apache"); // o.a.catalina.ha.session - suite.addTestSuite(TestSerializablePrincipal.class); // TODO rename + suite.addTestSuite(TesterSerializablePrincipal.class); // TODO rename // o.a.catalina.startup - suite.addTestSuite(TomcatStartupAPITest.class); + suite.addTestSuite(TestTomcat.class); // o.a.catalina.tomcat.util.http - TODO fix package suite.addTestSuite(TestCookies.class); // TODO rename // Tribes diff --git a/test/org/apache/catalina/ha/session/TestPrincipal.java b/test/org/apache/catalina/ha/session/TesterPrincipal.java similarity index 90% rename from test/org/apache/catalina/ha/session/TestPrincipal.java rename to test/org/apache/catalina/ha/session/TesterPrincipal.java index 7a7fed1c8..774f31076 100644 --- a/test/org/apache/catalina/ha/session/TestPrincipal.java +++ b/test/org/apache/catalina/ha/session/TesterPrincipal.java @@ -20,11 +20,11 @@ package org.apache.catalina.ha.session; import java.io.Serializable; import java.security.Principal; -public class TestPrincipal implements Principal, Serializable { +public class TesterPrincipal implements Principal, Serializable { private String name; - public TestPrincipal(String theName) { + public TesterPrincipal(String theName) { name = theName; } diff --git a/test/org/apache/catalina/ha/session/TestSerializablePrincipal.java b/test/org/apache/catalina/ha/session/TesterSerializablePrincipal.java similarity index 96% rename from test/org/apache/catalina/ha/session/TestSerializablePrincipal.java rename to test/org/apache/catalina/ha/session/TesterSerializablePrincipal.java index 4f572d88f..867943f08 100644 --- a/test/org/apache/catalina/ha/session/TestSerializablePrincipal.java +++ b/test/org/apache/catalina/ha/session/TesterSerializablePrincipal.java @@ -31,7 +31,7 @@ import org.apache.catalina.realm.GenericPrincipal; import junit.framework.TestCase; -public class TestSerializablePrincipal extends TestCase { +public class TesterSerializablePrincipal extends TestCase { /** * Simple serialization / de-serialization test for bug 43840. @@ -51,7 +51,7 @@ public class TestSerializablePrincipal extends TestCase { List roles = new ArrayList(); roles.add("RoleA"); roles.add("RoleB"); - TestPrincipal tpOriginal = new TestPrincipal("inner"); + TesterPrincipal tpOriginal = new TesterPrincipal("inner"); GenericPrincipal gpOriginal = new GenericPrincipal(null, "usr", "pwd", roles, tpOriginal); diff --git a/test/org/apache/catalina/startup/TomcatStartupAPITest.java b/test/org/apache/catalina/startup/TestTomcat.java similarity index 98% rename from test/org/apache/catalina/startup/TomcatStartupAPITest.java rename to test/org/apache/catalina/startup/TestTomcat.java index 25fdf077c..62f2c491e 100644 --- a/test/org/apache/catalina/startup/TomcatStartupAPITest.java +++ b/test/org/apache/catalina/startup/TestTomcat.java @@ -34,7 +34,7 @@ import junit.framework.TestCase; import org.apache.catalina.core.StandardContext; import org.apache.tomcat.util.buf.ByteChunk; -public class TomcatStartupAPITest extends TestCase { +public class TestTomcat extends TestCase { Tomcat tomcat; // if you run in eclipse - or tomcat src dir String base = "./"; diff --git a/test/org/apache/catalina/tribes/test/TestNioSender.java b/test/org/apache/catalina/tribes/test/NioSenderTest.java similarity index 97% rename from test/org/apache/catalina/tribes/test/TestNioSender.java rename to test/org/apache/catalina/tribes/test/NioSenderTest.java index 277a9f20f..2ad672456 100644 --- a/test/org/apache/catalina/tribes/test/TestNioSender.java +++ b/test/org/apache/catalina/tribes/test/NioSenderTest.java @@ -36,12 +36,12 @@ import org.apache.catalina.tribes.Channel; * @author not attributable * @version 1.0 */ -public class TestNioSender { +public class NioSenderTest { private Selector selector = null; private int counter = 0; MemberImpl mbr; private static int testOptions = Channel.SEND_OPTIONS_DEFAULT; - public TestNioSender() { + public NioSenderTest() { // Default constructor } @@ -112,7 +112,7 @@ public class TestNioSender { } public static void main(String[] args) throws Exception { - TestNioSender sender = new TestNioSender(); + NioSenderTest sender = new NioSenderTest(); sender.init(); sender.run(); } diff --git a/test/org/apache/catalina/tribes/test/TribesTestSuite.java b/test/org/apache/catalina/tribes/test/TribesTestSuite.java index 8d8beec9b..e206aa8d4 100644 --- a/test/org/apache/catalina/tribes/test/TribesTestSuite.java +++ b/test/org/apache/catalina/tribes/test/TribesTestSuite.java @@ -16,7 +16,7 @@ */ package org.apache.catalina.tribes.test; -import org.apache.catalina.tribes.test.channel.ChannelStartStop; +import org.apache.catalina.tribes.test.channel.TestChannelStartStop; import org.apache.catalina.tribes.test.channel.TestChannelOptionFlag; import org.apache.catalina.tribes.test.channel.TestDataIntegrity; import org.apache.catalina.tribes.test.channel.TestMulticastPackages; @@ -27,7 +27,7 @@ import org.apache.catalina.tribes.test.interceptors.TestOrderInterceptor; import org.apache.catalina.tribes.test.interceptors.TestTwoPhaseCommit; import org.apache.catalina.tribes.test.io.TestSenderConnections; import org.apache.catalina.tribes.test.io.TestSerialization; -import org.apache.catalina.tribes.test.membership.MemberSerialization; +import org.apache.catalina.tribes.test.membership.TestMemberSerialization; import org.apache.catalina.tribes.test.membership.TestDomainFilter; import org.apache.catalina.tribes.test.membership.TestMemberArrival; import org.apache.catalina.tribes.test.membership.TestTcpFailureDetector; @@ -46,7 +46,7 @@ public class TribesTestSuite public static Test suite() { TestSuite suite = new TestSuite(); // o.a.catalina.tribes.test.channel - suite.addTestSuite(ChannelStartStop.class); + suite.addTestSuite(TestChannelStartStop.class); suite.addTestSuite(TestChannelOptionFlag.class); suite.addTestSuite(TestDataIntegrity.class); suite.addTestSuite(TestMulticastPackages.class); @@ -60,7 +60,7 @@ public class TribesTestSuite suite.addTestSuite(TestSenderConnections.class); suite.addTestSuite(TestSerialization.class); // o.a.catalina.tribes.test.membership - suite.addTestSuite(MemberSerialization.class); + suite.addTestSuite(TestMemberSerialization.class); suite.addTestSuite(TestDomainFilter.class); suite.addTestSuite(TestMemberArrival.class); suite.addTestSuite(TestTcpFailureDetector.class); diff --git a/test/org/apache/catalina/tribes/test/channel/ChannelStartStop.java b/test/org/apache/catalina/tribes/test/channel/TestChannelStartStop.java similarity index 98% rename from test/org/apache/catalina/tribes/test/channel/ChannelStartStop.java rename to test/org/apache/catalina/tribes/test/channel/TestChannelStartStop.java index 7828e70c2..517c51685 100644 --- a/test/org/apache/catalina/tribes/test/channel/ChannelStartStop.java +++ b/test/org/apache/catalina/tribes/test/channel/TestChannelStartStop.java @@ -24,7 +24,7 @@ import org.apache.catalina.tribes.transport.ReceiverBase; * @author Filip Hanik * @version 1.0 */ -public class ChannelStartStop extends TestCase { +public class TestChannelStartStop extends TestCase { GroupChannel channel = null; int udpPort = 45543; protected void setUp() throws Exception { diff --git a/test/org/apache/catalina/tribes/test/membership/MemberSerialization.java b/test/org/apache/catalina/tribes/test/membership/TestMemberSerialization.java similarity index 98% rename from test/org/apache/catalina/tribes/test/membership/MemberSerialization.java rename to test/org/apache/catalina/tribes/test/membership/TestMemberSerialization.java index 9fc7106c2..623f67446 100644 --- a/test/org/apache/catalina/tribes/test/membership/MemberSerialization.java +++ b/test/org/apache/catalina/tribes/test/membership/TestMemberSerialization.java @@ -29,7 +29,7 @@ import java.util.Arrays; * @author not attributable * @version 1.0 */ -public class MemberSerialization extends TestCase { +public class TestMemberSerialization extends TestCase { MemberImpl m1, m2, p1,p2; byte[] payload = null; int udpPort = 3445; -- 2.11.0