You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by pk...@apache.org on 2022/04/28 14:48:40 UTC
[uima-uimaj] branch feature/UIMA-6374-Create-CAS-de-serialization-test-suite-windows updated: [UIMA-6374] Create CAS (de)serialization test suite
This is an automated email from the ASF dual-hosted git repository.
pkluegl pushed a commit to branch feature/UIMA-6374-Create-CAS-de-serialization-test-suite-windows
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
The following commit(s) were added to refs/heads/feature/UIMA-6374-Create-CAS-de-serialization-test-suite-windows by this push:
new c53ad4f20 [UIMA-6374] Create CAS (de)serialization test suite
c53ad4f20 is described below
commit c53ad4f20284164df305035310b1e0e2e7916bc9
Author: Peter Klügl <pk...@apache.org>
AuthorDate: Thu Apr 28 16:48:27 2022 +0200
[UIMA-6374] Create CAS (de)serialization test suite
- fixed tests for windows builds
---
.../org/apache/uima/resource/impl/RelativePathResolver_impl.java | 1 +
.../serdes/CasSerializationDeserialization_BINARY_TSI_Test.java | 8 ++++----
.../cas/serdes/CasSerializationDeserialization_BINARY_Test.java | 4 ++--
...SerializationDeserialization_COMPRESSED_FILTERED_TSI_Test.java | 8 ++++----
.../CasSerializationDeserialization_SERIALIZED_TSI_Test.java | 8 ++++----
.../cas/serdes/CasSerializationDeserialization_XCAS_Test.java | 8 ++++----
.../CasSerializationDeserialization_XMI_1_0_PRETTY_Test.java | 8 ++++----
.../CasSerializationDeserialization_XMI_1_1_PRETTY_Test.java | 8 ++++----
.../org/apache/uima/cas/serdes/scenario/SerRefTestScenario.java | 2 +-
.../apache/uima/resource/impl/RelativePathResolver_implTest.java | 7 ++++++-
10 files changed, 34 insertions(+), 28 deletions(-)
diff --git a/uimaj-core/src/main/java/org/apache/uima/resource/impl/RelativePathResolver_impl.java b/uimaj-core/src/main/java/org/apache/uima/resource/impl/RelativePathResolver_impl.java
index 67be7d25a..392912414 100644
--- a/uimaj-core/src/main/java/org/apache/uima/resource/impl/RelativePathResolver_impl.java
+++ b/uimaj-core/src/main/java/org/apache/uima/resource/impl/RelativePathResolver_impl.java
@@ -112,6 +112,7 @@ public class RelativePathResolver_impl implements RelativePathResolver {
mDataPath = unmodifiableList(Arrays.stream(aPaths) //
.map(File::getPath) //
+ .map(s-> s.replace(File.separator, "/"))
.collect(toList()));
mBaseUrls = new URL[aPaths.length];
for (int i = 0; i < aPaths.length; i++) {
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/serdes/CasSerializationDeserialization_BINARY_TSI_Test.java b/uimaj-core/src/test/java/org/apache/uima/cas/serdes/CasSerializationDeserialization_BINARY_TSI_Test.java
index 7277ae72f..ecd7e4124 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/serdes/CasSerializationDeserialization_BINARY_TSI_Test.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/serdes/CasSerializationDeserialization_BINARY_TSI_Test.java
@@ -46,15 +46,15 @@ public class CasSerializationDeserialization_BINARY_TSI_Test {
private static final int RANDOM_CAS_ITERATIONS = 20;
private static final List<CasSerDesCycleConfiguration> serDesCycles = asList( //
- new CasSerDesCycleConfiguration(FORMAT + " / DEFAULT", //
+ new CasSerDesCycleConfiguration(FORMAT + " - DEFAULT", //
(a, b) -> serdes(a, b, FORMAT, DEFAULT)),
- new CasSerDesCycleConfiguration(FORMAT + " / REINIT", //
+ new CasSerDesCycleConfiguration(FORMAT + " - REINIT", //
(a, b) -> serdes(a, b, FORMAT, REINIT)));
private static final List<CasDesSerCycleConfiguration> desSerCycles = asList( //
- new CasDesSerCycleConfiguration(FORMAT + " / DEFAULT", //
+ new CasDesSerCycleConfiguration(FORMAT + " - DEFAULT", //
(a, b) -> desser(createCas(), a, b, FORMAT, DEFAULT)),
- new CasDesSerCycleConfiguration(FORMAT + " / REINIT", //
+ new CasDesSerCycleConfiguration(FORMAT + " - REINIT", //
(a, b) -> desser(createCas(), a, b, FORMAT, REINIT)));
private static List<SerRefTestScenario> serRefScenarios() {
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/serdes/CasSerializationDeserialization_BINARY_Test.java b/uimaj-core/src/test/java/org/apache/uima/cas/serdes/CasSerializationDeserialization_BINARY_Test.java
index 98273c0ca..6c259c2f3 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/serdes/CasSerializationDeserialization_BINARY_Test.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/serdes/CasSerializationDeserialization_BINARY_Test.java
@@ -46,11 +46,11 @@ public class CasSerializationDeserialization_BINARY_Test {
private static final int RANDOM_CAS_ITERATIONS = 20;
private static final List<CasSerDesCycleConfiguration> serDesCycles = asList( //
- new CasSerDesCycleConfiguration(FORMAT + " / DEFAULT", //
+ new CasSerDesCycleConfiguration(FORMAT + " - DEFAULT", //
(a, b) -> serdes(a, b, FORMAT, DEFAULT, PRESERVE_ORIGINAL_TSI)));
private static final List<CasDesSerCycleConfiguration> desSerCycles = asList( //
- new CasDesSerCycleConfiguration(FORMAT + " / DEFAULT", //
+ new CasDesSerCycleConfiguration(FORMAT + " - DEFAULT", //
(a, b) -> desser(createCasMaybeWithTypesystem(a), a, b, FORMAT, DEFAULT)));
private static List<SerRefTestScenario> serRefScenarios() {
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/serdes/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test.java b/uimaj-core/src/test/java/org/apache/uima/cas/serdes/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test.java
index 8e83c618e..9beada61b 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/serdes/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/serdes/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test.java
@@ -48,15 +48,15 @@ public class CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test {
private static final int RANDOM_CAS_ITERATIONS = 20;
private static final List<CasSerDesCycleConfiguration> serDesCycles = asList( //
- new CasSerDesCycleConfiguration(FORMAT + " / DEFAULT", //
+ new CasSerDesCycleConfiguration(FORMAT + " - DEFAULT", //
(a, b) -> serdes(a, b, FORMAT, DEFAULT, PRESERVE_ORIGINAL_TSI)),
- new CasSerDesCycleConfiguration(FORMAT + " / REINIT", //
+ new CasSerDesCycleConfiguration(FORMAT + " - REINIT", //
(a, b) -> serdes(a, b, FORMAT, REINIT)));
private static final List<CasDesSerCycleConfiguration> desSerCycles = asList( //
- new CasDesSerCycleConfiguration(FORMAT + " / DEFAULT", //
+ new CasDesSerCycleConfiguration(FORMAT + " - DEFAULT", //
(a, b) -> desser(createCasMaybeWithTypesystem(a), a, b, FORMAT, DEFAULT)),
- new CasDesSerCycleConfiguration(FORMAT + " / REINIT", //
+ new CasDesSerCycleConfiguration(FORMAT + " - REINIT", //
(a, b) -> desser(createCas(), a, b, FORMAT, REINIT)));
private static List<SerRefTestScenario> serRefScenarios() {
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/serdes/CasSerializationDeserialization_SERIALIZED_TSI_Test.java b/uimaj-core/src/test/java/org/apache/uima/cas/serdes/CasSerializationDeserialization_SERIALIZED_TSI_Test.java
index d4b886323..6e2171d04 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/serdes/CasSerializationDeserialization_SERIALIZED_TSI_Test.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/serdes/CasSerializationDeserialization_SERIALIZED_TSI_Test.java
@@ -45,15 +45,15 @@ public class CasSerializationDeserialization_SERIALIZED_TSI_Test {
private static final int RANDOM_CAS_ITERATIONS = 20;
private static final List<CasSerDesCycleConfiguration> serDesCycles = asList( //
- new CasSerDesCycleConfiguration(FORMAT + " / DEFAULT", //
+ new CasSerDesCycleConfiguration(FORMAT + " - DEFAULT", //
(a, b) -> serdes(a, b, FORMAT, DEFAULT)),
- new CasSerDesCycleConfiguration(FORMAT + " / REINIT", //
+ new CasSerDesCycleConfiguration(FORMAT + " - REINIT", //
(a, b) -> serdes(a, b, FORMAT, REINIT)));
private static final List<CasDesSerCycleConfiguration> desSerCycles = asList( //
- new CasDesSerCycleConfiguration(FORMAT + " / DEFAULT", //
+ new CasDesSerCycleConfiguration(FORMAT + " - DEFAULT", //
(a, b) -> desser(createCas(), a, b, FORMAT, DEFAULT)),
- new CasDesSerCycleConfiguration(FORMAT + " / REINIT", //
+ new CasDesSerCycleConfiguration(FORMAT + " - REINIT", //
(a, b) -> desser(createCas(), a, b, FORMAT, REINIT)));
private static List<SerRefTestScenario> serRefScenarios() {
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/serdes/CasSerializationDeserialization_XCAS_Test.java b/uimaj-core/src/test/java/org/apache/uima/cas/serdes/CasSerializationDeserialization_XCAS_Test.java
index 7a6272473..74c710406 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/serdes/CasSerializationDeserialization_XCAS_Test.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/serdes/CasSerializationDeserialization_XCAS_Test.java
@@ -49,15 +49,15 @@ public class CasSerializationDeserialization_XCAS_Test {
private static final int RANDOM_CAS_ITERATIONS = 20;
private static final List<CasSerDesCycleConfiguration> serDesCycles = asList( //
- new CasSerDesCycleConfiguration(FORMAT + " / DEFAULT", //
+ new CasSerDesCycleConfiguration(FORMAT + " - DEFAULT", //
(a, b) -> serdes(a, b, FORMAT, DEFAULT, PRESERVE_ORIGINAL_TSI)),
- new CasSerDesCycleConfiguration(FORMAT + " / LENIENT", //
+ new CasSerDesCycleConfiguration(FORMAT + " - LENIENT", //
(a, b) -> serdes(a, b, FORMAT, LENIENT, PRESERVE_ORIGINAL_TSI)));
private static final List<CasDesSerCycleConfiguration> desSerCycles = asList( //
- new CasDesSerCycleConfiguration(FORMAT + " / DEFAULT", //
+ new CasDesSerCycleConfiguration(FORMAT + " - DEFAULT", //
(a, b) -> desser(createCasMaybeWithTypesystem(a), a, b, FORMAT, DEFAULT)),
- new CasDesSerCycleConfiguration(FORMAT + " / LENIENT", //
+ new CasDesSerCycleConfiguration(FORMAT + " - LENIENT", //
(a, b) -> desser(createCasMaybeWithTypesystem(a), a, b, FORMAT, LENIENT)));
private static List<SerRefTestScenario> serRefScenarios() {
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/serdes/CasSerializationDeserialization_XMI_1_0_PRETTY_Test.java b/uimaj-core/src/test/java/org/apache/uima/cas/serdes/CasSerializationDeserialization_XMI_1_0_PRETTY_Test.java
index d7e54323f..2200824c2 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/serdes/CasSerializationDeserialization_XMI_1_0_PRETTY_Test.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/serdes/CasSerializationDeserialization_XMI_1_0_PRETTY_Test.java
@@ -49,15 +49,15 @@ public class CasSerializationDeserialization_XMI_1_0_PRETTY_Test {
private static final int RANDOM_CAS_ITERATIONS = 20;
private static final List<CasSerDesCycleConfiguration> serDesCycles = asList( //
- new CasSerDesCycleConfiguration(FORMAT + " / DEFAULT", //
+ new CasSerDesCycleConfiguration(FORMAT + " - DEFAULT", //
(a, b) -> serdes(a, b, FORMAT, DEFAULT, PRESERVE_ORIGINAL_TSI)),
- new CasSerDesCycleConfiguration(FORMAT + " / LENIENT", //
+ new CasSerDesCycleConfiguration(FORMAT + " - LENIENT", //
(a, b) -> serdes(a, b, FORMAT, LENIENT, PRESERVE_ORIGINAL_TSI)));
private static final List<CasDesSerCycleConfiguration> desSerCycles = asList( //
- new CasDesSerCycleConfiguration(FORMAT + " / DEFAULT", //
+ new CasDesSerCycleConfiguration(FORMAT + " - DEFAULT", //
(a, b) -> desser(createCasMaybeWithTypesystem(a), a, b, FORMAT, DEFAULT)),
- new CasDesSerCycleConfiguration(FORMAT + " / LENIENT", //
+ new CasDesSerCycleConfiguration(FORMAT + " - LENIENT", //
(a, b) -> desser(createCasMaybeWithTypesystem(a), a, b, FORMAT, LENIENT)));
private static List<SerRefTestScenario> serRefScenarios() {
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/serdes/CasSerializationDeserialization_XMI_1_1_PRETTY_Test.java b/uimaj-core/src/test/java/org/apache/uima/cas/serdes/CasSerializationDeserialization_XMI_1_1_PRETTY_Test.java
index 15417f948..c4e009b9b 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/serdes/CasSerializationDeserialization_XMI_1_1_PRETTY_Test.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/serdes/CasSerializationDeserialization_XMI_1_1_PRETTY_Test.java
@@ -49,15 +49,15 @@ public class CasSerializationDeserialization_XMI_1_1_PRETTY_Test {
private static final int RANDOM_CAS_ITERATIONS = 20;
private static final List<CasSerDesCycleConfiguration> serDesCycles = asList( //
- new CasSerDesCycleConfiguration(FORMAT + " / DEFAULT", //
+ new CasSerDesCycleConfiguration(FORMAT + " - DEFAULT", //
(a, b) -> serdes(a, b, FORMAT, DEFAULT, PRESERVE_ORIGINAL_TSI)),
- new CasSerDesCycleConfiguration(FORMAT + " / LENIENT", //
+ new CasSerDesCycleConfiguration(FORMAT + " - LENIENT", //
(a, b) -> serdes(a, b, FORMAT, LENIENT, PRESERVE_ORIGINAL_TSI)));
private static final List<CasDesSerCycleConfiguration> desSerCycles = asList( //
- new CasDesSerCycleConfiguration(FORMAT + " / DEFAULT", //
+ new CasDesSerCycleConfiguration(FORMAT + " - DEFAULT", //
(a, b) -> desser(createCasMaybeWithTypesystem(a), a, b, FORMAT, DEFAULT)),
- new CasDesSerCycleConfiguration(FORMAT + " / LENIENT", //
+ new CasDesSerCycleConfiguration(FORMAT + " - LENIENT", //
(a, b) -> desser(createCasMaybeWithTypesystem(a), a, b, FORMAT, LENIENT)));
private static List<SerRefTestScenario> serRefScenarios() {
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/serdes/scenario/SerRefTestScenario.java b/uimaj-core/src/test/java/org/apache/uima/cas/serdes/scenario/SerRefTestScenario.java
index 9d99a9c04..ac4039daf 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/serdes/scenario/SerRefTestScenario.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/serdes/scenario/SerRefTestScenario.java
@@ -103,7 +103,7 @@ public class SerRefTestScenario implements Runnable {
.as("Reference file must exists at %s", referenceCasFile) //
.exists();
assertThat(contentOf(targetCasFile.toFile())) //
- .isEqualTo(contentOf(referenceCasFile.toFile()));
+ .isEqualToNormalizingNewlines(contentOf(referenceCasFile.toFile()));
}
private void serialize(CAS aSourceCas, Path aTargetCasFile) {
diff --git a/uimaj-core/src/test/java/org/apache/uima/resource/impl/RelativePathResolver_implTest.java b/uimaj-core/src/test/java/org/apache/uima/resource/impl/RelativePathResolver_implTest.java
index 1ccc4d355..057ae2d4f 100644
--- a/uimaj-core/src/test/java/org/apache/uima/resource/impl/RelativePathResolver_implTest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/resource/impl/RelativePathResolver_implTest.java
@@ -25,8 +25,10 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import java.io.File;
import java.net.MalformedURLException;
import java.net.URL;
+import java.util.Arrays;
import java.util.stream.Stream;
+import org.apache.commons.io.FilenameUtils;
import org.apache.uima.test.junit_extension.JUnitExtension;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -36,7 +38,9 @@ public class RelativePathResolver_implTest {
private final static String PATH_SEP = System.getProperty("path.separator");
private RelativePathResolver_impl sut;
- private final static String[] expectedElements = { "/this/is/a/test", "/another/test" };
+ private final static String element1 = "/this/is/a/test";
+ private final static String element2 = "/another/test" ;
+ private final static String[] expectedElements = { element1, element2 };
private final static String expectedPath = String.join(PATH_SEP, expectedElements);
@BeforeEach
@@ -101,6 +105,7 @@ public class RelativePathResolver_implTest {
@SuppressWarnings("deprecation")
private void assertThatGettersReturnTheRightValues(RelativePathResolver_impl aResolver) {
+
assertThat(aResolver.getDataPathElements()) //
.containsExactly(expectedElements);