Author: dvaleri
Date: Thu Mar 1 17:10:58 2012
New Revision: 1295679
URL: http://svn.apache.org/viewvc?rev=1295679&view=rev
Log:
[CAMEL-4840] Deprecated JUnit 3.x based test support classes.
Modified:
camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/CamelSpringTestSupport.java
camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/junit4/CamelSpringJUnit4ClassRunner.java
camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/LazyLoadTypeConverters.java
camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/StopWatchTestExecutionListener.java
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelTestSupport.java
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/ExchangeTestSupport.java
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/LanguageTestSupport.java
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/TestSupport.java
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/IsUseAdviceWithTest.java
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugTest.java
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterTest.java
camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsLazyLoadTypeConvertersInheritedOverrideTest.java
camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsLazyLoadTypeConvertersTest.java
camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsPlainTest.java
Modified:
camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/CamelSpringTestSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/CamelSpringTestSupport.java?rev=1295679&r1=1295678&r2=1295679&view=diff
==============================================================================
---
camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/CamelSpringTestSupport.java
(original)
+++
camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/CamelSpringTestSupport.java
Thu Mar 1 17:10:58 2012
@@ -30,8 +30,11 @@ import org.springframework.context.suppo
import org.springframework.context.support.GenericApplicationContext;
/**
- * @version
+ * @deprecated Support for JUnit 3.x is slated for removal in Camel 3.x. You
are encouraged to move to
+ * JUnit 4.x based tests. See {@link
org.apache.camel.test.junit4.CamelSpringTestSupport} or
+ * {@link
org.apache.camel.test.junit4.CamelSpringJUnit4ClassRunner}.
*/
+@Deprecated
public abstract class CamelSpringTestSupport extends CamelTestSupport {
protected AbstractApplicationContext applicationContext;
protected abstract AbstractApplicationContext createApplicationContext();
Modified:
camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/junit4/CamelSpringJUnit4ClassRunner.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/junit4/CamelSpringJUnit4ClassRunner.java?rev=1295679&r1=1295678&r2=1295679&view=diff
==============================================================================
---
camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/junit4/CamelSpringJUnit4ClassRunner.java
(original)
+++
camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/junit4/CamelSpringJUnit4ClassRunner.java
Thu Mar 1 17:10:58 2012
@@ -19,7 +19,6 @@ package org.apache.camel.test.junit4;
import java.util.LinkedHashSet;
import java.util.Set;
-import org.apache.camel.test.CamelSpringTestSupport;
import org.apache.camel.test.spring.CamelSpringTestContextLoader;
import
org.apache.camel.test.spring.CamelSpringTestContextLoaderTestExecutionListener;
import org.apache.camel.test.spring.DisableJmxTestExecutionListener;
Modified:
camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/LazyLoadTypeConverters.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/LazyLoadTypeConverters.java?rev=1295679&r1=1295678&r2=1295679&view=diff
==============================================================================
---
camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/LazyLoadTypeConverters.java
(original)
+++
camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/LazyLoadTypeConverters.java
Thu Mar 1 17:10:58 2012
@@ -26,6 +26,8 @@ import java.lang.annotation.Target;
/**
* Indicates if the {@code CamelContext}s that are bootstrapped during the
test through the use of Spring Test
* loaded application contexts should use lazy loading of type converters.
+ *
+ * @deprecated See <a
href="https://issues.apache.org/jira/browse/CAMEL-5011";>CAMEL-5011</a> for more
details.
*/
@Documented
@Inherited
@@ -36,7 +38,7 @@ public @interface LazyLoadTypeConverters
/**
* Whether the test annotated with this annotation should be run with lazy
type converter loading in Camel.
- * Defaults to {@code true}.
+ * Defaults to {@code false}.
*/
boolean value() default false;
}
Modified:
camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/StopWatchTestExecutionListener.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/StopWatchTestExecutionListener.java?rev=1295679&r1=1295678&r2=1295679&view=diff
==============================================================================
---
camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/StopWatchTestExecutionListener.java
(original)
+++
camel/trunk/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/StopWatchTestExecutionListener.java
Thu Mar 1 17:10:58 2012
@@ -16,7 +16,6 @@
*/
package org.apache.camel.test.spring;
-import org.apache.camel.test.CamelTestSupport;
import org.apache.camel.util.StopWatch;
import org.apache.camel.util.TimeUtils;
import org.slf4j.Logger;
Modified:
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelTestSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelTestSupport.java?rev=1295679&r1=1295678&r2=1295679&view=diff
==============================================================================
---
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelTestSupport.java
(original)
+++
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelTestSupport.java
Thu Mar 1 17:10:58 2012
@@ -54,7 +54,10 @@ import org.apache.camel.util.TimeUtils;
* along with a {@link org.apache.camel.ProducerTemplate} for use in the test
case
*
* @version
+ * @deprecated Support for JUnit 3.x is slated for removal in Camel 3.x. You
are encouraged to move to
+ * JUnit 4.x based tests. See {@link
org.apache.camel.test.junit4.CamelTestSupport}.
*/
+@Deprecated
public abstract class CamelTestSupport extends TestSupport {
protected volatile ModelCamelContext context;
Modified:
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/ExchangeTestSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/ExchangeTestSupport.java?rev=1295679&r1=1295678&r2=1295679&view=diff
==============================================================================
---
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/ExchangeTestSupport.java
(original)
+++
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/ExchangeTestSupport.java
Thu Mar 1 17:10:58 2012
@@ -25,7 +25,10 @@ import org.apache.camel.impl.DefaultExch
* a populated {@link Exchange}
*
* @version
+ * @deprecated Support for JUnit 3.x is slated for removal in Camel 3.x. You
are encouraged to move to
+ * JUnit 4.x based tests. See {@link
org.apache.camel.test.junit4.ExchangeTestSupport}.
*/
+@Deprecated
public abstract class ExchangeTestSupport extends CamelTestSupport {
protected Exchange exchange;
Modified:
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/LanguageTestSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/LanguageTestSupport.java?rev=1295679&r1=1295678&r2=1295679&view=diff
==============================================================================
---
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/LanguageTestSupport.java
(original)
+++
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/LanguageTestSupport.java
Thu Mar 1 17:10:58 2012
@@ -22,7 +22,11 @@ import org.apache.camel.spi.Language;
/**
* A useful base class for testing the language plugins in Camel
+ *
+ * @deprecated Support for JUnit 3.x is slated for removal in Camel 3.x. You
are encouraged to move to
+ * JUnit 4.x based tests. See {@link
org.apache.camel.test.junit4.LanguageTestSupport}.
*/
+@Deprecated
public abstract class LanguageTestSupport extends ExchangeTestSupport {
protected abstract String getLanguageName();
Modified:
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/TestSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/TestSupport.java?rev=1295679&r1=1295678&r2=1295679&view=diff
==============================================================================
---
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/TestSupport.java
(original)
+++
camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/TestSupport.java
Thu Mar 1 17:10:58 2012
@@ -47,7 +47,10 @@ import org.slf4j.LoggerFactory;
* A bunch of useful testing methods
*
* @version
+ * @deprecated Support for JUnit 3.x is slated for removal in Camel 3.x. You
are encouraged to move to
+ * JUnit 4.x based tests. See {@link
org.apache.camel.test.junit4.TestSupport}.
*/
+@Deprecated
public abstract class TestSupport extends TestCase {
protected static final String LS = System.getProperty("line.separator");
private static final Logger LOG =
LoggerFactory.getLogger(TestSupport.class);
Modified:
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/IsUseAdviceWithTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/IsUseAdviceWithTest.java?rev=1295679&r1=1295678&r2=1295679&view=diff
==============================================================================
---
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/IsUseAdviceWithTest.java
(original)
+++
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/IsUseAdviceWithTest.java
Thu Mar 1 17:10:58 2012
@@ -22,6 +22,7 @@ import org.apache.camel.builder.RouteBui
/**
*
*/
+@SuppressWarnings("deprecation")
public class IsUseAdviceWithTest extends CamelTestSupport {
public void testIsUseAdviceWith() throws Exception {
Modified:
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugTest.java?rev=1295679&r1=1295678&r2=1295679&view=diff
==============================================================================
---
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugTest.java
(original)
+++
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugTest.java
Thu Mar 1 17:10:58 2012
@@ -25,6 +25,7 @@ import org.apache.camel.test.CamelTestSu
/**
* @version
*/
+@SuppressWarnings("deprecation")
public class DebugTest extends CamelTestSupport {
// START SNIPPET: e1
Modified:
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterTest.java?rev=1295679&r1=1295678&r2=1295679&view=diff
==============================================================================
---
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterTest.java
(original)
+++
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/FilterTest.java
Thu Mar 1 17:10:58 2012
@@ -29,6 +29,7 @@ import org.junit.Test;
*
* @version
*/
+@SuppressWarnings("deprecation")
// START SNIPPET: example
public class FilterTest extends CamelTestSupport {
Modified:
camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsLazyLoadTypeConvertersInheritedOverrideTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsLazyLoadTypeConvertersInheritedOverrideTest.java?rev=1295679&r1=1295678&r2=1295679&view=diff
==============================================================================
---
camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsLazyLoadTypeConvertersInheritedOverrideTest.java
(original)
+++
camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsLazyLoadTypeConvertersInheritedOverrideTest.java
Thu Mar 1 17:10:58 2012
@@ -21,6 +21,7 @@ import org.apache.camel.test.spring.Lazy
import org.testng.annotations.Test;
import static org.testng.Assert.assertTrue;
+@SuppressWarnings("deprecation")
@LazyLoadTypeConverters(true)
public class
AbstractCamelTestNGSpringContextTestsLazyLoadTypeConvertersInheritedOverrideTest
extends
AbstractCamelTestNGSpringContextTestsLazyLoadTypeConvertersInheritedTest {
Modified:
camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsLazyLoadTypeConvertersTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsLazyLoadTypeConvertersTest.java?rev=1295679&r1=1295678&r2=1295679&view=diff
==============================================================================
---
camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsLazyLoadTypeConvertersTest.java
(original)
+++
camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsLazyLoadTypeConvertersTest.java
Thu Mar 1 17:10:58 2012
@@ -21,6 +21,7 @@ import org.apache.camel.test.spring.Lazy
import org.testng.annotations.Test;
import static org.testng.Assert.assertFalse;
+@SuppressWarnings("deprecation")
@LazyLoadTypeConverters(false)
public class AbstractCamelTestNGSpringContextTestsLazyLoadTypeConvertersTest
extends AbstractCamelTestNGSpringContextTestsPlainTest {
Modified:
camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsPlainTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsPlainTest.java?rev=1295679&r1=1295678&r2=1295679&view=diff
==============================================================================
---
camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsPlainTest.java
(original)
+++
camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/AbstractCamelTestNGSpringContextTestsPlainTest.java
Thu Mar 1 17:10:58 2012
@@ -118,6 +118,7 @@ public class AbstractCamelTestNGSpringCo
assertNull(camelContext2.getDebugger());
}
+ @SuppressWarnings("deprecation")
@Test
public void testLazyLoadTypeConverters() {
assertTrue(camelContext.isLazyLoadTypeConverters());
