This is an automated email from the ASF dual-hosted git repository. afs pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/jena.git
commit 1fecc61641634ec1c6f8086462dcbc35891ee702 Author: Andy Seaborne <[email protected]> AuthorDate: Tue Sep 8 08:47:24 2026 +0100 GH-3236: Restore running TestXMLAbbrev; remove duplicate TestXMLFeatures_XML_Abbrev --- .../jena/rdfxml/xmloutput/TS6_xmloutput.java | 2 +- .../jena/rdfxml/xmloutput/TestXMLAbbrev.java | 59 ++++++++++++++-------- .../xmloutput/TestXMLFeatures_CoreNTriples.java | 35 ------------- .../org/apache/jena/test/JenaCoreTestAll_JU3.java | 14 ++++- 4 files changed, 52 insertions(+), 58 deletions(-) diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TS6_xmloutput.java b/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TS6_xmloutput.java index 1202b2b881..4541dab462 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TS6_xmloutput.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TS6_xmloutput.java @@ -31,9 +31,9 @@ import org.apache.jena.test.JenaTestLib; @Suite @SelectClasses({ TestPrettyWriter.class, + TestXMLAbbrev.class, TestXMLFeatures_XML_Basic.class, TestXMLFeatures_XML_Abbrev.class, - TestXMLFeatures_XML_Abbrev.class, TestWriterURIExceptions.class, TestEntityOutput.class, TestLiteralEncoding.class, diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TestXMLAbbrev.java b/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TestXMLAbbrev.java index a38b21adb5..927cda0c52 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TestXMLAbbrev.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TestXMLAbbrev.java @@ -23,6 +23,10 @@ package org.apache.jena.rdfxml.xmloutput; import java.io.IOException; +import org.junit.jupiter.api.Test; + +import org.apache.jena.test.JenaTestLib; + public class TestXMLAbbrev extends BaseTestXMLOutput { @Override @@ -30,6 +34,9 @@ public class TestXMLAbbrev extends BaseTestXMLOutput return "RDF/XML-ABBREV"; } + static { JenaTestLib.setup(); } + + @Test public void testNoPropAttr() throws IOException { checkY(BaseTestXMLFeatures.file1, @@ -39,24 +46,27 @@ public class TestXMLAbbrev extends BaseTestXMLOutput ); } + @Test public void testNoRdfCollection() throws IOException { checkY("testing/abbreviated/collection.rdf", - null, - "[\"']Collection[\"']", - Change.blockRules( "parseTypeCollectionPropertyElt" ) + null, + "[\"']Collection[\"']", + Change.blockRules( "parseTypeCollectionPropertyElt" ) ); } + @Test public void testNoLi() throws IOException { checkY("testing/abbreviated/container.rdf", - null, - "rdf:li", - Change.blockRules( "section-List-Expand" ) + null, + "rdf:li", + Change.blockRules( "section-List-Expand" ) ); } + @Test public void testNoID() throws IOException { checkB("testing/abbreviated/container.rdf", @@ -66,6 +76,7 @@ public class TestXMLAbbrev extends BaseTestXMLOutput ); } + @Test public void testNoID2() throws IOException { checkB("testing/abbreviated/container.rdf", @@ -75,6 +86,7 @@ public class TestXMLAbbrev extends BaseTestXMLOutput ); } + @Test public void testNoID3() throws IOException { // Minimal version of testNoID2 checkB("testing/abbreviated/rdf-id.rdf", @@ -84,6 +96,7 @@ public class TestXMLAbbrev extends BaseTestXMLOutput ); } + @Test public void testNoResource() throws IOException { checkB("testing/abbreviated/container.rdf", @@ -93,24 +106,27 @@ public class TestXMLAbbrev extends BaseTestXMLOutput ); } + @Test public void testPropAttrs() throws IOException { checkY("testing/abbreviated/namespaces.rdf", - ":prop0 *=", - null, - Change.blockRules( "" ) + ":prop0 *=", + null, + Change.blockRules( "" ) ); } + @Test public void testNoPropAttrs() throws IOException { checkY("testing/abbreviated/namespaces.rdf", - null, - ":prop0 *=", - Change.none() + null, + ":prop0 *=", + Change.none() ); } + @Test public void testNoReification() throws IOException { // System.err.println("WARNING: reification output tests suppressed."); @@ -122,22 +138,23 @@ public class TestXMLAbbrev extends BaseTestXMLOutput },base); /* */ checkZ(filename, - null, - "rdf:subject", - null, - false, - Change.blockRules( "section-Reification" ), - base + null, + "rdf:subject", + null, + false, + Change.blockRules( "section-Reification" ), + base ); } + @Test public void testNoCookUp() throws IOException { checkY("testing/abbreviated/cookup.rdf", - null, - "(j\\.fixup|j\\.cook\\.up)", - Change.blockRules( "" ) + null, + "(j\\.fixup|j\\.cook\\.up)", + Change.blockRules( "" ) ); } } diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TestXMLFeatures_CoreNTriples.java b/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TestXMLFeatures_CoreNTriples.java deleted file mode 100644 index 9b6a820afc..0000000000 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TestXMLFeatures_CoreNTriples.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * 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 - * - * https://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. - * - * SPDX-License-Identifier: Apache-2.0 - */ - -package org.apache.jena.rdfxml.xmloutput; - -/** Test with the core/test N-triples writer */ -public class TestXMLFeatures_CoreNTriples extends BaseTestXMLFeatures { - - public TestXMLFeatures_CoreNTriples() { - super(); - } - - @Override - protected String getLang() { - return "N-TRIPLES"; - } -} diff --git a/jena-core/src/test/java/org/apache/jena/test/JenaCoreTestAll_JU3.java b/jena-core/src/test/java/org/apache/jena/test/JenaCoreTestAll_JU3.java index 074b7aed6d..f1f2daf0c6 100644 --- a/jena-core/src/test/java/org/apache/jena/test/JenaCoreTestAll_JU3.java +++ b/jena-core/src/test/java/org/apache/jena/test/JenaCoreTestAll_JU3.java @@ -25,7 +25,7 @@ import junit.framework.TestCase; import junit.framework.TestSuite; /** - * Jena core test suite. JUnit3 remaining + * Jena core test suite. Any JUnit3 remaining. */ public class JenaCoreTestAll_JU3 extends TestCase { @@ -43,4 +43,16 @@ public class JenaCoreTestAll_JU3 extends TestCase { tc.setName(name); ts.addTest(tc); } + +// // JUnit4 in a JUnit3 test runner. +// private static Test adaptJUnit4(Class<?> testClass) { +// return new JUnit4TestAdapter(testClass); +// } +// +// private static void addTest(TestSuite ts, String name, Test test) { +// // Adds an extra level but does name the test suite. +// TestSuite ts2 = new TestSuite(name); +// ts2.addTest(test); +// ts.addTest(ts2); +// } }
