You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2013/01/20 11:14:32 UTC
svn commit: r1435812 - in /camel/trunk:
camel-core/src/test/java/org/apache/camel/builder/
camel-core/src/test/java/org/apache/camel/component/log/
camel-core/src/test/java/org/apache/camel/component/mock/
camel-core/src/test/java/org/apache/camel/proc...
Author: bvahdat
Date: Sun Jan 20 10:14:32 2013
New Revision: 1435812
URL: http://svn.apache.org/viewvc?rev=1435812&view=rev
Log:
CAMEL-5983: Avoid negative-tests to behave as false-positve.
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/LoggingErrorHandlerBuilderTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/log/LogRouteTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationFinallyBlockNoCatchTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/CustomExceptionPolicyStrategyTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/DefaultTraceFormatterTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSpringCustomizedExceptionTest.java
camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbExceptionHandlingTest.java
camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbWriteConcernsTest.java
camel/trunk/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosEventNotifierTest.java
camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicyTest.java
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/builder/LoggingErrorHandlerBuilderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/LoggingErrorHandlerBuilderTest.java?rev=1435812&r1=1435811&r2=1435812&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/builder/LoggingErrorHandlerBuilderTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/builder/LoggingErrorHandlerBuilderTest.java Sun Jan 20 10:14:32 2013
@@ -51,6 +51,7 @@ public class LoggingErrorHandlerBuilderT
try {
template.sendBody("direct:start", "Hello World");
+ fail("Should have thrown an exception");
} catch (Exception e) {
// expected
}
@@ -69,6 +70,7 @@ public class LoggingErrorHandlerBuilderT
try {
template.sendBody("direct:start", "Hello World");
+ fail("Should have thrown an exception");
} catch (Exception e) {
// expected
}
@@ -94,6 +96,7 @@ public class LoggingErrorHandlerBuilderT
try {
template.sendBody("direct:start", "Hello World");
+ fail("Should have thrown an exception");
} catch (Exception e) {
// expected
}
@@ -118,6 +121,7 @@ public class LoggingErrorHandlerBuilderT
try {
template.sendBody("direct:start", "Hello World");
+ fail("Should have thrown an exception");
} catch (Exception e) {
// expected
}
@@ -136,6 +140,7 @@ public class LoggingErrorHandlerBuilderT
try {
template.sendBody("direct:start", "Hello World");
+ fail("Should have thrown an exception");
} catch (Exception e) {
// expected
}
@@ -156,6 +161,7 @@ public class LoggingErrorHandlerBuilderT
try {
template.sendBody("direct:start", "Hello World");
+ fail("Should have thrown an exception");
} catch (Exception e) {
// expected
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/log/LogRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/log/LogRouteTest.java?rev=1435812&r1=1435811&r2=1435812&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/log/LogRouteTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/log/LogRouteTest.java Sun Jan 20 10:14:32 2013
@@ -41,7 +41,7 @@ public class LogRouteTest extends Contex
public void testSendMessageToBadLevel() throws Exception {
try {
template.sendBody("log:org.apache.camel.TEST?level=noSuchLevel", "<level>noSuchLevel</level>");
- fail("Shoudl have failed!");
+ fail("Should have failed!");
} catch (Exception e) {
LOG.debug("Caught expected exception: " + e, e);
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointTest.java?rev=1435812&r1=1435811&r2=1435812&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointTest.java Sun Jan 20 10:14:32 2013
@@ -323,6 +323,7 @@ public class MockEndpointTest extends Co
try {
template.sendBody("direct:a", "Hello World");
+ fail("Should have thrown an exception");
} catch (Exception e) {
assertIsInstanceOf(IllegalArgumentException.class, e.getCause());
assertEquals("Forced", e.getCause().getMessage());
@@ -339,6 +340,7 @@ public class MockEndpointTest extends Co
try {
template.sendBody("direct:a", "Hello World");
+ fail("Should have thrown an exception");
} catch (Exception e) {
assertIsInstanceOf(IllegalArgumentException.class, e.getCause());
assertEquals("Forced", e.getCause().getMessage());
@@ -357,6 +359,7 @@ public class MockEndpointTest extends Co
template.sendBody("direct:a", "Hello World");
try {
template.sendBody("direct:a", "Hello World");
+ fail("Should have thrown an exception");
} catch (Exception e) {
assertIsInstanceOf(IllegalArgumentException.class, e.getCause());
assertEquals("Forced", e.getCause().getMessage());
@@ -375,6 +378,7 @@ public class MockEndpointTest extends Co
template.sendBody("direct:a", "Hello World");
try {
template.sendBody("direct:a", "Bye World");
+ fail("Should have thrown an exception");
} catch (Exception e) {
assertIsInstanceOf(IllegalArgumentException.class, e.getCause());
assertEquals("Forced", e.getCause().getMessage());
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationFinallyBlockNoCatchTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationFinallyBlockNoCatchTest.java?rev=1435812&r1=1435811&r2=1435812&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationFinallyBlockNoCatchTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ValidationFinallyBlockNoCatchTest.java Sun Jan 20 10:14:32 2013
@@ -50,6 +50,7 @@ public class ValidationFinallyBlockNoCat
try {
template.sendBodyAndHeader("direct:start", "<invalid/>", "foo", "notMatchedHeaderValue");
+ fail("Should have thrown an exception");
} catch (Exception e) {
// expected
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/CustomExceptionPolicyStrategyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/CustomExceptionPolicyStrategyTest.java?rev=1435812&r1=1435811&r2=1435812&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/CustomExceptionPolicyStrategyTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/exceptionpolicy/CustomExceptionPolicyStrategyTest.java Sun Jan 20 10:14:32 2013
@@ -59,6 +59,7 @@ public class CustomExceptionPolicyStrate
try {
template.sendBody("direct:a", "Hello Camel");
+ fail("Should have thrown an exception");
} catch (Exception e) {
// expected
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/DefaultTraceFormatterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/DefaultTraceFormatterTest.java?rev=1435812&r1=1435811&r2=1435812&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/DefaultTraceFormatterTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/DefaultTraceFormatterTest.java Sun Jan 20 10:14:32 2013
@@ -59,6 +59,7 @@ public class DefaultTraceFormatterTest e
try {
template.sendBody("direct:fail", "Hello World");
+ fail("Should have thrown an exception");
} catch (Exception e) {
// ignore
}
Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSpringCustomizedExceptionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSpringCustomizedExceptionTest.java?rev=1435812&r1=1435811&r2=1435812&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSpringCustomizedExceptionTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSpringCustomizedExceptionTest.java Sun Jan 20 10:14:32 2013
@@ -74,6 +74,7 @@ public class CxfSpringCustomizedExceptio
public void testInvokingServiceFromCamel() throws Exception {
try {
template.sendBodyAndHeader("direct:start", ExchangePattern.InOut, "hello world" , CxfConstants.OPERATION_NAME, "echo");
+ fail("Should have thrown an exception");
} catch (Exception ex) {
Throwable result = ex.getCause();
assertTrue("Exception is not instance of SoapFault", result instanceof SoapFault);
Modified: camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbExceptionHandlingTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbExceptionHandlingTest.java?rev=1435812&r1=1435811&r2=1435812&view=diff
==============================================================================
--- camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbExceptionHandlingTest.java (original)
+++ camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbExceptionHandlingTest.java Sun Jan 20 10:14:32 2013
@@ -31,6 +31,7 @@ public class MongoDbExceptionHandlingTes
// notice missing quote at the end of Einstein
try {
template.requestBody("direct:findOneByQuery", "{\"scientist\": \"Einstein}");
+ fail("Should have thrown an exception");
} catch (Exception e) {
extractAndAssertCamelMongoDbException(e, null);
}
@@ -44,6 +45,7 @@ public class MongoDbExceptionHandlingTes
try {
template.requestBodyAndHeader("direct:findOneByQuery", "{\"scientist\": \"Einstein\"}", MongoDbConstants.OPERATION_HEADER, "dummyOp");
+ fail("Should have thrown an exception");
} catch (Exception e) {
extractAndAssertCamelMongoDbException(e, "Operation specified on header is not supported. Value: dummyOp");
}
Modified: camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbWriteConcernsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbWriteConcernsTest.java?rev=1435812&r1=1435811&r2=1435812&view=diff
==============================================================================
--- camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbWriteConcernsTest.java (original)
+++ camel/trunk/components/camel-mongodb/src/test/java/org/apache/camel/component/mongodb/MongoDbWriteConcernsTest.java Sun Jan 20 10:14:32 2013
@@ -74,6 +74,7 @@ public class MongoDbWriteConcernsTest ex
try {
template.requestBodyAndHeader("direct:noWriteConcern", "{\"scientist\":\"newton\"}", MongoDbConstants.WRITECONCERN, "Random");
+ fail("Should have thrown an exception");
} catch (Exception e) {
extractAndAssertCamelMongoDbException(e, "WriteConcern specified in the " + MongoDbConstants.WRITECONCERN + " header");
}
Modified: camel/trunk/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosEventNotifierTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosEventNotifierTest.java?rev=1435812&r1=1435811&r2=1435812&view=diff
==============================================================================
--- camel/trunk/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosEventNotifierTest.java (original)
+++ camel/trunk/components/camel-nagios/src/test/java/org/apache/camel/component/nagios/NagiosEventNotifierTest.java Sun Jan 20 10:14:32 2013
@@ -108,6 +108,7 @@ public class NagiosEventNotifierTest ext
try {
template.sendBody("direct:fail", "Bye World");
+ fail("Should have thrown an exception");
} catch (Exception e) {
// ignore
}
Modified: camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicyTest.java?rev=1435812&r1=1435811&r2=1435812&view=diff
==============================================================================
--- camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicyTest.java (original)
+++ camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/routepolicy/quartz/SimpleScheduledRoutePolicyTest.java Sun Jan 20 10:14:32 2013
@@ -74,8 +74,6 @@ public class SimpleScheduledRoutePolicyT
@Test
public void testScheduledStopRoutePolicy() throws Exception {
- boolean consumerStopped = false;
-
context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
@@ -96,7 +94,8 @@ public class SimpleScheduledRoutePolicyT
Thread.sleep(4000);
assertTrue(context.getRouteStatus("test") == ServiceStatus.Stopped);
-
+
+ boolean consumerStopped = false;
try {
template.sendBody("direct:start", "Ready or not, Here, I come");
} catch (CamelExecutionException e) {
@@ -108,8 +107,6 @@ public class SimpleScheduledRoutePolicyT
@Test
public void testScheduledSuspendRoutePolicy() throws Exception {
- boolean consumerSuspended = false;
-
context.getComponent("quartz", QuartzComponent.class).setPropertiesFile("org/apache/camel/routepolicy/quartz/myquartz.properties");
context.addRoutes(new RouteBuilder() {
public void configure() {
@@ -128,6 +125,8 @@ public class SimpleScheduledRoutePolicyT
context.start();
Thread.sleep(4000);
+
+ boolean consumerSuspended = false;
try {
template.sendBody("direct:start", "Ready or not, Here, I come");
} catch (CamelExecutionException e) {
@@ -162,6 +161,7 @@ public class SimpleScheduledRoutePolicyT
ServiceHelper.suspendService(context.getRoute("test").getConsumer());
try {
template.sendBody("direct:start", "Ready or not, Here, I come");
+ fail("Should have thrown an exception");
} catch (CamelExecutionException e) {
LOG.debug("Consumer successfully suspended");
}
@@ -201,6 +201,7 @@ public class SimpleScheduledRoutePolicyT
try {
template.sendBody("direct:start", "Ready or not, Here, I come");
+ fail("Should have thrown an exception");
} catch (CamelExecutionException e) {
LOG.debug("Consumer successfully suspended");
}
@@ -240,6 +241,7 @@ public class SimpleScheduledRoutePolicyT
try {
template.sendBody("direct:start", "Ready or not, Here, I come");
+ fail("Should have thrown an exception");
} catch (CamelExecutionException e) {
LOG.debug("Consumer successfully suspended");
}