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-uimafit.git
commit a882ff402c0720bf07d6f79d6af21dcfacd230c0 Merge: b97026d 870f223 Author: Richard Eckart de Castilho <[email protected]> AuthorDate: Wed Mar 2 18:26:11 2022 +0100 Merge pull request #169 from apache/reactoring/UIMA-6424-Upgrade-uimaFIT-to-JUnit-5 [UIMA-6424] Upgrade uimaFIT to JUnit 5 .gitignore | 1 + installEclipseSettings.sh | 42 ++ pom.xml | 2 + .../main/eclipse}/org.eclipse.jdt.core.prefs | 31 +- src/main/eclipse/org.eclipse.jdt.ui.prefs | 121 +++++ .../apache/uima/fit/testing/assertj/CasAssert.java | 18 +- .../fit/testing/assertj/CasAssert_ImplBase.java | 83 ++-- .../uima/fit/testing/assertj/JCasAssert.java | 18 +- .../fit/testing/assertj/ValidationCheckAssert.java | 3 +- uimafit-benchmark/pom.xml | 22 +- .../java/org/apache/uima/fit/benchmark/Batch.java | 4 +- .../org/apache/uima/fit/benchmark/Benchmark.java | 75 ++- .../apache/uima/fit/benchmark/BenchmarkGroup.java | 17 +- .../fit/benchmark/CachingRandomJCasProvider.java | 1 + .../uima/fit/benchmark/CasInitializationUtils.java | 61 ++- .../org/apache/uima/fit/benchmark/Measurement.java | 80 ++- .../uima/fit/benchmark/RunnableWithExceptions.java | 2 +- .../apache/uima/fit/benchmark/FSUtilBenchmark.java | 31 +- .../uima/fit/benchmark/JCasFactoryBenchmark.java | 40 +- .../apache/uima/fit/benchmark/SelectBenchmark.java | 453 +++++++++-------- uimafit-core/.settings/org.eclipse.jdt.ui.prefs | 4 - uimafit-core/pom.xml | 27 +- .../uima/fit/component/CasAnnotator_ImplBase.java | 4 +- .../uima/fit/component/CasConsumer_ImplBase.java | 4 +- .../apache/uima/fit/component/CasDumpWriter.java | 13 +- .../fit/component/CasFlowController_ImplBase.java | 4 +- .../uima/fit/component/CasMultiplier_ImplBase.java | 4 +- .../uima/fit/component/ExternalResourceAware.java | 5 +- .../uima/fit/component/JCasAnnotator_ImplBase.java | 4 +- .../uima/fit/component/JCasConsumer_ImplBase.java | 4 +- .../fit/component/JCasFlowController_ImplBase.java | 4 +- .../fit/component/JCasMultiplier_ImplBase.java | 4 +- .../initialize/ExternalResourceInitializer.java | 24 +- .../fit/component/initialize/package-info.java | 1 - .../apache/uima/fit/component/package-info.java | 1 - .../org/apache/uima/fit/descriptor/FsIndex.java | 4 +- .../uima/fit/descriptor/LanguageCapability.java | 6 +- .../uima/fit/descriptor/MimeTypeCapability.java | 6 +- .../uima/fit/descriptor/ResourceMetaData.java | 8 +- .../apache/uima/fit/descriptor/SofaCapability.java | 26 +- .../apache/uima/fit/descriptor/TypeCapability.java | 12 +- .../apache/uima/fit/descriptor/package-info.java | 1 - .../uima/fit/factory/AnalysisEngineFactory.java | 33 +- .../apache/uima/fit/factory/CapabilityFactory.java | 15 +- .../org/apache/uima/fit/factory/CasFactory.java | 6 +- .../uima/fit/factory/CollectionReaderFactory.java | 85 ++-- .../fit/factory/ConfigurationParameterFactory.java | 6 +- .../uima/fit/factory/ExternalResourceFactory.java | 155 +++--- .../org/apache/uima/fit/factory/JCasFactory.java | 18 +- .../factory/ResourceCreationSpecifierFactory.java | 3 +- .../uima/fit/factory/ResourceMetaDataFactory.java | 36 +- .../uima/fit/factory/SofaMappingFactory.java | 3 +- .../initializable/InitializableFactory.java | 8 +- .../org/apache/uima/fit/factory/package-info.java | 23 +- .../apache/uima/fit/internal/ClassLoaderUtils.java | 3 +- .../apache/uima/fit/internal/DescriptionUtils.java | 8 +- .../ExtendedExternalResourceDescription_impl.java | 6 +- .../apache/uima/fit/internal/LegacySupport.java | 4 +- .../uima/fit/internal/LegacySupportPlugin.java | 36 +- .../org/apache/uima/fit/internal/MetaDataType.java | 4 +- .../apache/uima/fit/internal/ReflectionUtil.java | 24 +- .../org/apache/uima/fit/internal/ResourceList.java | 6 +- .../uima/fit/internal/ResourceManagerFactory.java | 12 +- .../propertyeditors/GetAsTextStringEditor.java | 4 +- .../propertyeditors/PropertyEditorUtil.java | 3 +- .../org/apache/uima/fit/pipeline/JCasIterable.java | 10 +- .../org/apache/uima/fit/pipeline/JCasIterator.java | 45 +- .../apache/uima/fit/pipeline/SimplePipeline.java | 67 +-- .../org/apache/uima/fit/pipeline/package-info.java | 1 - .../uima/fit/testing/factory/TokenBuilder.java | 12 +- .../java/org/apache/uima/fit/util/CasIOUtil.java | 4 +- .../java/org/apache/uima/fit/util/CasUtil.java | 204 ++++---- .../apache/uima/fit/util/FSCollectionFactory.java | 43 +- .../main/java/org/apache/uima/fit/util/FSUtil.java | 237 ++++----- .../java/org/apache/uima/fit/util/JCasUtil.java | 81 ++-- .../java/org/apache/uima/fit/util/LocaleUtil.java | 6 +- .../org/apache/uima/fit/util/package-info.java | 29 +- .../uima/fit/validation/ValidationCheck.java | 20 +- .../fit/validation/ValidationCheckException.java | 4 +- .../validation/ValidationCheckFailedException.java | 4 +- .../org/apache/uima/fit/validation/Validator.java | 39 +- .../src/test/java/DefaultPackageAETest.java | 9 +- .../org/apache/uima/fit/ComponentTestBase.java | 10 +- .../uima/fit/component/CasDumpWriterTest.java | 22 +- .../uima/fit/component/CasMultiplierTest.java | 84 ++-- .../JCasCollectionReader_ImplBaseTest.java | 21 +- .../fit/component/ViewCreatorAnnotatorTest.java | 73 ++- .../fit/component/ViewTextCopierAnnotatorTest.java | 45 +- .../ConfigurationParameterInitializerTest.java | 416 ++++++++-------- .../apache/uima/fit/data/CreateSampleXCASFile.java | 11 +- .../uima/fit/descriptor/TypeCapabilityTest.java | 12 +- .../uima/fit/factory/AggregateBuilderTest.java | 104 ++-- .../uima/fit/factory/AggregateWithReaderTest.java | 2 +- .../AnalysisEngineFactoryExternalResourceTest.java | 262 +++++----- .../fit/factory/AnalysisEngineFactoryTest.java | 357 +++++++------- .../uima/fit/factory/AnnotationFactoryTest.java | 4 +- ...ollectionReaderFactoryExternalResourceTest.java | 12 +- .../fit/factory/CollectionReaderFactoryTest.java | 60 +-- .../factory/ConfigurationParameterFactoryTest.java | 51 +- ...ameterFactory_ParameterValueConversionTest.java | 2 +- .../factory/ExternalResourceConfiguratorTest.java | 6 +- .../fit/factory/ExternalResourceFactoryTest.java | 235 +++++---- .../FlowControllerFactoryExternalResourceTest.java | 10 +- .../fit/factory/FlowControllerFactoryTest.java | 15 +- .../uima/fit/factory/FsIndexFactoryTest.java | 10 +- .../apache/uima/fit/factory/JCasBuilderTest.java | 21 +- .../apache/uima/fit/factory/JCasFactoryTest.java | 4 +- .../ResourceCreationSpecifierFactoryTest.java | 37 +- .../fit/factory/ResourceManagerFactoryTest.java | 13 +- .../fit/factory/ResourceMetaDataFactoryTest.java | 4 +- .../uima/fit/factory/SofaMappingFactoryTest.java | 4 +- .../fit/factory/TypePrioritiesFactoryTest.java | 20 +- .../factory/TypeSystemDescriptionFactoryTest.java | 4 +- .../uima/fit/factory/UimaContextFactoryTest.java | 14 +- .../initializable/InitializableFactoryTest.java | 30 +- .../uima/fit/factory/testAes/ParameterizedAE.java | 14 +- .../testAes/ReversableTestFlowController.java | 4 +- .../testAes/SerializationTestAnnotator.java | 2 +- .../fit/factory/testCrs/SingleFileXReader.java | 7 +- .../fit/factory/testCrs/SingleFileXReaderTest.java | 47 +- .../fit/factory/testRes/TestExternalResource.java | 6 +- .../factory/testRes/TestSharedResourceObject.java | 6 +- .../apache/uima/fit/pipeline/JCasIterableTest.java | 94 ++-- .../uima/fit/pipeline/SimplePipelineTest.java | 43 +- .../uima/fit/testing/factory/TokenBuilderTest.java | 36 +- .../uima/fit/util/AnnotationPredicateTestData.java | 150 +++--- .../java/org/apache/uima/fit/util/CasUtilTest.java | 153 +++--- .../apache/uima/fit/util/ContainmentIndexTest.java | 8 +- .../apache/uima/fit/util/DisableLoggingTest.java | 17 +- .../uima/fit/util/FSCollectionFactoryTest.java | 93 ++-- .../java/org/apache/uima/fit/util/FSUtilTest.java | 71 ++- .../org/apache/uima/fit/util/HideOutputTest.java | 18 +- .../org/apache/uima/fit/util/JCasIterableTest.java | 2 +- .../org/apache/uima/fit/util/JCasUtilTest.java | 535 ++++++++++----------- .../org/apache/uima/fit/util/JCasUtilv3Test.java | 172 +++---- .../org/apache/uima/fit/util/LocaleUtilTest.java | 9 +- .../org/apache/uima/fit/util/SelectionAssert.java | 51 +- .../apache/uima/fit/util/SimplePipelineTest.java | 22 +- .../fit/validation/CasValidatorBuilderTest.java | 12 +- .../checks/EndSameAsBeginCheckForTesting.java | 2 +- .../.settings/org.eclipse.core.resources.prefs | 6 - uimafit-cpe/.settings/org.eclipse.jdt.core.prefs | 292 ----------- uimafit-cpe/.settings/org.eclipse.jdt.ui.prefs | 3 - uimafit-cpe/.settings/org.eclipse.m2e.core.prefs | 4 - uimafit-cpe/pom.xml | 12 +- .../org/apache/uima/fit/cpe/CasMultiplierTest.java | 71 ++- .../fit/cpe/CpePipelineFailureHandlingTest.java | 9 +- .../org/apache/uima/fit/cpe/CpePipelineTest.java | 12 +- .../uima/fit/cpe/ExternalResourceFactoryTest.java | 64 ++- .../.settings/org.eclipse.jdt.core.prefs | 289 ----------- .../.settings/org.eclipse.jdt.ui.prefs | 3 - uimafit-examples/pom.xml | 9 +- .../fit/examples/experiment/pos/GoldTagger.java | 2 +- .../fit/examples/experiment/pos/RunExperiment.java | 25 +- .../fit/examples/experiment/pos/XmiWriter.java | 3 +- .../fit/examples/experiment/pos/package-info.java | 1 - .../getstarted/GetStartedQuickDescriptor.java | 4 +- .../uima/fit/examples/getstarted/package-info.java | 1 - .../examples/resource/ExternalResourceExample.java | 4 +- .../resource/ExternalResourceExample3.java | 4 +- .../uima/fit/examples/resource/package-info.java | 1 - .../fit/examples/tutorial/ex1/package-info.java | 1 - .../examples/tutorial/ex2/RoomNumberAnnotator.java | 6 +- .../fit/examples/tutorial/ex2/package-info.java | 1 - .../tutorial/ex6/UimaAcronymAnnotator.java | 7 +- .../fit/examples/tutorial/ex6/package-info.java | 1 - .../fit/examples/tutorial/ExamplesTestBase.java | 7 +- .../tutorial/ex1/RoomNumberAnnotator1Test.java | 10 +- .../tutorial/ex1/RoomNumberAnnotator2Test.java | 10 +- .../fit/examples/tutorial/ex6/Example6Test.java | 9 +- .../org/apache/uima/fit/examples/xmi/XmiTest.java | 19 +- uimafit-junit/pom.xml | 8 +- .../apache/uima/fit/testing/junit/ManagedCas.java | 108 ++--- .../apache/uima/fit/testing/junit/ManagedJCas.java | 108 ++--- .../.settings/org.eclipse.jdt.core.prefs | 289 ----------- .../.settings/org.eclipse.jdt.ui.prefs | 3 - uimafit-maven-plugin/pom.xml | 8 + .../org/apache/uima/fit/maven/EnhanceMojo.java | 59 +-- .../apache/uima/fit/maven/util/ComponentType.java | 1 + .../java/org/apache/uima/fit/maven/util/Util.java | 53 +- .../javadoc/ComponentDescriptionExtractorTest.java | 4 +- .../maven/javadoc/JavadocTextExtractorTest.java | 8 +- uimafit-parent/pom.xml | 107 +++-- .../.settings/org.eclipse.jdt.core.prefs | 289 ----------- uimafit-spring/.settings/org.eclipse.jdt.ui.prefs | 3 - uimafit-spring/pom.xml | 23 +- .../fit/spring/SpringContextResourceManager.java | 4 +- .../spring/factory/CasConsumerFactory_impl.java | 4 +- .../spring/util/ResourceInitializationUtil.java | 3 +- .../spring/SpringContextResourceManagerTest.java | 8 +- .../uima/fit/spring/UimaFactoryInjectionTest.java | 13 +- 191 files changed, 3515 insertions(+), 4618 deletions(-)
