From 75387b976a6302cfb0939a8e7c3f32262c8f3845 Mon Sep 17 00:00:00 2001 From: Arthit Suriyawongkul Date: Mon, 16 Dec 2024 06:07:54 +0000 Subject: [PATCH 1/3] Remove unused code Signed-off-by: Arthit Suriyawongkul --- src/test/java/org/spdx/tools/schema/OwlToXSDTest.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/test/java/org/spdx/tools/schema/OwlToXSDTest.java b/src/test/java/org/spdx/tools/schema/OwlToXSDTest.java index 9ed73f5..20219df 100644 --- a/src/test/java/org/spdx/tools/schema/OwlToXSDTest.java +++ b/src/test/java/org/spdx/tools/schema/OwlToXSDTest.java @@ -2,7 +2,6 @@ import java.io.File; import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.io.StringWriter; @@ -38,8 +37,6 @@ public void testConvertToXsd() throws IOException, XmlSchemaSerializerException, try (StringWriter sw = new StringWriter()) { result.write(sw); - String str = sw.toString(); - int i = 0; } } From 58e3be7e3018cfaf23654b17e73e88962b6980a1 Mon Sep 17 00:00:00 2001 From: Arthit Suriyawongkul Date: Tue, 17 Dec 2024 04:12:23 +0000 Subject: [PATCH 2/3] Remove debug code + Add assertion Also rename spdx-2-2-revision-8-onotology.owl -> spdx-2-2-revision-8-ontology.owl Signed-off-by: Arthit Suriyawongkul --- src/test/java/org/spdx/tools/schema/OwlToXSDTest.java | 10 +++------- ...gy.owl.xml => spdx-2-2-revision-8-ontology.owl.xml} | 0 2 files changed, 3 insertions(+), 7 deletions(-) rename testResources/{spdx-2-2-revision-8-onotology.owl.xml => spdx-2-2-revision-8-ontology.owl.xml} (100%) diff --git a/src/test/java/org/spdx/tools/schema/OwlToXSDTest.java b/src/test/java/org/spdx/tools/schema/OwlToXSDTest.java index 20219df..8f7b54f 100644 --- a/src/test/java/org/spdx/tools/schema/OwlToXSDTest.java +++ b/src/test/java/org/spdx/tools/schema/OwlToXSDTest.java @@ -4,7 +4,6 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; -import java.io.StringWriter; import org.apache.jena.ontology.OntModel; import org.apache.jena.ontology.OntModelSpec; @@ -15,8 +14,8 @@ import junit.framework.TestCase; public class OwlToXSDTest extends TestCase { - - static final String OWL_FILE_PATH = "testResources" + File.separator + "spdx-2-2-revision-8-onotology.owl.xml"; + + static final String OWL_FILE_PATH = "testResources" + File.separator + "spdx-2-2-revision-8-ontology.owl.xml"; protected void setUp() throws Exception { super.setUp(); @@ -34,10 +33,7 @@ public void testConvertToXsd() throws IOException, XmlSchemaSerializerException, otx = new OwlToXsd(model); } XmlSchema result = otx.convertToXsd(); - - try (StringWriter sw = new StringWriter()) { - result.write(sw); - } + assertNotNull(result); } } diff --git a/testResources/spdx-2-2-revision-8-onotology.owl.xml b/testResources/spdx-2-2-revision-8-ontology.owl.xml similarity index 100% rename from testResources/spdx-2-2-revision-8-onotology.owl.xml rename to testResources/spdx-2-2-revision-8-ontology.owl.xml From 4ec316d8a85fcb893985fb7356e9b69a673dab45 Mon Sep 17 00:00:00 2001 From: Arthit Suriyawongkul Date: Tue, 17 Dec 2024 04:41:21 +0000 Subject: [PATCH 3/3] Add few assertions Signed-off-by: Arthit Suriyawongkul --- src/test/java/org/spdx/tools/schema/OwlToXSDTest.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/test/java/org/spdx/tools/schema/OwlToXSDTest.java b/src/test/java/org/spdx/tools/schema/OwlToXSDTest.java index 8f7b54f..3d022e2 100644 --- a/src/test/java/org/spdx/tools/schema/OwlToXSDTest.java +++ b/src/test/java/org/spdx/tools/schema/OwlToXSDTest.java @@ -33,7 +33,11 @@ public void testConvertToXsd() throws IOException, XmlSchemaSerializerException, otx = new OwlToXsd(model); } XmlSchema result = otx.convertToXsd(); + assertNotNull(result); + assertNotNull(result.getElementByName("Document")); + String expectedIRI = "http://spdx.org/rdf/terms"; + assertEquals(expectedIRI, result.getTargetNamespace()); } }