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 2013/07/07 19:44:49 UTC
svn commit: r1500493 - in
/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite:
UnitTestBadEval.java UnitTestBadSyntax.java UnitTestEval.java
UnitTestSyntax.java
Author: andy
Date: Sun Jul 7 17:44:48 2013
New Revision: 1500493
URL: http://svn.apache.org/r1500493
Log:
Make test cases better adapt to triples or quads usage.
Modified:
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadEval.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadSyntax.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestEval.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestSyntax.java
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadEval.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadEval.java?rev=1500493&r1=1500492&r2=1500493&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadEval.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadEval.java Sun Jul 7 17:44:48 2013
@@ -21,12 +21,15 @@ package org.apache.jena.riot.langsuite;
import org.apache.jena.riot.Lang ;
import org.apache.jena.riot.RDFDataMgr ;
+import org.apache.jena.riot.RDFLanguages ;
import org.apache.jena.riot.RiotException ;
import org.apache.jena.riot.system.ErrorHandler ;
import org.apache.jena.riot.system.ErrorHandlerFactory ;
import org.junit.After ;
import org.junit.Before ;
+import com.hp.hpl.jena.query.Dataset ;
+import com.hp.hpl.jena.query.DatasetFactory ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.ModelFactory ;
import com.hp.hpl.jena.shared.JenaException ;
@@ -65,6 +68,15 @@ public class UnitTestBadEval extends Lan
@Override
public void runTestForReal()
{
+ if ( RDFLanguages.isTriples(lang) )
+ run3() ;
+ else
+ run4() ;
+ }
+
+
+ private void run3()
+ {
Model model = ModelFactory.createDefaultModel() ;
try {
RDFDataMgr.read(model, input) ;
@@ -77,4 +89,20 @@ public class UnitTestBadEval extends Lan
ex.printStackTrace(System.err) ;
throw ex ; }
}
+
+ private void run4()
+ {
+ Dataset ds = DatasetFactory.createMem() ;
+ try {
+ RDFDataMgr.read(ds, input) ;
+ fail("Managed to read a bad evaluation test without error") ;
+ }
+ catch (RiotException ex) {}
+ catch (JenaException ex) {}
+ catch (RuntimeException ex)
+ {
+ ex.printStackTrace(System.err) ;
+ throw ex ; }
+ }
+
}
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadSyntax.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadSyntax.java?rev=1500493&r1=1500492&r2=1500493&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadSyntax.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestBadSyntax.java Sun Jul 7 17:44:48 2013
@@ -22,10 +22,13 @@ import static org.apache.jena.riot.SysRI
import org.apache.jena.atlas.junit.BaseTest ;
import org.apache.jena.riot.Lang ;
import org.apache.jena.riot.RDFDataMgr ;
+import org.apache.jena.riot.RDFLanguages ;
import org.apache.jena.riot.RiotException ;
import org.apache.jena.riot.system.ErrorHandler ;
import org.apache.jena.riot.system.ErrorHandlerFactory ;
+import com.hp.hpl.jena.query.Dataset ;
+import com.hp.hpl.jena.query.DatasetFactory ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.ModelFactory ;
import com.hp.hpl.jena.sparql.junit.EarlReport ;
@@ -75,6 +78,13 @@ public class UnitTestBadSyntax extends L
@Override
public void runTestForReal()
{
+ if ( RDFLanguages.isTriples(lang) )
+ run3() ;
+ else
+ run4() ;
+ }
+
+ private void run3() {
Model model = ModelFactory.createDefaultModel() ;
try {
RDFDataMgr.read(model, uri, uri, lang) ;
@@ -85,4 +95,16 @@ public class UnitTestBadSyntax extends L
}
fail("Bad syntax test succeed in parsing the file") ;
}
+
+ private void run4() {
+ Dataset ds = DatasetFactory.createMem() ;
+ try {
+ RDFDataMgr.read(ds, uri, uri, lang) ;
+ } catch (RiotException ex) { return ; }
+ catch (RuntimeException ex) {
+ ex.printStackTrace(System.err) ;
+ fail("Unexpected exception") ;
+ }
+ fail("Bad syntax test succeed in parsing the file") ;
+ }
}
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestEval.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestEval.java?rev=1500493&r1=1500492&r2=1500493&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestEval.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestEval.java Sun Jul 7 17:44:48 2013
@@ -109,29 +109,6 @@ public class UnitTestEval extends LangTe
return IsoMatcher.isomorphic(dsg1, dsg2) ;
}
-// private boolean isomorphicX(DatasetGraph dsg1, DatasetGraph dsg2) {
-// {
-// Graph g1 = dsg1.getDefaultGraph() ;
-// Graph g2 = dsg2.getDefaultGraph() ;
-// boolean b = g1.isIsomorphicWith(g2) ;
-// if ( !b ) return false ;
-// }
-// List<Node> names1 = Iter.toList(dsg1.listGraphNodes()) ;
-// List<Node> names2 = Iter.toList(dsg2.listGraphNodes()) ;
-// if ( names1.size() != names2.size() )
-// return false ;
-//
-// for ( Node gn : names1 ) {
-// Graph g1 = dsg1.getGraph(gn) ;
-// Graph g2 = dsg2.getGraph(gn) ;
-// if ( g1 == null || g2 == null )
-// return false ;
-// boolean b = g1.isIsomorphicWith(g2) ;
-// if ( !b ) return false ;
-// }
-// return true ;
-// }
-
// Triples test.
private void run3() {
Model model = ModelFactory.createDefaultModel() ;
@@ -152,20 +129,6 @@ public class UnitTestEval extends LangTe
boolean b = model.isIsomorphicWith(results) ;
-// try {
-// boolean b1 = IsoMatcher.isomorphic(model.getGraph(), results.getGraph()) ;
-// if ( b1 != b ) {
-// System.out.println("---- IsoMatcher mismatch");
-// }
-// } catch ( java.lang.StackOverflowError ex) {
-// System.out.println("STACK") ;
-// System.out.println("---- Parsed");
-// model.write(System.out, "TTL") ;
-// System.out.println("---- Expected");
-// results.write(System.out, "TTL") ;
-// System.out.println("--------");
-// }
-
if ( !b )
{
//model.isIsomorphicWith(results) ;
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestSyntax.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestSyntax.java?rev=1500493&r1=1500492&r2=1500493&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestSyntax.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/UnitTestSyntax.java Sun Jul 7 17:44:48 2013
@@ -20,7 +20,10 @@ package org.apache.jena.riot.langsuite;
import org.apache.jena.riot.Lang ;
import org.apache.jena.riot.RDFDataMgr ;
+import org.apache.jena.riot.RDFLanguages ;
+import com.hp.hpl.jena.query.Dataset ;
+import com.hp.hpl.jena.query.DatasetFactory ;
import com.hp.hpl.jena.rdf.model.Model ;
import com.hp.hpl.jena.rdf.model.ModelFactory ;
import com.hp.hpl.jena.sparql.junit.EarlReport ;
@@ -40,10 +43,22 @@ public class UnitTestSyntax extends Lang
@Override
public void runTestForReal()
{
+ if ( RDFLanguages.isTriples(lang) )
+ run3() ;
+ else
+ run4() ;
+ }
+
+ private void run3() {
Model model = ModelFactory.createDefaultModel() ;
RDFDataMgr.read(model, uri, uri, lang) ;
}
-
+
+ private void run4() {
+ Dataset ds = DatasetFactory.createMem() ;
+ RDFDataMgr.read(ds, uri, uri, lang) ;
+ }
+
@Override
protected void _setUp()
{}