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/12 17:47:28 UTC
svn commit: r1397622 - in /jena/trunk/jena-arq/src:
main/java/com/hp/hpl/jena/sparql/engine/binding/
main/java/com/hp/hpl/jena/sparql/expr/ main/java/org/openjena/riot/
main/java/org/openjena/riot/checker/ main/java/org/openjena/riot/lang/
main/java/or...
Author: andy
Date: Fri Oct 12 15:47:27 2012
New Revision: 1397622
URL: http://svn.apache.org/viewvc?rev=1397622&view=rev
Log:
Reorganise error handler output to make testing frameworks easier.
Testing frameworks often want to supress output and just catch exceptions.
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingInputStream.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/NodeValue.java
jena/trunk/jena-arq/src/main/java/org/openjena/riot/ErrorHandlerFactory.java
jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotReader.java
jena/trunk/jena-arq/src/main/java/org/openjena/riot/checker/CheckerIRI.java
jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangTurtleBase.java
jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/Checker.java
jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/RiotLib.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/ARQTestSuite.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/binding/TestBindingStreams.java
jena/trunk/jena-arq/src/test/java/org/openjena/atlas/junit/BaseTest.java
jena/trunk/jena-arq/src/test/java/org/openjena/riot/TS_Riot.java
jena/trunk/jena-arq/src/test/java/org/openjena/riot/lang/TestLangTurtle.java
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingInputStream.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingInputStream.java?rev=1397622&r1=1397621&r2=1397622&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingInputStream.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/engine/binding/BindingInputStream.java Fri Oct 12 15:47:27 2012
@@ -89,7 +89,7 @@ public class BindingInputStream extends
// TODO
// Don't do anything with IRIs.
Prologue prologue = new Prologue(new PrefixMap(), IRIResolver.createNoResolve()) ;
- ErrorHandler handler = ErrorHandlerFactory.errorHandlerStd ;
+ ErrorHandler handler = ErrorHandlerFactory.getDefaultErrorHandler() ;
ParserProfile profile = new ParserProfileBase(prologue, handler) ;
profile.setLabelToNode(LabelToNode.createUseLabelAsGiven()) ;
// Include safe bNode labels.
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/NodeValue.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/NodeValue.java?rev=1397622&r1=1397621&r2=1397622&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/NodeValue.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/NodeValue.java Fri Oct 12 15:47:27 2012
@@ -195,7 +195,6 @@ public abstract class NodeValue extends
* This is clearly crazy, but DatatypeFactory is missing a very obvious
* method newInstance(Classloader). The method that was added is very
* hard to use correctly, as we shall see...
- * @return
*/
private static DatatypeFactory getDatatypeFactory()
throws DatatypeConfigurationException {
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/ErrorHandlerFactory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/ErrorHandlerFactory.java?rev=1397622&r1=1397621&r2=1397622&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/ErrorHandlerFactory.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/ErrorHandlerFactory.java Fri Oct 12 15:47:27 2012
@@ -27,31 +27,33 @@ public class ErrorHandlerFactory
static public final Logger noLogger = null ;
/** Standard error handler - logs to stdLogger */
- static public ErrorHandler errorHandlerStd = errorHandlerStd(stdLogger) ;
+ static public final ErrorHandler errorHandlerStd = errorHandlerStd(stdLogger) ;
/** Strict error handler - logs to stdLogger - exceptions for warnings */
- static public ErrorHandler errorHandlerStrict = errorHandlerStrict(stdLogger) ;
+ static public final ErrorHandler errorHandlerStrict = errorHandlerStrict(stdLogger) ;
/** Warning error handler - logs to stdLogger - mesages for warnings and some errors */
- static public ErrorHandler errorHandlerWarn = errorHandlerWarning(stdLogger) ;
+ static public final ErrorHandler errorHandlerWarn = errorHandlerWarning(stdLogger) ;
/** Silent error handler */
- static public ErrorHandler errorHandlerNoLogging = errorHandlerSimple() ;
-
- static public void setTestLogging(boolean visible)
- {
- // Reset
- if ( visible )
- errorHandlerStd = new ErrorHandlerStd(stdLogger) ;
- else
- errorHandlerStd = new ErrorHandlerSimple() ;
- }
+ static public final ErrorHandler errorHandlerNoLogging = errorHandlerSimple() ;
+
+ /** Silent, strict error handler */
+ static public final ErrorHandler errorHandlerStrictNoLogging = errorHandlerStrictSilent() ;
+ public static ErrorHandler errorHandlerStrictSilent() { return new ErrorHandlerStrict(null) ; }
public static ErrorHandler errorHandlerStrict(Logger log) { return new ErrorHandlerStrict(log) ; }
public static ErrorHandler errorHandlerStd(Logger log) { return new ErrorHandlerStd(log) ; }
public static ErrorHandler errorHandlerWarning(Logger log) { return new ErrorHandlerWarning(log) ; }
public static ErrorHandler errorHandlerSimple() { return new ErrorHandlerSimple() ; }
+ private static ErrorHandler defaultErrorHandler = errorHandlerStd ;
+ /** Get the current default error handler */
+ public static ErrorHandler getDefaultErrorHandler() { return defaultErrorHandler ; }
+
+ /** Set the current default error handler - use carefully, mainly for use in testing */
+ public static void setDefaultErrorHandler(ErrorHandler errorHandler) { defaultErrorHandler = errorHandler ; }
+
/** Messages to a logger. This is not an ErrorHandler */
private static class ErrorLogger
{
@@ -65,19 +67,22 @@ public class ErrorHandlerFactory
/** report a warning */
public void logWarning(String message, long line, long col)
{
- log.warn(fmtMessage(message, line, col)) ;
+ if ( log != null )
+ log.warn(fmtMessage(message, line, col)) ;
}
/** report an error */
public void logError(String message, long line, long col)
{
- log.error(fmtMessage(message, line, col)) ;
+ if ( log != null )
+ log.error(fmtMessage(message, line, col)) ;
}
/** report a catastrophic error */
public void logFatal(String message, long line, long col)
{
- logError(message, line, col) ;
+ if ( log != null )
+ logError(message, line, col) ;
}
}
@@ -158,6 +163,31 @@ public class ErrorHandlerFactory
}
}
+ /** An error handler that throw exceptions on warnings and errors but does not log */
+ private static class ErrorHandlerStrictSilent implements ErrorHandler
+ {
+ /** report a warning - do not carry on */
+ @Override
+ public void warning(String message, long line, long col)
+ {
+ throw new RiotException(fmtMessage(message, line, col)) ;
+ }
+
+ /** report an error - do not carry on */
+ @Override
+ public void error(String message, long line, long col)
+ {
+ throw new RiotException(fmtMessage(message, line, col)) ;
+ }
+
+ @Override
+ public void fatal(String message, long line, long col)
+ {
+ throw new RiotException(fmtMessage(message, line, col)) ;
+ }
+ } ;
+
+
/** An error handler that logs messages for errors and warnings and attempt to carry on */
private static class ErrorHandlerWarning extends ErrorLogger implements ErrorHandler
{
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotReader.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotReader.java?rev=1397622&r1=1397621&r2=1397622&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotReader.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/RiotReader.java Fri Oct 12 15:47:27 2012
@@ -75,7 +75,7 @@ public class RiotReader
if ( lang == RDFXML )
{
// Fudge to make the bulk loader process RDF/XML files.
- LangRDFXML.create(in, base, filename, ErrorHandlerFactory.errorHandlerStd, sink).parse() ;
+ LangRDFXML.create(in, base, filename, ErrorHandlerFactory.getDefaultErrorHandler(), sink).parse() ;
IO.close(in) ;
return ;
}
@@ -143,7 +143,7 @@ public class RiotReader
{
if ( baseIRI != null )
baseIRI = IRIResolver.resolveString(baseIRI) ;
- return LangRDFXML.create(input, baseIRI, baseIRI, ErrorHandlerFactory.errorHandlerStd, sink) ;
+ return LangRDFXML.create(input, baseIRI, baseIRI, ErrorHandlerFactory.getDefaultErrorHandler(), sink) ;
}
Tokenizer tokenizer = ( lang == RDFJSON ) ?
new TokenizerJSON(PeekReader.makeUTF8(input)) :
@@ -259,7 +259,7 @@ public class RiotReader
{
if ( baseIRI == null )
baseIRI = chooseBaseIRI() ;
- LangRDFXML parser = LangRDFXML.create(input, baseIRI, baseIRI, ErrorHandlerFactory.errorHandlerStd, sink) ;
+ LangRDFXML parser = LangRDFXML.create(input, baseIRI, baseIRI, ErrorHandlerFactory.getDefaultErrorHandler(), sink) ;
return parser ;
}
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/checker/CheckerIRI.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/checker/CheckerIRI.java?rev=1397622&r1=1397621&r2=1397622&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/checker/CheckerIRI.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/checker/CheckerIRI.java Fri Oct 12 15:47:27 2012
@@ -40,7 +40,7 @@ public class CheckerIRI implements NodeC
public CheckerIRI()
{
- this(ErrorHandlerFactory.errorHandlerStd, IRIResolver.iriFactory) ;
+ this(ErrorHandlerFactory.getDefaultErrorHandler(), IRIResolver.iriFactory) ;
}
public CheckerIRI(ErrorHandler handler, IRIFactory iriFactory)
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangTurtleBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangTurtleBase.java?rev=1397622&r1=1397621&r2=1397622&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangTurtleBase.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangTurtleBase.java Fri Oct 12 15:47:27 2012
@@ -196,14 +196,18 @@ public abstract class LangTurtleBase<X>
protected final void directiveBase()
{
- String baseStr = peekToken().getImage() ;
+ Token token = peekToken() ;
+ if ( ! lookingAt(IRI) )
+ exception(token, "@base requires an IRI (found '"+token+"')") ;
+
+ String baseStr = token.getImage() ;
IRI baseIRI = profile.makeIRI(baseStr, currLine, currCol) ;
nextToken() ;
-
+
expect("Base directive not terminated by a dot", DOT) ;
profile.getPrologue().setBaseURI(baseIRI) ;
}
-
+
// Unlike many operations in this parser suite
// this does not assume that we have definitely
// entering this state. It does checks and may
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/Checker.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/Checker.java?rev=1397622&r1=1397621&r2=1397622&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/Checker.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/Checker.java Fri Oct 12 15:47:27 2012
@@ -18,8 +18,8 @@
package org.openjena.riot.system;
-import static org.openjena.riot.ErrorHandlerFactory.errorHandlerStd ;
import org.openjena.riot.ErrorHandler ;
+import org.openjena.riot.ErrorHandlerFactory ;
import org.openjena.riot.checker.CheckerBlankNodes ;
import org.openjena.riot.checker.CheckerIRI ;
import org.openjena.riot.checker.CheckerLiterals ;
@@ -50,7 +50,7 @@ public final class Checker
public Checker(ErrorHandler handler)
{
if ( handler == null )
- handler = errorHandlerStd ;
+ handler = ErrorHandlerFactory.getDefaultErrorHandler() ;
this.handler = handler ;
checkLiterals = new CheckerLiterals(handler) ;
@@ -103,33 +103,33 @@ public final class Checker
return rc ;
}
- public static boolean validate(String msg, Triple triple)
- {
- return validate(msg, triple.getSubject() , triple.getPredicate() , triple.getObject() ) ;
- }
-
- public static boolean validate(String msg, Node subject, Node predicate, Node object)
- {
- if ( msg == null )
- msg = "Validation" ;
- if ( subject == null || ( ! subject.isURI() && ! subject.isBlank() ) )
- {
- errorHandlerStd.error(msg+": Subject is not a URI or blank node", -1, -1) ;
- return false ;
- }
-
- if ( predicate == null || ( ! predicate.isURI() ) )
- {
- errorHandlerStd.error(msg+": Predicate not a URI", -1, -1) ;
- return false ;
- }
- if ( object == null || ( ! object.isURI() && ! object.isBlank() && ! object.isLiteral() ) )
- {
- errorHandlerStd.error(msg+": Object is not a URI, blank node or literal", -1 ,-1) ;
- return false ;
- }
- return true ;
- }
+// public static boolean validate(String msg, Triple triple)
+// {
+// return validate(msg, triple.getSubject() , triple.getPredicate() , triple.getObject() ) ;
+// }
+//
+// public static boolean validate(String msg, Node subject, Node predicate, Node object)
+// {
+// if ( msg == null )
+// msg = "Validation" ;
+// if ( subject == null || ( ! subject.isURI() && ! subject.isBlank() ) )
+// {
+// errorHandlerStd.error(msg+": Subject is not a URI or blank node", -1, -1) ;
+// return false ;
+// }
+//
+// if ( predicate == null || ( ! predicate.isURI() ) )
+// {
+// errorHandlerStd.error(msg+": Predicate not a URI", -1, -1) ;
+// return false ;
+// }
+// if ( object == null || ( ! object.isURI() && ! object.isBlank() && ! object.isLiteral() ) )
+// {
+// errorHandlerStd.error(msg+": Object is not a URI, blank node or literal", -1 ,-1) ;
+// return false ;
+// }
+// return true ;
+// }
final public boolean checkVar(Node node, long line, long col)
{ return checkVars.check(node, line, col) ; }
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/RiotLib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/RiotLib.java?rev=1397622&r1=1397621&r2=1397622&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/RiotLib.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/system/RiotLib.java Fri Oct 12 15:47:27 2012
@@ -60,7 +60,7 @@ public class RiotLib
public static ParserProfile profile(Lang lang, String baseIRI)
{
- return profile(lang, baseIRI, ErrorHandlerFactory.errorHandlerStd) ;
+ return profile(lang, baseIRI, ErrorHandlerFactory.getDefaultErrorHandler()) ;
}
public static ParserProfile profile(Lang lang, String baseIRI, ErrorHandler handler)
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/ARQTestSuite.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/ARQTestSuite.java?rev=1397622&r1=1397621&r2=1397622&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/ARQTestSuite.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/ARQTestSuite.java Fri Oct 12 15:47:27 2012
@@ -19,9 +19,16 @@
package com.hp.hpl.jena.sparql;
+import static org.openjena.riot.ErrorHandlerFactory.errorHandlerNoLogging ;
+import static org.openjena.riot.ErrorHandlerFactory.getDefaultErrorHandler ;
+import static org.openjena.riot.ErrorHandlerFactory.setDefaultErrorHandler ;
import junit.framework.JUnit4TestAdapter ;
import junit.framework.TestSuite ;
+import org.junit.AfterClass ;
+import org.junit.BeforeClass ;
import org.openjena.atlas.TC_Atlas ;
+import org.openjena.atlas.junit.BaseTest ;
+import org.openjena.riot.ErrorHandler ;
import org.openjena.riot.ErrorHandlerFactory ;
import org.openjena.riot.TC_Riot ;
@@ -49,7 +56,7 @@ public class ARQTestSuite extends TestSu
TestSuite ts = new ARQTestSuite() ;
// No warnings (e.g. bad lexical forms).
- ErrorHandlerFactory.setTestLogging(false) ;
+ BaseTest.setTestLogging() ;
// ARQ dependencies
ts.addTest(new JUnit4TestAdapter(TC_Atlas.class)) ;
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/binding/TestBindingStreams.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/binding/TestBindingStreams.java?rev=1397622&r1=1397621&r2=1397622&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/binding/TestBindingStreams.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/binding/TestBindingStreams.java Fri Oct 12 15:47:27 2012
@@ -28,7 +28,6 @@ import org.junit.AfterClass ;
import org.junit.BeforeClass ;
import org.junit.Test ;
import org.openjena.atlas.junit.BaseTest ;
-import org.openjena.riot.ErrorHandlerFactory ;
import org.openjena.riot.RiotException ;
import org.openjena.riot.system.PrefixMap ;
import org.openjena.riot.tokens.Tokenizer ;
@@ -43,6 +42,7 @@ import com.hp.hpl.jena.sparql.sse.SSE ;
import com.hp.hpl.jena.sparql.sse.builders.BuilderBinding ;
import com.hp.hpl.jena.sparql.util.NodeUtils ;
+
public class TestBindingStreams extends BaseTest
{
public static junit.framework.Test suite()
@@ -52,12 +52,12 @@ public class TestBindingStreams extends
@BeforeClass public static void beforeClass()
{
- ErrorHandlerFactory.setTestLogging(false) ;
+ setTestLogging() ;
}
@AfterClass public static void afterClass()
{
- ErrorHandlerFactory.setTestLogging(true) ;
+ unsetTestLogging() ;
}
static Binding b12 = build("(?a 1) (?b 2)") ;
Modified: jena/trunk/jena-arq/src/test/java/org/openjena/atlas/junit/BaseTest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/openjena/atlas/junit/BaseTest.java?rev=1397622&r1=1397621&r2=1397622&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/openjena/atlas/junit/BaseTest.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/openjena/atlas/junit/BaseTest.java Fri Oct 12 15:47:27 2012
@@ -18,10 +18,44 @@
package org.openjena.atlas.junit;
+import java.util.ArrayDeque ;
+import java.util.Deque ;
+
import org.junit.Assert ;
+import org.openjena.atlas.logging.Log ;
+import org.openjena.riot.ErrorHandler ;
+import org.openjena.riot.ErrorHandlerFactory ;
public class BaseTest extends Assert
{
+ private static Deque<ErrorHandler> errorHandlers = new ArrayDeque<ErrorHandler>() ;
+
+ static public void setTestLogging(ErrorHandler errorhandler)
+ {
+ errorHandlers.push(ErrorHandlerFactory.getDefaultErrorHandler()) ;
+ ErrorHandlerFactory.setDefaultErrorHandler(errorhandler) ;
+ }
+
+ static public void setTestLogging()
+ {
+// if ( errorHandlers.size() != 0 )
+// Log.warn(BaseTest.class, "ErrorHandler already set for testing") ;
+ setTestLogging(ErrorHandlerFactory.errorHandlerNoLogging) ;
+ }
+
+ static public void unsetTestLogging()
+ {
+ if ( errorHandlers.size() == 0 )
+ {
+ Log.warn(BaseTest.class, "ErrorHandler not set for testing") ;
+ ErrorHandlerFactory.setDefaultErrorHandler(ErrorHandlerFactory.errorHandlerStd) ; // Panic measures
+ return ;
+ }
+ ErrorHandler errHandler = errorHandlers.pop();
+ ErrorHandlerFactory.setDefaultErrorHandler(errHandler) ;
+ }
+
+
public static void assertNotEquals(Object a, Object b)
{
assertFalse(a.equals(b)) ;
@@ -36,4 +70,5 @@ public class BaseTest extends Assert
{
assertFalse(a == b ) ;
}
+
}
Modified: jena/trunk/jena-arq/src/test/java/org/openjena/riot/TS_Riot.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/openjena/riot/TS_Riot.java?rev=1397622&r1=1397621&r2=1397622&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/openjena/riot/TS_Riot.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/openjena/riot/TS_Riot.java Fri Oct 12 15:47:27 2012
@@ -18,10 +18,14 @@
package org.openjena.riot;
+import static org.openjena.riot.ErrorHandlerFactory.errorHandlerNoLogging ;
+import static org.openjena.riot.ErrorHandlerFactory.getDefaultErrorHandler ;
+import static org.openjena.riot.ErrorHandlerFactory.setDefaultErrorHandler ;
import org.junit.AfterClass ;
import org.junit.BeforeClass ;
import org.junit.runner.RunWith ;
import org.junit.runners.Suite ;
+import org.openjena.atlas.junit.BaseTest ;
import org.openjena.riot.lang.* ;
import org.openjena.riot.langsuite.TestSuiteRDFJSON ;
import org.openjena.riot.langsuite.TestSuiteTrig ;
@@ -74,12 +78,11 @@ public class TS_Riot
{
@BeforeClass public static void beforeClass()
{
- ErrorHandlerFactory.setTestLogging(false) ;
+ BaseTest.setTestLogging() ;
}
@AfterClass public static void afterClass()
{
- ErrorHandlerFactory.setTestLogging(true) ;
+ BaseTest.unsetTestLogging() ;
}
-
}
Modified: jena/trunk/jena-arq/src/test/java/org/openjena/riot/lang/TestLangTurtle.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/openjena/riot/lang/TestLangTurtle.java?rev=1397622&r1=1397621&r2=1397622&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/openjena/riot/lang/TestLangTurtle.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/openjena/riot/lang/TestLangTurtle.java Fri Oct 12 15:47:27 2012
@@ -18,9 +18,15 @@
package org.openjena.riot.lang;
+import static org.openjena.riot.ErrorHandlerFactory.errorHandlerNoLogging ;
+import static org.openjena.riot.ErrorHandlerFactory.getDefaultErrorHandler ;
+import static org.openjena.riot.ErrorHandlerFactory.setDefaultErrorHandler ;
+
import java.io.Reader ;
import java.io.StringReader ;
+import org.junit.AfterClass ;
+import org.junit.BeforeClass ;
import org.junit.Test ;
import org.openjena.atlas.junit.BaseTest ;
import org.openjena.atlas.lib.Sink ;
@@ -87,13 +93,25 @@ public class TestLangTurtle extends Base
assertEquals("http://example/x", model.getNsPrefixURI("x")) ;
}
+ private static ErrorHandler errorhandler = null ;
+ @BeforeClass public static void beforeClass()
+ {
+ errorhandler = getDefaultErrorHandler() ;
+ setDefaultErrorHandler(errorHandlerNoLogging) ;
+ }
+
+ @AfterClass public static void afterClass()
+ {
+ setDefaultErrorHandler(errorhandler) ;
+ }
+
private void readProtected(RDFReader reader, Model m, Reader r, String base)
{
- ErrorHandler errHandler = ErrorHandlerFactory.errorHandlerStd ;
- ErrorHandlerFactory.errorHandlerStd = ErrorHandlerFactory.errorHandlerNoLogging ;
+ ErrorHandler errorhandler = ErrorHandlerFactory.getDefaultErrorHandler() ;
+ ErrorHandlerFactory.setDefaultErrorHandler(ErrorHandlerFactory.errorHandlerNoLogging) ;
try {
reader.read(m, r, base) ;
- } finally { ErrorHandlerFactory.errorHandlerStd = errHandler ; }
+ } finally { ErrorHandlerFactory.setDefaultErrorHandler(errorhandler) ; }
}
// Call parser directly.
@@ -164,7 +182,6 @@ public class TestLangTurtle extends Base
public void errorBadURI_3()
{ parse("<http://example/a%Aab> <http://example/p> 123 .") ; }
-
@Test
public void turtle_01()
{