manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1581960 - in /manifoldcf/branches/CONNECTORS-912/connectors/elasticsearch: build.xml connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/APISanityDerbyIT.java
Date Wed, 26 Mar 2014 17:36:07 GMT
Author: kwright
Date: Wed Mar 26 17:36:07 2014
New Revision: 1581960

URL: http://svn.apache.org/r1581960
Log:
Conditionalize elasticsearch tests properly

Modified:
    manifoldcf/branches/CONNECTORS-912/connectors/elasticsearch/build.xml
    manifoldcf/branches/CONNECTORS-912/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/APISanityDerbyIT.java

Modified: manifoldcf/branches/CONNECTORS-912/connectors/elasticsearch/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/elasticsearch/build.xml?rev=1581960&r1=1581959&r2=1581960&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/elasticsearch/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/elasticsearch/build.xml Wed Mar 26 17:36:07
2014
@@ -68,6 +68,18 @@
         </copy>
     </target>
 
+    <target name="calculate-testcode-condition">
+        <available file="test-materials-proprietary" property="tests-present"/>
+    </target>
+
+    <path id="connector-test-classpath">
+        <path refid="mcf-connector-build.connector-test-classpath"/>
+        <fileset dir="test-materials-proprietary/elasticsearch-1.0.1">
+            <include name="elasticsearch*/lib/*.jar"/>
+        	  <include name="elasticsearch*/plugins/mapper-attachments/*.jar"/>
+        </fileset>
+    </path>
+
     <target name="deliver-connector" depends="mcf-connector-build.deliver-connector">
         <antcall target="general-add-output-connector">
             <param name="connector-label" value="ElasticSearch"/>

Modified: manifoldcf/branches/CONNECTORS-912/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/APISanityDerbyIT.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/APISanityDerbyIT.java?rev=1581960&r1=1581959&r2=1581960&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/APISanityDerbyIT.java
(original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/APISanityDerbyIT.java
Wed Mar 26 17:36:07 2014
@@ -29,7 +29,6 @@ import org.apache.commons.lang.StringUti
 import org.apache.manifoldcf.core.interfaces.Configuration;
 import org.apache.manifoldcf.core.interfaces.ConfigurationNode;
 import org.apache.manifoldcf.core.interfaces.ManifoldCFException;
-import org.apache.manifoldcf.crawler.connectors.cmis.CmisConfig;
 import org.apache.manifoldcf.crawler.system.ManifoldCF;
 import org.junit.After;
 import org.junit.Before;
@@ -38,7 +37,7 @@ import org.junit.Test;
 /**
  * @author Piergiorgio Lucidi
  */
-public class APISanityDerbyIT extends BaseDerby
+public class APISanityDerbyIT extends BaseITDerby
 {
   
   @Test



Mime
View raw message