Use Curator instead of ConfigCurator, part 3

1 files changed, 7 insertions, 6 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 c452e1cf0f3..1c43591de9a 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
@@ -5,6 +5,7 @@ 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;
@@ -23,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());
         Path appPath = Path.fromString("/0");
-        ZKApplicationPackageTest.feedZooKeeper(zk.curator(), dirToFeed, appPath.append(USERAPP_ZK_SUBPATH), null, true);
-        zk.curator().set(appPath.append(ZKApplicationPackage.fileRegistryNode), Utf8.toBytes("dummyfiles"));
+        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")));
     }
 
 }