You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2017/01/17 16:27:17 UTC
svn commit: r1779208 - in /uima/uimaj/branches/experiment-v3-jcas:
jcasgen-maven-plugin/src/test/java/org/apache/uima/tools/jcasgen/maven/
uimaj-adapter-vinci/src/test/java/org/apache/uima/adapter/vinci/
uimaj-component-test-util/src/main/java/org/apac...
Author: schor
Date: Tue Jan 17 16:27:16 2017
New Revision: 1779208
URL: http://svn.apache.org/viewvc?rev=1779208&view=rev
Log:
no Jira, update ref for junit version 4 import
Modified:
uima/uimaj/branches/experiment-v3-jcas/jcasgen-maven-plugin/src/test/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojoTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-adapter-vinci/src/test/java/org/apache/uima/adapter/vinci/VinciAnalysisEngineServiceAdapterTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-component-test-util/src/main/java/org/apache/uima/test/junit_extension/AnnotatorPerformanceTester.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-component-test-util/src/main/java/org/apache/uima/test/junit_extension/AnnotatorTester.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnnotatorContext_implTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_implTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/ResultSpecification_implTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/TaeDescription_implTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/TestAnnotator2.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/metadata/SofaMapping_implTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/sequencer/SequencerCapabilityLanguageTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/sequencer/SequencerFixedTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasPoolTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/TypeOrderTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/CasComparer.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/CasDataToXCasTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/XCasToCasDataSaxHandlerTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/collection/impl/CasConsumerDescription_implTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/collection/impl/CasInitializerDescription_implTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/collection/impl/CollectionReaderDescription_implTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/impl/SomeCustomResource.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/impl/UimaContext_implTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/internal/util/AnalysisEnginePoolTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/internal/util/IntVectorTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/internal/util/ResourcePoolTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/pear/util/ComponentCategoryTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/pear/util/PearEncodingTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/pear/util/PearInstallerTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/pear/util/TestPearInstallationVerification.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/resource/ConfigurableResource_implTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/resource/impl/DataResource_implTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/resource/impl/FileLanguageResource_implTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/resource/impl/PearSpecifier_implTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/resource/impl/RelativePathResolver_implTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/resource/impl/ResourceManager_implTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterDeclarations_implTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/MetaDataObject_implTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/resource/service/impl/ResourceServiceAdapter_implTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/resource/service/impl/ResourceService_implTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/CasCreationUtilsTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/CasIOUtilsTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/LevelTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/impl/JSR47Logger_implTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/impl/Logger_implTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/impl/LoggingTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/impl/ProcessTrace_implTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/impl/XMLParser_implTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/test/java/org/apache/uima/analysis_engine/impl/SofaNamingInAggregateTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/CasHeapSizeTestCollectionReader.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/TestCasMultiplier.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CasPoolTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpeImportTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpmProcessingTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/PearCasPoolTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/test/java/org/apache/uima/examples/cpm/sofa/SofaCasConsumer.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/test/java/org/apache/uima/examples/cpm/sofa/SofaUnawareCasConsumer.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/test/java/org/apache/uima/pear/util/ComponentCategoryTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/java/org/apache/uima/json/JsonMetaDataObjectTest.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-test-util/src/main/java/org/apache/uima/test/junit_extension/JUnitExtension.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-test-util/src/main/java/org/apache/uima/test/junit_extension/UIMAResultPrinter.java
uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/test/java/org/apache/uima/tools/pear/merger/PearMergerTest.java
Modified: uima/uimaj/branches/experiment-v3-jcas/jcasgen-maven-plugin/src/test/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojoTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/jcasgen-maven-plugin/src/test/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojoTest.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/jcasgen-maven-plugin/src/test/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojoTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/jcasgen-maven-plugin/src/test/java/org/apache/uima/tools/jcasgen/maven/JCasGenMojoTest.java Tue Jan 17 16:27:16 2017
@@ -22,7 +22,7 @@ import java.io.File;
import java.util.ArrayList;
import java.util.List;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.maven.execution.DefaultMavenExecutionRequest;
import org.apache.maven.execution.MavenExecutionRequest;
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-adapter-vinci/src/test/java/org/apache/uima/adapter/vinci/VinciAnalysisEngineServiceAdapterTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-adapter-vinci/src/test/java/org/apache/uima/adapter/vinci/VinciAnalysisEngineServiceAdapterTest.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-adapter-vinci/src/test/java/org/apache/uima/adapter/vinci/VinciAnalysisEngineServiceAdapterTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-adapter-vinci/src/test/java/org/apache/uima/adapter/vinci/VinciAnalysisEngineServiceAdapterTest.java Tue Jan 17 16:27:16 2017
@@ -19,7 +19,7 @@
package org.apache.uima.adapter.vinci;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
import org.apache.uima.Constants;
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-component-test-util/src/main/java/org/apache/uima/test/junit_extension/AnnotatorPerformanceTester.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-component-test-util/src/main/java/org/apache/uima/test/junit_extension/AnnotatorPerformanceTester.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-component-test-util/src/main/java/org/apache/uima/test/junit_extension/AnnotatorPerformanceTester.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-component-test-util/src/main/java/org/apache/uima/test/junit_extension/AnnotatorPerformanceTester.java Tue Jan 17 16:27:16 2017
@@ -24,7 +24,7 @@ import java.io.FileFilter;
import java.util.HashMap;
import java.util.logging.LogManager;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.uima.UIMAFramework;
import org.apache.uima.analysis_engine.AnalysisEngine;
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-component-test-util/src/main/java/org/apache/uima/test/junit_extension/AnnotatorTester.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-component-test-util/src/main/java/org/apache/uima/test/junit_extension/AnnotatorTester.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-component-test-util/src/main/java/org/apache/uima/test/junit_extension/AnnotatorTester.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-component-test-util/src/main/java/org/apache/uima/test/junit_extension/AnnotatorTester.java Tue Jan 17 16:27:16 2017
@@ -25,8 +25,6 @@ import java.util.Map;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
-import junit.framework.Assert;
-
import org.apache.uima.UIMAFramework;
import org.apache.uima.analysis_engine.AnalysisEngine;
import org.apache.uima.analysis_engine.AnalysisEngineDescription;
@@ -45,6 +43,7 @@ import org.apache.uima.util.CasCreationU
import org.apache.uima.util.FileUtils;
import org.apache.uima.util.InvalidXMLException;
import org.apache.uima.util.XMLInputSource;
+import org.junit.Assert;
/**
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnnotatorContext_implTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnnotatorContext_implTest.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnnotatorContext_implTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnnotatorContext_implTest.java Tue Jan 17 16:27:16 2017
@@ -39,7 +39,7 @@ import org.apache.uima.resource.impl.Tes
import org.apache.uima.test.junit_extension.JUnitExtension;
import org.apache.uima.util.XMLInputSource;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_implTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_implTest.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_implTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/MultiprocessingAnalysisEngine_implTest.java Tue Jan 17 16:27:16 2017
@@ -50,7 +50,7 @@ import org.apache.uima.resource.metadata
import org.apache.uima.test.junit_extension.JUnitExtension;
import org.apache.uima.util.XMLInputSource;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/ResultSpecification_implTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/ResultSpecification_implTest.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/ResultSpecification_implTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/ResultSpecification_implTest.java Tue Jan 17 16:27:16 2017
@@ -40,7 +40,7 @@ import org.apache.uima.resource.metadata
import org.apache.uima.test.junit_extension.JUnitExtension;
import org.apache.uima.util.XMLInputSource;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/TaeDescription_implTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/TaeDescription_implTest.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/TaeDescription_implTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/TaeDescription_implTest.java Tue Jan 17 16:27:16 2017
@@ -66,7 +66,7 @@ import org.apache.uima.resource.metadata
import org.apache.uima.test.junit_extension.JUnitExtension;
import org.apache.uima.util.XMLInputSource;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
/**
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/TestAnnotator2.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/TestAnnotator2.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/TestAnnotator2.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/TestAnnotator2.java Tue Jan 17 16:27:16 2017
@@ -36,7 +36,7 @@ import org.apache.uima.resource.Resource
import org.apache.uima.util.Settings;
import org.apache.uima.util.UimaContextHolderTest;
-import junit.framework.Assert;
+import org.junit.Assert;
/**
* Annotator class used for testing.
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/metadata/SofaMapping_implTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/metadata/SofaMapping_implTest.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/metadata/SofaMapping_implTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/metadata/SofaMapping_implTest.java Tue Jan 17 16:27:16 2017
@@ -29,8 +29,8 @@ import org.apache.uima.UIMAFramework;
import org.apache.uima.analysis_engine.metadata.impl.SofaMapping_impl;
import org.apache.uima.test.junit_extension.JUnitExtension;
import org.apache.uima.util.XMLInputSource;
+import org.junit.Assert;
-import junit.framework.Assert;
import junit.framework.TestCase;
public class SofaMapping_implTest extends TestCase {
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/sequencer/SequencerCapabilityLanguageTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/sequencer/SequencerCapabilityLanguageTest.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/sequencer/SequencerCapabilityLanguageTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/sequencer/SequencerCapabilityLanguageTest.java Tue Jan 17 16:27:16 2017
@@ -30,7 +30,7 @@ import org.apache.uima.test.junit_extens
import org.apache.uima.test.junit_extension.JUnitExtension;
import org.apache.uima.util.XMLInputSource;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
/**
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/sequencer/SequencerFixedTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/sequencer/SequencerFixedTest.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/sequencer/SequencerFixedTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/sequencer/SequencerFixedTest.java Tue Jan 17 16:27:16 2017
@@ -31,7 +31,7 @@ import org.apache.uima.test.junit_extens
import org.apache.uima.test.junit_extension.JUnitExtension;
import org.apache.uima.util.XMLInputSource;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
/*
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasPoolTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasPoolTest.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasPoolTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasPoolTest.java Tue Jan 17 16:27:16 2017
@@ -42,7 +42,7 @@ import org.apache.uima.util.InvalidXMLEx
import org.apache.uima.util.XMLInputSource;
import org.apache.uima.util.XMLizable;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/TypeOrderTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/TypeOrderTest.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/TypeOrderTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas/test/TypeOrderTest.java Tue Jan 17 16:27:16 2017
@@ -47,7 +47,7 @@ import org.apache.uima.util.InvalidXMLEx
import org.apache.uima.util.XMLInputSource;
import org.apache.uima.util.XMLParser;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/CasComparer.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/CasComparer.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/CasComparer.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/CasComparer.java Tue Jan 17 16:27:16 2017
@@ -63,7 +63,7 @@ import org.apache.uima.jcas.cas.Sofa;
import org.apache.uima.jcas.cas.StringArray;
import org.apache.uima.jcas.cas.TOP;
-import junit.framework.Assert;
+import org.junit.Assert;
/**
* A CAS equality checker for JUnit.
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/CasDataToXCasTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/CasDataToXCasTest.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/CasDataToXCasTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/CasDataToXCasTest.java Tue Jan 17 16:27:16 2017
@@ -26,7 +26,7 @@ import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/XCasToCasDataSaxHandlerTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/XCasToCasDataSaxHandlerTest.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/XCasToCasDataSaxHandlerTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/XCasToCasDataSaxHandlerTest.java Tue Jan 17 16:27:16 2017
@@ -58,7 +58,7 @@ import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
/**
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/collection/impl/CasConsumerDescription_implTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/collection/impl/CasConsumerDescription_implTest.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/collection/impl/CasConsumerDescription_implTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/collection/impl/CasConsumerDescription_implTest.java Tue Jan 17 16:27:16 2017
@@ -61,7 +61,7 @@ import org.apache.uima.resource.metadata
import org.apache.uima.test.junit_extension.JUnitExtension;
import org.apache.uima.util.XMLInputSource;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
public class CasConsumerDescription_implTest extends TestCase {
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/collection/impl/CasInitializerDescription_implTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/collection/impl/CasInitializerDescription_implTest.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/collection/impl/CasInitializerDescription_implTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/collection/impl/CasInitializerDescription_implTest.java Tue Jan 17 16:27:16 2017
@@ -61,7 +61,7 @@ import org.apache.uima.resource.metadata
import org.apache.uima.test.junit_extension.JUnitExtension;
import org.apache.uima.util.XMLInputSource;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
public class CasInitializerDescription_implTest extends TestCase {
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/collection/impl/CollectionReaderDescription_implTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/collection/impl/CollectionReaderDescription_implTest.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/collection/impl/CollectionReaderDescription_implTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/collection/impl/CollectionReaderDescription_implTest.java Tue Jan 17 16:27:16 2017
@@ -61,7 +61,7 @@ import org.apache.uima.resource.metadata
import org.apache.uima.test.junit_extension.JUnitExtension;
import org.apache.uima.util.XMLInputSource;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
public class CollectionReaderDescription_implTest extends TestCase {
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/impl/SomeCustomResource.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/impl/SomeCustomResource.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/impl/SomeCustomResource.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/impl/SomeCustomResource.java Tue Jan 17 16:27:16 2017
@@ -27,7 +27,7 @@ import org.apache.uima.resource.Resource
import org.apache.uima.resource.ResourceSpecifier;
import org.apache.uima.resource.Resource_ImplBase;
-import junit.framework.Assert;
+import org.junit.Assert;
public class SomeCustomResource extends Resource_ImplBase {
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/impl/UimaContext_implTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/impl/UimaContext_implTest.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/impl/UimaContext_implTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/impl/UimaContext_implTest.java Tue Jan 17 16:27:16 2017
@@ -43,7 +43,7 @@ import org.apache.uima.resource.metadata
import org.apache.uima.test.junit_extension.JUnitExtension;
import org.apache.uima.util.XMLInputSource;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/internal/util/AnalysisEnginePoolTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/internal/util/AnalysisEnginePoolTest.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/internal/util/AnalysisEnginePoolTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/internal/util/AnalysisEnginePoolTest.java Tue Jan 17 16:27:16 2017
@@ -39,7 +39,7 @@ import org.apache.uima.resource.metadata
import org.apache.uima.resource.metadata.impl.NameValuePair_impl;
import org.apache.uima.test.junit_extension.JUnitExtension;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/internal/util/IntVectorTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/internal/util/IntVectorTest.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/internal/util/IntVectorTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/internal/util/IntVectorTest.java Tue Jan 17 16:27:16 2017
@@ -31,7 +31,7 @@ import org.apache.uima.resource.CasManag
import org.apache.uima.test.junit_extension.JUnitExtension;
import org.apache.uima.util.XMLInputSource;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/internal/util/ResourcePoolTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/internal/util/ResourcePoolTest.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/internal/util/ResourcePoolTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/internal/util/ResourcePoolTest.java Tue Jan 17 16:27:16 2017
@@ -28,7 +28,7 @@ import org.apache.uima.resource.metadata
import org.apache.uima.test.junit_extension.JUnitExtension;
import org.apache.uima.util.Level;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
/**
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/pear/util/ComponentCategoryTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/pear/util/ComponentCategoryTest.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/pear/util/ComponentCategoryTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/pear/util/ComponentCategoryTest.java Tue Jan 17 16:27:16 2017
@@ -24,7 +24,7 @@ import java.io.FileNotFoundException;
import org.apache.uima.test.junit_extension.JUnitExtension;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
/**
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/pear/util/PearEncodingTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/pear/util/PearEncodingTest.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/pear/util/PearEncodingTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/pear/util/PearEncodingTest.java Tue Jan 17 16:27:16 2017
@@ -23,7 +23,7 @@ import java.io.File;
import org.apache.uima.test.junit_extension.JUnitExtension;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
/**
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/pear/util/PearInstallerTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/pear/util/PearInstallerTest.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/pear/util/PearInstallerTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/pear/util/PearInstallerTest.java Tue Jan 17 16:27:16 2017
@@ -32,7 +32,7 @@ import org.apache.uima.resource.Resource
import org.apache.uima.test.junit_extension.JUnitExtension;
import org.apache.uima.util.XMLInputSource;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
/**
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/pear/util/TestPearInstallationVerification.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/pear/util/TestPearInstallationVerification.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/pear/util/TestPearInstallationVerification.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/pear/util/TestPearInstallationVerification.java Tue Jan 17 16:27:16 2017
@@ -27,7 +27,7 @@ import org.apache.uima.pear.tools.Packag
import org.apache.uima.pear.tools.PackageInstaller;
import org.apache.uima.test.junit_extension.JUnitExtension;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
/**
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/resource/ConfigurableResource_implTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/resource/ConfigurableResource_implTest.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/resource/ConfigurableResource_implTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/resource/ConfigurableResource_implTest.java Tue Jan 17 16:27:16 2017
@@ -34,7 +34,7 @@ import org.apache.uima.resource.metadata
import org.apache.uima.test.junit_extension.JUnitExtension;
import org.apache.uima.util.XMLInputSource;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/resource/impl/DataResource_implTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/resource/impl/DataResource_implTest.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/resource/impl/DataResource_implTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/resource/impl/DataResource_implTest.java Tue Jan 17 16:27:16 2017
@@ -29,7 +29,7 @@ import java.util.Collections;
import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.test.junit_extension.JUnitExtension;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
/**
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/resource/impl/FileLanguageResource_implTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/resource/impl/FileLanguageResource_implTest.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/resource/impl/FileLanguageResource_implTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/resource/impl/FileLanguageResource_implTest.java Tue Jan 17 16:27:16 2017
@@ -28,7 +28,7 @@ import org.apache.uima.resource.FileLang
import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.test.junit_extension.JUnitExtension;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
/**
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/resource/impl/PearSpecifier_implTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/resource/impl/PearSpecifier_implTest.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/resource/impl/PearSpecifier_implTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/resource/impl/PearSpecifier_implTest.java Tue Jan 17 16:27:16 2017
@@ -29,7 +29,7 @@ import org.apache.uima.resource.PearSpec
import org.apache.uima.test.junit_extension.JUnitExtension;
import org.apache.uima.util.XMLInputSource;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
/**
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/resource/impl/RelativePathResolver_implTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/resource/impl/RelativePathResolver_implTest.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/resource/impl/RelativePathResolver_implTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/resource/impl/RelativePathResolver_implTest.java Tue Jan 17 16:27:16 2017
@@ -24,7 +24,7 @@ import java.net.URL;
import org.apache.uima.test.junit_extension.JUnitExtension;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/resource/impl/ResourceManager_implTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/resource/impl/ResourceManager_implTest.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/resource/impl/ResourceManager_implTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/resource/impl/ResourceManager_implTest.java Tue Jan 17 16:27:16 2017
@@ -38,7 +38,7 @@ import org.apache.uima.resource.metadata
import org.apache.uima.test.junit_extension.JUnitExtension;
import org.apache.uima.util.XMLInputSource;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterDeclarations_implTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterDeclarations_implTest.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterDeclarations_implTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/ConfigurationParameterDeclarations_implTest.java Tue Jan 17 16:27:16 2017
@@ -29,7 +29,7 @@ import org.apache.uima.UIMAFramework;
import org.apache.uima.test.junit_extension.JUnitExtension;
import org.w3c.dom.Document;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/MetaDataObject_implTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/MetaDataObject_implTest.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/MetaDataObject_implTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/MetaDataObject_implTest.java Tue Jan 17 16:27:16 2017
@@ -40,7 +40,7 @@ import org.apache.uima.util.XMLParser;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
/**
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/resource/service/impl/ResourceServiceAdapter_implTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/resource/service/impl/ResourceServiceAdapter_implTest.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/resource/service/impl/ResourceServiceAdapter_implTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/resource/service/impl/ResourceServiceAdapter_implTest.java Tue Jan 17 16:27:16 2017
@@ -28,7 +28,7 @@ import org.apache.uima.resource.metadata
import org.apache.uima.resource.metadata.impl.ResourceMetaData_impl;
import org.apache.uima.test.junit_extension.JUnitExtension;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
/**
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/resource/service/impl/ResourceService_implTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/resource/service/impl/ResourceService_implTest.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/resource/service/impl/ResourceService_implTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/resource/service/impl/ResourceService_implTest.java Tue Jan 17 16:27:16 2017
@@ -26,7 +26,7 @@ import org.apache.uima.resource.metadata
import org.apache.uima.resource.metadata.impl.ConfigurationParameter_impl;
import org.apache.uima.test.junit_extension.JUnitExtension;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
/**
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/CasCreationUtilsTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/CasCreationUtilsTest.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/CasCreationUtilsTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/CasCreationUtilsTest.java Tue Jan 17 16:27:16 2017
@@ -52,7 +52,7 @@ import org.apache.uima.resource.metadata
import org.apache.uima.resource.metadata.impl.TypeSystemDescription_impl;
import org.apache.uima.test.junit_extension.JUnitExtension;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
public class CasCreationUtilsTest extends TestCase {
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/CasIOUtilsTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/CasIOUtilsTest.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/CasIOUtilsTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/CasIOUtilsTest.java Tue Jan 17 16:27:16 2017
@@ -42,7 +42,7 @@ import org.apache.uima.resource.metadata
import org.apache.uima.resource.metadata.impl.TypePriorities_impl;
import org.apache.uima.test.junit_extension.JUnitExtension;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
public class CasIOUtilsTest extends TestCase{
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/LevelTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/LevelTest.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/LevelTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/LevelTest.java Tue Jan 17 16:27:16 2017
@@ -19,7 +19,7 @@
package org.apache.uima.util;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
/**
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/impl/JSR47Logger_implTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/impl/JSR47Logger_implTest.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/impl/JSR47Logger_implTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/impl/JSR47Logger_implTest.java Tue Jan 17 16:27:16 2017
@@ -24,7 +24,7 @@ import java.util.logging.Logger;
import org.apache.uima.util.Level;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
/**
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/impl/Logger_implTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/impl/Logger_implTest.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/impl/Logger_implTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/impl/Logger_implTest.java Tue Jan 17 16:27:16 2017
@@ -21,7 +21,7 @@ package org.apache.uima.util.impl;
import org.apache.uima.util.Level;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
/**
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/impl/LoggingTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/impl/LoggingTest.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/impl/LoggingTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/impl/LoggingTest.java Tue Jan 17 16:27:16 2017
@@ -24,7 +24,7 @@ import org.apache.uima.test.junit_extens
import org.apache.uima.util.Level;
import org.apache.uima.util.Logger;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
/**
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/impl/ProcessTrace_implTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/impl/ProcessTrace_implTest.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/impl/ProcessTrace_implTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/impl/ProcessTrace_implTest.java Tue Jan 17 16:27:16 2017
@@ -24,7 +24,7 @@ import java.util.List;
import org.apache.uima.util.ProcessTrace;
import org.apache.uima.util.ProcessTraceEvent;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/impl/XMLParser_implTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/impl/XMLParser_implTest.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/impl/XMLParser_implTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/util/impl/XMLParser_implTest.java Tue Jan 17 16:27:16 2017
@@ -37,7 +37,7 @@ import org.apache.uima.util.XMLInputSour
import org.apache.uima.util.XMLParser;
import org.xml.sax.XMLReader;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
public class XMLParser_implTest extends TestCase {
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/test/java/org/apache/uima/analysis_engine/impl/SofaNamingInAggregateTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/test/java/org/apache/uima/analysis_engine/impl/SofaNamingInAggregateTest.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/test/java/org/apache/uima/analysis_engine/impl/SofaNamingInAggregateTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/test/java/org/apache/uima/analysis_engine/impl/SofaNamingInAggregateTest.java Tue Jan 17 16:27:16 2017
@@ -21,7 +21,7 @@ package org.apache.uima.analysis_engine.
import java.util.HashMap;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
import org.apache.uima.UIMAFramework;
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/CasHeapSizeTestCollectionReader.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/CasHeapSizeTestCollectionReader.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/CasHeapSizeTestCollectionReader.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/CasHeapSizeTestCollectionReader.java Tue Jan 17 16:27:16 2017
@@ -21,7 +21,7 @@ package org.apache.uima.collection.impl;
import java.io.IOException;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.uima.cas.CAS;
import org.apache.uima.cas.impl.CasTestUtil;
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/TestCasMultiplier.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/TestCasMultiplier.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/TestCasMultiplier.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/TestCasMultiplier.java Tue Jan 17 16:27:16 2017
@@ -18,7 +18,7 @@
*/
package org.apache.uima.collection.impl;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.uima.analysis_component.CasMultiplier_ImplBase;
import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CasPoolTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CasPoolTest.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CasPoolTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CasPoolTest.java Tue Jan 17 16:27:16 2017
@@ -19,7 +19,7 @@
package org.apache.uima.collection.impl.cpm;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
import org.apache.uima.UIMAFramework;
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpeImportTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpeImportTest.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpeImportTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpeImportTest.java Tue Jan 17 16:27:16 2017
@@ -21,7 +21,7 @@ package org.apache.uima.collection.impl.
import java.io.File;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
import org.apache.uima.UIMAFramework;
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpmProcessingTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpmProcessingTest.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpmProcessingTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/CpmProcessingTest.java Tue Jan 17 16:27:16 2017
@@ -19,7 +19,7 @@
package org.apache.uima.collection.impl.cpm;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
import org.apache.uima.UIMAFramework;
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/PearCasPoolTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/PearCasPoolTest.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/PearCasPoolTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/test/java/org/apache/uima/collection/impl/cpm/PearCasPoolTest.java Tue Jan 17 16:27:16 2017
@@ -22,7 +22,7 @@ package org.apache.uima.collection.impl.
import java.io.File;
import java.io.FileNotFoundException;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
import org.apache.uima.UIMAFramework;
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/test/java/org/apache/uima/examples/cpm/sofa/SofaCasConsumer.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/test/java/org/apache/uima/examples/cpm/sofa/SofaCasConsumer.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/test/java/org/apache/uima/examples/cpm/sofa/SofaCasConsumer.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/test/java/org/apache/uima/examples/cpm/sofa/SofaCasConsumer.java Tue Jan 17 16:27:16 2017
@@ -19,7 +19,7 @@
package org.apache.uima.examples.cpm.sofa;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.uima.cas.CAS;
import org.apache.uima.cas.FSIndex;
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/test/java/org/apache/uima/examples/cpm/sofa/SofaUnawareCasConsumer.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/test/java/org/apache/uima/examples/cpm/sofa/SofaUnawareCasConsumer.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/test/java/org/apache/uima/examples/cpm/sofa/SofaUnawareCasConsumer.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/test/java/org/apache/uima/examples/cpm/sofa/SofaUnawareCasConsumer.java Tue Jan 17 16:27:16 2017
@@ -19,7 +19,7 @@
package org.apache.uima.examples.cpm.sofa;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.uima.cas.CAS;
import org.apache.uima.cas.FSIndex;
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/test/java/org/apache/uima/pear/util/ComponentCategoryTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/test/java/org/apache/uima/pear/util/ComponentCategoryTest.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/test/java/org/apache/uima/pear/util/ComponentCategoryTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-cpe/src/test/java/org/apache/uima/pear/util/ComponentCategoryTest.java Tue Jan 17 16:27:16 2017
@@ -22,7 +22,7 @@ package org.apache.uima.pear.util;
import java.io.File;
import java.io.FileNotFoundException;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
import org.apache.uima.test.junit_extension.JUnitExtension;
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/java/org/apache/uima/json/JsonMetaDataObjectTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/java/org/apache/uima/json/JsonMetaDataObjectTest.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/java/org/apache/uima/json/JsonMetaDataObjectTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-json/src/test/java/org/apache/uima/json/JsonMetaDataObjectTest.java Tue Jan 17 16:27:16 2017
@@ -24,7 +24,7 @@ import java.io.IOException;
import java.io.StringWriter;
import java.io.Writer;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
import org.apache.uima.UIMAFramework;
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-test-util/src/main/java/org/apache/uima/test/junit_extension/JUnitExtension.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-test-util/src/main/java/org/apache/uima/test/junit_extension/JUnitExtension.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-test-util/src/main/java/org/apache/uima/test/junit_extension/JUnitExtension.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-test-util/src/main/java/org/apache/uima/test/junit_extension/JUnitExtension.java Tue Jan 17 16:27:16 2017
@@ -24,7 +24,7 @@ import java.io.UnsupportedEncodingExcept
import java.net.URL;
import java.net.URLDecoder;
-import junit.framework.Assert;
+import org.junit.Assert;
/**
* Contains static convenience methods for using the UIMA JUnit extensions.
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-test-util/src/main/java/org/apache/uima/test/junit_extension/UIMAResultPrinter.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-test-util/src/main/java/org/apache/uima/test/junit_extension/UIMAResultPrinter.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-test-util/src/main/java/org/apache/uima/test/junit_extension/UIMAResultPrinter.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-test-util/src/main/java/org/apache/uima/test/junit_extension/UIMAResultPrinter.java Tue Jan 17 16:27:16 2017
@@ -187,7 +187,7 @@ public class UIMAResultPrinter extends R
}
/**
- * @see junit.framework.TestListener#addFailure(Test, AssertionFailedError)
+ * @see org.junit.TestListener#addFailure(Test, AssertionFailedError)
*/
public void addFailure(Test test, AssertionFailedError t) {
getWriter().print("failure");
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/test/java/org/apache/uima/tools/pear/merger/PearMergerTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/test/java/org/apache/uima/tools/pear/merger/PearMergerTest.java?rev=1779208&r1=1779207&r2=1779208&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/test/java/org/apache/uima/tools/pear/merger/PearMergerTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-tools/src/test/java/org/apache/uima/tools/pear/merger/PearMergerTest.java Tue Jan 17 16:27:16 2017
@@ -22,7 +22,7 @@ package org.apache.uima.tools.pear.merge
import java.io.File;
import java.io.FileNotFoundException;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
import org.apache.uima.UIMAFramework;