You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2015/11/12 15:56:47 UTC
[04/18] marmotta git commit: Fixed tests in
ldclient-provider-mediawiki that failed after wikipedia switching to https by
default
Fixed tests in ldclient-provider-mediawiki that failed after wikipedia switching to https by default
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/55d4087b
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/55d4087b
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/55d4087b
Branch: refs/heads/MARMOTTA-588
Commit: 55d4087b203f0358f5e0791b9aac7bf8db821439
Parents: 36167f0
Author: Jakob Frank <ja...@apache.org>
Authored: Thu Jul 23 09:23:57 2015 +0200
Committer: Jakob Frank <ja...@apache.org>
Committed: Thu Jul 23 09:23:57 2015 +0200
----------------------------------------------------------------------
.../test/provider/ProviderTestBase.java | 20 ++++++++------
.../mediawiki/WikipediaIndexEndpoint.java | 2 +-
.../mediawiki/WikipediaPageEndpoint.java | 2 +-
.../test/mediawiki/TestMediawikiProvider.java | 8 ++++--
.../test/mediawiki/wikipedia-marmot-http.sparql | 29 ++++++++++++++++++++
.../test/mediawiki/wikipedia-marmot.sparql | 4 +--
6 files changed, 51 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/55d4087b/libraries/ldclient/ldclient-core/src/test/java/org/apache/marmotta/ldclient/test/provider/ProviderTestBase.java
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-core/src/test/java/org/apache/marmotta/ldclient/test/provider/ProviderTestBase.java b/libraries/ldclient/ldclient-core/src/test/java/org/apache/marmotta/ldclient/test/provider/ProviderTestBase.java
index d46184b..7178e88 100644
--- a/libraries/ldclient/ldclient-core/src/test/java/org/apache/marmotta/ldclient/test/provider/ProviderTestBase.java
+++ b/libraries/ldclient/ldclient-core/src/test/java/org/apache/marmotta/ldclient/test/provider/ProviderTestBase.java
@@ -98,22 +98,26 @@ public class ProviderTestBase {
ClientResponse response = ldclient.retrieveResource(uri);
- RepositoryConnection connection = ModelCommons.asRepository(response.getData()).getConnection();
+ final RepositoryConnection connection = ModelCommons.asRepository(response.getData()).getConnection();
try {
connection.begin();
Assert.assertTrue(connection.size() > 0);
// run a SPARQL test to see if the returned data is correct
- InputStream sparql = this.getClass().getResourceAsStream(sparqlFile);
- BooleanQuery testLabel = connection.prepareBooleanQuery(QueryLanguage.SPARQL, IOUtils.toString(sparql, "UTF-8"));
- Assert.assertTrue("SPARQL test query failed", testLabel.evaluate());
+ final InputStream sparql = this.getClass().getResourceAsStream(sparqlFile);
+ final String query = IOUtils.toString(sparql, "utf8");
+ final BooleanQuery testLabel = connection.prepareBooleanQuery(QueryLanguage.SPARQL, query);
+ final boolean testSuccess = testLabel.evaluate();
+
+ if (!testSuccess && log.isDebugEnabled()) {
+ log.debug("QUERY:\n{}", query);
- if (log.isDebugEnabled()) {
- StringWriter out = new StringWriter();
+ final StringWriter out = new StringWriter();
connection.export(Rio.createWriter(RDFFormat.TURTLE, out));
- log.debug("DATA:");
- log.debug(out.toString());
+ log.debug("DATA:\n{}", out.toString());
}
+
+ Assert.assertTrue("SPARQL test query failed", testSuccess);
} finally {
connection.commit();
connection.close();
http://git-wip-us.apache.org/repos/asf/marmotta/blob/55d4087b/libraries/ldclient/ldclient-provider-mediawiki/src/main/java/org/apache/marmotta/ldclient/endpoint/mediawiki/WikipediaIndexEndpoint.java
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-mediawiki/src/main/java/org/apache/marmotta/ldclient/endpoint/mediawiki/WikipediaIndexEndpoint.java b/libraries/ldclient/ldclient-provider-mediawiki/src/main/java/org/apache/marmotta/ldclient/endpoint/mediawiki/WikipediaIndexEndpoint.java
index 47215d3..863b88f 100644
--- a/libraries/ldclient/ldclient-provider-mediawiki/src/main/java/org/apache/marmotta/ldclient/endpoint/mediawiki/WikipediaIndexEndpoint.java
+++ b/libraries/ldclient/ldclient-provider-mediawiki/src/main/java/org/apache/marmotta/ldclient/endpoint/mediawiki/WikipediaIndexEndpoint.java
@@ -30,7 +30,7 @@ import org.apache.marmotta.ldclient.provider.mediawiki.MediawikiProvider;
public class WikipediaIndexEndpoint extends Endpoint {
public WikipediaIndexEndpoint() {
- super("Wikipedia Provider (Index)", MediawikiProvider.PROVIDER_NAME, "^http://([^.]+)\\.wikipedia\\.org/w/index\\.php.*", "http://$1.wikipedia.org/w/api.php", 86400L);
+ super("Wikipedia Provider (Index)", MediawikiProvider.PROVIDER_NAME, "^https?://([^.]+)\\.wikipedia\\.org/w/index\\.php.*", "https://$1.wikipedia.org/w/api.php", 86400L);
setPriority(PRIORITY_HIGH);
addContentType(new ContentType("text", "xml"));
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/55d4087b/libraries/ldclient/ldclient-provider-mediawiki/src/main/java/org/apache/marmotta/ldclient/endpoint/mediawiki/WikipediaPageEndpoint.java
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-mediawiki/src/main/java/org/apache/marmotta/ldclient/endpoint/mediawiki/WikipediaPageEndpoint.java b/libraries/ldclient/ldclient-provider-mediawiki/src/main/java/org/apache/marmotta/ldclient/endpoint/mediawiki/WikipediaPageEndpoint.java
index 218dc27..1987532 100644
--- a/libraries/ldclient/ldclient-provider-mediawiki/src/main/java/org/apache/marmotta/ldclient/endpoint/mediawiki/WikipediaPageEndpoint.java
+++ b/libraries/ldclient/ldclient-provider-mediawiki/src/main/java/org/apache/marmotta/ldclient/endpoint/mediawiki/WikipediaPageEndpoint.java
@@ -30,7 +30,7 @@ import org.apache.marmotta.ldclient.provider.mediawiki.MediawikiProvider;
public class WikipediaPageEndpoint extends Endpoint {
public WikipediaPageEndpoint() {
- super("Wikipedia Provider (Page)", MediawikiProvider.PROVIDER_NAME, "^http://([^.]+)\\.wikipedia\\.org/wiki/.*", "http://$1.wikipedia.org/w/api.php", 86400L);
+ super("Wikipedia Provider (Page)", MediawikiProvider.PROVIDER_NAME, "^https?://([^.]+)\\.wikipedia\\.org/wiki/.*", "https://$1.wikipedia.org/w/api.php", 86400L);
setPriority(PRIORITY_HIGH);
addContentType(new ContentType("text", "xml"));
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/55d4087b/libraries/ldclient/ldclient-provider-mediawiki/src/test/java/org/apache/marmotta/ldclient/test/mediawiki/TestMediawikiProvider.java
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-mediawiki/src/test/java/org/apache/marmotta/ldclient/test/mediawiki/TestMediawikiProvider.java b/libraries/ldclient/ldclient-provider-mediawiki/src/test/java/org/apache/marmotta/ldclient/test/mediawiki/TestMediawikiProvider.java
index 71b8027..bbfc74b 100644
--- a/libraries/ldclient/ldclient-provider-mediawiki/src/test/java/org/apache/marmotta/ldclient/test/mediawiki/TestMediawikiProvider.java
+++ b/libraries/ldclient/ldclient-provider-mediawiki/src/test/java/org/apache/marmotta/ldclient/test/mediawiki/TestMediawikiProvider.java
@@ -29,13 +29,17 @@ public class TestMediawikiProvider extends ProviderTestBase {
/**
- * This method tests accessing the Youtube Video service via the GData API.
+ * This method tests accessing the mediawiki resource.
*
* @throws Exception
*/
@Test
public void testArticle() throws Exception {
- testResource("http://en.wikipedia.org/wiki/Marmot", "wikipedia-marmot.sparql");
+ testResource("https://en.wikipedia.org/wiki/Marmot", "wikipedia-marmot.sparql");
}
+ @Test
+ public void testArticleHttp() throws Exception {
+ testResource("http://en.wikipedia.org/wiki/Marmot", "wikipedia-marmot-http.sparql");
+ }
}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/55d4087b/libraries/ldclient/ldclient-provider-mediawiki/src/test/resources/org/apache/marmotta/ldclient/test/mediawiki/wikipedia-marmot-http.sparql
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-mediawiki/src/test/resources/org/apache/marmotta/ldclient/test/mediawiki/wikipedia-marmot-http.sparql b/libraries/ldclient/ldclient-provider-mediawiki/src/test/resources/org/apache/marmotta/ldclient/test/mediawiki/wikipedia-marmot-http.sparql
new file mode 100644
index 0000000..36672d6
--- /dev/null
+++ b/libraries/ldclient/ldclient-provider-mediawiki/src/test/resources/org/apache/marmotta/ldclient/test/mediawiki/wikipedia-marmot-http.sparql
@@ -0,0 +1,29 @@
+#
+# 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.
+#
+PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
+PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
+PREFIX dct: <http://purl.org/dc/terms/>
+PREFIX sioc: <http://rdfs.org/sioc/ns#>
+PREFIX sioc-types: <http://rdfs.org/sioc/types#>
+PREFIX owl: <http://www.w3.org/2002/07/owl#>
+ASK {
+ <http://en.wikipedia.org/wiki/Marmot> dct:title "Marmot" ;
+ owl:sameAs <https://en.wikipedia.org/wiki/Marmot> ;
+ rdf:type sioc-types:WikiArticle ;
+ sioc:topic <https://en.wikipedia.org/wiki/Category:Ground_squirrels> .
+}
http://git-wip-us.apache.org/repos/asf/marmotta/blob/55d4087b/libraries/ldclient/ldclient-provider-mediawiki/src/test/resources/org/apache/marmotta/ldclient/test/mediawiki/wikipedia-marmot.sparql
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-mediawiki/src/test/resources/org/apache/marmotta/ldclient/test/mediawiki/wikipedia-marmot.sparql b/libraries/ldclient/ldclient-provider-mediawiki/src/test/resources/org/apache/marmotta/ldclient/test/mediawiki/wikipedia-marmot.sparql
index 5425d1c..65be278 100644
--- a/libraries/ldclient/ldclient-provider-mediawiki/src/test/resources/org/apache/marmotta/ldclient/test/mediawiki/wikipedia-marmot.sparql
+++ b/libraries/ldclient/ldclient-provider-mediawiki/src/test/resources/org/apache/marmotta/ldclient/test/mediawiki/wikipedia-marmot.sparql
@@ -21,7 +21,7 @@ PREFIX dct: <http://purl.org/dc/terms/>
PREFIX sioc: <http://rdfs.org/sioc/ns#>
PREFIX sioc-types: <http://rdfs.org/sioc/types#>
ASK {
- <http://en.wikipedia.org/wiki/Marmot> dct:title "Marmot" ;
+ <https://en.wikipedia.org/wiki/Marmot> dct:title "Marmot" ;
rdf:type sioc-types:WikiArticle ;
- sioc:topic <http://en.wikipedia.org/wiki/Category:Ground_squirrels> .
+ sioc:topic <https://en.wikipedia.org/wiki/Category:Ground_squirrels> .
}