You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2013/04/07 09:42:23 UTC
svn commit: r1465337 - in
/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws:
CodeFirstTest.java service/AddNumbersException.java
service/AddNumbersSubException.java service/Hello.java
service/HelloInterface.java
Author: ffang
Date: Sun Apr 7 07:42:23 2013
New Revision: 1465337
URL: http://svn.apache.org/r1465337
Log:
[CXF-4940]add a testcase to demonstrate exception hierarchy works
Added:
cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AddNumbersSubException.java
Modified:
cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java
cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AddNumbersException.java
cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/Hello.java
cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/HelloInterface.java
Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java?rev=1465337&r1=1465336&r2=1465337&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java Sun Apr 7 07:42:23 2013
@@ -47,6 +47,7 @@ import org.apache.cxf.frontend.ServerFac
import org.apache.cxf.interceptor.LoggingInInterceptor;
import org.apache.cxf.interceptor.LoggingOutInterceptor;
import org.apache.cxf.jaxws.service.AddNumbersException;
+import org.apache.cxf.jaxws.service.AddNumbersSubException;
import org.apache.cxf.jaxws.service.ArrayService;
import org.apache.cxf.jaxws.service.ArrayServiceImpl;
import org.apache.cxf.jaxws.service.Entity;
@@ -247,6 +248,15 @@ public class CodeFirstTest extends Abstr
} catch (AddNumbersException e) {
assertEquals(e.getInfo(), "Sum is less than 0.");
}
+
+ try {
+ proxy.addNumbers(1, 99);
+ fail("should throw AddNumbersSubException");
+ } catch (AddNumbersSubException e) {
+ assertEquals(e.getSubInfo(), "Sum is 100");
+ } catch (AddNumbersException e) {
+ fail("should throw AddNumbersSubException");
+ }
}
Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AddNumbersException.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AddNumbersException.java?rev=1465337&r1=1465336&r2=1465337&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AddNumbersException.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AddNumbersException.java Sun Apr 7 07:42:23 2013
@@ -23,7 +23,7 @@ import javax.xml.ws.WebFault;
@WebFault
public class AddNumbersException extends Exception {
private static final long serialVersionUID = 1L;
- private String info;
+ protected String info;
public AddNumbersException() {
}
Added: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AddNumbersSubException.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AddNumbersSubException.java?rev=1465337&view=auto
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AddNumbersSubException.java (added)
+++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/AddNumbersSubException.java Sun Apr 7 07:42:23 2013
@@ -0,0 +1,38 @@
+/**
+ * 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.cxf.jaxws.service;
+
+import javax.xml.ws.WebFault;
+
+
+@WebFault
+public class AddNumbersSubException extends AddNumbersException {
+
+ private static final long serialVersionUID = 1L;
+
+ private String subInfo;
+ public AddNumbersSubException(String info) {
+ this.subInfo = info;
+ }
+
+ public String getSubInfo() {
+ return subInfo;
+ }
+}
Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/Hello.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/Hello.java?rev=1465337&r1=1465336&r2=1465337&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/Hello.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/Hello.java Sun Apr 7 07:42:23 2013
@@ -70,10 +70,13 @@ public class Hello {
}
@WebMethod
- public String addNumbers(int arg0, int arg1) throws AddNumbersException {
+ public String addNumbers(int arg0, int arg1) throws AddNumbersSubException, AddNumbersException {
if (arg0 + arg1 < 0) {
throw new AddNumbersException("Sum is less than 0.");
}
+ if (arg0 + arg1 == 100) {
+ throw new AddNumbersSubException("Sum is 100");
+ }
return "Result = " + String.valueOf(arg0 + arg1);
}
}
Modified: cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/HelloInterface.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/HelloInterface.java?rev=1465337&r1=1465336&r2=1465337&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/HelloInterface.java (original)
+++ cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/HelloInterface.java Sun Apr 7 07:42:23 2013
@@ -34,5 +34,5 @@ public interface HelloInterface {
@WebMethod
List<String> getStringList(List<String> list);
@WebMethod
- String addNumbers(int arg0, int arg1) throws AddNumbersException;
+ String addNumbers(int arg0, int arg1) throws AddNumbersSubException, AddNumbersException;
}