aboutsummaryrefslogtreecommitdiffstats
path: root/config-application-package/src/test/java/com/yahoo/config/model/application/provider/FilesApplicationPackageTest.java
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2020-08-12 10:34:39 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2020-08-12 10:34:39 +0000
commit38285e0e1147042b519957958083e537e6d90fc9 (patch)
tree317bcc846acb2bc8365ca2aedb76d9066152de40 /config-application-package/src/test/java/com/yahoo/config/model/application/provider/FilesApplicationPackageTest.java
parent104f7547cb92ab39251308f15ddc45d515a48ae2 (diff)
Minor unification of tests.
Diffstat (limited to 'config-application-package/src/test/java/com/yahoo/config/model/application/provider/FilesApplicationPackageTest.java')
-rw-r--r--config-application-package/src/test/java/com/yahoo/config/model/application/provider/FilesApplicationPackageTest.java7
1 files changed, 2 insertions, 5 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 44656f8f534..be4d8fdab25 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
@@ -15,14 +15,11 @@ import org.xml.sax.SAXException;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.TransformerException;
import java.io.File;
-import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
-import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
/**
@@ -92,7 +89,7 @@ public class FilesApplicationPackageTest {
FilesApplicationPackage app = FilesApplicationPackage.fromFile(appDir);
assertTrue(app.getDeployment().isPresent());
assertFalse(app.getMajorVersion().isPresent());
- assertThat(IOUtils.readAll(new FileReader(deployment)), is(IOUtils.readAll(app.getDeployment().get())));
+ assertEquals(IOUtils.readAll(app.getDeployment().get()), IOUtils.readAll(new FileReader(deployment)));
}
@Test
@@ -104,7 +101,7 @@ public class FilesApplicationPackageTest {
assertTrue(app.getDeployment().isPresent());
assertTrue(app.getMajorVersion().isPresent());
assertEquals(6, (int)app.getMajorVersion().get());
- assertThat(IOUtils.readAll(new FileReader(deployment)), is(IOUtils.readAll(app.getDeployment().get())));
+ assertEquals(IOUtils.readAll(app.getDeployment().get()), IOUtils.readAll(new FileReader(deployment)));
}
}