You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2011/02/27 16:08:59 UTC
svn commit: r1075074 - in /lucene/dev/branches/branch_3x: ./ lucene/ solr/
solr/contrib/uima/src/main/resources/org/apache/uima/desc/
solr/contrib/uima/src/test/java/org/apache/solr/uima/processor/
solr/contrib/uima/src/test/resources/ solr/contrib/uim...
Author: rmuir
Date: Sun Feb 27 15:08:59 2011
New Revision: 1075074
URL: http://svn.apache.org/viewvc?rev=1075074&view=rev
Log:
SOLR-2387: UIMA tests are unstable
Added:
lucene/dev/branches/branch_3x/solr/contrib/uima/src/test/resources/AggregateSentenceAE.xml
- copied unchanged from r1075072, lucene/dev/trunk/solr/contrib/uima/src/test/resources/AggregateSentenceAE.xml
lucene/dev/branches/branch_3x/solr/contrib/uima/src/test/resources/OpenCalaisAnnotator.xml
- copied unchanged from r1075072, lucene/dev/trunk/solr/contrib/uima/src/test/resources/OpenCalaisAnnotator.xml
lucene/dev/branches/branch_3x/solr/contrib/uima/src/test/resources/TestAE.xml
- copied unchanged from r1075072, lucene/dev/trunk/solr/contrib/uima/src/test/resources/TestAE.xml
lucene/dev/branches/branch_3x/solr/contrib/uima/src/test/resources/TextCategorizationAEDescriptor.xml
- copied unchanged from r1075072, lucene/dev/trunk/solr/contrib/uima/src/test/resources/TextCategorizationAEDescriptor.xml
Removed:
lucene/dev/branches/branch_3x/solr/contrib/uima/src/main/resources/org/apache/uima/desc/ExtServicesAE.xml
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/solr/ (props changed)
lucene/dev/branches/branch_3x/solr/contrib/uima/src/test/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorTest.java
lucene/dev/branches/branch_3x/solr/contrib/uima/src/test/resources/solr-uima/conf/solrconfig.xml
Modified: lucene/dev/branches/branch_3x/solr/contrib/uima/src/test/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/uima/src/test/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorTest.java?rev=1075074&r1=1075073&r2=1075074&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/uima/src/test/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/uima/src/test/java/org/apache/solr/uima/processor/UIMAUpdateRequestProcessorTest.java Sun Feb 27 15:08:59 2011
@@ -36,7 +36,6 @@ import org.apache.solr.response.SolrQuer
import org.apache.solr.update.processor.UpdateRequestProcessorChain;
import org.junit.Before;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
/**
@@ -70,7 +69,6 @@ public class UIMAUpdateRequestProcessorT
}
@Test
- @Ignore("unstable: see https://issues.apache.org/jira/browse/SOLR-2387")
public void testProcessing() throws Exception {
// this test requires an internet connection (e.g. opencalais api)
checkInternetConnection();
@@ -85,31 +83,26 @@ public class UIMAUpdateRequestProcessorT
+ " attached if you need it, but it is also committed to trunk and 3_x branch."
+ " Last Lucene European Conference has been held in Prague."));
assertU(commit());
- assertQ(req("language:english"), "//*[@numFound='1']");
+ assertQ(req("suggested_category:*"), "//*[@numFound='1']");
}
@Test
- public void testTwoUpdates() {
+ public void testTwoUpdates() throws Exception {
// this test requires an internet connection (e.g. opencalais api)
checkInternetConnection();
- try {
- addDoc(adoc("id", "1", "text", "The Apache Software Foundation is happy to announce "
- + "BarCampApache Sydney, Australia, the first ASF-backed event in the Southern "
- + "Hemisphere!"));
- assertU(commit());
- assertQ(req("language:english"), "//*[@numFound='1']");
-
- addDoc(adoc("id", "2", "text", "Taking place 11th December 2010 at the University "
- + "of Sydney's Darlington Centre, the BarCampApache \"unconference\" will be"
- + " attendee-driven, facilitated by members of the Apache community and will "
- + "focus on the Apache..."));
- assertU(commit());
- assertQ(req("language:english"), "//*[@numFound='2']");
+ addDoc(adoc("id", "1", "text", "The Apache Software Foundation is happy to announce "
+ + "BarCampApache Sydney, Australia, the first ASF-backed event in the Southern "
+ + "Hemisphere!"));
+ assertU(commit());
+ assertQ(req("suggested_category:*"), "//*[@numFound='1']");
- } catch (Exception e) {
- assumeNoException("Multiple updates on same instance didn't work", e);
- }
+ addDoc(adoc("id", "2", "text", "Taking place 11th December 2010 at the University "
+ + "of Sydney's Darlington Centre, the BarCampApache \"unconference\" will be"
+ + " attendee-driven, facilitated by members of the Apache community and will "
+ + "focus on the Apache..."));
+ assertU(commit());
+ assertQ(req("suggested_category:*"), "//*[@numFound='2']");
}
private void addDoc(String doc) throws Exception {
Modified: lucene/dev/branches/branch_3x/solr/contrib/uima/src/test/resources/solr-uima/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/uima/src/test/resources/solr-uima/conf/solrconfig.xml?rev=1075074&r1=1075073&r2=1075074&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/uima/src/test/resources/solr-uima/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/uima/src/test/resources/solr-uima/conf/solrconfig.xml Sun Feb 27 15:08:59 2011
@@ -1078,7 +1078,7 @@
<entities_apikey>04490000a72fe7ec5cb3497f14e77f338c86f2fe</entities_apikey>
<oc_licenseID>g6h9zamsdtwhb93nc247ecrs</oc_licenseID>
</runtimeParameters>
- <analysisEngine>/org/apache/uima/desc/OverridingParamsExtServicesAE.xml</analysisEngine>
+ <analysisEngine>/TestAE.xml</analysisEngine>
<analyzeFields merge="false">text</analyzeFields>
<fieldMapping>
<type name="org.apache.uima.alchemy.ts.categorization.Category">