diff --git a/pom.xml b/pom.xml index 1d4b1d4..daf7d0d 100644 --- a/pom.xml +++ b/pom.xml @@ -113,7 +113,6 @@ 5.9.1 1.9.1 5.1.1 - 2.2 1.4.7 @@ -234,11 +233,6 @@ jaxb-api ${jaxb.version} - - org.glassfish.jaxb - jaxb-runtime - ${jaxb.version} - com.google.guava guava @@ -259,11 +253,6 @@ junit-platform-commons ${junit-platform-commons.version} - - org.hamcrest - hamcrest - ${hamcrest.version} - org.mockito mockito-bom @@ -286,26 +275,6 @@ kotlin-test-junit ${kotlin.version} - - org.jmock - jmock - ${jmock.version} - - - asm - org.ow2.asm - - - jsr305 - com.google.code.findbugs - - - - - org.jetbrains.kotlin - kotlin-reflect - ${kotlin.version} - ch.qos.logback logback-classic @@ -336,10 +305,7 @@ javax.xml.bind jaxb-api - - org.glassfish.jaxb - jaxb-runtime - + org.junit.jupiter @@ -357,22 +323,10 @@ co.unruly java-8-matchers - - org.hamcrest - hamcrest - org.jetbrains.kotlin kotlin-test-junit - - org.jmock - jmock - - - org.jetbrains.kotlin - kotlin-reflect - ch.qos.logback logback-classic diff --git a/src/test/java/com/regnosys/testing/schemeimport/LatestSchemesImportTest.java b/src/test/java/com/regnosys/testing/schemeimport/LatestSchemesImportTest.java index e1e9d76..7145026 100644 --- a/src/test/java/com/regnosys/testing/schemeimport/LatestSchemesImportTest.java +++ b/src/test/java/com/regnosys/testing/schemeimport/LatestSchemesImportTest.java @@ -36,8 +36,7 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; public class LatestSchemesImportTest { @@ -45,7 +44,7 @@ public class LatestSchemesImportTest { private static final String CODE_LIST_ZIP = "src/main/resources/coding-schemes/fpml/codelist.zip"; private static final String CODE_LIST = "src/main/resources/coding-schemes/fpml/codelist"; private static final boolean WRITE_LATEST_VERSION = Optional.ofNullable(System.getenv("WRITE_EXPECTATIONS")) - .map(Boolean::parseBoolean).orElse(false); + .map(Boolean::parseBoolean).orElse(false); @Test public void downloadLatestVersions() throws IOException, NoSuchAlgorithmException { @@ -55,8 +54,8 @@ public void downloadLatestVersions() throws IOException, NoSuchAlgorithmExceptio try (FileOutputStream fos = new FileOutputStream(LatestSchemesImportTest.CODE_LIST_ZIP)) { fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); String checksum = getZipCheckSum(Paths.get(CODE_LIST_ZIP)); - assertThat("CodeList zip has been updated, run again with WRITE_LATEST_VERSION enabled then update expected checksum", - checksum, equalTo("f4e20644ca711aaa443c03980cb8b785")); + + assertEquals("f4e20644ca711aaa443c03980cb8b785", checksum, "CodeList zip has been updated, run again with WRITE_LATEST_VERSION enabled then update expected checksum"); if (WRITE_LATEST_VERSION) { //Unzip from CodeList just being downloaded