svn commit: r1815870 - in /ctakes/trunk: ctakes-core/src/test/java/org/apache/ctakes/core/ae/ ctakes-preprocessor/src/test/java/org/apache/ctakes/preprocessor/ ctakes-ytex/src/test/java/org/apache/ctakes/jdl/

[al...@apache.org]

Author: alexz
Date: Mon Nov 20 23:35:34 2017
New Revision: 1815870

URL: http://svn.apache.org/viewvc?rev=1815870&view=rev
Log:
CTAKES-465: fix usage of deprecated junit.framework

Removed:
    ctakes/trunk/ctakes-ytex/src/test/java/org/apache/ctakes/jdl/AppTest.java
Modified:
    ctakes/trunk/ctakes-core/src/test/java/org/apache/ctakes/core/ae/TestCDASegmentAnnotator.java
    ctakes/trunk/ctakes-preprocessor/src/test/java/org/apache/ctakes/preprocessor/ClinicalNotePreProcessorTest.java

Modified: ctakes/trunk/ctakes-core/src/test/java/org/apache/ctakes/core/ae/TestCDASegmentAnnotator.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-core/src/test/java/org/apache/ctakes/core/ae/TestCDASegmentAnnotator.java?rev=1815870&r1=1815869&r2=1815870&view=diff
==============================================================================
--- ctakes/trunk/ctakes-core/src/test/java/org/apache/ctakes/core/ae/TestCDASegmentAnnotator.java (original)
+++ ctakes/trunk/ctakes-core/src/test/java/org/apache/ctakes/core/ae/TestCDASegmentAnnotator.java Mon Nov 20 23:35:34 2017
@@ -18,8 +18,6 @@
  */
 package org.apache.ctakes.core.ae;
 
-import junit.framework.Assert;
-
 import org.apache.ctakes.typesystem.type.textspan.Segment;
 import org.apache.uima.analysis_engine.AnalysisEngineDescription;
 import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
@@ -35,6 +33,8 @@ import org.apache.uima.resource.metadata
 import org.cleartk.util.cr.FilesCollectionReader;
 import org.junit.Test;
 
+import static org.junit.Assert.assertEquals;
+
 public class TestCDASegmentAnnotator {
 
 	public static String INPUT_FILE = "../ctakes-regression-test/testdata/input/plaintext/doc2_07543210_sample_current.txt";
@@ -73,9 +73,10 @@ public class TestCDASegmentAnnotator {
 				}
 			}
 		}
-		Assert.assertEquals(section_exists, true);
-		Assert.assertEquals(expected_begin, section_begin);
-		Assert.assertEquals(expected_end, section_end);
+
+		assertEquals(section_exists, true);
+		assertEquals(expected_begin, section_begin);
+		assertEquals("", expected_end, section_end);
 	}
 
 	public static class DumpOutputAE extends JCasAnnotator_ImplBase {

Modified: ctakes/trunk/ctakes-preprocessor/src/test/java/org/apache/ctakes/preprocessor/ClinicalNotePreProcessorTest.java
URL: http://svn.apache.org/viewvc/ctakes/trunk/ctakes-preprocessor/src/test/java/org/apache/ctakes/preprocessor/ClinicalNotePreProcessorTest.java?rev=1815870&r1=1815869&r2=1815870&view=diff
==============================================================================
--- ctakes/trunk/ctakes-preprocessor/src/test/java/org/apache/ctakes/preprocessor/ClinicalNotePreProcessorTest.java (original)
+++ ctakes/trunk/ctakes-preprocessor/src/test/java/org/apache/ctakes/preprocessor/ClinicalNotePreProcessorTest.java Mon Nov 20 23:35:34 2017
@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
+
 package org.apache.ctakes.preprocessor;
 
 import java.io.BufferedReader;
@@ -32,8 +32,12 @@ import java.util.Map;
 import org.apache.ctakes.core.resource.FileLocator;
 import org.apache.ctakes.preprocessor.ClinicalNotePreProcessor;
 import org.apache.ctakes.preprocessor.DocumentMetaData;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
 
 /**
  * Unit tests for the ClinicalNotePreProcessor class.  These test the class
@@ -42,27 +46,14 @@ import junit.framework.TestCase;
  * 
  * @author Mayo Clinic
  */
-public class ClinicalNotePreProcessorTest extends TestCase
+public class ClinicalNotePreProcessorTest
 {
     private ClinicalNotePreProcessor iv_cnotePreProcessor;
     private String iv_cnoteXML;
 
-    /**
-     * Constructor for ClinicalNotePreProcessorTest.
-     * @param arg0
-     */
-    public ClinicalNotePreProcessorTest(String arg0)
-    {
-        super(arg0);
-    }
-
-    /*
-     * @see TestCase#setUp()
-     */
-    protected void setUp() throws Exception
+    @Before
+    public void setUp() throws Exception
     {
-        super.setUp();
-
         String dtdLocation = "src/test/resources/NotesIIST_RTF.DTD";
         iv_cnotePreProcessor = new ClinicalNotePreProcessor(FileLocator.getAsStream(dtdLocation), false);
 
@@ -75,17 +66,10 @@ public class ClinicalNotePreProcessorTes
         iv_cnoteXML = load(cnoteLocation);
     }
 
-    /*
-     * @see TestCase#tearDown()
-     */
-    protected void tearDown() throws Exception
-    {
-        super.tearDown();
-    }
-
     /**
      * Tests the process method.
      */
+    @Test
     public void testProcess()
     {
         try