Move assertRoute to common base for reuse

2 files changed, 12 insertions, 9 deletions

diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentBaseTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentBaseTest.java
index 0432b181c2c..f5642922d5b 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/ContentBaseTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/ContentBaseTest.java
@@ -1,6 +1,10 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.model.content;
 
+import com.yahoo.messagebus.routing.RouteSpec;
+
+import static org.junit.Assert.assertEquals;
+
 public class ContentBaseTest {
     public static String getHosts() {
         return "<?xml version='1.0' encoding='utf-8' ?>" +
@@ -10,4 +14,12 @@ public class ContentBaseTest {
                 "  </host>" +
                 "</hosts>";
     }
+
+    static void assertRoute(RouteSpec r, String name, String... hops) {
+        assertEquals(name, r.getName());
+        assertEquals(hops.length, r.getNumHops());
+        for(int i = 0; i < hops.length; i++) {
+            assertEquals(hops[i], r.getHop(i));
+        }
+    }
 }
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java
index f883e83374e..919fec5be2f 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java
@@ -4,7 +4,6 @@ package com.yahoo.vespa.model.content;
 import com.yahoo.cloud.config.ClusterListConfig;
 import com.yahoo.config.model.deploy.DeployState;
 import com.yahoo.documentmodel.NewDocumentType;
-import com.yahoo.messagebus.routing.RouteSpec;
 import com.yahoo.messagebus.routing.RoutingTableSpec;
 import com.yahoo.vespa.config.content.core.StorServerConfig;
 import com.yahoo.vespa.config.search.core.ProtonConfig;
@@ -165,14 +164,6 @@ public class IndexedTest extends ContentBaseTest {
         assertRoute(spec.getRoute(5), "test-index", "jdisc/chain.indexing", "[Content:cluster=test]");
     }
 
-    private static void assertRoute(RouteSpec r, String name, String... hops) {
-        assertEquals(name, r.getName());
-        assertEquals(hops.length, r.getNumHops());
-        for(int i = 0; i < hops.length; i++) {
-            assertEquals(hops[i], r.getHop(i));
-        }
-    }
-
     @Test
     public void requireProtonStreamingOnly()
     {