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/12/19 21:24:54 UTC

svn commit: r1424082 - in /jena/trunk/jena-arq/src/test/java/org: apache/jena/riot/ apache/jena/riot/lang/ apache/jena/riot/langsuite/ apache/jena/riot/process/ apache/jena/riot/tokens/ openjena/riot/ openjena/riot/out/ openjena/riot/process/

Author: andy
Date: Wed Dec 19 20:24:54 2012
New Revision: 1424082

URL: http://svn.apache.org/viewvc?rev=1424082&view=rev
Log:
Migrate tests from org.openjena to org.apache.jena

Added:
    jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/ErrorHandlerTestLib.java
      - copied, changed from r1422691, jena/trunk/jena-arq/src/test/java/org/openjena/riot/ErrorHandlerTestLib.java
    jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TS_RiotMisc.java
    jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestChecker.java
      - copied, changed from r1422691, jena/trunk/jena-arq/src/test/java/org/openjena/riot/TestChecker.java
    jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TS_Lang.java
    jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/process/
    jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/process/TS_Process.java
    jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/process/TestNormalization.java
      - copied, changed from r1424047, jena/trunk/jena-arq/src/test/java/org/openjena/riot/process/TestNormalization.java
    jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/tokens/TS_Tokens.java
    jena/trunk/jena-arq/src/test/java/org/openjena/riot/VocavTestRIOT.java
      - copied, changed from r1422691, jena/trunk/jena-arq/src/test/java/org/openjena/riot/TestVocabRIOT.java
    jena/trunk/jena-arq/src/test/java/org/openjena/riot/out/TS_Out.java
Removed:
    jena/trunk/jena-arq/src/test/java/org/openjena/riot/ErrorHandlerTestLib.java
    jena/trunk/jena-arq/src/test/java/org/openjena/riot/TestChecker.java
    jena/trunk/jena-arq/src/test/java/org/openjena/riot/TestVocabRIOT.java
    jena/trunk/jena-arq/src/test/java/org/openjena/riot/process/TestNormalization.java
Modified:
    jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TC_Riot.java
    jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestIRI.java
    jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNQuads.java
    jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNTriples.java
    jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNTuples.java
    jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangRdfJson.java
    jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangTrig.java
    jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangTurtle.java
    jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/FactoryTestRiot.java
    jena/trunk/jena-arq/src/test/java/org/openjena/riot/TS_Riot1.java
    jena/trunk/jena-arq/src/test/java/org/openjena/riot/TestLangTag.java

Copied: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/ErrorHandlerTestLib.java (from r1422691, jena/trunk/jena-arq/src/test/java/org/openjena/riot/ErrorHandlerTestLib.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/ErrorHandlerTestLib.java?p2=jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/ErrorHandlerTestLib.java&p1=jena/trunk/jena-arq/src/test/java/org/openjena/riot/ErrorHandlerTestLib.java&r1=1422691&r2=1424082&rev=1424082&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/openjena/riot/ErrorHandlerTestLib.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/ErrorHandlerTestLib.java Wed Dec 19 20:24:54 2012
@@ -16,11 +16,13 @@
  * limitations under the License.
  */
 
-package org.openjena.riot;
+package org.apache.jena.riot;
 
 import java.util.ArrayList ;
 import java.util.List ;
 
+import org.openjena.riot.ErrorHandler ;
+
 public class ErrorHandlerTestLib
 {
     public static class ExFatal extends RuntimeException {}

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TC_Riot.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TC_Riot.java?rev=1424082&r1=1424081&r2=1424082&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TC_Riot.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TC_Riot.java Wed Dec 19 20:24:54 2012
@@ -19,25 +19,31 @@
 package org.apache.jena.riot;
 
 import org.apache.jena.riot.adapters.TS_RIOTAdapters ;
+import org.apache.jena.riot.lang.TS_Lang ;
+import org.apache.jena.riot.process.TS_Process ;
 import org.apache.jena.riot.stream.TS_IO2 ;
-import org.apache.jena.riot.tokens.TestTokenForNode ;
-import org.apache.jena.riot.tokens.TestTokenizer ;
 import org.junit.BeforeClass ;
 import org.junit.runner.RunWith ;
 import org.junit.runners.Suite ;
 import org.openjena.riot.RIOT ;
 import org.openjena.riot.TS_Riot1 ;
+import org.openjena.riot.out.TS_Out ;
 
 @RunWith(Suite.class)
 @Suite.SuiteClasses( {
-      TS_Riot1.class
-      , TestTokenizer.class
-      , TestTokenForNode.class
+    // Old world - org.openjena.riot
+    TS_Riot1.class
+    , TS_Out.class
 
-      , TS_LangSuite.class
-      , TS_ReaderRIOT.class
-      , TS_IO2.class
-      , TS_RIOTAdapters.class
+    // New world - org.apache.jena.riot
+    , TS_Lang.class
+    , TS_LangSuite.class
+    , TS_ReaderRIOT.class
+    , TS_IO2.class
+    , TS_RIOTAdapters.class
+    , TS_Process.class
+    , TS_ReaderRIOT.class
+    , TS_RiotMisc.class
 })
 
 

Added: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TS_RiotMisc.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TS_RiotMisc.java?rev=1424082&view=auto
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TS_RiotMisc.java (added)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TS_RiotMisc.java Wed Dec 19 20:24:54 2012
@@ -0,0 +1,35 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.riot;
+
+import org.junit.runner.RunWith ;
+import org.junit.runners.Suite ;
+import org.junit.runners.Suite.SuiteClasses ;
+
+
+@RunWith(Suite.class)
+@SuiteClasses({ 
+    TestChecker.class
+})
+
+public class TS_RiotMisc
+{
+
+}
+

Copied: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestChecker.java (from r1422691, jena/trunk/jena-arq/src/test/java/org/openjena/riot/TestChecker.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestChecker.java?p2=jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestChecker.java&p1=jena/trunk/jena-arq/src/test/java/org/openjena/riot/TestChecker.java&r1=1422691&r2=1424082&rev=1424082&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/openjena/riot/TestChecker.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestChecker.java Wed Dec 19 20:24:54 2012
@@ -16,14 +16,14 @@
  * limitations under the License.
  */
 
-package org.openjena.riot;
+package org.apache.jena.riot;
 
+import org.apache.jena.riot.ErrorHandlerTestLib.ExError ;
+import org.apache.jena.riot.ErrorHandlerTestLib.ExWarning ;
 import org.apache.jena.riot.system.Checker ;
 import org.junit.After ;
 import org.junit.Before ;
 import org.junit.Test ;
-import org.openjena.riot.ErrorHandlerTestLib.ExError ;
-import org.openjena.riot.ErrorHandlerTestLib.ExWarning ;
 
 import com.hp.hpl.jena.graph.Node ;
 import com.hp.hpl.jena.shared.impl.JenaParameters ;

Added: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TS_Lang.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TS_Lang.java?rev=1424082&view=auto
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TS_Lang.java (added)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TS_Lang.java Wed Dec 19 20:24:54 2012
@@ -0,0 +1,42 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.riot.lang;
+
+import org.junit.runner.RunWith ;
+import org.junit.runners.Suite ;
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses( {
+      TestIRI.class
+    , TestLang.class
+    , TestNodeAllocator.class
+    
+    , TestTurtleTerms.class
+    , TestLangNTriples.class
+    , TestLangNQuads.class
+    , TestLangTurtle.class
+    , TestLangTrig.class
+    , TestLangRdfJson.class
+    , TestParserFactory.class
+})
+
+
+public class TS_Lang
+{}
+

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestIRI.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestIRI.java?rev=1424082&r1=1424081&r2=1424082&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestIRI.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestIRI.java Wed Dec 19 20:24:54 2012
@@ -23,13 +23,13 @@ import com.hp.hpl.jena.graph.Node ;
 import org.apache.jena.atlas.junit.BaseTest ;
 import org.apache.jena.iri.IRI ;
 import org.apache.jena.iri.IRIFactory ;
+import org.apache.jena.riot.ErrorHandlerTestLib ;
+import org.apache.jena.riot.ErrorHandlerTestLib.ExWarning ;
 import org.apache.jena.riot.checker.CheckerIRI ;
 import org.apache.jena.riot.system.Checker ;
 import org.apache.jena.riot.system.RiotLib ;
 import org.junit.Test ;
 import org.openjena.riot.ErrorHandler ;
-import org.openjena.riot.ErrorHandlerTestLib ;
-import org.openjena.riot.ErrorHandlerTestLib.ExWarning ;
 
 public class TestIRI extends BaseTest
 {

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNQuads.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNQuads.java?rev=1424082&r1=1424081&r2=1424082&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNQuads.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNQuads.java Wed Dec 19 20:24:54 2012
@@ -18,13 +18,13 @@
 
 package org.apache.jena.riot.lang;
 
+import org.apache.jena.riot.ErrorHandlerTestLib.ExFatal ;
 import org.apache.jena.riot.lang.LangRIOT ;
 import org.apache.jena.riot.lang.RDFParserOutput ;
 import org.apache.jena.riot.lang.RDFParserOutputCounting ;
 import org.apache.jena.riot.lang.RDFParserOutputLib ;
 import org.apache.jena.riot.tokens.Tokenizer ;
 import org.junit.Test ;
-import org.openjena.riot.ErrorHandlerTestLib.ExFatal ;
 import org.openjena.riot.RiotReader ;
 
 import com.hp.hpl.jena.graph.Node ;

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNTriples.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNTriples.java?rev=1424082&r1=1424081&r2=1424082&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNTriples.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNTriples.java Wed Dec 19 20:24:54 2012
@@ -23,10 +23,10 @@ import java.io.StringReader ;
 import org.apache.jena.atlas.lib.StrUtils ;
 import org.apache.jena.riot.RDFLanguages ;
 import org.apache.jena.riot.WebReader2 ;
+import org.apache.jena.riot.ErrorHandlerTestLib.ErrorHandlerEx ;
+import org.apache.jena.riot.ErrorHandlerTestLib.ExFatal ;
 import org.apache.jena.riot.tokens.Tokenizer ;
 import org.junit.Test ;
-import org.openjena.riot.ErrorHandlerTestLib.ErrorHandlerEx ;
-import org.openjena.riot.ErrorHandlerTestLib.ExFatal ;
 import org.openjena.riot.RiotException ;
 import org.openjena.riot.RiotReader ;
 

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNTuples.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNTuples.java?rev=1424082&r1=1424081&r2=1424082&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNTuples.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNTuples.java Wed Dec 19 20:24:54 2012
@@ -22,6 +22,10 @@ import java.io.ByteArrayInputStream ;
 
 import org.apache.jena.atlas.junit.BaseTest ;
 import org.apache.jena.atlas.lib.StrUtils ;
+import org.apache.jena.riot.ErrorHandlerTestLib.ErrorHandlerEx ;
+import org.apache.jena.riot.ErrorHandlerTestLib.ExError ;
+import org.apache.jena.riot.ErrorHandlerTestLib.ExFatal ;
+import org.apache.jena.riot.ErrorHandlerTestLib.ExWarning ;
 import org.apache.jena.riot.lang.LangRIOT ;
 import org.apache.jena.riot.lang.RDFParserOutput ;
 import org.apache.jena.riot.lang.RDFParserOutputCounting ;
@@ -32,10 +36,6 @@ import org.apache.jena.riot.tokens.Token
 import org.junit.Test ;
 import org.openjena.riot.RiotException ;
 import org.openjena.riot.RiotReader ;
-import org.openjena.riot.ErrorHandlerTestLib.ErrorHandlerEx ;
-import org.openjena.riot.ErrorHandlerTestLib.ExError ;
-import org.openjena.riot.ErrorHandlerTestLib.ExFatal ;
-import org.openjena.riot.ErrorHandlerTestLib.ExWarning ;
 
 /** Test of syntax by a tuples parser (does not include node validitiy checking) */ 
 

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangRdfJson.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangRdfJson.java?rev=1424082&r1=1424081&r2=1424082&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangRdfJson.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangRdfJson.java Wed Dec 19 20:24:54 2012
@@ -27,6 +27,8 @@ import org.apache.jena.atlas.junit.BaseT
 import org.apache.jena.atlas.lib.StrUtils ;
 import org.apache.jena.riot.RDFLanguages ;
 import org.apache.jena.riot.WebReader2 ;
+import org.apache.jena.riot.ErrorHandlerTestLib.ErrorHandlerEx ;
+import org.apache.jena.riot.ErrorHandlerTestLib.ExFatal ;
 import org.apache.jena.riot.lang.LangRDFJSON ;
 import org.apache.jena.riot.lang.RDFParserOutputCounting ;
 import org.apache.jena.riot.lang.RDFParserOutputLib ;
@@ -35,8 +37,6 @@ import org.apache.jena.riot.tokens.Token
 import org.junit.AfterClass ;
 import org.junit.BeforeClass ;
 import org.junit.Test ;
-import org.openjena.riot.ErrorHandlerTestLib.ErrorHandlerEx ;
-import org.openjena.riot.ErrorHandlerTestLib.ExFatal ;
 import org.openjena.riot.RiotReader ;
 import org.openjena.riot.SysRIOT ;
 

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangTrig.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangTrig.java?rev=1424082&r1=1424081&r2=1424082&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangTrig.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangTrig.java Wed Dec 19 20:24:54 2012
@@ -20,14 +20,14 @@ package org.apache.jena.riot.lang;
 
 import org.apache.jena.atlas.junit.BaseTest ;
 import org.apache.jena.atlas.lib.StrUtils ;
+import org.apache.jena.riot.ErrorHandlerTestLib.ErrorHandlerEx ;
+import org.apache.jena.riot.ErrorHandlerTestLib.ExWarning ;
 import org.apache.jena.riot.lang.LangTriG ;
 import org.apache.jena.riot.lang.RDFParserOutput ;
 import org.apache.jena.riot.lang.RDFParserOutputLib ;
 import org.apache.jena.riot.tokens.Tokenizer ;
 import org.apache.jena.riot.tokens.TokenizerFactory ;
 import org.junit.Test ;
-import org.openjena.riot.ErrorHandlerTestLib.ErrorHandlerEx ;
-import org.openjena.riot.ErrorHandlerTestLib.ExWarning ;
 import org.openjena.riot.RiotReader ;
 
 import com.hp.hpl.jena.graph.Triple ;

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangTurtle.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangTurtle.java?rev=1424082&r1=1424081&r2=1424082&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangTurtle.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangTurtle.java Wed Dec 19 20:24:54 2012
@@ -29,6 +29,9 @@ import org.apache.jena.atlas.junit.BaseT
 import org.apache.jena.atlas.lib.StrUtils ;
 import org.apache.jena.riot.RDFLanguages ;
 import org.apache.jena.riot.WebReader2 ;
+import org.apache.jena.riot.ErrorHandlerTestLib.ErrorHandlerEx ;
+import org.apache.jena.riot.ErrorHandlerTestLib.ExFatal ;
+import org.apache.jena.riot.ErrorHandlerTestLib.ExWarning ;
 import org.apache.jena.riot.lang.LangTurtle ;
 import org.apache.jena.riot.lang.RDFParserOutput ;
 import org.apache.jena.riot.lang.RDFParserOutputLib ;
@@ -38,9 +41,6 @@ import org.junit.AfterClass ;
 import org.junit.BeforeClass ;
 import org.junit.Test ;
 import org.openjena.riot.* ;
-import org.openjena.riot.ErrorHandlerTestLib.ErrorHandlerEx ;
-import org.openjena.riot.ErrorHandlerTestLib.ExFatal ;
-import org.openjena.riot.ErrorHandlerTestLib.ExWarning ;
 
 import com.hp.hpl.jena.graph.Graph ;
 import com.hp.hpl.jena.graph.Triple ;

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/FactoryTestRiot.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/FactoryTestRiot.java?rev=1424082&r1=1424081&r2=1424082&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/FactoryTestRiot.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/langsuite/FactoryTestRiot.java Wed Dec 19 20:24:54 2012
@@ -22,7 +22,7 @@ import junit.framework.Test ;
 import junit.framework.TestSuite ;
 import org.apache.jena.riot.RDFLanguages ;
 import org.openjena.riot.RiotException ;
-import org.openjena.riot.TestVocabRIOT ;
+import org.openjena.riot.VocavTestRIOT ;
 
 import com.hp.hpl.jena.rdf.model.Resource ;
 import com.hp.hpl.jena.sparql.junit.EarlReport ;
@@ -68,7 +68,7 @@ public class FactoryTestRiot extends Tes
             Resource input = action ;
             Resource output = result ; 
             
-            String baseIRI = TestVocabRIOT.assumedBaseURI ;
+            String baseIRI = VocavTestRIOT.assumedBaseURI ;
             String x = input.getLocalName() ;
             // Yuk, yuk, yuk.
             baseIRI = baseIRI+x ;

Added: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/process/TS_Process.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/process/TS_Process.java?rev=1424082&view=auto
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/process/TS_Process.java (added)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/process/TS_Process.java Wed Dec 19 20:24:54 2012
@@ -0,0 +1,33 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.riot.process;
+
+import org.junit.runner.RunWith ;
+import org.junit.runners.Suite ;
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses( {
+    TestNormalization.class
+   
+})
+
+public class TS_Process
+{
+}
+

Copied: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/process/TestNormalization.java (from r1424047, jena/trunk/jena-arq/src/test/java/org/openjena/riot/process/TestNormalization.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/process/TestNormalization.java?p2=jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/process/TestNormalization.java&p1=jena/trunk/jena-arq/src/test/java/org/openjena/riot/process/TestNormalization.java&r1=1424047&r2=1424082&rev=1424082&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/openjena/riot/process/TestNormalization.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/process/TestNormalization.java Wed Dec 19 20:24:54 2012
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.openjena.riot.process;
+package org.apache.jena.riot.process;
 
 import org.apache.jena.atlas.junit.BaseTest ;
 import org.apache.jena.riot.process.normalize.CanonicalizeLiteral ;

Added: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/tokens/TS_Tokens.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/tokens/TS_Tokens.java?rev=1424082&view=auto
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/tokens/TS_Tokens.java (added)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/tokens/TS_Tokens.java Wed Dec 19 20:24:54 2012
@@ -0,0 +1,32 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.riot.tokens;
+
+import org.junit.runner.RunWith ;
+import org.junit.runners.Suite ;
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses( {
+      TestTokenizer.class
+    , TestTokenForNode.class
+})
+
+public class TS_Tokens
+{ }
+

Modified: jena/trunk/jena-arq/src/test/java/org/openjena/riot/TS_Riot1.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/openjena/riot/TS_Riot1.java?rev=1424082&r1=1424081&r2=1424082&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/openjena/riot/TS_Riot1.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/openjena/riot/TS_Riot1.java Wed Dec 19 20:24:54 2012
@@ -19,39 +19,16 @@
 package org.openjena.riot;
 
 import org.apache.jena.atlas.junit.BaseTest ;
-import org.apache.jena.riot.lang.* ;
 import org.junit.AfterClass ;
 import org.junit.BeforeClass ;
 import org.junit.runner.RunWith ;
 import org.junit.runners.Suite ;
-import org.openjena.riot.out.* ;
-import org.openjena.riot.process.TestNormalization ;
 
 @RunWith(Suite.class)
 @Suite.SuiteClasses( {
     TestWebContent.class
-    
     , TestPrefixMap.class
-    , TestIRI.class
-    , TestChecker.class
-    , TestLang.class
-    , TestNodeAllocator.class
-    
-    , TestTurtleTerms.class
-    , TestLangNTriples.class
-    , TestLangNQuads.class
-    , TestLangTurtle.class
-    , TestLangTrig.class
-    , TestLangRdfJson.class
-    , TestParserFactory.class
-
-    , TestNodeFmt.class
-    , TestNodeFmtLib.class
-    , TestOutput.class
-    , TestOutputNTriples.class
-    , TestOutputRDFJSON.class
     , TestLangTag.class
-    , TestNormalization.class
 })
 
 public class TS_Riot1

Modified: jena/trunk/jena-arq/src/test/java/org/openjena/riot/TestLangTag.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/openjena/riot/TestLangTag.java?rev=1424082&r1=1424081&r2=1424082&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/openjena/riot/TestLangTag.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/openjena/riot/TestLangTag.java Wed Dec 19 20:24:54 2012
@@ -21,7 +21,6 @@ package org.openjena.riot;
 import org.apache.jena.atlas.junit.BaseTest ;
 import org.junit.Test ;
 
-
 public class TestLangTag extends BaseTest
 {
     @Test public void parse_01() 

Copied: jena/trunk/jena-arq/src/test/java/org/openjena/riot/VocavTestRIOT.java (from r1422691, jena/trunk/jena-arq/src/test/java/org/openjena/riot/TestVocabRIOT.java)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/openjena/riot/VocavTestRIOT.java?p2=jena/trunk/jena-arq/src/test/java/org/openjena/riot/VocavTestRIOT.java&p1=jena/trunk/jena-arq/src/test/java/org/openjena/riot/TestVocabRIOT.java&r1=1422691&r2=1424082&rev=1424082&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/openjena/riot/TestVocabRIOT.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/openjena/riot/VocavTestRIOT.java Wed Dec 19 20:24:54 2012
@@ -23,7 +23,7 @@ import com.hp.hpl.jena.rdf.model.ModelFa
 import com.hp.hpl.jena.rdf.model.Property ;
 import com.hp.hpl.jena.rdf.model.Resource ;
 
-public class TestVocabRIOT
+public class VocavTestRIOT
 {
     public static String assumedBaseURI = "http://example/base/" ;
     

Added: jena/trunk/jena-arq/src/test/java/org/openjena/riot/out/TS_Out.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/openjena/riot/out/TS_Out.java?rev=1424082&view=auto
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/openjena/riot/out/TS_Out.java (added)
+++ jena/trunk/jena-arq/src/test/java/org/openjena/riot/out/TS_Out.java Wed Dec 19 20:24:54 2012
@@ -0,0 +1,52 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openjena.riot.out;
+
+import org.apache.jena.riot.lang.* ;
+import org.apache.jena.riot.process.TestNormalization ;
+import org.junit.runner.RunWith ;
+import org.junit.runners.Suite ;
+
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses( {
+      TestIRI.class
+    , TestLang.class
+    , TestNodeAllocator.class
+    
+    , TestTurtleTerms.class
+    , TestLangNTriples.class
+    , TestLangNQuads.class
+    , TestLangTurtle.class
+    , TestLangTrig.class
+    , TestLangRdfJson.class
+    , TestParserFactory.class
+
+    , TestNodeFmt.class
+    , TestNodeFmtLib.class
+    , TestOutput.class
+    , TestOutputNTriples.class
+    , TestOutputRDFJSON.class
+    , TestNormalization.class
+
+})
+
+public class TS_Out
+{}
+