You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@any23.apache.org by ha...@apache.org on 2019/02/07 06:09:05 UTC
[any23] branch master updated (e9c001f -> b4d652c)
This is an automated email from the ASF dual-hosted git repository.
hansbrende pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/any23.git.
from e9c001f ANY23-418 update NOTICE.txt
new a0af112 ANY23-424 Update dependencies
new 630f0fd Merge branch 'master' into ANY23-424
new b51aef8 ANY23-424 cleanup owl test
new b4d652c ANY23-424 update rdf4j again, to v2.4.4
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../rdf/FunctionalSyntaxExtractorTest.java | 60 +++++++---------------
pom.xml | 20 ++++----
service/pom.xml | 2 +-
3 files changed, 29 insertions(+), 53 deletions(-)
[any23] 03/04: ANY23-424 cleanup owl test
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hansbrende pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/any23.git
commit b51aef86a13eebb0c4b621531ac2f684abde6638
Author: Hans <fi...@gmail.com>
AuthorDate: Wed Feb 6 23:45:16 2019 -0600
ANY23-424 cleanup owl test
---
.../rdf/FunctionalSyntaxExtractorTest.java | 66 ++++++----------------
1 file changed, 18 insertions(+), 48 deletions(-)
diff --git a/core/src/test/java/org/apache/any23/extractor/rdf/FunctionalSyntaxExtractorTest.java b/core/src/test/java/org/apache/any23/extractor/rdf/FunctionalSyntaxExtractorTest.java
index f265b45..1a72a46 100644
--- a/core/src/test/java/org/apache/any23/extractor/rdf/FunctionalSyntaxExtractorTest.java
+++ b/core/src/test/java/org/apache/any23/extractor/rdf/FunctionalSyntaxExtractorTest.java
@@ -17,70 +17,40 @@
package org.apache.any23.extractor.rdf;
-import org.apache.any23.extractor.ExtractionContext;
-import org.apache.any23.extractor.ExtractionParameters;
-import org.apache.any23.extractor.ExtractionResult;
-import org.apache.any23.extractor.ExtractionResultImpl;
+import org.apache.any23.extractor.ExtractorFactory;
+import org.apache.any23.extractor.html.AbstractExtractorTestCase;
import org.apache.any23.rdf.RDFUtils;
-import org.apache.any23.writer.RDFXMLWriter;
-import org.apache.any23.writer.TripleHandler;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
+import org.eclipse.rdf4j.model.vocabulary.OWL;
+import org.eclipse.rdf4j.model.vocabulary.RDF;
+import org.eclipse.rdf4j.model.vocabulary.RDFS;
import org.junit.Test;
-import org.eclipse.rdf4j.model.IRI;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.io.ByteArrayOutputStream;
+import java.lang.invoke.MethodHandles;
/**
* Test case for {@link FunctionalSyntaxExtractor}.
*
* @author Peter Ansell
+ * @author Hans Brende (hansbrende@apache.org)
*/
-public class FunctionalSyntaxExtractorTest {
+public class FunctionalSyntaxExtractorTest extends AbstractExtractorTestCase {
- private static final Logger logger = LoggerFactory.getLogger(FunctionalSyntaxExtractorTest.class);
+ private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
- private FunctionalSyntaxExtractor extractor;
-
- @Before
- public void setUp() {
- extractor = new FunctionalSyntaxExtractor();
- }
-
- @After
- public void tearDown() {
- extractor = null;
+ @Override
+ public ExtractorFactory<?> getExtractorFactory() {
+ return new FunctionalSyntaxExtractorFactory();
}
@Test
- public void testExampleFunctionalSyntax()
- throws Exception {
- final IRI uri = RDFUtils.iri("http://example.org/example-functionalsyntax.ofn");
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- final TripleHandler th = new RDFXMLWriter(baos);
- final ExtractionContext extractionContext = new ExtractionContext("owl-functionalsyntax-extractor", uri);
- final ExtractionResult result = new ExtractionResultImpl(extractionContext, extractor, th);
- extractor.setStopAtFirstError(false);
- try {
- extractor.run(
- ExtractionParameters.newDefault(),
- extractionContext,
- this.getClass().getResourceAsStream("/text/owl-functional/example-functionalsyntax.ofn"),
- result
- );
- } finally {
- result.close();
- th.close();
- String output = baos.toString();
- logger.debug(output);
- Assert.assertTrue(output.contains(
- "<rdfs:comment>Test individual is a unique individual</rdfs:comment>"));
- Assert.assertTrue(output.contains(
- "<rdf:Description rdf:about=\"http://example.org/example-manchestersyntax#TestIndividual\">"));
- }
+ public void testExampleFunctionalSyntax() {
+ assertExtract("/text/owl-functional/example-functionalsyntax.ofn");
+ logger.debug(dumpModelToNQuads());
+ assertStatementsSize(null, null, null, 2);
+ assertContains(RDFUtils.iri("http://example.org/example-manchestersyntax"), RDF.TYPE, OWL.ONTOLOGY);
+ assertContains(RDFUtils.iri("http://example.org/example-manchestersyntax#TestIndividual"), RDFS.COMMENT, "Test individual is a unique individual");
}
}
[any23] 01/04: ANY23-424 Update dependencies
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hansbrende pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/any23.git
commit a0af112e0065612ca9b02c32f9fb534a78f21390
Author: Hans <fi...@gmail.com>
AuthorDate: Sun Feb 3 23:21:02 2019 -0600
ANY23-424 Update dependencies
---
.../extractor/rdf/FunctionalSyntaxExtractorTest.java | 10 ++++++++--
pom.xml | 20 ++++++++++----------
service/pom.xml | 2 +-
3 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/core/src/test/java/org/apache/any23/extractor/rdf/FunctionalSyntaxExtractorTest.java b/core/src/test/java/org/apache/any23/extractor/rdf/FunctionalSyntaxExtractorTest.java
index cd87293..f265b45 100644
--- a/core/src/test/java/org/apache/any23/extractor/rdf/FunctionalSyntaxExtractorTest.java
+++ b/core/src/test/java/org/apache/any23/extractor/rdf/FunctionalSyntaxExtractorTest.java
@@ -25,6 +25,7 @@ import org.apache.any23.rdf.RDFUtils;
import org.apache.any23.writer.RDFXMLWriter;
import org.apache.any23.writer.TripleHandler;
import org.junit.After;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.eclipse.rdf4j.model.IRI;
@@ -71,9 +72,14 @@ public class FunctionalSyntaxExtractorTest {
result
);
} finally {
- logger.debug(baos.toString());
- th.close();
result.close();
+ th.close();
+ String output = baos.toString();
+ logger.debug(output);
+ Assert.assertTrue(output.contains(
+ "<rdfs:comment>Test individual is a unique individual</rdfs:comment>"));
+ Assert.assertTrue(output.contains(
+ "<rdf:Description rdf:about=\"http://example.org/example-manchestersyntax#TestIndividual\">"));
}
}
diff --git a/pom.xml b/pom.xml
index 739669b..440992a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -270,17 +270,17 @@
<implementation.build>${scmBranch}@r${buildNumber}</implementation.build>
<implementation.build.tstamp>${maven.build.timestamp}</implementation.build.tstamp>
- <httpclient.version>4.5.6</httpclient.version>
- <httpcore.version>4.4.10</httpcore.version>
- <owlapi.version>5.1.7</owlapi.version>
- <poi.version>4.0.0</poi.version>
- <rdf4j.version>2.4.0</rdf4j.version>
+ <httpclient.version>4.5.7</httpclient.version>
+ <httpcore.version>4.4.11</httpcore.version>
+ <owlapi.version>5.1.9</owlapi.version>
+ <poi.version>4.0.1</poi.version>
+ <rdf4j.version>2.4.3</rdf4j.version>
<semargl.version>0.7</semargl.version>
<slf4j.logger.version>1.7.25</slf4j.logger.version>
- <tika.version>1.19.1</tika.version>
+ <tika.version>1.20</tika.version>
<openie_2.11.version>4.2.6</openie_2.11.version>
<openregex.version>1.1.1</openregex.version>
- <jackson.version>2.9.7</jackson.version>
+ <jackson.version>2.9.8</jackson.version>
<!-- Overridden in profiles to add JDK specific arguments to surefire -->
<surefire-extra-args />
@@ -376,7 +376,7 @@
<dependency>
<groupId>net.sf.biweekly</groupId>
<artifactId>biweekly</artifactId>
- <version>0.6.2</version>
+ <version>0.6.3</version>
</dependency>
<!-- BEGIN: Tika -->
@@ -511,7 +511,7 @@
<dependency>
<groupId>com.github.jsonld-java</groupId>
<artifactId>jsonld-java</artifactId>
- <version>0.12.1</version>
+ <version>0.12.3</version>
</dependency>
<dependency>
<groupId>org.semarglproject</groupId>
@@ -609,7 +609,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>2.23.0</version>
+ <version>2.24.0</version>
<scope>test</scope>
</dependency>
<!-- END: Test Dependencies -->
diff --git a/service/pom.xml b/service/pom.xml
index 8432f4b..a5b8d83 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -33,7 +33,7 @@
<properties>
<!-- the following property is used in the bash script as well, don't remove it! -->
- <jetty.runner.version>9.4.12.v20180830</jetty.runner.version>
+ <jetty.runner.version>9.4.14.v20181114</jetty.runner.version>
<output.directory>${project.build.directory}/${project.artifactId}-${project.version}/WEB-INF/lib/apache-any23-openie</output.directory>
</properties>
[any23] 04/04: ANY23-424 update rdf4j again, to v2.4.4
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hansbrende pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/any23.git
commit b4d652ca7eadc2179140bc786475299ba2585078
Author: Hans <fi...@gmail.com>
AuthorDate: Thu Feb 7 00:00:39 2019 -0600
ANY23-424 update rdf4j again, to v2.4.4
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 440992a..323c955 100644
--- a/pom.xml
+++ b/pom.xml
@@ -274,7 +274,7 @@
<httpcore.version>4.4.11</httpcore.version>
<owlapi.version>5.1.9</owlapi.version>
<poi.version>4.0.1</poi.version>
- <rdf4j.version>2.4.3</rdf4j.version>
+ <rdf4j.version>2.4.4</rdf4j.version>
<semargl.version>0.7</semargl.version>
<slf4j.logger.version>1.7.25</slf4j.logger.version>
<tika.version>1.20</tika.version>
[any23] 02/04: Merge branch 'master' into ANY23-424
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hansbrende pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/any23.git
commit 630f0fd4502dbd981e91d4ad4fdce64a16e690d8
Merge: a0af112 e9c001f
Author: Hans <fi...@gmail.com>
AuthorDate: Wed Feb 6 23:07:15 2019 -0600
Merge branch 'master' into ANY23-424
NOTICE.txt | 5 +-
encoding/pom.xml | 6 +
.../org/apache/any23/encoding/EncodingUtils.java | 340 +++++++++++++++++++++
.../any23/encoding/TikaEncodingDetector.java | 261 +++++++++++-----
.../any23/encoding/TikaEncodingDetectorTest.java | 43 ++-
5 files changed, 567 insertions(+), 88 deletions(-)