Move basic-search-for-docker to node-admin root to fix tests

19 files changed, 4 insertions, 3 deletions

diff --git a/node-admin/README.md b/node-admin/README.md
index f76bf46d110..7b3e9805d21 100644
--- a/node-admin/README.md
+++ b/node-admin/README.md
@@ -45,7 +45,7 @@ To start a local zone, simply run:
 Package and deploy vespa application by running:
 
 ```
-    Path pathToApp = Paths.get("node-admin/src/test/resources/basic-search-for-docker");
+    Path pathToApp = Paths.get("node-admin/basic-search-for-docker");
     runVespaLocal.deployApplication(pathToApp);
 ```
 If the deployment is successful, the final log entry should be something like 
diff --git a/node-admin/src/test/resources/basic-search-for-docker/music-data-1.json b/node-admin/basic-search-for-docker/music-data-1.json
index 44ce547370e..44ce547370e 100644
--- a/node-admin/src/test/resources/basic-search-for-docker/music-data-1.json
+++ b/node-admin/basic-search-for-docker/music-data-1.json
diff --git a/node-admin/src/test/resources/basic-search-for-docker/music-data-2.json b/node-admin/basic-search-for-docker/music-data-2.json
index c8e2d3c017c..c8e2d3c017c 100644
--- a/node-admin/src/test/resources/basic-search-for-docker/music-data-2.json
+++ b/node-admin/basic-search-for-docker/music-data-2.json
diff --git a/node-admin/src/test/resources/basic-search-for-docker/pom.xml b/node-admin/basic-search-for-docker/pom.xml
index 749640b5a34..749640b5a34 100644
--- a/node-admin/src/test/resources/basic-search-for-docker/pom.xml
+++ b/node-admin/basic-search-for-docker/pom.xml
diff --git a/node-admin/src/test/resources/basic-search-for-docker/src/main/application/deployment.xml b/node-admin/basic-search-for-docker/src/main/application/deployment.xml
index 0a2397bbca9..0a2397bbca9 100644
--- a/node-admin/src/test/resources/basic-search-for-docker/src/main/application/deployment.xml
+++ b/node-admin/basic-search-for-docker/src/main/application/deployment.xml
diff --git a/node-admin/src/test/resources/basic-search-for-docker/src/main/application/searchdefinitions/music.sd b/node-admin/basic-search-for-docker/src/main/application/searchdefinitions/music.sd
index d6bcaac8ae0..d6bcaac8ae0 100644
--- a/node-admin/src/test/resources/basic-search-for-docker/src/main/application/searchdefinitions/music.sd
+++ b/node-admin/basic-search-for-docker/src/main/application/searchdefinitions/music.sd
diff --git a/node-admin/src/test/resources/basic-search-for-docker/src/main/application/services.xml b/node-admin/basic-search-for-docker/src/main/application/services.xml
index cea6861ca91..cea6861ca91 100644
--- a/node-admin/src/test/resources/basic-search-for-docker/src/main/application/services.xml
+++ b/node-admin/basic-search-for-docker/src/main/application/services.xml
diff --git a/node-admin/src/test/resources/basic-search-for-docker/src/main/java/com/yahoo/example/ExampleDocumentProcessor.java b/node-admin/basic-search-for-docker/src/main/java/com/yahoo/example/ExampleDocumentProcessor.java
index 907ab355288..907ab355288 100644
--- a/node-admin/src/test/resources/basic-search-for-docker/src/main/java/com/yahoo/example/ExampleDocumentProcessor.java
+++ b/node-admin/basic-search-for-docker/src/main/java/com/yahoo/example/ExampleDocumentProcessor.java
diff --git a/node-admin/src/test/resources/basic-search-for-docker/src/main/java/com/yahoo/example/ExampleSearcher.java b/node-admin/basic-search-for-docker/src/main/java/com/yahoo/example/ExampleSearcher.java
index cf4c1fc8e34..cf4c1fc8e34 100644
--- a/node-admin/src/test/resources/basic-search-for-docker/src/main/java/com/yahoo/example/ExampleSearcher.java
+++ b/node-admin/basic-search-for-docker/src/main/java/com/yahoo/example/ExampleSearcher.java
diff --git a/node-admin/src/test/resources/basic-search-for-docker/src/main/resources/configdefinitions/message.def b/node-admin/basic-search-for-docker/src/main/resources/configdefinitions/message.def
index d2a2bc5407a..d2a2bc5407a 100644
--- a/node-admin/src/test/resources/basic-search-for-docker/src/main/resources/configdefinitions/message.def
+++ b/node-admin/basic-search-for-docker/src/main/resources/configdefinitions/message.def
diff --git a/node-admin/src/test/resources/basic-search-for-docker/src/test/application/services.xml b/node-admin/basic-search-for-docker/src/test/application/services.xml
index 388ab448f9c..388ab448f9c 100644
--- a/node-admin/src/test/resources/basic-search-for-docker/src/test/application/services.xml
+++ b/node-admin/basic-search-for-docker/src/test/application/services.xml
diff --git a/node-admin/src/test/resources/basic-search-for-docker/src/test/java/BasicSearchConditionalStagingTest.java b/node-admin/basic-search-for-docker/src/test/java/BasicSearchConditionalStagingTest.java
index 4a6c48073c1..4a6c48073c1 100644
--- a/node-admin/src/test/resources/basic-search-for-docker/src/test/java/BasicSearchConditionalStagingTest.java
+++ b/node-admin/basic-search-for-docker/src/test/java/BasicSearchConditionalStagingTest.java
diff --git a/node-admin/src/test/resources/basic-search-for-docker/src/test/java/BasicSearchStagingTest.java b/node-admin/basic-search-for-docker/src/test/java/BasicSearchStagingTest.java
index 89bf52a9870..89bf52a9870 100644
--- a/node-admin/src/test/resources/basic-search-for-docker/src/test/java/BasicSearchStagingTest.java
+++ b/node-admin/basic-search-for-docker/src/test/java/BasicSearchStagingTest.java
diff --git a/node-admin/src/test/resources/basic-search-for-docker/src/test/java/BasicSearchSystemTest.java b/node-admin/basic-search-for-docker/src/test/java/BasicSearchSystemTest.java
index e9e72ca4d8c..e9e72ca4d8c 100644
--- a/node-admin/src/test/resources/basic-search-for-docker/src/test/java/BasicSearchSystemTest.java
+++ b/node-admin/basic-search-for-docker/src/test/java/BasicSearchSystemTest.java
diff --git a/node-admin/src/test/resources/basic-search-for-docker/src/test/java/com/yahoo/example/ExampleSearcherTest.java b/node-admin/basic-search-for-docker/src/test/java/com/yahoo/example/ExampleSearcherTest.java
index 87592f2a2ba..87592f2a2ba 100644
--- a/node-admin/src/test/resources/basic-search-for-docker/src/test/java/com/yahoo/example/ExampleSearcherTest.java
+++ b/node-admin/basic-search-for-docker/src/test/java/com/yahoo/example/ExampleSearcherTest.java
diff --git a/node-admin/src/test/resources/basic-search-for-docker/src/test/java/com/yahoo/example/ExampleSystemTest.java b/node-admin/basic-search-for-docker/src/test/java/com/yahoo/example/ExampleSystemTest.java
index 2bed440868e..2bed440868e 100644
--- a/node-admin/src/test/resources/basic-search-for-docker/src/test/java/com/yahoo/example/ExampleSystemTest.java
+++ b/node-admin/basic-search-for-docker/src/test/java/com/yahoo/example/ExampleSystemTest.java
diff --git a/node-admin/src/test/resources/basic-search-for-docker/src/test/resources/minifeed.json b/node-admin/basic-search-for-docker/src/test/resources/minifeed.json
index 2fd5d9e2053..2fd5d9e2053 100644
--- a/node-admin/src/test/resources/basic-search-for-docker/src/test/resources/minifeed.json
+++ b/node-admin/basic-search-for-docker/src/test/resources/minifeed.json
diff --git a/node-admin/src/test/resources/basic-search-for-docker/src/test/resources/sd-change-requiring-restart.patch b/node-admin/basic-search-for-docker/src/test/resources/sd-change-requiring-restart.patch
index b4e0745fcc2..b4e0745fcc2 100644
--- a/node-admin/src/test/resources/basic-search-for-docker/src/test/resources/sd-change-requiring-restart.patch
+++ b/node-admin/basic-search-for-docker/src/test/resources/sd-change-requiring-restart.patch
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/LocalZoneUtils.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/LocalZoneUtils.java
index 70df830285c..3d0847bc53c 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/LocalZoneUtils.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/docker/LocalZoneUtils.java
@@ -237,11 +237,12 @@ public class LocalZoneUtils {
         return getContainersForApp(TENANT_NAME, APPLICATION_NAME, "default");
     }
 
+    @SuppressWarnings("unchecked")
     public static Set<String> getContainersForApp(String tenant, String application, String instance) {
         String app = String.join(".", tenant, application, instance);
-        Map response = requestExecutor.get("/nodes/v2/node/?recursive=true&clusterType=container&application=" + app,
+        Map<String, Object> response = requestExecutor.get("/nodes/v2/node/?recursive=true&clusterType=container&application=" + app,
                 CONFIG_SERVER_WEB_SERVICE_PORT, Map.class);
-        List<Map> nodes = (List<Map>) response.get("nodes");
+        List<Map<String, Object>> nodes = (List<Map<String, Object>>) response.get("nodes");
         return nodes.stream().map(nodeMap -> (String) nodeMap.get("hostname")).collect(Collectors.toSet());
     }