This is an automated email from the ASF dual-hosted git repository. rec pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
commit 58f220abe786da6bb4cc17f9354dce1423c15d9e Merge: 26114e0 98f323d Author: Richard Eckart de Castilho <r...@apache.org> AuthorDate: Fri Jul 2 15:14:15 2021 +0200 Merge pull request #130 from apache/refactoring/UIMA-6372-Upgrade-from-JUnit-3-to-JUnit-4-to-JUnit-5 [UIMA-6372] Upgrade from JUnit 3 to JUnit 4 to JUnit 5 .../impl/AnalysisEngineDescription_implTest.java | 4 +- .../impl/AnalysisEngine_implTest.java | 16 +- .../MultiprocessingAnalysisEngine_implTest.java | 12 +- .../uima/analysis_engine/impl/ResultSpecTest.java | 4 +- .../impl/ResultSpecWithTypeSystemTest.java | 2 +- .../impl/ResultSpecification_implTest.java | 2 +- .../impl/TaeDescription_implTest.java | 2 +- .../sequencer/SequencerCapabilityLanguageTest.java | 38 ++-- .../impl/sequencer/SequencerFixedTest.java | 12 +- .../uima/cas/impl/AnnotationIteratorTest.java | 2 +- .../java/org/apache/uima/cas/impl/CasPoolTest.java | 2 +- .../uima/cas/impl/CasTypeSystemMapperTest.java | 12 +- .../uima/cas/impl/CustomSerializationTest.java | 12 +- .../org/apache/uima/cas/impl/FeaturePathTest.java | 4 +- .../org/apache/uima/cas/impl/ProtectIndexTest.java | 10 +- .../org/apache/uima/cas/impl/SelectFsAssert.java | 75 ++++---- .../cas/impl/SelectFsPredicateAlignmentTest.java | 8 +- .../org/apache/uima/cas/impl/SerDesForm4Test.java | 199 +++++++-------------- .../org/apache/uima/cas/impl/SerDesForm6Test.java | 178 ++++++------------ .../org/apache/uima/cas/impl/SerDesTstCommon.java | 24 +-- .../uima/cas/impl/UimaV2CasCompatibilityTest.java | 2 +- .../apache/uima/cas/impl/XCASDeserializerTest.java | 2 +- .../uima/cas/impl/XmiCasDeserializerTest.java | 28 +-- .../apache/uima/cas/impl/XmiCasSerializerTest.java | 2 +- .../org/apache/uima/cas/test/CASInitializer.java | 10 +- .../java/org/apache/uima/cas/test/CASTest.java | 2 +- .../uima/cas/test/CompleteSerializationTest.java | 4 +- .../apache/uima/cas/test/FeatureStructureTest.java | 12 +- .../apache/uima/cas/test/FilteredIteratorTest.java | 6 +- .../apache/uima/cas/test/IndexRepositoryTest.java | 6 +- .../org/apache/uima/cas/test/IteratorTest.java | 18 +- .../apache/uima/cas/test/JCasClassLoaderTest.java | 6 +- .../org/apache/uima/cas/test/JcasSofaTest.java | 6 +- .../uima/cas/test/NewPrimitiveTypesTest.java | 6 +- .../uima/cas/test/SerializationReinitTest.java | 2 +- .../java/org/apache/uima/cas/test/SofaTest.java | 18 +- .../org/apache/uima/cas/test/StringArrayTest.java | 4 +- .../apache/uima/cas/test/StringSubtypeTest.java | 4 +- .../org/apache/uima/cas/test/TypePriorityTest.java | 2 +- .../org/apache/uima/cas/test/TypeSystemTest.java | 6 +- .../uima/cas/text/AnnotationPredicatesTest.java | 16 +- .../cas_data/impl/XCasToCasDataSaxHandlerTest.java | 2 +- .../impl/CasConsumerDescription_implTest.java | 2 +- .../impl/CasInitializerDescription_implTest.java | 2 +- .../impl/CapabilityLanguageFlowControllerTest.java | 2 +- .../org/apache/uima/impl/UimaContext_implTest.java | 16 +- .../uima/internal/util/Int2ObjHashMapTest.java | 4 +- .../apache/uima/internal/util/IntBitSetTest.java | 6 +- .../apache/uima/internal/util/IntHashSetTest.java | 10 +- .../apache/uima/internal/util/IntVectorTest.java | 2 +- .../internal/util/Obj2IntIdentityHashMapTest.java | 4 +- .../uima/internal/util/PositiveIntSetTest.java | 4 +- .../uima/internal/util/UIMAClassLoaderTest.java | 10 +- .../uima/internal/util/WeakIdentityMapTest.java | 2 +- .../internal/util/rb_trees/Int2IntRBTTest.java | 2 +- .../internal/util/rb_trees/IntArrayRBTTest.java | 6 +- .../org/apache/uima/jcas/tcas/AnnotationTest.java | 24 +-- .../java/org/apache/uima/jcas/test/JCasTest.java | 48 ++--- .../uima/pear/util/ComponentCategoryTest.java | 8 +- .../apache/uima/pear/util/PearEncodingTest.java | 6 +- .../org/apache/uima/pear/util/PearRuntimeTest.java | 4 +- .../resource/ConfigurableResource_implTest.java | 2 +- .../uima/resource/impl/DataResource_implTest.java | 2 +- .../uima/resource/impl/PearSpecifier_implTest.java | 2 +- .../impl/RelativePathResolver_implTest.java | 2 +- .../resource/impl/ResourceManager_implTest.java | 4 +- .../metadata/impl/FsIndexCollection_implTest.java | 2 +- .../metadata/impl/MetaDataObject_implTest.java | 8 +- .../ResourceManagerConfiguration_implTest.java | 2 +- .../metadata/impl/TypePriorities_implTest.java | 4 +- .../impl/TypeSystemDescription_implTest.java | 4 +- .../org/apache/uima/util/CasCreationUtilsTest.java | 20 +-- .../java/org/apache/uima/util/CasIOUtilsTest.java | 2 +- .../org/apache/uima/util/CasToInlineXmlTest.java | 2 +- .../java/org/apache/uima/util/FileUtilsTest.java | 2 +- .../test/java/org/apache/uima/util/LevelTest.java | 20 +-- .../org/apache/uima/util/XMLSerializerTest.java | 2 +- .../uima/util/impl/JSR47Logger_implTest.java | 6 +- .../uima/util/impl/Log4jLogger_implTest.java | 2 +- .../org/apache/uima/util/impl/Logger_implTest.java | 2 +- .../apache/uima/util/impl/OptimizeStringsTest.java | 4 +- .../uima/util/impl/ProcessTrace_implTest.java | 10 +- .../impl/SofaNamingInAggregateTest.java | 2 +- .../impl/cpm/CpeCasProcessorAPI_Test.java | 4 +- .../uima/collection/impl/cpm/CpeImportTest.java | 2 +- .../uima/collection/impl/cpm/CpmAE_ErrorTest.java | 10 +- .../impl/cpm/CpmCasConsumer_ErrorTest.java | 4 +- .../impl/cpm/CpmCollectionReader_ErrorTest.java | 20 +-- .../uima/collection/impl/cpm/CpmInitTest.java | 4 +- .../collection/impl/cpm/CpmProcessingTest.java | 6 +- .../uima/collection/impl/cpm/CpmStopTest.java | 6 +- .../uima/jcas/tcas/DocumentAnnotationTest.java | 6 +- uimaj-eclipse-feature-runtime/.gitignore | 4 +- uimaj-eclipse-feature-tools/.gitignore | 4 +- .../apache/uima/caseditor/core/util/SpanTest.java | 20 +-- .../uima/caseditor/editor/util/SpanTest.java | 22 +-- .../apache/uima/json/JsonCasSerializerTest.java | 6 +- 97 files changed, 515 insertions(+), 653 deletions(-)