Author: davsclaus
Date: Fri Oct 21 09:26:35 2011
New Revision: 1187241
URL: http://svn.apache.org/viewvc?rev=1187241&view=rev
Log:
CAMEL-4563: Fixed CS. Thanks to Ioannis for the patch.
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/sql/DatabaseManager.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/sql/SqlBlueprintRoute.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/sql/SqlRouteTest.java
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/sql/DatabaseManager.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/sql/DatabaseManager.java?rev=1187241&r1=1187240&r2=1187241&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/sql/DatabaseManager.java
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/sql/DatabaseManager.java
Fri Oct 21 09:26:35 2011
@@ -1,4 +1,4 @@
-/*
+/**
* 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.
@@ -17,13 +17,12 @@
package org.apache.camel.itest.osgi.sql;
-import org.springframework.jdbc.core.JdbcTemplate;
-
import javax.sql.DataSource;
+import org.springframework.jdbc.core.JdbcTemplate;
public class DatabaseManager {
- private DataSource dataSource;
+ private DataSource dataSource;
public DatabaseManager(DataSource dataSource) {
this.dataSource = dataSource;
@@ -32,7 +31,7 @@ public class DatabaseManager {
public void init() {
JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
jdbcTemplate.execute("create table projects (id integer primary key,"
- + "project varchar(10), license varchar(5))");
+ + "project varchar(10), license varchar(5))");
jdbcTemplate.execute("insert into projects values (1, 'Camel',
'ASF')");
jdbcTemplate.execute("insert into projects values (2, 'AMQ', 'ASF')");
jdbcTemplate.execute("insert into projects values (3, 'Linux',
'XXX')");
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/sql/SqlBlueprintRoute.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/sql/SqlBlueprintRoute.java?rev=1187241&r1=1187240&r2=1187241&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/sql/SqlBlueprintRoute.java
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/sql/SqlBlueprintRoute.java
Fri Oct 21 09:26:35 2011
@@ -1,4 +1,4 @@
-/*
+/**
* 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.
@@ -17,6 +17,13 @@
package org.apache.camel.itest.osgi.sql;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import javax.sql.DataSource;
import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.RuntimeCamelException;
@@ -35,13 +42,6 @@ import org.springframework.dao.DataAcces
import org.springframework.dao.EmptyResultDataAccessException;
import org.springframework.jdbc.core.JdbcTemplate;
-import javax.sql.DataSource;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
import static org.ops4j.pax.exam.CoreOptions.equinox;
import static org.ops4j.pax.exam.CoreOptions.felix;
@@ -96,22 +96,21 @@ public class SqlBlueprintRoute extends O
}
-
@Test
public void testInsert() throws Exception {
getInstalledBundle("CamelBlueprintSqlTestBundle").start();
BlueprintContainer ctn = getOsgiService(BlueprintContainer.class,
"(osgi.blueprint.container.symbolicname=CamelBlueprintSqlTestBundle)", 10000);
CamelContext ctx = getOsgiService(CamelContext.class,
"(camel.context.symbolicname=CamelBlueprintSqlTestBundle)", 10000);
- DataSource ds = getOsgiService(DataSource.class,10000);
+ DataSource ds = getOsgiService(DataSource.class, 10000);
JdbcTemplate jdbcTemplate = new JdbcTemplate(ds);
ProducerTemplate template = ctx.createProducerTemplate();
MockEndpoint mock = (MockEndpoint) ctx.getEndpoint("mock:result");
mock.expectedMessageCount(1);
- template.sendBody("direct:insert", new Object[] {10, "test", "test"});
+ template.sendBody("direct:insert", new Object[]{10, "test", "test"});
mock.assertIsSatisfied();
try {
- String projectName = (String)jdbcTemplate.queryForObject("select
project from projects where id = 10", String.class);
+ String projectName = (String) jdbcTemplate.queryForObject("select
project from projects where id = 10", String.class);
assertEquals("test", projectName);
} catch (EmptyResultDataAccessException e) {
fail("no row inserted");
@@ -122,7 +121,7 @@ public class SqlBlueprintRoute extends O
}
- private boolean isOrdered(Set<?> keySet) {
+ private boolean isOrdered(Set<?> keySet) {
assertTrue("isOrdered() requires the following keys: id, project,
license", keySet.contains("id"));
assertTrue("isOrdered() requires the following keys: id, project,
license", keySet.contains("project"));
assertTrue("isOrdered() requires the following keys: id, project,
license", keySet.contains("license"));
@@ -130,9 +129,10 @@ public class SqlBlueprintRoute extends O
// the implementation uses a case insensitive Map
final Iterator<?> it = keySet.iterator();
return "id".equalsIgnoreCase(assertIsInstanceOf(String.class,
it.next()))
- && "project".equalsIgnoreCase(assertIsInstanceOf(String.class,
it.next()))
- && "license".equalsIgnoreCase(assertIsInstanceOf(String.class,
it.next()));
+ && "project".equalsIgnoreCase(assertIsInstanceOf(String.class,
it.next()))
+ && "license".equalsIgnoreCase(assertIsInstanceOf(String.class,
it.next()));
}
+
@Configuration
public static Option[] configure() throws Exception {
Modified:
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/sql/SqlRouteTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/sql/SqlRouteTest.java?rev=1187241&r1=1187240&r2=1187241&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/sql/SqlRouteTest.java
(original)
+++
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/sql/SqlRouteTest.java
Fri Oct 21 09:26:35 2011
@@ -1,4 +1,4 @@
-/*
+/**
* 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.
@@ -17,18 +17,20 @@
package org.apache.camel.itest.osgi.sql;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import javax.sql.DataSource;
import org.apache.camel.CamelContext;
import org.apache.camel.RuntimeCamelException;
-import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.component.sql.SqlComponent;
import org.apache.camel.component.sql.SqlConstants;
import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
import org.apache.camel.spring.SpringCamelContext;
-import org.apache.derby.jdbc.EmbeddedDataSource;
import org.apache.karaf.testing.Helper;
import org.junit.After;
-import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
@@ -37,16 +39,8 @@ import org.ops4j.pax.exam.junit.JUnit4Te
import org.springframework.dao.DataAccessException;
import org.springframework.dao.EmptyResultDataAccessException;
import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.datasource.SingleConnectionDataSource;
import
org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
-import javax.sql.DataSource;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
import static org.ops4j.pax.exam.CoreOptions.equinox;
import static org.ops4j.pax.exam.CoreOptions.felix;
@@ -58,12 +52,12 @@ import static org.ops4j.pax.exam.contain
@RunWith(JUnit4TestRunner.class)
public class SqlRouteTest extends OSGiIntegrationTestSupport {
- protected String driverClass = "org.apache.derby.jdbc.EmbeddedDriver";
+ String driverClass = "org.apache.derby.jdbc.EmbeddedDriver";
+ OsgiBundleXmlApplicationContext applicationContext;
+
private DataSource ds;
private JdbcTemplate jdbcTemplate;
- protected OsgiBundleXmlApplicationContext applicationContext;
-
@After
public void tearDown() throws Exception {
super.tearDown();
@@ -74,7 +68,7 @@ public class SqlRouteTest extends OSGiIn
protected CamelContext createCamelContext() throws Exception {
setThreadContextClassLoader();
applicationContext = new OsgiBundleXmlApplicationContext(
- new
String[]{"org/apache/camel/itest/osgi/sql/springSqlRouteContext.xml"});
+ new
String[]{"org/apache/camel/itest/osgi/sql/springSqlRouteContext.xml"});
if (bundleContext != null) {
applicationContext.setBundleContext(bundleContext);
applicationContext.refresh();
@@ -116,16 +110,15 @@ public class SqlRouteTest extends OSGiIn
}
-
@Test
public void testInsert() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
- template.sendBody("direct:insert", new Object[] {10, "test", "test"});
+ template.sendBody("direct:insert", new Object[]{10, "test", "test"});
mock.assertIsSatisfied();
try {
- String projectName = (String)jdbcTemplate.queryForObject("select
project from projects where id = 10", String.class);
+ String projectName = (String) jdbcTemplate.queryForObject("select
project from projects where id = 10", String.class);
assertEquals("test", projectName);
} catch (EmptyResultDataAccessException e) {
fail("no row inserted");
@@ -136,7 +129,7 @@ public class SqlRouteTest extends OSGiIn
}
- private boolean isOrdered(Set<?> keySet) {
+ private boolean isOrdered(Set<?> keySet) {
assertTrue("isOrdered() requires the following keys: id, project,
license", keySet.contains("id"));
assertTrue("isOrdered() requires the following keys: id, project,
license", keySet.contains("project"));
assertTrue("isOrdered() requires the following keys: id, project,
license", keySet.contains("license"));
@@ -144,8 +137,8 @@ public class SqlRouteTest extends OSGiIn
// the implementation uses a case insensitive Map
final Iterator<?> it = keySet.iterator();
return "id".equalsIgnoreCase(assertIsInstanceOf(String.class,
it.next()))
- && "project".equalsIgnoreCase(assertIsInstanceOf(String.class,
it.next()))
- && "license".equalsIgnoreCase(assertIsInstanceOf(String.class,
it.next()));
+ && "project".equalsIgnoreCase(assertIsInstanceOf(String.class,
it.next()))
+ && "license".equalsIgnoreCase(assertIsInstanceOf(String.class,
it.next()));
}
@Configuration
