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 07fd52df410ed8cfa0ae8b9b5505eec7fdaa829a Merge: 5d0e20a 9f7e76f Author: Richard Eckart de Castilho <r...@apache.org> AuthorDate: Thu Jun 24 10:40:14 2021 +0200 Merge pull request #128 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 .gitignore | 2 + jcasgen-maven-plugin/pom.xml | 11 + .../uima/tools/jcasgen/maven/JCasGenM2ETest.java | 12 +- .../uima/tools/jcasgen/maven/JCasGenMojoTest.java | 19 +- uimaj-adapter-vinci/pom.xml | 11 +- .../VinciAnalysisEngineServiceAdapterTest.java | 79 ++- uimaj-component-test-util/pom.xml | 9 +- .../uima/test/junit_extension/AnnotatorTester.java | 74 +-- uimaj-core/pom.xml | 10 + .../impl/AnalysisEngineDescription_implTest.java | 55 +- .../impl/AnalysisEngineManagementImplTest.java | 11 +- .../impl/AnalysisEngine_implTest.java | 86 ++- .../impl/AnnotatorContext_implTest.java | 68 +-- .../MultiprocessingAnalysisEngine_implTest.java | 45 +- .../impl/PearAnalysisEngineWrapperTest.java | 31 +- .../uima/analysis_engine/impl/ResultSpecTest.java | 17 +- .../impl/ResultSpecWithTypeSystemTest.java | 19 +- .../impl/ResultSpecification_implTest.java | 80 +-- .../impl/TaeDescription_implTest.java | 32 +- .../impl/metadata/SofaMapping_implTest.java | 13 +- .../sequencer/SequencerCapabilityLanguageTest.java | 93 ++-- .../impl/sequencer/SequencerFixedTest.java | 42 +- .../uima/cas/impl/AnnotationIteratorTest.java | 32 +- .../java/org/apache/uima/cas/impl/CasPoolTest.java | 24 +- .../uima/cas/impl/CasTypeSystemMapperTest.java | 54 +- .../apache/uima/cas/impl/ComponentInfoTest.java | 10 +- .../impl/ConcurrentBinarySerializationTest.java | 2 +- .../uima/cas/impl/CustomSerializationTest.java | 18 +- .../org/apache/uima/cas/impl/FSBagIndexTest.java | 17 +- .../java/org/apache/uima/cas/impl/FSIndexTest.java | 2 +- .../org/apache/uima/cas/impl/FeaturePathTest.java | 37 +- .../java/org/apache/uima/cas/impl/Id2FSTest.java | 14 +- .../cas/impl/IndexCorruptionReportingTest.java | 18 +- .../org/apache/uima/cas/impl/JCasReinitTest.java | 11 +- .../uima/cas/impl/OrderedFsSet_array_Test.java | 25 +- .../org/apache/uima/cas/impl/ProtectIndexTest.java | 22 +- .../apache/uima/cas/impl/SelectFsNoJCasTest.java | 10 +- .../cas/impl/SelectFsPredicateAlignmentTest.java | 10 +- .../org/apache/uima/cas/impl/SelectFsTest.java | 574 +++++++++++++-------- .../org/apache/uima/cas/impl/SerDesForm4Test.java | 51 +- .../apache/uima/cas/impl/SerDesForm6ExtraTest.java | 2 +- .../org/apache/uima/cas/impl/SerDesForm6Test.java | 62 ++- .../uima/cas/impl/UimaV2CasCompatibilityTest.java | 4 +- .../uima/cas/impl/UnambiguousIteratorTest.java | 10 +- .../apache/uima/cas/impl/XCASDeserializerTest.java | 44 +- .../uima/cas/impl/XmiCasDeserializerTest.java | 103 ++-- .../apache/uima/cas/impl/XmiCasSerializerTest.java | 31 +- .../apache/uima/cas/test/AnnotationIndexTest.java | 18 +- .../apache/uima/cas/test/AnnotationTreeTest.java | 14 +- .../java/org/apache/uima/cas/test/ArrayFSTest.java | 39 +- .../org/apache/uima/cas/test/ArrayIndexTest.java | 24 +- .../java/org/apache/uima/cas/test/CASTest.java | 70 +-- .../uima/cas/test/CompleteSerializationTest.java | 18 +- .../uima/cas/test/FSCreatedInPearContextTest.java | 2 +- .../apache/uima/cas/test/FeatureStructureTest.java | 78 +-- .../apache/uima/cas/test/FilteredIteratorTest.java | 38 +- .../org/apache/uima/cas/test/FloatArrayFSTest.java | 32 +- .../apache/uima/cas/test/GetAllIndexedTest.java | 30 +- .../cas/test/GrowingTheCasNoJcasCacheTest.java | 25 +- .../apache/uima/cas/test/GrowingTheCasTest.java | 28 +- .../apache/uima/cas/test/IndexComparitorTest.java | 35 +- .../uima/cas/test/IndexRepositoryMergingTest.java | 19 +- .../apache/uima/cas/test/IndexRepositoryTest.java | 39 +- .../uima/cas/test/IndexSerializationTest.java | 30 +- .../org/apache/uima/cas/test/IntArrayFSTest.java | 32 +- .../apache/uima/cas/test/IteratorSortedTest.java | 23 +- .../org/apache/uima/cas/test/IteratorTest.java | 56 +- .../apache/uima/cas/test/JCasClassLoaderTest.java | 12 +- .../org/apache/uima/cas/test/JcasSofaTest.java | 39 +- .../uima/cas/test/NewPrimitiveTypesTest.java | 50 +- .../uima/cas/test/SerializationNoMDTest.java | 30 +- .../uima/cas/test/SerializationReinitTest.java | 44 +- .../java/org/apache/uima/cas/test/SofaTest.java | 58 ++- .../org/apache/uima/cas/test/StringArrayTest.java | 38 +- .../apache/uima/cas/test/StringSubtypeTest.java | 29 +- .../org/apache/uima/cas/test/SubiteratorTest.java | 26 +- .../org/apache/uima/cas/test/TypeOrderTest.java | 33 +- .../org/apache/uima/cas/test/TypePriorityTest.java | 35 +- .../apache/uima/cas/test/TypeSystemReinitTest.java | 13 +- .../org/apache/uima/cas/test/TypeSystemTest.java | 77 +-- .../apache/uima/cas/test/TypeSystemUtilsTest.java | 26 +- .../uima/cas/test/UimacppDeserializationTest.java | 25 +- .../uima/cas/text/AnnotationPredicatesTest.java | 30 +- .../uima/cas_data/impl/CasDataToXCasTest.java | 18 +- .../cas_data/impl/XCasToCasDataSaxHandlerTest.java | 24 +- .../impl/CasConsumerDescription_implTest.java | 17 +- .../impl/CasInitializerDescription_implTest.java | 16 +- .../impl/CollectionReaderDescription_implTest.java | 17 +- .../impl/CapabilityLanguageFlowControllerTest.java | 4 +- .../uima/flow/impl/FixedFlowControllerTest.java | 20 +- .../uima/impl/AnalysisEngineFactory_implTest.java | 14 +- .../uima/impl/CasConsumerFactory_implTest.java | 14 +- .../impl/CollectionReaderFactory_implTest.java | 13 +- .../CustomResourceSpecifierFactory_implTest.java | 14 +- .../org/apache/uima/impl/UimaContext_implTest.java | 83 +-- .../uima/internal/util/AnalysisEnginePoolTest.java | 38 +- .../uima/internal/util/Int2ObjHashMapTest.java | 20 +- .../apache/uima/internal/util/IntBitSetTest.java | 26 +- .../uima/internal/util/IntHashSetPerfTest.java | 10 +- .../apache/uima/internal/util/IntHashSetTest.java | 31 +- .../apache/uima/internal/util/IntVectorTest.java | 14 +- .../org/apache/uima/internal/util/MiscTest.java | 6 +- .../internal/util/Obj2IntIdentityHashMapTest.java | 20 +- .../apache/uima/internal/util/ObjHashSetTest.java | 25 +- .../uima/internal/util/PositiveIntSetTest.java | 22 +- .../uima/internal/util/ResourcePoolTest.java | 41 +- .../uima/internal/util/UIMAClassLoaderTest.java | 43 +- .../uima/internal/util/WeakIdentityMapTest.java | 12 +- .../apache/uima/internal/util/XmlUtilsTest.java | 18 +- .../internal/util/rb_trees/Int2IntRBTTest.java | 16 +- .../internal/util/rb_trees/IntArrayRBTTest.java | 19 +- .../uima/jcas/impl/JCasCoverClassLoadingTest.java | 2 +- .../uima/jcas/impl/JCasHashMapCompareTest.java | 10 +- .../org/apache/uima/jcas/impl/JCasHashMapTest.java | 25 +- .../org/apache/uima/jcas/tcas/AnnotationTest.java | 30 +- .../org/apache/uima/jcas/test/FSArrayListTest.java | 24 +- .../org/apache/uima/jcas/test/FSHashSetTest.java | 21 +- .../uima/jcas/test/IntegerArrayListTest.java | 23 +- .../java/org/apache/uima/jcas/test/JCasTest.java | 119 +++-- .../java/org/apache/uima/jcas/test/JCasTest2.java | 57 +- .../uima/pear/util/ComponentCategoryTest.java | 21 +- .../apache/uima/pear/util/PearEncodingTest.java | 18 +- .../util/PearInstallationVerificationTest.java | 28 +- .../apache/uima/pear/util/PearInstallerTest.java | 15 +- .../org/apache/uima/pear/util/PearRuntimeTest.java | 23 +- .../resource/ConfigurableResource_implTest.java | 21 +- .../uima/resource/impl/CasManager_implTest.java | 9 +- ...ConfigurableDataResourceSpecifier_implTest.java | 11 +- .../impl/ConfigurableDataResource_implTest.java | 27 +- .../uima/resource/impl/DataResource_implTest.java | 29 +- .../impl/FileLanguageResource_implTest.java | 27 +- .../uima/resource/impl/PearSpecifier_implTest.java | 15 +- .../impl/RelativePathResolver_implTest.java | 22 +- .../impl/ResourceCreationSpecifier_implTest.java | 9 +- .../resource/impl/ResourceManager_implTest.java | 39 +- .../uima/resource/impl/URISpecifier_implTest.java | 14 +- ...onfigurationParameterDeclarations_implTest.java | 19 +- .../metadata/impl/FsIndexCollection_implTest.java | 36 +- .../resource/metadata/impl/Import_implTest.java | 42 +- .../metadata/impl/MetaDataObject_implTest.java | 33 +- .../ResourceManagerConfiguration_implTest.java | 34 +- .../metadata/impl/TypePriorities_implTest.java | 36 +- .../impl/TypeSystemDescription_implTest.java | 35 +- .../impl/ResourceServiceAdapter_implTest.java | 25 +- .../service/impl/ResourceService_implTest.java | 25 +- .../java/org/apache/uima/util/CasCopierTest.java | 29 +- .../org/apache/uima/util/CasCreationUtilsTest.java | 55 +- .../uima/util/CasIOUtilsAlwaysHoldOnTest.java | 2 +- .../java/org/apache/uima/util/CasIOUtilsTest.java | 73 +-- .../org/apache/uima/util/CasToInlineXmlTest.java | 14 +- .../java/org/apache/uima/util/FileUtilsTest.java | 14 +- .../test/java/org/apache/uima/util/LevelTest.java | 44 +- .../org/apache/uima/util/TypeSystemUtilTest.java | 9 +- .../org/apache/uima/util/XMLSerializerTest.java | 22 +- .../uima/util/impl/JSR47Logger_implTest.java | 22 +- .../uima/util/impl/Log4jLogger_implTest.java | 30 +- .../org/apache/uima/util/impl/Logger_implTest.java | 16 +- .../org/apache/uima/util/impl/LoggingTest.java | 25 +- .../apache/uima/util/impl/OptimizeStringsTest.java | 21 +- .../uima/util/impl/ProcessTrace_implTest.java | 38 +- .../apache/uima/util/impl/XMLParser_implTest.java | 48 +- .../impl/SofaNamingInAggregateTest.java | 40 +- .../impl/CollectionProcessingEngine_implTest.java | 36 +- .../uima/collection/impl/cpm/CasPoolTest.java | 17 +- .../impl/cpm/CpeCasProcessorAPI_Test.java | 19 +- .../impl/cpm/CpeDescriptorSerialization_Test.java | 25 +- .../uima/collection/impl/cpm/CpeImportTest.java | 29 +- .../uima/collection/impl/cpm/CpmAE_ErrorTest.java | 61 ++- .../impl/cpm/CpmCasConsumer_ErrorTest.java | 36 +- .../impl/cpm/CpmCollectionReader_ErrorTest.java | 53 +- .../uima/collection/impl/cpm/CpmInitTest.java | 22 +- .../collection/impl/cpm/CpmProcessingTest.java | 29 +- .../uima/collection/impl/cpm/CpmStopTest.java | 25 +- .../uima/collection/impl/cpm/PearCasPoolTest.java | 25 +- .../impl/cpm/SofaCPE_SofaUnawareCC_Test.java | 70 +-- .../uima/collection/impl/cpm/SofaCPE_Test.java | 70 +-- .../collection/impl/cpm/SofaMixedCPE_Test.java | 67 +-- .../uima/pear/util/ComponentCategoryTest.java | 9 +- .../uima/jcas/tcas/DocumentAnnotationTest.java | 22 +- uimaj-ep-cas-editor-ide/pom.xml | 4 +- uimaj-ep-cas-editor/pom.xml | 11 +- .../core/model/dotcorpus/AnnotationStyleTest.java | 18 +- .../model/dotcorpus/DotCorpusSerializerTest.java | 12 +- .../apache/uima/caseditor/core/util/SpanTest.java | 77 ++- .../uima/caseditor/editor/AnnotationStyleTest.java | 15 +- .../uima/caseditor/editor/util/SpanTest.java | 80 ++- .../apache/uima/json/JsonCasSerializerTest.java | 32 +- .../apache/uima/json/JsonMetaDataObjectTest.java | 33 +- .../apache/uima/json/JsonXmiCasSerializerTest.java | 6 +- uimaj-parent/pom.xml | 24 +- uimaj-test-util/pom.xml | 13 +- .../uima/tools/pear/merger/PearMergerTest.java | 15 +- .../uima/tools/viewer/CasAnnotationViewerTest.java | 16 +- .../uima/cas/impl/JCasCoverClassFactoryTest.java | 7 +- .../impl/JCasCoverClassFactoryTest.java | 5 +- .../uima/internal/util/Int2IntHashMapTest.java | 13 +- .../apache/uima/internal/util/Int2IntPerfTest.java | 10 +- .../uima/jcas/impl/JCasCoverClassFactoryTest.java | 6 +- .../uima/jcas/impl/JCasHashMapCompareTest.java | 10 +- .../org/apache/uima/jcas/impl/JCasHashMapTest.java | 25 +- 200 files changed, 3239 insertions(+), 3070 deletions(-)