Revision: 17932
          http://sourceforge.net/p/gate/code/17932
Author:   markagreenwood
Date:     2014-05-08 14:25:54 +0000 (Thu, 08 May 2014)
Log Message:
-----------
all but one of the tests now pass

Modified Paths:
--------------
    gate/trunk/src/test/gate/jape/functest/BaseJapeTests.java
    gate/trunk/src/test/gate/jape/functest/TestConstraints.java
    
gate/trunk/src/test/gate/resources/jape/test/japefiles/Req-GATETao-8.1.2-Negatives.jape
    
gate/trunk/src/test/gate/resources/jape/test/japefiles/Req-GATETao-8.1.3-LHSOP_contains.jape
    
gate/trunk/src/test/gate/resources/jape/test/japefiles/Req-GATETao-8.1.3-LHSOP_within.jape
    
gate/trunk/src/test/gate/resources/jape/test/japefiles/Req-GATETao-8.1.3-op-ge-int-negative.jape

Modified: gate/trunk/src/test/gate/jape/functest/BaseJapeTests.java
===================================================================
--- gate/trunk/src/test/gate/jape/functest/BaseJapeTests.java   2014-05-08 
12:46:13 UTC (rev 17931)
+++ gate/trunk/src/test/gate/jape/functest/BaseJapeTests.java   2014-05-08 
14:25:54 UTC (rev 17932)
@@ -22,6 +22,7 @@
 import gate.FeatureMap;
 import gate.Gate;
 import gate.Resource;
+import gate.corpora.DocumentStaxUtils;
 import gate.creole.AbstractLanguageAnalyser;
 import gate.creole.ExecutionException;
 import gate.creole.ResourceInstantiationException;
@@ -67,8 +68,11 @@
     protected static void setUpGate() {
        if (Gate.isInitialised()) {
            logger.warn("GATE already intialized and set up for JAPE Transducer 
tests.");
-           return;
+           
        }
+       else {
+         
+       
 
        Properties logConfProps = new Properties();
        InputStream logConfStream = 
BaseJapeTests.class.getResourceAsStream("log4j-test.properties");
@@ -99,6 +103,8 @@
            logger.fatal(errMsg);
            throw new RuntimeException(errMsg);
        }
+       
+       }
 
        /** CHANGE THIS if JAPE Transducer need more plug-ins */
        final File[] plugInsToLoad = { new File(Gate.getPluginsHome(), 
"Ontology") };
@@ -133,17 +139,14 @@
        }
     }
 
-    private static Resource createOntology(String ontologyURL) throws 
MalformedURLException {
+    private static Resource createOntology(String ontologyURL) throws 
MalformedURLException, ResourceInstantiationException {
        FeatureMap params = Factory.newFeatureMap();
        params.put("rdfXmlURL", new URL(ontologyURL)); //TODO: FeatureMap keys 
should be defined as constants somewhere
        params.put("loadImports", true);
        final String ontologyClass = 
"gate.creole.ontology.impl.sesame.OWLIMOntology";
        Resource ontology = null;
-       try {
            ontology = Factory.createResource(ontologyClass, params);
-       } catch (ResourceInstantiationException rie) {
-           assert false : "Cannot instantiate ontology class: " + 
ontologyClass;
-       }
+
        return ontology;
     }
 
@@ -194,15 +197,25 @@
        final String outputAsName = "Output";
        params.put("outputASName", outputAsName);
 
-       if (ontologyURL != null) {
-           Resource ontology = createOntology(ontologyURL);
-           params.put("ontology", ontology);
-       }
+       
 
        AbstractLanguageAnalyser transducer = (AbstractLanguageAnalyser) 
Factory.createResource(
                transducerType.getFqdnClass(), params);
+       
+       Resource ontology = null;
+       
+       if (ontologyURL != null) {
+    ontology = createOntology(ontologyURL);
+    transducer.setParameterValue("ontology", ontology);
+       }
+       
        transducer.setDocument(doc);
        transducer.execute();
+       
+       if (ontology != null) {
+         transducer.setParameterValue("ontology", null);
+         Factory.deleteResource(ontology);       
+       }
 
        Set<Annotation> orderedResults = new TreeSet<Annotation>(new 
OffsetComparator());
        orderedResults.addAll(doc.getAnnotations(outputAsName));
@@ -215,18 +228,22 @@
 
        Document doc = 
Factory.newDocument(Files.getGateResourceAsString(docResourcePath));
        return doTest(doc, japeResourcePath, ac, ontologyURL);
+       
     }
 
     protected Set<Annotation> doTest(String docResourcePath, String 
japeResourcePath, AnnotationCreator ac)
            throws Exception {
        return doTest(docResourcePath, japeResourcePath, ac, null);
     }
+    
+    protected static int count=0;
 
     protected Set<Annotation> doTest(Document doc, String japeResourcePath, 
AnnotationCreator ac,
            String ontologyURL) throws Exception {
        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;
     }
 
@@ -237,7 +254,7 @@
     protected static void compareResults(String[] expectedResults, 
Set<Annotation> actualResults) {
        int i = 0;
 
-       assertEquals("Number of the expected and transducet annotations must be 
equal.",
+       assertEquals("Number of the expected and transduced annotations must be 
equal.",
                expectedResults.length, actualResults.size());
 
        for (Annotation annot : actualResults) {

Modified: gate/trunk/src/test/gate/jape/functest/TestConstraints.java
===================================================================
--- gate/trunk/src/test/gate/jape/functest/TestConstraints.java 2014-05-08 
12:46:13 UTC (rev 17931)
+++ gate/trunk/src/test/gate/jape/functest/TestConstraints.java 2014-05-08 
14:25:54 UTC (rev 17932)
@@ -21,6 +21,7 @@
 import gate.Factory;
 import gate.FeatureMap;
 import gate.Gate;
+import gate.corpora.TestDocument;
 import gate.jape.Transducer;
 import gate.jape.parser.ParseCpsl;
 import gate.jape.parser.ParseException;
@@ -67,8 +68,8 @@
 
     String[] expectedResults = {"SimpleText", "ComplexText", "ComplexText",
         "ComplexText", "ComplexText"};
-    int[] expectedStartOffsets = {1, 4, 11, 26, 43};
-    int[] expectedEndOffsets = {3, 11, 15, 32, 47};
+    int[] expectedStartOffsets = {0, 3, 10, 25, 42};
+    int[] expectedEndOffsets = {2, 10, 14, 31, 46};
 
     AnnotationCreator annocreator = new BaseAnnotationCreator() {
       @Override
@@ -76,47 +77,47 @@
               throws InvalidOffsetException {
         FeatureMap feat = Factory.newFeatureMap();
         feat.put("string", "of");
-        add(1, 3, "Token", feat);
+        add(0, 2, "Token", feat);
 
         feat = Factory.newFeatureMap();
         feat.put("string", "http");
-        add(4, 8, "Token", feat);
+        add(3, 7, "Token", feat);
         feat = Factory.newFeatureMap();
         feat.put("string", ":");
+        add(7, 8, "Token", feat);
+        feat = Factory.newFeatureMap();
+        feat.put("string", "/");
         add(8, 9, "Token", feat);
         feat = Factory.newFeatureMap();
         feat.put("string", "/");
         add(9, 10, "Token", feat);
         feat = Factory.newFeatureMap();
-        feat.put("string", "/");
-        add(10, 11, "Token", feat);
-        feat = Factory.newFeatureMap();
         feat.put("string", "www");
-        add(11, 14, "Token", feat);
+        add(10, 13, "Token", feat);
         feat = Factory.newFeatureMap();
         feat.put("string", ".");
-        add(14, 15, "Token", feat);
+        add(13, 14, "Token", feat);
 
         feat = Factory.newFeatureMap();
         feat.put("string", "ftp");
-        add(26, 29, "Token", feat);
+        add(25, 28, "Token", feat);
         feat = Factory.newFeatureMap();
         feat.put("string", ":");
+        add(28, 29, "Token", feat);
+        feat = Factory.newFeatureMap();
+        feat.put("string", "/");
         add(29, 30, "Token", feat);
         feat = Factory.newFeatureMap();
         feat.put("string", "/");
         add(30, 31, "Token", feat);
         feat = Factory.newFeatureMap();
-        feat.put("string", "/");
-        add(31, 32, "Token", feat);
-        feat = Factory.newFeatureMap();
 
         feat = Factory.newFeatureMap();
         feat.put("string", "www");
-        add(37, 42, "Token", feat);
+        add(42, 45, "Token", feat);
         feat = Factory.newFeatureMap();
         feat.put("string", ".");
-        add(42, 43, "Token", feat);
+        add(45, 46, "Token", feat);
         return as;
       }
     };
@@ -148,8 +149,8 @@
     final String docFilePath = "/jape/test/docfiles/Req-GATETao-8.1.2.txt";
 
     String[] expectedResults = {"SimpleAnnotation", "SimpleAnnotation"};
-    int[] expectedStartOffsets = {1, 101};
-    int[] expectedEndOffsets = {53, 137};
+    int[] expectedStartOffsets = {0, 100};
+    int[] expectedEndOffsets = {52, 136};
 
     doCommonTest(japeFilePath, docFilePath, expectedResults, 
expectedStartOffsets, expectedEndOffsets, annoCreator81LocOrgDateJob);
   }
@@ -176,12 +177,12 @@
    * @throws Exception
    */
   public void test812MatchNegativeAnnotations() throws Exception {
-    final String japeFilePath = "/jape/test/japefiles/Req-GATETao-8.1.2.jape";
+    final String japeFilePath = 
"/jape/test/japefiles/Req-GATETao-8.1.2-Negatives.jape";
     final String docFilePath = "/jape/test/docfiles/Req-GATETao-8.1.2.txt";
 
-    String[] expectedResults = {"NegativeAnnotation", "NegativeAnnotation", 
"NegativeAnnotation"};
-    int[] expectedStartOffsets = {16, 69, 111};
-    int[] expectedEndOffsets = {53, 100, 137};
+    String[] expectedResults = {"NegativeAnnotation", "NegativeAnnotation", 
"NegativeAnnotation","NegativeAnnotation", "NegativeAnnotation", 
"NegativeAnnotation","NegativeAnnotation", "NegativeAnnotation", 
"NegativeAnnotation"};
+    int[] expectedStartOffsets = {15, 24, 35, 68, 77, 88, 110, 115, 126};
+    int[] expectedEndOffsets = {23, 34, 52, 76, 87, 99, 114, 125, 136};
 
     doCommonTest(japeFilePath, docFilePath, expectedResults, 
expectedStartOffsets, expectedEndOffsets, annoCreator81LocOrgDateJob);
   }
@@ -199,8 +200,8 @@
     final String docFilePath = "/jape/test/docfiles/Req-GATETao-8.1.2.txt";
 
     String[] expectedResults = {"OpContains", "OpContains", "OpContains"};
-    int[] expectedStartOffsets = {1, 54, 101};
-    int[] expectedEndOffsets = {15, 68, 110};
+    int[] expectedStartOffsets = {0, 53, 100};
+    int[] expectedEndOffsets = {14, 67, 109};
 
     doCommonTest(japeFilePath, docFilePath, expectedResults, 
expectedStartOffsets, expectedEndOffsets, annoCreator81LocOrgDateJob);
   }
@@ -218,9 +219,9 @@
     final String japeFilePath = 
"/jape/test/japefiles/Req-GATETao-8.1.3-LHSOP_within.jape";
     final String docFilePath = "/jape/test/docfiles/Req-GATETao-8.1.2.txt";
 
-    String[] expectedResults = {"OpWithin", "OpWithin", "OpWithin", 
"OpWithin", "OpWithin", "OpWithin"};
-    int[] expectedStartOffsets = {1, 7, 54, 60, 101, 108};
-    int[] expectedEndOffsets = {6, 15, 59, 68, 107, 110};
+    String[] expectedResults = {"OpWithin", "OpWithin", "OpWithin"};
+    int[] expectedStartOffsets = {0, 53, 100};
+    int[] expectedEndOffsets = {14, 67, 109};
 
     doCommonTest(japeFilePath, docFilePath, expectedResults, 
expectedStartOffsets, expectedEndOffsets, annoCreator81LocOrgDateJob);
   }
@@ -257,8 +258,8 @@
     final String docFilePath = "/jape/test/docfiles/Req-GATETao-8.1.3.txt";
     
     String[] expectedResults = {"OpEquals"};
-    int[] expectedStartOffsets = {6};
-    int[] expectedEndOffsets = {13};
+    int[] expectedStartOffsets = {5};
+    int[] expectedEndOffsets = {12};
 
     doCommonTest(japeFilePath, docFilePath, expectedResults, 
expectedStartOffsets, expectedEndOffsets, annoCreator813Operators);
   }
@@ -329,8 +330,8 @@
     final String docFilePath = "/jape/test/docfiles/Req-GATETao-8.1.3.txt";
     
     String[] expectedResults = {"OpEquals"};
-    int[] expectedStartOffsets = {14};
-    int[] expectedEndOffsets = {17};
+    int[] expectedStartOffsets = {13};
+    int[] expectedEndOffsets = {16};
   
     doCommonTest(japeFilePath, docFilePath, expectedResults, 
expectedStartOffsets, expectedEndOffsets, annoCreator813Operators);
   }
@@ -348,8 +349,8 @@
     final String docFilePath = "/jape/test/docfiles/Req-GATETao-8.1.3.txt";
     
     String[] expectedResults = {"OpEquals"};
-    int[] expectedStartOffsets = {18};
-    int[] expectedEndOffsets = {21};
+    int[] expectedStartOffsets = {17};
+    int[] expectedEndOffsets = {20};
   
     doCommonTest(japeFilePath, docFilePath, expectedResults, 
expectedStartOffsets, expectedEndOffsets, annoCreator813Operators);
   }
@@ -367,8 +368,8 @@
     final String docFilePath = "/jape/test/docfiles/Req-GATETao-8.1.3.txt";
     
     String[] expectedResults = {"OpEquals"};
-    int[] expectedStartOffsets = {22};
-    int[] expectedEndOffsets = {26};
+    int[] expectedStartOffsets = {21};
+    int[] expectedEndOffsets = {25};
   
     doCommonTest(japeFilePath, docFilePath, expectedResults, 
expectedStartOffsets, expectedEndOffsets, annoCreator813Operators);
   }
@@ -386,8 +387,8 @@
     final String docFilePath = "/jape/test/docfiles/Req-GATETao-8.1.3.txt";
     
     String[] expectedResults = {"OpEquals"};
-    int[] expectedStartOffsets = {27};
-    int[] expectedEndOffsets = {34};
+    int[] expectedStartOffsets = {26};
+    int[] expectedEndOffsets = {33};
   
     doCommonTest(japeFilePath, docFilePath, expectedResults, 
expectedStartOffsets, expectedEndOffsets, annoCreator813Operators);
   }
@@ -406,8 +407,8 @@
     final String docFilePath = "/jape/test/docfiles/Req-GATETao-8.1.3.txt";
     
     String[] expectedResults = {"OpGreaterThan", "OpGreaterThan", 
"OpGreaterThan"};
-    int[] expectedStartOffsets = {1, 6 ,35};
-    int[] expectedEndOffsets = {5, 13, 43};
+    int[] expectedStartOffsets = {0, 5 ,34};
+    int[] expectedEndOffsets = {4, 12, 42};
   
     doCommonTest(japeFilePath, docFilePath, expectedResults, 
expectedStartOffsets, expectedEndOffsets, annoCreator813Operators);
   }
@@ -425,8 +426,8 @@
     final String docFilePath = "/jape/test/docfiles/Req-GATETao-8.1.3.txt";
     
     String[] expectedResults = {"OpGreaterThan", "OpGreaterThan"};
-    int[] expectedStartOffsets = {14, 22};
-    int[] expectedEndOffsets = {17, 26};
+    int[] expectedStartOffsets = {13, 21};
+    int[] expectedEndOffsets = {16, 25};
   
     doCommonTest(japeFilePath, docFilePath, expectedResults, 
expectedStartOffsets, expectedEndOffsets, annoCreator813Operators);
   }
@@ -444,9 +445,9 @@
     final String japeFilePath = 
"/jape/test/japefiles/Req-GATETao-8.1.3-op-gt-int-negative.jape";
     final String docFilePath = "/jape/test/docfiles/Req-GATETao-8.1.3.txt";
     
-    String[] expectedResults = {"OpGreaterThan", "OpGreaterThan", 
"OpGreaterThan", "OpGreaterThan"};
-    int[] expectedStartOffsets = {14, 18, 22, 27};
-    int[] expectedEndOffsets = {17, 21, 26, 34};
+    String[] expectedResults = {"OpGreaterThan", "OpGreaterThan", 
"OpGreaterThan"};
+    int[] expectedStartOffsets = {13, 17, 21};
+    int[] expectedEndOffsets = {16, 20, 25};
   
     doCommonTest(japeFilePath, docFilePath, expectedResults, 
expectedStartOffsets, expectedEndOffsets, annoCreator813Operators);
   }
@@ -464,8 +465,8 @@
     final String docFilePath = "/jape/test/docfiles/Req-GATETao-8.1.3.txt";
     
     String[] expectedResults = {"OpGreaterThan", "OpGreaterThan"};
-    int[] expectedStartOffsets = {14, 22};
-    int[] expectedEndOffsets = {17, 26};
+    int[] expectedStartOffsets = {13, 21};
+    int[] expectedEndOffsets = {16, 25};
   
     doCommonTest(japeFilePath, docFilePath, expectedResults, 
expectedStartOffsets, expectedEndOffsets, annoCreator813Operators);
   }
@@ -483,8 +484,8 @@
     final String docFilePath = "/jape/test/docfiles/Req-GATETao-8.1.3.txt";
     
     String[] expectedResults = {"OpGreaterThan", "OpGreaterThan", 
"OpGreaterThan", "OpGreaterThan"};
-    int[] expectedStartOffsets = {14, 18, 22, 27};
-    int[] expectedEndOffsets = {17, 21, 26, 34};
+    int[] expectedStartOffsets = {13, 17, 21, 26};
+    int[] expectedEndOffsets = {16, 20, 25, 33};
   
     doCommonTest(japeFilePath, docFilePath, expectedResults, 
expectedStartOffsets, expectedEndOffsets, annoCreator813Operators);
   }
@@ -502,8 +503,8 @@
     final String docFilePath = "/jape/test/docfiles/Req-GATETao-8.1.3.txt";
     
     String[] expectedResults = {"OpGreaterEquals"};
-    int[] expectedStartOffsets = {1};
-    int[] expectedEndOffsets = {5};
+    int[] expectedStartOffsets = {0};
+    int[] expectedEndOffsets = {4};
   
     doCommonTest(japeFilePath, docFilePath, expectedResults, 
expectedStartOffsets, expectedEndOffsets, annoCreator813Operators);
   }
@@ -521,8 +522,8 @@
     final String docFilePath = "/jape/test/docfiles/Req-GATETao-8.1.3.txt";
     
     String[] expectedResults = {"OpGreaterEquals"};
-    int[] expectedStartOffsets = {14};
-    int[] expectedEndOffsets = {17};
+    int[] expectedStartOffsets = {13};
+    int[] expectedEndOffsets = {16};
   
     doCommonTest(japeFilePath, docFilePath, expectedResults, 
expectedStartOffsets, expectedEndOffsets, annoCreator813Operators);
   }
@@ -540,8 +541,8 @@
     final String docFilePath = "/jape/test/docfiles/Req-GATETao-8.1.3.txt";
     
     String[] expectedResults = {"OpGreaterEquals", "OpGreaterEquals", 
"OpGreaterEquals"};
-    int[] expectedStartOffsets = {14, 18, 22};
-    int[] expectedEndOffsets = {17, 21, 26};
+    int[] expectedStartOffsets = {13, 17, 21};
+    int[] expectedEndOffsets = {16, 20, 25};
   
     doCommonTest(japeFilePath, docFilePath, expectedResults, 
expectedStartOffsets, expectedEndOffsets, annoCreator813Operators);
   }
@@ -559,8 +560,8 @@
     final String docFilePath = "/jape/test/docfiles/Req-GATETao-8.1.3.txt";
     
     String[] expectedResults = {"OpGreaterEquals", "OpGreaterEquals"};
-    int[] expectedStartOffsets = {14, 22};
-    int[] expectedEndOffsets = {17, 26};
+    int[] expectedStartOffsets = {13, 21};
+    int[] expectedEndOffsets = {16, 25};
   
     doCommonTest(japeFilePath, docFilePath, expectedResults, 
expectedStartOffsets, expectedEndOffsets, annoCreator813Operators);
   }
@@ -578,8 +579,8 @@
     final String docFilePath = "/jape/test/docfiles/Req-GATETao-8.1.3.txt";
     
     String[] expectedResults = {"OpGreaterEquals", "OpGreaterEquals", 
"OpGreaterEquals", "OpGreaterEquals"};
-    int[] expectedStartOffsets = {14, 18, 22, 27};
-    int[] expectedEndOffsets = {17, 21, 26, 34};
+    int[] expectedStartOffsets = {13, 17, 21, 26};
+    int[] expectedEndOffsets = {16, 20, 25, 33};
   
     doCommonTest(japeFilePath, docFilePath, expectedResults, 
expectedStartOffsets, expectedEndOffsets, annoCreator813Operators);
   }
@@ -795,7 +796,7 @@
         "EqualAndNotExistance", "OntoTest", "OntoTest2"};
 
     Set<Annotation> actualResults = doTest(DEFAULT_DATA_FILE, japeFile,
-            basicAnnotCreator, "http://gate.ac.uk/tests/demo.owl";);
+            basicAnnotCreator, TestDocument.getTestServerName() + 
"tests/demo.owl");
     Out.println(actualResults);
     compareResults(expectedResults, actualResults);
   }
@@ -1038,7 +1039,7 @@
       @Override
       public AnnotationSet createAnnots(Document doc)
               throws InvalidOffsetException { // OptionalB check
-        // addInc("C");
+         addInc("C");
         addInc("B");
         addInc("C");
 
@@ -1105,36 +1106,36 @@
   @Override
   public AnnotationSet createAnnots(Document doc) throws 
InvalidOffsetException {
     /* line 1 */
-    add(1, 6, "Location");
-    add(1, 15, "Location");
-    add(7, 15, "Location");
-    add(16, 24, "Organization");
+    add(0, 5, "Location");
+    add(0, 14, "Location");
+    add(6, 14, "Location");
+    add(15, 23, "Organization");
     FeatureMap feat = Factory.newFeatureMap();
     feat.put("month", "September");
-    add(25, 35, "Date", feat);
-    add(36, 53, "JobTitle");
+    add(24, 34, "Date", feat);
+    add(35, 52, "JobTitle");
     
     /* line 2 */
-    add(54, 59, "Location");
-    add(54, 68, "Location");
-    add(60, 68, "Location");
-    add(69, 77, "Organization");
+    add(53, 58, "Location");
+    add(53, 67, "Location");
+    add(59, 67, "Location");
+    add(68, 76, "Organization");
     feat = Factory.newFeatureMap();
     feat.put("month", "November");
-    add(78, 88, "Date", feat);
-    add(89, 100, "JobTitle");
+    add(77, 87, "Date", feat);
+    add(88, 99, "JobTitle");
     
     /* line 3 */
-    add(101, 107, "Location");
-    add(101, 110, "Location");
-    add(108, 110, "Location");
-    add(111, 115, "Organization");
+    add(100, 106, "Location");
+    add(100, 109, "Location");
+    add(107, 109, "Location");
+    add(110, 114, "Organization");
     
     feat = Factory.newFeatureMap();
     feat.put("month", "October");
-    add(116, 126, "Date", feat);
+    add(115, 125, "Date", feat);
     
-    add(127, 137, "JobTitle");
+    add(126, 136, "JobTitle");
     
     return as;
   }
@@ -1145,31 +1146,31 @@
   public AnnotationSet createAnnots(Document doc) throws 
InvalidOffsetException {
     FeatureMap feat = Factory.newFeatureMap();
     feat.put("string", "room");
-    add(1, 5, "Token", feat);
+    add(0, 4, "Token", feat);
     
     feat = Factory.newFeatureMap();
     feat.put("string", "qu\"oted");
-    add(6, 13, "Token", feat);
+    add(5, 12, "Token", feat);
     
     feat = Factory.newFeatureMap();
     feat.put("int", 101l);
-    add(14, 17, "Token", feat);
+    add(13, 16, "Token", feat);
     
     feat = Factory.newFeatureMap();
-    feat.put("int", -10);
-    add(18, 21, "Token", feat);
+    feat.put("int", -10l);
+    add(17, 20, "Token", feat);
     
     feat = Factory.newFeatureMap();
-    feat.put("double", 3.14f);
-    add(22, 26, "Token", feat);
+    feat.put("double", 3.14d);
+    add(21, 25, "Token", feat);
     
     feat = Factory.newFeatureMap();
-    feat.put("double", -273.15);
-    add(27, 34, "Token", feat);
+    feat.put("double", -273.15d);
+    add(26, 33, "Token", feat);
     
     feat = Factory.newFeatureMap();
     feat.put("string", "qu\\\"oted");
-    add(35, 43, "Token", feat);
+    add(34, 42, "Token", feat);
     return as;
   }
 };
@@ -1254,7 +1255,7 @@
       FeatureMap feat = Factory.newFeatureMap();
       feat.put("f1", "atext");
       feat.put("f2", "2");
-      feat.put("f3", 3);
+      feat.put("f3", 3l);
       add(2, 4, "A", feat);
 
       feat = Factory.newFeatureMap();
@@ -1286,14 +1287,14 @@
       feat = Factory.newFeatureMap();
       feat.put("f2", 2l);
       add(14, 16, "D", feat);
-
+      
       feat = Factory.newFeatureMap();
-      feat.put("ontology", "http://gate.ac.uk/tests/demo.owl";);
+      feat.put("ontology", TestDocument.getTestServerName() + 
"tests/demo.owl");
       feat.put("class", "Businessman");
       add(16, 18, "D", feat);
 
       feat = Factory.newFeatureMap();
-      feat.put("ontology", "http://gate.ac.uk/tests/demo.owl";);
+      feat.put("ontology", TestDocument.getTestServerName() + 
"tests/demo.owl");
       feat.put("class", "Country");
       add(18, 19, "D", feat);
       return as;

Modified: 
gate/trunk/src/test/gate/resources/jape/test/japefiles/Req-GATETao-8.1.2-Negatives.jape
===================================================================
--- 
gate/trunk/src/test/gate/resources/jape/test/japefiles/Req-GATETao-8.1.2-Negatives.jape
     2014-05-08 12:46:13 UTC (rev 17931)
+++ 
gate/trunk/src/test/gate/resources/jape/test/japefiles/Req-GATETao-8.1.2-Negatives.jape
     2014-05-08 14:25:54 UTC (rev 17932)
@@ -1,5 +1,5 @@
 Phase: Test
-Options: control = brill
+Options: control = appelt
 
 Rule:SimpleAnnotation
 (

Modified: 
gate/trunk/src/test/gate/resources/jape/test/japefiles/Req-GATETao-8.1.3-LHSOP_contains.jape
===================================================================
--- 
gate/trunk/src/test/gate/resources/jape/test/japefiles/Req-GATETao-8.1.3-LHSOP_contains.jape
        2014-05-08 12:46:13 UTC (rev 17931)
+++ 
gate/trunk/src/test/gate/resources/jape/test/japefiles/Req-GATETao-8.1.3-LHSOP_contains.jape
        2014-05-08 14:25:54 UTC (rev 17932)
@@ -1,5 +1,5 @@
 Phase: Test
-Options: control = brill
+Options: control = appelt
 
 Rule:OpContains
 ({Location contains Location}):bind 

Modified: 
gate/trunk/src/test/gate/resources/jape/test/japefiles/Req-GATETao-8.1.3-LHSOP_within.jape
===================================================================
--- 
gate/trunk/src/test/gate/resources/jape/test/japefiles/Req-GATETao-8.1.3-LHSOP_within.jape
  2014-05-08 12:46:13 UTC (rev 17931)
+++ 
gate/trunk/src/test/gate/resources/jape/test/japefiles/Req-GATETao-8.1.3-LHSOP_within.jape
  2014-05-08 14:25:54 UTC (rev 17932)
@@ -1,5 +1,5 @@
 Phase: Test
-Options: control = brill
+Options: control = appelt
 
 Rule:OpWithin
 ({Location within Location}):bind 

Modified: 
gate/trunk/src/test/gate/resources/jape/test/japefiles/Req-GATETao-8.1.3-op-ge-int-negative.jape
===================================================================
--- 
gate/trunk/src/test/gate/resources/jape/test/japefiles/Req-GATETao-8.1.3-op-ge-int-negative.jape
    2014-05-08 12:46:13 UTC (rev 17931)
+++ 
gate/trunk/src/test/gate/resources/jape/test/japefiles/Req-GATETao-8.1.3-op-ge-int-negative.jape
    2014-05-08 14:25:54 UTC (rev 17932)
@@ -3,7 +3,7 @@
 
 Rule:OpGreaterEquals
 (
-       {Token.int > -10} | {Token.double > -10d}
+       {Token.int >= -10} | {Token.double >= -10d}
 ):bind 
 --> 
 :bind.SomeAnnotation = {rule="OpGreaterEquals"}

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
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs

Reply via email to