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 2015/10/21 18:46:27 UTC
[08/10] jena git commit: JENA-1051: Better strict mode setting and
testing.
JENA-1051: Better strict mode setting and testing.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/31583c52
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/31583c52
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/31583c52
Branch: refs/heads/master
Commit: 31583c5234579afdad0e15ef81d75844d5a96eb9
Parents: 1cb87df
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Oct 21 16:00:06 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Oct 21 17:45:03 2015 +0100
----------------------------------------------------------------------
jena-arq/src/main/java/org/apache/jena/riot/RIOT.java | 4 ++++
.../org/apache/jena/riot/system/ParserProfileBase.java | 4 ++--
.../main/java/org/apache/jena/riot/system/RiotLib.java | 7 ++-----
.../org/apache/jena/riot/langsuite/LangTestCase.java | 13 ++++---------
4 files changed, 12 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/31583c52/jena-arq/src/main/java/org/apache/jena/riot/RIOT.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RIOT.java b/jena-arq/src/main/java/org/apache/jena/riot/RIOT.java
index e6dac18..8cbd105 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/RIOT.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RIOT.java
@@ -51,6 +51,10 @@ public class RIOT {
SysRIOT.StrictXSDLexicialForms = state ;
}
+ public static boolean isStrictMode() {
+ return SysRIOT.strictMode ;
+ }
+
public static void init() {
if ( initialized )
return ;
http://git-wip-us.apache.org/repos/asf/jena/blob/31583c52/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileBase.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileBase.java b/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileBase.java
index 7146b79..d6c85fe 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileBase.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileBase.java
@@ -24,8 +24,8 @@ import org.apache.jena.graph.Node ;
import org.apache.jena.graph.NodeFactory ;
import org.apache.jena.graph.Triple ;
import org.apache.jena.iri.IRI ;
+import org.apache.jena.riot.RIOT ;
import org.apache.jena.riot.RiotException ;
-import org.apache.jena.riot.SysRIOT ;
import org.apache.jena.riot.lang.LabelToNode ;
import org.apache.jena.riot.tokens.Token ;
import org.apache.jena.riot.tokens.TokenType ;
@@ -39,7 +39,7 @@ public class ParserProfileBase implements ParserProfile {
protected ErrorHandler errorHandler ;
protected Prologue prologue ;
protected LabelToNode labelMapping ;
- protected boolean strictMode = SysRIOT.strictMode ;
+ protected boolean strictMode = RIOT.isStrictMode() ;
public ParserProfileBase(Prologue prologue, ErrorHandler errorHandler) {
this(prologue, errorHandler, SyntaxLabels.createLabelToNode()) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/31583c52/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java b/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java
index 54fe37f..31d23c8 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/RiotLib.java
@@ -38,10 +38,7 @@ import org.apache.jena.graph.Node ;
import org.apache.jena.graph.NodeFactory ;
import org.apache.jena.graph.Triple ;
import org.apache.jena.query.ARQ ;
-import org.apache.jena.riot.Lang ;
-import org.apache.jena.riot.RDFLanguages ;
-import org.apache.jena.riot.SysRIOT ;
-import org.apache.jena.riot.WriterDatasetRIOT ;
+import org.apache.jena.riot.* ;
import org.apache.jena.riot.lang.LabelToNode ;
import org.apache.jena.riot.tokens.Token ;
import org.apache.jena.riot.tokens.Tokenizer ;
@@ -117,7 +114,7 @@ public class RiotLib
{
if ( sameLang(NTRIPLES, lang) || sameLang(NQUADS, lang) )
{
- boolean checking = SysRIOT.strictMode ;
+ boolean checking = RIOT.isStrictMode() ;
// If strict mode, do checking e.g. URIs
return profile(baseIRI, false, checking, handler) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/31583c52/jena-arq/src/test/java/org/apache/jena/riot/langsuite/LangTestCase.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/langsuite/LangTestCase.java b/jena-arq/src/test/java/org/apache/jena/riot/langsuite/LangTestCase.java
index 903558c..1d7a3ce 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/langsuite/LangTestCase.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/langsuite/LangTestCase.java
@@ -19,7 +19,7 @@
package org.apache.jena.riot.langsuite;
import org.apache.jena.atlas.legacy.BaseTest2 ;
-import org.apache.jena.riot.SysRIOT ;
+import org.apache.jena.riot.RIOT ;
import org.apache.jena.riot.system.ErrorHandlerFactory ;
import org.apache.jena.sparql.junit.EarlReport ;
import org.apache.jena.sparql.junit.EarlTestCase ;
@@ -33,7 +33,6 @@ public abstract class LangTestCase extends EarlTestCase
protected abstract void _tearDown() ;
protected boolean sysRIOT_strictMode ;
- protected boolean sysRIOT_strictXSDLexicialForms ;
@Override
final public void setUpTest()
@@ -45,11 +44,8 @@ public abstract class LangTestCase extends EarlTestCase
// If the test suite is sloppy, with IRIs that are not good practice, you may need
// to run with warnings as not-errors ....
//BaseTest.setTestLogging(ErrorHandlerFactory.errorHandlerStd) ;
- sysRIOT_strictMode = SysRIOT.strictMode ;
- sysRIOT_strictXSDLexicialForms = SysRIOT.StrictXSDLexicialForms ;
-
- SysRIOT.strictMode = true ;
- SysRIOT.StrictXSDLexicialForms = true ;
+ sysRIOT_strictMode = RIOT.isStrictMode() ;
+ RIOT.setStrictMode(true) ;
_setUp() ;
}
@@ -57,8 +53,7 @@ public abstract class LangTestCase extends EarlTestCase
final public void tearDownTest()
{
_tearDown() ;
- SysRIOT.strictMode = sysRIOT_strictMode ;
- SysRIOT.StrictXSDLexicialForms = sysRIOT_strictXSDLexicialForms ;
+ RIOT.setStrictMode(sysRIOT_strictMode) ;
BaseTest2.unsetTestLogging() ;
}