diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2018-01-02 13:58:54 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-02 13:58:54 +0100 |
commit | c71969101b26dd4e29e5bef4c507550ebb47a9d9 (patch) | |
tree | 8f27590a3063bc592b85dc5d269e89491def2524 /config-application-package/src/test/java/com/yahoo/config | |
parent | e77379005bccd3d5009b1484038183a05856b4cd (diff) |
Revert "Jvenstad/zone cleanup 4"
Diffstat (limited to 'config-application-package/src/test/java/com/yahoo/config')
-rw-r--r-- | config-application-package/src/test/java/com/yahoo/config/model/application/provider/FilesApplicationPackageTest.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/config-application-package/src/test/java/com/yahoo/config/model/application/provider/FilesApplicationPackageTest.java b/config-application-package/src/test/java/com/yahoo/config/model/application/provider/FilesApplicationPackageTest.java index 89a5769ff0c..2dfaf440084 100644 --- a/config-application-package/src/test/java/com/yahoo/config/model/application/provider/FilesApplicationPackageTest.java +++ b/config-application-package/src/test/java/com/yahoo/config/model/application/provider/FilesApplicationPackageTest.java @@ -2,10 +2,12 @@ package com.yahoo.config.model.application.provider; import com.yahoo.config.application.TestBase; +import com.yahoo.config.application.api.RuleConfigDeriver; import com.yahoo.config.application.api.ApplicationPackage; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.RegionName; import com.yahoo.config.provision.Zone; +import com.yahoo.config.provision.ZoneId; import com.yahoo.io.IOUtils; import org.junit.Rule; import org.junit.Test; @@ -40,7 +42,7 @@ public class FilesApplicationPackageTest { assertTrue(new File(appDir, "hosts.xml").exists()); FilesApplicationPackage app = FilesApplicationPackage.fromFile(appDir); - ApplicationPackage processed = app.preprocess(new Zone(Environment.dev, RegionName.defaultName()), + ApplicationPackage processed = app.preprocess(ZoneId.from(Environment.dev, RegionName.defaultName()), (ruleBaseDir, outputDir) -> {}, new BaseDeployLogger()); assertTrue(new File(appDir, ".preprocessed").exists()); |