svn commit: r1531494 [2/2] - in /zookeeper/bookkeeper/trunk: ./ bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/ bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ bookkeeper-server/src/main/java/org/apache/bookkeeper/util/ bookke...

[si...@apache.org]

Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ConcurrentLedgerTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ConcurrentLedgerTest.java?rev=1531494&r1=1531493&r2=1531494&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ConcurrentLedgerTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/ConcurrentLedgerTest.java Sat Oct 12 03:42:21 2013
@@ -28,15 +28,16 @@ import java.nio.ByteBuffer;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import junit.framework.TestCase;
+
 import org.apache.bookkeeper.bookie.Bookie;
 import org.apache.bookkeeper.bookie.BookieException;
 import org.apache.bookkeeper.conf.ServerConfiguration;
+import org.apache.bookkeeper.conf.TestBKConfiguration;
 import org.apache.bookkeeper.proto.BookkeeperInternalCallbacks.WriteCallback;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-
-import junit.framework.TestCase;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -50,7 +51,7 @@ public class ConcurrentLedgerTest extend
     File txnDir, ledgerDir;
     int recvTimeout = 10000;
     Semaphore throttle;
-    ServerConfiguration conf = new ServerConfiguration();
+    ServerConfiguration conf = TestBKConfiguration.newServerConfiguration();
 
     @Override
     @Before

Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/TestBackwardCompat.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/TestBackwardCompat.java?rev=1531494&r1=1531493&r2=1531494&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/TestBackwardCompat.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/TestBackwardCompat.java Sat Oct 12 03:42:21 2013
@@ -20,25 +20,26 @@
  */
 package org.apache.bookkeeper.test;
 
-import java.io.File;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
-import java.util.Enumeration;
-import java.util.Arrays;
+import java.io.File;
 import java.net.InetAddress;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.junit.Test;
-import org.junit.Before;
-import org.junit.After;
-import static org.junit.Assert.*;
+import java.util.Arrays;
+import java.util.Enumeration;
 
 import org.apache.bookkeeper.bookie.Bookie;
 import org.apache.bookkeeper.bookie.BookieException;
 import org.apache.bookkeeper.bookie.FileSystemUpgrade;
 import org.apache.bookkeeper.client.BookKeeperAdmin;
 import org.apache.bookkeeper.conf.ClientConfiguration;
+import org.apache.bookkeeper.conf.TestBKConfiguration;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class TestBackwardCompat {
     static Logger LOG = LoggerFactory.getLogger(TestBackwardCompat.class);
@@ -265,7 +266,7 @@ public class TestBackwardCompat {
         org.apache.bookkeeper.proto.BookieServer server = null;
 
         ServerCurrent(File journalDir, File ledgerDir, int port) throws Exception {
-            conf = new org.apache.bookkeeper.conf.ServerConfiguration();
+            conf = TestBKConfiguration.newServerConfiguration();
             conf.setBookiePort(port);
             conf.setZkServers(zkUtil.getZooKeeperConnectString());
             conf.setJournalDirName(journalDir.getPath());

Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/BookKeeperTestBase.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/BookKeeperTestBase.java?rev=1531494&r1=1531493&r2=1531494&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/BookKeeperTestBase.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/persistence/BookKeeperTestBase.java Sat Oct 12 03:42:21 2013
@@ -108,7 +108,7 @@ public class BookKeeperTestBase extends 
     // BookKeeper client instance
     protected BookKeeper bk;
 
-    protected ServerConfiguration baseConf = new ServerConfiguration();
+    protected ServerConfiguration baseConf = newServerConfiguration();
     protected ClientConfiguration baseClientConf = new ClientConfiguration();
 
     // Constructor
@@ -242,6 +242,14 @@ public class BookKeeperTestBase extends 
         return server;
     }
 
+    // construct the basic server configuration for bookkeeper testing
+    private static ServerConfiguration newServerConfiguration() {
+        ServerConfiguration conf = new ServerConfiguration();
+        conf.setJournalFlushWhenQueueEmpty(true);
+        conf.setJournalAdaptiveGroupWrites(false);
+        return conf;
+    }
+
     protected ServerConfiguration newServerConfiguration(int port, String zkServers, File journalDir, File[] ledgerDirs) {
         ServerConfiguration conf = new ServerConfiguration(baseConf);
         conf.setBookiePort(port);