Author: rwesten
Date: Tue Feb 23 09:16:34 2016
New Revision: 1731811
URL: http://svn.apache.org/viewvc?rev=1731811&view=rev
Log:
merged fix for STANBOL-1449 to trunk
Modified:
stanbol/trunk/enhancement-engines/dbpedia-spotlight/ (props changed)
stanbol/trunk/enhancement-engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/annotate/DBPSpotlightAnnotateEnhancementTest.java
stanbol/trunk/enhancement-engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/candidates/DBPSpotlightCandidatesEnhancementTest.java
stanbol/trunk/enhancement-engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/disambiguate/DBPSpotlightDisambiguateEnhancementTest.java
stanbol/trunk/enhancement-engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/spot/DBPSpotlightSpotEnhancementTest.java
Propchange: stanbol/trunk/enhancement-engines/dbpedia-spotlight/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 23 09:16:34 2016
@@ -2,6 +2,7 @@
/incubator/stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight:1386989-1388016
/incubator/stanbol/trunk/enhancer/engines/dbpedia-spotlight:1339554,1339557-1339558
/stanbol/branches/STANBOL-913/dbpedia-spotlight:1443935-1448276
+/stanbol/branches/release-0.12/enhancement-engines/dbpedia-spotlight:1731810
/stanbol/branches/stanbol-nlp-processing/enhancer/engines/dbpedia-spotlight:1388017-1413353
/stanbol/branches/stanbol-solr4/enhancement-engines/dbpedia-spotlight:1455112-1458685
/stanbol/trunk/enhancement-engines/dbpedia-spotlight:1496360-1533530
Modified:
stanbol/trunk/enhancement-engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/annotate/DBPSpotlightAnnotateEnhancementTest.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/annotate/DBPSpotlightAnnotateEnhancementTest.java?rev=1731811&r1=1731810&r2=1731811&view=diff
==============================================================================
---
stanbol/trunk/enhancement-engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/annotate/DBPSpotlightAnnotateEnhancementTest.java
(original)
+++
stanbol/trunk/enhancement-engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/annotate/DBPSpotlightAnnotateEnhancementTest.java
Tue Feb 23 09:16:34 2016
@@ -34,6 +34,7 @@ import org.apache.clerezza.rdf.core.impl
import org.apache.clerezza.rdf.core.impl.TripleImpl;
import
org.apache.stanbol.enhancer.contentitem.inmemory.InMemoryContentItemFactory;
import org.apache.stanbol.enhancer.engines.dbpspotlight.Constants;
+import org.apache.stanbol.enhancer.engines.dbpspotlight.TestDefaults;
import org.apache.stanbol.enhancer.engines.dbpspotlight.model.Annotation;
import org.apache.stanbol.enhancer.servicesapi.Blob;
import org.apache.stanbol.enhancer.servicesapi.ContentItem;
@@ -46,6 +47,7 @@ import org.apache.stanbol.enhancer.servi
import org.apache.stanbol.enhancer.test.helper.EnhancementStructureHelper;
import org.apache.stanbol.enhancer.test.helper.RemoteServiceHelper;
import org.junit.Assert;
+import org.junit.Assume;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -58,15 +60,16 @@ import org.slf4j.LoggerFactory;
*
* @author Iavor Jelev, babelmonkeys / GzEvD
*/
-public class DBPSpotlightAnnotateEnhancementTest {
+public class DBPSpotlightAnnotateEnhancementTest implements TestDefaults{
+
/**
* This contains the logger.
*/
private static final Logger LOG = LoggerFactory
.getLogger(DBPSpotlightAnnotateEnhancementTest.class);
private static String SPL_URL = System
- .getProperty(Constants.PARAM_URL_KEY) == null ?
"http://spotlight.dbpedia.org/rest/annotate";
+ .getProperty(Constants.PARAM_URL_KEY) == null ?
DEFAULT_SPL_URL
: System.getProperty(Constants.PARAM_URL_KEY);
private static String TEST_TEXT = "President Obama is meeting Angela
Merkel in Berlin on Monday";
private static DBPSpotlightAnnotateEnhancementEngine dbpslight;
@@ -78,7 +81,8 @@ public class DBPSpotlightAnnotateEnhance
@BeforeClass
public static void oneTimeSetup() throws Exception {
- dbpslight = new DBPSpotlightAnnotateEnhancementEngine(new
URL(SPL_URL),10);
+ Assume.assumeNotNull(SPL_URL);
+ dbpslight = new DBPSpotlightAnnotateEnhancementEngine(new
URL(SPL_URL + "/annotate"),10);
}
@Before
public void initTest() throws IOException {
Modified:
stanbol/trunk/enhancement-engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/candidates/DBPSpotlightCandidatesEnhancementTest.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/candidates/DBPSpotlightCandidatesEnhancementTest.java?rev=1731811&r1=1731810&r2=1731811&view=diff
==============================================================================
---
stanbol/trunk/enhancement-engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/candidates/DBPSpotlightCandidatesEnhancementTest.java
(original)
+++
stanbol/trunk/enhancement-engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/candidates/DBPSpotlightCandidatesEnhancementTest.java
Tue Feb 23 09:16:34 2016
@@ -34,6 +34,7 @@ import org.apache.clerezza.rdf.core.impl
import org.apache.clerezza.rdf.core.impl.TripleImpl;
import
org.apache.stanbol.enhancer.contentitem.inmemory.InMemoryContentItemFactory;
import org.apache.stanbol.enhancer.engines.dbpspotlight.Constants;
+import org.apache.stanbol.enhancer.engines.dbpspotlight.TestDefaults;
import org.apache.stanbol.enhancer.engines.dbpspotlight.model.SurfaceForm;
import org.apache.stanbol.enhancer.servicesapi.Blob;
import org.apache.stanbol.enhancer.servicesapi.ContentItem;
@@ -46,6 +47,7 @@ import org.apache.stanbol.enhancer.servi
import org.apache.stanbol.enhancer.test.helper.EnhancementStructureHelper;
import org.apache.stanbol.enhancer.test.helper.RemoteServiceHelper;
import org.junit.Assert;
+import org.junit.Assume;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -58,7 +60,7 @@ import org.slf4j.LoggerFactory;
*
* @author Iavor Jelev, babelmonkeys / GzEvD
*/
-public class DBPSpotlightCandidatesEnhancementTest {
+public class DBPSpotlightCandidatesEnhancementTest implements TestDefaults {
/**
* This contains the logger.
@@ -66,7 +68,7 @@ public class DBPSpotlightCandidatesEnhan
private static final Logger LOG = LoggerFactory
.getLogger(DBPSpotlightCandidatesEnhancementTest.class);
private static String SPL_URL = System
- .getProperty(Constants.PARAM_URL_KEY) == null ?
"http://spotlight.dbpedia.org/rest/candidates";
+ .getProperty(Constants.PARAM_URL_KEY) == null ?
DEFAULT_SPL_URL
: System.getProperty(Constants.PARAM_URL_KEY);
private static String TEST_TEXT = "President Obama is meeting Angela
Merkel in Berlin on Monday.";
private static DBPSpotlightCandidatesEnhancementEngine dbpslight;
@@ -78,7 +80,8 @@ public class DBPSpotlightCandidatesEnhan
@BeforeClass
public static void oneTimeSetup() throws Exception {
- dbpslight = new DBPSpotlightCandidatesEnhancementEngine(new
URL(SPL_URL),10);
+ Assume.assumeNotNull(SPL_URL);
+ dbpslight = new DBPSpotlightCandidatesEnhancementEngine(new
URL(SPL_URL + "/candidates"),10);
}
@Before
Modified:
stanbol/trunk/enhancement-engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/disambiguate/DBPSpotlightDisambiguateEnhancementTest.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/disambiguate/DBPSpotlightDisambiguateEnhancementTest.java?rev=1731811&r1=1731810&r2=1731811&view=diff
==============================================================================
---
stanbol/trunk/enhancement-engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/disambiguate/DBPSpotlightDisambiguateEnhancementTest.java
(original)
+++
stanbol/trunk/enhancement-engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/disambiguate/DBPSpotlightDisambiguateEnhancementTest.java
Tue Feb 23 09:16:34 2016
@@ -37,6 +37,7 @@ import org.apache.clerezza.rdf.core.impl
import org.apache.commons.io.IOUtils;
import
org.apache.stanbol.enhancer.contentitem.inmemory.InMemoryContentItemFactory;
import org.apache.stanbol.enhancer.engines.dbpspotlight.Constants;
+import org.apache.stanbol.enhancer.engines.dbpspotlight.TestDefaults;
import org.apache.stanbol.enhancer.engines.dbpspotlight.model.Annotation;
import
org.apache.stanbol.enhancer.engines.dbpspotlight.spot.DBPSpotlightSpotEnhancementEngine;
import org.apache.stanbol.enhancer.servicesapi.Blob;
@@ -51,6 +52,7 @@ import org.apache.stanbol.enhancer.servi
import org.apache.stanbol.enhancer.test.helper.EnhancementStructureHelper;
import org.apache.stanbol.enhancer.test.helper.RemoteServiceHelper;
import org.junit.Assert;
+import org.junit.Assume;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -63,7 +65,7 @@ import org.slf4j.LoggerFactory;
*
* @author Iavor Jelev, babelmonkeys / GzEvD
*/
-public class DBPSpotlightDisambiguateEnhancementTest {
+public class DBPSpotlightDisambiguateEnhancementTest implements TestDefaults{
/**
* This contains the logger.
@@ -71,7 +73,7 @@ public class DBPSpotlightDisambiguateEnh
private static final Logger LOG = LoggerFactory
.getLogger(DBPSpotlightDisambiguateEnhancementTest.class);
private static String SPL_URL = System
- .getProperty(Constants.PARAM_URL_KEY) == null ?
"http://spotlight.dbpedia.org/rest/annotate";
+ .getProperty(Constants.PARAM_URL_KEY) == null ?
DEFAULT_SPL_URL
: System.getProperty(Constants.PARAM_URL_KEY);
private static String TEST_TEXT = "President Obama is meeting Angela
Merkel in Berlin on Monday.";
private static DBPSpotlightDisambiguateEnhancementEngine dbpslight;
@@ -85,7 +87,8 @@ public class DBPSpotlightDisambiguateEnh
@BeforeClass
public static void oneTimeSetup() throws Exception {
- dbpslight = new DBPSpotlightDisambiguateEnhancementEngine(new
URL(SPL_URL),10);
+ Assume.assumeNotNull(SPL_URL);
+ dbpslight = new DBPSpotlightDisambiguateEnhancementEngine(new
URL(SPL_URL + "/annotate"),10);
}
@Before
Modified:
stanbol/trunk/enhancement-engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/spot/DBPSpotlightSpotEnhancementTest.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/enhancement-engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/spot/DBPSpotlightSpotEnhancementTest.java?rev=1731811&r1=1731810&r2=1731811&view=diff
==============================================================================
---
stanbol/trunk/enhancement-engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/spot/DBPSpotlightSpotEnhancementTest.java
(original)
+++
stanbol/trunk/enhancement-engines/dbpedia-spotlight/src/test/java/org/apache/stanbol/enhancer/engines/dbpspotlight/spot/DBPSpotlightSpotEnhancementTest.java
Tue Feb 23 09:16:34 2016
@@ -35,6 +35,7 @@ import org.apache.clerezza.rdf.core.impl
import org.apache.clerezza.rdf.core.impl.TripleImpl;
import
org.apache.stanbol.enhancer.contentitem.inmemory.InMemoryContentItemFactory;
import org.apache.stanbol.enhancer.engines.dbpspotlight.Constants;
+import org.apache.stanbol.enhancer.engines.dbpspotlight.TestDefaults;
import org.apache.stanbol.enhancer.engines.dbpspotlight.model.SurfaceForm;
import org.apache.stanbol.enhancer.servicesapi.Blob;
import org.apache.stanbol.enhancer.servicesapi.ContentItem;
@@ -46,6 +47,7 @@ import org.apache.stanbol.enhancer.servi
import org.apache.stanbol.enhancer.servicesapi.rdf.Properties;
import org.apache.stanbol.enhancer.test.helper.EnhancementStructureHelper;
import org.apache.stanbol.enhancer.test.helper.RemoteServiceHelper;
+import org.junit.Assume;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -58,7 +60,7 @@ import org.slf4j.LoggerFactory;
*
* @author Iavor Jelev, babelmonkeys / GzEvD
*/
-public class DBPSpotlightSpotEnhancementTest {
+public class DBPSpotlightSpotEnhancementTest implements TestDefaults {
/**
* This contains the logger.
@@ -66,8 +68,7 @@ public class DBPSpotlightSpotEnhancement
private static final Logger LOG = LoggerFactory
.getLogger(DBPSpotlightSpotEnhancementTest.class);
private static String SPL_URL = System
- .getProperty(Constants.PARAM_URL_KEY) == null ?
-
"http://spotlight.dbpedia.org/rest/spot"; :
+ .getProperty(Constants.PARAM_URL_KEY) == null ?
DEFAULT_SPL_URL :
System.getProperty(Constants.PARAM_URL_KEY);
private static String TEST_TEXT = "President Obama is meeting Angela
Merkel in Berlin on Monday";
private static DBPSpotlightSpotEnhancementEngine dbpslight;
@@ -79,8 +80,9 @@ public class DBPSpotlightSpotEnhancement
@BeforeClass
public static void oneTimeSetup() throws Exception {
+ Assume.assumeNotNull(SPL_URL);
//and the enhancement engine instance
- dbpslight = new DBPSpotlightSpotEnhancementEngine(new
URL(SPL_URL),null,10);
+ dbpslight = new DBPSpotlightSpotEnhancementEngine(new
URL(SPL_URL + "/spot"),null,10);
}
@Before
