Modified: zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/ReadOnlyModeTest.java URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/ReadOnlyModeTest.java?rev=1689582&r1=1689581&r2=1689582&view=diff ============================================================================== --- zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/ReadOnlyModeTest.java (original) +++ zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/ReadOnlyModeTest.java Tue Jul 7 06:45:16 2015 @@ -25,7 +25,6 @@ import java.util.ArrayList; import java.util.List; import java.util.regex.Pattern; -import junit.framework.Assert; import org.apache.log4j.Layout; import org.apache.log4j.Level; @@ -45,6 +44,7 @@ import org.apache.zookeeper.ZooKeeper.St import org.apache.zookeeper.common.Time; import org.apache.zookeeper.test.ClientBase.CountdownWatcher; import org.junit.After; +import org.junit.Assert; import org.junit.Before; import org.junit.Test;
Modified: zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/SessionInvalidationTest.java URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/SessionInvalidationTest.java?rev=1689582&r1=1689581&r2=1689582&view=diff ============================================================================== --- zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/SessionInvalidationTest.java (original) +++ zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/SessionInvalidationTest.java Tue Jul 7 06:45:16 2015 @@ -23,7 +23,6 @@ import java.io.InputStream; import java.io.OutputStream; import java.net.Socket; -import junit.framework.Assert; import org.apache.jute.BinaryOutputArchive; import org.apache.zookeeper.ZooDefs; @@ -33,6 +32,7 @@ import org.apache.zookeeper.ZooKeeper; import org.apache.zookeeper.proto.ConnectRequest; import org.apache.zookeeper.proto.CreateRequest; import org.apache.zookeeper.proto.RequestHeader; +import org.junit.Assert; import org.junit.Test; public class SessionInvalidationTest extends ClientBase { Modified: zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/StringUtilTest.java URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/StringUtilTest.java?rev=1689582&r1=1689581&r2=1689582&view=diff ============================================================================== --- zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/StringUtilTest.java (original) +++ zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/StringUtilTest.java Tue Jul 7 06:45:16 2015 @@ -18,14 +18,15 @@ package org.apache.zookeeper.test; +import org.apache.zookeeper.ZKTestCase; import org.apache.zookeeper.common.StringUtils; import org.junit.Test; import java.util.Arrays; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; -public class StringUtilTest { +public class StringUtilTest extends ZKTestCase { @Test public void testStrings() { Modified: zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/WatchEventWhenAutoResetTest.java URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/WatchEventWhenAutoResetTest.java?rev=1689582&r1=1689581&r2=1689582&view=diff ============================================================================== --- zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/WatchEventWhenAutoResetTest.java (original) +++ zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/WatchEventWhenAutoResetTest.java Tue Jul 7 06:45:16 2015 @@ -29,15 +29,15 @@ import org.apache.zookeeper.ZooDefs; import org.apache.zookeeper.ZooKeeper; import org.apache.zookeeper.Watcher.Event.EventType; import org.apache.zookeeper.test.ClientBase.CountdownWatcher; +import org.apache.zookeeper.ZKTestCase; import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import junit.framework.TestCase; -public class WatchEventWhenAutoResetTest extends TestCase { +public class WatchEventWhenAutoResetTest extends ZKTestCase { protected static final Logger LOG = LoggerFactory .getLogger(WatchEventWhenAutoResetTest.class); @@ -80,7 +80,7 @@ public class WatchEventWhenAutoResetTest } catch (InterruptedException e) { // ignoring the interrupt } catch (TimeoutException e) { - fail("can not connect to " + hostPort); + Assert.fail("can not connect to " + hostPort); } return zk; } Modified: zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/X509AuthTest.java URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/X509AuthTest.java?rev=1689582&r1=1689581&r2=1689582&view=diff ============================================================================== --- zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/X509AuthTest.java (original) +++ zookeeper/branches/branch-3.5/src/java/test/org/apache/zookeeper/test/X509AuthTest.java Tue Jul 7 06:45:16 2015 @@ -39,12 +39,12 @@ import javax.net.ssl.X509KeyManager; import javax.net.ssl.X509TrustManager; import javax.security.auth.x500.X500Principal; -import junit.framework.Assert; import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.ZKTestCase; import org.apache.zookeeper.server.MockServerCnxn; import org.apache.zookeeper.server.auth.X509AuthenticationProvider; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; Modified: zookeeper/branches/branch-3.5/src/recipes/election/test/org/apache/zookeeper/recipes/leader/LeaderElectionSupportTest.java URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/recipes/election/test/org/apache/zookeeper/recipes/leader/LeaderElectionSupportTest.java?rev=1689582&r1=1689581&r2=1689582&view=diff ============================================================================== --- zookeeper/branches/branch-3.5/src/recipes/election/test/org/apache/zookeeper/recipes/leader/LeaderElectionSupportTest.java (original) +++ zookeeper/branches/branch-3.5/src/recipes/election/test/org/apache/zookeeper/recipes/leader/LeaderElectionSupportTest.java Tue Jul 7 06:45:16 2015 @@ -23,7 +23,6 @@ import java.util.concurrent.CountDownLat import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import junit.framework.Assert; import org.apache.zookeeper.CreateMode; import org.apache.zookeeper.KeeperException; @@ -32,6 +31,7 @@ import org.apache.zookeeper.ZooKeeper; import org.apache.zookeeper.recipes.leader.LeaderElectionSupport.EventType; import org.apache.zookeeper.test.ClientBase; import org.junit.After; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.slf4j.Logger; Modified: zookeeper/branches/branch-3.5/src/recipes/lock/test/org/apache/zookeeper/recipes/lock/ZNodeNameTest.java URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/recipes/lock/test/org/apache/zookeeper/recipes/lock/ZNodeNameTest.java?rev=1689582&r1=1689581&r2=1689582&view=diff ============================================================================== --- zookeeper/branches/branch-3.5/src/recipes/lock/test/org/apache/zookeeper/recipes/lock/ZNodeNameTest.java (original) +++ zookeeper/branches/branch-3.5/src/recipes/lock/test/org/apache/zookeeper/recipes/lock/ZNodeNameTest.java Tue Jul 7 06:45:16 2015 @@ -17,17 +17,17 @@ */ package org.apache.zookeeper.recipes.lock; -import junit.framework.TestCase; + +import org.junit.Assert; +import org.junit.Test; import java.util.SortedSet; import java.util.TreeSet; -import org.junit.Test; - /** * test for znodenames */ -public class ZNodeNameTest extends TestCase { +public class ZNodeNameTest { @Test public void testOrderWithSamePrefix() throws Exception { String[] names = { "x-3", "x-5", "x-11", "x-1" }; @@ -43,7 +43,7 @@ public class ZNodeNameTest extends TestC protected void assertOrderedNodeNames(String[] names, String[] expected) { int size = names.length; - assertEquals("The two arrays should be the same size!", names.length, expected.length); + Assert.assertEquals("The two arrays should be the same size!", names.length, expected.length); SortedSet<ZNodeName> nodeNames = new TreeSet<ZNodeName>(); for (String name : names) { nodeNames.add(new ZNodeName(name)); @@ -52,7 +52,7 @@ public class ZNodeNameTest extends TestC int index = 0; for (ZNodeName nodeName : nodeNames) { String name = nodeName.getName(); - assertEquals("Node " + index, expected[index++], name); + Assert.assertEquals("Node " + index, expected[index++], name); } }
