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
The following commit(s) were added to refs/heads/main by this push:
new d5d727b7f0 GH-1690: Remove TestSystemSetup.testInitFromRDFS
new c3a0272642 Merge pull request #1691 from afs/test-init-rdfs
d5d727b7f0 is described below
commit d5d727b7f06cb7d8347d58ae17a6ca7587e94c04
Author: Andy Seaborne <[email protected]>
AuthorDate: Wed Dec 21 11:06:38 2022 +0000
GH-1690: Remove TestSystemSetup.testInitFromRDFS
---
.../org/apache/jena/test/RDFSJenaInitTestApp.java | 28 ----------------
.../java/org/apache/jena/test/TestSystemSetup.java | 38 +++-------------------
.../java/org/apache/jena/test/X_RDFReaderF.java | 4 ++-
3 files changed, 7 insertions(+), 63 deletions(-)
diff --git
a/jena-core/src/test/java/org/apache/jena/test/RDFSJenaInitTestApp.java
b/jena-core/src/test/java/org/apache/jena/test/RDFSJenaInitTestApp.java
deleted file mode 100644
index 1e93f71a74..0000000000
--- a/jena-core/src/test/java/org/apache/jena/test/RDFSJenaInitTestApp.java
+++ /dev/null
@@ -1,28 +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
- *
- * 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.test;
-
-import org.apache.jena.vocabulary.RDFS;
-
-// Invoked from TestSystemSetup
-public class RDFSJenaInitTestApp {
- public static void main(String[] args) {
- System.out.printf("%s\n", RDFS.subClassOf);
- }
-}
diff --git a/jena-core/src/test/java/org/apache/jena/test/TestSystemSetup.java
b/jena-core/src/test/java/org/apache/jena/test/TestSystemSetup.java
index b09cbbed46..0594140a19 100644
--- a/jena-core/src/test/java/org/apache/jena/test/TestSystemSetup.java
+++ b/jena-core/src/test/java/org/apache/jena/test/TestSystemSetup.java
@@ -18,50 +18,20 @@
package org.apache.jena.test;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
-
import junit.framework.TestCase ;
import junit.framework.TestSuite ;
-import org.apache.commons.lang3.SystemUtils;
import org.apache.jena.JenaRuntime ;
-import org.apache.jena.util.FileUtils;
-import org.apache.jena.vocabulary.RDFS;
-import org.junit.Assert;
public class TestSystemSetup extends TestCase {
public static TestSuite suite() {
return new TestSuite(TestSystemSetup.class, "System setup") ;
}
-
+
public void testRDF11() {
- // This should be "false" in Jena2.
- // This should be "true" in Jena3.
+ // This should be "false" in Jena2.
+ // This should be "true" in Jena3, Jena4, ...
if ( ! JenaRuntime.isRDF11 )
- fail("RDF 1.0 mode enabled in Jena3 test run") ;
- }
-
- /** This test relies on forking a clean JVM */
- public void testInitFromRDFS() throws IOException, InterruptedException {
- String separator = System.getProperty("file.separator");
- String classpath = System.getProperty("java.class.path");
- String java = System.getProperty("java.home")
- + separator + "bin" + separator + "java";
- if (SystemUtils.IS_OS_WINDOWS)
- java += ".exe";
-
- List<String> args = Arrays.asList(java, "-cp", classpath,
- "org.apache.jena.test.RDFSJenaInitTestApp");
- Process child = new ProcessBuilder().command(args)
- .redirectError(ProcessBuilder.Redirect.INHERIT)
- .redirectOutput(ProcessBuilder.Redirect.PIPE)
- .start();
-
- Assert.assertEquals(0, child.waitFor());
- Assert.assertEquals(RDFS.subClassOf.toString()+"\n",
-
FileUtils.readWholeFileAsUTF8(child.getInputStream()));
+ fail("RDF 1.0 mode enabled in Jena test run") ;
}
}
-
diff --git a/jena-core/src/test/java/org/apache/jena/test/X_RDFReaderF.java
b/jena-core/src/test/java/org/apache/jena/test/X_RDFReaderF.java
index ad6c80bfd9..386e6da432 100644
--- a/jena-core/src/test/java/org/apache/jena/test/X_RDFReaderF.java
+++ b/jena-core/src/test/java/org/apache/jena/test/X_RDFReaderF.java
@@ -31,7 +31,9 @@ public class X_RDFReaderF extends Object implements
RDFReaderF {
public static final String DEFAULTLANG = "RDF/XML" ;
private static Map<String, Class<? extends RDFReaderI>> custom = new
LinkedHashMap<>();
private static RDFReaderF rewiredAlternative = null ;
- /** Rewire to use an external RDFReaderF (typically, RIOT).
+
+ /**
+ * Rewire to use an external RDFReaderF (typically, RIOT).
* Set to null to use old jena-core setup.
* @param other
*/
