Author: hadrian
Date: Mon Apr 14 12:53:22 2008
New Revision: 647972
URL: http://svn.apache.org/viewvc?rev=647972&view=rev
Log:
Fixed typos in cxf tests.
Added:
activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomizedExceptionTest.java
- copied, changed from r647969,
activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustmerizedExceptionTest.java
Removed:
activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustmerizedExceptionTest.java
Modified:
activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMessageCustomizedExceptionTest.java
activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadCustomizedExceptionTest.java
Copied:
activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomizedExceptionTest.java
(from r647969,
activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustmerizedExceptionTest.java)
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomizedExceptionTest.java?p2=activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomizedExceptionTest.java&p1=activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustmerizedExceptionTest.java&r1=647969&r2=647972&rev=647972&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustmerizedExceptionTest.java
(original)
+++
activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfCustomizedExceptionTest.java
Mon Apr 14 12:53:22 2008
@@ -16,27 +16,22 @@
*/
package org.apache.camel.component.cxf;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Text;
-
import org.apache.camel.CamelContext;
-import org.apache.camel.CamelException;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.Exchange;
-import org.apache.camel.Message;
-import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
+
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.binding.soap.SoapFault;
-import org.apache.cxf.endpoint.ServerImpl;
import org.apache.cxf.frontend.ClientFactoryBean;
import org.apache.cxf.frontend.ClientProxyFactoryBean;
-import org.apache.cxf.frontend.ServerFactoryBean;
-public class CxfCustmerizedExceptionTest extends ContextTestSupport {
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Text;
+
+public class CxfCustomizedExceptionTest extends ContextTestSupport {
protected static final String ROUTER_ADDRESS =
"http://localhost:9002/router";;
protected static final String SERVICE_CLASS =
"serviceClass=org.apache.camel.component.cxf.HelloService";
@@ -45,10 +40,8 @@
private static final String DETAIL_TEXT = "This is a detail text node";
private static final SoapFault SOAP_FAULT;
-
private Bus bus;
-
static {
SOAP_FAULT = new SoapFault(EXCEPTION_MESSAGE,
SoapFault.FAULT_CODE_CLIENT);
Element detail = SOAP_FAULT.getOrCreateDetail();
@@ -57,7 +50,6 @@
detail.appendChild(tn);
}
-
@Override
protected void setUp() throws Exception {
BusFactory.setDefaultBus(null);
@@ -98,13 +90,12 @@
try {
client.echo("hello world");
- fail("Except to get an exception here");
+ fail("Expect to get an exception here");
} catch (Exception e) {
- assertEquals("Except to get right exception message",
e.getMessage(), EXCEPTION_MESSAGE);
- assertEquals("Except to get right exception message",
EXCEPTION_MESSAGE, e.getMessage());
+ assertEquals("Expect to get right exception message",
EXCEPTION_MESSAGE, e.getMessage());
assertTrue("Exception is not instance of SoapFault", e instanceof
SoapFault);
- assertEquals("Except to get right detail message", DETAIL_TEXT,
((SoapFault)e).getDetail().getTextContent());
- assertEquals("Except to get right fault-code",
SoapFault.FAULT_CODE_CLIENT, ((SoapFault)e).getFaultCode());
+ assertEquals("Expect to get right detail message", DETAIL_TEXT,
((SoapFault)e).getDetail().getTextContent());
+ assertEquals("Expect to get right fault-code",
SoapFault.FAULT_CODE_CLIENT, ((SoapFault)e).getFaultCode());
}
}
Modified:
activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMessageCustomizedExceptionTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMessageCustomizedExceptionTest.java?rev=647972&r1=647971&r2=647972&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMessageCustomizedExceptionTest.java
(original)
+++
activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfMessageCustomizedExceptionTest.java
Mon Apr 14 12:53:22 2008
@@ -22,13 +22,11 @@
/**
* Test for throwing the CustomizedException from Camel CXF consumer with
MESSAGE DataFormat
*/
-public class CxfMessageCustomizedExceptionTest extends
CxfCustmerizedExceptionTest {
+public class CxfMessageCustomizedExceptionTest extends
CxfCustomizedExceptionTest {
@Override
protected void setUp() throws Exception {
routerEndpointURI = "cxf://" + ROUTER_ADDRESS + "?" + SERVICE_CLASS +
"&DataFormat=MESSAGE";
super.setUp();
-
}
-
}
Modified:
activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadCustomizedExceptionTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadCustomizedExceptionTest.java?rev=647972&r1=647971&r2=647972&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadCustomizedExceptionTest.java
(original)
+++
activemq/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadCustomizedExceptionTest.java
Mon Apr 14 12:53:22 2008
@@ -20,12 +20,11 @@
/**
* Test for throwing the CustomizedException from Camel CXF consumer with
PAYLOAD DataFormat
*/
-public class CxfPayLoadCustomizedExceptionTest extends
CxfCustmerizedExceptionTest {
+public class CxfPayLoadCustomizedExceptionTest extends
CxfCustomizedExceptionTest {
@Override
protected void setUp() throws Exception {
routerEndpointURI = "cxf://" + ROUTER_ADDRESS + "?" + SERVICE_CLASS +
"&DataFormat=PAYLOAD";
super.setUp();
}
-
}
