You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2009/10/12 16:20:34 UTC
svn commit: r824351 - in /camel/trunk/camel-core/src:
main/java/org/apache/camel/builder/BinaryPredicateSupport.java
test/java/org/apache/camel/builder/ExpressionClauseTest.java
test/java/org/apache/camel/builder/LoggingErrorHandlerBuilderTest.java
Author: davsclaus
Date: Mon Oct 12 14:20:34 2009
New Revision: 824351
URL: http://svn.apache.org/viewvc?rev=824351&view=rev
Log:
MR-187: Added more unit tests.
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExpressionClauseTest.java (with props)
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/LoggingErrorHandlerBuilderTest.java (with props)
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/BinaryPredicateSupport.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/BinaryPredicateSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/BinaryPredicateSupport.java?rev=824351&r1=824350&r2=824351&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/BinaryPredicateSupport.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/BinaryPredicateSupport.java Mon Oct 12 14:20:34 2009
@@ -50,20 +50,8 @@
return matches(exchange, leftValue, rightValue);
}
- public void assertMatches(String text, Exchange exchange) {
- Object leftValue = left.evaluate(exchange, Object.class);
- Object rightValue = right.evaluate(exchange, Object.class);
- if (!matches(exchange, leftValue, rightValue)) {
- throw new AssertionError(text + assertionFailureMessage(exchange, leftValue, rightValue));
- }
- }
-
protected abstract boolean matches(Exchange exchange, Object leftValue, Object rightValue);
protected abstract String getOperationText();
- protected String assertionFailureMessage(Exchange exchange, Object leftValue, Object rightValue) {
- return this + " failed on " + exchange
- + " with left value <" + leftValue + "> right value <" + rightValue + ">";
- }
}
Added: camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExpressionClauseTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExpressionClauseTest.java?rev=824351&view=auto
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExpressionClauseTest.java (added)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExpressionClauseTest.java Mon Oct 12 14:20:34 2009
@@ -0,0 +1,46 @@
+/**
+ * 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.builder;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.component.mock.MockEndpoint;
+
+/**
+ * @version $Revision$
+ */
+public class ExpressionClauseTest extends ContextTestSupport {
+
+ public void testConstant() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMessageCount(1);
+ mock.expectedBodyReceived().constant("Hello World");
+
+ template.sendBody("direct:start", "Hello World");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start").to("mock:result");
+ }
+ };
+ }
+}
Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExpressionClauseTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/builder/ExpressionClauseTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: 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=824351&view=auto
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/builder/LoggingErrorHandlerBuilderTest.java (added)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/builder/LoggingErrorHandlerBuilderTest.java Mon Oct 12 14:20:34 2009
@@ -0,0 +1,125 @@
+/**
+ * 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.builder;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.LoggingLevel;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * @version $Revision$
+ */
+public class LoggingErrorHandlerBuilderTest extends ContextTestSupport {
+
+ @Override
+ public boolean isUseRouteBuilder() {
+ return false;
+ }
+
+ public void testLoggingErrorHandler() throws Exception {
+ context.addRoutes(new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ LoggingErrorHandlerBuilder eh = loggingErrorHandler();
+ eh.setLevel(LoggingLevel.FATAL);
+ eh.setLog(LogFactory.getLog("foo"));
+
+ assertEquals(LoggingLevel.FATAL, eh.getLevel());
+ assertNotNull(eh.getLog());
+ assertFalse(eh.supportTransacted());
+
+ errorHandler(eh);
+
+ from("direct:start").to("mock:foo").throwException(new IllegalArgumentException("Damn"));
+ }
+ });
+ context.start();
+
+ try {
+ template.sendBody("direct:start", "Hello World");
+ } catch (Exception e) {
+ // expected
+ }
+ }
+
+ public void testLoggingErrorHandler2() throws Exception {
+ context.addRoutes(new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ errorHandler(loggingErrorHandler().level(LoggingLevel.FATAL).log(LogFactory.getLog("foo")));
+
+ from("direct:start").to("mock:foo").throwException(new IllegalArgumentException("Damn"));
+ }
+ });
+ context.start();
+
+ try {
+ template.sendBody("direct:start", "Hello World");
+ } catch (Exception e) {
+ // expected
+ }
+ }
+
+ public void testLoggingErrorHandler3() throws Exception {
+ context.addRoutes(new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ LoggingErrorHandlerBuilder eh = loggingErrorHandler(LogFactory.getLog("foo"));
+ eh.setLevel(LoggingLevel.FATAL);
+
+ assertEquals(LoggingLevel.FATAL, eh.getLevel());
+ assertNotNull(eh.getLog());
+ assertFalse(eh.supportTransacted());
+
+ errorHandler(eh);
+
+ from("direct:start").to("mock:foo").throwException(new IllegalArgumentException("Damn"));
+ }
+ });
+ context.start();
+
+ try {
+ template.sendBody("direct:start", "Hello World");
+ } catch (Exception e) {
+ // expected
+ }
+ }
+
+ public void testLoggingErrorHandler4() throws Exception {
+ context.addRoutes(new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ LoggingErrorHandlerBuilder eh = loggingErrorHandler(LogFactory.getLog("foo"), LoggingLevel.FATAL);
+
+ assertEquals(LoggingLevel.FATAL, eh.getLevel());
+ assertNotNull(eh.getLog());
+ assertFalse(eh.supportTransacted());
+
+ errorHandler(eh);
+
+ from("direct:start").to("mock:foo").throwException(new IllegalArgumentException("Damn"));
+ }
+ });
+ context.start();
+
+ try {
+ template.sendBody("direct:start", "Hello World");
+ } catch (Exception e) {
+ // expected
+ }
+ }
+}
Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/builder/LoggingErrorHandlerBuilderTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/builder/LoggingErrorHandlerBuilderTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date