[gate-cvs] SF.net SVN: gate:[17933] gate/trunk/src/test/gate

[markagreenwood]

Revision: 17933
          http://sourceforge.net/p/gate/code/17933
Author:   markagreenwood
Date:     2014-05-08 18:09:40 +0000 (Thu, 08 May 2014)
Log Message:
-----------
all the jape functional tests now pass so I'm turning them on

Modified Paths:
--------------
    gate/trunk/src/test/gate/TestGate.java
    gate/trunk/src/test/gate/jape/functest/BaseJapeTests.java
    gate/trunk/src/test/gate/jape/functest/TestConstraints.java

Modified: gate/trunk/src/test/gate/TestGate.java
===================================================================
--- gate/trunk/src/test/gate/TestGate.java      2014-05-08 14:25:54 UTC (rev 
17932)
+++ gate/trunk/src/test/gate/TestGate.java      2014-05-08 18:09:40 UTC (rev 
17933)
@@ -171,7 +171,7 @@
         suite.addTest(TestJape.suite());
         
         //TODO fix these tests so that they work properly
-        //suite.addTest(TestConstraints.suite());
+        suite.addTest(TestConstraints.suite());
         
         suite.addTest(TestTemplate.suite());
         suite.addTest(TestDocument.suite());
@@ -183,16 +183,12 @@
         suite.addTest(TestDiffer.suite());
         suite.addTest(TestAnnotationMerging.suite());
         suite.addTest(TestClassificationMeasures.suite());
-//no longer needed as replaced by testPR
-//        suite.addTest(TestTokeniser.suite());
         suite.addTest(TestGazetteer.suite());
-//        suite.addTest(TestSplitterTagger.suite());
         suite.addTest(TestFeatureMap.suite());
         suite.addTest(TestTools.suite());
         suite.addTest(TestCreoleAnnotationHandler.suite());
         suite.addTest(TestPR.suite());
         suite.addTest(TestMorph.suite());
-        // suite.addTest(TestMaxentWrapper.suite());
 
         //test ontotext gazetteer
         suite.addTest(TestHashGazetteer.suite());

Modified: gate/trunk/src/test/gate/jape/functest/BaseJapeTests.java
===================================================================
--- gate/trunk/src/test/gate/jape/functest/BaseJapeTests.java   2014-05-08 
14:25:54 UTC (rev 17932)
+++ gate/trunk/src/test/gate/jape/functest/BaseJapeTests.java   2014-05-08 
18:09:40 UTC (rev 17933)
@@ -243,7 +243,6 @@
        if (ac != null)
            ac.annotate(doc);
        Set<Annotation> orderedResults = runTransducer(doc, japeResourcePath, 
ontologyURL);
-       //DocumentStaxUtils.writeDocument(doc, new 
File("/home/mark/test"+(count++)+".xml"));
        return orderedResults;
     }
 

Modified: gate/trunk/src/test/gate/jape/functest/TestConstraints.java
===================================================================
--- gate/trunk/src/test/gate/jape/functest/TestConstraints.java 2014-05-08 
14:25:54 UTC (rev 17932)
+++ gate/trunk/src/test/gate/jape/functest/TestConstraints.java 2014-05-08 
18:09:40 UTC (rev 17933)
@@ -679,8 +679,8 @@
     final String docFilePath = "/jape/test/docfiles/Req-GATETao-8.1.5.txt";
     
     String[] expectedResults = {"PersonJobTitle1", "PersonJobTitle2"};
-    int[] expectedStartOffsets = {6, 13};
-    int[] expectedEndOffsets = {12, 21};
+    int[] expectedStartOffsets = {5, 12};
+    int[] expectedEndOffsets = {11, 20};
     
     doCommonTest(japeFilePath, docFilePath, expectedResults, 
expectedStartOffsets, expectedEndOffsets, annoCreator815MultipleActions);
   
@@ -698,8 +698,8 @@
     final String docFilePath = "/jape/test/docfiles/Req-GATETao-8.1.5.txt";
     
     String[] expectedResults = {"PersonJobTitle1", "PersonJobTitle2"};
-    int[] expectedStartOffsets = {36, 36};
-    int[] expectedEndOffsets = {50, 59};
+    int[] expectedStartOffsets = {5, 5};
+    int[] expectedEndOffsets = {11, 20};
     
     doCommonTest(japeFilePath, docFilePath, expectedResults, 
expectedStartOffsets, expectedEndOffsets, annoCreator815MultipleActions);
   }
@@ -1187,15 +1187,15 @@
   @Override
   public AnnotationSet createAnnots(Document doc) throws 
InvalidOffsetException {
     final String tp = "TempPerson";
-    add(1, 5, tp);
+    add(0, 4, tp);
     
     FeatureMap feats = Factory.newFeatureMap();
     feats.put("majorType", "jobtitle");
-    add(6,12, "Lookup", feats);
-    add(13, 21, tp);
+    add(5,11, "Lookup", feats);
+    add(12, 20, tp);
     
-    add(36, 50, "Lookup", feats);
-    add(36, 59, tp);
+    add(35, 49, "Lookup", feats);
+    add(35, 58, tp);
     
     return as;
   }

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
Is your legacy SCM system holding you back? Join Perforce May 7 to find out:
&#149; 3 signs your SCM is hindering your productivity
&#149; Requirements for releasing software faster
&#149; Expert tips and advice for migrating your SCM now
http://p.sf.net/sfu/perforce
_______________________________________________
GATE-cvs mailing list
GATE-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gate-cvs