diff --git a/droid-parent/pom.xml b/droid-parent/pom.xml index 03cc60e1a..65bd8a211 100644 --- a/droid-parent/pom.xml +++ b/droid-parent/pom.xml @@ -93,14 +93,14 @@ UTF-8 pronom@nationalarchives.gov.uk - 7.0.8 + 7.0.9 5.4.1.Final 10.17.1.0 4.2.3 2.1.0 4.0.5 4.0.5 - 2.22.1 + 2.22.2 9.7.2 0.14.0 1.2.1 @@ -124,7 +124,7 @@ org.apache.maven.shared maven-dependency-analyzer - 1.17.0 + 1.17.1 @@ -146,7 +146,7 @@ com.mycila license-maven-plugin - 5.1.1 + 5.1.2 org.apache.maven.plugins @@ -225,7 +225,7 @@ org.apache.maven.plugins maven-site-plugin - 3.21.0 + 3.22.0 org.apache.maven.plugins @@ -692,7 +692,7 @@ Copyright © ${project.inceptionYear}-{currentYear} org.dbunit dbunit - 3.3.0 + 3.5.1 com.github.stephenc.java-iso-tools diff --git a/droid-results/src/main/resources/META-INF/spring-results.xml b/droid-results/src/main/resources/META-INF/spring-results.xml index 4b9908711..ddc264f80 100644 --- a/droid-results/src/main/resources/META-INF/spring-results.xml +++ b/droid-results/src/main/resources/META-INF/spring-results.xml @@ -311,8 +311,8 @@ http://www.springframework.org/schema/context http://www.springframework.org/sch - + diff --git a/droid-results/src/test/java/uk/gov/nationalarchives/droid/planet/xml/dao/JpaPlanetsXMLDaoTest.java b/droid-results/src/test/java/uk/gov/nationalarchives/droid/planet/xml/dao/JpaPlanetsXMLDaoTest.java index abf1c79eb..0cdbe4754 100644 --- a/droid-results/src/test/java/uk/gov/nationalarchives/droid/planet/xml/dao/JpaPlanetsXMLDaoTest.java +++ b/droid-results/src/test/java/uk/gov/nationalarchives/droid/planet/xml/dao/JpaPlanetsXMLDaoTest.java @@ -43,6 +43,7 @@ import org.springframework.jdbc.datasource.DataSourceUtils; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import uk.gov.nationalarchives.droid.core.interfaces.config.RuntimeConfig; import uk.gov.nationalarchives.droid.core.interfaces.filter.CriterionFieldEnum; import uk.gov.nationalarchives.droid.core.interfaces.filter.CriterionOperator; import uk.gov.nationalarchives.droid.profile.FilterCriterionImpl; @@ -83,8 +84,11 @@ public class JpaPlanetsXMLDaoTest { @BeforeClass public static void getTestData() throws Exception { - testData = new FlatXmlDataSetBuilder().build(JpaPlanetsXMLDaoTest.class + testData = new FlatXmlDataSetBuilder().setDtdMetadata(false).setColumnSensing(true) + .build(JpaPlanetsXMLDaoTest.class .getResource("planets-xml-test-data-sans-formats.xml")); + System.setProperty(RuntimeConfig.DROID_USER, "/tmp/droid"); + System.setProperty(RuntimeConfig.DROID_TEMP_DIR, "/tmp/droid"); } @Before diff --git a/droid-results/src/test/java/uk/gov/nationalarchives/droid/profile/ItemWriterImplTest.java b/droid-results/src/test/java/uk/gov/nationalarchives/droid/profile/ItemWriterImplTest.java index b5d46dedc..a0a0699de 100644 --- a/droid-results/src/test/java/uk/gov/nationalarchives/droid/profile/ItemWriterImplTest.java +++ b/droid-results/src/test/java/uk/gov/nationalarchives/droid/profile/ItemWriterImplTest.java @@ -185,7 +185,7 @@ public void should_write_node_file_name_with_space_at_the_end() throws IOExcepti final String expectedEntry = toCsvRow(new String[]{ "", "", isNotWindows() ? "file:/my/file1.txt%20%20" : "file:/C:/my/file1.txt%20%20", - isNotWindows() ? "/my/file1.txt " : "C:\\my\\file1.txt ", + isNotWindows() ? "/my/file1.txt" : "C:\\my\\file1.txt", "file1.txt", "Signature", "Done", diff --git a/droid-results/src/test/java/uk/gov/nationalarchives/droid/profile/JpaProfileDaoTest.java b/droid-results/src/test/java/uk/gov/nationalarchives/droid/profile/JpaProfileDaoTest.java index 5257acec8..ffe53e080 100644 --- a/droid-results/src/test/java/uk/gov/nationalarchives/droid/profile/JpaProfileDaoTest.java +++ b/droid-results/src/test/java/uk/gov/nationalarchives/droid/profile/JpaProfileDaoTest.java @@ -55,6 +55,7 @@ import org.springframework.jdbc.datasource.DataSourceUtils; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import uk.gov.nationalarchives.droid.core.interfaces.config.RuntimeConfig; /** @@ -83,11 +84,13 @@ public static void getTestData() throws Exception { // ole approach we would have had to find a way to load the test formats after the class had ben initialised, // tricky due to the way the whole fresh vs existing template behaviour works. See comments in init method // of JDBCBatchResultsHandler - testData = new FlatXmlDataSetBuilder().build( - JpaProfileDaoTest.class.getResource("results-test-data-sans-formats.xml")); + testData = new FlatXmlDataSetBuilder().setDtdMetadata(false).setColumnSensing(true) + .build(JpaProfileDaoTest.class.getResource("results-test-data-sans-formats.xml")); //System.setProperty("hibernate.generateDdl", "true"); System.setProperty("maxBytesToScan", "65536"); System.setProperty("matchAllExtensions", "false"); + System.setProperty(RuntimeConfig.DROID_USER, "/tmp/droid"); + System.setProperty(RuntimeConfig.DROID_TEMP_DIR, "/tmp/droid"); } @AfterClass diff --git a/droid-results/src/test/java/uk/gov/nationalarchives/droid/profile/JpaProfileFilterTest.java b/droid-results/src/test/java/uk/gov/nationalarchives/droid/profile/JpaProfileFilterTest.java index 8ee2ed0b8..80cf057cd 100644 --- a/droid-results/src/test/java/uk/gov/nationalarchives/droid/profile/JpaProfileFilterTest.java +++ b/droid-results/src/test/java/uk/gov/nationalarchives/droid/profile/JpaProfileFilterTest.java @@ -90,7 +90,7 @@ public static void getTestData() throws Exception { // old approach we would have had to find a way to load the test formats after the class had ben initialised, // tricky due to the way the whole fresh vs existing template behaviour works. See comments in init method // of JDBCBatchResultsHandler - testData = new FlatXmlDataSetBuilder().build( + testData = new FlatXmlDataSetBuilder().setDtdMetadata(false).setColumnSensing(true).build( JpaProfileDaoTest.class.getResource("results-test-data-sans-formats.xml")); //System.setProperty("hibernate.generateDdl", "true"); System.setProperty("maxBytesToScan", "65536"); diff --git a/droid-results/src/test/java/uk/gov/nationalarchives/droid/report/dao/JpaReportDaoTest.java b/droid-results/src/test/java/uk/gov/nationalarchives/droid/report/dao/JpaReportDaoTest.java index d8ca9a696..421356fed 100644 --- a/droid-results/src/test/java/uk/gov/nationalarchives/droid/report/dao/JpaReportDaoTest.java +++ b/droid-results/src/test/java/uk/gov/nationalarchives/droid/report/dao/JpaReportDaoTest.java @@ -92,7 +92,8 @@ public class JpaReportDaoTest { @BeforeClass public static void getTestData() throws Exception { - testData = new FlatXmlDataSetBuilder().build(JpaReportDaoTest.class.getResource("report-test-data-sans-formats.xml")); + testData = new FlatXmlDataSetBuilder().setDtdMetadata(false).setColumnSensing(true) + .build(JpaReportDaoTest.class.getResource("report-test-data-sans-formats.xml")); //System.setProperty("hibernate.generateDdl", "true"); System.setProperty("matchAllExtensions", "false"); conn = TestDatabase.getConnection(); diff --git a/droid-results/src/test/java/uk/gov/nationalarchives/droid/submitter/ProfileSpecWalkerImplTest.java b/droid-results/src/test/java/uk/gov/nationalarchives/droid/submitter/ProfileSpecWalkerImplTest.java index 0ebce8a42..5edd869eb 100644 --- a/droid-results/src/test/java/uk/gov/nationalarchives/droid/submitter/ProfileSpecWalkerImplTest.java +++ b/droid-results/src/test/java/uk/gov/nationalarchives/droid/submitter/ProfileSpecWalkerImplTest.java @@ -36,6 +36,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +import java.time.Instant; import java.util.ArrayList; import java.util.List; @@ -182,7 +183,7 @@ private static S3EventHandler getS3EventHandler(List re for (AbstractProfileResource resource : s3Resources) { String key = resource.getName().startsWith("/") ? resource.getName().substring(1) : resource.getName(); - S3Object s3Object = S3Object.builder().key(key).build(); + S3Object s3Object = S3Object.builder().key(key).lastModified(Instant.now()).size(1L).build(); ArgumentMatcher requestArgumentMatcher = argument -> argument != null && resource.getName().equals(argument.prefix()); ListObjectsV2Response response = ListObjectsV2Response.builder().contents(List.of(s3Object)).build(); diff --git a/droid-results/src/test/java/uk/gov/nationalarchives/droid/submitter/S3EventHandlerTest.java b/droid-results/src/test/java/uk/gov/nationalarchives/droid/submitter/S3EventHandlerTest.java index 55a077031..005e884e4 100644 --- a/droid-results/src/test/java/uk/gov/nationalarchives/droid/submitter/S3EventHandlerTest.java +++ b/droid-results/src/test/java/uk/gov/nationalarchives/droid/submitter/S3EventHandlerTest.java @@ -68,7 +68,7 @@ public void testS3EventHandlerProvidesCorrectMetadata() { List> allValues = droidCoreCaptor.getAllValues(); RequestMetaData requestMetaData = allValues.getFirst().getRequestMetaData(); - assertEquals(Long.valueOf(1), requestMetaData.getSize()); + assertEquals(Long.valueOf(0), requestMetaData.getSize()); assertEquals(Long.valueOf(0), requestMetaData.getTime()); assertEquals("object", requestMetaData.getName()); } diff --git a/droid-results/src/test/resources/jpa-test.properties b/droid-results/src/test/resources/jpa-test.properties index 30eeeddea..05a4ce449 100644 --- a/droid-results/src/test/resources/jpa-test.properties +++ b/droid-results/src/test/resources/jpa-test.properties @@ -76,4 +76,5 @@ matchAllExtensions=false quoteAllFields=true columnsToWrite= -exportOptions=ONE_ROW_PER_FILE \ No newline at end of file +exportOptions=ONE_ROW_PER_FILE +exportOutputOptions=CSV_OUTPUT \ No newline at end of file