Author: dkulp
Date: Wed Jul 27 16:27:22 2011
New Revision: 1151525
URL: http://svn.apache.org/viewvc?rev=1151525&view=rev
Log:
More updates to use JUnit 4
Fix a bunch more compiler warnings, mostly related to non-use of
generics.
Modified:
camel/trunk/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcProducer.java
camel/trunk/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProducerTwoParametersWithSameKeyTest.java
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCarQuoteAndCommaDelimiterTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPipeDelimiterTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPojoSimpleCsvMarshallTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvOneToManyMarshallTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyTabSeparatorTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithClipAndTrimTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithClipTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithNoClipTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trim/BindySimpleFixedLengthUnmarshallTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trimfield/BindySimpleFixedLengthUnmarshallTrimFieldTest.java
Modified:
camel/trunk/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcProducer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcProducer.java?rev=1151525&r1=1151524&r2=1151525&view=diff
==============================================================================
---
camel/trunk/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcProducer.java
(original)
+++
camel/trunk/components/camel-ahc/src/main/java/org/apache/camel/component/ahc/AhcProducer.java
Wed Jul 27 16:27:22 2011
@@ -46,7 +46,6 @@ public class AhcProducer extends Default
}
@Override
- @SuppressWarnings("unchecked")
public boolean process(Exchange exchange, AsyncCallback callback) {
try {
// AHC supports async processing
Modified:
camel/trunk/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProducerTwoParametersWithSameKeyTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProducerTwoParametersWithSameKeyTest.java?rev=1151525&r1=1151524&r2=1151525&view=diff
==============================================================================
---
camel/trunk/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProducerTwoParametersWithSameKeyTest.java
(original)
+++
camel/trunk/components/camel-ahc/src/test/java/org/apache/camel/component/ahc/AhcProducerTwoParametersWithSameKeyTest.java
Wed Jul 27 16:27:22 2011
@@ -89,7 +89,7 @@ public class AhcProducerTwoParametersWit
// response
exchange.getOut().setBody("OK");
// use multiple values for the foo header in the reply
- List list = new ArrayList();
+ List<Integer> list = new ArrayList<Integer>();
list.add(123);
list.add(456);
exchange.getOut().setHeader("foo", list);
Modified:
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java?rev=1151525&r1=1151524&r2=1151525&view=diff
==============================================================================
---
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java
(original)
+++
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java
Wed Jul 27 16:27:22 2011
@@ -55,7 +55,7 @@ public class BindyCsvFactory extends Bin
private Map<Integer, Field> annotedFields = new LinkedHashMap<Integer,
Field>();
private Map<String, Integer> sections = new HashMap<String, Integer>();
- private Map<Integer, List> results;
+ private Map<Integer, List<String>> results;
private int numberOptionalFields;
private int numberMandatoryFields;
@@ -226,7 +226,7 @@ public class BindyCsvFactory extends Bin
public String unbind(Map<String, Object> model) throws Exception {
StringBuilder buffer = new StringBuilder();
- results = new HashMap<Integer, List>();
+ results = new HashMap<Integer, List<String>>();
// Check if separator exists
ObjectHelper.notNull(this.separator, "The separator has not been
instantiated or property not defined in the @CsvRecord annotation");
@@ -307,7 +307,7 @@ public class BindyCsvFactory extends Bin
return buffer.toString();
}
- private List<List> product(Map<Integer, List> values) {
+ private List<List> product(Map<Integer, List<String>> values) {
TreeMap<Integer, List> sortValues = new TreeMap<Integer, List>(values);
List<List> product = new ArrayList<List>();
@@ -317,10 +317,10 @@ public class BindyCsvFactory extends Bin
int idxSize = 0;
do {
idxSize = 0;
- List v = new ArrayList();
+ List<String> v = new ArrayList<String>();
for (int ii = 1; ii <= sortValues.lastKey(); ii++) {
- List l = values.get(ii);
+ List<String> l = values.get(ii);
if (l == null) {
v.add("");
++idxSize;
@@ -423,13 +423,13 @@ public class BindyCsvFactory extends Bin
if (!results.containsKey(key)) {
- List list = new LinkedList();
+ List<String> list = new LinkedList<String>();
list.add(result);
results.put(key, list);
} else {
- List list = (LinkedList)results.get(key);
+ List<String> list = results.get(key);
list.add(result);
}
Modified:
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java?rev=1151525&r1=1151524&r2=1151525&view=diff
==============================================================================
---
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java
(original)
+++
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java
Wed Jul 27 16:27:22 2011
@@ -52,7 +52,7 @@ public class BindyFixedLengthFactory ext
private Map<Integer, DataField> dataFields = new LinkedHashMap<Integer,
DataField>();
private Map<Integer, Field> annotatedFields = new LinkedHashMap<Integer,
Field>();
- private Map<Integer, List> results;
+ private Map<Integer, List<String>> results;
private int numberOptionalFields;
private int numberMandatoryFields;
@@ -251,7 +251,7 @@ public class BindyFixedLengthFactory ext
public String unbind(Map<String, Object> model) throws Exception {
StringBuilder buffer = new StringBuilder();
- results = new HashMap<Integer, List>();
+ results = new HashMap<Integer, List<String>>();
for (Class clazz : models) {
@@ -274,8 +274,8 @@ public class BindyFixedLengthFactory ext
}
// Convert Map<Integer, List> into List<List>
- TreeMap<Integer, List> sortValues = new TreeMap<Integer,
List>(results);
- for (Entry<Integer, List> entry : sortValues.entrySet()) {
+ TreeMap<Integer, List<String>> sortValues = new TreeMap<Integer,
List<String>>(results);
+ for (Entry<Integer, List<String>> entry : sortValues.entrySet()) {
// Get list of values
List<String> val = entry.getValue();
@@ -309,14 +309,14 @@ public class BindyFixedLengthFactory ext
// Retrieve the format, pattern and precision associated to
// the type
- Class type = field.getType();
+ Class<?> type = field.getType();
String pattern = datafield.pattern();
int precision = datafield.precision();
// Create format
- Format format = FormatFactory.getFormat(type, pattern,
getLocale(), precision);
+ Format<?> format = FormatFactory.getFormat(type, pattern,
getLocale(), precision);
// Get field value
Object value = field.get(obj);
@@ -391,11 +391,11 @@ public class BindyFixedLengthFactory ext
key = datafield.pos();
if (!results.containsKey(key)) {
- List list = new LinkedList();
+ List<String> list = new LinkedList<String>();
list.add(result);
results.put(key, list);
} else {
- List list = results.get(key);
+ List<String> list = results.get(key);
list.add(result);
}
Modified:
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java?rev=1151525&r1=1151524&r2=1151525&view=diff
==============================================================================
---
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java
(original)
+++
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyKeyValuePairFactory.java
Wed Jul 27 16:27:22 2011
@@ -52,7 +52,7 @@ public class BindyKeyValuePairFactory ex
private Map<Integer, Field> annotedFields = new LinkedHashMap<Integer,
Field>();
private Map<String, Integer> sections = new HashMap<String, Integer>();
- private Map<String, List> lists = new HashMap<String, List>();
+ private Map<String, List<Object>> lists = new HashMap<String,
List<Object>>();
private String keyValuePairSeparator;
private String pairSeparator;
@@ -122,7 +122,7 @@ public class BindyKeyValuePairFactory ex
*/
public void bind(List<String> data, Map<String, Object> model, int line)
throws Exception {
- Map<Integer, List> results = new HashMap<Integer, List>();
+ Map<Integer, List<String>> results = new HashMap<Integer,
List<String>>();
LOG.debug("Key value pairs data : {}", data);
@@ -149,13 +149,13 @@ public class BindyKeyValuePairFactory ex
// Add value to the Map using key value as key
if (!results.containsKey(key)) {
- List list = new LinkedList();
+ List<String> list = new LinkedList<String>();
list.add(value);
results.put(key, list);
} else {
- List list = (LinkedList)results.get(key);
+ List<String> list = results.get(key);
list.add(value);
}
@@ -183,7 +183,7 @@ public class BindyKeyValuePairFactory ex
* @param line
* @throws Exception
*/
- private void generateModelFromKeyValueMap(Class clazz, Object obj,
Map<Integer, List> results, int line) throws Exception {
+ private void generateModelFromKeyValueMap(Class clazz, Object obj,
Map<Integer, List<String>> results, int line) throws Exception {
for (Field field : clazz.getDeclaredFields()) {
@@ -231,7 +231,7 @@ public class BindyKeyValuePairFactory ex
*/
// Get List from Map
- List l = lists.get(clazz.getName());
+ List<Object> l = lists.get(clazz.getName());
if (l != null) {
@@ -305,7 +305,7 @@ public class BindyKeyValuePairFactory ex
} else {
// Get List from Map
- List l = lists.get(clazz.getName());
+ List<Object> l = lists.get(clazz.getName());
if (l != null) {
@@ -392,7 +392,7 @@ public class BindyKeyValuePairFactory ex
}
if (!lists.containsKey(cl.getName())) {
- lists.put(cl.getName(), new ArrayList());
+ lists.put(cl.getName(), new ArrayList<Object>());
}
generateModelFromKeyValueMap(cl, null, results, line);
@@ -454,7 +454,8 @@ public class BindyKeyValuePairFactory ex
int precision = keyValuePairField.precision();
// Create format
- Format format = FormatFactory.getFormat(type, pattern,
getLocale(), precision);
+ @SuppressWarnings("unchecked")
+ Format<Object> format =
(Format<Object>)FormatFactory.getFormat(type, pattern, getLocale(), precision);
// Get object to be formatted
Object obj = model.get(field.getDeclaringClass().getName());
Modified:
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCarQuoteAndCommaDelimiterTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCarQuoteAndCommaDelimiterTest.java?rev=1151525&r1=1151524&r2=1151525&view=diff
==============================================================================
---
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCarQuoteAndCommaDelimiterTest.java
(original)
+++
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCarQuoteAndCommaDelimiterTest.java
Wed Jul 27 16:27:22 2011
@@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBui
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.bindy.model.car.Car;
import org.apache.camel.model.dataformat.BindyType;
-import org.apache.camel.test.CamelTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
/**
@@ -59,7 +59,7 @@ public class BindyCarQuoteAndCommaDelimi
assertEquals("TOYOTA", rec1.getMake());
assertEquals("KLUGER", rec1.getModel());
assertEquals(2005, rec1.getYear());
- assertEquals(Double.valueOf("155000.0"), rec1.getKlms());
+ assertEquals(Double.valueOf("155000.0"), rec1.getKlms(), 0.0001);
assertEquals("EZR05I", rec1.getNvic());
assertEquals("Used", rec1.getStatus());
}
Modified:
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPipeDelimiterTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPipeDelimiterTest.java?rev=1151525&r1=1151524&r2=1151525&view=diff
==============================================================================
---
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPipeDelimiterTest.java
(original)
+++
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPipeDelimiterTest.java
Wed Jul 27 16:27:22 2011
@@ -23,7 +23,7 @@ import org.apache.camel.builder.RouteBui
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.bindy.model.simple.pipeline.MyData;
import org.apache.camel.model.dataformat.BindyType;
-import org.apache.camel.test.CamelTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
/**
Modified:
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPojoSimpleCsvMarshallTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPojoSimpleCsvMarshallTest.java?rev=1151525&r1=1151524&r2=1151525&view=diff
==============================================================================
---
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPojoSimpleCsvMarshallTest.java
(original)
+++
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPojoSimpleCsvMarshallTest.java
Wed Jul 27 16:27:22 2011
@@ -48,9 +48,6 @@ public class BindyPojoSimpleCsvMarshallT
@EndpointInject(uri = URI_MOCK_RESULT)
private MockEndpoint result;
- @EndpointInject(uri = URI_MOCK_ERROR)
- private MockEndpoint error;
-
@Test
@DirtiesContext
public void testMarshallMessage() throws Exception {
Modified:
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallTest.java?rev=1151525&r1=1151524&r2=1151525&view=diff
==============================================================================
---
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallTest.java
(original)
+++
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMarshallTest.java
Wed Jul 27 16:27:22 2011
@@ -53,9 +53,6 @@ public class BindySimpleCsvMarshallTest
@EndpointInject(uri = URI_MOCK_RESULT)
private MockEndpoint result;
- @EndpointInject(uri = URI_MOCK_ERROR)
- private MockEndpoint error;
-
@Test
@DirtiesContext
public void testMarshallMessage() throws Exception {
Modified:
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvOneToManyMarshallTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvOneToManyMarshallTest.java?rev=1151525&r1=1151524&r2=1151525&view=diff
==============================================================================
---
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvOneToManyMarshallTest.java
(original)
+++
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvOneToManyMarshallTest.java
Wed Jul 27 16:27:22 2011
@@ -55,8 +55,6 @@ public class BindySimpleCsvOneToManyMars
}
public List<Map<String, Object>> generateModel() {
- Map<String, Object> modelObjects = new HashMap<String, Object>();
-
Author author;
Book book;
Modified:
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyTabSeparatorTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyTabSeparatorTest.java?rev=1151525&r1=1151524&r2=1151525&view=diff
==============================================================================
---
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyTabSeparatorTest.java
(original)
+++
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyTabSeparatorTest.java
Wed Jul 27 16:27:22 2011
@@ -23,6 +23,8 @@ import org.apache.camel.builder.RouteBui
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.dataformat.bindy.model.tab.PurchaseOrder;
import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.util.CastUtils;
+
import org.junit.Test;
/**
@@ -39,7 +41,7 @@ public class BindyTabSeparatorTest exten
assertMockEndpointsSatisfied();
- List<Map> rows =
mock.getReceivedExchanges().get(0).getIn().getBody(List.class);
+ List<Map> rows =
CastUtils.cast(mock.getReceivedExchanges().get(0).getIn().getBody(List.class));
PurchaseOrder order = (PurchaseOrder)
rows.get(0).get(PurchaseOrder.class.getName());
assertEquals(123, order.getId());
Modified:
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallTest.java?rev=1151525&r1=1151524&r2=1151525&view=diff
==============================================================================
---
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallTest.java
(original)
+++
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallTest.java
Wed Jul 27 16:27:22 2011
@@ -57,9 +57,6 @@ public class BindySimpleFixedLengthMarsh
@EndpointInject(uri = URI_MOCK_RESULT)
private MockEndpoint result;
- @EndpointInject(uri = URI_MOCK_ERROR)
- private MockEndpoint error;
-
@Test
@DirtiesContext
public void testMarshallMessage() throws Exception {
Modified:
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithClipAndTrimTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithClipAndTrimTest.java?rev=1151525&r1=1151524&r2=1151525&view=diff
==============================================================================
---
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithClipAndTrimTest.java
(original)
+++
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithClipAndTrimTest.java
Wed Jul 27 16:27:22 2011
@@ -29,7 +29,7 @@ import org.apache.camel.builder.RouteBui
import org.apache.camel.dataformat.bindy.annotation.DataField;
import org.apache.camel.dataformat.bindy.annotation.FixedLengthRecord;
import org.apache.camel.dataformat.bindy.fixed.BindyFixedLengthDataFormat;
-import org.apache.camel.test.CamelTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
public class BindySimpleFixedLengthMarshallWithClipAndTrimTest extends
CamelTestSupport {
Modified:
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithClipTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithClipTest.java?rev=1151525&r1=1151524&r2=1151525&view=diff
==============================================================================
---
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithClipTest.java
(original)
+++
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithClipTest.java
Wed Jul 27 16:27:22 2011
@@ -29,7 +29,7 @@ import org.apache.camel.builder.RouteBui
import org.apache.camel.dataformat.bindy.annotation.DataField;
import org.apache.camel.dataformat.bindy.annotation.FixedLengthRecord;
import org.apache.camel.dataformat.bindy.fixed.BindyFixedLengthDataFormat;
-import org.apache.camel.test.CamelTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
public class BindySimpleFixedLengthMarshallWithClipTest extends
CamelTestSupport {
Modified:
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithNoClipTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithNoClipTest.java?rev=1151525&r1=1151524&r2=1151525&view=diff
==============================================================================
---
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithNoClipTest.java
(original)
+++
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithNoClipTest.java
Wed Jul 27 16:27:22 2011
@@ -30,7 +30,7 @@ import org.apache.camel.builder.RouteBui
import org.apache.camel.dataformat.bindy.annotation.DataField;
import org.apache.camel.dataformat.bindy.annotation.FixedLengthRecord;
import org.apache.camel.dataformat.bindy.fixed.BindyFixedLengthDataFormat;
-import org.apache.camel.test.CamelTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
public class BindySimpleFixedLengthMarshallWithNoClipTest extends
CamelTestSupport {
Modified:
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trim/BindySimpleFixedLengthUnmarshallTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trim/BindySimpleFixedLengthUnmarshallTest.java?rev=1151525&r1=1151524&r2=1151525&view=diff
==============================================================================
---
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trim/BindySimpleFixedLengthUnmarshallTest.java
(original)
+++
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trim/BindySimpleFixedLengthUnmarshallTest.java
Wed Jul 27 16:27:22 2011
@@ -39,7 +39,6 @@ import org.springframework.test.context.
public class BindySimpleFixedLengthUnmarshallTest extends
AbstractJUnit4SpringContextTests {
private static final String URI_MOCK_RESULT = "mock:result";
- private static final String URI_MOCK_ERROR = "mock:error";
private static final String URI_DIRECT_START = "direct:start";
@Produce(uri = URI_DIRECT_START)
@@ -48,9 +47,6 @@ public class BindySimpleFixedLengthUnmar
@EndpointInject(uri = URI_MOCK_RESULT)
private MockEndpoint result;
- @EndpointInject(uri = URI_MOCK_ERROR)
- private MockEndpoint error;
-
private String expected;
@Test
Modified:
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trimfield/BindySimpleFixedLengthUnmarshallTrimFieldTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trimfield/BindySimpleFixedLengthUnmarshallTrimFieldTest.java?rev=1151525&r1=1151524&r2=1151525&view=diff
==============================================================================
---
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trimfield/BindySimpleFixedLengthUnmarshallTrimFieldTest.java
(original)
+++
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trimfield/BindySimpleFixedLengthUnmarshallTrimFieldTest.java
Wed Jul 27 16:27:22 2011
@@ -39,7 +39,6 @@ import org.springframework.test.context.
public class BindySimpleFixedLengthUnmarshallTrimFieldTest extends
AbstractJUnit4SpringContextTests {
private static final String URI_MOCK_RESULT = "mock:result";
- private static final String URI_MOCK_ERROR = "mock:error";
private static final String URI_DIRECT_START = "direct:start";
@Produce(uri = URI_DIRECT_START)
@@ -48,9 +47,6 @@ public class BindySimpleFixedLengthUnmar
@EndpointInject(uri = URI_MOCK_RESULT)
private MockEndpoint result;
- @EndpointInject(uri = URI_MOCK_ERROR)
- private MockEndpoint error;
-
private String expected;
@Test
