This is an automated email from the ASF dual-hosted git repository. andy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/jena.git
commit d31fd722e064e5af6e49ec0d732e8660d8695886 Author: Andy Seaborne <[email protected]> AuthorDate: Sat Dec 20 15:36:44 2025 +0000 GH-3664: Rename ARP1 test package as oaj.rdfxml.arp1tests --- .../rdfxml/{xmlinput1 => arp1tests}/ARPTests.java | 2 +- .../InputStreamFactoryARP.java | 2 +- .../{xmlinput1 => arp1tests}/InputSupplier.java | 2 +- .../rdfxml/{xmlinput1 => arp1tests}/NTripleARP1.java | 3 ++- .../{xmlinput1 => arp1tests}/NTripleTestSuite.java | 5 ++++- .../{xmlinput1 => arp1tests}/TS3_xmlinput1.java | 20 ++++++++++---------- .../{xmlinput1 => arp1tests}/TestErrorMsg.java | 3 ++- .../TestPropEltErrorMsg.java | 2 +- .../{xmlinput1 => arp1tests}/TestRDFXML_URI.java | 4 +++- .../rdfxml/{xmlinput1 => arp1tests}/TestScope.java | 2 +- .../{xmlinput1 => arp1tests}/TestSuiteException.java | 4 +++- .../{xmlinput1 => arp1tests}/TestSuiteWG_RDFXML.java | 4 ++-- .../TestSuiteWG_RDFXML_ARP.java | 4 ++-- .../rdfxml/{xmlinput1 => arp1tests}/TestURIs.java | 2 +- .../rdfxml/{xmlinput1 => arp1tests}/TestsARP.java | 5 +++-- .../{xmlinput1 => arp1tests}/TestsDOM2RDF.java | 3 ++- .../{xmlinput1 => arp1tests}/TestsMoreDOM2RDF.java | 6 +++++- .../{xmlinput1 => arp1tests}/TestsSAX2RDF.java | 5 ++++- .../{xmlinput1 => arp1tests}/TestsSAX2RDFMore.java | 7 +++++-- .../{xmlinput1 => arp1tests}/TestsStAX2Model.java | 3 ++- .../{xmlinput1 => arp1tests}/TestsTainting.java | 4 +++- .../rdfxml/{xmlinput1 => arp1tests}/WGTestSuite.java | 5 ++++- .../{xmlinput1 => arp1tests}/states/AttrEvent.java | 3 ++- .../states/ElementEvent.java | 3 ++- .../{xmlinput1 => arp1tests}/states/Event.java | 3 ++- .../{xmlinput1 => arp1tests}/states/EventList.java | 4 +++- .../{xmlinput1 => arp1tests}/states/EventRecord.java | 2 +- .../states/FullEventRecord.java | 2 +- .../states/InternalEvent.java | 2 +- .../{xmlinput1 => arp1tests}/states/QName.java | 2 +- .../states/TestARPStates.java | 2 +- .../{xmlinput1 => arp1tests}/states/TestData.java | 3 ++- .../states/TestEventList.java | 3 ++- .../{xmlinput1 => arp1tests}/states/TestFrame.java | 6 +++++- .../{xmlinput1 => arp1tests}/states/TestHandler.java | 2 +- .../java/org/apache/jena/test/JenaCoreTestAll.java | 2 +- 36 files changed, 87 insertions(+), 49 deletions(-) diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/ARPTests.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/ARPTests.java similarity index 96% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/ARPTests.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/ARPTests.java index 1fe85e3815..587f8d11f0 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/ARPTests.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/ARPTests.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1tests; /** * Constants for the test suite for ARP. diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/InputStreamFactoryARP.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/InputStreamFactoryARP.java similarity index 98% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/InputStreamFactoryARP.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/InputStreamFactoryARP.java index af4ea8615a..4ee0abc05a 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/InputStreamFactoryARP.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/InputStreamFactoryARP.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1tests; import java.io.*; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/InputSupplier.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/InputSupplier.java similarity index 95% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/InputSupplier.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/InputSupplier.java index e82910599d..446c1df206 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/InputSupplier.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/InputSupplier.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1tests; import java.io.IOException; import java.io.InputStream; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/NTripleARP1.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/NTripleARP1.java similarity index 99% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/NTripleARP1.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/NTripleARP1.java index 6db0555bbd..548fbf0e9b 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/NTripleARP1.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/NTripleARP1.java @@ -22,7 +22,7 @@ * Created on July 13, 2001, 10:06 PM */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1tests; import java.io.File; import java.io.FileInputStream; @@ -35,6 +35,7 @@ import java.util.Locale; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.apache.jena.rdfxml.xmlinput1.*; import org.xml.sax.ErrorHandler; import org.xml.sax.Locator; import org.xml.sax.SAXException; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/NTripleTestSuite.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/NTripleTestSuite.java similarity index 97% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/NTripleTestSuite.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/NTripleTestSuite.java index 978471e6f0..b75f7ca1d1 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/NTripleTestSuite.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/NTripleTestSuite.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1tests; import java.io.*; import java.util.HashSet; import java.util.Set; @@ -25,6 +25,9 @@ import org.junit.Assert; import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.RDFErrorHandler; +import org.apache.jena.rdfxml.xmlinput1.ALiteral; +import org.apache.jena.rdfxml.xmlinput1.ARPEventHandler; +import org.apache.jena.rdfxml.xmlinput1.AResource; import org.apache.jena.rdfxml.xmlinput1.impl.ARPResource; import org.apache.jena.rdfxml.xmlinput1.impl.ARPSaxErrorHandler; import org.xml.sax.SAXException; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TS3_xmlinput1.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TS3_xmlinput1.java similarity index 67% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TS3_xmlinput1.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TS3_xmlinput1.java index 5a5e244c5b..60049e0ae8 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TS3_xmlinput1.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TS3_xmlinput1.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1tests; import junit.framework.TestSuite; @@ -30,17 +30,17 @@ public class TS3_xmlinput1 extends TestSuite private TS3_xmlinput1() { super("RDF/XML Input ARP1"); - addTest( org.apache.jena.rdfxml.xmlinput1.TestURIs.suite()); - addTest( org.apache.jena.rdfxml.xmlinput1.TestSuiteWG_RDFXML.suite()); - addTest( org.apache.jena.rdfxml.xmlinput1.TestSuiteWG_RDFXML_ARP.suite()); + addTest( org.apache.jena.rdfxml.arp1tests.TestURIs.suite()); + addTest( org.apache.jena.rdfxml.arp1tests.TestSuiteWG_RDFXML.suite()); + addTest( org.apache.jena.rdfxml.arp1tests.TestSuiteWG_RDFXML_ARP.suite()); - addTest( org.apache.jena.rdfxml.xmlinput1.TestsARP.suite()); - addTest( org.apache.jena.rdfxml.xmlinput1.states.TestARPStates.suite()); + addTest( org.apache.jena.rdfxml.arp1tests.TestsARP.suite()); + addTest( org.apache.jena.rdfxml.arp1tests.states.TestARPStates.suite()); - addTest( org.apache.jena.rdfxml.xmlinput1.TestsTainting.suite()); - addTest( org.apache.jena.rdfxml.xmlinput1.TestsSAX2RDF.suite()); - addTest( org.apache.jena.rdfxml.xmlinput1.TestsStAX2Model.suite()); - addTest( org.apache.jena.rdfxml.xmlinput1.TestRDFXML_URI.suite()); + addTest( org.apache.jena.rdfxml.arp1tests.TestsTainting.suite()); + addTest( org.apache.jena.rdfxml.arp1tests.TestsSAX2RDF.suite()); + addTest( org.apache.jena.rdfxml.arp1tests.TestsStAX2Model.suite()); + addTest( org.apache.jena.rdfxml.arp1tests.TestRDFXML_URI.suite()); } private void addTest(String name, TestSuite tc) { diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestErrorMsg.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestErrorMsg.java similarity index 97% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestErrorMsg.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestErrorMsg.java index fd704f24f2..5478a2dbdc 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestErrorMsg.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestErrorMsg.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1tests; import java.io.FileInputStream; import java.io.IOException; @@ -26,6 +26,7 @@ import java.util.regex.Pattern; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.apache.jena.rdfxml.xmlinput1.ARP; import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestPropEltErrorMsg.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestPropEltErrorMsg.java similarity index 99% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestPropEltErrorMsg.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestPropEltErrorMsg.java index 0dbcc9a6f4..f795c978f4 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestPropEltErrorMsg.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestPropEltErrorMsg.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1tests; import java.util.ArrayList; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestRDFXML_URI.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestRDFXML_URI.java similarity index 95% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestRDFXML_URI.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestRDFXML_URI.java index 97387302f1..e183562fea 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestRDFXML_URI.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestRDFXML_URI.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1tests; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -30,6 +30,8 @@ import org.apache.jena.irix.IRIs; import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.RDFErrorHandler; +import org.apache.jena.rdfxml.xmlinput1.ParseException; +import org.apache.jena.rdfxml.xmlinput1.RDFXMLReader; import org.apache.jena.shared.JenaException; import org.junit.Test; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestScope.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestScope.java similarity index 98% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestScope.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestScope.java index 441f81f479..7af95e8fe3 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestScope.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestScope.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1tests; import java.io.FileInputStream; import java.io.IOException; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestSuiteException.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestSuiteException.java similarity index 97% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestSuiteException.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestSuiteException.java index 736d75d025..bdc074a0eb 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestSuiteException.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestSuiteException.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1tests; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; @@ -25,6 +25,8 @@ import org.apache.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.RDFErrorHandler; import org.apache.jena.rdf.model.RDFReaderI; import org.apache.jena.rdf.model.impl.RDFDefaultErrorHandler; +import org.apache.jena.rdfxml.xmlinput1.ARPErrorNumbers; +import org.apache.jena.rdfxml.xmlinput1.RDFXMLReader; import org.apache.jena.shared.JenaException; public class TestSuiteException diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestSuiteWG_RDFXML.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestSuiteWG_RDFXML.java similarity index 99% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestSuiteWG_RDFXML.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestSuiteWG_RDFXML.java index a501b97671..a7a03e1291 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestSuiteWG_RDFXML.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestSuiteWG_RDFXML.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1tests; import junit.framework.Test; import junit.framework.TestSuite; @@ -27,7 +27,7 @@ public class TestSuiteWG_RDFXML { TestSuite testSuite = new TestSuite("WG RDF/XML"); WGTestSuite testSuiteWG = - new org.apache.jena.rdfxml.xmlinput1.WGTestSuite( + new org.apache.jena.rdfxml.arp1tests.WGTestSuite( new InputStreamFactoryARP("http://www.w3.org/2000/10/rdf-tests/rdfcore/";, "wg"), "WG Parser Tests", false); TestSuite testSuiteApproved = new TestSuite("APPROVED"); diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestSuiteWG_RDFXML_ARP.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestSuiteWG_RDFXML_ARP.java similarity index 99% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestSuiteWG_RDFXML_ARP.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestSuiteWG_RDFXML_ARP.java index fc27a0d9e7..b9b95c83ab 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestSuiteWG_RDFXML_ARP.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestSuiteWG_RDFXML_ARP.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1tests; import junit.framework.Test; @@ -26,7 +26,7 @@ public class TestSuiteWG_RDFXML_ARP { String base = "http://jcarroll.hpl.hp.com/arp-tests/";; - WGTestSuite testSuite = new org.apache.jena.rdfxml.xmlinput1.WGTestSuite + WGTestSuite testSuite = new org.apache.jena.rdfxml.arp1tests.WGTestSuite (new InputStreamFactoryARP(base, "arp") ,"ARP RDF/XML Tests" ,false); diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestURIs.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestURIs.java similarity index 98% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestURIs.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestURIs.java index b0abbb5e42..f3f8d40936 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestURIs.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestURIs.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1tests; import java.util.ArrayList; import java.util.List; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestsARP.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsARP.java similarity index 99% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestsARP.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsARP.java index 25eaee42bf..4e8cd776bd 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestsARP.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsARP.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1tests; import java.io.*; @@ -28,6 +28,7 @@ import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.RDFErrorHandler; import org.apache.jena.rdf.model.RDFReaderI; +import org.apache.jena.rdfxml.xmlinput1.*; import org.apache.jena.vocabulary.RDF; import org.junit.Assert; import org.slf4j.Logger; @@ -338,7 +339,7 @@ public class TestsARP extends TestCase implements RDFErrorHandler, ARPErrorNumbe checkExpected(); } - /** Create an {@link RDFXMLReader} that does not reolve the initial XML base. */ + /** Create an {@link RDFXMLReader} that does not resolve the initial XML base. */ private static RDFXMLReader baseTestReader() { return new RDFXMLReader(false); } diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestsDOM2RDF.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsDOM2RDF.java similarity index 95% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestsDOM2RDF.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsDOM2RDF.java index bd45d6dc2b..103e564c9b 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestsDOM2RDF.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsDOM2RDF.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1tests; import java.io.IOException; import java.io.InputStream; @@ -26,6 +26,7 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import org.apache.jena.rdf.model.Model; +import org.apache.jena.rdfxml.xmlinput1.DOM2Model; import org.apache.jena.shared.JenaException; import org.apache.jena.util.JenaXMLInput; import org.w3c.dom.Document; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestsMoreDOM2RDF.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsMoreDOM2RDF.java similarity index 90% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestsMoreDOM2RDF.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsMoreDOM2RDF.java index 2d31dd873e..856ab8d2da 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestsMoreDOM2RDF.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsMoreDOM2RDF.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1tests; import java.io.FileInputStream; import java.io.IOException; @@ -27,6 +27,10 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import junit.framework.TestCase; +import org.apache.jena.rdfxml.xmlinput1.ALiteral; +import org.apache.jena.rdfxml.xmlinput1.AResource; +import org.apache.jena.rdfxml.xmlinput1.DOM2Model; +import org.apache.jena.rdfxml.xmlinput1.StatementHandler; import org.apache.jena.shared.JenaException; import org.apache.jena.util.JenaXMLInput; import org.w3c.dom.Document; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestsSAX2RDF.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsSAX2RDF.java similarity index 99% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestsSAX2RDF.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsSAX2RDF.java index b425f6acab..6b4bc53000 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestsSAX2RDF.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsSAX2RDF.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1tests; import java.io.FileInputStream; import java.io.IOException; @@ -33,6 +33,9 @@ import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.RDFErrorHandler; import org.apache.jena.rdf.model.RDFReaderI; +import org.apache.jena.rdfxml.xmlinput1.RDFXMLReader; +import org.apache.jena.rdfxml.xmlinput1.SAX2Model; +import org.apache.jena.rdfxml.xmlinput1.SAX2RDF; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.xml.sax.InputSource; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestsSAX2RDFMore.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsSAX2RDFMore.java similarity index 92% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestsSAX2RDFMore.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsSAX2RDFMore.java index 5e1bc9ed18..be15c376b5 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestsSAX2RDFMore.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsSAX2RDFMore.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1tests; import java.io.FileInputStream; import java.io.InputStream; @@ -28,7 +28,10 @@ import junit.framework.TestCase; import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.RDFReaderI; -import org.apache.jena.rdfxml.xmlinput1.TestsSAX2RDF.RDFEHArray; +import org.apache.jena.rdfxml.arp1tests.TestsSAX2RDF.RDFEHArray; +import org.apache.jena.rdfxml.xmlinput1.RDFXMLReader; +import org.apache.jena.rdfxml.xmlinput1.SAX2Model; +import org.apache.jena.rdfxml.xmlinput1.SAX2RDF; import org.xml.sax.InputSource; import org.xml.sax.SAXParseException; import org.xml.sax.XMLReader; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestsStAX2Model.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsStAX2Model.java similarity index 99% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestsStAX2Model.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsStAX2Model.java index 56ef38c4e0..db1f5d8cee 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestsStAX2Model.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsStAX2Model.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1tests; import java.io.FileInputStream; import java.io.InputStream; @@ -28,6 +28,7 @@ import junit.framework.TestSuite; import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; import org.apache.jena.rdf.model.impl.RDFDefaultErrorHandler; +import org.apache.jena.rdfxml.xmlinput1.StAX2Model; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestsTainting.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsTainting.java similarity index 98% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestsTainting.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsTainting.java index 8acb41b591..bbd3c6dfcc 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/TestsTainting.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/TestsTainting.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1tests; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -31,6 +31,8 @@ import junit.framework.TestSuite; import org.apache.jena.ontology.OntDocumentManager; import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; +import org.apache.jena.rdfxml.xmlinput1.ARPErrorNumbers; +import org.apache.jena.rdfxml.xmlinput1.ParseException; import org.xml.sax.ErrorHandler; import org.xml.sax.SAXParseException; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/WGTestSuite.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/WGTestSuite.java similarity index 99% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/WGTestSuite.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/WGTestSuite.java index 059e484ebe..1ca160853f 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/WGTestSuite.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/WGTestSuite.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1; +package org.apache.jena.rdfxml.arp1tests; import java.io.FileOutputStream; import java.io.IOException; @@ -30,6 +30,9 @@ import org.apache.jena.irix.IRIx; import org.apache.jena.rdf.model.*; import org.apache.jena.rdf.model.impl.PropertyImpl; import org.apache.jena.rdf.model.impl.ResourceImpl; +import org.apache.jena.rdfxml.xmlinput1.ARPErrorNumbers; +import org.apache.jena.rdfxml.xmlinput1.ParseException; +import org.apache.jena.rdfxml.xmlinput1.RDFXMLReader; import org.apache.jena.rdfxml.xmloutput.impl.RDFXML_Abbrev; import org.apache.jena.reasoner.rulesys.RDFSRuleReasonerFactory; import org.apache.jena.reasoner.test.WGReasonerTester; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/AttrEvent.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/AttrEvent.java similarity index 93% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/AttrEvent.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/AttrEvent.java index 0c3717e4f6..5ee58dd815 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/AttrEvent.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/AttrEvent.java @@ -16,9 +16,10 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1tests.states; import org.apache.jena.rdfxml.xmlinput1.impl.Names; +import org.apache.jena.rdfxml.xmlinput1.states.FrameI; import org.xml.sax.Attributes; class AttrEvent extends Event { diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/ElementEvent.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/ElementEvent.java similarity index 93% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/ElementEvent.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/ElementEvent.java index 24a244fde2..30215a63ae 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/ElementEvent.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/ElementEvent.java @@ -16,8 +16,9 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1tests.states; +import org.apache.jena.rdfxml.xmlinput1.states.FrameI; import org.xml.sax.Attributes; import org.xml.sax.SAXParseException; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/Event.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/Event.java similarity index 92% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/Event.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/Event.java index f29a8357a4..8d0a26740a 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/Event.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/Event.java @@ -16,7 +16,8 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1tests.states; +import org.apache.jena.rdfxml.xmlinput1.states.FrameI; import org.xml.sax.Attributes; import org.xml.sax.SAXParseException; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/EventList.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/EventList.java similarity index 97% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/EventList.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/EventList.java index 7511b68a0c..1d7eb9be7f 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/EventList.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/EventList.java @@ -16,10 +16,12 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1tests.states; import org.apache.jena.rdfxml.xmlinput1.impl.TaintImpl; +import org.apache.jena.rdfxml.xmlinput1.states.FrameI; + import org.junit.Assert; import org.xml.sax.Attributes; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/EventRecord.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/EventRecord.java similarity index 98% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/EventRecord.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/EventRecord.java index d9ffd3d54f..599252a6f3 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/EventRecord.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/EventRecord.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1tests.states; class EventRecord { String startEvents[]; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/FullEventRecord.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/FullEventRecord.java similarity index 98% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/FullEventRecord.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/FullEventRecord.java index 9dd8e75e4a..aac2902a56 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/FullEventRecord.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/FullEventRecord.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1tests.states; class FullEventRecord extends EventRecord { String state; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/InternalEvent.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/InternalEvent.java similarity index 95% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/InternalEvent.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/InternalEvent.java index d65da895f7..c32f732739 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/InternalEvent.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/InternalEvent.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1tests.states; abstract class InternalEvent extends Event { diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/QName.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/QName.java similarity index 96% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/QName.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/QName.java index 286da9b3fe..984cceaf32 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/QName.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/QName.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1tests.states; import org.apache.jena.rdfxml.xmlinput1.impl.Names; class QName implements Names { diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/TestARPStates.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/TestARPStates.java similarity index 97% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/TestARPStates.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/TestARPStates.java index 13430de71d..e5ded25c24 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/TestARPStates.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/TestARPStates.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1tests.states; import java.io.FileReader; import java.io.IOException; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/TestData.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/TestData.java similarity index 99% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/TestData.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/TestData.java index d5dcfae06f..7eeffa4def 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/TestData.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/TestData.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1tests.states; import java.io.FileWriter; import java.io.IOException; @@ -25,6 +25,7 @@ import java.util.*; import org.apache.jena.rdfxml.xmlinput1.ARPErrorNumbers; import org.apache.jena.rdfxml.xmlinput1.impl.*; +import org.apache.jena.rdfxml.xmlinput1.states.*; import org.xml.sax.Attributes; import org.xml.sax.SAXParseException; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/TestEventList.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/TestEventList.java similarity index 97% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/TestEventList.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/TestEventList.java index 74d3904d22..be56aadfa9 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/TestEventList.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/TestEventList.java @@ -16,11 +16,12 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1tests.states; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.apache.jena.rdfxml.xmlinput1.states.FrameI; public class TestEventList extends TestCase implements Test { diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/TestFrame.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/TestFrame.java similarity index 89% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/TestFrame.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/TestFrame.java index e87e70f632..c7b48827e0 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/TestFrame.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/TestFrame.java @@ -16,12 +16,16 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1tests.states; import org.apache.jena.rdfxml.xmlinput1.impl.ANode; import org.apache.jena.rdfxml.xmlinput1.impl.AbsXMLContext; import org.apache.jena.rdfxml.xmlinput1.impl.XMLHandler; +import org.apache.jena.rdfxml.xmlinput1.states.AbsXMLLiteral; +import org.apache.jena.rdfxml.xmlinput1.states.HasSubjectFrameI; +import org.apache.jena.rdfxml.xmlinput1.states.WantsObjectFrameI; + import org.junit.Assert; class TestFrame extends AbsXMLLiteral implements WantsObjectFrameI, diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/TestHandler.java b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/TestHandler.java similarity index 97% rename from jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/TestHandler.java rename to jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/TestHandler.java index 345034fbf8..d366cc5602 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput1/states/TestHandler.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/arp1tests/states/TestHandler.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.jena.rdfxml.xmlinput1.states; +package org.apache.jena.rdfxml.arp1tests.states; import java.util.HashMap; diff --git a/jena-core/src/test/java/org/apache/jena/test/JenaCoreTestAll.java b/jena-core/src/test/java/org/apache/jena/test/JenaCoreTestAll.java index 3c9764e96a..4f9d030e94 100644 --- a/jena-core/src/test/java/org/apache/jena/test/JenaCoreTestAll.java +++ b/jena-core/src/test/java/org/apache/jena/test/JenaCoreTestAll.java @@ -58,7 +58,7 @@ public class JenaCoreTestAll extends TestCase { addTest(ts, "Model2", org.apache.jena.rdf.model.test.TS3_StandardModels.suite() ); // Test suite building - addTest(ts, "XML Input [ARP1]", org.apache.jena.rdfxml.xmlinput1.TS3_xmlinput1.suite()); + addTest(ts, "XML Input [ARP1]", org.apache.jena.rdfxml.arp1tests.TS3_xmlinput1.suite()); addTest(ts, "XML Output", org.apache.jena.rdfxml.xmloutput.TS3_xmloutput.suite()); addTest(ts, "Util", adaptJUnit4(org.apache.jena.util.TS3_coreutil.class));
