Author: kkolinko
Date: Sat Nov 7 01:06:31 2015
New Revision: 1713059
URL: http://svn.apache.org/viewvc?rev=1713059&view=rev
Log:
Move and rename tests to align with Tomcat 7
Added:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
- copied, changed from r1713051,
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/membership/TestMemberArrival.java
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java
- copied, changed from r1713051,
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestChannelOptionFlag.java
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java
- copied, changed from r1713051,
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/io/TestSenderConnections.java
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java
- copied, changed from r1713051,
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/channel/ChannelStartStop.java
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/
- copied from r1713051,
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/interceptors/
Removed:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/channel/ChannelStartStop.java
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestChannelOptionFlag.java
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/interceptors/
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/io/TestSenderConnections.java
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/membership/TestMemberArrival.java
Modified:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/TribesTestSuite.java
Copied:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
(from r1713051,
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/membership/TestMemberArrival.java)
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java?p2=tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java&p1=tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/membership/TestMemberArrival.java&r1=1713051&r2=1713059&rev=1713059&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/membership/TestMemberArrival.java
(original)
+++
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
Sat Nov 7 01:06:31 2015
@@ -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;
@@ -22,10 +22,9 @@ 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;
import junit.framework.TestCase;
-public class TestMemberArrival
+public class TestGroupChannelMemberArrival
extends TestCase {
private static int count = 10;
private ManagedChannel[] channels = new ManagedChannel[count];
Copied:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java
(from r1713051,
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestChannelOptionFlag.java)
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java?p2=tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java&p1=tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestChannelOptionFlag.java&r1=1713051&r2=1713059&rev=1713059&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestChannelOptionFlag.java
(original)
+++
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java
Sat Nov 7 01:06:31 2015
@@ -14,10 +14,9 @@
* 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.*;
-import org.apache.catalina.tribes.group.*;
import org.apache.catalina.tribes.ChannelInterceptor;
import org.apache.catalina.tribes.ChannelException;
@@ -31,7 +30,7 @@ import org.apache.catalina.tribes.Channe
* @author not attributable
* @version 1.0
*/
-public class TestChannelOptionFlag extends TestCase {
+public class TestGroupChannelOptionFlag extends TestCase {
GroupChannel channel = null;
protected void setUp() throws Exception {
super.setUp();
Copied:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java
(from r1713051,
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/io/TestSenderConnections.java)
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java?p2=tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java&p1=tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/io/TestSenderConnections.java&r1=1713051&r2=1713059&rev=1713059&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/io/TestSenderConnections.java
(original)
+++
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java
Sat Nov 7 01:06:31 2015
@@ -14,15 +14,13 @@
* 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.util.ArrayList;
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;
import junit.framework.TestCase;
import org.apache.catalina.tribes.ChannelListener;
import java.io.Serializable;
@@ -30,7 +28,7 @@ import java.util.Random;
import java.util.HashMap;
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/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java
(from r1713051,
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/channel/ChannelStartStop.java)
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java?p2=tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java&p1=tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/channel/ChannelStartStop.java&r1=1713051&r2=1713059&rev=1713059&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/channel/ChannelStartStop.java
(original)
+++
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java
Sat Nov 7 01:06:31 2015
@@ -13,9 +13,8 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
*/
-package org.apache.catalina.tribes.test.channel;
+package org.apache.catalina.tribes.group;
-import org.apache.catalina.tribes.group.GroupChannel;
import junit.framework.TestCase;
import org.apache.catalina.tribes.transport.ReceiverBase;
@@ -23,7 +22,7 @@ import org.apache.catalina.tribes.transp
* @author Filip Hanik
* @version 1.0
*/
-public class ChannelStartStop extends TestCase {
+public class TestGroupChannelStartStop extends TestCase {
GroupChannel channel = null;
protected void setUp() throws Exception {
super.setUp();
Modified:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java?rev=1713059&r1=1713051&r2=1713059&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
(original)
+++
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java
Sat Nov 7 01:06:31 2015
@@ -14,13 +14,11 @@
* 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 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;
import junit.framework.TestCase;
import junit.framework.TestResult;
import junit.framework.TestSuite;
Modified:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java?rev=1713059&r1=1713051&r2=1713059&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java
(original)
+++
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java
Sat Nov 7 01:06:31 2015
@@ -14,19 +14,16 @@
* 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 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;
import junit.framework.TestCase;
import junit.framework.TestResult;
import junit.framework.TestSuite;
import org.apache.catalina.tribes.ChannelListener;
import java.io.Serializable;
-import org.apache.catalina.tribes.group.interceptors.OrderInterceptor;
import org.apache.catalina.tribes.group.ChannelInterceptorBase;
import org.apache.catalina.tribes.ChannelMessage;
import org.apache.catalina.tribes.group.InterceptorPayload;
Modified:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/TribesTestSuite.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/TribesTestSuite.java?rev=1713059&r1=1713058&r2=1713059&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/TribesTestSuite.java
(original)
+++
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/TribesTestSuite.java
Sat Nov 7 01:06:31 2015
@@ -29,13 +29,13 @@ public class TribesTestSuite
public static Test suite() {
TestSuite suite = new TestSuite();
-
suite.addTestSuite(org.apache.catalina.tribes.test.channel.ChannelStartStop.class);
-
suite.addTestSuite(org.apache.catalina.tribes.test.channel.TestChannelOptionFlag.class);
+
suite.addTestSuite(org.apache.catalina.tribes.group.TestGroupChannelStartStop.class);
+
suite.addTestSuite(org.apache.catalina.tribes.group.TestGroupChannelOptionFlag.class);
suite.addTestSuite(org.apache.catalina.tribes.test.membership.MemberSerialization.class);
-
suite.addTestSuite(org.apache.catalina.tribes.test.membership.TestMemberArrival.class);
+
suite.addTestSuite(org.apache.catalina.tribes.group.TestGroupChannelMemberArrival.class);
suite.addTestSuite(org.apache.catalina.tribes.test.membership.TestTcpFailureDetector.class);
suite.addTestSuite(org.apache.catalina.tribes.test.channel.TestDataIntegrity.class);
-
suite.addTestSuite(org.apache.catalina.tribes.test.interceptors.TestOrderInterceptor.class);
+
suite.addTestSuite(org.apache.catalina.tribes.group.interceptors.TestOrderInterceptor.class);
return suite;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
