diff --git a/pom.xml b/pom.xml index 188959f80f5..a809c635e30 100644 --- a/pom.xml +++ b/pom.xml @@ -17,6 +17,11 @@ UTC en US + + 4.12 + 5.3.1 + 5.3.1 + 1.3.1 @@ -66,12 +71,27 @@ passay 1.1.0 + + org.junit.jupiter + junit-jupiter-api + ${junit.jupiter.version} + test + junit junit - 4.8.1 + ${junit.version} test - jar + + + org.junit.jupiter + junit-jupiter-engine + ${junit.jupiter.version} + + + org.junit.vintage + junit-vintage-engine + ${junit.vintage.version} org.glassfish @@ -354,11 +374,12 @@ org.slf4j slf4j-log4j12 1.7.7 - + org.mockito mockito-core - 1.10.19 + 2.22.0 + test ${testsToExclude} - -Duser.timezone=${project.timezone} -Dfile.encoding=${project.build.sourceEncoding} -Duser.language=${project.language} -Duser.region=${project.region} + ${argLine} -Duser.timezone=${project.timezone} -Dfile.encoding=${project.build.sourceEncoding} -Duser.language=${project.language} -Duser.region=${project.region} diff --git a/src/test/java/edu/harvard/iq/dataverse/ingest/IngestableDataCheckerTest.java b/src/test/java/edu/harvard/iq/dataverse/ingest/IngestableDataCheckerTest.java index 2c69393963f..ea9e378739b 100644 --- a/src/test/java/edu/harvard/iq/dataverse/ingest/IngestableDataCheckerTest.java +++ b/src/test/java/edu/harvard/iq/dataverse/ingest/IngestableDataCheckerTest.java @@ -165,7 +165,7 @@ public void testTestSAVformat() throws IOException { assertEquals(result, "application/x-spss-sav"); msgt("(2b) File is empty string"); - buff = createTempFileAndGetBuffer("testNotSAV.txt", ""); + buff = createTempFileAndGetBuffer("testNotSAV-empty.txt", ""); instance = new IngestableDataChecker(); result = instance.testSAVformat(buff); @@ -173,7 +173,7 @@ public void testTestSAVformat() throws IOException { assertEquals(result, null); msgt("(2c) File is non-SAV string"); - buff = createTempFileAndGetBuffer("testNotSAV.txt", "i-am-not-a-x-spss-sav-file"); + buff = createTempFileAndGetBuffer("testNotSAV-string.txt", "i-am-not-a-x-spss-sav-file"); instance = new IngestableDataChecker(); result = instance.testSAVformat(buff); msg("result 2c: " + result);