Implement debug handler

3 files changed, 47 insertions, 7 deletions

diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/provider/DebugHandlerHelperTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/provider/DebugHandlerHelperTest.java
new file mode 100644
index 00000000000..723b9f0df8a
--- /dev/null
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/provider/DebugHandlerHelperTest.java
@@ -0,0 +1,35 @@
+// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+
+package com.yahoo.vespa.hosted.node.admin.provider;
+
+import org.junit.Test;
+
+import java.util.Collections;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+
+public class DebugHandlerHelperTest {
+    @Test
+    public void trivial() {
+        DebugHandlerHelper helper = new DebugHandlerHelper();
+        helper.addConstant("constant-key", "constant-value");
+
+        NodeAdminDebugHandler handler = new NodeAdminDebugHandler() {
+            @Override
+            public Map<String, Object> getDebugPage() {
+                return Collections.singletonMap("handler-value-key", "handler-value-value");
+            }
+        };
+        helper.addHandler("handler-key", handler);
+
+        helper.addThreadSafeSupplier("supplier-key", () -> "supplier-value");
+
+        assertEquals("{" +
+                "supplier-key=supplier-value, " +
+                "handler-key={handler-value-key=handler-value-value}, " +
+                "constant-key=constant-value" +
+                "}",
+                helper.getDebugPage().toString());
+    }
+}
\ No newline at end of file
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileSyncTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileSyncTest.java
index 71cd312d5d6..44868e17464 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileSyncTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileSyncTest.java
@@ -2,6 +2,7 @@
 
 package com.yahoo.vespa.hosted.node.admin.task.util.file;
 
+import com.yahoo.vespa.test.file.TestFileSystem;
 import org.junit.Test;
 
 import java.nio.file.FileSystem;
@@ -18,7 +19,7 @@ import static org.junit.Assert.assertTrue;
 
 public class FileSyncTest {
     private final TestTaskContext taskContext = new TestTaskContext();
-    private final FileSystem fileSystem = taskContext.fileSystem();
+    private final FileSystem fileSystem = TestFileSystem.create();
 
     private final Path path = fileSystem.getPath("/dir/file.txt");
     private final UnixPath unixPath = new UnixPath(path);
@@ -80,4 +81,4 @@ public class FileSyncTest {
         actualMods = taskContext.getSystemModificationLog();
         assertEquals(new ArrayList<>(), actualMods);
     }
-}
\ No newline at end of file
+}
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/TestTaskContext.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/TestTaskContext.java
index d023a11671e..757f3004683 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/TestTaskContext.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/TestTaskContext.java
@@ -2,8 +2,8 @@
 
 package com.yahoo.vespa.hosted.node.admin.task.util.file;
 
+import com.yahoo.vespa.hosted.node.admin.component.IdempotentTask;
 import com.yahoo.vespa.hosted.node.admin.component.TaskContext;
-import com.yahoo.vespa.test.file.TestFileSystem;
 
 import java.nio.file.FileSystem;
 import java.util.ArrayList;
@@ -12,22 +12,21 @@ import java.util.List;
 import java.util.logging.Logger;
 
 public class TestTaskContext implements TaskContext {
-    private final FileSystem fileSystem = TestFileSystem.create();
     private final List<String> logs = new ArrayList<>();
 
     @Override
     public Cloud cloud() {
-        return Cloud.YAHOO;
+        throw new UnsupportedOperationException();
     }
 
     @Override
     public EnumSet<Role> roles() {
-        return EnumSet.of(Role.CONFIG_SERVER_DOCKER_HOST);
+        throw new UnsupportedOperationException();
     }
 
     @Override
     public FileSystem fileSystem() {
-        return fileSystem;
+        throw new UnsupportedOperationException();
     }
 
     @Override
@@ -42,4 +41,9 @@ public class TestTaskContext implements TaskContext {
     public void clearSystemModificationLog() {
         logs.clear();
     }
+
+    @Override
+    public boolean executeSubtask(IdempotentTask task) {
+        throw new UnsupportedOperationException();
+    }
 }