1 files changed, 11 insertions, 8 deletions
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationFileTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationFileTest.java
index a34c17dc909..b149aa94441 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationFileTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationFileTest.java
@@ -1,9 +1,11 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.config.server.zookeeper;
 
 import com.yahoo.config.application.api.ApplicationFile;
 import com.yahoo.config.application.api.ApplicationFileTest;
 import com.yahoo.path.Path;
+import com.yahoo.text.Utf8;
+import com.yahoo.vespa.curator.Curator;
 import com.yahoo.vespa.curator.mock.MockCurator;
 import org.junit.Rule;
 import org.junit.rules.TemporaryFolder;
@@ -11,6 +13,7 @@ import org.junit.rules.TemporaryFolder;
 import java.io.File;
 import java.io.IOException;
 
+import static com.yahoo.vespa.config.server.zookeeper.ZKApplication.USERAPP_ZK_SUBPATH;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -21,20 +24,20 @@ public class ZKApplicationFileTest extends ApplicationFileTest {
     @Rule
     public TemporaryFolder temporaryFolder = new TemporaryFolder();
 
-    private void feed(ConfigCurator zk, File dirToFeed) {
+    private void feed(Curator curator, File dirToFeed) {
         assertTrue(dirToFeed.isDirectory());
-        String appPath = "/0";
-        ZKApplicationPackageTest.feedZooKeeper(zk, dirToFeed, appPath + ConfigCurator.USERAPP_ZK_SUBPATH, null, true);
-        zk.putData(appPath, ZKApplicationPackage.fileRegistryNode, "dummyfiles");
+        Path appPath = Path.fromString("/0");
+        ZKApplicationPackageTest.feedZooKeeper(curator, dirToFeed, appPath.append(USERAPP_ZK_SUBPATH), null, true);
+        curator.set(appPath.append(ZKApplicationPackage.fileRegistryNode), Utf8.toBytes("dummyfiles"));
     }
 
     @Override
     public ApplicationFile getApplicationFile(Path path) throws IOException{
-        ConfigCurator configCurator = ConfigCurator.create(new MockCurator());
+        Curator curator = new MockCurator();
         File tmp = temporaryFolder.newFolder();
         writeAppTo(tmp);
-        feed(configCurator, tmp);
-        return new ZKApplicationFile(path, new ZKApplication(configCurator, Path.fromString("/0")));
+        feed(curator, tmp);
+        return new ZKApplicationFile(path, new ZKApplication(curator, Path.fromString("/0")));
     }
 
 }