You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ri...@apache.org on 2007/02/16 14:41:28 UTC
svn commit: r508389 - in
/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src:
main/java/org/apache/tuscany/sca/test/exceptions/impl/
main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/
test/java/org/apa...
Author: rineholt
Date: Fri Feb 16 05:41:27 2007
New Revision: 508389
URL: http://svn.apache.org/viewvc?view=rev&rev=508389
Log:
exercise test + clean up
Added:
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
- copied, changed from r508362, incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTest.java
Removed:
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTest.java
Modified:
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java?view=diff&rev=508389&r1=508388&r2=508389
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDO.java Fri Feb 16 05:41:27 2007
@@ -19,8 +19,17 @@
package org.apache.tuscany.sca.test.exceptions.impl;
+import java.rmi.RemoteException;
+
+import org.apache.tuscany.sca.test.exceptions.sdohandgen.InvalidSymbolSDOException;
+import org.apache.tuscany.sca.test.exceptions.sdohandgen.MarketClosedSDOException;
+
+import stockexceptiontestservice.scatesttool.StockOffer;
+
public interface StockTraderSDO {
- public abstract void tradingTest();
+ StockOffer testTrading() throws RemoteException, InvalidSymbolSDOException, MarketClosedSDOException;
+
+ void testInvalidSymbolSDOException() throws RemoteException, InvalidSymbolSDOException, MarketClosedSDOException;
}
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java?view=diff&rev=508389&r1=508388&r2=508389
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/StockTraderSDOImpl.java Fri Feb 16 05:41:27 2007
@@ -56,43 +56,30 @@
*
* @see org.apache.tuscany.sca.test.exceptions.impl.StockTraderSDO#tradingTest()
*/
- public void tradingTest() {
+ public StockOffer testTrading() throws RemoteException, InvalidSymbolSDOException, MarketClosedSDOException {
StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer();
stockOffer.setName("IBM");
stockOffer.setSymbol("IBM");
stockOffer.setPrice(100.00F); // offer to buy at max $100.00
- try {
- StockOffer stockOfferAccepted = exchangeJaxb.stockQuoteOffer(stockOffer);
- stockOfferAccepted.getPrice(); // the price actually bought.
- } catch (RemoteException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (InvalidSymbolSDOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (MarketClosedSDOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- if (true)
- return; // lets see if what we know is supported runs first.
+
+ StockOffer stockOfferAccepted = exchangeJaxb.stockQuoteOffer(stockOffer);
+
+ return stockOfferAccepted;
+
+ }
+
+ public void testInvalidSymbolSDOException() throws RemoteException, InvalidSymbolSDOException, MarketClosedSDOException {
+ StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer();
// set up for a InvalidSymbolSDOException
stockOffer.setName("");
stockOffer.setSymbol("");
stockOffer.setPrice(11.0F); // offer to buy at max $100.00
- try {
- StockOffer stockOfferAccepted = exchangeJaxb.stockQuoteOffer(stockOffer);
- stockOfferAccepted.getPrice(); // the price actually bought.
- } catch (RemoteException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (InvalidSymbolSDOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (MarketClosedSDOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ exchangeJaxb.stockQuoteOffer(stockOffer);
+
+ }
+
+ public void marketClosedSDOExceptionTest() {
+ StockOffer stockOffer = ScatesttoolFactory.INSTANCE.createStockOffer();
// set up for a MarketClosedSDOException
stockOffer.setName("CLOSED");
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java?view=diff&rev=508389&r1=508388&r2=508389
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/InvalidSymbolSDOException.java Fri Feb 16 05:41:27 2007
@@ -30,7 +30,7 @@
*
*/
public InvalidSymbolSDOException() {
- // TODO Auto-generated constructor stub
+
}
/**
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java?view=diff&rev=508389&r1=508388&r2=508389
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/main/java/org/apache/tuscany/sca/test/exceptions/sdohandgen/StockExceptionTest.java Fri Feb 16 05:41:27 2007
@@ -24,8 +24,10 @@
*/
package org.apache.tuscany.sca.test.exceptions.sdohandgen;
-import org.osoa.sca.annotations.Remotable;
import org.apache.tuscany.api.annotation.DataType;
+import org.osoa.sca.annotations.Remotable;
+
+import stockexceptiontestservice.scatesttool.StockOffer;
/*
* StockExceptionTest java interface
@@ -40,7 +42,7 @@
*
* @param param0
*/
- public stockexceptiontestservice.scatesttool.StockOffer stockQuoteOffer(stockexceptiontestservice.scatesttool.StockOffer param0)
+ stockexceptiontestservice.scatesttool.StockOffer stockQuoteOffer(StockOffer param0)
throws java.rmi.RemoteException, InvalidSymbolSDOException, MarketClosedSDOException;
}
Copied: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java (from r508362, incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTest.java)
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java?view=diff&rev=508389&p1=incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTest.java&r1=508362&p2=incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java&r2=508389
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTest.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java Fri Feb 16 05:41:27 2007
@@ -18,21 +18,54 @@
*/
package org.apache.tuscany.sca.test.exceptions;
-import junit.framework.TestCase;
+import junit.framework.AssertionFailedError;
import org.apache.tuscany.sca.test.exceptions.impl.StockTraderSDO;
-import org.apache.tuscany.sca.test.exceptions.impl.StockTraderSDOImpl;
+import org.apache.tuscany.sca.test.exceptions.sdohandgen.InvalidSymbolSDOException;
import org.apache.tuscany.test.SCATestCase;
import org.osoa.sca.CompositeContext;
import org.osoa.sca.CurrentCompositeContext;
-public class IntraCompositeTest extends SCATestCase {
+import stockexceptiontestservice.scatesttool.InvalidSymbolFault;
+import stockexceptiontestservice.scatesttool.StockOffer;
+
+public class IntraCompositeTestCase extends SCATestCase {
private StockTraderSDO stockTrader;
private CompositeContext context;
- public void testALL() {
- stockTrader.tradingTest();
+ public void testTrading() {
+ try {
+ StockOffer sp = stockTrader.testTrading();
+ assertNotNull(sp);
+ assertEquals(99.00F, sp.getPrice());
+ assertEquals("IBM", sp.getSymbol());
+ } catch (Exception e) {
+
+ e.printStackTrace();
+ throw new AssertionFailedError(e + "");
+
+ }
+
+ }
+
+ public void badtestInvalidSymbolSDOException() {
+ try {
+ stockTrader.testInvalidSymbolSDOException();
+ throw new AssertionFailedError("Expected InvalidSymbolSDOException");
+ } catch (InvalidSymbolSDOException e) {
+ InvalidSymbolFault isf = e.getFaultInfo();
+
+ assertNotNull(isf);
+ StockOffer sp = isf.getOffer();
+ assertEquals(99.00F, sp.getPrice());
+ assertEquals("IBM", sp.getSymbol());
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new AssertionFailedError("Expected InvalidSymbolSDOException" + e);
+
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org