You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2012/10/29 18:03:24 UTC

svn commit: r1403424 - in /jena/Experimental/riot-reader/src/test/java: org/apache/jena/riot/langsuite/FactoryTestRiot.java org/apache/jena/riot/langsuite/VocabLangRDF.java riotcmd/MainLangTest.java

Author: andy
Date: Mon Oct 29 17:03:24 2012
New Revision: 1403424

URL: http://svn.apache.org/viewvc?rev=1403424&view=rev
Log:
Eval tests

Modified:
    jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/FactoryTestRiot.java
    jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/VocabLangRDF.java
    jena/Experimental/riot-reader/src/test/java/riotcmd/MainLangTest.java

Modified: jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/FactoryTestRiot.java
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/FactoryTestRiot.java?rev=1403424&r1=1403423&r2=1403424&view=diff
==============================================================================
--- jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/FactoryTestRiot.java (original)
+++ jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/FactoryTestRiot.java Mon Oct 29 17:03:24 2012
@@ -98,12 +98,8 @@ public class FactoryTestRiot extends Tes
 
             // Eval.
             
-            if (r.equals(VocabLangRDF.TestPositiveEvalTTL) )
+            if (r.equals(VocabLangRDF.TestEvalTTL) )
                 return new UnitTestEvalTurtle(testName, input.getURI(), result.getURI(), baseIRI) ;
-                
-            if (r.equals(VocabLangRDF.TestNegativeEvalTTL) )
-                return new UnitTestBadEvalTurtle(testName, input.getURI(), result.getURI(), baseIRI) ;
-                
 
             
 //            // Old vocab

Modified: jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/VocabLangRDF.java
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/VocabLangRDF.java?rev=1403424&r1=1403423&r2=1403424&view=diff
==============================================================================
--- jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/VocabLangRDF.java (original)
+++ jena/Experimental/riot-reader/src/test/java/org/apache/jena/riot/langsuite/VocabLangRDF.java Mon Oct 29 17:03:24 2012
@@ -43,41 +43,41 @@ public class VocabLangRDF
 
     public static final Resource TestNegativeSyntaxTTL  = m_model.createResource( NS+"TestTurtleNegativeSyntax" );
 
-    public static final Resource TestPositiveEvalTTL    = m_model.createResource( NS+"TestTurtlePositiveEval" );
+    public static final Resource TestEvalTTL            = m_model.createResource( NS+"TestTurtleEval" );
 
-    public static final Resource TestNegativeEvalTTL    = m_model.createResource( NS+"TestTurtleNegativeEval" );
+    //public static final Resource TestNegativeEvalTTL    = m_model.createResource( NS+"TestTurtleNegativeEval" );
 
-    public static final Resource TestPositiveSyntaxNT  = m_model.createResource( NS+"TestNTriplesPositiveSyntax" );
+    public static final Resource TestPositiveSyntaxNT   = m_model.createResource( NS+"TestNTriplesPositiveSyntax" );
 
-    public static final Resource TestNegativeSyntaxNT  = m_model.createResource( NS+"TestNTriplesNegativeSyntax" );
+    public static final Resource TestNegativeSyntaxNT   = m_model.createResource( NS+"TestNTriplesNegativeSyntax" );
 
-    public static final Resource TestPositiveEvalNT    = m_model.createResource( NS+"TestNTriplesPositiveEval" );
+    public static final Resource TestEvalNT             = m_model.createResource( NS+"TestNTriplesEval" );
 
-    public static final Resource TestNegativeEvalNT    = m_model.createResource( NS+"TestNTriplesNegativeEval" );
+    //public static final Resource TestNegativeEvalNT    = m_model.createResource( NS+"TestNTriplesNegativeEval" );
 
-    public static final Resource TestPositiveSyntaxRJ  = m_model.createResource( NS+"TestRDFJSONPositiveSyntax" );
+    public static final Resource TestPositiveSyntaxRJ   = m_model.createResource( NS+"TestRDFJSONPositiveSyntax" );
 
-    public static final Resource TestNegativeSyntaxRJ  = m_model.createResource( NS+"TestRDFJSONNegativeSyntax" );
+    public static final Resource TestNegativeSyntaxRJ   = m_model.createResource( NS+"TestRDFJSONNegativeSyntax" );
 
-    public static final Resource TestPositiveEvalRJ    = m_model.createResource( NS+"TestRDFJSONPositiveEval" );
+    public static final Resource TestEvalRJ             = m_model.createResource( NS+"TestRDFJSONEval" );
 
-    public static final Resource TestNegativeEvalRJ    = m_model.createResource( NS+"TestRDFJSONNegativeEval" );
+    //public static final Resource TestNegativeEvalRJ    = m_model.createResource( NS+"TestRDFJSONNegativeEval" );
 
-    public static final Resource TestPositiveSyntaxNQ  = m_model.createResource( NS+"TestNQuadsPositiveSyntax" );
+    public static final Resource TestPositiveSyntaxNQ   = m_model.createResource( NS+"TestNQuadsPositiveSyntax" );
 
-    public static final Resource TestNegativeSyntaxNQ  = m_model.createResource( NS+"TestNQuadsNegativeSyntax" );
+    public static final Resource TestNegativeSyntaxNQ   = m_model.createResource( NS+"TestNQuadsNegativeSyntax" );
 
-    public static final Resource TestPositiveEvalNQ    = m_model.createResource( NS+"TestNQuadsPositiveEval" );
+    public static final Resource TestEvalNQ             = m_model.createResource( NS+"TestNQuadsPositiveEval" );
 
-    public static final Resource TestNegativeEvalNQ    = m_model.createResource( NS+"TestNQuadsNegativeEval" );
+    //public static final Resource TestNegativeEvalNQ    = m_model.createResource( NS+"TestNQuadsNegativeEval" );
 
-    public static final Resource TestPositiveSyntaxTriG  = m_model.createResource( NS+"TestTrigPositiveSyntax" );
+    public static final Resource TestPositiveSyntaxTriG     = m_model.createResource( NS+"TestTrigPositiveSyntax" );
 
-    public static final Resource TestNegativeSyntaxTriG  = m_model.createResource( NS+"TestTrigNegativeSyntax" );
+    public static final Resource TestNegativeSyntaxTriG     = m_model.createResource( NS+"TestTrigNegativeSyntax" );
 
-    public static final Resource TestPositiveEvalTriG    = m_model.createResource( NS+"TestTrigPositiveEval" );
+    public static final Resource TestEvalTriG           = m_model.createResource( NS+"TestTrigEval" );
 
-    public static final Resource TestNegativeEvalTriG    = m_model.createResource( NS+"TestTrigNegativeEval" );
+    //public static final Resource TestNegativeEvalTriG    = m_model.createResource( NS+"TestTrigNegativeEval" );
 
     public static final Resource TestSurpressed         = m_model.createResource( NS+"Test" );
 }

Modified: jena/Experimental/riot-reader/src/test/java/riotcmd/MainLangTest.java
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-reader/src/test/java/riotcmd/MainLangTest.java?rev=1403424&r1=1403423&r2=1403424&view=diff
==============================================================================
--- jena/Experimental/riot-reader/src/test/java/riotcmd/MainLangTest.java (original)
+++ jena/Experimental/riot-reader/src/test/java/riotcmd/MainLangTest.java Mon Oct 29 17:03:24 2012
@@ -22,7 +22,7 @@ public class MainLangTest
 {
     public static void main(String ... argv)
     {
-        riotcmd.rdflangtest.main("testing/RIOT/Lang/manifest-all.ttl") ; 
+        riotcmd.rdflangtest.main("testing/RIOT/Lang/Turtle/manifest.ttl") ; 
         //riotcmd.rdflangtest.main("testing/RIOT/Lang/Turtle/manifest.ttl") ;
     }
 }