diff options
author | Harald Musum <musum@verizonmedia.com> | 2020-05-28 10:31:23 +0200 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2020-05-28 10:31:23 +0200 |
commit | 232d8d90bf375f8e70c80234241c1694dd3f5660 (patch) | |
tree | 0917141ab975cf8814dd7a1da8aa78989d068623 /config-model-api | |
parent | 094c120148fe1bfe64bd8f866ac2c2598ec60468 (diff) |
Use java Files class for creating temp dir
Diffstat (limited to 'config-model-api')
-rw-r--r-- | config-model-api/src/test/java/com/yahoo/config/application/api/ApplicationFileTest.java | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/config-model-api/src/test/java/com/yahoo/config/application/api/ApplicationFileTest.java b/config-model-api/src/test/java/com/yahoo/config/application/api/ApplicationFileTest.java index b7ae6d9dcdf..5b0b11b88b7 100644 --- a/config-model-api/src/test/java/com/yahoo/config/application/api/ApplicationFileTest.java +++ b/config-model-api/src/test/java/com/yahoo/config/application/api/ApplicationFileTest.java @@ -6,16 +6,25 @@ import com.yahoo.path.Path; import com.yahoo.vespa.config.util.ConfigUtils; import org.junit.Test; -import java.io.*; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.StringReader; import java.util.List; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; /** * @author Ulf Lilleengen */ public abstract class ApplicationFileTest { + protected void writeAppTo(File destFolder) throws IOException { createFiles(destFolder, "vespa-services.xml", "vespa-hosts.xml"); createFolders(destFolder, "searchdefinitions", "components", "files", "templates"); @@ -34,7 +43,7 @@ public abstract class ApplicationFileTest { private void createFiles(File destFolder, String ... names) throws IOException { for (String name : names) { File f = new File(destFolder, name); - f.createNewFile(); + assertTrue(f.createNewFile()); IOUtils.writeFile(f, "foo", false); } } @@ -61,11 +70,11 @@ public abstract class ApplicationFileTest { ApplicationFile f1 = getApplicationFile(p1); ApplicationFile f2 = getApplicationFile(p2); - assertTrue(f1.equals(f1)); - assertFalse(f1.equals(f2)); + assertEquals(f1, f1); + assertNotEquals(f1, f2); - assertFalse(f2.equals(f1)); - assertTrue(f2.equals(f2)); + assertNotEquals(f2, f1); + assertEquals(f2, f2); } @Test @@ -315,4 +324,5 @@ public abstract class ApplicationFileTest { } public abstract ApplicationFile getApplicationFile(Path path) throws Exception; + } |