Author: rfeng
Date: Mon Feb 18 11:13:48 2008
New Revision: 628844
URL: http://svn.apache.org/viewvc?rev=628844&view=rev
Log:
Clean up the itest and add tests for undeclared exceptions
Removed:
incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExceptionTestJAXB.java
Modified:
incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite
incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
Modified:
incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java?rev=628844&r1=628843&r2=628844&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
(original)
+++
incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockExchangeJaxB.java
Mon Feb 18 11:13:48 2008
@@ -23,29 +23,23 @@
import
org.apache.tuscany.sca.test.exceptions.impl.jaxb.InvalidSymbolFault_Exception;
import org.apache.tuscany.sca.test.exceptions.impl.jaxb.MarketClosedFault;
import org.apache.tuscany.sca.test.exceptions.impl.jaxb.ObjectFactory;
+import org.apache.tuscany.sca.test.exceptions.impl.jaxb.StockExceptionTest;
import org.apache.tuscany.sca.test.exceptions.impl.jaxb.StockOffer;
import
org.apache.tuscany.sca.test.exceptions.impl.jaxb.TestNotDeclaredAtSourceFault;
import org.osoa.sca.annotations.Service;
/**
- *
+ * JAXB version of StockExceptionTest impl
*/
[EMAIL PROTECTED](StockExceptionTestJAXB.class)
-public class StockExchangeJaxB implements StockExceptionTestJAXB {
[EMAIL PROTECTED](StockExceptionTest.class)
+public class StockExchangeJaxB implements StockExceptionTest {
- /**
- *
- */
public StockExchangeJaxB() {
}
- /*
- * (non-Javadoc)
- *
- * @see
org.apache.tuscany.sca.test.exceptions.impl.jaxb.StockExceptionTest#stockQuoteOffer(org.apache.tuscany.sca.test.exceptions.impl.jaxb.StockOffer)
- */
- public StockOffer stockQuoteOffer(StockOffer input) throws
InvalidSymbolFault_Exception, MarketClosedFault, TestNotDeclaredAtSourceFault{
+ public StockOffer stockQuoteOffer(StockOffer input) throws
InvalidSymbolFault_Exception, MarketClosedFault,
+ TestNotDeclaredAtSourceFault {
System.out.println("stockQuoteOffer '" + input + "'");
@@ -54,19 +48,20 @@
input.setPrice(99.00F);
return input;
- }
- else if ("CLOSED".equals(input.getName())) {
+ } else if ("CLOSED".equals(input.getName())) {
throw new MarketClosedFault("TO LATE!", 3);
-
- } else if( "testNotDeclaredAtSourceTest".equals(input.getName())){
-
+
+ } else if ("UNDECLARED_SOURCE".equals(input.getName())) {
+
throw new TestNotDeclaredAtSourceFault("not declared", "fault
info");
-
+
+ } else if ("UNDECLARED_TARGET".equals(input.getName())) {
+ throw new IllegalArgumentException("System fault");
}
ObjectFactory jaxbOjectFactory = new ObjectFactory();
InvalidSymbolFault faultinfo =
jaxbOjectFactory.createInvalidSymbolFault();
-
+
faultinfo.setOffer(input);
throw new InvalidSymbolFault_Exception("bad symbol", faultinfo);
Modified:
incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java?rev=628844&r1=628843&r2=628844&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
(original)
+++
incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
Mon Feb 18 11:13:48 2008
@@ -34,4 +34,6 @@
Object testNotDeclaredAtSourceTest();
+ Object testNotDeclaredAtTargetTest();
+
}
Modified:
incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java?rev=628844&r1=628843&r2=628844&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
(original)
+++
incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
Mon Feb 18 11:13:48 2008
@@ -102,19 +102,36 @@
}
}
- public Object testNotDeclaredAtSourceTest() {
+ public Object testNotDeclaredAtSourceTest() {
StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer();
// set up for a MarketClosedSDOException
- stockOffer.setName("testNotDeclaredAtSourceTest");
- stockOffer.setSymbol("TNDAS");
+ stockOffer.setName("UNDECLARED_SOURCE");
+ stockOffer.setSymbol("XYZ");
stockOffer.setPrice(Float.NaN); // offer to buy at max $100.00
try {
- return exchangeJaxb.stockQuoteOffer(stockOffer);
-
+ return exchangeJaxb.stockQuoteOffer(stockOffer);
+
+ } catch (Exception e) {
+ return e;
+
+ }
+
+ }
+
+ public Object testNotDeclaredAtTargetTest() {
+ StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer();
+
+ // set up for a MarketClosedSDOException
+ stockOffer.setName("UNDECLARED_TARGET");
+ stockOffer.setSymbol("XYZ");
+ stockOffer.setPrice(Float.NaN); // offer to buy at max $100.00
+ try {
+ return exchangeJaxb.stockQuoteOffer(stockOffer);
+
} catch (Exception e) {
return e;
-
+
}
}
Modified:
incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite?rev=628844&r1=628843&r2=628844&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite
(original)
+++
incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite
Mon Feb 18 11:13:48 2008
@@ -17,15 +17,13 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite
- targetNamespace="http://foo";
- name="intracomposite" xmlns="http://www.osoa.org/xmlns/sca/1.0";
+<composite targetNamespace="http://foo"; name="intracomposite"
xmlns="http://www.osoa.org/xmlns/sca/1.0";
xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance";>
<service name="exchangeJaxbService" promote="exchangeJaxbComponent">
- <interface.java
interface="org.apache.tuscany.sca.test.exceptions.impl.StockExceptionTestJAXB"
/>
+ <interface.java
interface="org.apache.tuscany.sca.test.exceptions.impl.jaxb.StockExceptionTest"
/>
<binding.ws
-
wsdlElement="http://scatesttool.stockexceptiontestservice#wsdl.port(StockExceptionTestService/StockExceptionTestServiceSoapPort)"/>
+
wsdlElement="http://scatesttool.stockexceptiontestservice#wsdl.port(StockExceptionTestService/StockExceptionTestServiceSoapPort)"
/>
</service>
<component name="exchangeJaxbComponent">
@@ -39,6 +37,6 @@
<reference name="stockTraderSDOReference"
promote="stockTraderSDOComponent/exchangeJaxb">
<interface.java
interface="org.apache.tuscany.sca.test.exceptions.sdohandgen.StockExceptionTest"
/>
<binding.ws
-
wsdlElement="http://scatesttool.stockexceptiontestservice#wsdl.port(StockExceptionTestService/StockExceptionTestServiceSoapPort)"/>
+
wsdlElement="http://scatesttool.stockexceptiontestservice#wsdl.port(StockExceptionTestService/StockExceptionTestServiceSoapPort)"
/>
</reference>
</composite>
Modified:
incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java?rev=628844&r1=628843&r2=628844&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
(original)
+++
incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
Mon Feb 18 11:13:48 2008
@@ -18,9 +18,10 @@
*/
package org.apache.tuscany.sca.test.exceptions;
+import java.lang.reflect.UndeclaredThrowableException;
+
import junit.framework.TestCase;
-import org.apache.tuscany.sca.databinding.TransformationException;
import org.apache.tuscany.sca.host.embedded.SCADomain;
import org.apache.tuscany.sca.test.exceptions.impl.StockTraderSDO;
import
org.apache.tuscany.sca.test.exceptions.sdohandgen.InvalidSymbolSDOException;
@@ -66,13 +67,23 @@
}
}
- public void _testNotDeclaredAtSourceException() {
+ public void testNotDeclaredAtSourceException() {
Object ret = stockTrader.testNotDeclaredAtSourceTest();
assertNotNull(ret);
- assertEquals(TransformationException.class, ret.getClass());
+ assertEquals(UndeclaredThrowableException.class, ret.getClass());
+
+ }
+
+ public void testNotDeclaredAtTargetException() {
+
+ Object ret = stockTrader.testNotDeclaredAtTargetTest();
+
+ assertNotNull(ret);
+
+ assertEquals(UndeclaredThrowableException.class, ret.getClass());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
