Move class

2 files changed, 11 insertions, 11 deletions

diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java
index 371a57e08c0..01720644fa8 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTest.java
@@ -7,7 +7,6 @@ import com.yahoo.jrt.StringValue;
 import com.yahoo.jrt.Supervisor;
 import com.yahoo.jrt.Target;
 import com.yahoo.jrt.Transport;
-import com.yahoo.jrt.slobrok.api.BackOffPolicy;
 import com.yahoo.jrt.slobrok.server.Slobrok;
 import com.yahoo.log.LogSetup;
 import com.yahoo.vdslib.distribution.ConfiguredNode;
@@ -83,14 +82,6 @@ public abstract class FleetControllerTest implements Waiter {
         LogSetup.initVespaLogging("fleetcontroller");
     }
 
-    static class BackOff implements BackOffPolicy {
-        private int counter = 0;
-        public void reset() { counter = 0; }
-        public double get() { ++counter; return 0.01; }
-        public boolean shouldWarn(double v) { return ((counter % 1000) == 10); }
-        public boolean shouldInform(double v) { return false; }
-    }
-
     public static class CleanupZookeeperLogsOnSuccess implements TestWatcher {
 
         public CleanupZookeeperLogsOnSuccess() {}
@@ -335,7 +326,7 @@ public abstract class FleetControllerTest implements Waiter {
     }
 
     private static class ExpectLine {
-        Pattern regex;
+        final Pattern regex;
         int matchedCount = 0;
         int minCount = 1;
         int maxCount = 1;
@@ -439,7 +430,7 @@ public abstract class FleetControllerTest implements Waiter {
                 eventsGotten.append(eventLine).append("\n");
             }
             errors.append("\nExpected events matching:\n" + exp + "\n");
-            errors.append("but got the following events:\n" + eventsGotten.toString());
+            errors.append("but got the following events:\n" + eventsGotten);
             fail(errors.toString());
         }
     }
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/RpcServerTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/RpcServerTest.java
index 641f15467a6..6a7c75c629e 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/RpcServerTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/RpcServerTest.java
@@ -9,6 +9,7 @@ import com.yahoo.jrt.StringValue;
 import com.yahoo.jrt.Supervisor;
 import com.yahoo.jrt.Target;
 import com.yahoo.jrt.Transport;
+import com.yahoo.jrt.slobrok.api.BackOffPolicy;
 import com.yahoo.jrt.slobrok.server.Slobrok;
 import com.yahoo.vdslib.distribution.ConfiguredNode;
 import com.yahoo.vdslib.distribution.Distribution;
@@ -595,4 +596,12 @@ public class RpcServerTest extends FleetControllerTest {
         return req;
     }
 
+    private static class BackOff implements BackOffPolicy {
+        private int counter = 0;
+        public void reset() { counter = 0; }
+        public double get() { ++counter; return 0.01; }
+        public boolean shouldWarn(double v) { return ((counter % 1000) == 10); }
+        public boolean shouldInform(double v) { return false; }
+    }
+
 }