This is an automated email from the ASF dual-hosted git repository. rec pushed a commit to branch feature/UIMA-6480-Add-tests-with-empty-arrays-to-CAS-de-ser-suite in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
commit a155fe81718bc8687284be643a51aaf070a9c366 Author: Richard Eckart de Castilho <[email protected]> AuthorDate: Mon Jul 11 16:32:37 2022 +0200 [UIMA-6480] Add tests with empty arrays to CAS de/ser-suite - Add the ability to generate random tests with empty array (although we do not activate them for all tests because the old CasCompare cannot handle them) - Add tests with empty arrays to the programmatically generated CAS suite - Switch more tests from binary file compare to content compare because the binary file compare is defied by the empty arrays - Rename test folder --- ...rializationDeserialization_BINARY_TSI_Test.java | 2 +- ...asSerializationDeserialization_BINARY_Test.java | 2 +- ...izationDeserialization_SERIALIZED_TSI_Test.java | 2 +- ...izationDeserialization_XMI_1_0_PRETTY_Test.java | 28 +--- ...izationDeserialization_XMI_1_1_PRETTY_Test.java | 1 + .../datasuites/MultiFeatureRandomCasDataSuite.java | 12 +- .../ProgrammaticallyCreatedCasDataSuite.java | 160 ++++++++++++++++++++- .../generators/MultiFeatureRandomCasGenerator.java | 69 ++++++++- .../{casWithFsList => casWithArrays}/cas.bin | Bin 3204 -> 3092 bytes .../debug-typesystem.xml | 48 +++---- .../ser-ref/casWithArrays/debug.xmi | 29 ++++ .../{casWithFsList => casWithLists}/cas.bin | Bin .../debug-typesystem.xml | 0 .../{casWithFsList => casWithLists}/debug.xmi | 0 .../ser-ref/casWithArrays/cas.bin | Bin 0 -> 584 bytes .../ser-ref/casWithArrays}/debug-typesystem.xml | 48 +++---- .../ser-ref/casWithArrays/debug.xmi | 29 ++++ .../ser-ref/casWithArrays}/typesystem.xml | 48 +++---- .../{casWithFsList => casWithLists}/cas.bin | Bin .../debug-typesystem.xml | 0 .../{casWithFsList => casWithLists}/debug.xmi | 0 .../{casWithFsList => casWithLists}/typesystem.xml | 0 .../{casWithFsList => casWithArrays}/cas.bin | Bin 2868 -> 2856 bytes .../ser-ref/casWithArrays}/debug-typesystem.xml | 48 +++---- .../ser-ref/casWithArrays/debug.xmi | 29 ++++ .../typesystem.xml | 48 +++---- .../{casWithFsList => casWithLists}/cas.bin | Bin .../debug-typesystem.xml | 0 .../{casWithFsList => casWithLists}/debug.xmi | 0 .../{casWithFsList => casWithLists}/typesystem.xml | 0 .../{casWithFsList => casWithArrays}/cas.bin | Bin 3603 -> 3491 bytes .../ser-ref/casWithArrays}/debug-typesystem.xml | 48 +++---- .../ser-ref/casWithArrays/debug.xmi | 29 ++++ .../{casWithFsList => casWithLists}/cas.bin | Bin .../debug-typesystem.xml | 0 .../{casWithFsList => casWithLists}/debug.xmi | 0 .../ser-ref/casWithArrays/cas.xcas | 67 +++++++++ .../ser-ref/casWithArrays}/debug-typesystem.xml | 48 +++---- .../ser-ref/casWithArrays/debug.xmi | 29 ++++ .../ser-ref/casWithArrays}/typesystem.xml | 48 +++---- .../{casWithFsList => casWithLists}/cas.xcas | 0 .../debug-typesystem.xml | 0 .../{casWithFsList => casWithLists}/debug.xmi | 0 .../{casWithFsList => casWithLists}/typesystem.xml | 0 .../ser-ref/casWithArrays/data.xmi | 29 ++++ .../ser-ref/casWithArrays}/debug-typesystem.xml | 48 +++---- .../ser-ref/casWithArrays/debug.xmi | 29 ++++ .../ser-ref/casWithArrays}/typesystem.xml | 48 +++---- .../{casWithFsList => casWithLists}/data.xmi | 0 .../debug-typesystem.xml | 0 .../{casWithFsList => casWithLists}/debug.xmi | 0 .../{casWithFsList => casWithLists}/typesystem.xml | 0 .../ser-ref/casWithArrays/data.xmi | 29 ++++ .../ser-ref/casWithArrays}/debug-typesystem.xml | 48 +++---- .../ser-ref/casWithArrays/debug.xmi | 29 ++++ .../ser-ref/casWithArrays}/typesystem.xml | 48 +++---- .../{casWithFsList => casWithLists}/data.xmi | 0 .../debug-typesystem.xml | 0 .../{casWithFsList => casWithLists}/debug.xmi | 0 .../{casWithFsList => casWithLists}/typesystem.xml | 0 60 files changed, 849 insertions(+), 331 deletions(-) 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 ecd7e4124..4cbe8f0de 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 @@ -66,7 +66,7 @@ public class CasSerializationDeserialization_BINARY_TSI_Test { } private static List<DesSerTestScenario> roundTripDesSerScenarios() throws Exception { - return SerDesCasIOTestUtils.roundTripDesSerScenariosComparingFileContents(desSerCycles, + return SerDesCasIOTestUtils.roundTripDesSerScenariosComparingCasContents(desSerCycles, CAS_FILE_NAME); } 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 6c259c2f3..94ab5955d 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 @@ -62,7 +62,7 @@ public class CasSerializationDeserialization_BINARY_Test { } private static List<DesSerTestScenario> roundTripDesSerScenarios() throws Exception { - return SerDesCasIOTestUtils.roundTripDesSerScenariosComparingFileContents(desSerCycles, + return SerDesCasIOTestUtils.roundTripDesSerScenariosComparingCasContents(desSerCycles, CAS_FILE_NAME); } 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 6e2171d04..677aa314f 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 @@ -65,7 +65,7 @@ public class CasSerializationDeserialization_SERIALIZED_TSI_Test { } private static List<DesSerTestScenario> roundTripDesSerScenarios() throws Exception { - return SerDesCasIOTestUtils.roundTripDesSerScenariosComparingFileContents(desSerCycles, + return SerDesCasIOTestUtils.roundTripDesSerScenariosComparingCasContents(desSerCycles, CAS_FILE_NAME); } 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 2200824c2..91be87f73 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 @@ -77,36 +77,10 @@ public class CasSerializationDeserialization_XMI_1_0_PRETTY_Test { return SerDesCasIOTestUtils.programmaticSerDesScenarios(serDesCycles); } - // private static List<DesSerTestScenario> desSerScenarios() { - // TestType type; - // - // Class<?> testClass = CasSerializationDeserialization_XMI_1_0_PRETTY_Test.class; - // - // List<DesSerTestScenario> scenarios = new ArrayList<>(); - // DesSerTestScenario.builder() // - // .withTitle("multipleEmptyFSArrays") // - // .withSourceCasFile(Paths.get( - // "src/test/resources/XmiFileDataSuite/tsv3-testStackedComplexSlotFeatureWithoutSlotFillers/data.xmi")) - // // - // .withReferenceCasFile(DES_REF.getReferenceFolder(testClass) - // .resolve("tsv3-testStackedComplexSlotFeatureWithoutSlotFillers") - // .resolve("data.xmi")) // - // .withTargetBasePath(DES_REF.getTargetFolder(testClass) - // .resolve("tsv3-testStackedComplexSlotFeatureWithoutSlotFillers")) // - // .withCycle((a, b) -> { - // CAS buffer = createCasMaybeWithTypesystem(a); - // des(buffer, a, DEFAULT); - // Type linkHostType = buffer.getTypeSystem().getType("webanno.custom.ComplexLinkHost"); - // List<Annotation> linkHosts = buffer.<Annotation> select(linkHostType).asList(); - // FSArray array1 = (FSArray) linkHosts.get(0) - // .getFeatureValue(linkHostType.getFeatureByBaseName("links")); - // }); // - // return scenarios; - // } - private static List<SerDesTestScenario> randomSerDesScenarios() { return SerDesCasIOTestUtils.serDesScenarios(serDesCycles, MultiFeatureRandomCasDataSuite.builder() // + .withEmptyArrays(false) // .withIterations(RANDOM_CAS_ITERATIONS) // .withStringArrayMode(NULL_STRINGS_AS_EMPTY) // .build(), 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 c4e009b9b..b9b5078de 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 @@ -80,6 +80,7 @@ public class CasSerializationDeserialization_XMI_1_1_PRETTY_Test { private static List<SerDesTestScenario> randomSerDesScenarios() { return SerDesCasIOTestUtils.serDesScenarios(serDesCycles, MultiFeatureRandomCasDataSuite.builder() // + .withEmptyArrays(false) // .withIterations(RANDOM_CAS_ITERATIONS) // .withStringArrayMode(NULL_STRINGS_AS_EMPTY) // .build(), diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/serdes/datasuites/MultiFeatureRandomCasDataSuite.java b/uimaj-core/src/test/java/org/apache/uima/cas/serdes/datasuites/MultiFeatureRandomCasDataSuite.java index e2dccb41a..1598dbaae 100644 --- a/uimaj-core/src/test/java/org/apache/uima/cas/serdes/datasuites/MultiFeatureRandomCasDataSuite.java +++ b/uimaj-core/src/test/java/org/apache/uima/cas/serdes/datasuites/MultiFeatureRandomCasDataSuite.java @@ -34,12 +34,14 @@ public class MultiFeatureRandomCasDataSuite extends AbstractCollection<CasSource implements CasDataSuite { private final int sizeFactor; private final StringArrayMode stringArrayMode; + private final boolean emptyArrays; private final int iterations; private MultiFeatureRandomCasDataSuite(Builder builder) { sizeFactor = builder.sizeFactor; stringArrayMode = builder.stringArrayMode; iterations = builder.iterations; + emptyArrays = builder.emtpyArrays; } @Override @@ -48,7 +50,9 @@ public class MultiFeatureRandomCasDataSuite extends AbstractCollection<CasSource for (int n = 0; n < iterations; n++) { MultiFeatureRandomCasGenerator randomizer = MultiFeatureRandomCasGenerator.builder() // - .withStringArrayMode(stringArrayMode).withSize((n + 1) * sizeFactor) // + .withStringArrayMode(stringArrayMode) // + .withSize((n + 1) * sizeFactor) // + .withEmptyArrays(emptyArrays) // .build(); CasConfiguration cfg = new CasConfiguration(randomizer); @@ -84,6 +88,7 @@ public class MultiFeatureRandomCasDataSuite extends AbstractCollection<CasSource private int iterations = 10; private int sizeFactor = 10; private StringArrayMode stringArrayMode = ALLOW_NULL_AND_EMPTY_STRINGS; + private boolean emtpyArrays = true; private Builder() { } @@ -103,6 +108,11 @@ public class MultiFeatureRandomCasDataSuite extends AbstractCollection<CasSource return this; } + public Builder withEmptyArrays(boolean aFlag) { + emtpyArrays = aFlag; + return this; + } + public MultiFeatureRandomCasDataSuite build() { return new MultiFeatureRandomCasDataSuite(this); } diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/serdes/datasuites/ProgrammaticallyCreatedCasDataSuite.java b/uimaj-core/src/test/java/org/apache/uima/cas/serdes/datasuites/ProgrammaticallyCreatedCasDataSuite.java index 62ef2b755..ed237ebc5 100644 --- a/uimaj-core/src/test/java/org/apache/uima/cas/serdes/datasuites/ProgrammaticallyCreatedCasDataSuite.java +++ b/uimaj-core/src/test/java/org/apache/uima/cas/serdes/datasuites/ProgrammaticallyCreatedCasDataSuite.java @@ -26,11 +26,15 @@ import static java.lang.Float.POSITIVE_INFINITY; import static java.util.Arrays.asList; import static org.apache.uima.cas.CAS.TYPE_NAME_DOUBLE; import static org.apache.uima.cas.CAS.TYPE_NAME_FLOAT; +import static org.apache.uima.cas.CAS.TYPE_NAME_FLOAT_ARRAY; import static org.apache.uima.cas.CAS.TYPE_NAME_FLOAT_LIST; +import static org.apache.uima.cas.CAS.TYPE_NAME_FS_ARRAY; import static org.apache.uima.cas.CAS.TYPE_NAME_FS_LIST; import static org.apache.uima.cas.CAS.TYPE_NAME_INTEGER; +import static org.apache.uima.cas.CAS.TYPE_NAME_INTEGER_ARRAY; import static org.apache.uima.cas.CAS.TYPE_NAME_INTEGER_LIST; import static org.apache.uima.cas.CAS.TYPE_NAME_STRING; +import static org.apache.uima.cas.CAS.TYPE_NAME_STRING_ARRAY; import static org.apache.uima.cas.CAS.TYPE_NAME_STRING_LIST; import static org.apache.uima.cas.CAS.TYPE_NAME_TOP; import static org.apache.uima.util.CasCreationUtils.createCas; @@ -41,11 +45,14 @@ import java.util.Iterator; import java.util.List; import org.apache.uima.UIMAFramework; +import org.apache.uima.cas.ArrayFS; import org.apache.uima.cas.ByteArrayFS; import org.apache.uima.cas.CAS; import org.apache.uima.cas.DoubleArrayFS; import org.apache.uima.cas.FeatureStructure; import org.apache.uima.cas.FloatArrayFS; +import org.apache.uima.cas.IntArrayFS; +import org.apache.uima.cas.StringArrayFS; import org.apache.uima.cas.Type; import org.apache.uima.cas.serdes.transitions.CasSourceTargetConfiguration; import org.apache.uima.cas.text.AnnotationFS; @@ -120,8 +127,14 @@ public class ProgrammaticallyCreatedCasDataSuite typeSystemWithFloatingPointSpecialValues(), null, null, null)) // .build(), CasSourceTargetConfiguration.builder() // - .withTitle("casWithFsList") // - .withSourceCasSupplier(ProgrammaticallyCreatedCasDataSuite::casWithFsList) + .withTitle("casWithLists") // + .withSourceCasSupplier(ProgrammaticallyCreatedCasDataSuite::casWithListFeatures) + .withTargetCasSupplier(CasCreationUtils::createCas) // + .build(), + CasSourceTargetConfiguration.builder() // + .withTitle("casWithArrays") // + .withSourceCasSupplier( + ProgrammaticallyCreatedCasDataSuite::casWithArrayFeatures) .withTargetCasSupplier(CasCreationUtils::createCas) // .build()); } @@ -247,7 +260,7 @@ public class ProgrammaticallyCreatedCasDataSuite return tsd; } - public static TypeSystemDescription typeSystemWithFsListFeature() throws Exception { + public static TypeSystemDescription typeSystemWithListFeatures() throws Exception { TypeSystemDescription tsd = UIMAFramework.getResourceSpecifierFactory() .createTypeSystemDescription(); @@ -279,6 +292,39 @@ public class ProgrammaticallyCreatedCasDataSuite return tsd; } + public static TypeSystemDescription typeSystemWithArrayFeatures() throws Exception { + TypeSystemDescription tsd = UIMAFramework.getResourceSpecifierFactory() + .createTypeSystemDescription(); + + TypeDescription fsArrayHolder = tsd.addType("FsArrayHolder", null, TYPE_NAME_TOP); + fsArrayHolder.addFeature("fsArray", null, TYPE_NAME_FS_ARRAY, TYPE_NAME_TOP, false); + + TypeDescription fsArrayHolderMr = tsd.addType("FsArrayHolderMR", null, TYPE_NAME_TOP); + fsArrayHolderMr.addFeature("fsArray", null, TYPE_NAME_FS_ARRAY, TYPE_NAME_TOP, true); + + TypeDescription intArrayHolder = tsd.addType("IntArrayHolder", null, TYPE_NAME_TOP); + intArrayHolder.addFeature("intArray", null, TYPE_NAME_INTEGER_ARRAY, TYPE_NAME_INTEGER, false); + + TypeDescription intArrayHolderMr = tsd.addType("IntArrayHolderMR", null, TYPE_NAME_TOP); + intArrayHolderMr.addFeature("intArray", null, TYPE_NAME_INTEGER_ARRAY, TYPE_NAME_INTEGER, true); + + TypeDescription floatArrayHolder = tsd.addType("FloatArrayHolder", null, TYPE_NAME_TOP); + floatArrayHolder.addFeature("floatArray", null, TYPE_NAME_FLOAT_ARRAY, TYPE_NAME_FLOAT, false); + + TypeDescription floatArrayHolderMr = tsd.addType("FloatArrayHolderMR", null, TYPE_NAME_TOP); + floatArrayHolderMr.addFeature("floatArray", null, TYPE_NAME_FLOAT_ARRAY, TYPE_NAME_FLOAT, true); + + TypeDescription stringArrayHolder = tsd.addType("StringArrayHolder", null, TYPE_NAME_TOP); + stringArrayHolder.addFeature("stringArray", null, TYPE_NAME_STRING_ARRAY, TYPE_NAME_STRING, + false); + + TypeDescription stringArrayHolderMr = tsd.addType("StringArrayHolderMR", null, TYPE_NAME_TOP); + stringArrayHolderMr.addFeature("stringArray", null, TYPE_NAME_STRING_ARRAY, TYPE_NAME_STRING, + true); + + return tsd; + } + public static CAS casWithFloatingPointSpecialValues() throws Exception { CAS cas = createCas(typeSystemWithFloatingPointSpecialValues(), null, null, null); @@ -315,8 +361,8 @@ public class ProgrammaticallyCreatedCasDataSuite return cas; } - public static CAS casWithFsList() throws Exception { - CAS cas = createCas(typeSystemWithFsListFeature(), null, null, null); + public static CAS casWithListFeatures() throws Exception { + CAS cas = createCas(typeSystemWithListFeatures(), null, null, null); AnnotationFS a1 = cas.createAnnotation(cas.getAnnotationType(), 0, 1); AnnotationFS a2 = cas.createAnnotation(cas.getAnnotationType(), 1, 2); @@ -377,6 +423,110 @@ public class ProgrammaticallyCreatedCasDataSuite return cas; } + public static CAS casWithArrayFeatures() throws Exception { + CAS cas = createCas(typeSystemWithArrayFeatures(), null, null, null); + + AnnotationFS a1 = cas.createAnnotation(cas.getAnnotationType(), 0, 1); + AnnotationFS a2 = cas.createAnnotation(cas.getAnnotationType(), 1, 2); + FeatureStructure[] fsArrayValue = { a1, a2 }; + + ArrayFS<FeatureStructure> arrayFs = cas.createArrayFS(fsArrayValue.length); + arrayFs.copyFromArray(fsArrayValue, 0, 0, fsArrayValue.length); + cas.addFsToIndexes(arrayFs); + + Type fsArrayHolderType = cas.getTypeSystem().getType("FsArrayHolder"); + FeatureStructure fsArrayHolder = cas.createFS(fsArrayHolderType); + ArrayFS<FeatureStructure> arrayFs1 = cas.createArrayFS(fsArrayValue.length); + arrayFs1.copyFromArray(fsArrayValue, 0, 0, fsArrayValue.length); + fsArrayHolder.setFeatureValue(fsArrayHolderType.getFeatureByBaseName("fsArray"), arrayFs1); + cas.addFsToIndexes(fsArrayHolder); + + FeatureStructure fsArrayHolderEmpty = cas.createFS(fsArrayHolderType); + fsArrayHolderEmpty.setFeatureValue(fsArrayHolderType.getFeatureByBaseName("fsArray"), + cas.emptyFSArray()); + cas.addFsToIndexes(fsArrayHolder); + + Type fsArrayHolderMrType = cas.getTypeSystem().getType("FsArrayHolderMR"); + FeatureStructure fsArrayHolderMr = cas.createFS(fsArrayHolderMrType); + ArrayFS<FeatureStructure> arrayFsMr = cas.createArrayFS(fsArrayValue.length); + arrayFsMr.copyFromArray(fsArrayValue, 0, 0, fsArrayValue.length); + fsArrayHolderMr.setFeatureValue(fsArrayHolderMrType.getFeatureByBaseName("fsArray"), arrayFsMr); + cas.addFsToIndexes(fsArrayHolderMr); + + int[] intArrayValue = { 1, 2 }; + + Type intArrayHolderType = cas.getTypeSystem().getType("IntArrayHolder"); + FeatureStructure intArrayHolder = cas.createFS(intArrayHolderType); + IntArrayFS intArray = cas.createIntArrayFS(intArrayValue.length); + intArray.copyFromArray(intArrayValue, 0, 0, intArrayValue.length); + intArrayHolder.setFeatureValue(intArrayHolderType.getFeatureByBaseName("intArray"), intArray); + cas.addFsToIndexes(intArrayHolder); + + FeatureStructure intArrayHolderEmpty = cas.createFS(intArrayHolderType); + intArrayHolderEmpty.setFeatureValue(intArrayHolderType.getFeatureByBaseName("intArray"), + cas.emptyIntegerArray()); + cas.addFsToIndexes(intArrayHolderEmpty); + + Type intArrayHolderMrType = cas.getTypeSystem().getType("IntArrayHolderMR"); + FeatureStructure intArrayHolderMr = cas.createFS(intArrayHolderMrType); + IntArrayFS intArrayMr = cas.createIntArrayFS(intArrayValue.length); + intArrayMr.copyFromArray(intArrayValue, 0, 0, intArrayValue.length); + intArrayHolderMr.setFeatureValue(intArrayHolderMrType.getFeatureByBaseName("intArray"), + intArrayMr); + cas.addFsToIndexes(intArrayHolderMr); + + float[] floatArrayValue = { -1.0f, 0.0f, 1.0f, NaN, NEGATIVE_INFINITY, POSITIVE_INFINITY, + MIN_VALUE, MAX_VALUE }; + + Type floatArrayHolderType = cas.getTypeSystem().getType("FloatArrayHolder"); + FeatureStructure floatArrayHolder = cas.createFS(floatArrayHolderType); + FloatArrayFS floatArray = cas.createFloatArrayFS(floatArrayValue.length); + floatArray.copyFromArray(floatArrayValue, 0, 0, floatArrayValue.length); + floatArrayHolder.setFeatureValue(floatArrayHolderType.getFeatureByBaseName("floatArray"), + floatArray); + cas.addFsToIndexes(floatArrayHolder); + + FeatureStructure floatArrayHolderEmpty = cas.createFS(floatArrayHolderType); + floatArrayHolderEmpty.setFeatureValue(floatArrayHolderType.getFeatureByBaseName("floatArray"), + cas.emptyFloatArray()); + cas.addFsToIndexes(floatArrayHolderEmpty); + + Type floatArrayHolderMrType = cas.getTypeSystem().getType("FloatArrayHolderMR"); + FeatureStructure floatArrayHolderMr = cas.createFS(floatArrayHolderMrType); + FloatArrayFS floatArrayMr = cas.createFloatArrayFS(floatArrayValue.length); + floatArrayMr.copyFromArray(floatArrayValue, 0, 0, floatArrayValue.length); + floatArrayHolderMr.setFeatureValue(floatArrayHolderMrType.getFeatureByBaseName("floatArray"), + floatArrayMr); + cas.addFsToIndexes(floatArrayHolderMr); + + String[] stringArrayValue = { "blah", "blub" }; + + // We do not push null or the empty string here because different formats handle it differently + // and we have tests for that in other places + Type stringArrayHolderType = cas.getTypeSystem().getType("StringArrayHolder"); + FeatureStructure stringArrayHolder = cas.createFS(stringArrayHolderType); + StringArrayFS stringArray = cas.createStringArrayFS(stringArrayValue.length); + stringArray.copyFromArray(stringArrayValue, 0, 0, stringArrayValue.length); + stringArrayHolder.setFeatureValue(stringArrayHolderType.getFeatureByBaseName("stringArray"), + stringArray); + cas.addFsToIndexes(stringArrayHolder); + + FeatureStructure stringArrayHolderEmpty = cas.createFS(stringArrayHolderType); + stringArrayHolderEmpty.setFeatureValue( + stringArrayHolderType.getFeatureByBaseName("stringArray"), cas.emptyStringArray()); + cas.addFsToIndexes(stringArrayHolderEmpty); + + Type stringArrayHolderMrType = cas.getTypeSystem().getType("StringArrayHolderMR"); + FeatureStructure stringArrayHolderMr = cas.createFS(stringArrayHolderMrType); + StringArrayFS stringArrayMr = cas.createStringArrayFS(stringArrayValue.length); + stringArrayMr.copyFromArray(stringArrayValue, 0, 0, stringArrayValue.length); + stringArrayHolderMr.setFeatureValue(stringArrayHolderMrType.getFeatureByBaseName("stringArray"), + stringArrayMr); + cas.addFsToIndexes(stringArrayHolderMr); + + return cas; + } + private static void createAnnotatedText(CAS aCas, StringBuilder aBuffer, String aText, String... aSuffix) { int begin = aBuffer.length(); diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/serdes/generators/MultiFeatureRandomCasGenerator.java b/uimaj-core/src/test/java/org/apache/uima/cas/serdes/generators/MultiFeatureRandomCasGenerator.java index 5e4709544..7bff362ba 100644 --- a/uimaj-core/src/test/java/org/apache/uima/cas/serdes/generators/MultiFeatureRandomCasGenerator.java +++ b/uimaj-core/src/test/java/org/apache/uima/cas/serdes/generators/MultiFeatureRandomCasGenerator.java @@ -104,6 +104,7 @@ public class MultiFeatureRandomCasGenerator implements CasGenerator { private final Random rnd; private final int size; private final StringArrayMode stringArrayMode; + private final boolean emptyArrays; // akof = all kinds of features private Type akof; @@ -145,6 +146,7 @@ public class MultiFeatureRandomCasGenerator implements CasGenerator { rnd = builder.randomGenerator; size = builder.size; stringArrayMode = builder.stringArrayMode; + emptyArrays = builder.emptyArrays; aint = includeUid ? new AtomicInteger(0) : null; } @@ -310,66 +312,113 @@ public class MultiFeatureRandomCasGenerator implements CasGenerator { } private StringArrayFS randomStringA(Random r) { - int length = r.nextInt(2) + 1; + int length = r.nextInt(3) + (emptyArrays ? 0 : 1); + + if (length == 0) { + return maybeKeep(cas.emptyStringArray()); + } + StringArrayFS fs = maybeKeep(cas.createStringArrayFS(length)); for (int i = 0; i < length; i++) { fs.set(i, randomString(r)); } + return fs; } private IntArrayFS randomIntA(Random r) { - int length = r.nextInt(2) + 1; + int length = r.nextInt(3) + (emptyArrays ? 0 : 1); + + if (length == 0) { + return maybeKeep(cas.emptyIntegerArray()); + } + IntArrayFS fs = maybeKeep(cas.createIntArrayFS(length)); for (int i = 0; i < length; i++) { fs.set(i, r.nextInt(101) - 50); } + return fs; } private ByteArrayFS randomByteA(Random r) { - int length = r.nextInt(2) + 1; + int length = r.nextInt(3) + (emptyArrays ? 0 : 1); + ; + + if (length == 0) { + return maybeKeep(cas.emptyByteArray()); + } + ByteArrayFS fs = maybeKeep(cas.createByteArrayFS(length)); for (int i = 0; i < length; i++) { int bvidx = r.nextInt(BYTE_VALUES.length); fs.set(i, BYTE_VALUES[bvidx]); } + return fs; } private LongArrayFS randomLongA(Random r) { - int length = r.nextInt(2) + 1; + int length = r.nextInt(3) + (emptyArrays ? 0 : 1); + ; + + if (length == 0) { + return maybeKeep(cas.emptyLongArray()); + } + LongArrayFS fs = maybeKeep(cas.createLongArrayFS(length)); for (int i = 0; i < length; i++) { fs.set(i, LONG_VALUES[r.nextInt(LONG_VALUES.length)]); } + return fs; } private ShortArrayFS randomShortA(Random r) { - int length = r.nextInt(2) + 1; + int length = r.nextInt(3) + (emptyArrays ? 0 : 1); + ; + + if (length == 0) { + return maybeKeep(cas.emptyShortArray()); + } + ShortArrayFS fs = maybeKeep(cas.createShortArrayFS(length)); for (int i = 0; i < length; i++) { fs.set(i, SHORT_VALUES[r.nextInt(SHORT_VALUES.length)]); } + return fs; } private DoubleArrayFS randomDoubleA(Random r) { - int length = r.nextInt(2) + 1; + int length = r.nextInt(3) + (emptyArrays ? 0 : 1); + ; + + if (length == 0) { + return maybeKeep(cas.emptyDoubleArray()); + } + DoubleArrayFS fs = maybeKeep(cas.createDoubleArrayFS(length)); for (int i = 0; i < length; i++) { fs.set(i, DOUBLE_VALUES[r.nextInt(DOUBLE_VALUES.length)]); } + return fs; } private FloatArrayFS randomFloatA(Random r) { - int length = r.nextInt(2) + 1; + int length = r.nextInt(3) + (emptyArrays ? 0 : 1); + ; + + if (length == 0) { + return maybeKeep(cas.emptyFloatArray()); + } + FloatArrayFS fs = maybeKeep(cas.createFloatArrayFS(length)); for (int i = 0; i < length; i++) { fs.set(i, FLOAT_VALUES[r.nextInt(FLOAT_VALUES.length)]); } + return fs; } @@ -401,6 +450,7 @@ public class MultiFeatureRandomCasGenerator implements CasGenerator { private Random randomGenerator; private int size; private StringArrayMode stringArrayMode = ALLOW_NULL_AND_EMPTY_STRINGS; + private boolean emptyArrays; private Builder() { } @@ -430,6 +480,11 @@ public class MultiFeatureRandomCasGenerator implements CasGenerator { return this; } + public Builder withEmptyArrays(boolean aFlag) { + emptyArrays = aFlag; + return this; + } + public MultiFeatureRandomCasGenerator build() { if (randomGenerator == null) { randomGenerator = new Random(); diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithFsList/cas.bin b/uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithArrays/cas.bin similarity index 54% copy from uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithFsList/cas.bin copy to uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithArrays/cas.bin index 533913580..c708cf9bc 100644 Binary files a/uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithFsList/cas.bin and b/uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithArrays/cas.bin differ diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithFsList/debug-typesystem.xml b/uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithArrays/debug-typesystem.xml similarity index 73% copy from uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithFsList/debug-typesystem.xml copy to uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithArrays/debug-typesystem.xml index 61b16972a..9b89fba96 100644 --- a/uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithFsList/debug-typesystem.xml +++ b/uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithArrays/debug-typesystem.xml @@ -14,101 +14,101 @@ </features> </typeDescription> <typeDescription> - <name>FloatListHolder</name> + <name>FloatArrayHolder</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>floatList</name> + <name>floatArray</name> <description/> - <rangeTypeName>uima.cas.FloatList</rangeTypeName> + <rangeTypeName>uima.cas.FloatArray</rangeTypeName> </featureDescription> </features> </typeDescription> <typeDescription> - <name>FloatListHolderMR</name> + <name>FloatArrayHolderMR</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>floatList</name> + <name>floatArray</name> <description/> - <rangeTypeName>uima.cas.FloatList</rangeTypeName> + <rangeTypeName>uima.cas.FloatArray</rangeTypeName> <multipleReferencesAllowed>true</multipleReferencesAllowed> </featureDescription> </features> </typeDescription> <typeDescription> - <name>FsListHolder</name> + <name>FsArrayHolder</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>fsList</name> + <name>fsArray</name> <description/> - <rangeTypeName>uima.cas.FSList</rangeTypeName> + <rangeTypeName>uima.cas.FSArray</rangeTypeName> </featureDescription> </features> </typeDescription> <typeDescription> - <name>FsListHolderMR</name> + <name>FsArrayHolderMR</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>fsList</name> + <name>fsArray</name> <description/> - <rangeTypeName>uima.cas.FSList</rangeTypeName> + <rangeTypeName>uima.cas.FSArray</rangeTypeName> <multipleReferencesAllowed>true</multipleReferencesAllowed> </featureDescription> </features> </typeDescription> <typeDescription> - <name>IntListHolder</name> + <name>IntArrayHolder</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>intList</name> + <name>intArray</name> <description/> - <rangeTypeName>uima.cas.IntegerList</rangeTypeName> + <rangeTypeName>uima.cas.IntegerArray</rangeTypeName> </featureDescription> </features> </typeDescription> <typeDescription> - <name>IntListHolderMR</name> + <name>IntArrayHolderMR</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>intList</name> + <name>intArray</name> <description/> - <rangeTypeName>uima.cas.IntegerList</rangeTypeName> + <rangeTypeName>uima.cas.IntegerArray</rangeTypeName> <multipleReferencesAllowed>true</multipleReferencesAllowed> </featureDescription> </features> </typeDescription> <typeDescription> - <name>StringListHolder</name> + <name>StringArrayHolder</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>stringList</name> + <name>stringArray</name> <description/> - <rangeTypeName>uima.cas.StringList</rangeTypeName> + <rangeTypeName>uima.cas.StringArray</rangeTypeName> </featureDescription> </features> </typeDescription> <typeDescription> - <name>StringListHolderMR</name> + <name>StringArrayHolderMR</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>stringList</name> + <name>stringArray</name> <description/> - <rangeTypeName>uima.cas.StringList</rangeTypeName> + <rangeTypeName>uima.cas.StringArray</rangeTypeName> <multipleReferencesAllowed>true</multipleReferencesAllowed> </featureDescription> </features> diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithArrays/debug.xmi b/uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithArrays/debug.xmi new file mode 100644 index 000000000..72ee1cd1c --- /dev/null +++ b/uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithArrays/debug.xmi @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:noNamespace="http:///uima/noNamespace.ecore"; xmlns:tcas="http:///uima/tcas.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmlns:cas="http:///uima/cas.ecore"; xmi:version="2.0"> + <cas:NULL xmi:id="0"/> + <cas:FSArray xmi:id="4" elements="2 3"/> + <noNamespace:FsArrayHolder xmi:id="5" fsArray="2 3"/> + <noNamespace:FsArrayHolderMR xmi:id="9" fsArray="10"/> + <noNamespace:IntArrayHolder xmi:id="13" intArray=""/> + <noNamespace:IntArrayHolder xmi:id="11" intArray="1 2"/> + <noNamespace:IntArrayHolderMR xmi:id="15" intArray="16"/> + <noNamespace:FloatArrayHolder xmi:id="17" floatArray="-1.0 0.0 1.0 NaN -Infinity Infinity 1.4E-45 3.4028235E38"/> + <noNamespace:FloatArrayHolder xmi:id="19" floatArray=""/> + <noNamespace:FloatArrayHolderMR xmi:id="21" floatArray="22"/> + <noNamespace:StringArrayHolder xmi:id="23"> + <stringArray>blah</stringArray> + <stringArray>blub</stringArray> + </noNamespace:StringArrayHolder> + <noNamespace:StringArrayHolder xmi:id="25" stringArray=""/> + <noNamespace:StringArrayHolderMR xmi:id="27" stringArray="28"/> + <cas:Sofa xmi:id="1" sofaNum="1" sofaID="_InitialView"/> + <tcas:Annotation xmi:id="2" sofa="1" begin="0" end="1"/> + <tcas:Annotation xmi:id="3" sofa="1" begin="1" end="2"/> + <cas:FSArray xmi:id="10" elements="2 3"/> + <cas:IntegerArray xmi:id="16" elements="1 2"/> + <cas:FloatArray xmi:id="22" elements="-1.0 0.0 1.0 NaN -Infinity Infinity 1.4E-45 3.4028235E38"/> + <cas:StringArray xmi:id="28"> + <elements>blah</elements> + <elements>blub</elements> + </cas:StringArray> + <cas:View sofa="1" members="4 5 9 13 11 15 17 19 21 23 25 27"/> +</xmi:XMI> diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithFsList/cas.bin b/uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithLists/cas.bin similarity index 100% rename from uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithFsList/cas.bin rename to uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithLists/cas.bin diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithFsList/debug-typesystem.xml b/uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithLists/debug-typesystem.xml similarity index 100% copy from uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithFsList/debug-typesystem.xml copy to uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithLists/debug-typesystem.xml diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithFsList/debug.xmi b/uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithLists/debug.xmi similarity index 100% rename from uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithFsList/debug.xmi rename to uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithLists/debug.xmi diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_Test/ser-ref/casWithArrays/cas.bin b/uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_Test/ser-ref/casWithArrays/cas.bin new file mode 100644 index 000000000..7494b7a90 Binary files /dev/null and b/uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_Test/ser-ref/casWithArrays/cas.bin differ diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithFsList/debug-typesystem.xml b/uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_Test/ser-ref/casWithArrays/debug-typesystem.xml similarity index 73% copy from uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithFsList/debug-typesystem.xml copy to uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_Test/ser-ref/casWithArrays/debug-typesystem.xml index 61b16972a..9b89fba96 100644 --- a/uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithFsList/debug-typesystem.xml +++ b/uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_Test/ser-ref/casWithArrays/debug-typesystem.xml @@ -14,101 +14,101 @@ </features> </typeDescription> <typeDescription> - <name>FloatListHolder</name> + <name>FloatArrayHolder</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>floatList</name> + <name>floatArray</name> <description/> - <rangeTypeName>uima.cas.FloatList</rangeTypeName> + <rangeTypeName>uima.cas.FloatArray</rangeTypeName> </featureDescription> </features> </typeDescription> <typeDescription> - <name>FloatListHolderMR</name> + <name>FloatArrayHolderMR</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>floatList</name> + <name>floatArray</name> <description/> - <rangeTypeName>uima.cas.FloatList</rangeTypeName> + <rangeTypeName>uima.cas.FloatArray</rangeTypeName> <multipleReferencesAllowed>true</multipleReferencesAllowed> </featureDescription> </features> </typeDescription> <typeDescription> - <name>FsListHolder</name> + <name>FsArrayHolder</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>fsList</name> + <name>fsArray</name> <description/> - <rangeTypeName>uima.cas.FSList</rangeTypeName> + <rangeTypeName>uima.cas.FSArray</rangeTypeName> </featureDescription> </features> </typeDescription> <typeDescription> - <name>FsListHolderMR</name> + <name>FsArrayHolderMR</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>fsList</name> + <name>fsArray</name> <description/> - <rangeTypeName>uima.cas.FSList</rangeTypeName> + <rangeTypeName>uima.cas.FSArray</rangeTypeName> <multipleReferencesAllowed>true</multipleReferencesAllowed> </featureDescription> </features> </typeDescription> <typeDescription> - <name>IntListHolder</name> + <name>IntArrayHolder</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>intList</name> + <name>intArray</name> <description/> - <rangeTypeName>uima.cas.IntegerList</rangeTypeName> + <rangeTypeName>uima.cas.IntegerArray</rangeTypeName> </featureDescription> </features> </typeDescription> <typeDescription> - <name>IntListHolderMR</name> + <name>IntArrayHolderMR</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>intList</name> + <name>intArray</name> <description/> - <rangeTypeName>uima.cas.IntegerList</rangeTypeName> + <rangeTypeName>uima.cas.IntegerArray</rangeTypeName> <multipleReferencesAllowed>true</multipleReferencesAllowed> </featureDescription> </features> </typeDescription> <typeDescription> - <name>StringListHolder</name> + <name>StringArrayHolder</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>stringList</name> + <name>stringArray</name> <description/> - <rangeTypeName>uima.cas.StringList</rangeTypeName> + <rangeTypeName>uima.cas.StringArray</rangeTypeName> </featureDescription> </features> </typeDescription> <typeDescription> - <name>StringListHolderMR</name> + <name>StringArrayHolderMR</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>stringList</name> + <name>stringArray</name> <description/> - <rangeTypeName>uima.cas.StringList</rangeTypeName> + <rangeTypeName>uima.cas.StringArray</rangeTypeName> <multipleReferencesAllowed>true</multipleReferencesAllowed> </featureDescription> </features> diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_Test/ser-ref/casWithArrays/debug.xmi b/uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_Test/ser-ref/casWithArrays/debug.xmi new file mode 100644 index 000000000..72ee1cd1c --- /dev/null +++ b/uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_Test/ser-ref/casWithArrays/debug.xmi @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:noNamespace="http:///uima/noNamespace.ecore"; xmlns:tcas="http:///uima/tcas.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmlns:cas="http:///uima/cas.ecore"; xmi:version="2.0"> + <cas:NULL xmi:id="0"/> + <cas:FSArray xmi:id="4" elements="2 3"/> + <noNamespace:FsArrayHolder xmi:id="5" fsArray="2 3"/> + <noNamespace:FsArrayHolderMR xmi:id="9" fsArray="10"/> + <noNamespace:IntArrayHolder xmi:id="13" intArray=""/> + <noNamespace:IntArrayHolder xmi:id="11" intArray="1 2"/> + <noNamespace:IntArrayHolderMR xmi:id="15" intArray="16"/> + <noNamespace:FloatArrayHolder xmi:id="17" floatArray="-1.0 0.0 1.0 NaN -Infinity Infinity 1.4E-45 3.4028235E38"/> + <noNamespace:FloatArrayHolder xmi:id="19" floatArray=""/> + <noNamespace:FloatArrayHolderMR xmi:id="21" floatArray="22"/> + <noNamespace:StringArrayHolder xmi:id="23"> + <stringArray>blah</stringArray> + <stringArray>blub</stringArray> + </noNamespace:StringArrayHolder> + <noNamespace:StringArrayHolder xmi:id="25" stringArray=""/> + <noNamespace:StringArrayHolderMR xmi:id="27" stringArray="28"/> + <cas:Sofa xmi:id="1" sofaNum="1" sofaID="_InitialView"/> + <tcas:Annotation xmi:id="2" sofa="1" begin="0" end="1"/> + <tcas:Annotation xmi:id="3" sofa="1" begin="1" end="2"/> + <cas:FSArray xmi:id="10" elements="2 3"/> + <cas:IntegerArray xmi:id="16" elements="1 2"/> + <cas:FloatArray xmi:id="22" elements="-1.0 0.0 1.0 NaN -Infinity Infinity 1.4E-45 3.4028235E38"/> + <cas:StringArray xmi:id="28"> + <elements>blah</elements> + <elements>blub</elements> + </cas:StringArray> + <cas:View sofa="1" members="4 5 9 13 11 15 17 19 21 23 25 27"/> +</xmi:XMI> diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithFsList/typesystem.xml b/uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_Test/ser-ref/casWithArrays/typesystem.xml similarity index 73% copy from uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithFsList/typesystem.xml copy to uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_Test/ser-ref/casWithArrays/typesystem.xml index 61b16972a..9b89fba96 100644 --- a/uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithFsList/typesystem.xml +++ b/uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_Test/ser-ref/casWithArrays/typesystem.xml @@ -14,101 +14,101 @@ </features> </typeDescription> <typeDescription> - <name>FloatListHolder</name> + <name>FloatArrayHolder</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>floatList</name> + <name>floatArray</name> <description/> - <rangeTypeName>uima.cas.FloatList</rangeTypeName> + <rangeTypeName>uima.cas.FloatArray</rangeTypeName> </featureDescription> </features> </typeDescription> <typeDescription> - <name>FloatListHolderMR</name> + <name>FloatArrayHolderMR</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>floatList</name> + <name>floatArray</name> <description/> - <rangeTypeName>uima.cas.FloatList</rangeTypeName> + <rangeTypeName>uima.cas.FloatArray</rangeTypeName> <multipleReferencesAllowed>true</multipleReferencesAllowed> </featureDescription> </features> </typeDescription> <typeDescription> - <name>FsListHolder</name> + <name>FsArrayHolder</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>fsList</name> + <name>fsArray</name> <description/> - <rangeTypeName>uima.cas.FSList</rangeTypeName> + <rangeTypeName>uima.cas.FSArray</rangeTypeName> </featureDescription> </features> </typeDescription> <typeDescription> - <name>FsListHolderMR</name> + <name>FsArrayHolderMR</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>fsList</name> + <name>fsArray</name> <description/> - <rangeTypeName>uima.cas.FSList</rangeTypeName> + <rangeTypeName>uima.cas.FSArray</rangeTypeName> <multipleReferencesAllowed>true</multipleReferencesAllowed> </featureDescription> </features> </typeDescription> <typeDescription> - <name>IntListHolder</name> + <name>IntArrayHolder</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>intList</name> + <name>intArray</name> <description/> - <rangeTypeName>uima.cas.IntegerList</rangeTypeName> + <rangeTypeName>uima.cas.IntegerArray</rangeTypeName> </featureDescription> </features> </typeDescription> <typeDescription> - <name>IntListHolderMR</name> + <name>IntArrayHolderMR</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>intList</name> + <name>intArray</name> <description/> - <rangeTypeName>uima.cas.IntegerList</rangeTypeName> + <rangeTypeName>uima.cas.IntegerArray</rangeTypeName> <multipleReferencesAllowed>true</multipleReferencesAllowed> </featureDescription> </features> </typeDescription> <typeDescription> - <name>StringListHolder</name> + <name>StringArrayHolder</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>stringList</name> + <name>stringArray</name> <description/> - <rangeTypeName>uima.cas.StringList</rangeTypeName> + <rangeTypeName>uima.cas.StringArray</rangeTypeName> </featureDescription> </features> </typeDescription> <typeDescription> - <name>StringListHolderMR</name> + <name>StringArrayHolderMR</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>stringList</name> + <name>stringArray</name> <description/> - <rangeTypeName>uima.cas.StringList</rangeTypeName> + <rangeTypeName>uima.cas.StringArray</rangeTypeName> <multipleReferencesAllowed>true</multipleReferencesAllowed> </featureDescription> </features> diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_Test/ser-ref/casWithFsList/cas.bin b/uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_Test/ser-ref/casWithLists/cas.bin similarity index 100% rename from uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_Test/ser-ref/casWithFsList/cas.bin rename to uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_Test/ser-ref/casWithLists/cas.bin diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_Test/ser-ref/casWithFsList/debug-typesystem.xml b/uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_Test/ser-ref/casWithLists/debug-typesystem.xml similarity index 100% rename from uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_Test/ser-ref/casWithFsList/debug-typesystem.xml rename to uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_Test/ser-ref/casWithLists/debug-typesystem.xml diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_Test/ser-ref/casWithFsList/debug.xmi b/uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_Test/ser-ref/casWithLists/debug.xmi similarity index 100% rename from uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_Test/ser-ref/casWithFsList/debug.xmi rename to uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_Test/ser-ref/casWithLists/debug.xmi diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_Test/ser-ref/casWithFsList/typesystem.xml b/uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_Test/ser-ref/casWithLists/typesystem.xml similarity index 100% rename from uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_Test/ser-ref/casWithFsList/typesystem.xml rename to uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_Test/ser-ref/casWithLists/typesystem.xml diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithFsList/cas.bin b/uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithArrays/cas.bin similarity index 62% copy from uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithFsList/cas.bin copy to uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithArrays/cas.bin index dfd8a68ed..e266d449a 100644 Binary files a/uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithFsList/cas.bin and b/uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithArrays/cas.bin differ diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithFsList/debug-typesystem.xml b/uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithArrays/debug-typesystem.xml similarity index 73% copy from uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithFsList/debug-typesystem.xml copy to uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithArrays/debug-typesystem.xml index 61b16972a..9b89fba96 100644 --- a/uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithFsList/debug-typesystem.xml +++ b/uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithArrays/debug-typesystem.xml @@ -14,101 +14,101 @@ </features> </typeDescription> <typeDescription> - <name>FloatListHolder</name> + <name>FloatArrayHolder</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>floatList</name> + <name>floatArray</name> <description/> - <rangeTypeName>uima.cas.FloatList</rangeTypeName> + <rangeTypeName>uima.cas.FloatArray</rangeTypeName> </featureDescription> </features> </typeDescription> <typeDescription> - <name>FloatListHolderMR</name> + <name>FloatArrayHolderMR</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>floatList</name> + <name>floatArray</name> <description/> - <rangeTypeName>uima.cas.FloatList</rangeTypeName> + <rangeTypeName>uima.cas.FloatArray</rangeTypeName> <multipleReferencesAllowed>true</multipleReferencesAllowed> </featureDescription> </features> </typeDescription> <typeDescription> - <name>FsListHolder</name> + <name>FsArrayHolder</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>fsList</name> + <name>fsArray</name> <description/> - <rangeTypeName>uima.cas.FSList</rangeTypeName> + <rangeTypeName>uima.cas.FSArray</rangeTypeName> </featureDescription> </features> </typeDescription> <typeDescription> - <name>FsListHolderMR</name> + <name>FsArrayHolderMR</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>fsList</name> + <name>fsArray</name> <description/> - <rangeTypeName>uima.cas.FSList</rangeTypeName> + <rangeTypeName>uima.cas.FSArray</rangeTypeName> <multipleReferencesAllowed>true</multipleReferencesAllowed> </featureDescription> </features> </typeDescription> <typeDescription> - <name>IntListHolder</name> + <name>IntArrayHolder</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>intList</name> + <name>intArray</name> <description/> - <rangeTypeName>uima.cas.IntegerList</rangeTypeName> + <rangeTypeName>uima.cas.IntegerArray</rangeTypeName> </featureDescription> </features> </typeDescription> <typeDescription> - <name>IntListHolderMR</name> + <name>IntArrayHolderMR</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>intList</name> + <name>intArray</name> <description/> - <rangeTypeName>uima.cas.IntegerList</rangeTypeName> + <rangeTypeName>uima.cas.IntegerArray</rangeTypeName> <multipleReferencesAllowed>true</multipleReferencesAllowed> </featureDescription> </features> </typeDescription> <typeDescription> - <name>StringListHolder</name> + <name>StringArrayHolder</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>stringList</name> + <name>stringArray</name> <description/> - <rangeTypeName>uima.cas.StringList</rangeTypeName> + <rangeTypeName>uima.cas.StringArray</rangeTypeName> </featureDescription> </features> </typeDescription> <typeDescription> - <name>StringListHolderMR</name> + <name>StringArrayHolderMR</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>stringList</name> + <name>stringArray</name> <description/> - <rangeTypeName>uima.cas.StringList</rangeTypeName> + <rangeTypeName>uima.cas.StringArray</rangeTypeName> <multipleReferencesAllowed>true</multipleReferencesAllowed> </featureDescription> </features> diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithArrays/debug.xmi b/uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithArrays/debug.xmi new file mode 100644 index 000000000..72ee1cd1c --- /dev/null +++ b/uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithArrays/debug.xmi @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:noNamespace="http:///uima/noNamespace.ecore"; xmlns:tcas="http:///uima/tcas.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmlns:cas="http:///uima/cas.ecore"; xmi:version="2.0"> + <cas:NULL xmi:id="0"/> + <cas:FSArray xmi:id="4" elements="2 3"/> + <noNamespace:FsArrayHolder xmi:id="5" fsArray="2 3"/> + <noNamespace:FsArrayHolderMR xmi:id="9" fsArray="10"/> + <noNamespace:IntArrayHolder xmi:id="13" intArray=""/> + <noNamespace:IntArrayHolder xmi:id="11" intArray="1 2"/> + <noNamespace:IntArrayHolderMR xmi:id="15" intArray="16"/> + <noNamespace:FloatArrayHolder xmi:id="17" floatArray="-1.0 0.0 1.0 NaN -Infinity Infinity 1.4E-45 3.4028235E38"/> + <noNamespace:FloatArrayHolder xmi:id="19" floatArray=""/> + <noNamespace:FloatArrayHolderMR xmi:id="21" floatArray="22"/> + <noNamespace:StringArrayHolder xmi:id="23"> + <stringArray>blah</stringArray> + <stringArray>blub</stringArray> + </noNamespace:StringArrayHolder> + <noNamespace:StringArrayHolder xmi:id="25" stringArray=""/> + <noNamespace:StringArrayHolderMR xmi:id="27" stringArray="28"/> + <cas:Sofa xmi:id="1" sofaNum="1" sofaID="_InitialView"/> + <tcas:Annotation xmi:id="2" sofa="1" begin="0" end="1"/> + <tcas:Annotation xmi:id="3" sofa="1" begin="1" end="2"/> + <cas:FSArray xmi:id="10" elements="2 3"/> + <cas:IntegerArray xmi:id="16" elements="1 2"/> + <cas:FloatArray xmi:id="22" elements="-1.0 0.0 1.0 NaN -Infinity Infinity 1.4E-45 3.4028235E38"/> + <cas:StringArray xmi:id="28"> + <elements>blah</elements> + <elements>blub</elements> + </cas:StringArray> + <cas:View sofa="1" members="4 5 9 13 11 15 17 19 21 23 25 27"/> +</xmi:XMI> diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithFsList/typesystem.xml b/uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithArrays/typesystem.xml similarity index 73% copy from uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithFsList/typesystem.xml copy to uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithArrays/typesystem.xml index 61b16972a..9b89fba96 100644 --- a/uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithFsList/typesystem.xml +++ b/uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithArrays/typesystem.xml @@ -14,101 +14,101 @@ </features> </typeDescription> <typeDescription> - <name>FloatListHolder</name> + <name>FloatArrayHolder</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>floatList</name> + <name>floatArray</name> <description/> - <rangeTypeName>uima.cas.FloatList</rangeTypeName> + <rangeTypeName>uima.cas.FloatArray</rangeTypeName> </featureDescription> </features> </typeDescription> <typeDescription> - <name>FloatListHolderMR</name> + <name>FloatArrayHolderMR</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>floatList</name> + <name>floatArray</name> <description/> - <rangeTypeName>uima.cas.FloatList</rangeTypeName> + <rangeTypeName>uima.cas.FloatArray</rangeTypeName> <multipleReferencesAllowed>true</multipleReferencesAllowed> </featureDescription> </features> </typeDescription> <typeDescription> - <name>FsListHolder</name> + <name>FsArrayHolder</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>fsList</name> + <name>fsArray</name> <description/> - <rangeTypeName>uima.cas.FSList</rangeTypeName> + <rangeTypeName>uima.cas.FSArray</rangeTypeName> </featureDescription> </features> </typeDescription> <typeDescription> - <name>FsListHolderMR</name> + <name>FsArrayHolderMR</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>fsList</name> + <name>fsArray</name> <description/> - <rangeTypeName>uima.cas.FSList</rangeTypeName> + <rangeTypeName>uima.cas.FSArray</rangeTypeName> <multipleReferencesAllowed>true</multipleReferencesAllowed> </featureDescription> </features> </typeDescription> <typeDescription> - <name>IntListHolder</name> + <name>IntArrayHolder</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>intList</name> + <name>intArray</name> <description/> - <rangeTypeName>uima.cas.IntegerList</rangeTypeName> + <rangeTypeName>uima.cas.IntegerArray</rangeTypeName> </featureDescription> </features> </typeDescription> <typeDescription> - <name>IntListHolderMR</name> + <name>IntArrayHolderMR</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>intList</name> + <name>intArray</name> <description/> - <rangeTypeName>uima.cas.IntegerList</rangeTypeName> + <rangeTypeName>uima.cas.IntegerArray</rangeTypeName> <multipleReferencesAllowed>true</multipleReferencesAllowed> </featureDescription> </features> </typeDescription> <typeDescription> - <name>StringListHolder</name> + <name>StringArrayHolder</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>stringList</name> + <name>stringArray</name> <description/> - <rangeTypeName>uima.cas.StringList</rangeTypeName> + <rangeTypeName>uima.cas.StringArray</rangeTypeName> </featureDescription> </features> </typeDescription> <typeDescription> - <name>StringListHolderMR</name> + <name>StringArrayHolderMR</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>stringList</name> + <name>stringArray</name> <description/> - <rangeTypeName>uima.cas.StringList</rangeTypeName> + <rangeTypeName>uima.cas.StringArray</rangeTypeName> <multipleReferencesAllowed>true</multipleReferencesAllowed> </featureDescription> </features> diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithFsList/cas.bin b/uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithLists/cas.bin similarity index 100% rename from uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithFsList/cas.bin rename to uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithLists/cas.bin diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithFsList/debug-typesystem.xml b/uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithLists/debug-typesystem.xml similarity index 100% rename from uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithFsList/debug-typesystem.xml rename to uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithLists/debug-typesystem.xml diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithFsList/debug.xmi b/uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithLists/debug.xmi similarity index 100% rename from uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithFsList/debug.xmi rename to uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithLists/debug.xmi diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithFsList/typesystem.xml b/uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithLists/typesystem.xml similarity index 100% copy from uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithFsList/typesystem.xml copy to uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithLists/typesystem.xml diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_SERIALIZED_TSI_Test/ser-ref/casWithFsList/cas.bin b/uimaj-core/src/test/resources/CasSerializationDeserialization_SERIALIZED_TSI_Test/ser-ref/casWithArrays/cas.bin similarity index 58% copy from uimaj-core/src/test/resources/CasSerializationDeserialization_SERIALIZED_TSI_Test/ser-ref/casWithFsList/cas.bin copy to uimaj-core/src/test/resources/CasSerializationDeserialization_SERIALIZED_TSI_Test/ser-ref/casWithArrays/cas.bin index c148956ab..4b2ceac5c 100644 Binary files a/uimaj-core/src/test/resources/CasSerializationDeserialization_SERIALIZED_TSI_Test/ser-ref/casWithFsList/cas.bin and b/uimaj-core/src/test/resources/CasSerializationDeserialization_SERIALIZED_TSI_Test/ser-ref/casWithArrays/cas.bin differ diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithFsList/debug-typesystem.xml b/uimaj-core/src/test/resources/CasSerializationDeserialization_SERIALIZED_TSI_Test/ser-ref/casWithArrays/debug-typesystem.xml similarity index 73% copy from uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithFsList/debug-typesystem.xml copy to uimaj-core/src/test/resources/CasSerializationDeserialization_SERIALIZED_TSI_Test/ser-ref/casWithArrays/debug-typesystem.xml index 61b16972a..9b89fba96 100644 --- a/uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithFsList/debug-typesystem.xml +++ b/uimaj-core/src/test/resources/CasSerializationDeserialization_SERIALIZED_TSI_Test/ser-ref/casWithArrays/debug-typesystem.xml @@ -14,101 +14,101 @@ </features> </typeDescription> <typeDescription> - <name>FloatListHolder</name> + <name>FloatArrayHolder</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>floatList</name> + <name>floatArray</name> <description/> - <rangeTypeName>uima.cas.FloatList</rangeTypeName> + <rangeTypeName>uima.cas.FloatArray</rangeTypeName> </featureDescription> </features> </typeDescription> <typeDescription> - <name>FloatListHolderMR</name> + <name>FloatArrayHolderMR</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>floatList</name> + <name>floatArray</name> <description/> - <rangeTypeName>uima.cas.FloatList</rangeTypeName> + <rangeTypeName>uima.cas.FloatArray</rangeTypeName> <multipleReferencesAllowed>true</multipleReferencesAllowed> </featureDescription> </features> </typeDescription> <typeDescription> - <name>FsListHolder</name> + <name>FsArrayHolder</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>fsList</name> + <name>fsArray</name> <description/> - <rangeTypeName>uima.cas.FSList</rangeTypeName> + <rangeTypeName>uima.cas.FSArray</rangeTypeName> </featureDescription> </features> </typeDescription> <typeDescription> - <name>FsListHolderMR</name> + <name>FsArrayHolderMR</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>fsList</name> + <name>fsArray</name> <description/> - <rangeTypeName>uima.cas.FSList</rangeTypeName> + <rangeTypeName>uima.cas.FSArray</rangeTypeName> <multipleReferencesAllowed>true</multipleReferencesAllowed> </featureDescription> </features> </typeDescription> <typeDescription> - <name>IntListHolder</name> + <name>IntArrayHolder</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>intList</name> + <name>intArray</name> <description/> - <rangeTypeName>uima.cas.IntegerList</rangeTypeName> + <rangeTypeName>uima.cas.IntegerArray</rangeTypeName> </featureDescription> </features> </typeDescription> <typeDescription> - <name>IntListHolderMR</name> + <name>IntArrayHolderMR</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>intList</name> + <name>intArray</name> <description/> - <rangeTypeName>uima.cas.IntegerList</rangeTypeName> + <rangeTypeName>uima.cas.IntegerArray</rangeTypeName> <multipleReferencesAllowed>true</multipleReferencesAllowed> </featureDescription> </features> </typeDescription> <typeDescription> - <name>StringListHolder</name> + <name>StringArrayHolder</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>stringList</name> + <name>stringArray</name> <description/> - <rangeTypeName>uima.cas.StringList</rangeTypeName> + <rangeTypeName>uima.cas.StringArray</rangeTypeName> </featureDescription> </features> </typeDescription> <typeDescription> - <name>StringListHolderMR</name> + <name>StringArrayHolderMR</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>stringList</name> + <name>stringArray</name> <description/> - <rangeTypeName>uima.cas.StringList</rangeTypeName> + <rangeTypeName>uima.cas.StringArray</rangeTypeName> <multipleReferencesAllowed>true</multipleReferencesAllowed> </featureDescription> </features> diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_SERIALIZED_TSI_Test/ser-ref/casWithArrays/debug.xmi b/uimaj-core/src/test/resources/CasSerializationDeserialization_SERIALIZED_TSI_Test/ser-ref/casWithArrays/debug.xmi new file mode 100644 index 000000000..72ee1cd1c --- /dev/null +++ b/uimaj-core/src/test/resources/CasSerializationDeserialization_SERIALIZED_TSI_Test/ser-ref/casWithArrays/debug.xmi @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:noNamespace="http:///uima/noNamespace.ecore"; xmlns:tcas="http:///uima/tcas.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmlns:cas="http:///uima/cas.ecore"; xmi:version="2.0"> + <cas:NULL xmi:id="0"/> + <cas:FSArray xmi:id="4" elements="2 3"/> + <noNamespace:FsArrayHolder xmi:id="5" fsArray="2 3"/> + <noNamespace:FsArrayHolderMR xmi:id="9" fsArray="10"/> + <noNamespace:IntArrayHolder xmi:id="13" intArray=""/> + <noNamespace:IntArrayHolder xmi:id="11" intArray="1 2"/> + <noNamespace:IntArrayHolderMR xmi:id="15" intArray="16"/> + <noNamespace:FloatArrayHolder xmi:id="17" floatArray="-1.0 0.0 1.0 NaN -Infinity Infinity 1.4E-45 3.4028235E38"/> + <noNamespace:FloatArrayHolder xmi:id="19" floatArray=""/> + <noNamespace:FloatArrayHolderMR xmi:id="21" floatArray="22"/> + <noNamespace:StringArrayHolder xmi:id="23"> + <stringArray>blah</stringArray> + <stringArray>blub</stringArray> + </noNamespace:StringArrayHolder> + <noNamespace:StringArrayHolder xmi:id="25" stringArray=""/> + <noNamespace:StringArrayHolderMR xmi:id="27" stringArray="28"/> + <cas:Sofa xmi:id="1" sofaNum="1" sofaID="_InitialView"/> + <tcas:Annotation xmi:id="2" sofa="1" begin="0" end="1"/> + <tcas:Annotation xmi:id="3" sofa="1" begin="1" end="2"/> + <cas:FSArray xmi:id="10" elements="2 3"/> + <cas:IntegerArray xmi:id="16" elements="1 2"/> + <cas:FloatArray xmi:id="22" elements="-1.0 0.0 1.0 NaN -Infinity Infinity 1.4E-45 3.4028235E38"/> + <cas:StringArray xmi:id="28"> + <elements>blah</elements> + <elements>blub</elements> + </cas:StringArray> + <cas:View sofa="1" members="4 5 9 13 11 15 17 19 21 23 25 27"/> +</xmi:XMI> diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_SERIALIZED_TSI_Test/ser-ref/casWithFsList/cas.bin b/uimaj-core/src/test/resources/CasSerializationDeserialization_SERIALIZED_TSI_Test/ser-ref/casWithLists/cas.bin similarity index 100% rename from uimaj-core/src/test/resources/CasSerializationDeserialization_SERIALIZED_TSI_Test/ser-ref/casWithFsList/cas.bin rename to uimaj-core/src/test/resources/CasSerializationDeserialization_SERIALIZED_TSI_Test/ser-ref/casWithLists/cas.bin diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_SERIALIZED_TSI_Test/ser-ref/casWithFsList/debug-typesystem.xml b/uimaj-core/src/test/resources/CasSerializationDeserialization_SERIALIZED_TSI_Test/ser-ref/casWithLists/debug-typesystem.xml similarity index 100% rename from uimaj-core/src/test/resources/CasSerializationDeserialization_SERIALIZED_TSI_Test/ser-ref/casWithFsList/debug-typesystem.xml rename to uimaj-core/src/test/resources/CasSerializationDeserialization_SERIALIZED_TSI_Test/ser-ref/casWithLists/debug-typesystem.xml diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_SERIALIZED_TSI_Test/ser-ref/casWithFsList/debug.xmi b/uimaj-core/src/test/resources/CasSerializationDeserialization_SERIALIZED_TSI_Test/ser-ref/casWithLists/debug.xmi similarity index 100% rename from uimaj-core/src/test/resources/CasSerializationDeserialization_SERIALIZED_TSI_Test/ser-ref/casWithFsList/debug.xmi rename to uimaj-core/src/test/resources/CasSerializationDeserialization_SERIALIZED_TSI_Test/ser-ref/casWithLists/debug.xmi diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_XCAS_Test/ser-ref/casWithArrays/cas.xcas b/uimaj-core/src/test/resources/CasSerializationDeserialization_XCAS_Test/ser-ref/casWithArrays/cas.xcas new file mode 100644 index 000000000..bbaa5dc96 --- /dev/null +++ b/uimaj-core/src/test/resources/CasSerializationDeserialization_XCAS_Test/ser-ref/casWithArrays/cas.xcas @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?><CAS version="2"> + <uima.cas.Sofa _indexed="0" _id="1" sofaNum="1" sofaID="_InitialView"/> + <uima.cas.FSArray _indexed="1" _id="4" size="2"> + <i>2</i> + <i>3</i> + </uima.cas.FSArray> + <FsArrayHolder _indexed="1" _id="5" _ref_fsArray="6"/> + <FsArrayHolderMR _indexed="1" _id="9" _ref_fsArray="10"/> + <IntArrayHolder _indexed="1" _id="13" _ref_intArray="14"/> + <IntArrayHolder _indexed="1" _id="11" _ref_intArray="12"/> + <IntArrayHolderMR _indexed="1" _id="15" _ref_intArray="16"/> + <FloatArrayHolder _indexed="1" _id="17" _ref_floatArray="18"/> + <FloatArrayHolder _indexed="1" _id="19" _ref_floatArray="20"/> + <FloatArrayHolderMR _indexed="1" _id="21" _ref_floatArray="22"/> + <StringArrayHolder _indexed="1" _id="23" _ref_stringArray="24"/> + <StringArrayHolder _indexed="1" _id="25" _ref_stringArray="26"/> + <StringArrayHolderMR _indexed="1" _id="27" _ref_stringArray="28"/> + <uima.cas.StringArray _id="28" size="2"> + <i>blah</i> + <i>blub</i> + </uima.cas.StringArray> + <uima.cas.StringArray _id="26" size="0"/> + <uima.cas.StringArray _id="24" size="2"> + <i>blah</i> + <i>blub</i> + </uima.cas.StringArray> + <uima.cas.FloatArray _id="22" size="8"> + <i>-1.0</i> + <i>0.0</i> + <i>1.0</i> + <i>NaN</i> + <i>-Infinity</i> + <i>Infinity</i> + <i>1.4E-45</i> + <i>3.4028235E38</i> + </uima.cas.FloatArray> + <uima.cas.FloatArray _id="20" size="0"/> + <uima.cas.FloatArray _id="18" size="8"> + <i>-1.0</i> + <i>0.0</i> + <i>1.0</i> + <i>NaN</i> + <i>-Infinity</i> + <i>Infinity</i> + <i>1.4E-45</i> + <i>3.4028235E38</i> + </uima.cas.FloatArray> + <uima.cas.IntegerArray _id="16" size="2"> + <i>1</i> + <i>2</i> + </uima.cas.IntegerArray> + <uima.cas.IntegerArray _id="12" size="2"> + <i>1</i> + <i>2</i> + </uima.cas.IntegerArray> + <uima.cas.IntegerArray _id="14" size="0"/> + <uima.cas.FSArray _id="10" size="2"> + <i>2</i> + <i>3</i> + </uima.cas.FSArray> + <uima.cas.FSArray _id="6" size="2"> + <i>2</i> + <i>3</i> + </uima.cas.FSArray> + <uima.tcas.Annotation _id="3" _ref_sofa="1" begin="1" end="2"/> + <uima.tcas.Annotation _id="2" _ref_sofa="1" begin="0" end="1"/> +</CAS> diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithFsList/debug-typesystem.xml b/uimaj-core/src/test/resources/CasSerializationDeserialization_XCAS_Test/ser-ref/casWithArrays/debug-typesystem.xml similarity index 73% copy from uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithFsList/debug-typesystem.xml copy to uimaj-core/src/test/resources/CasSerializationDeserialization_XCAS_Test/ser-ref/casWithArrays/debug-typesystem.xml index 61b16972a..9b89fba96 100644 --- a/uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithFsList/debug-typesystem.xml +++ b/uimaj-core/src/test/resources/CasSerializationDeserialization_XCAS_Test/ser-ref/casWithArrays/debug-typesystem.xml @@ -14,101 +14,101 @@ </features> </typeDescription> <typeDescription> - <name>FloatListHolder</name> + <name>FloatArrayHolder</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>floatList</name> + <name>floatArray</name> <description/> - <rangeTypeName>uima.cas.FloatList</rangeTypeName> + <rangeTypeName>uima.cas.FloatArray</rangeTypeName> </featureDescription> </features> </typeDescription> <typeDescription> - <name>FloatListHolderMR</name> + <name>FloatArrayHolderMR</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>floatList</name> + <name>floatArray</name> <description/> - <rangeTypeName>uima.cas.FloatList</rangeTypeName> + <rangeTypeName>uima.cas.FloatArray</rangeTypeName> <multipleReferencesAllowed>true</multipleReferencesAllowed> </featureDescription> </features> </typeDescription> <typeDescription> - <name>FsListHolder</name> + <name>FsArrayHolder</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>fsList</name> + <name>fsArray</name> <description/> - <rangeTypeName>uima.cas.FSList</rangeTypeName> + <rangeTypeName>uima.cas.FSArray</rangeTypeName> </featureDescription> </features> </typeDescription> <typeDescription> - <name>FsListHolderMR</name> + <name>FsArrayHolderMR</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>fsList</name> + <name>fsArray</name> <description/> - <rangeTypeName>uima.cas.FSList</rangeTypeName> + <rangeTypeName>uima.cas.FSArray</rangeTypeName> <multipleReferencesAllowed>true</multipleReferencesAllowed> </featureDescription> </features> </typeDescription> <typeDescription> - <name>IntListHolder</name> + <name>IntArrayHolder</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>intList</name> + <name>intArray</name> <description/> - <rangeTypeName>uima.cas.IntegerList</rangeTypeName> + <rangeTypeName>uima.cas.IntegerArray</rangeTypeName> </featureDescription> </features> </typeDescription> <typeDescription> - <name>IntListHolderMR</name> + <name>IntArrayHolderMR</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>intList</name> + <name>intArray</name> <description/> - <rangeTypeName>uima.cas.IntegerList</rangeTypeName> + <rangeTypeName>uima.cas.IntegerArray</rangeTypeName> <multipleReferencesAllowed>true</multipleReferencesAllowed> </featureDescription> </features> </typeDescription> <typeDescription> - <name>StringListHolder</name> + <name>StringArrayHolder</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>stringList</name> + <name>stringArray</name> <description/> - <rangeTypeName>uima.cas.StringList</rangeTypeName> + <rangeTypeName>uima.cas.StringArray</rangeTypeName> </featureDescription> </features> </typeDescription> <typeDescription> - <name>StringListHolderMR</name> + <name>StringArrayHolderMR</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>stringList</name> + <name>stringArray</name> <description/> - <rangeTypeName>uima.cas.StringList</rangeTypeName> + <rangeTypeName>uima.cas.StringArray</rangeTypeName> <multipleReferencesAllowed>true</multipleReferencesAllowed> </featureDescription> </features> diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_XCAS_Test/ser-ref/casWithArrays/debug.xmi b/uimaj-core/src/test/resources/CasSerializationDeserialization_XCAS_Test/ser-ref/casWithArrays/debug.xmi new file mode 100644 index 000000000..72ee1cd1c --- /dev/null +++ b/uimaj-core/src/test/resources/CasSerializationDeserialization_XCAS_Test/ser-ref/casWithArrays/debug.xmi @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:noNamespace="http:///uima/noNamespace.ecore"; xmlns:tcas="http:///uima/tcas.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmlns:cas="http:///uima/cas.ecore"; xmi:version="2.0"> + <cas:NULL xmi:id="0"/> + <cas:FSArray xmi:id="4" elements="2 3"/> + <noNamespace:FsArrayHolder xmi:id="5" fsArray="2 3"/> + <noNamespace:FsArrayHolderMR xmi:id="9" fsArray="10"/> + <noNamespace:IntArrayHolder xmi:id="13" intArray=""/> + <noNamespace:IntArrayHolder xmi:id="11" intArray="1 2"/> + <noNamespace:IntArrayHolderMR xmi:id="15" intArray="16"/> + <noNamespace:FloatArrayHolder xmi:id="17" floatArray="-1.0 0.0 1.0 NaN -Infinity Infinity 1.4E-45 3.4028235E38"/> + <noNamespace:FloatArrayHolder xmi:id="19" floatArray=""/> + <noNamespace:FloatArrayHolderMR xmi:id="21" floatArray="22"/> + <noNamespace:StringArrayHolder xmi:id="23"> + <stringArray>blah</stringArray> + <stringArray>blub</stringArray> + </noNamespace:StringArrayHolder> + <noNamespace:StringArrayHolder xmi:id="25" stringArray=""/> + <noNamespace:StringArrayHolderMR xmi:id="27" stringArray="28"/> + <cas:Sofa xmi:id="1" sofaNum="1" sofaID="_InitialView"/> + <tcas:Annotation xmi:id="2" sofa="1" begin="0" end="1"/> + <tcas:Annotation xmi:id="3" sofa="1" begin="1" end="2"/> + <cas:FSArray xmi:id="10" elements="2 3"/> + <cas:IntegerArray xmi:id="16" elements="1 2"/> + <cas:FloatArray xmi:id="22" elements="-1.0 0.0 1.0 NaN -Infinity Infinity 1.4E-45 3.4028235E38"/> + <cas:StringArray xmi:id="28"> + <elements>blah</elements> + <elements>blub</elements> + </cas:StringArray> + <cas:View sofa="1" members="4 5 9 13 11 15 17 19 21 23 25 27"/> +</xmi:XMI> diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithFsList/typesystem.xml b/uimaj-core/src/test/resources/CasSerializationDeserialization_XCAS_Test/ser-ref/casWithArrays/typesystem.xml similarity index 73% copy from uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithFsList/typesystem.xml copy to uimaj-core/src/test/resources/CasSerializationDeserialization_XCAS_Test/ser-ref/casWithArrays/typesystem.xml index 61b16972a..9b89fba96 100644 --- a/uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithFsList/typesystem.xml +++ b/uimaj-core/src/test/resources/CasSerializationDeserialization_XCAS_Test/ser-ref/casWithArrays/typesystem.xml @@ -14,101 +14,101 @@ </features> </typeDescription> <typeDescription> - <name>FloatListHolder</name> + <name>FloatArrayHolder</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>floatList</name> + <name>floatArray</name> <description/> - <rangeTypeName>uima.cas.FloatList</rangeTypeName> + <rangeTypeName>uima.cas.FloatArray</rangeTypeName> </featureDescription> </features> </typeDescription> <typeDescription> - <name>FloatListHolderMR</name> + <name>FloatArrayHolderMR</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>floatList</name> + <name>floatArray</name> <description/> - <rangeTypeName>uima.cas.FloatList</rangeTypeName> + <rangeTypeName>uima.cas.FloatArray</rangeTypeName> <multipleReferencesAllowed>true</multipleReferencesAllowed> </featureDescription> </features> </typeDescription> <typeDescription> - <name>FsListHolder</name> + <name>FsArrayHolder</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>fsList</name> + <name>fsArray</name> <description/> - <rangeTypeName>uima.cas.FSList</rangeTypeName> + <rangeTypeName>uima.cas.FSArray</rangeTypeName> </featureDescription> </features> </typeDescription> <typeDescription> - <name>FsListHolderMR</name> + <name>FsArrayHolderMR</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>fsList</name> + <name>fsArray</name> <description/> - <rangeTypeName>uima.cas.FSList</rangeTypeName> + <rangeTypeName>uima.cas.FSArray</rangeTypeName> <multipleReferencesAllowed>true</multipleReferencesAllowed> </featureDescription> </features> </typeDescription> <typeDescription> - <name>IntListHolder</name> + <name>IntArrayHolder</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>intList</name> + <name>intArray</name> <description/> - <rangeTypeName>uima.cas.IntegerList</rangeTypeName> + <rangeTypeName>uima.cas.IntegerArray</rangeTypeName> </featureDescription> </features> </typeDescription> <typeDescription> - <name>IntListHolderMR</name> + <name>IntArrayHolderMR</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>intList</name> + <name>intArray</name> <description/> - <rangeTypeName>uima.cas.IntegerList</rangeTypeName> + <rangeTypeName>uima.cas.IntegerArray</rangeTypeName> <multipleReferencesAllowed>true</multipleReferencesAllowed> </featureDescription> </features> </typeDescription> <typeDescription> - <name>StringListHolder</name> + <name>StringArrayHolder</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>stringList</name> + <name>stringArray</name> <description/> - <rangeTypeName>uima.cas.StringList</rangeTypeName> + <rangeTypeName>uima.cas.StringArray</rangeTypeName> </featureDescription> </features> </typeDescription> <typeDescription> - <name>StringListHolderMR</name> + <name>StringArrayHolderMR</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>stringList</name> + <name>stringArray</name> <description/> - <rangeTypeName>uima.cas.StringList</rangeTypeName> + <rangeTypeName>uima.cas.StringArray</rangeTypeName> <multipleReferencesAllowed>true</multipleReferencesAllowed> </featureDescription> </features> diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_XCAS_Test/ser-ref/casWithFsList/cas.xcas b/uimaj-core/src/test/resources/CasSerializationDeserialization_XCAS_Test/ser-ref/casWithLists/cas.xcas similarity index 100% rename from uimaj-core/src/test/resources/CasSerializationDeserialization_XCAS_Test/ser-ref/casWithFsList/cas.xcas rename to uimaj-core/src/test/resources/CasSerializationDeserialization_XCAS_Test/ser-ref/casWithLists/cas.xcas diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_XCAS_Test/ser-ref/casWithFsList/debug-typesystem.xml b/uimaj-core/src/test/resources/CasSerializationDeserialization_XCAS_Test/ser-ref/casWithLists/debug-typesystem.xml similarity index 100% rename from uimaj-core/src/test/resources/CasSerializationDeserialization_XCAS_Test/ser-ref/casWithFsList/debug-typesystem.xml rename to uimaj-core/src/test/resources/CasSerializationDeserialization_XCAS_Test/ser-ref/casWithLists/debug-typesystem.xml diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_XCAS_Test/ser-ref/casWithFsList/debug.xmi b/uimaj-core/src/test/resources/CasSerializationDeserialization_XCAS_Test/ser-ref/casWithLists/debug.xmi similarity index 100% rename from uimaj-core/src/test/resources/CasSerializationDeserialization_XCAS_Test/ser-ref/casWithFsList/debug.xmi rename to uimaj-core/src/test/resources/CasSerializationDeserialization_XCAS_Test/ser-ref/casWithLists/debug.xmi diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_XCAS_Test/ser-ref/casWithFsList/typesystem.xml b/uimaj-core/src/test/resources/CasSerializationDeserialization_XCAS_Test/ser-ref/casWithLists/typesystem.xml similarity index 100% rename from uimaj-core/src/test/resources/CasSerializationDeserialization_XCAS_Test/ser-ref/casWithFsList/typesystem.xml rename to uimaj-core/src/test/resources/CasSerializationDeserialization_XCAS_Test/ser-ref/casWithLists/typesystem.xml diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_0_PRETTY_Test/ser-ref/casWithArrays/data.xmi b/uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_0_PRETTY_Test/ser-ref/casWithArrays/data.xmi new file mode 100644 index 000000000..72ee1cd1c --- /dev/null +++ b/uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_0_PRETTY_Test/ser-ref/casWithArrays/data.xmi @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:noNamespace="http:///uima/noNamespace.ecore"; xmlns:tcas="http:///uima/tcas.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmlns:cas="http:///uima/cas.ecore"; xmi:version="2.0"> + <cas:NULL xmi:id="0"/> + <cas:FSArray xmi:id="4" elements="2 3"/> + <noNamespace:FsArrayHolder xmi:id="5" fsArray="2 3"/> + <noNamespace:FsArrayHolderMR xmi:id="9" fsArray="10"/> + <noNamespace:IntArrayHolder xmi:id="13" intArray=""/> + <noNamespace:IntArrayHolder xmi:id="11" intArray="1 2"/> + <noNamespace:IntArrayHolderMR xmi:id="15" intArray="16"/> + <noNamespace:FloatArrayHolder xmi:id="17" floatArray="-1.0 0.0 1.0 NaN -Infinity Infinity 1.4E-45 3.4028235E38"/> + <noNamespace:FloatArrayHolder xmi:id="19" floatArray=""/> + <noNamespace:FloatArrayHolderMR xmi:id="21" floatArray="22"/> + <noNamespace:StringArrayHolder xmi:id="23"> + <stringArray>blah</stringArray> + <stringArray>blub</stringArray> + </noNamespace:StringArrayHolder> + <noNamespace:StringArrayHolder xmi:id="25" stringArray=""/> + <noNamespace:StringArrayHolderMR xmi:id="27" stringArray="28"/> + <cas:Sofa xmi:id="1" sofaNum="1" sofaID="_InitialView"/> + <tcas:Annotation xmi:id="2" sofa="1" begin="0" end="1"/> + <tcas:Annotation xmi:id="3" sofa="1" begin="1" end="2"/> + <cas:FSArray xmi:id="10" elements="2 3"/> + <cas:IntegerArray xmi:id="16" elements="1 2"/> + <cas:FloatArray xmi:id="22" elements="-1.0 0.0 1.0 NaN -Infinity Infinity 1.4E-45 3.4028235E38"/> + <cas:StringArray xmi:id="28"> + <elements>blah</elements> + <elements>blub</elements> + </cas:StringArray> + <cas:View sofa="1" members="4 5 9 13 11 15 17 19 21 23 25 27"/> +</xmi:XMI> diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithFsList/debug-typesystem.xml b/uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_0_PRETTY_Test/ser-ref/casWithArrays/debug-typesystem.xml similarity index 73% copy from uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithFsList/debug-typesystem.xml copy to uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_0_PRETTY_Test/ser-ref/casWithArrays/debug-typesystem.xml index 61b16972a..9b89fba96 100644 --- a/uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithFsList/debug-typesystem.xml +++ b/uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_0_PRETTY_Test/ser-ref/casWithArrays/debug-typesystem.xml @@ -14,101 +14,101 @@ </features> </typeDescription> <typeDescription> - <name>FloatListHolder</name> + <name>FloatArrayHolder</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>floatList</name> + <name>floatArray</name> <description/> - <rangeTypeName>uima.cas.FloatList</rangeTypeName> + <rangeTypeName>uima.cas.FloatArray</rangeTypeName> </featureDescription> </features> </typeDescription> <typeDescription> - <name>FloatListHolderMR</name> + <name>FloatArrayHolderMR</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>floatList</name> + <name>floatArray</name> <description/> - <rangeTypeName>uima.cas.FloatList</rangeTypeName> + <rangeTypeName>uima.cas.FloatArray</rangeTypeName> <multipleReferencesAllowed>true</multipleReferencesAllowed> </featureDescription> </features> </typeDescription> <typeDescription> - <name>FsListHolder</name> + <name>FsArrayHolder</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>fsList</name> + <name>fsArray</name> <description/> - <rangeTypeName>uima.cas.FSList</rangeTypeName> + <rangeTypeName>uima.cas.FSArray</rangeTypeName> </featureDescription> </features> </typeDescription> <typeDescription> - <name>FsListHolderMR</name> + <name>FsArrayHolderMR</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>fsList</name> + <name>fsArray</name> <description/> - <rangeTypeName>uima.cas.FSList</rangeTypeName> + <rangeTypeName>uima.cas.FSArray</rangeTypeName> <multipleReferencesAllowed>true</multipleReferencesAllowed> </featureDescription> </features> </typeDescription> <typeDescription> - <name>IntListHolder</name> + <name>IntArrayHolder</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>intList</name> + <name>intArray</name> <description/> - <rangeTypeName>uima.cas.IntegerList</rangeTypeName> + <rangeTypeName>uima.cas.IntegerArray</rangeTypeName> </featureDescription> </features> </typeDescription> <typeDescription> - <name>IntListHolderMR</name> + <name>IntArrayHolderMR</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>intList</name> + <name>intArray</name> <description/> - <rangeTypeName>uima.cas.IntegerList</rangeTypeName> + <rangeTypeName>uima.cas.IntegerArray</rangeTypeName> <multipleReferencesAllowed>true</multipleReferencesAllowed> </featureDescription> </features> </typeDescription> <typeDescription> - <name>StringListHolder</name> + <name>StringArrayHolder</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>stringList</name> + <name>stringArray</name> <description/> - <rangeTypeName>uima.cas.StringList</rangeTypeName> + <rangeTypeName>uima.cas.StringArray</rangeTypeName> </featureDescription> </features> </typeDescription> <typeDescription> - <name>StringListHolderMR</name> + <name>StringArrayHolderMR</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>stringList</name> + <name>stringArray</name> <description/> - <rangeTypeName>uima.cas.StringList</rangeTypeName> + <rangeTypeName>uima.cas.StringArray</rangeTypeName> <multipleReferencesAllowed>true</multipleReferencesAllowed> </featureDescription> </features> diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_0_PRETTY_Test/ser-ref/casWithArrays/debug.xmi b/uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_0_PRETTY_Test/ser-ref/casWithArrays/debug.xmi new file mode 100644 index 000000000..72ee1cd1c --- /dev/null +++ b/uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_0_PRETTY_Test/ser-ref/casWithArrays/debug.xmi @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:noNamespace="http:///uima/noNamespace.ecore"; xmlns:tcas="http:///uima/tcas.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmlns:cas="http:///uima/cas.ecore"; xmi:version="2.0"> + <cas:NULL xmi:id="0"/> + <cas:FSArray xmi:id="4" elements="2 3"/> + <noNamespace:FsArrayHolder xmi:id="5" fsArray="2 3"/> + <noNamespace:FsArrayHolderMR xmi:id="9" fsArray="10"/> + <noNamespace:IntArrayHolder xmi:id="13" intArray=""/> + <noNamespace:IntArrayHolder xmi:id="11" intArray="1 2"/> + <noNamespace:IntArrayHolderMR xmi:id="15" intArray="16"/> + <noNamespace:FloatArrayHolder xmi:id="17" floatArray="-1.0 0.0 1.0 NaN -Infinity Infinity 1.4E-45 3.4028235E38"/> + <noNamespace:FloatArrayHolder xmi:id="19" floatArray=""/> + <noNamespace:FloatArrayHolderMR xmi:id="21" floatArray="22"/> + <noNamespace:StringArrayHolder xmi:id="23"> + <stringArray>blah</stringArray> + <stringArray>blub</stringArray> + </noNamespace:StringArrayHolder> + <noNamespace:StringArrayHolder xmi:id="25" stringArray=""/> + <noNamespace:StringArrayHolderMR xmi:id="27" stringArray="28"/> + <cas:Sofa xmi:id="1" sofaNum="1" sofaID="_InitialView"/> + <tcas:Annotation xmi:id="2" sofa="1" begin="0" end="1"/> + <tcas:Annotation xmi:id="3" sofa="1" begin="1" end="2"/> + <cas:FSArray xmi:id="10" elements="2 3"/> + <cas:IntegerArray xmi:id="16" elements="1 2"/> + <cas:FloatArray xmi:id="22" elements="-1.0 0.0 1.0 NaN -Infinity Infinity 1.4E-45 3.4028235E38"/> + <cas:StringArray xmi:id="28"> + <elements>blah</elements> + <elements>blub</elements> + </cas:StringArray> + <cas:View sofa="1" members="4 5 9 13 11 15 17 19 21 23 25 27"/> +</xmi:XMI> diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithFsList/typesystem.xml b/uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_0_PRETTY_Test/ser-ref/casWithArrays/typesystem.xml similarity index 73% copy from uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithFsList/typesystem.xml copy to uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_0_PRETTY_Test/ser-ref/casWithArrays/typesystem.xml index 61b16972a..9b89fba96 100644 --- a/uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithFsList/typesystem.xml +++ b/uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_0_PRETTY_Test/ser-ref/casWithArrays/typesystem.xml @@ -14,101 +14,101 @@ </features> </typeDescription> <typeDescription> - <name>FloatListHolder</name> + <name>FloatArrayHolder</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>floatList</name> + <name>floatArray</name> <description/> - <rangeTypeName>uima.cas.FloatList</rangeTypeName> + <rangeTypeName>uima.cas.FloatArray</rangeTypeName> </featureDescription> </features> </typeDescription> <typeDescription> - <name>FloatListHolderMR</name> + <name>FloatArrayHolderMR</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>floatList</name> + <name>floatArray</name> <description/> - <rangeTypeName>uima.cas.FloatList</rangeTypeName> + <rangeTypeName>uima.cas.FloatArray</rangeTypeName> <multipleReferencesAllowed>true</multipleReferencesAllowed> </featureDescription> </features> </typeDescription> <typeDescription> - <name>FsListHolder</name> + <name>FsArrayHolder</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>fsList</name> + <name>fsArray</name> <description/> - <rangeTypeName>uima.cas.FSList</rangeTypeName> + <rangeTypeName>uima.cas.FSArray</rangeTypeName> </featureDescription> </features> </typeDescription> <typeDescription> - <name>FsListHolderMR</name> + <name>FsArrayHolderMR</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>fsList</name> + <name>fsArray</name> <description/> - <rangeTypeName>uima.cas.FSList</rangeTypeName> + <rangeTypeName>uima.cas.FSArray</rangeTypeName> <multipleReferencesAllowed>true</multipleReferencesAllowed> </featureDescription> </features> </typeDescription> <typeDescription> - <name>IntListHolder</name> + <name>IntArrayHolder</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>intList</name> + <name>intArray</name> <description/> - <rangeTypeName>uima.cas.IntegerList</rangeTypeName> + <rangeTypeName>uima.cas.IntegerArray</rangeTypeName> </featureDescription> </features> </typeDescription> <typeDescription> - <name>IntListHolderMR</name> + <name>IntArrayHolderMR</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>intList</name> + <name>intArray</name> <description/> - <rangeTypeName>uima.cas.IntegerList</rangeTypeName> + <rangeTypeName>uima.cas.IntegerArray</rangeTypeName> <multipleReferencesAllowed>true</multipleReferencesAllowed> </featureDescription> </features> </typeDescription> <typeDescription> - <name>StringListHolder</name> + <name>StringArrayHolder</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>stringList</name> + <name>stringArray</name> <description/> - <rangeTypeName>uima.cas.StringList</rangeTypeName> + <rangeTypeName>uima.cas.StringArray</rangeTypeName> </featureDescription> </features> </typeDescription> <typeDescription> - <name>StringListHolderMR</name> + <name>StringArrayHolderMR</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>stringList</name> + <name>stringArray</name> <description/> - <rangeTypeName>uima.cas.StringList</rangeTypeName> + <rangeTypeName>uima.cas.StringArray</rangeTypeName> <multipleReferencesAllowed>true</multipleReferencesAllowed> </featureDescription> </features> diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_0_PRETTY_Test/ser-ref/casWithFsList/data.xmi b/uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_0_PRETTY_Test/ser-ref/casWithLists/data.xmi similarity index 100% rename from uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_0_PRETTY_Test/ser-ref/casWithFsList/data.xmi rename to uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_0_PRETTY_Test/ser-ref/casWithLists/data.xmi diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_0_PRETTY_Test/ser-ref/casWithFsList/debug-typesystem.xml b/uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_0_PRETTY_Test/ser-ref/casWithLists/debug-typesystem.xml similarity index 100% rename from uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_0_PRETTY_Test/ser-ref/casWithFsList/debug-typesystem.xml rename to uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_0_PRETTY_Test/ser-ref/casWithLists/debug-typesystem.xml diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_0_PRETTY_Test/ser-ref/casWithFsList/debug.xmi b/uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_0_PRETTY_Test/ser-ref/casWithLists/debug.xmi similarity index 100% rename from uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_0_PRETTY_Test/ser-ref/casWithFsList/debug.xmi rename to uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_0_PRETTY_Test/ser-ref/casWithLists/debug.xmi diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_0_PRETTY_Test/ser-ref/casWithFsList/typesystem.xml b/uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_0_PRETTY_Test/ser-ref/casWithLists/typesystem.xml similarity index 100% rename from uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_0_PRETTY_Test/ser-ref/casWithFsList/typesystem.xml rename to uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_0_PRETTY_Test/ser-ref/casWithLists/typesystem.xml diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_1_PRETTY_Test/ser-ref/casWithArrays/data.xmi b/uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_1_PRETTY_Test/ser-ref/casWithArrays/data.xmi new file mode 100644 index 000000000..e778da0c6 --- /dev/null +++ b/uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_1_PRETTY_Test/ser-ref/casWithArrays/data.xmi @@ -0,0 +1,29 @@ +<?xml version="1.1" encoding="UTF-8"?><xmi:XMI xmlns:noNamespace="http:///uima/noNamespace.ecore"; xmlns:tcas="http:///uima/tcas.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmlns:cas="http:///uima/cas.ecore"; xmi:version="2.0"> + <cas:NULL xmi:id="0"/> + <cas:FSArray xmi:id="4" elements="2 3"/> + <noNamespace:FsArrayHolder xmi:id="5" fsArray="2 3"/> + <noNamespace:FsArrayHolderMR xmi:id="9" fsArray="10"/> + <noNamespace:IntArrayHolder xmi:id="13" intArray=""/> + <noNamespace:IntArrayHolder xmi:id="11" intArray="1 2"/> + <noNamespace:IntArrayHolderMR xmi:id="15" intArray="16"/> + <noNamespace:FloatArrayHolder xmi:id="17" floatArray="-1.0 0.0 1.0 NaN -Infinity Infinity 1.4E-45 3.4028235E38"/> + <noNamespace:FloatArrayHolder xmi:id="19" floatArray=""/> + <noNamespace:FloatArrayHolderMR xmi:id="21" floatArray="22"/> + <noNamespace:StringArrayHolder xmi:id="23"> + <stringArray>blah</stringArray> + <stringArray>blub</stringArray> + </noNamespace:StringArrayHolder> + <noNamespace:StringArrayHolder xmi:id="25" stringArray=""/> + <noNamespace:StringArrayHolderMR xmi:id="27" stringArray="28"/> + <cas:Sofa xmi:id="1" sofaNum="1" sofaID="_InitialView"/> + <tcas:Annotation xmi:id="2" sofa="1" begin="0" end="1"/> + <tcas:Annotation xmi:id="3" sofa="1" begin="1" end="2"/> + <cas:FSArray xmi:id="10" elements="2 3"/> + <cas:IntegerArray xmi:id="16" elements="1 2"/> + <cas:FloatArray xmi:id="22" elements="-1.0 0.0 1.0 NaN -Infinity Infinity 1.4E-45 3.4028235E38"/> + <cas:StringArray xmi:id="28"> + <elements>blah</elements> + <elements>blub</elements> + </cas:StringArray> + <cas:View sofa="1" members="4 5 9 13 11 15 17 19 21 23 25 27"/> +</xmi:XMI> diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithFsList/debug-typesystem.xml b/uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_1_PRETTY_Test/ser-ref/casWithArrays/debug-typesystem.xml similarity index 73% rename from uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithFsList/debug-typesystem.xml rename to uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_1_PRETTY_Test/ser-ref/casWithArrays/debug-typesystem.xml index 61b16972a..9b89fba96 100644 --- a/uimaj-core/src/test/resources/CasSerializationDeserialization_BINARY_TSI_Test/ser-ref/casWithFsList/debug-typesystem.xml +++ b/uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_1_PRETTY_Test/ser-ref/casWithArrays/debug-typesystem.xml @@ -14,101 +14,101 @@ </features> </typeDescription> <typeDescription> - <name>FloatListHolder</name> + <name>FloatArrayHolder</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>floatList</name> + <name>floatArray</name> <description/> - <rangeTypeName>uima.cas.FloatList</rangeTypeName> + <rangeTypeName>uima.cas.FloatArray</rangeTypeName> </featureDescription> </features> </typeDescription> <typeDescription> - <name>FloatListHolderMR</name> + <name>FloatArrayHolderMR</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>floatList</name> + <name>floatArray</name> <description/> - <rangeTypeName>uima.cas.FloatList</rangeTypeName> + <rangeTypeName>uima.cas.FloatArray</rangeTypeName> <multipleReferencesAllowed>true</multipleReferencesAllowed> </featureDescription> </features> </typeDescription> <typeDescription> - <name>FsListHolder</name> + <name>FsArrayHolder</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>fsList</name> + <name>fsArray</name> <description/> - <rangeTypeName>uima.cas.FSList</rangeTypeName> + <rangeTypeName>uima.cas.FSArray</rangeTypeName> </featureDescription> </features> </typeDescription> <typeDescription> - <name>FsListHolderMR</name> + <name>FsArrayHolderMR</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>fsList</name> + <name>fsArray</name> <description/> - <rangeTypeName>uima.cas.FSList</rangeTypeName> + <rangeTypeName>uima.cas.FSArray</rangeTypeName> <multipleReferencesAllowed>true</multipleReferencesAllowed> </featureDescription> </features> </typeDescription> <typeDescription> - <name>IntListHolder</name> + <name>IntArrayHolder</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>intList</name> + <name>intArray</name> <description/> - <rangeTypeName>uima.cas.IntegerList</rangeTypeName> + <rangeTypeName>uima.cas.IntegerArray</rangeTypeName> </featureDescription> </features> </typeDescription> <typeDescription> - <name>IntListHolderMR</name> + <name>IntArrayHolderMR</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>intList</name> + <name>intArray</name> <description/> - <rangeTypeName>uima.cas.IntegerList</rangeTypeName> + <rangeTypeName>uima.cas.IntegerArray</rangeTypeName> <multipleReferencesAllowed>true</multipleReferencesAllowed> </featureDescription> </features> </typeDescription> <typeDescription> - <name>StringListHolder</name> + <name>StringArrayHolder</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>stringList</name> + <name>stringArray</name> <description/> - <rangeTypeName>uima.cas.StringList</rangeTypeName> + <rangeTypeName>uima.cas.StringArray</rangeTypeName> </featureDescription> </features> </typeDescription> <typeDescription> - <name>StringListHolderMR</name> + <name>StringArrayHolderMR</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>stringList</name> + <name>stringArray</name> <description/> - <rangeTypeName>uima.cas.StringList</rangeTypeName> + <rangeTypeName>uima.cas.StringArray</rangeTypeName> <multipleReferencesAllowed>true</multipleReferencesAllowed> </featureDescription> </features> diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_1_PRETTY_Test/ser-ref/casWithArrays/debug.xmi b/uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_1_PRETTY_Test/ser-ref/casWithArrays/debug.xmi new file mode 100644 index 000000000..72ee1cd1c --- /dev/null +++ b/uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_1_PRETTY_Test/ser-ref/casWithArrays/debug.xmi @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?><xmi:XMI xmlns:noNamespace="http:///uima/noNamespace.ecore"; xmlns:tcas="http:///uima/tcas.ecore"; xmlns:xmi="http://www.omg.org/XMI"; xmlns:cas="http:///uima/cas.ecore"; xmi:version="2.0"> + <cas:NULL xmi:id="0"/> + <cas:FSArray xmi:id="4" elements="2 3"/> + <noNamespace:FsArrayHolder xmi:id="5" fsArray="2 3"/> + <noNamespace:FsArrayHolderMR xmi:id="9" fsArray="10"/> + <noNamespace:IntArrayHolder xmi:id="13" intArray=""/> + <noNamespace:IntArrayHolder xmi:id="11" intArray="1 2"/> + <noNamespace:IntArrayHolderMR xmi:id="15" intArray="16"/> + <noNamespace:FloatArrayHolder xmi:id="17" floatArray="-1.0 0.0 1.0 NaN -Infinity Infinity 1.4E-45 3.4028235E38"/> + <noNamespace:FloatArrayHolder xmi:id="19" floatArray=""/> + <noNamespace:FloatArrayHolderMR xmi:id="21" floatArray="22"/> + <noNamespace:StringArrayHolder xmi:id="23"> + <stringArray>blah</stringArray> + <stringArray>blub</stringArray> + </noNamespace:StringArrayHolder> + <noNamespace:StringArrayHolder xmi:id="25" stringArray=""/> + <noNamespace:StringArrayHolderMR xmi:id="27" stringArray="28"/> + <cas:Sofa xmi:id="1" sofaNum="1" sofaID="_InitialView"/> + <tcas:Annotation xmi:id="2" sofa="1" begin="0" end="1"/> + <tcas:Annotation xmi:id="3" sofa="1" begin="1" end="2"/> + <cas:FSArray xmi:id="10" elements="2 3"/> + <cas:IntegerArray xmi:id="16" elements="1 2"/> + <cas:FloatArray xmi:id="22" elements="-1.0 0.0 1.0 NaN -Infinity Infinity 1.4E-45 3.4028235E38"/> + <cas:StringArray xmi:id="28"> + <elements>blah</elements> + <elements>blub</elements> + </cas:StringArray> + <cas:View sofa="1" members="4 5 9 13 11 15 17 19 21 23 25 27"/> +</xmi:XMI> diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithFsList/typesystem.xml b/uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_1_PRETTY_Test/ser-ref/casWithArrays/typesystem.xml similarity index 73% rename from uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithFsList/typesystem.xml rename to uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_1_PRETTY_Test/ser-ref/casWithArrays/typesystem.xml index 61b16972a..9b89fba96 100644 --- a/uimaj-core/src/test/resources/CasSerializationDeserialization_COMPRESSED_FILTERED_TSI_Test/ser-ref/casWithFsList/typesystem.xml +++ b/uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_1_PRETTY_Test/ser-ref/casWithArrays/typesystem.xml @@ -14,101 +14,101 @@ </features> </typeDescription> <typeDescription> - <name>FloatListHolder</name> + <name>FloatArrayHolder</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>floatList</name> + <name>floatArray</name> <description/> - <rangeTypeName>uima.cas.FloatList</rangeTypeName> + <rangeTypeName>uima.cas.FloatArray</rangeTypeName> </featureDescription> </features> </typeDescription> <typeDescription> - <name>FloatListHolderMR</name> + <name>FloatArrayHolderMR</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>floatList</name> + <name>floatArray</name> <description/> - <rangeTypeName>uima.cas.FloatList</rangeTypeName> + <rangeTypeName>uima.cas.FloatArray</rangeTypeName> <multipleReferencesAllowed>true</multipleReferencesAllowed> </featureDescription> </features> </typeDescription> <typeDescription> - <name>FsListHolder</name> + <name>FsArrayHolder</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>fsList</name> + <name>fsArray</name> <description/> - <rangeTypeName>uima.cas.FSList</rangeTypeName> + <rangeTypeName>uima.cas.FSArray</rangeTypeName> </featureDescription> </features> </typeDescription> <typeDescription> - <name>FsListHolderMR</name> + <name>FsArrayHolderMR</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>fsList</name> + <name>fsArray</name> <description/> - <rangeTypeName>uima.cas.FSList</rangeTypeName> + <rangeTypeName>uima.cas.FSArray</rangeTypeName> <multipleReferencesAllowed>true</multipleReferencesAllowed> </featureDescription> </features> </typeDescription> <typeDescription> - <name>IntListHolder</name> + <name>IntArrayHolder</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>intList</name> + <name>intArray</name> <description/> - <rangeTypeName>uima.cas.IntegerList</rangeTypeName> + <rangeTypeName>uima.cas.IntegerArray</rangeTypeName> </featureDescription> </features> </typeDescription> <typeDescription> - <name>IntListHolderMR</name> + <name>IntArrayHolderMR</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>intList</name> + <name>intArray</name> <description/> - <rangeTypeName>uima.cas.IntegerList</rangeTypeName> + <rangeTypeName>uima.cas.IntegerArray</rangeTypeName> <multipleReferencesAllowed>true</multipleReferencesAllowed> </featureDescription> </features> </typeDescription> <typeDescription> - <name>StringListHolder</name> + <name>StringArrayHolder</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>stringList</name> + <name>stringArray</name> <description/> - <rangeTypeName>uima.cas.StringList</rangeTypeName> + <rangeTypeName>uima.cas.StringArray</rangeTypeName> </featureDescription> </features> </typeDescription> <typeDescription> - <name>StringListHolderMR</name> + <name>StringArrayHolderMR</name> <description/> <supertypeName>uima.cas.TOP</supertypeName> <features> <featureDescription> - <name>stringList</name> + <name>stringArray</name> <description/> - <rangeTypeName>uima.cas.StringList</rangeTypeName> + <rangeTypeName>uima.cas.StringArray</rangeTypeName> <multipleReferencesAllowed>true</multipleReferencesAllowed> </featureDescription> </features> diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_1_PRETTY_Test/ser-ref/casWithFsList/data.xmi b/uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_1_PRETTY_Test/ser-ref/casWithLists/data.xmi similarity index 100% rename from uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_1_PRETTY_Test/ser-ref/casWithFsList/data.xmi rename to uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_1_PRETTY_Test/ser-ref/casWithLists/data.xmi diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_1_PRETTY_Test/ser-ref/casWithFsList/debug-typesystem.xml b/uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_1_PRETTY_Test/ser-ref/casWithLists/debug-typesystem.xml similarity index 100% rename from uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_1_PRETTY_Test/ser-ref/casWithFsList/debug-typesystem.xml rename to uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_1_PRETTY_Test/ser-ref/casWithLists/debug-typesystem.xml diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_1_PRETTY_Test/ser-ref/casWithFsList/debug.xmi b/uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_1_PRETTY_Test/ser-ref/casWithLists/debug.xmi similarity index 100% rename from uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_1_PRETTY_Test/ser-ref/casWithFsList/debug.xmi rename to uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_1_PRETTY_Test/ser-ref/casWithLists/debug.xmi diff --git a/uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_1_PRETTY_Test/ser-ref/casWithFsList/typesystem.xml b/uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_1_PRETTY_Test/ser-ref/casWithLists/typesystem.xml similarity index 100% rename from uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_1_PRETTY_Test/ser-ref/casWithFsList/typesystem.xml rename to uimaj-core/src/test/resources/CasSerializationDeserialization_XMI_1_1_PRETTY_Test/ser-ref/casWithLists/typesystem.xml
