Author: kkolinko
Date: Sat Nov 7 01:20:45 2015
New Revision: 1713062
URL: http://svn.apache.org/viewvc?rev=1713062&view=rev
Log:
Move and rename tests to align with Tomcat 7
Added:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestDomainFilterInterceptor.java
- copied, changed from r1713051,
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/membership/TestDomainFilter.java
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java
- copied, changed from r1713051,
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/membership/TestTcpFailureDetector.java
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/io/
- copied from r1713051,
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/io/
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/io/TestXByteBuffer.java
- copied, changed from r1713051,
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/io/TestSerialization.java
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/membership/
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/membership/TestMemberImplSerialization.java
- copied, changed from r1713051,
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/membership/MemberSerialization.java
Removed:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/io/TestSenderConnections.java
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/io/TestSerialization.java
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/io/
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/membership/MemberSerialization.java
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/membership/TestDomainFilter.java
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/membership/TestTcpFailureDetector.java
Modified:
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/interceptors/TestDomainFilterInterceptor.java
(from r1713051,
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/membership/TestDomainFilter.java)
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestDomainFilterInterceptor.java?p2=tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestDomainFilterInterceptor.java&p1=tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/membership/TestDomainFilter.java&r1=1713051&r2=1713062&rev=1713062&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/membership/TestDomainFilter.java
(original)
+++
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestDomainFilterInterceptor.java
Sat Nov 7 01:20:45 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.interceptors;
import java.util.ArrayList;
@@ -24,10 +24,9 @@ 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.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];
Copied:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java
(from r1713051,
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/membership/TestTcpFailureDetector.java)
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java?p2=tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java&p1=tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/membership/TestTcpFailureDetector.java&r1=1713051&r2=1713062&rev=1713062&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/membership/TestTcpFailureDetector.java
(original)
+++
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java
Sat Nov 7 01:20:45 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.interceptors;
import java.util.ArrayList;
@@ -25,7 +25,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;
import junit.framework.TestCase;
/**
Copied:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/io/TestXByteBuffer.java
(from r1713051,
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/io/TestSerialization.java)
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/io/TestXByteBuffer.java?p2=tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/io/TestXByteBuffer.java&p1=tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/io/TestSerialization.java&r1=1713051&r2=1713062&rev=1713062&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/io/TestSerialization.java
(original)
+++
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/io/TestXByteBuffer.java
Sat Nov 7 01:20:45 2015
@@ -14,12 +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 org.apache.catalina.tribes.io.XByteBuffer;
import junit.framework.TestCase;
-public class TestSerialization extends TestCase {
+public class TestXByteBuffer extends TestCase {
protected void setUp() throws Exception {
super.setUp();
}
Copied:
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/membership/TestMemberImplSerialization.java
(from r1713051,
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/membership/MemberSerialization.java)
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/membership/TestMemberImplSerialization.java?p2=tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/membership/TestMemberImplSerialization.java&p1=tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/membership/MemberSerialization.java&r1=1713051&r2=1713062&rev=1713062&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/membership/MemberSerialization.java
(original)
+++
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/membership/TestMemberImplSerialization.java
Sat Nov 7 01:20:45 2015
@@ -13,10 +13,9 @@
* 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.membership;
+package org.apache.catalina.tribes.membership;
import junit.framework.TestCase;
-import org.apache.catalina.tribes.membership.MemberImpl;
import java.util.Arrays;
/**
@@ -29,7 +28,7 @@ import java.util.Arrays;
* @author not attributable
* @version 1.0
*/
-public class MemberSerialization extends TestCase {
+public class TestMemberImplSerialization extends TestCase {
MemberImpl m1, m2, p1,p2;
byte[] payload = null;
protected void setUp() throws Exception {
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=1713062&r1=1713061&r2=1713062&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:20:45 2015
@@ -31,9 +31,9 @@ public class TribesTestSuite
TestSuite suite = new TestSuite();
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.membership.TestMemberImplSerialization.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.group.interceptors.TestTcpFailureDetector.class);
suite.addTestSuite(org.apache.catalina.tribes.test.channel.TestDataIntegrity.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
