Skip to content

Commit

Permalink
ont-api: update dependencies (owlapi -> 5.5.0)
Browse files Browse the repository at this point in the history
  • Loading branch information
@sszuev
sszuev committed Feb 5, 2023
1 parent 10ca7ad commit d569e16
Show file tree
Hide file tree
Showing 5 changed files with 55 additions and 87 deletions.
8 changes: 2 additions & 6 deletions ontapi/src/test/java/com/github/owlcs/ontapi/testutils/OWLIOUtils.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* This file is part of the ONT API.
* The contents of this file are subject to the LGPL License, Version 3.0.
* Copyright (c) 2022, owl.cs group.
* Copyright (c) 2023, owl.cs group.
*
* This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
Expand Down Expand Up @@ -107,11 +107,7 @@ public static StringWriter toStringWriter(Model model, OntFormat ext) {
}

public static InputStream asInputStream(String txt) {
try {
return IOUtils.toInputStream(txt, StandardCharsets.UTF_8.name());
} catch (IOException e) {
throw new AssertionError(e);
}
return IOUtils.toInputStream(txt, StandardCharsets.UTF_8.name());
}

public static InputStream asInputStream(Model model, OntFormat ext) {
Expand Down
19 changes: 1 addition & 18 deletions ontapi/src/test/java/com/github/owlcs/owlapi/tests/api/baseclasses/TestBase.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* This file is part of the ONT API.
* The contents of this file are subject to the LGPL License, Version 3.0.
* Copyright (c) 2022, owl.cs group.
* Copyright (c) 2023, owl.cs group.
*
* This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
Expand All @@ -24,7 +24,6 @@
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.semanticweb.owlapi.formats.ManchesterSyntaxDocumentFormat;
import org.semanticweb.owlapi.formats.PrefixDocumentFormat;
import org.semanticweb.owlapi.formats.RDFJsonLDDocumentFormat;
import org.semanticweb.owlapi.formats.RDFXMLDocumentFormat;
Expand All @@ -48,7 +47,6 @@
import org.semanticweb.owlapi.model.OWLOntologyLoaderConfiguration;
import org.semanticweb.owlapi.model.OWLOntologyManager;
import org.semanticweb.owlapi.model.OWLOntologyStorageException;
import org.semanticweb.owlapi.model.OWLSubClassOfAxiom;
import org.semanticweb.owlapi.util.OWLAPIStreamUtils;
import org.semanticweb.owlapi.vocab.OWL2Datatype;
import org.slf4j.Logger;
Expand All @@ -60,7 +58,6 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Stream;
Expand Down Expand Up @@ -155,20 +152,6 @@ public static boolean equal(OWLOntology ont1, OWLOntology ont2) {
axioms2 = new AnonymousIndividualsNormaliser(ont1.getOWLOntologyManager()).getNormalisedAxioms(ont2.axioms());
OWLDocumentFormat ontologyFormat = ont2.getFormat();
applyEquivalentsRoundtrip(axioms1, axioms2, ontologyFormat);
if (ontologyFormat instanceof ManchesterSyntaxDocumentFormat) {
// drop GCIs from the expected axioms, they won't be there
Iterator<OWLAxiom> it = axioms1.iterator();
while (it.hasNext()) {
OWLAxiom next = it.next();
if (next instanceof OWLSubClassOfAxiom) {
if (!((OWLSubClassOfAxiom) next).getSubClass().isAnonymous() ||
!((OWLSubClassOfAxiom) next).getSuperClass().isAnonymous()) {
continue;
}
it.remove();
}
}
}
PlainLiteralTypeFoldingAxiomSet a = new PlainLiteralTypeFoldingAxiomSet(axioms1);
PlainLiteralTypeFoldingAxiomSet b = new PlainLiteralTypeFoldingAxiomSet(axioms2);
if (a.equals(b)) {
Expand Down
107 changes: 47 additions & 60 deletions .../src/test/java/com/github/owlcs/owlapi/tests/api/fileroundtrip/FileRoundTripTestCase.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* This file is part of the ONT API.
* The contents of this file are subject to the LGPL License, Version 3.0.
* Copyright (c) 2022, owl.cs group.
* Copyright (c) 2023, owl.cs group.
*
* This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
Expand All @@ -28,64 +28,51 @@ public static Stream<OWLOntology> data() {

public static Stream<String> files() {
return Stream.of(
"AnnotatedPropertyAssertions.rdf",
"ComplexSubProperty.rdf",
"DataAllValuesFrom.rdf",
"cardinalitywithwhitespace.owl",
"DataComplementOf.rdf",
"DataHasValue.rdf",
"DataIntersectionOf.rdf",
"DataMaxCardinality.rdf",
"DataMinCardinality.rdf",
"DataOneOf.rdf",
"DataSomeValuesFrom.rdf",
"DataUnionOf.rdf",
"DatatypeRestriction.rdf",
"TestDeclarations.rdf",
"Deprecated.rdf",
"DisjointClasses.rdf",
"HasKey.rdf",
"InverseOf.rdf",
"ObjectAllValuesFrom.rdf",
"ObjectCardinality.rdf",
"ObjectComplementOf.rdf",
"ObjectHasSelf.rdf",
"ObjectHasValue.rdf",
"ObjectIntersectionOf.rdf",
"ObjectMaxCardinality.rdf",
"ObjectMaxQualifiedCardinality.rdf",
"ObjectMinCardinality.rdf",
"ObjectMinQualifiedCardinality.rdf",
"ObjectOneOf.rdf",
"ObjectQualifiedCardinality.rdf",
"ObjectSomeValuesFrom.rdf",
"ObjectUnionOf.rdf",
"primer.functionalsyntax.txt",
"primer.owlxml.xml",
// WARNING: The entity http://example.com/owl/families/hasSSN inside primer.rdfxml.xml was an owl:DataProperty initially.
// I changed it to owl:DatatypeProperty. OWL-API treats an entity as owl:DatatypeProperty in such unclear cases
// (see org.semanticweb.owlapi.rdf.rdfxml.parser.Translators#DataSomeValuesFromTranslator#translate),
// but it doesn't seem correct to me.
"primer.rdfxml.xml",
"RDFSClass.rdf",
"koala.owl",
"SubClassOf.rdf",
"TestParser06.rdf",
// WARNING: There is ambiguous situation with Restriction inside TestParser07.rdf:
// the pair <http://example.org#r>, <http://example.org#z> could be a data property either an object property restriction.
// OWL-API decides that it is object property for some reasons.
// ONT-API would throw an exception in such case.
// To make test passed I changed initial TestParser07.rdf by adding declaration for <http://example.org#z> as Datatype.
// UPDATE: currently ONT-API(1.4.0) also chooses ObjectProperty in ambiguous situations.
"TestParser07.rdf",
"TestParser10.rdf",
// WARNING: data modified. Replace '\r\n' -> '\n'.
// Test had failed both for OWL-API and ONT-API due to Manchester and OWL/XML parsers.
// We don't test pure OWL things, so we don't need this particular checking.
"annotatedpropertychain.ttl.rdf",
"UntypedSubClassOf.rdf",
"SubClassOfUntypedOWLClass.rdf",
"SubClassOfUntypedSomeValuesFrom.rdf",
"XMLLiteral.rdf");
"AnnotatedPropertyAssertions.rdf", // 1
"ComplexSubProperty.rdf", // 2
"DataAllValuesFrom.rdf", // 3
"cardinalitywithwhitespace.owl", // 4
"DataComplementOf.rdf", // 5
"DataHasValue.rdf", // 6
"DataIntersectionOf.rdf", // 7
"DataMaxCardinality.rdf", // 8
"DataMinCardinality.rdf", // 9
"DataOneOf.rdf", // 10
"DataSomeValuesFrom.rdf", // 11
"DataUnionOf.rdf", // 12
"DatatypeRestriction.rdf", // 13
"TestDeclarations.rdf", // 14
"Deprecated.rdf", // 15
"DisjointClasses.rdf", // 16
"HasKey.rdf", // 17
"InverseOf.rdf", // 18
"ObjectAllValuesFrom.rdf", // 19
"ObjectCardinality.rdf", // 20
"ObjectComplementOf.rdf", // 21
"ObjectHasSelf.rdf", // 22
"ObjectHasValue.rdf", // 23
"ObjectIntersectionOf.rdf", // 24
"ObjectMaxCardinality.rdf", // 25
"ObjectMaxQualifiedCardinality.rdf", // 26
"ObjectMinCardinality.rdf", // 27
"ObjectMinQualifiedCardinality.rdf", // 28
"ObjectOneOf.rdf", // 29
"ObjectQualifiedCardinality.rdf", // 30
"ObjectSomeValuesFrom.rdf", // 31
"ObjectUnionOf.rdf", // 32
"primer.functionalsyntax.txt", // 33
"primer.owlxml.xml", // 34
"primer.rdfxml.xml", // 35
"RDFSClass.rdf", // 36
"koala.owl", // 37
"SubClassOf.rdf", // 38
"TestParser06.rdf", // 39
"TestParser07.rdf", // 40
"TestParser10.rdf", // 41
"annotatedpropertychain.ttl.rdf", // 42
"UntypedSubClassOf.rdf", // 43
"SubClassOfUntypedOWLClass.rdf", // 44
"SubClassOfUntypedSomeValuesFrom.rdf", // 45
"XMLLiteral.rdf"); // 46
}
}
4 changes: 3 additions & 1 deletion ...ava/com/github/owlcs/owlapi/tests/api/syntax/ManchesterOWLSyntaxParserErrorsTestCase.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* This file is part of the ONT API.
* The contents of this file are subject to the LGPL License, Version 3.0.
* Copyright (c) 2022, owl.cs group.
* Copyright (c) 2023, owl.cs group.
*
* This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
Expand Down Expand Up @@ -49,6 +49,8 @@ public void setUp() {
OWLClass cls = Mockito.mock(OWLClass.class);
Mockito.when(cls.getIRI()).thenReturn(Mockito.mock(IRI.class));
Mockito.when(entityChecker.getOWLClass("C")).thenReturn(cls);
Mockito.when(cls.isOWLClass()).thenReturn(true);
Mockito.when(cls.asOWLClass()).thenReturn(cls);
OWLClass clsC1 = Mockito.mock(OWLClass.class);
Mockito.when(clsC1.getIRI()).thenReturn(Mockito.mock(IRI.class));
Mockito.when(entityChecker.getOWLClass("C1")).thenReturn(clsC1);
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<revision>3.0.3-SNAPSHOT</revision>
<version.jena>4.7.0</version.jena>
<version.owlapi>5.1.20</version.owlapi>
<version.owlapi>5.5.0</version.owlapi>
<version.slf4j>2.0.6</version.slf4j>
<version.caffeine>3.1.2</version.caffeine>
<version.junit>5.9.2</version.junit>
<versio.mockito>4.11.0</versio.mockito>
<versio.mockito>5.1.1</versio.mockito>
</properties>

<licenses>
Expand Down

0 comments on commit d569e16

Please sign in to comment.