Author: markt
Date: Mon Jun 15 16:21:22 2009
New Revision: 784843
URL: http://svn.apache.org/viewvc?rev=784843&view=rev
Log:
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*
Added:
tomcat/trunk/test/org/apache/catalina/ha/session/TesterPrincipal.java
- copied, changed from r784605,
tomcat/trunk/test/org/apache/catalina/ha/session/TestPrincipal.java
tomcat/trunk/test/org/apache/catalina/ha/session/TesterSerializablePrincipal.java
- copied, changed from r784605,
tomcat/trunk/test/org/apache/catalina/ha/session/TestSerializablePrincipal.java
tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java
- copied, changed from r784605,
tomcat/trunk/test/org/apache/catalina/startup/TomcatStartupAPITest.java
tomcat/trunk/test/org/apache/catalina/tribes/test/NioSenderTest.java
- copied, changed from r784605,
tomcat/trunk/test/org/apache/catalina/tribes/test/TestNioSender.java
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestChannelStartStop.java
- copied, changed from r784605,
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/ChannelStartStop.java
tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestMemberSerialization.java
- copied, changed from r784605,
tomcat/trunk/test/org/apache/catalina/tribes/test/membership/MemberSerialization.java
Removed:
tomcat/trunk/test/org/apache/catalina/ha/session/TestPrincipal.java
tomcat/trunk/test/org/apache/catalina/ha/session/TestSerializablePrincipal.java
tomcat/trunk/test/org/apache/catalina/startup/TomcatStartupAPITest.java
tomcat/trunk/test/org/apache/catalina/tribes/test/TestNioSender.java
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/ChannelStartStop.java
tomcat/trunk/test/org/apache/catalina/tribes/test/membership/MemberSerialization.java
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
tomcat/trunk/test/org/apache/TestAll.java
tomcat/trunk/test/org/apache/catalina/tribes/test/TribesTestSuite.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=784843&r1=784842&r2=784843&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java Mon Jun 15
16:21:22 2009
@@ -77,7 +77,7 @@
* 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 {
Modified: tomcat/trunk/test/org/apache/TestAll.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/TestAll.java?rev=784843&r1=784842&r2=784843&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/TestAll.java (original)
+++ tomcat/trunk/test/org/apache/TestAll.java Mon Jun 15 16:21:22 2009
@@ -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 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
Copied: tomcat/trunk/test/org/apache/catalina/ha/session/TesterPrincipal.java
(from r784605,
tomcat/trunk/test/org/apache/catalina/ha/session/TestPrincipal.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/ha/session/TesterPrincipal.java?p2=tomcat/trunk/test/org/apache/catalina/ha/session/TesterPrincipal.java&p1=tomcat/trunk/test/org/apache/catalina/ha/session/TestPrincipal.java&r1=784605&r2=784843&rev=784843&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/ha/session/TestPrincipal.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/ha/session/TesterPrincipal.java Mon
Jun 15 16:21:22 2009
@@ -20,11 +20,11 @@
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;
}
Copied:
tomcat/trunk/test/org/apache/catalina/ha/session/TesterSerializablePrincipal.java
(from r784605,
tomcat/trunk/test/org/apache/catalina/ha/session/TestSerializablePrincipal.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/ha/session/TesterSerializablePrincipal.java?p2=tomcat/trunk/test/org/apache/catalina/ha/session/TesterSerializablePrincipal.java&p1=tomcat/trunk/test/org/apache/catalina/ha/session/TestSerializablePrincipal.java&r1=784605&r2=784843&rev=784843&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/ha/session/TestSerializablePrincipal.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/ha/session/TesterSerializablePrincipal.java
Mon Jun 15 16:21:22 2009
@@ -31,7 +31,7 @@
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 @@
List<String> roles = new ArrayList<String>();
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);
Copied: tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java (from
r784605,
tomcat/trunk/test/org/apache/catalina/startup/TomcatStartupAPITest.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java?p2=tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java&p1=tomcat/trunk/test/org/apache/catalina/startup/TomcatStartupAPITest.java&r1=784605&r2=784843&rev=784843&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TomcatStartupAPITest.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TestTomcat.java Mon Jun 15
16:21:22 2009
@@ -34,7 +34,7 @@
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 = "./";
Copied: tomcat/trunk/test/org/apache/catalina/tribes/test/NioSenderTest.java
(from r784605,
tomcat/trunk/test/org/apache/catalina/tribes/test/TestNioSender.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/NioSenderTest.java?p2=tomcat/trunk/test/org/apache/catalina/tribes/test/NioSenderTest.java&p1=tomcat/trunk/test/org/apache/catalina/tribes/test/TestNioSender.java&r1=784605&r2=784843&rev=784843&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/tribes/test/TestNioSender.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/tribes/test/NioSenderTest.java Mon
Jun 15 16:21:22 2009
@@ -36,12 +36,12 @@
* @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 static void main(String[] args) throws Exception {
- TestNioSender sender = new TestNioSender();
+ NioSenderTest sender = new NioSenderTest();
sender.init();
sender.run();
}
Modified: tomcat/trunk/test/org/apache/catalina/tribes/test/TribesTestSuite.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/TribesTestSuite.java?rev=784843&r1=784842&r2=784843&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/tribes/test/TribesTestSuite.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/tribes/test/TribesTestSuite.java Mon
Jun 15 16:21:22 2009
@@ -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.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 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 @@
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);
Copied:
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestChannelStartStop.java
(from r784605,
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/ChannelStartStop.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestChannelStartStop.java?p2=tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestChannelStartStop.java&p1=tomcat/trunk/test/org/apache/catalina/tribes/test/channel/ChannelStartStop.java&r1=784605&r2=784843&rev=784843&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/ChannelStartStop.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestChannelStartStop.java
Mon Jun 15 16:21:22 2009
@@ -24,7 +24,7 @@
* @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 {
Copied:
tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestMemberSerialization.java
(from r784605,
tomcat/trunk/test/org/apache/catalina/tribes/test/membership/MemberSerialization.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestMemberSerialization.java?p2=tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestMemberSerialization.java&p1=tomcat/trunk/test/org/apache/catalina/tribes/test/membership/MemberSerialization.java&r1=784605&r2=784843&rev=784843&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/tribes/test/membership/MemberSerialization.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestMemberSerialization.java
Mon Jun 15 16:21:22 2009
@@ -29,7 +29,7 @@
* @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;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
