Fixes compilation errors from last merge

neo4j · Feb 15, 2016 · 140c532 · 140c532
1 parent aca7899
commit 140c532
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 13 deletions.
diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/TestFailover.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/TestFailover.java
@@ -41,7 +41,8 @@ public class TestFailover
 {
     @Rule
     public LoggerRule logger = new LoggerRule();
-    public TargetDirectory dir = TargetDirectory.forTest( getClass() );
+    @Rule
+    public TargetDirectory.TestDirectory dir = TargetDirectory.testDirForTest( getClass() );
 
     // parameters
     private int clusterSize;
@@ -65,10 +66,13 @@ public TestFailover( int clusterSize )
     private void testFailOver( int clusterSize ) throws Throwable
     {
         // given
-        ClusterManager clusterManager = new ClusterManager( clusterOfSize( clusterSize ), dir.cleanDirectory( "failover" ), stringMap(
+        ClusterManager clusterManager = new ClusterManager.Builder().withRootDirectory( dir.cleanDirectory( "failover" ) ).
-                ClusterSettings.default_timeout.name(),    "1",
+        withProvider( ClusterManager.clusterOfSize( clusterSize ) )
-                ClusterSettings.heartbeat_interval.name(), "1",
+                .withSharedConfig( stringMap(
-                ClusterSettings.heartbeat_timeout.name(),  "2" ) );
+                    ClusterSettings.default_timeout.name(),    "1",
+                    ClusterSettings.heartbeat_interval.name(), "1",
+                    ClusterSettings.heartbeat_timeout.name(),  "2" ) )
+                .build();
 
         clusterManager.start();
         ClusterManager.ManagedCluster cluster = clusterManager.getDefaultCluster();
@@ -79,13 +83,13 @@ private void testFailOver( int clusterSize ) throws Throwable
         // When
         long start = System.nanoTime();
         ClusterManager.RepairKit repairKit = cluster.fail( oldMaster );
-        logger.getLogger().warn( "Shut down master" );
+        logger.getLogger().warning( "Shut down master" );
 
         // Then
         cluster.await( ClusterManager.masterAvailable( oldMaster ) );
         long end = System.nanoTime();
 
-        logger.getLogger().warn( "Failover took:" + (end - start) / 1000000 + "ms" );
+        logger.getLogger().warning( "Failover took:" + (end - start) / 1000000 + "ms" );
 
         repairKit.repair();
         Thread.sleep( 3000 ); // give repaired instance chance to cleanly rejoin and exit faster

diff --git a/enterprise/ha/src/test/java/org/neo4j/kernel/ha/TestFailoverWithAdditionalSlaveFailures.java b/enterprise/ha/src/test/java/org/neo4j/kernel/ha/TestFailoverWithAdditionalSlaveFailures.java
@@ -45,7 +45,8 @@ public class TestFailoverWithAdditionalSlaveFailures
 {
     @Rule
     public LoggerRule logger = new LoggerRule();
-    public TargetDirectory dir = TargetDirectory.forTest( getClass() );
+    @Rule
+    public TargetDirectory.TestDirectory dir = TargetDirectory.testDirForTest( getClass() );
 
     // parameters
     private int clusterSize;
@@ -83,11 +84,13 @@ public void testFailoverWithAdditionalSlave() throws Throwable
 
     private void testFailoverWithAdditionalSlave( int clusterSize, int[] slaveIndexes ) throws Throwable
     {
-        ClusterManager manager = new ClusterManager( ClusterManager.clusterOfSize( clusterSize ),
+        ClusterManager manager = new ClusterManager.Builder().withRootDirectory( dir.cleanDirectory( "testcluster" ) ).
-                TargetDirectory.forTest( getClass() ).cleanDirectory( "testCluster" ), stringMap(
+                withProvider( ClusterManager.clusterOfSize( clusterSize ) )
-                ClusterSettings.default_timeout.name(),    "1",
+                .withSharedConfig( stringMap(
-                ClusterSettings.heartbeat_interval.name(), "1",
+                        ClusterSettings.default_timeout.name(),    "1",
-                ClusterSettings.heartbeat_timeout.name(),  "2" ) );
+                        ClusterSettings.heartbeat_interval.name(), "1",
+                        ClusterSettings.heartbeat_timeout.name(),  "2" ) )
+                .build();
 
         try
         {