From 7e71adc3d7a50cf3ec9ec34d6d3656081bd32caa Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 5 Jul 2011 12:06:04 +0000
Subject: [PATCH] Move working JUnit tests to align with package of class being
 tested.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1143016 13f79535-47bb-0310-9956-ffa450edef68
---
 .../TestGroupChannelMemberArrival.java}            |  5 ++--
 .../TestGroupChannelOptionFlag.java}               |  6 ++--
 .../TestGroupChannelSenderConnections.java}        |  5 ++--
 .../TestGroupChannelStartStop.java}                |  5 ++--
 .../interceptors/TestDomainFilterInterceptor.java} |  5 ++--
 .../interceptors/TestNonBlockingCoordinator.java   |  4 +--
 .../interceptors/TestOrderInterceptor.java         |  3 +-
 .../interceptors}/TestTcpFailureDetector.java      |  3 +-
 .../TestXByteBuffer.java}                          |  6 ++--
 .../TestMemberImplSerialization.java}              |  6 ++--
 .../catalina/tribes/test/TribesTestSuite.java      | 34 +++++++++++-----------
 11 files changed, 34 insertions(+), 48 deletions(-)
 rename test/org/apache/catalina/tribes/{test/membership/TestMemberArrival.java => group/TestGroupChannelMemberArrival.java} (97%)
 rename test/org/apache/catalina/tribes/{test/channel/TestChannelOptionFlag.java => group/TestGroupChannelOptionFlag.java} (92%)
 rename test/org/apache/catalina/tribes/{test/io/TestSenderConnections.java => group/TestGroupChannelSenderConnections.java} (96%)
 rename test/org/apache/catalina/tribes/{test/channel/TestChannelStartStop.java => group/TestGroupChannelStartStop.java} (96%)
 rename test/org/apache/catalina/tribes/{test/membership/TestDomainFilter.java => group/interceptors/TestDomainFilterInterceptor.java} (96%)
 rename test/org/apache/catalina/tribes/{test => group}/interceptors/TestNonBlockingCoordinator.java (95%)
 rename test/org/apache/catalina/tribes/{test => group}/interceptors/TestOrderInterceptor.java (98%)
 rename test/org/apache/catalina/tribes/{test/membership => group/interceptors}/TestTcpFailureDetector.java (98%)
 rename test/org/apache/catalina/tribes/{test/io/TestSerialization.java => io/TestXByteBuffer.java} (90%)
 rename test/org/apache/catalina/tribes/{test/membership/TestMemberSerialization.java => membership/TestMemberImplSerialization.java} (95%)

diff --git a/test/org/apache/catalina/tribes/test/membership/TestMemberArrival.java b/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
similarity index 97%
rename from test/org/apache/catalina/tribes/test/membership/TestMemberArrival.java
rename to test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
index 3fb99f032..aa6f9a642 100644
--- a/test/org/apache/catalina/tribes/test/membership/TestMemberArrival.java
+++ b/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
@@ -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.Channel;
 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];
diff --git a/test/org/apache/catalina/tribes/test/channel/TestChannelOptionFlag.java b/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java
similarity index 92%
rename from test/org/apache/catalina/tribes/test/channel/TestChannelOptionFlag.java
rename to test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java
index 85324ec19..dc855e833 100644
--- a/test/org/apache/catalina/tribes/test/channel/TestChannelOptionFlag.java
+++ b/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java
@@ -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.GroupChannel;
  * @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 {
diff --git a/test/org/apache/catalina/tribes/test/io/TestSenderConnections.java b/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java
similarity index 96%
rename from test/org/apache/catalina/tribes/test/io/TestSenderConnections.java
rename to test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java
index ea296a54f..d32411de9 100644
--- a/test/org/apache/catalina/tribes/test/io/TestSenderConnections.java
+++ b/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java
@@ -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.Channel;
 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];
diff --git a/test/org/apache/catalina/tribes/test/channel/TestChannelStartStop.java b/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java
similarity index 96%
rename from test/org/apache/catalina/tribes/test/channel/TestChannelStartStop.java
rename to test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java
index d77f43306..070126dbc 100644
--- a/test/org/apache/catalina/tribes/test/channel/TestChannelStartStop.java
+++ b/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java
@@ -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
diff --git a/test/org/apache/catalina/tribes/test/membership/TestDomainFilter.java b/test/org/apache/catalina/tribes/group/interceptors/TestDomainFilterInterceptor.java
similarity index 96%
rename from test/org/apache/catalina/tribes/test/membership/TestDomainFilter.java
rename to test/org/apache/catalina/tribes/group/interceptors/TestDomainFilterInterceptor.java
index 19c5cefd1..fbf2c472d 100644
--- a/test/org/apache/catalina/tribes/test/membership/TestDomainFilter.java
+++ b/test/org/apache/catalina/tribes/group/interceptors/TestDomainFilterInterceptor.java
@@ -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.ManagedChannel;
 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];
diff --git a/test/org/apache/catalina/tribes/test/interceptors/TestNonBlockingCoordinator.java b/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
similarity index 95%
rename from test/org/apache/catalina/tribes/test/interceptors/TestNonBlockingCoordinator.java
rename to test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
index f1e2c2796..828b95cd1 100644
--- a/test/org/apache/catalina/tribes/test/interceptors/TestNonBlockingCoordinator.java
+++ b/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
@@ -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 {
 
diff --git a/test/org/apache/catalina/tribes/test/interceptors/TestOrderInterceptor.java b/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java
similarity index 98%
rename from test/org/apache/catalina/tribes/test/interceptors/TestOrderInterceptor.java
rename to test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java
index 95a4a5940..dc6e6b71a 100644
--- a/test/org/apache/catalina/tribes/test/interceptors/TestOrderInterceptor.java
+++ b/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java
@@ -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 {
 
diff --git a/test/org/apache/catalina/tribes/test/membership/TestTcpFailureDetector.java b/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java
similarity index 98%
rename from test/org/apache/catalina/tribes/test/membership/TestTcpFailureDetector.java
rename to test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java
index 83f4fe79c..82f4ea511 100644
--- a/test/org/apache/catalina/tribes/test/membership/TestTcpFailureDetector.java
+++ b/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java
@@ -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.ManagedChannel;
 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> 
diff --git a/test/org/apache/catalina/tribes/test/io/TestSerialization.java b/test/org/apache/catalina/tribes/io/TestXByteBuffer.java
similarity index 90%
rename from test/org/apache/catalina/tribes/test/io/TestSerialization.java
rename to test/org/apache/catalina/tribes/io/TestXByteBuffer.java
index 378bf8a18..9704ccf9c 100644
--- a/test/org/apache/catalina/tribes/test/io/TestSerialization.java
+++ b/test/org/apache/catalina/tribes/io/TestXByteBuffer.java
@@ -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();
diff --git a/test/org/apache/catalina/tribes/test/membership/TestMemberSerialization.java b/test/org/apache/catalina/tribes/membership/TestMemberImplSerialization.java
similarity index 95%
rename from test/org/apache/catalina/tribes/test/membership/TestMemberSerialization.java
rename to test/org/apache/catalina/tribes/membership/TestMemberImplSerialization.java
index c7e842b3a..4d070603d 100644
--- a/test/org/apache/catalina/tribes/test/membership/TestMemberSerialization.java
+++ b/test/org/apache/catalina/tribes/membership/TestMemberImplSerialization.java
@@ -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.membership.MemberImpl;
  * @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;
diff --git a/test/org/apache/catalina/tribes/test/TribesTestSuite.java b/test/org/apache/catalina/tribes/test/TribesTestSuite.java
index 48b9eebd5..f9bce6591 100644
--- a/test/org/apache/catalina/tribes/test/TribesTestSuite.java
+++ b/test/org/apache/catalina/tribes/test/TribesTestSuite.java
@@ -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;
     }
-- 
2.11.0