Author: antelder
Date: Thu Jan 8 01:32:53 2009
New Revision: 732663
URL: http://svn.apache.org/viewvc?rev=732663&view=rev
Log:
Add more exception testing for TUSCANY-2593
Added:
tuscany/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
tuscany/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
tuscany/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
Modified:
tuscany/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
tuscany/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
tuscany/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
tuscany/branches/sca-java-1.x/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
Added:
tuscany/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java?rev=732663&view=auto
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
(added)
+++
tuscany/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetion2Args.java
Thu Jan 8 01:32:53 2009
@@ -0,0 +1,28 @@
+/*
+ * 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.tuscany.sca.binding.jms;
+
+public class CheckedExcpetion2Args extends Exception {
+ private static final long serialVersionUID = 1L;
+
+ public CheckedExcpetion2Args(String s, Throwable e) {
+ super(s, e);
+ }
+}
Added:
tuscany/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java?rev=732663&view=auto
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
(added)
+++
tuscany/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionChained.java
Thu Jan 8 01:32:53 2009
@@ -0,0 +1,28 @@
+/*
+ * 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.tuscany.sca.binding.jms;
+
+public class CheckedExcpetionChained extends Exception {
+ private static final long serialVersionUID = 1L;
+
+ public CheckedExcpetionChained(Throwable e) {
+ super(e);
+ }
+}
Added:
tuscany/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java?rev=732663&view=auto
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
(added)
+++
tuscany/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/CheckedExcpetionNoArgs.java
Thu Jan 8 01:32:53 2009
@@ -0,0 +1,28 @@
+/*
+ * 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.tuscany.sca.binding.jms;
+
+public class CheckedExcpetionNoArgs extends Exception {
+ private static final long serialVersionUID = 1L;
+
+ public CheckedExcpetionNoArgs() {
+ super();
+ }
+}
Modified:
tuscany/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java?rev=732663&r1=732662&r2=732663&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
(original)
+++
tuscany/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
Thu Jan 8 01:32:53 2009
@@ -25,6 +25,9 @@
public interface ExceptionService {
public void throwChecked() throws CheckedExcpetion;
+ public void throwCheckedNoArgs() throws CheckedExcpetionNoArgs;
+ public void throwChecked2Args() throws CheckedExcpetion2Args;
+ public void throwCheckedChained() throws CheckedExcpetionChained;
public void throwUnChecked();
}
Modified:
tuscany/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java?rev=732663&r1=732662&r2=732663&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
(original)
+++
tuscany/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
Thu Jan 8 01:32:53 2009
@@ -38,6 +38,18 @@
service.throwChecked();
}
+ public void throwChecked2Args() throws CheckedExcpetion2Args {
+ service.throwChecked2Args();
+ }
+
+ public void throwCheckedChained() throws CheckedExcpetionChained {
+ service.throwCheckedChained();
+ }
+
+ public void throwCheckedNoArgs() throws CheckedExcpetionNoArgs {
+ service.throwCheckedNoArgs();
+ }
+
public void throwUnChecked() {
service.throwUnChecked();
}
Modified:
tuscany/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java?rev=732663&r1=732662&r2=732663&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
(original)
+++
tuscany/branches/sca-java-1.x/itest/jms/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceImpl.java
Thu Jan 8 01:32:53 2009
@@ -25,6 +25,18 @@
throw new CheckedExcpetion("foo");
}
+ public void throwChecked2Args() throws CheckedExcpetion2Args {
+ throw new CheckedExcpetion2Args("foo", new Exception("bla"));
+ }
+
+ public void throwCheckedChained() throws CheckedExcpetionChained {
+ throw new CheckedExcpetionChained(new Exception("bla"));
+ }
+
+ public void throwCheckedNoArgs() throws CheckedExcpetionNoArgs {
+ throw new CheckedExcpetionNoArgs();
+ }
+
public void throwUnChecked() {
throw new RuntimeException("bla");
}
Modified:
tuscany/branches/sca-java-1.x/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java?rev=732663&r1=732662&r2=732663&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.x/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
(original)
+++
tuscany/branches/sca-java-1.x/itest/jms/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
Thu Jan 8 01:32:53 2009
@@ -19,12 +19,12 @@
package org.apache.tuscany.sca.binding.jms;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
import org.apache.tuscany.sca.host.embedded.SCADomain;
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
/**
@@ -41,7 +41,7 @@
}
@Test
- @Ignore // TUSCANY-2593, currently fails for some jaxws reason?
+// @Ignore // TUSCANY-2593, currently fails for some jaxws reason?
public void testChecked() {
ExceptionService service =
scaDomain.getService(ExceptionService.class, "ExceptionServiceClient");
try {
@@ -53,6 +53,42 @@
}
@Test
+ public void testCheckedNoArgs() {
+ ExceptionService service =
scaDomain.getService(ExceptionService.class, "ExceptionServiceClient");
+ try {
+ service.throwCheckedNoArgs();
+ fail();
+ } catch (CheckedExcpetionNoArgs e) {
+ // ok
+ }
+ }
+
+ @Test
+ public void testChecked2Args() {
+ ExceptionService service =
scaDomain.getService(ExceptionService.class, "ExceptionServiceClient");
+ try {
+ service.throwChecked2Args();
+ fail();
+ } catch (CheckedExcpetion2Args e) {
+ assertEquals("foo", e.getMessage());
+ assertNotNull(e.getCause());
+ assertEquals("bla", e.getCause().getMessage());
+ }
+ }
+
+ @Test
+ public void testCheckedChained() {
+ ExceptionService service =
scaDomain.getService(ExceptionService.class, "ExceptionServiceClient");
+ try {
+ service.throwCheckedChained();
+ fail();
+ } catch (CheckedExcpetionChained e) {
+ assertNotNull(e.getCause());
+ assertEquals("bla", e.getCause().getMessage());
+ }
+ }
+
+ @Test
public void testUnChecked() {
ExceptionService service =
scaDomain.getService(ExceptionService.class, "ExceptionServiceClient");
try {
