You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by re...@apache.org on 2021/02/22 15:23:25 UTC
[uima-uimaj] branch
bugfix/UIMA-6318-Deserialization-of-array-subtypes-fails created (now
99d3e59)
This is an automated email from the ASF dual-hosted git repository.
rec pushed a change to branch bugfix/UIMA-6318-Deserialization-of-array-subtypes-fails
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git.
at 99d3e59 UIMA-6318: Deserialization of array subtypes fails (form6)
This branch includes the following new commits:
new 99d3e59 UIMA-6318: Deserialization of array subtypes fails (form6)
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[uima-uimaj] 01/01: UIMA-6318: Deserialization of array subtypes
fails (form6)
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rec pushed a commit to branch bugfix/UIMA-6318-Deserialization-of-array-subtypes-fails
in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
commit 99d3e592142f2ebe979e4a042961d50f28161652
Author: Richard Eckart de Castilho <re...@apache.org>
AuthorDate: Mon Feb 22 16:23:41 2021 +0100
UIMA-6318: Deserialization of array subtypes fails (form6)
- Rename tests so that Maven actually finds and executes them
---
...MapperTst.java => CasTypeSystemMapperTest.java} | 2 +-
...rray_test.java => OrderedFsSet_array_Test.java} | 2 +-
...ctFsTestNoJCas.java => SelectFsNoJCasTest.java} | 2 +-
.../{SerDesTest4.java => SerDesForm4Test.java} | 4 ++--
.../{SerDesTest6.java => SerDesForm6Test.java} | 22 +++++++++-------------
...ache.java => GrowingTheCasNoJcasCacheTest.java} | 6 +++---
...atorTestSorted.java => IteratorSortedTest.java} | 4 ++--
.../{Int2IntRBTtest.java => Int2IntRBTTest.java} | 2 +-
.../{IntArrayRBTtest.java => IntArrayRBTTest.java} | 2 +-
....java => PearInstallationVerificationTest.java} | 2 +-
10 files changed, 22 insertions(+), 26 deletions(-)
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasTypeSystemMapperTst.java b/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasTypeSystemMapperTest.java
similarity index 99%
rename from uimaj-core/src/test/java/org/apache/uima/cas/impl/CasTypeSystemMapperTst.java
rename to uimaj-core/src/test/java/org/apache/uima/cas/impl/CasTypeSystemMapperTest.java
index a59158e..b8fb338 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasTypeSystemMapperTst.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasTypeSystemMapperTest.java
@@ -54,7 +54,7 @@ import junit.framework.TestCase;
* Verify appropriate mapping is there.
*/
-public class CasTypeSystemMapperTst extends TestCase {
+public class CasTypeSystemMapperTest extends TestCase {
private static TypeSystemImpl tsi = (TypeSystemImpl) CASFactory.createTypeSystem(); // just to get the built-ins
private static int t0 = tsi.getNumberOfTypes();
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/impl/OrderedFsSet_array_test.java b/uimaj-core/src/test/java/org/apache/uima/cas/impl/OrderedFsSet_array_Test.java
similarity index 95%
rename from uimaj-core/src/test/java/org/apache/uima/cas/impl/OrderedFsSet_array_test.java
rename to uimaj-core/src/test/java/org/apache/uima/cas/impl/OrderedFsSet_array_Test.java
index c1d6956..0f523cf 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/impl/OrderedFsSet_array_test.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/impl/OrderedFsSet_array_Test.java
@@ -47,7 +47,7 @@ import org.apache.uima.util.XMLInputSource;
import junit.framework.TestCase;
-public class OrderedFsSet_array_test extends TestCase {
+public class OrderedFsSet_array_Test extends TestCase {
static File typeSystemFile1 = JUnitExtension.getFile("ExampleCas/testTypeSystem.xml");
static int SZ = 23;
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/impl/SelectFsTestNoJCas.java b/uimaj-core/src/test/java/org/apache/uima/cas/impl/SelectFsNoJCasTest.java
similarity index 98%
rename from uimaj-core/src/test/java/org/apache/uima/cas/impl/SelectFsTestNoJCas.java
rename to uimaj-core/src/test/java/org/apache/uima/cas/impl/SelectFsNoJCasTest.java
index 6c4f765..1cdbfd0 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/impl/SelectFsTestNoJCas.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/impl/SelectFsNoJCasTest.java
@@ -36,7 +36,7 @@ import org.junit.BeforeClass;
import org.junit.Test;
// tests without initializing JCas
-public class SelectFsTestNoJCas {
+public class SelectFsNoJCasTest {
private static TypeSystemDescription typeSystemDescription;
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesTest4.java b/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesForm4Test.java
similarity index 99%
rename from uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesTest4.java
rename to uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesForm4Test.java
index 3dd800d..3beb6c5 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesTest4.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesForm4Test.java
@@ -73,7 +73,7 @@ import junit.framework.TestCase;
* Has main method for creating resources to use in testing
* will update resources in SerDes4. If you do this by mistake, just revert those resources.
*/
-public class SerDesTest4 extends SerDesTstCommon {
+public class SerDesForm4Test extends SerDesTstCommon {
// FIXME need to understand why includeUid is false, seems to be disabling some testing Nov 2016
private static final boolean includeUid = false;
@@ -263,7 +263,7 @@ public class SerDesTest4 extends SerDesTstCommon {
}
}
- public SerDesTest4() {
+ public SerDesForm4Test() {
}
public void setUp() {
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesTest6.java b/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesForm6Test.java
similarity index 98%
rename from uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesTest6.java
rename to uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesForm6Test.java
index 248ae49..15389dc 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesTest6.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesForm6Test.java
@@ -18,14 +18,14 @@
*/
package org.apache.uima.cas.impl;
-import static org.apache.uima.cas.impl.SerDesTest6.TypeSystems.EqTwoTypes;
-import static org.apache.uima.cas.impl.SerDesTest6.TypeSystems.OneType;
-import static org.apache.uima.cas.impl.SerDesTest6.TypeSystems.OneTypeSubsetFeatures;
-import static org.apache.uima.cas.impl.SerDesTest6.TypeSystems.TwoTypes;
-import static org.apache.uima.cas.impl.SerDesTest6.TypeSystems.TwoTypesNoFeatures;
-import static org.apache.uima.cas.impl.SerDesTest6.TypeSystems.TwoTypesSubsetFeatures;
-import static org.apache.uima.cas.impl.SerDesTest6.Types.Akof1;
-import static org.apache.uima.cas.impl.SerDesTest6.Types.Akof2;
+import static org.apache.uima.cas.impl.SerDesForm6Test.TypeSystems.EqTwoTypes;
+import static org.apache.uima.cas.impl.SerDesForm6Test.TypeSystems.OneType;
+import static org.apache.uima.cas.impl.SerDesForm6Test.TypeSystems.OneTypeSubsetFeatures;
+import static org.apache.uima.cas.impl.SerDesForm6Test.TypeSystems.TwoTypes;
+import static org.apache.uima.cas.impl.SerDesForm6Test.TypeSystems.TwoTypesNoFeatures;
+import static org.apache.uima.cas.impl.SerDesForm6Test.TypeSystems.TwoTypesSubsetFeatures;
+import static org.apache.uima.cas.impl.SerDesForm6Test.Types.Akof1;
+import static org.apache.uima.cas.impl.SerDesForm6Test.Types.Akof2;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -70,15 +70,11 @@ import junit.framework.TestCase;
/**
* Serializer and Deserializer testing
- *
- *
*/
-public class SerDesTest6 extends SerDesTstCommon {
+public class SerDesForm6Test extends SerDesTstCommon {
/**
* TwoType, EqTwoTypes, TwoTypesSubsetFeatures, TwoTypesNoFeatures have Akof1 and Akof2
- *
- *
*/
enum TypeSystems {
TwoTypes, // two types, Akof1 Akof2, with all features, one type system
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/test/GrowingTheCasTestNoJcasCache.java b/uimaj-core/src/test/java/org/apache/uima/cas/test/GrowingTheCasNoJcasCacheTest.java
similarity index 97%
rename from uimaj-core/src/test/java/org/apache/uima/cas/test/GrowingTheCasTestNoJcasCache.java
rename to uimaj-core/src/test/java/org/apache/uima/cas/test/GrowingTheCasNoJcasCacheTest.java
index 89c7feb..ecbe07f 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/test/GrowingTheCasTestNoJcasCache.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/test/GrowingTheCasNoJcasCacheTest.java
@@ -44,7 +44,7 @@ import junit.framework.TestCase;
* Class comment for IteratorTest.java goes here.
*
*/
-public class GrowingTheCasTestNoJcasCache extends TestCase {
+public class GrowingTheCasNoJcasCacheTest extends TestCase {
private final static int REPETITIONS = 1;
@@ -52,7 +52,7 @@ public class GrowingTheCasTestNoJcasCache extends TestCase {
private JCas smallHeapCas = null;
- public GrowingTheCasTestNoJcasCache(String arg0) {
+ public GrowingTheCasNoJcasCacheTest(String arg0) {
super(arg0);
}
@@ -172,7 +172,7 @@ public class GrowingTheCasTestNoJcasCache extends TestCase {
}
public static void main(String[] args) {
- junit.textui.TestRunner.run(GrowingTheCasTestNoJcasCache.class);
+ junit.textui.TestRunner.run(GrowingTheCasNoJcasCacheTest.class);
}
}
diff --git a/uimaj-core/src/test/java/org/apache/uima/cas/test/IteratorTestSorted.java b/uimaj-core/src/test/java/org/apache/uima/cas/test/IteratorSortedTest.java
similarity index 95%
rename from uimaj-core/src/test/java/org/apache/uima/cas/test/IteratorTestSorted.java
rename to uimaj-core/src/test/java/org/apache/uima/cas/test/IteratorSortedTest.java
index 9b4fcb1..ef2c075 100644
--- a/uimaj-core/src/test/java/org/apache/uima/cas/test/IteratorTestSorted.java
+++ b/uimaj-core/src/test/java/org/apache/uima/cas/test/IteratorSortedTest.java
@@ -70,7 +70,7 @@ import junit.framework.TestCase;
*
*
*/
-public class IteratorTestSorted extends TestCase {
+public class IteratorSortedTest extends TestCase {
static final int REPETITIONS = // 100_000_000; 1000 secs = 17 min
100_000; // 1 second + startup time ~ .8 sec
// 1000000;
@@ -126,7 +126,7 @@ public class IteratorTestSorted extends TestCase {
}
- public IteratorTestSorted(String arg) {
+ public IteratorSortedTest(String arg) {
super(arg);
}
diff --git a/uimaj-core/src/test/java/org/apache/uima/internal/util/rb_trees/Int2IntRBTtest.java b/uimaj-core/src/test/java/org/apache/uima/internal/util/rb_trees/Int2IntRBTTest.java
similarity index 98%
rename from uimaj-core/src/test/java/org/apache/uima/internal/util/rb_trees/Int2IntRBTtest.java
rename to uimaj-core/src/test/java/org/apache/uima/internal/util/rb_trees/Int2IntRBTTest.java
index b237de9..6dd7fb7 100644
--- a/uimaj-core/src/test/java/org/apache/uima/internal/util/rb_trees/Int2IntRBTtest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/internal/util/rb_trees/Int2IntRBTTest.java
@@ -29,7 +29,7 @@ import org.apache.uima.internal.util.IntListIterator;
import junit.framework.TestCase;
-public class Int2IntRBTtest extends TestCase {
+public class Int2IntRBTTest extends TestCase {
public void testexpand() {
Int2IntRBT ia = new Int2IntRBT();
diff --git a/uimaj-core/src/test/java/org/apache/uima/internal/util/rb_trees/IntArrayRBTtest.java b/uimaj-core/src/test/java/org/apache/uima/internal/util/rb_trees/IntArrayRBTTest.java
similarity index 99%
rename from uimaj-core/src/test/java/org/apache/uima/internal/util/rb_trees/IntArrayRBTtest.java
rename to uimaj-core/src/test/java/org/apache/uima/internal/util/rb_trees/IntArrayRBTTest.java
index ad66756..c4f6c43 100644
--- a/uimaj-core/src/test/java/org/apache/uima/internal/util/rb_trees/IntArrayRBTtest.java
+++ b/uimaj-core/src/test/java/org/apache/uima/internal/util/rb_trees/IntArrayRBTTest.java
@@ -27,7 +27,7 @@ import org.apache.uima.internal.util.IntListIterator;
import junit.framework.TestCase;
-public class IntArrayRBTtest extends TestCase {
+public class IntArrayRBTTest extends TestCase {
private final static int NIL = 0;
static final Random rand = new Random();
static {
diff --git a/uimaj-core/src/test/java/org/apache/uima/pear/util/TestPearInstallationVerification.java b/uimaj-core/src/test/java/org/apache/uima/pear/util/PearInstallationVerificationTest.java
similarity index 98%
rename from uimaj-core/src/test/java/org/apache/uima/pear/util/TestPearInstallationVerification.java
rename to uimaj-core/src/test/java/org/apache/uima/pear/util/PearInstallationVerificationTest.java
index 28539b2..236247a 100644
--- a/uimaj-core/src/test/java/org/apache/uima/pear/util/TestPearInstallationVerification.java
+++ b/uimaj-core/src/test/java/org/apache/uima/pear/util/PearInstallationVerificationTest.java
@@ -41,7 +41,7 @@ import org.junit.rules.TemporaryFolder;
/**
* Test the pear installation verification
*/
-public class TestPearInstallationVerification {
+public class PearInstallationVerificationTest {
// Temporary working directory, used to install the pear package
public @Rule TemporaryFolder temp = new TemporaryFolder();