Remved not needed test dep in camel-solr and reduce dep used for testing
Conflicts:
components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrSpringTest.java
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/daf1c729
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/daf1c729
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/daf1c729
Branch: refs/heads/camel-2.12.x
Commit: daf1c72980c26544509dc004eaf40a86b4acf1fd
Parents: 16fdf52
Author: Claus Ibsen <[email protected]>
Authored: Sun Nov 10 18:03:28 2013 +0100
Committer: Claus Ibsen <[email protected]>
Committed: Sun Nov 10 18:15:51 2013 +0100
----------------------------------------------------------------------
components/camel-solr/pom.xml | 33 +---
.../camel/component/solr/SolrSpringTest.java | 184 -------------------
.../test/resources/SolrSpringTest-context.xml | 112 -----------
3 files changed, 1 insertion(+), 328 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/daf1c729/components/camel-solr/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-solr/pom.xml b/components/camel-solr/pom.xml
index 9b13f38..4e48a30 100644
--- a/components/camel-solr/pom.xml
+++ b/components/camel-solr/pom.xml
@@ -68,13 +68,7 @@
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-core-xml</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-test-spring</artifactId>
+ <artifactId>camel-test</artifactId>
<scope>test</scope>
</dependency>
@@ -127,31 +121,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-script</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-jsr223</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/camel/blob/daf1c729/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrSpringTest.java
----------------------------------------------------------------------
diff --git
a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrSpringTest.java
b/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrSpringTest.java
deleted file mode 100644
index 239ed1a..0000000
---
a/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrSpringTest.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/**
- * 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.camel.component.solr;
-
-import java.io.File;
-import java.util.Arrays;
-import org.apache.camel.Produce;
-import org.apache.camel.ProducerTemplate;
-import org.apache.solr.client.solrj.SolrQuery;
-import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.solr.client.solrj.embedded.JettySolrRunner;
-import org.apache.solr.client.solrj.impl.HttpSolrServer;
-import org.apache.solr.client.solrj.response.QueryResponse;
-import org.apache.solr.client.solrj.util.ClientUtils;
-import org.apache.solr.common.SolrDocument;
-import org.apache.solr.common.SolrInputDocument;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.ContextConfiguration;
-import
org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
-
-import static org.junit.Assert.assertEquals;
-
-@ContextConfiguration (locations = {"/SolrSpringTest-context.xml"})
-public class SolrSpringTest extends AbstractJUnit4SpringContextTests {
-
- static {
- System.setProperty("SolrServer.Port",
Integer.toString(SolrComponentTestSupport.PORT));
- }
-
- private static JettySolrRunner solrRunner;
- private static HttpSolrServer solrServer;
-
- @Produce(uri = "direct:direct-xml-start")
- protected ProducerTemplate directXmlRoute;
-
- @Produce(uri = "direct:xml-start")
- protected ProducerTemplate xmlRoute;
-
- @Produce(uri = "direct:xml-start-streaming")
- protected ProducerTemplate xmlRouteStreaming;
-
- @Produce(uri = "direct:pdf-start")
- protected ProducerTemplate pdfRoute;
-
- @Produce(uri = "direct:pdf-start-streaming")
- protected ProducerTemplate pdfRouteStreaming;
-
-
- @DirtiesContext
- @Test
- public void endToEndIndexDirectXML() throws Exception {
- SolrInputDocument doc = new SolrInputDocument();
- doc.addField("id", "MA147LL/A", 1.0f);
- String docAsXml = ClientUtils.toXML(doc);
- directXmlRoute.sendBody(docAsXml);
-
- QueryResponse response = executeSolrQuery("id:MA147LL/A");
- assertEquals(0, response.getStatus());
- assertEquals(1, response.getResults().getNumFound());
- }
-
- @DirtiesContext
- @Test
- public void endToEndIndexXMLDocuments() throws Exception {
- xmlRoute.sendBody(new File("src/test/resources/data/books.xml"));
-
- // Check things were indexed.
- QueryResponse response = executeSolrQuery("*:*");
-
- assertEquals(0, response.getStatus());
- assertEquals(4, response.getResults().getNumFound());
-
- // Check fields were indexed correctly.
- response = executeSolrQuery("title:Learning XML");
-
- SolrDocument doc = response.getResults().get(0);
- assertEquals("Learning XML", doc.getFieldValue("id"));
- assertEquals(Arrays.asList("Web", "Technology", "Computers"),
doc.getFieldValue("cat"));
- }
-
-
- @DirtiesContext
- @Test
- public void endToEndIndexXMLDocumentsStreaming() throws Exception {
- xmlRouteStreaming.sendBody(new
File("src/test/resources/data/books.xml"));
-
- // Check things were indexed.
- QueryResponse response = executeSolrQuery("*:*");
-
- assertEquals(0, response.getStatus());
- assertEquals(4, response.getResults().getNumFound());
-
- // Check fields were indexed correctly.
- response = executeSolrQuery("title:Learning XML");
-
- SolrDocument doc = response.getResults().get(0);
- assertEquals("Learning XML", doc.getFieldValue("id"));
- assertEquals(Arrays.asList("Web", "Technology", "Computers"),
doc.getFieldValue("cat"));
- }
-
- @DirtiesContext
- @Test
- public void endToEndIndexPDFDocument() throws Exception {
- pdfRoute.sendBody(new File("src/test/resources/data/tutorial.pdf"));
-
- QueryResponse response = executeSolrQuery("*:*");
-
- assertEquals(0, response.getStatus());
- assertEquals(1, response.getResults().getNumFound());
-
- SolrDocument doc = response.getResults().get(0);
- assertEquals("Solr", doc.getFieldValue("subject"));
- assertEquals("tutorial.pdf", doc.getFieldValue("id"));
- assertEquals(Arrays.asList("application/pdf"),
doc.getFieldValue("content_type"));
- }
-
- @DirtiesContext
- @Test
- public void endToEndIndexPDFDocumentStreaming() throws Exception {
- pdfRouteStreaming.sendBody(new
File("src/test/resources/data/tutorial.pdf"));
-
- QueryResponse response = executeSolrQuery("*:*");
-
- assertEquals(0, response.getStatus());
- assertEquals(1, response.getResults().getNumFound());
-
- SolrDocument doc = response.getResults().get(0);
- assertEquals("Solr", doc.getFieldValue("subject"));
- assertEquals("tutorial.pdf", doc.getFieldValue("id"));
- assertEquals(Arrays.asList("application/pdf"),
doc.getFieldValue("content_type"));
- }
-
- @BeforeClass
- public static void beforeClass() throws Exception {
- // Set appropriate paths for Solr to use.
- System.setProperty("solr.solr.home", "src/test/resources/solr");
- System.setProperty("solr.data.dir", "target/test-classes/solr/data");
-
- // Instruct Solr to keep the index in memory, for faster testing.
- System.setProperty("solr.directoryFactory",
"solr.RAMDirectoryFactory");
-
- // Start a Solr instance.
- solrRunner = new JettySolrRunner("/solr",
SolrComponentTestSupport.PORT);
- solrRunner.start();
-
- solrServer = new HttpSolrServer("http://localhost:"; +
SolrComponentTestSupport.PORT + "/solr");
- }
-
- @AfterClass
- public static void afterClass() throws Exception {
- solrRunner.stop();
- }
-
- @Before
- public void clearIndex() throws Exception {
- // Clear the Solr index.
- solrServer.deleteByQuery("*:*");
- solrServer.commit();
- }
-
- private QueryResponse executeSolrQuery(String query) throws
SolrServerException {
- SolrQuery solrQuery = new SolrQuery();
- solrQuery.setQuery(query);
- return solrServer.query(solrQuery);
- }
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/daf1c729/components/camel-solr/src/test/resources/SolrSpringTest-context.xml
----------------------------------------------------------------------
diff --git
a/components/camel-solr/src/test/resources/SolrSpringTest-context.xml
b/components/camel-solr/src/test/resources/SolrSpringTest-context.xml
deleted file mode 100644
index 7b53a1b..0000000
--- a/components/camel-solr/src/test/resources/SolrSpringTest-context.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<beans xmlns="http://www.springframework.org/schema/beans";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
- http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd";>
-
- <bean id="properties"
class="org.apache.camel.component.properties.PropertiesComponent"/>
-
- <camelContext xmlns="http://camel.apache.org/schema/spring";>
- <route id="DirectXMLRoute">
- <from uri="direct:direct-xml-start" />
- <setHeader headerName="SolrOperation">
- <constant>INSERT</constant>
- </setHeader>
- <to uri="solr://localhost:{{SolrServer.Port}}/solr"/>
- <setHeader headerName="SolrOperation">
- <constant>COMMIT</constant>
- </setHeader>
- <to uri="solr://localhost:{{SolrServer.Port}}/solr"/>
- </route>
-
- <route id="XMLRoute">
- <from uri="direct:xml-start" />
- <split>
- <xpath>/bookstore/book</xpath>
- <convertBodyTo type="java.lang.String"/>
- <setHeader headerName="SolrOperation">
- <constant>INSERT</constant>
- </setHeader>
- <setHeader headerName="SolrField.id">
- <xpath resultType="java.lang.String">//title/text()</xpath>
- </setHeader>
- <setHeader headerName="SolrField.title">
- <xpath resultType="java.lang.String">//title/text()</xpath>
- </setHeader>
- <setHeader headerName="SolrField.cat">
- <groovy>
- def book = new XmlParser().parseText(request.body)
- book.cat.collect{ it.text() } as String[]
- </groovy>
- </setHeader>
- <to uri="solr://localhost:{{SolrServer.Port}}/solr"/>
- </split>
- <setHeader headerName="SolrOperation">
- <constant>COMMIT</constant>
- </setHeader>
- <to uri="solr://localhost:{{SolrServer.Port}}/solr"/>
- </route>
-
- <route id="XMLRoute-Streaming">
- <from uri="direct:xml-start-streaming" />
- <split>
- <xpath>/bookstore/book</xpath>
- <convertBodyTo type="java.lang.String"/>
- <setHeader headerName="SolrOperation">
- <constant>INSERT_STREAMING</constant>
- </setHeader>
- <setHeader headerName="SolrField.id">
- <xpath resultType="java.lang.String">//title/text()</xpath>
- </setHeader>
- <setHeader headerName="SolrField.title">
- <xpath resultType="java.lang.String">//title/text()</xpath>
- </setHeader>
- <setHeader headerName="SolrField.cat">
- <groovy>
- def book = new XmlParser().parseText(request.body)
- book.cat.collect{ it.text() } as String[]
- </groovy>
- </setHeader>
- <to uri="solr://localhost:{{SolrServer.Port}}/solr"/>
- </split>
- <delay><constant>500</constant></delay>
- <setHeader headerName="SolrOperation">
- <constant>COMMIT</constant>
- </setHeader>
- <to uri="solr://localhost:{{SolrServer.Port}}/solr"/>
- </route>
-
- <route id="PDFRoute">
- <from uri="direct:pdf-start" />
- <setHeader headerName="SolrOperation">
- <constant>INSERT</constant>
- </setHeader>
- <setHeader headerName="SolrParam.literal.id">
- <simple>${body.name}</simple>
- </setHeader>
- <to
uri="solr://localhost:{{SolrServer.Port}}/solr?requestHandler=/update/extract"
/>
- <setHeader headerName="SolrOperation">
- <constant>COMMIT</constant>
- </setHeader>
- <to uri="solr://localhost:{{SolrServer.Port}}/solr"/>
- </route>
-
- <route id="PDFRoute-Streaming">
- <from uri="direct:pdf-start-streaming" />
- <setHeader headerName="SolrOperation">
- <constant>INSERT_STREAMING</constant>
- </setHeader>
- <setHeader headerName="SolrParam.literal.id">
- <simple>${body.name}</simple>
- </setHeader>
- <to
uri="solr://localhost:{{SolrServer.Port}}/solr?requestHandler=/update/extract"
/>
- <delay><constant>500</constant></delay>
- <setHeader headerName="SolrOperation">
- <constant>COMMIT</constant>
- </setHeader>
- <to uri="solr://localhost:{{SolrServer.Port}}/solr"/>
- </route>
-
- </camelContext>
-
-</beans>
