You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bookkeeper.apache.org by si...@apache.org on 2015/10/20 09:10:57 UTC
bookkeeper git commit: BOOKKEEPER-866: Fix compile issue when
Updating junit to latest release version( 4.12) in the test of
Bookkeeper-server. (Jia Zhai via sijie)
Repository: bookkeeper
Updated Branches:
refs/heads/master 9803ee8e6 -> 8a3922e00
BOOKKEEPER-866: Fix compile issue when Updating junit to latest release version( 4.12) in the test of Bookkeeper-server. (Jia Zhai via sijie)
Project: http://git-wip-us.apache.org/repos/asf/bookkeeper/repo
Commit: http://git-wip-us.apache.org/repos/asf/bookkeeper/commit/8a3922e0
Tree: http://git-wip-us.apache.org/repos/asf/bookkeeper/tree/8a3922e0
Diff: http://git-wip-us.apache.org/repos/asf/bookkeeper/diff/8a3922e0
Branch: refs/heads/master
Commit: 8a3922e00d5fc3f82cb28ca032595b02db1a516e
Parents: 9803ee8
Author: Sijie Guo <si...@apache.org>
Authored: Thu Oct 15 22:00:57 2015 -0700
Committer: Sijie Guo <si...@apache.org>
Committed: Thu Oct 15 22:00:57 2015 -0700
----------------------------------------------------------------------
CHANGES.txt | 2 ++
bookkeeper-server/pom.xml | 2 +-
.../org/apache/bookkeeper/bookie/BookieInitializationTest.java | 2 +-
.../src/test/java/org/apache/bookkeeper/bookie/CookieTest.java | 2 +-
.../test/java/org/apache/bookkeeper/bookie/CreateNewLogTest.java | 2 +-
.../java/org/apache/bookkeeper/bookie/UpdateCookieCmdTest.java | 2 +-
.../test/java/org/apache/bookkeeper/client/BookKeeperTest.java | 4 ++--
.../java/org/apache/bookkeeper/client/UpdateLedgerCmdTest.java | 2 +-
.../org/apache/bookkeeper/replication/AuditorBookieTest.java | 2 +-
.../org/apache/bookkeeper/zookeeper/TestZooKeeperClient.java | 2 +-
10 files changed, 12 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8a3922e0/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 3e91989..8ca3ebb 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -97,6 +97,8 @@ Trunk (unreleased changes)
BOOKKEEPER-862: Add tracing and stats to OrderedSafeExecutor for debugging slow tasks (Leigh Stewart via sijie)
+ BOOKKEEPER-866: Fix compile issue when Updating junit to latest release version( 4.12) in the test of Bookkeeper-server. (Jia Zhai via sijie)
+
bookkeeper-client:
BOOKKEEPER-810: Allow to configure TCP connect timeout (Charles Xie via sijie)
http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8a3922e0/bookkeeper-server/pom.xml
----------------------------------------------------------------------
diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml
index 2ff498c..a1a74e0 100644
--- a/bookkeeper-server/pom.xml
+++ b/bookkeeper-server/pom.xml
@@ -51,7 +51,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.8.1</version>
+ <version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8a3922e0/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieInitializationTest.java
----------------------------------------------------------------------
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieInitializationTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieInitializationTest.java
index 5b70d3f..5db8aad 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieInitializationTest.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/BookieInitializationTest.java
@@ -26,7 +26,7 @@ import java.io.File;
import java.io.IOException;
import java.net.BindException;
import java.net.InetAddress;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.bookkeeper.conf.TestBKConfiguration;
import org.apache.bookkeeper.conf.ClientConfiguration;
http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8a3922e0/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CookieTest.java
----------------------------------------------------------------------
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CookieTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CookieTest.java
index 9497c29..34104d3 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CookieTest.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CookieTest.java
@@ -35,7 +35,7 @@ import static org.junit.Assert.fail;
import java.io.File;
import java.io.IOException;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.bookkeeper.client.BookKeeperAdmin;
import org.apache.bookkeeper.conf.ClientConfiguration;
http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8a3922e0/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CreateNewLogTest.java
----------------------------------------------------------------------
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CreateNewLogTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CreateNewLogTest.java
index 51b25bc..e2d2e63 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CreateNewLogTest.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/CreateNewLogTest.java
@@ -20,7 +20,7 @@ package org.apache.bookkeeper.bookie;
import java.io.File;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.bookkeeper.conf.ServerConfiguration;
import org.apache.bookkeeper.conf.TestBKConfiguration;
http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8a3922e0/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/UpdateCookieCmdTest.java
----------------------------------------------------------------------
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/UpdateCookieCmdTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/UpdateCookieCmdTest.java
index 5eaf224..f3a44a3 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/UpdateCookieCmdTest.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/bookie/UpdateCookieCmdTest.java
@@ -25,7 +25,7 @@ import java.io.IOException;
import java.net.UnknownHostException;
import java.util.List;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.bookkeeper.conf.ServerConfiguration;
import org.apache.bookkeeper.proto.BookieServer;
http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8a3922e0/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookKeeperTest.java
----------------------------------------------------------------------
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookKeeperTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookKeeperTest.java
index 364e48e..b1a544b 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookKeeperTest.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/BookKeeperTest.java
@@ -56,7 +56,7 @@ public class BookKeeperTest extends BaseTestCase {
this.digestType = digestType;
}
- @Test(timeout=60000)
+ @Test
public void testConstructionZkDelay() throws Exception {
ClientConfiguration conf = new ClientConfiguration()
.setZkServers(zkUtil.getZooKeeperConnectString())
@@ -71,7 +71,7 @@ public class BookKeeperTest extends BaseTestCase {
bkc.close();
}
- @Test(timeout=60000)
+ @Test
public void testConstructionNotConnectedExplicitZk() throws Exception {
ClientConfiguration conf = new ClientConfiguration()
.setZkServers(zkUtil.getZooKeeperConnectString())
http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8a3922e0/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/UpdateLedgerCmdTest.java
----------------------------------------------------------------------
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/UpdateLedgerCmdTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/UpdateLedgerCmdTest.java
index 1d56a56..3f61601 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/UpdateLedgerCmdTest.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/UpdateLedgerCmdTest.java
@@ -28,7 +28,7 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.bookkeeper.bookie.Bookie;
import org.apache.bookkeeper.bookie.BookieShell;
http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8a3922e0/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorBookieTest.java
----------------------------------------------------------------------
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorBookieTest.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorBookieTest.java
index b52cc8d..a90b557 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorBookieTest.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/replication/AuditorBookieTest.java
@@ -24,7 +24,7 @@ import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.bookkeeper.conf.ServerConfiguration;
import org.apache.bookkeeper.proto.BookieServer;
http://git-wip-us.apache.org/repos/asf/bookkeeper/blob/8a3922e0/bookkeeper-server/src/test/java/org/apache/bookkeeper/zookeeper/TestZooKeeperClient.java
----------------------------------------------------------------------
diff --git a/bookkeeper-server/src/test/java/org/apache/bookkeeper/zookeeper/TestZooKeeperClient.java b/bookkeeper-server/src/test/java/org/apache/bookkeeper/zookeeper/TestZooKeeperClient.java
index f8c9871..0c23aaf 100644
--- a/bookkeeper-server/src/test/java/org/apache/bookkeeper/zookeeper/TestZooKeeperClient.java
+++ b/bookkeeper-server/src/test/java/org/apache/bookkeeper/zookeeper/TestZooKeeperClient.java
@@ -50,7 +50,7 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
/**