svn commit: r1400723 - in /incubator/ctakes/trunk/ctakes-preprocessor: ./ src/test/java/org/ src/test/java/org/apache/ src/test/java/org/apache/ctakes/ src/test/java/org/apache/ctakes/preprocessor/ src/test/java/preprocessor/ src/test/resources/

[br...@apache.org]

Author: brittfitch
Date: Sun Oct 21 20:53:38 2012
New Revision: 1400723

URL: http://svn.apache.org/viewvc?rev=1400723&view=rev
Log:
moved test case to full o.a.c directory to match package declaration. formerly in directory "preprocessor". updated setUp method to locate input files. moved test resources to src/test/resources. added test directories to classpath

Added:
    incubator/ctakes/trunk/ctakes-preprocessor/src/test/java/org/
    incubator/ctakes/trunk/ctakes-preprocessor/src/test/java/org/apache/
    incubator/ctakes/trunk/ctakes-preprocessor/src/test/java/org/apache/ctakes/
    incubator/ctakes/trunk/ctakes-preprocessor/src/test/java/org/apache/ctakes/preprocessor/
    incubator/ctakes/trunk/ctakes-preprocessor/src/test/java/org/apache/ctakes/preprocessor/ClinicalNotePreProcessorTest.java
      - copied, changed from r1400716, incubator/ctakes/trunk/ctakes-preprocessor/src/test/java/preprocessor/ClinicalNotePreProcessorTest.java
    incubator/ctakes/trunk/ctakes-preprocessor/src/test/resources/
    incubator/ctakes/trunk/ctakes-preprocessor/src/test/resources/NotesIIST_RTF.DTD
      - copied unchanged from r1400473, incubator/ctakes/trunk/ctakes-preprocessor/src/test/data/output/NotesIIST_RTF.DTD
    incubator/ctakes/trunk/ctakes-preprocessor/src/test/resources/testpatient_cn_1.xml
      - copied unchanged from r1400473, incubator/ctakes/trunk/ctakes-preprocessor/src/test/data/testpatient_cn_1.xml
Removed:
    incubator/ctakes/trunk/ctakes-preprocessor/src/test/java/preprocessor/ClinicalNotePreProcessorTest.java
Modified:
    incubator/ctakes/trunk/ctakes-preprocessor/.classpath

Modified: incubator/ctakes/trunk/ctakes-preprocessor/.classpath
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-preprocessor/.classpath?rev=1400723&r1=1400722&r2=1400723&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-preprocessor/.classpath (original)
+++ incubator/ctakes/trunk/ctakes-preprocessor/.classpath Sun Oct 21 20:53:38 2012
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
 	<classpathentry excluding="**" kind="src" output="target/classes" path="resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>

Copied: incubator/ctakes/trunk/ctakes-preprocessor/src/test/java/org/apache/ctakes/preprocessor/ClinicalNotePreProcessorTest.java (from r1400716, incubator/ctakes/trunk/ctakes-preprocessor/src/test/java/preprocessor/ClinicalNotePreProcessorTest.java)
URL: http://svn.apache.org/viewvc/incubator/ctakes/trunk/ctakes-preprocessor/src/test/java/org/apache/ctakes/preprocessor/ClinicalNotePreProcessorTest.java?p2=incubator/ctakes/trunk/ctakes-preprocessor/src/test/java/org/apache/ctakes/preprocessor/ClinicalNotePreProcessorTest.java&p1=incubator/ctakes/trunk/ctakes-preprocessor/src/test/java/preprocessor/ClinicalNotePreProcessorTest.java&r1=1400716&r2=1400723&rev=1400723&view=diff
==============================================================================
--- incubator/ctakes/trunk/ctakes-preprocessor/src/test/java/preprocessor/ClinicalNotePreProcessorTest.java (original)
+++ incubator/ctakes/trunk/ctakes-preprocessor/src/test/java/org/apache/ctakes/preprocessor/ClinicalNotePreProcessorTest.java Sun Oct 21 20:53:38 2012
@@ -25,6 +25,7 @@ import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
+import java.net.URL;
 import java.net.URLDecoder;
 import java.util.Map;
 
@@ -61,14 +62,12 @@ public class ClinicalNotePreProcessorTes
     {
         super.setUp();
 
-        String dtdLocation = "resources/cda/NotesIIST_RTF.DTD";
+        String dtdLocation = "src/test/resources/NotesIIST_RTF.DTD";
         File dtd = new File(dtdLocation);
         iv_cnotePreProcessor = new ClinicalNotePreProcessor(dtd, false);
 
-		//String cnoteLocationOnCp = "/test/data/testpatient_cn_1.xml";
-		String cnoteLocationOnCp = "../../../../../data/testpatient_cn_1.xml";
-        String cnoteLocation =
-            URLDecoder.decode(getClass().getResource(cnoteLocationOnCp).getPath());
+        String cnoteLocationOnCp = "src/test/resources/testpatient_cn_1.xml";
+        String cnoteLocation = new File(cnoteLocationOnCp).getPath();
         
         if (cnoteLocation == null) {
         	throw new FileNotFoundException("Unable to find: " + cnoteLocationOnCp);