Author: markt
Date: Tue Jul 5 12:06:04 2011
New Revision: 1143016
URL: http://svn.apache.org/viewvc?rev=1143016&view=rev
Log:
Move working JUnit tests to align with package of class being tested.
Added:
tomcat/trunk/test/org/apache/catalina/tribes/group/
tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
- copied, changed from r1142970,
tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestMemberArrival.java
tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java
- copied, changed from r1142970,
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestChannelOptionFlag.java
tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java
- copied, changed from r1142970,
tomcat/trunk/test/org/apache/catalina/tribes/test/io/TestSenderConnections.java
tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java
- copied, changed from r1142970,
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestChannelStartStop.java
tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/
- copied from r1142970,
tomcat/trunk/test/org/apache/catalina/tribes/test/interceptors/
tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestDomainFilterInterceptor.java
- copied, changed from r1142970,
tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestDomainFilter.java
tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java
- copied, changed from r1142970,
tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestTcpFailureDetector.java
tomcat/trunk/test/org/apache/catalina/tribes/io/
- copied from r1142970,
tomcat/trunk/test/org/apache/catalina/tribes/test/io/
tomcat/trunk/test/org/apache/catalina/tribes/io/TestXByteBuffer.java
- copied, changed from r1142970,
tomcat/trunk/test/org/apache/catalina/tribes/test/io/TestSerialization.java
tomcat/trunk/test/org/apache/catalina/tribes/membership/
- copied from r1142970,
tomcat/trunk/test/org/apache/catalina/tribes/test/membership/
tomcat/trunk/test/org/apache/catalina/tribes/membership/TestMemberImplSerialization.java
- copied, changed from r1142970,
tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestMemberSerialization.java
Removed:
tomcat/trunk/test/org/apache/catalina/tribes/io/TestSenderConnections.java
tomcat/trunk/test/org/apache/catalina/tribes/io/TestSerialization.java
tomcat/trunk/test/org/apache/catalina/tribes/membership/TestDomainFilter.java
tomcat/trunk/test/org/apache/catalina/tribes/membership/TestMemberArrival.java
tomcat/trunk/test/org/apache/catalina/tribes/membership/TestMemberSerialization.java
tomcat/trunk/test/org/apache/catalina/tribes/membership/TestTcpFailureDetector.java
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestChannelOptionFlag.java
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestChannelStartStop.java
tomcat/trunk/test/org/apache/catalina/tribes/test/interceptors/
tomcat/trunk/test/org/apache/catalina/tribes/test/io/
tomcat/trunk/test/org/apache/catalina/tribes/test/membership/
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java
tomcat/trunk/test/org/apache/catalina/tribes/test/TribesTestSuite.java
Copied:
tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
(from r1142970,
tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestMemberArrival.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java?p2=tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java&p1=tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestMemberArrival.java&r1=1142970&r2=1143016&rev=1143016&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestMemberArrival.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
Tue Jul 5 12:06:04 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.catalina.tribes.test.membership;
+package org.apache.catalina.tribes.group;
import java.util.ArrayList;
@@ -24,9 +24,8 @@ import org.apache.catalina.tribes.Channe
import org.apache.catalina.tribes.ManagedChannel;
import org.apache.catalina.tribes.Member;
import org.apache.catalina.tribes.MembershipListener;
-import org.apache.catalina.tribes.group.GroupChannel;
-public class TestMemberArrival
+public class TestGroupChannelMemberArrival
extends TestCase {
private static int count = 10;
private ManagedChannel[] channels = new ManagedChannel[count];
Copied:
tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java
(from r1142970,
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestChannelOptionFlag.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java?p2=tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java&p1=tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestChannelOptionFlag.java&r1=1142970&r2=1143016&rev=1143016&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestChannelOptionFlag.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java
Tue Jul 5 12:06:04 2011
@@ -14,15 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.catalina.tribes.test.channel;
+package org.apache.catalina.tribes.group;
import junit.framework.TestCase;
import org.apache.catalina.tribes.Channel;
import org.apache.catalina.tribes.ChannelException;
import org.apache.catalina.tribes.ChannelInterceptor;
-import org.apache.catalina.tribes.group.ChannelInterceptorBase;
-import org.apache.catalina.tribes.group.GroupChannel;
/**
* <p>Title: </p>
@@ -34,7 +32,7 @@ import org.apache.catalina.tribes.group.
* @author not attributable
* @version 1.0
*/
-public class TestChannelOptionFlag extends TestCase {
+public class TestGroupChannelOptionFlag extends TestCase {
GroupChannel channel = null;
@Override
protected void setUp() throws Exception {
Copied:
tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java
(from r1142970,
tomcat/trunk/test/org/apache/catalina/tribes/test/io/TestSenderConnections.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java?p2=tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java&p1=tomcat/trunk/test/org/apache/catalina/tribes/test/io/TestSenderConnections.java&r1=1142970&r2=1143016&rev=1143016&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/tribes/test/io/TestSenderConnections.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java
Tue Jul 5 12:06:04 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.catalina.tribes.test.io;
+package org.apache.catalina.tribes.group;
import java.io.Serializable;
import java.util.ArrayList;
@@ -27,10 +27,9 @@ import org.apache.catalina.tribes.Channe
import org.apache.catalina.tribes.ChannelListener;
import org.apache.catalina.tribes.ManagedChannel;
import org.apache.catalina.tribes.Member;
-import org.apache.catalina.tribes.group.GroupChannel;
import org.apache.catalina.tribes.transport.ReplicationTransmitter;
-public class TestSenderConnections extends TestCase {
+public class TestGroupChannelSenderConnections extends TestCase {
private static int count = 2;
private ManagedChannel[] channels = new ManagedChannel[count];
private TestMsgListener[] listeners = new TestMsgListener[count];
Copied:
tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java
(from r1142970,
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestChannelStartStop.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java?p2=tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java&p1=tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestChannelStartStop.java&r1=1142970&r2=1143016&rev=1143016&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestChannelStartStop.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java
Tue Jul 5 12:06:04 2011
@@ -14,19 +14,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.catalina.tribes.test.channel;
+package org.apache.catalina.tribes.group;
import junit.framework.TestCase;
import org.apache.catalina.tribes.Channel;
-import org.apache.catalina.tribes.group.GroupChannel;
import org.apache.catalina.tribes.transport.ReceiverBase;
/**
* @author Filip Hanik
* @version 1.0
*/
-public class TestChannelStartStop extends TestCase {
+public class TestGroupChannelStartStop extends TestCase {
GroupChannel channel = null;
int udpPort = 45543;
@Override
Copied:
tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestDomainFilterInterceptor.java
(from r1142970,
tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestDomainFilter.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestDomainFilterInterceptor.java?p2=tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestDomainFilterInterceptor.java&p1=tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestDomainFilter.java&r1=1142970&r2=1143016&rev=1143016&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestDomainFilter.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestDomainFilterInterceptor.java
Tue Jul 5 12:06:04 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.catalina.tribes.test.membership;
+package org.apache.catalina.tribes.group.interceptors;
import java.util.ArrayList;
@@ -25,10 +25,9 @@ import org.apache.catalina.tribes.Manage
import org.apache.catalina.tribes.Member;
import org.apache.catalina.tribes.MembershipListener;
import org.apache.catalina.tribes.group.GroupChannel;
-import org.apache.catalina.tribes.group.interceptors.DomainFilterInterceptor;
import org.apache.catalina.tribes.util.UUIDGenerator;
-public class TestDomainFilter
+public class TestDomainFilterInterceptor
extends TestCase {
private static int count = 10;
private ManagedChannel[] channels = new ManagedChannel[count];
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java?rev=1143016&r1=1142970&r2=1143016&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
Tue Jul 5 12:06:04 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.catalina.tribes.test.interceptors;
+package org.apache.catalina.tribes.group.interceptors;
import junit.framework.TestCase;
import junit.framework.TestResult;
@@ -23,8 +23,6 @@ import junit.framework.TestSuite;
import org.apache.catalina.tribes.Channel;
import org.apache.catalina.tribes.Member;
import org.apache.catalina.tribes.group.GroupChannel;
-import org.apache.catalina.tribes.group.interceptors.NonBlockingCoordinator;
-import org.apache.catalina.tribes.group.interceptors.TcpFailureDetector;
public class TestNonBlockingCoordinator extends TestCase {
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java?rev=1143016&r1=1142970&r2=1143016&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java
Tue Jul 5 12:06:04 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.catalina.tribes.test.interceptors;
+package org.apache.catalina.tribes.group.interceptors;
import java.io.Serializable;
import java.util.Queue;
@@ -33,7 +33,6 @@ import org.apache.catalina.tribes.Member
import org.apache.catalina.tribes.group.ChannelInterceptorBase;
import org.apache.catalina.tribes.group.GroupChannel;
import org.apache.catalina.tribes.group.InterceptorPayload;
-import org.apache.catalina.tribes.group.interceptors.OrderInterceptor;
public class TestOrderInterceptor extends TestCase {
Copied:
tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java
(from r1142970,
tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestTcpFailureDetector.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java?p2=tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java&p1=tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestTcpFailureDetector.java&r1=1142970&r2=1143016&rev=1143016&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestTcpFailureDetector.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java
Tue Jul 5 12:06:04 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.catalina.tribes.test.membership;
+package org.apache.catalina.tribes.group.interceptors;
import java.util.ArrayList;
@@ -27,7 +27,6 @@ import org.apache.catalina.tribes.Manage
import org.apache.catalina.tribes.Member;
import org.apache.catalina.tribes.MembershipListener;
import org.apache.catalina.tribes.group.GroupChannel;
-import org.apache.catalina.tribes.group.interceptors.TcpFailureDetector;
/**
* <p>Title: </p>
Copied: tomcat/trunk/test/org/apache/catalina/tribes/io/TestXByteBuffer.java
(from r1142970,
tomcat/trunk/test/org/apache/catalina/tribes/test/io/TestSerialization.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/io/TestXByteBuffer.java?p2=tomcat/trunk/test/org/apache/catalina/tribes/io/TestXByteBuffer.java&p1=tomcat/trunk/test/org/apache/catalina/tribes/test/io/TestSerialization.java&r1=1142970&r2=1143016&rev=1143016&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/tribes/test/io/TestSerialization.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/tribes/io/TestXByteBuffer.java Tue
Jul 5 12:06:04 2011
@@ -14,13 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.catalina.tribes.test.io;
+package org.apache.catalina.tribes.io;
import junit.framework.TestCase;
-import org.apache.catalina.tribes.io.XByteBuffer;
-
-public class TestSerialization extends TestCase {
+public class TestXByteBuffer extends TestCase {
@Override
protected void setUp() throws Exception {
super.setUp();
Copied:
tomcat/trunk/test/org/apache/catalina/tribes/membership/TestMemberImplSerialization.java
(from r1142970,
tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestMemberSerialization.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/membership/TestMemberImplSerialization.java?p2=tomcat/trunk/test/org/apache/catalina/tribes/membership/TestMemberImplSerialization.java&p1=tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestMemberSerialization.java&r1=1142970&r2=1143016&rev=1143016&view=diff
==============================================================================
---
tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestMemberSerialization.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/tribes/membership/TestMemberImplSerialization.java
Tue Jul 5 12:06:04 2011
@@ -14,14 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.catalina.tribes.test.membership;
+package org.apache.catalina.tribes.membership;
import java.util.Arrays;
import junit.framework.TestCase;
-import org.apache.catalina.tribes.membership.MemberImpl;
-
/**
* <p>Title: </p>
*
@@ -32,7 +30,7 @@ import org.apache.catalina.tribes.member
* @author not attributable
* @version 1.0
*/
-public class TestMemberSerialization extends TestCase {
+public class TestMemberImplSerialization extends TestCase {
MemberImpl m1, m2, p1,p2;
byte[] payload = null;
int udpPort = 3445;
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=1143016&r1=1143015&r2=1143016&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/tribes/test/TribesTestSuite.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/tribes/test/TribesTestSuite.java Tue
Jul 5 12:06:04 2011
@@ -20,20 +20,20 @@ import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.apache.catalina.tribes.test.channel.TestChannelOptionFlag;
-import org.apache.catalina.tribes.test.channel.TestChannelStartStop;
+import org.apache.catalina.tribes.group.TestGroupChannelMemberArrival;
+import org.apache.catalina.tribes.group.TestGroupChannelOptionFlag;
+import org.apache.catalina.tribes.group.TestGroupChannelSenderConnections;
+import org.apache.catalina.tribes.group.TestGroupChannelStartStop;
+import
org.apache.catalina.tribes.group.interceptors.TestDomainFilterInterceptor;
+import
org.apache.catalina.tribes.group.interceptors.TestNonBlockingCoordinator;
+import org.apache.catalina.tribes.group.interceptors.TestOrderInterceptor;
+import org.apache.catalina.tribes.group.interceptors.TestTcpFailureDetector;
+import org.apache.catalina.tribes.io.TestXByteBuffer;
+import org.apache.catalina.tribes.membership.TestMemberImplSerialization;
import org.apache.catalina.tribes.test.channel.TestDataIntegrity;
import org.apache.catalina.tribes.test.channel.TestMulticastPackages;
import org.apache.catalina.tribes.test.channel.TestRemoteProcessException;
import org.apache.catalina.tribes.test.channel.TestUdpPackages;
-import org.apache.catalina.tribes.test.interceptors.TestNonBlockingCoordinator;
-import org.apache.catalina.tribes.test.interceptors.TestOrderInterceptor;
-import org.apache.catalina.tribes.test.io.TestSenderConnections;
-import org.apache.catalina.tribes.test.io.TestSerialization;
-import org.apache.catalina.tribes.test.membership.TestDomainFilter;
-import org.apache.catalina.tribes.test.membership.TestMemberArrival;
-import org.apache.catalina.tribes.test.membership.TestMemberSerialization;
-import org.apache.catalina.tribes.test.membership.TestTcpFailureDetector;
public class TribesTestSuite
extends TestCase {
@@ -45,8 +45,8 @@ public class TribesTestSuite
public static Test suite() {
TestSuite suite = new TestSuite();
// o.a.catalina.tribes.test.channel
- suite.addTestSuite(TestChannelStartStop.class);
- suite.addTestSuite(TestChannelOptionFlag.class);
+ suite.addTestSuite(TestGroupChannelStartStop.class);
+ suite.addTestSuite(TestGroupChannelOptionFlag.class);
suite.addTestSuite(TestDataIntegrity.class);
suite.addTestSuite(TestMulticastPackages.class);
suite.addTestSuite(TestRemoteProcessException.class);
@@ -55,12 +55,12 @@ public class TribesTestSuite
suite.addTestSuite(TestNonBlockingCoordinator.class);
suite.addTestSuite(TestOrderInterceptor.class);
// o.a.catalina.tribes.test.io
- suite.addTestSuite(TestSenderConnections.class);
- suite.addTestSuite(TestSerialization.class);
+ suite.addTestSuite(TestGroupChannelSenderConnections.class);
+ suite.addTestSuite(TestXByteBuffer.class);
// o.a.catalina.tribes.test.membership
- suite.addTestSuite(TestMemberSerialization.class);
- suite.addTestSuite(TestDomainFilter.class);
- suite.addTestSuite(TestMemberArrival.class);
+ suite.addTestSuite(TestMemberImplSerialization.class);
+ suite.addTestSuite(TestDomainFilterInterceptor.class);
+ suite.addTestSuite(TestGroupChannelMemberArrival.class);
suite.addTestSuite(TestTcpFailureDetector.class);
return suite;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
