Author: rwesten
Date: Mon Mar 5 21:42:20 2012
New Revision: 1297236
URL: http://svn.apache.org/viewvc?rev=1297236&view=rev
Log:
STANBOL-510: Adapted integration tests to the exclusion of the Metaxa Engine
Modified:
incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/ContentTranformationTest.java
incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/DefaultChainTest.java
incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/EnhancerTestBase.java
incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/MultipartRequestTest.java
Modified:
incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/ContentTranformationTest.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/ContentTranformationTest.java?rev=1297236&r1=1297235&r2=1297236&view=diff
==============================================================================
---
incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/ContentTranformationTest.java
(original)
+++
incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/ContentTranformationTest.java
Mon Mar 5 21:42:20 2012
@@ -43,7 +43,7 @@ public class ContentTranformationTest ex
public ContentTranformationTest() {
//for now use the language chain to test transforming
- super(getChainEndpoint("language"),"metaxa","langid");
+ super(getChainEndpoint("language"),"tika","langid");
}
@Test
Modified:
incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/DefaultChainTest.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/DefaultChainTest.java?rev=1297236&r1=1297235&r2=1297236&view=diff
==============================================================================
---
incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/DefaultChainTest.java
(original)
+++
incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/DefaultChainTest.java
Mon Mar 5 21:42:20 2012
@@ -71,8 +71,8 @@ public class DefaultChainTest extends En
.assertContentRegexp(
//check execution metadata
"http://stanbol.apache.org/ontology/enhancer/executionmetadata#executionPart";,
- //check execution of metaxa & if executionPlan is included
-
"http://stanbol.apache.org/ontology/enhancer/executionplan#engine.*metaxa";,
+ //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/language.*en";,
"http://fise.iks-project.eu/ontology/entity-label.*Paris";,
Modified:
incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/EnhancerTestBase.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/EnhancerTestBase.java?rev=1297236&r1=1297235&r2=1297236&view=diff
==============================================================================
---
incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/EnhancerTestBase.java
(original)
+++
incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/EnhancerTestBase.java
Mon Mar 5 21:42:20 2012
@@ -69,7 +69,7 @@ public class EnhancerTestBase extends St
private static final String[] DEFAULT_ASSERT_ENGINES =
new String[]{
- "metaxa","MetaxaEngine",
+ //"metaxa","MetaxaEngine", deactivated see STANBOL-510
"langid","LangIdEnhancementEngine",
"ner","NamedEntityExtractionEnhancementEngine",
"entityhubLinking","NamedEntityTaggingEngine",
Modified:
incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/MultipartRequestTest.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/MultipartRequestTest.java?rev=1297236&r1=1297235&r2=1297236&view=diff
==============================================================================
---
incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/MultipartRequestTest.java
(original)
+++
incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/MultipartRequestTest.java
Mon Mar 5 21:42:20 2012
@@ -178,7 +178,7 @@ public class MultipartRequestTest extend
.assertContentContains(HTML_CONTENT_LINES) //line by line the HTML
content
.assertContentRegexp(
"Content-Disposition: form-data; name=\"metadata\"; filename=.*",
- "Content-Disposition: form-data; name=\"urn:metaxa:plain-text:.*",
+ "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";,
@@ -215,7 +215,7 @@ public class MultipartRequestTest extend
.assertContentContains(TEXT_CONTENT_LINES)
.assertContentContains(HTML_CONTENT_LINES) //line by line the HTML
content
.assertContentRegexp( //MUST contain
- "Content-Disposition: form-data; name=\"urn:metaxa:plain-text:.*",
+ "Content-Disposition: form-data; name=\"urn:tika:text:.*",
"Content-Disposition: form-data; name=\"urn:content-item-sha1-.*")
.assertContentRegexp(false, //MUST NOT contain
"Content-Disposition: form-data; name=\"metadata\"; filename=.*",
@@ -253,7 +253,7 @@ public class MultipartRequestTest extend
.assertContentContains(TEXT_CONTENT_LINES)
.assertContentRegexp(
"Content-Disposition: form-data; name=\"metadata\"; filename=.*",
- "Content-Disposition: form-data; name=\"urn:metaxa:plain-text:.*",
+ "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/language.*en";,
@@ -289,7 +289,7 @@ public class MultipartRequestTest extend
.assertContentContains(TEXT_CONTENT_LINES)
.assertContentRegexp(
"Content-Disposition: form-data; name=\"metadata\"; filename=.*",
- "Content-Disposition: form-data; name=\"urn:metaxa:plain-text:.*",
+ "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/language.*en";,
