Author: suat
Date: Mon Aug 27 14:30:42 2012
New Revision: 1377694
URL: http://svn.apache.org/viewvc?rev=1377694&view=rev
Log:
STANBOL-471: Porting changes on the integration-test from trunk to the branch
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/integration-tests/src/test/java/org/apache/stanbol/commons/httpqueryheaders/it/HttpQueryHeaderPostTest.java
incubator/stanbol/branches/contenthub-two-layered-structure/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/ContentTranformationTest.java
incubator/stanbol/branches/contenthub-two-layered-structure/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/DefaultChainTest.java
incubator/stanbol/branches/contenthub-two-layered-structure/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/EnhancerConfigurationTest.java
incubator/stanbol/branches/contenthub-two-layered-structure/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/EnhancerTestBase.java
incubator/stanbol/branches/contenthub-two-layered-structure/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/LanguageChainTest.java
incubator/stanbol/branches/contenthub-two-layered-structure/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/MultipartRequestTest.java
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/integration-tests/src/test/java/org/apache/stanbol/commons/httpqueryheaders/it/HttpQueryHeaderPostTest.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/integration-tests/src/test/java/org/apache/stanbol/commons/httpqueryheaders/it/HttpQueryHeaderPostTest.java?rev=1377694&r1=1377693&r2=1377694&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/integration-tests/src/test/java/org/apache/stanbol/commons/httpqueryheaders/it/HttpQueryHeaderPostTest.java
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/integration-tests/src/test/java/org/apache/stanbol/commons/httpqueryheaders/it/HttpQueryHeaderPostTest.java
Mon Aug 27 14:30:42 2012
@@ -70,7 +70,7 @@ public class HttpQueryHeaderPostTest ext
//check for JSON-LD (the default content type
.assertContentType("application/json")
.assertContentRegexp("\"entity-reference\":
\"http://dbpedia.org/resource/London\",";,
- "\"creator\":
\"org.apache.stanbol.enhancer.engines.langid.LangIdEnhancementEngine\"",
+ "\"creator\":
\"org.apache.stanbol.enhancer.engines.langdetect.LanguageDetectionEnhancementEngine\"",
"\"creator\":
\"org.apache.stanbol.enhancer.engines.entitytagging.impl.NamedEntityTaggingEngine\"");
}
}
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/ContentTranformationTest.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/ContentTranformationTest.java?rev=1377694&r1=1377693&r2=1377694&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/ContentTranformationTest.java
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/ContentTranformationTest.java
Mon Aug 27 14:30:42 2012
@@ -43,7 +43,7 @@ public class ContentTranformationTest ex
public ContentTranformationTest() {
//for now use the language chain to test transforming
- super(getChainEndpoint("language"),"tika","langid");
+ super(getChainEndpoint("language"),"tika","langdetect");
}
@Test
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/DefaultChainTest.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/DefaultChainTest.java?rev=1377694&r1=1377693&r2=1377694&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/DefaultChainTest.java
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/DefaultChainTest.java
Mon Aug 27 14:30:42 2012
@@ -31,7 +31,7 @@ public class DefaultChainTest extends En
public final static String [] ACCEPT_FORMAT_TEST_DATA = new String[] {
"application/json",
"application/json", //now JSON LD uses application/json
- "\"creator\":
\"org.apache.stanbol.enhancer.engines.langid.LangIdEnhancementEngine\",",
+ "\"creator\":
\"org.apache.stanbol.enhancer.engines.langdetect.LanguageDetectionEnhancementEngine\",",
"application/rdf+xml",
"application/rdf+xml",
@@ -39,7 +39,7 @@ public class DefaultChainTest extends En
"application/rdf+json",
"application/rdf+json",
-
"\"value\":\"org.apache.stanbol.enhancer.engines.langid.LangIdEnhancementEngine\"",
+
"\"value\":\"org.apache.stanbol.enhancer.engines.langdetect.LanguageDetectionEnhancementEngine\"",
"text/turtle",
"text/turtle",
@@ -73,7 +73,7 @@ public class DefaultChainTest extends En
"http://stanbol.apache.org/ontology/enhancer/executionmetadata#executionPart";,
//check execution of tika & if executionPlan is included
"http://stanbol.apache.org/ontology/enhancer/executionplan#engine.*tika";,
- "http://purl.org/dc/terms/creator.*LangIdEnhancementEngine";,
+
"http://purl.org/dc/terms/creator.*LanguageDetectionEnhancementEngine";,
"http://purl.org/dc/terms/language.*en";,
"http://fise.iks-project.eu/ontology/entity-label.*Paris";,
"http://purl.org/dc/terms/creator.*org.apache.stanbol.enhancer.engines.opennlp.*EngineCore";,
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/EnhancerConfigurationTest.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/EnhancerConfigurationTest.java?rev=1377694&r1=1377693&r2=1377694&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/EnhancerConfigurationTest.java
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/EnhancerConfigurationTest.java
Mon Aug 27 14:30:42 2012
@@ -36,6 +36,7 @@ public class EnhancerConfigurationTest e
"<rdf:type
rdf:resource=\"http://stanbol.apache.org/ontology/enhancer/enhancer#Enhancer\"/>",
"<j.0:hasEngine
rdf:resource=\"http://localhost:.*/enhancer/engine/dbpediaLinking\"/>",
"<j.0:hasEngine
rdf:resource=\"http://localhost:.*/enhancer/engine/langid\"/>",
+ "<j.0:hasEngine
rdf:resource=\"http://localhost:.*/enhancer/engine/langdetect\"/>",
"<j.0:hasEngine
rdf:resource=\"http://localhost:.*/enhancer/engine/tika\"/>",
"<j.0:hasEngine
rdf:resource=\"http://localhost:.*/enhancer/engine/ner\"/>",
"<j.0:hasChain
rdf:resource=\"http://localhost:.*/enhancer/chain/default\"/>",
@@ -58,6 +59,7 @@ public class EnhancerConfigurationTest e
"<rdf:type
rdf:resource=\"http://stanbol.apache.org/ontology/enhancer/enhancer#Enhancer\"/>",
"<j.0:hasEngine
rdf:resource=\"http://localhost:.*/enhancer/engine/dbpediaLinking\"/>",
"<j.0:hasEngine
rdf:resource=\"http://localhost:.*/enhancer/engine/langid\"/>",
+ "<j.0:hasEngine
rdf:resource=\"http://localhost:.*/enhancer/engine/langdetect\"/>",
"<j.0:hasEngine
rdf:resource=\"http://localhost:.*/enhancer/engine/tika\"/>",
"<j.0:hasEngine
rdf:resource=\"http://localhost:.*/enhancer/engine/ner\"/>",
"<rdf:type
rdf:resource=\"http://stanbol.apache.org/ontology/enhancer/enhancer#EnhancementEngine\"/>",
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/EnhancerTestBase.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/EnhancerTestBase.java?rev=1377694&r1=1377693&r2=1377694&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/EnhancerTestBase.java
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/EnhancerTestBase.java
Mon Aug 27 14:30:42 2012
@@ -70,7 +70,7 @@ public class EnhancerTestBase extends St
private static final String[] DEFAULT_ASSERT_ENGINES =
new String[]{
//"metaxa","MetaxaEngine", deactivated see STANBOL-510
- "langid","LangIdEnhancementEngine",
+ "langdetect","LanguageDetectionEnhancementEngine",
"ner","NamedEntityExtractionEnhancementEngine",
"entityhubExtraction","NamedEntityExtractionEnhancementEngine",
"dbpediaLinking","NamedEntityTaggingEngine",
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/LanguageChainTest.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/LanguageChainTest.java?rev=1377694&r1=1377693&r2=1377694&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/LanguageChainTest.java
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/LanguageChainTest.java
Mon Aug 27 14:30:42 2012
@@ -22,7 +22,7 @@ public class LanguageChainTest extends E
public LanguageChainTest() {
super(getChainEndpoint("language"),
- "langid","LangIdEnhancementEngine");
+ "langdetect","LanguageDetectionEnhancementEngine");
}
@@ -37,7 +37,7 @@ public class LanguageChainTest extends E
)
.assertStatus(200)
.assertContentRegexp( // it MUST detect the language
- "http://purl.org/dc/terms/creator.*LangIdEnhancementEngine";,
+
"http://purl.org/dc/terms/creator.*LanguageDetectionEnhancementEngine";,
"http://purl.org/dc/terms/language.*en";)
.assertContentRegexp(false, //MUST NOT contain because NER is not in
this chain
"http://fise.iks-project.eu/ontology/entity-label.*Paris";,
//No entitylinking
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/MultipartRequestTest.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/MultipartRequestTest.java?rev=1377694&r1=1377693&r2=1377694&view=diff
==============================================================================
---
incubator/stanbol/branches/contenthub-two-layered-structure/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/MultipartRequestTest.java
(original)
+++
incubator/stanbol/branches/contenthub-two-layered-structure/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/MultipartRequestTest.java
Mon Aug 27 14:30:42 2012
@@ -181,7 +181,7 @@ public class MultipartRequestTest extend
"Content-Disposition: form-data; name=\"urn:tika:text:.*",
"Content-Disposition: form-data; name=\"urn:content-item-sha1-.*",
//and the expected enhancements in the metadata
- "http://purl.org/dc/terms/creator.*LangIdEnhancementEngine";,
+
"http://purl.org/dc/terms/creator.*LanguageDetectionEnhancementEngine";,
"http://purl.org/dc/terms/language.*en";,
"http://fise.iks-project.eu/ontology/entity-label.*Paris";,
"http://purl.org/dc/terms/creator.*org.apache.stanbol.enhancer.engines.opennlp.*EngineCore";,
@@ -220,7 +220,7 @@ public class MultipartRequestTest extend
.assertContentRegexp(false, //MUST NOT contain
"Content-Disposition: form-data; name=\"metadata\"; filename=.*",
//and the expected enhancements in the metadata
- "http://purl.org/dc/terms/creator.*LangIdEnhancementEngine";,
+
"http://purl.org/dc/terms/creator.*LanguageDetectionEnhancementEngine";,
"http://purl.org/dc/terms/language.*en";,
"http://fise.iks-project.eu/ontology/entity-label.*Paris";,
"http://purl.org/dc/terms/creator.*org.apache.stanbol.enhancer.engines.opennlp.*EngineCore";,
@@ -255,7 +255,7 @@ public class MultipartRequestTest extend
"Content-Disposition: form-data; name=\"metadata\"; filename=.*",
"Content-Disposition: form-data; name=\"urn:tika:text:.*",
//and the expected enhancements in the metadata
- "http://purl.org/dc/terms/creator.*LangIdEnhancementEngine";,
+
"http://purl.org/dc/terms/creator.*LanguageDetectionEnhancementEngine";,
"http://purl.org/dc/terms/language.*en";,
"http://fise.iks-project.eu/ontology/entity-label.*Paris";,
"http://purl.org/dc/terms/creator.*org.apache.stanbol.enhancer.engines.opennlp.*EngineCore";,
@@ -291,7 +291,7 @@ public class MultipartRequestTest extend
"Content-Disposition: form-data; name=\"metadata\"; filename=.*",
"Content-Disposition: form-data; name=\"urn:tika:text:.*",
//and the expected enhancements in the metadata
- "http://purl.org/dc/terms/creator.*LangIdEnhancementEngine";,
+
"http://purl.org/dc/terms/creator.*LanguageDetectionEnhancementEngine";,
"http://purl.org/dc/terms/language.*en";,
"http://fise.iks-project.eu/ontology/entity-label.*Paris";,
"http://purl.org/dc/terms/creator.*org.apache.stanbol.enhancer.engines.opennlp.*EngineCore";,
@@ -368,7 +368,7 @@ public class MultipartRequestTest extend
.assertStatus(200)
.assertContentRegexp(
//and the expected enhancements in the metadata
- "http://purl.org/dc/terms/creator.*LangIdEnhancementEngine";,
+
"http://purl.org/dc/terms/creator.*LanguageDetectionEnhancementEngine";,
"http://purl.org/dc/terms/language.*en";,
"http://fise.iks-project.eu/ontology/entity-label.*Paris";,
"http://purl.org/dc/terms/creator.*org.apache.stanbol.enhancer.engines.opennlp.*EngineCore";,
@@ -509,7 +509,7 @@ public class MultipartRequestTest extend
.assertStatus(200)
.assertContentRegexp(
//and the expected enhancements based on the parsed content
- "http://purl.org/dc/terms/creator.*LangIdEnhancementEngine";,
+
"http://purl.org/dc/terms/creator.*LanguageDetectionEnhancementEngine";,
"http://purl.org/dc/terms/language.*en";,
"http://fise.iks-project.eu/ontology/entity-label.*Paris";,
"http://purl.org/dc/terms/creator.*org.apache.stanbol.enhancer.engines.opennlp.*EngineCore";,
