You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2012/02/16 20:53:29 UTC
svn commit: r1245141 - in /incubator/lcf/branches/CONNECTORS-288: ./
connectors/elasticsearch/connector/src/test/
connectors/elasticsearch/connector/src/test/java/
connectors/elasticsearch/connector/src/test/java/org/
connectors/elasticsearch/connector...
Author: kwright
Date: Thu Feb 16 19:53:29 2012
New Revision: 1245141
URL: http://svn.apache.org/viewvc?rev=1245141&view=rev
Log:
Install infrastructure for running tests under ant. IT test builds still fail however.
Added:
incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/test/
incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/test/java/
incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/test/java/org/
incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/test/java/org/apache/
incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/
incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/
incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/
incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/
incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/
incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/BaseDerby.java (with props)
incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/BaseHSQLDB.java (with props)
incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/BasePostgresql.java (with props)
incubator/lcf/branches/CONNECTORS-288/tests/icmis-test-build.xml
- copied, changed from r1245127, incubator/lcf/branches/CONNECTORS-288/tests/ifs-test-build.xml
Modified:
incubator/lcf/branches/CONNECTORS-288/build.xml
incubator/lcf/branches/CONNECTORS-288/tests/elasticsearch/build.xml
Modified: incubator/lcf/branches/CONNECTORS-288/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-288/build.xml?rev=1245141&r1=1245140&r2=1245141&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-288/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-288/build.xml Thu Feb 16 19:53:29 2012
@@ -679,9 +679,6 @@
<ant dir="connectors/opensearchserver" target="run-tests-HSQLDB"/>
</target>
-
-
-
<target name="setup-elasticsearch-connector" depends="build-framework"/>
@@ -1508,14 +1505,14 @@
</condition>
</target>
- <target name="calculate-elasticsearch-tests-condition" depends="calculate-elasticsearch-condition,calculate-cmis-condition">
- <condition property="elasticsearch.include">
+ <target name="calculate-elasticsearch-tests-condition" depends="calculate-elasticsearch-condition,calculate-cmis-condition">
+ <condition property="elasticsearch-tests.include">
<and>
- <isset property="elasticsearch.exists"/>
+ <isset property="elasticsearch.include"/>
<isset property="cmis.include"/>
</and>
</condition>
- </target>
+ </target>
<target name="calculate-elasticsearch-doc-condition" depends="doc-elasticsearch-connector">
<available file="connectors/elasticsearch/dist/doc" type="dir" property="elasticsearch-doc.exists"/>
@@ -1911,7 +1908,7 @@
<ant dir="tests/cmis" target="run-load-derby"/>
</target>
- <target name="run-elasticsearch-tests-derby" depends="build-tests-framework,build-tests-cmis-connector,build-tests-elasticsearch-connector,calculate-cmis-tests-condition,calculate-elasticsearch-tests-condition" if="elasticsearch-tests.include">
+ <target name="run-elasticsearch-tests-derby" depends="build-tests-framework,build-tests-cmis-connector,build-tests-elasticsearch-connector,calculate-cmis-tests-condition,calculate-elasticsearch-tests-condition" if="elasticsearch-tests.include">
<ant dir="tests/elasticsearch" target="run-derby"/>
</target>
Added: incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/BaseDerby.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/BaseDerby.java?rev=1245141&view=auto
==============================================================================
--- incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/BaseDerby.java (added)
+++ incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/BaseDerby.java Thu Feb 16 19:53:29 2012
@@ -0,0 +1,36 @@
+/* $Id$ */
+
+/**
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package org.apache.manifoldcf.agents.output.elasticsearch.tests;
+
+
+/** This is a testing base class that is responsible for setting up/tearing down the agents framework. */
+public class BaseDerby extends org.apache.manifoldcf.crawler.tests.ConnectorBaseDerby
+{
+
+ protected String[] getOutputNames()
+ {
+ return new String[]{"Elastic Search"};
+ }
+
+ protected String[] getOutputClasses()
+ {
+ return new String[]{"org.apache.manifoldcf.agents.output.elasticsearch.ElasticSearchConnector"};
+ }
+
+}
Propchange: incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/BaseDerby.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/BaseDerby.java
------------------------------------------------------------------------------
svn:keywords = Id
Added: incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/BaseHSQLDB.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/BaseHSQLDB.java?rev=1245141&view=auto
==============================================================================
--- incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/BaseHSQLDB.java (added)
+++ incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/BaseHSQLDB.java Thu Feb 16 19:53:29 2012
@@ -0,0 +1,36 @@
+/* $Id$ */
+
+/**
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package org.apache.manifoldcf.crawler.connectors.cmis.tests;
+
+
+/** This is a testing base class that is responsible for setting up/tearing down the agents framework. */
+public class BaseHSQLDB extends org.apache.manifoldcf.crawler.tests.ConnectorBaseHSQLDB
+{
+
+ protected String[] getOutputNames()
+ {
+ return new String[]{"Elastic Search"};
+ }
+
+ protected String[] getOutputClasses()
+ {
+ return new String[]{"org.apache.manifoldcf.agents.output.elasticsearch.ElasticSearchConnector"};
+ }
+
+}
Propchange: incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/BaseHSQLDB.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/BaseHSQLDB.java
------------------------------------------------------------------------------
svn:keywords = Id
Added: incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/BasePostgresql.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/BasePostgresql.java?rev=1245141&view=auto
==============================================================================
--- incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/BasePostgresql.java (added)
+++ incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/BasePostgresql.java Thu Feb 16 19:53:29 2012
@@ -0,0 +1,36 @@
+/* $Id$ */
+
+/**
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package org.apache.manifoldcf.crawler.connectors.cmis.tests;
+
+
+/** This is a testing base class that is responsible for setting up/tearing down the agents framework. */
+public class BasePostgresql extends org.apache.manifoldcf.crawler.tests.ConnectorBasePostgresql
+{
+
+ protected String[] getOutputNames()
+ {
+ return new String[]{"Elastic Search"};
+ }
+
+ protected String[] getOutputClasses()
+ {
+ return new String[]{"org.apache.manifoldcf.agents.output.elasticsearch.ElasticSearchConnector"};
+ }
+
+}
Propchange: incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/BasePostgresql.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/test/java/org/apache/manifoldcf/agents/output/elasticsearch/tests/BasePostgresql.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: incubator/lcf/branches/CONNECTORS-288/tests/elasticsearch/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-288/tests/elasticsearch/build.xml?rev=1245141&r1=1245140&r2=1245141&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-288/tests/elasticsearch/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-288/tests/elasticsearch/build.xml Thu Feb 16 19:53:29 2012
@@ -17,7 +17,7 @@
<project name="elasticsearch" default="all">
- <import file="../ino-test-build.xml"/>
+ <import file="../icmis-test-build.xml"/>
<target name="run-derby" depends="compile-tests">
<mkdir dir="test-derby-output"/>
Copied: incubator/lcf/branches/CONNECTORS-288/tests/icmis-test-build.xml (from r1245127, incubator/lcf/branches/CONNECTORS-288/tests/ifs-test-build.xml)
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-288/tests/icmis-test-build.xml?p2=incubator/lcf/branches/CONNECTORS-288/tests/icmis-test-build.xml&p1=incubator/lcf/branches/CONNECTORS-288/tests/ifs-test-build.xml&r1=1245127&r2=1245141&rev=1245141&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-288/tests/ifs-test-build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-288/tests/icmis-test-build.xml Thu Feb 16 19:53:29 2012
@@ -16,22 +16,22 @@
-->
<!-- Include file system connector in addition to the test connector -->
-<project name="mcf-ifs-test-build">
+<project name="mcf-icmis-test-build">
<import file="test-build.xml"/>
- <path id="mcf-ifs-test-build.test-classpath">
+ <path id="mcf-icmis-test-build.test-classpath">
<path refid="mcf-test-build.test-classpath"/>
- <fileset dir="../../connectors/filesystem/dist/lib">
+ <fileset dir="../../connectors/cmis/dist/lib">
<include name="*.jar"/>
</fileset>
- <fileset dir="../../connectors/filesystem/build/test-jar">
+ <fileset dir="../../connectors/cmis/build/test-jar">
<include name="*.jar"/>
</fileset>
</path>
<path id="test-classpath">
- <path refid="mcf-ifs-test-build.test-classpath"/>
+ <path refid="mcf-icmis-test-build.test-classpath"/>
</path>
<target name="run-derby" depends="mcf-test-build.run-derby"/>