build: fix issues and failing tests after migration

ING-4375
halestudio · Aug 16, 2024 · 55c9803 · 55c9803
1 parent 8f8f0d4
commit 55c9803
Show file tree

Hide file tree

Showing 51 changed files with 259 additions and 160 deletions.
diff --git a/app/plugins/eu.esdihumboldt.hale.app.transform/build.gradle b/app/plugins/eu.esdihumboldt.hale.app.transform/build.gradle
@@ -33,6 +33,7 @@ dependencies {
   testImplementation libs.groovy.xml
 
   testImplementation project(':common:plugins:eu.esdihumboldt.hale.common.test')
+  testImplementation project(':common:plugins:eu.esdihumboldt.hale.common.filter')
 
   testRuntimeOnly project(':io:features:eu.esdihumboldt.hale.io.feature.core')
   testRuntimeOnly project(':cst:features:eu.esdihumboldt.cst.feature')

diff --git a/...sdihumboldt.hale.app.transform/resources/test/projects/arguments/hydro_arguments_file.txt b/...sdihumboldt.hale.app.transform/resources/test/projects/arguments/hydro_arguments_file.txt
@@ -1,11 +1,11 @@
 -project
-platform:/plugin/eu.esdihumboldt.hale.app.transform.test/projects/hydro/project.halex
+RESOLVE:projects/hydro/project.halex
 -source
-platform:/plugin/eu.esdihumboldt.hale.app.transform.test/projects/hydro/hydro-source.gml.gz
+RESOLVE:projects/hydro/hydro-source.gml.gz
 -Sinspire.sds.localId
 1234
 -filter
 name='River Rede'
 -filter-on
 River
-width='10.0'
+width='10.0'
diff --git a/...mboldt.hale.app.transform/resources/test/projects/arguments/multitypes_arguments_file.txt b/...mboldt.hale.app.transform/resources/test/projects/arguments/multitypes_arguments_file.txt
@@ -1,11 +1,11 @@
 -project
-platform:/plugin/eu.esdihumboldt.hale.app.transform.test/projects/multitype/project.halex
+RESOLVE:projects/multitype/project.halex
 -source
-platform:/plugin/eu.esdihumboldt.hale.app.transform.test/projects/multitype/multi-type-source.xml
+RESOLVE:projects/multitype/multi-type-source.xml
 -filter
 CQL:price>'11'
 -filter-on
 shirt
 name='Polo shirt green'
 -exclude-type
-shirt
+shirt
diff --git a/...boldt.hale.app.transform/resources/test/projects/arguments/multitypes_arguments_file2.txt b/...boldt.hale.app.transform/resources/test/projects/arguments/multitypes_arguments_file2.txt
@@ -1,4 +1,4 @@
 -project
-platform:/plugin/eu.esdihumboldt.hale.app.transform.test/projects/multitype/project.halex
+RESOLVE:projects/multitype/project.halex
 -source
-platform:/plugin/eu.esdihumboldt.hale.app.transform.test/projects/multitype/multi-type-source.xml
+RESOLVE:projects/multitype/multi-type-source.xml
diff --git a/...mboldt.hale.app.transform/test/eu/esdihumboldt/hale/app/transform/test/ExecuteTest.groovy b/...mboldt.hale.app.transform/test/eu/esdihumboldt/hale/app/transform/test/ExecuteTest.groovy
@@ -120,6 +120,9 @@ class ExecuteTest extends AbstractPlatformTest {
 		tempArgsFile.deleteOnExit()
 		createTempFile(MULTITYPE_ARGS_2_FILE_PATH, tempArgsFile);
 
+		// replace RESOLVE: for correct URL
+		resolveArgResources(tempArgsFile)
+
 		println ">> Arguments will be read from ${tempArgsFile}"
 		println ">> Transformed data will be written to ${targetFile}..."
 		transform([
@@ -157,6 +160,9 @@ class ExecuteTest extends AbstractPlatformTest {
 		tempArgsFile.deleteOnExit()
 		createTempFile(MULTITYPE_ARGS_FILE_PATH, tempArgsFile);
 
+		// replace RESOLVE: for correct URL
+		resolveArgResources(tempArgsFile)
+
 		println ">> Arguments will be read from ${tempArgsFile}"
 		println ">> Transformed data will be written to ${targetFile}..."
 		transform([
@@ -384,6 +390,9 @@ class ExecuteTest extends AbstractPlatformTest {
 		tempArgsFile.deleteOnExit()
 		createTempFile(HYDRO_ARGS_FILE_PATH, tempArgsFile);
 
+		// replace RESOLVE: for correct URL
+		resolveArgResources(tempArgsFile)
+
 		println ">> Arguments will be read from ${tempArgsFile}"
 		println ">> Transformed data will be written to ${targetFile}..."
 		transform([
@@ -1100,4 +1109,16 @@ assert aggregated['eu.esdihumboldt.hale.instance.validation.internal'].report.wa
 
 		return res
 	}
+
+	def void resolveArgResources(File argFile) {
+		argFile.text = argFile.readLines().collect {line ->
+			if (line.startsWith('RESOLVE:')) {
+				def path = line.substring('RESOLVE:'.length())
+				getClass().getClassLoader().getResource(path).toString()
+			}
+			else {
+				line
+			}
+		}.join('\n')
+	}
 }
diff --git a/buildSrc/src/main/groovy/hale.java-conventions.gradle b/buildSrc/src/main/groovy/hale.java-conventions.gradle
@@ -32,6 +32,9 @@ dependencies {
   testRuntimeOnly libs.logback.core
   testRuntimeOnly libs.logback.classic
   testRuntimeOnly project(':common:plugins:eu.esdihumboldt.hale.common.logback.config.test')
+
+  // make offline resources available to all tests
+  testRuntimeOnly project(':util:features:eu.esdihumboldt.util.feature.resource')
 }
 
 task sourcesJar(type: Jar) {

diff --git a/common/plugins/eu.esdihumboldt.hale.common.align.groovy/build.gradle b/common/plugins/eu.esdihumboldt.hale.common.align.groovy/build.gradle
@@ -27,4 +27,6 @@ dependencies {
   testImplementation testLibs.junit4
   testImplementation project(':common:plugins:eu.esdihumboldt.hale.common.schema.groovy')
   testImplementation project(':util:plugins:eu.esdihumboldt.util.test')
+
+  testRuntimeOnly project(':common:plugins:eu.esdihumboldt.hale.common.filter')
 }
diff --git a/common/plugins/eu.esdihumboldt.hale.common.align.merge/build.gradle b/common/plugins/eu.esdihumboldt.hale.common.align.merge/build.gradle
@@ -29,5 +29,13 @@ dependencies {
 
   testImplementation testLibs.junit4
 
+  testImplementation libs.jakarta.xml.bind.api
+
   testImplementation project(':common:plugins:eu.esdihumboldt.hale.common.align.merge.test')
+  testImplementation project(':common:plugins:eu.esdihumboldt.hale.common.instance.index')
+  testImplementation project(':common:plugins:eu.esdihumboldt.hale.common.instance.groovy')
+
+  // unsafe providers
+  testRuntimeOnly project(':io:plugins:eu.esdihumboldt.hale.io.schemabuilder')
+  testRuntimeOnly project(':io:plugins:eu.esdihumboldt.hale.io.instancebuilder')
 }
diff --git a/...convert.core/src/eu/esdihumboldt/hale/common/convert/core/StringToLocalDateConverter.java b/...convert.core/src/eu/esdihumboldt/hale/common/convert/core/StringToLocalDateConverter.java
@@ -1,35 +1,44 @@
 /*
  * Copyright (c) 2020 wetransform GmbH
- * 
+ *
  * All rights reserved. This program and the accompanying materials are made
  * available under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation, either version 3 of the License,
  * or (at your option) any later version.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
- * 
+ *
  * Contributors:
  *     wetransform GmbH <http://www.wetransform.to>
  */
 
 package eu.esdihumboldt.hale.common.convert.core;
 
 import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
 
 /**
  * Convert a {@link String} to a {@link LocalDate}.
- * 
+ *
  * @author Simon Templer
  */
 public class StringToLocalDateConverter extends AbstractStringToDateTimeTypeConverter<LocalDate> {
 
+	private static DateTimeFormatter SLASH_FORMATTER = DateTimeFormatter.ofPattern("yyyy/MM/dd");
+
 	/**
 	 * @see eu.esdihumboldt.hale.common.convert.core.AbstractStringToDateTimeTypeConverter#parse(java.lang.String)
 	 */
 	@Override
 	protected LocalDate parse(String source) {
-		return LocalDate.parse(source);
+		try {
+			return LocalDate.parse(source);
+		} catch (DateTimeParseException e) {
+			// try alternative format
+			return LocalDate.parse(source, SLASH_FORMATTER);
+		}
 	}
 
 }
diff --git a/common/plugins/eu.esdihumboldt.hale.common.core/build.gradle b/common/plugins/eu.esdihumboldt.hale.common.core/build.gradle
@@ -39,5 +39,8 @@ dependencies {
   implementation libs.model.project
 
   testImplementation testLibs.junit4
+
+  testImplementation project(':util:plugins:eu.esdihumboldt.util.test')
+
   testImplementation project(':ext:nonosgi:org.eclipse.equinox.nonosgi.registry')
 }
diff --git a/...esdihumboldt.hale.common.core/test/eu/esdihumboldt/hale/common/core/HalePlatformTest.java b/...esdihumboldt.hale.common.core/test/eu/esdihumboldt/hale/common/core/HalePlatformTest.java
@@ -21,6 +21,7 @@
 
 import org.eclipse.equinox.nonosgi.registry.RegistryFactoryHelper;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.osgi.framework.Version;
 
@@ -39,6 +40,7 @@ public static void init() {
 
 	@SuppressWarnings("javadoc")
 	@Test
+	@Ignore("Does not work in dev environment because manifest file is not present yet")
 	public void testGetVersion() {
 		Version version = HalePlatform.getCoreVersion();
 		assertNotNull(version);

diff --git a/...dt.hale.common.core/test/eu/esdihumboldt/hale/common/core/io/impl/ValueMapTypeTest.groovy b/...dt.hale.common.core/test/eu/esdihumboldt/hale/common/core/io/impl/ValueMapTypeTest.groovy
@@ -21,8 +21,8 @@ import eu.esdihumboldt.hale.common.core.io.HaleIO
 import eu.esdihumboldt.hale.common.core.io.Value
 import eu.esdihumboldt.hale.common.core.io.ValueList
 import eu.esdihumboldt.hale.common.core.io.ValueMap
-import org.eclipse.equinox.nonosgi.registry.RegistryFactoryHelper
-import org.junit.BeforeClass
+import eu.esdihumboldt.util.nonosgi.Init
+import eu.esdihumboldt.util.test.AbstractPlatformTest
 import org.junit.Test
 import org.w3c.dom.Element
 
@@ -31,13 +31,7 @@ import org.w3c.dom.Element
  *
  * @author Simon Templer
  */
-class ValueMapTypeTest {
-
-	@BeforeClass
-	static void init() {
-		// initialize registry
-		RegistryFactoryHelper.getRegistry()
-	}
+class ValueMapTypeTest extends AbstractPlatformTest {
 
 	/**
 	 * Test if a map containing simple values and complex values is the same
@@ -46,13 +40,16 @@ class ValueMapTypeTest {
 	@Test
 	public void testValueMap() {
 		ValueMap vm = new ValueMap()
-		vm['languages' as Value] = new ValueList(['de' as Value, 'en' as Value]) as Value
+		vm[Value.of('languages')] = Value.of(new ValueList([
+			Value.of('de'),
+			Value.of('en')
+		]))
 		vm[6*7 as Value] = 42 as Value
-		vm[new ValueList([
+		vm[Value.of(new ValueList([
 				1 as Value,
 				2 as Value,
 				3 as Value
-			]) as Value] = 123 as Value
+			]))] = 123 as Value
 
 		// convert to DOM
 		Element fragment = HaleIO.getComplexElement(vm)
@@ -72,13 +69,16 @@ class ValueMapTypeTest {
 	@Test
 	public void testValueMapJson() {
 		ValueMap vm = new ValueMap()
-		vm['languages' as Value] = new ValueList(['de' as Value, 'en' as Value]) as Value
+		vm[Value.of('languages')] = Value.of(new ValueList([
+			Value.of('de'),
+			Value.of('en')
+		]))
 		vm[6*7 as Value] = 42 as Value
-		vm[new ValueList([
+		vm[Value.of(new ValueList([
 				1 as Value,
 				2 as Value,
 				3 as Value
-			]) as Value] = 123 as Value
+			]))] = 123 as Value
 
 		// converter
 		ValueMapType vmt = new ValueMapType()

diff --git a/....common.core/test/eu/esdihumboldt/hale/common/core/io/impl/ValuePropertiesTypeTest.groovy b/....common.core/test/eu/esdihumboldt/hale/common/core/io/impl/ValuePropertiesTypeTest.groovy
@@ -21,6 +21,7 @@ import eu.esdihumboldt.hale.common.core.io.HaleIO
 import eu.esdihumboldt.hale.common.core.io.Value
 import eu.esdihumboldt.hale.common.core.io.ValueList
 import eu.esdihumboldt.hale.common.core.io.ValueProperties
+import eu.esdihumboldt.util.test.AbstractPlatformTest
 import org.eclipse.equinox.nonosgi.registry.RegistryFactoryHelper
 import org.junit.BeforeClass
 import org.junit.Test
@@ -32,13 +33,7 @@ import org.w3c.dom.Element
  *
  * @author Simon Templer
  */
-class ValuePropertiesTypeTest {
-
-	@BeforeClass
-	static void init() {
-		// initialize registry
-		RegistryFactoryHelper.getRegistry()
-	}
+class ValuePropertiesTypeTest extends AbstractPlatformTest {
 
 	/**
 	 * Test if a simple properties map containing only simple values is the same
@@ -47,9 +42,9 @@ class ValuePropertiesTypeTest {
 	@Test
 	public void testValueProperties() {
 		ValueProperties vp = new ValueProperties()
-		Value name = 'Peter' as Value
+		Value name = Value.of('Peter')
 		vp['name'] = name
-		vp['city'] = 'Petersburg' as Value
+		vp['city'] = Value.of('Petersburg')
 		vp['age'] = 2.power(5) as Value
 
 		// convert to DOM
@@ -69,9 +64,9 @@ class ValuePropertiesTypeTest {
 	@Test
 	public void testValuePropertiesJson() {
 		ValueProperties vp = new ValueProperties()
-		Value name = 'Peter' as Value
+		Value name = Value.of('Peter')
 		vp['name'] = name
-		vp['city'] = 'Petersburg' as Value
+		vp['city'] = Value.of('Petersburg')
 		vp['age'] = 2.power(5) as Value
 
 		// converter
@@ -97,12 +92,12 @@ class ValuePropertiesTypeTest {
 	@Test
 	public void testValuePropertiesList() {
 		ValueProperties vp = new ValueProperties()
-		vp['name'] = 'Peter' as Value
-		vp['cities'] = new ValueList([
-			'Petersburg' as Value,
-			'Katzenhirn' as Value,
-			'Munich' as Value
-		]) as Value
+		vp['name'] = Value.of('Peter')
+		vp['cities'] = Value.of(new ValueList([
+			Value.of('Petersburg'),
+			Value.of('Katzenhirn'),
+			Value.of('Munich')
+		]))
 		vp['age'] = 42 - 10 as Value
 
 		// convert to DOM
@@ -123,12 +118,12 @@ class ValuePropertiesTypeTest {
 	@Test
 	public void testValuePropertiesListJson() {
 		ValueProperties vp = new ValueProperties()
-		vp['name'] = 'Peter' as Value
-		vp['cities'] = new ValueList([
-			'Petersburg' as Value,
-			'Katzenhirn' as Value,
-			'Munich' as Value
-		]) as Value
+		vp['name'] = Value.of('Peter')
+		vp['cities'] = Value.of(new ValueList([
+			Value.of('Petersburg'),
+			Value.of('Katzenhirn'),
+			Value.of('Munich')
+		]))
 		vp['age'] = 42 - 10 as Value
 
 		// converter

diff --git a/...oldt.hale.common.filter/test/eu/esdihumboldt/hale/common/filter/AbstractFilterTest.groovy b/...oldt.hale.common.filter/test/eu/esdihumboldt/hale/common/filter/AbstractFilterTest.groovy
@@ -1,19 +1,19 @@
 /*
  * Copyright (c) 2017 wetransform GmbH
- * 
+ *
  * All rights reserved. This program and the accompanying materials are made
  * available under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation, either version 3 of the License,
  * or (at your option) any later version.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this distribution. If not, see <http://www.gnu.org/licenses/>.
- * 
+ *
  * Contributors:
  *     wetransform GmbH <http://www.wetransform.to>
  */
 
-package eu.esdihumboldt.hale.common.filter;
+package eu.esdihumboldt.hale.common.filter
 
 import static org.junit.Assert.*
 
@@ -24,6 +24,7 @@ import eu.esdihumboldt.hale.common.instance.model.Instance
 import eu.esdihumboldt.hale.common.schema.groovy.SchemaBuilder
 import eu.esdihumboldt.hale.common.schema.model.Schema
 import eu.esdihumboldt.hale.common.schema.model.TypeDefinition
+import eu.esdihumboldt.util.test.AbstractPlatformTest
 import java.text.SimpleDateFormat
 import org.junit.Before
 import org.locationtech.jts.geom.Coordinate
@@ -32,10 +33,10 @@ import org.locationtech.jts.geom.GeometryFactory
 
 /**
  * Base class for filter tests providing test instances.
- * 
+ *
  * @author Simon Templer
  */
-abstract class AbstractFilterTest {
+abstract class AbstractFilterTest extends AbstractPlatformTest {
 
 	private static final String defaultNs = "http://www.my.namespace"