You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cs...@apache.org on 2014/12/11 11:33:22 UTC
camel git commit: Adding better assertion for exceptions
Repository: camel
Updated Branches:
refs/heads/master d4e5b1398 -> 9a42f37e6
Adding better assertion for exceptions
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9a42f37e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9a42f37e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9a42f37e
Branch: refs/heads/master
Commit: 9a42f37e69ba37e0c60a0c4ec4bb83094b173685
Parents: d4e5b13
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Thu Dec 11 11:33:14 2014 +0100
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Thu Dec 11 11:33:14 2014 +0100
----------------------------------------------------------------------
.../component/jetty/CamelRedirectListener.java | 52 --------------------
.../apache/camel/test/junit4/TestSupport.java | 8 +++
2 files changed, 8 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/9a42f37e/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelRedirectListener.java
----------------------------------------------------------------------
diff --git a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelRedirectListener.java b/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelRedirectListener.java
deleted file mode 100644
index 7e1b93d..0000000
--- a/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelRedirectListener.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * 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.component.jetty;
-
-import java.io.IOException;
-
-import org.eclipse.jetty.client.HttpDestination;
-import org.eclipse.jetty.client.HttpExchange;
-import org.eclipse.jetty.client.RedirectListener;
-import org.eclipse.jetty.http.HttpStatus;
-import org.eclipse.jetty.io.Buffer;
-
-public class CamelRedirectListener extends RedirectListener {
- private final HttpExchange exchange;
-
- public CamelRedirectListener(HttpDestination destination, HttpExchange ex) {
- super(destination, ex);
- exchange = ex;
- }
-
- @Override
- public void onResponseStatus(Buffer version, int status, Buffer reason) throws IOException {
- // Update the exchange method to get to support the Post/Redirect/Get
- // http://en.wikipedia.org/wiki/Post/Redirect/Get
- if (exchange.getMethod().equals("POST") && (status == HttpStatus.SEE_OTHER_303 || status == HttpStatus.MOVED_TEMPORARILY_302)) {
- exchange.setMethod("GET");
- }
-
- // Since the default RedirectListener only cares about http
- // response codes 301 and 302, we override this method and
- // trick the super class into handling this case for us.
- if (status == HttpStatus.SEE_OTHER_303) {
- status = HttpStatus.MOVED_TEMPORARILY_302;
- }
-
- super.onResponseStatus(version, status, reason);
- }
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/9a42f37e/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java b/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
index d574f60..f086c82 100644
--- a/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
+++ b/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
@@ -147,6 +147,14 @@ public abstract class TestSupport extends Assert {
+ value.getClass().getName(), expectedType.isInstance(value));
return expectedType.cast(value);
}
+
+ public static <T extends Throwable> T assertThrowable(Class<T> expectedType, Throwable t) {
+ assertNotNull("Expected an exinstance of type: " + expectedType.getName() + " but was null", t);
+ if (!expectedType.isInstance(t)) {
+ throw new AssertionError("Unexpected throwable", t);
+ }
+ return expectedType.cast(t);
+ }
public static void assertEndpointUri(Endpoint endpoint, String uri) {
assertNotNull("Endpoint is null when expecting endpoint for: " + uri, endpoint);