From ac1b197298975b185c90ab02f28a2666861f977c Mon Sep 17 00:00:00 2001 From: rfeng Date: Wed, 30 Jul 2008 22:11:46 +0000 Subject: Apply the patch for TUSCANY-2469 from Wojtek. (sca-binding-sdo-problem-jira-2469-30-july.patch) git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@681221 13f79535-47bb-0310-9956-ffa450edef68 --- java/sca/itest/corba/pom.xml | 215 +++++++++++++++------ .../sca/test/corba/ScenarioFourTestCase.java | 49 ++++- .../tuscany/sca/test/corba/types/ScenarioFour.java | 5 + .../test/corba/types/ScenarioFourException.java | 37 ++++ .../sca/test/corba/types/ScenarioFourImpl.java | 12 ++ .../corba/src/test/resources/scenariofour.xsd | 31 +++ 6 files changed, 282 insertions(+), 67 deletions(-) create mode 100644 java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourException.java create mode 100644 java/sca/itest/corba/src/test/resources/scenariofour.xsd (limited to 'java/sca/itest/corba') diff --git a/java/sca/itest/corba/pom.xml b/java/sca/itest/corba/pom.xml index b1d45f7c32..c79e84b660 100644 --- a/java/sca/itest/corba/pom.xml +++ b/java/sca/itest/corba/pom.xml @@ -1,73 +1,162 @@ - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.4-SNAPSHOT - ../pom.xml - - itest-corba-binding - Apache Tuscany SCA CORBA Binding Integration Tests - + 4.0.0 + + org.apache.tuscany.sca + tuscany-itest + 1.4-SNAPSHOT + ../pom.xml + + itest-corba-binding + Apache Tuscany SCA CORBA Binding Integration Tests + + + + org.apache.tuscany.sca + tuscany-host-embedded + 1.4-SNAPSHOT + + + + org.apache.tuscany.sca + tuscany-implementation-java-runtime + 1.4-SNAPSHOT + runtime + + + + org.apache.tuscany.sca + tuscany-binding-corba-runtime + 1.4-SNAPSHOT + runtime + + + + org.apache.tuscany.sca + tuscany-host-corba-jdk + 1.4-SNAPSHOT + runtime + + + + org.apache.tuscany.sca + tuscany-binding-sca + 1.4-SNAPSHOT + runtime + + + + org.apache.tuscany.sca + tuscany-binding-sca-corba + 1.4-SNAPSHOT + runtime + + + + org.apache.tuscany.sca - tuscany-host-embedded - 1.4-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.4-SNAPSHOT - runtime - - - org.apache.tuscany.sca - tuscany-binding-corba-runtime - 1.4-SNAPSHOT - runtime - - - org.apache.tuscany.sca - tuscany-host-corba-jdk + tuscany-databinding-axiom 1.4-SNAPSHOT runtime - - org.apache.tuscany.sca - tuscany-binding-sca - 1.4-SNAPSHOT - runtime - - - org.apache.tuscany.sca - tuscany-binding-sca-corba - 1.4-SNAPSHOT - runtime - - - junit - junit - 4.2 - compile - - + + + org.apache.tuscany.sca + tuscany-databinding-sdo + 1.4-SNAPSHOT + compile + + + + junit + junit + 4.2 + compile + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + 1.0 + + + add-source + generate-sources + + add-test-source + + + + target/sdo-source + + + + + + + org.apache.tuscany.sdo + tuscany-sdo-plugin + 1.1-incubating + + + generate-scenariofour-sdo + generate-sources + + + ${basedir}/src/test/resources/scenariofour.xsd + + + org.apache.tuscany.sca.test.corba.scenariofour + + ScenarioFour + true + true + true + + + generate + + + + + + diff --git a/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java b/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java index f47792c5f2..7ab5ca1e14 100644 --- a/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java +++ b/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/ScenarioFourTestCase.java @@ -26,13 +26,17 @@ import junit.framework.Assert; import org.apache.tuscany.sca.host.corba.naming.TransientNameServer; import org.apache.tuscany.sca.host.corba.naming.TransientNameService; import org.apache.tuscany.sca.host.embedded.SCADomain; +import org.apache.tuscany.sca.test.corba.scenariofour.ScenarioFourFactory; +import org.apache.tuscany.sca.test.corba.scenariofour.ScenarioFourSdo; import org.apache.tuscany.sca.test.corba.types.ScenarioFour; import org.apache.tuscany.sca.test.corba.types.ScenarioFourComponent; +import org.apache.tuscany.sca.test.corba.types.ScenarioFourException; import org.apache.tuscany.sca.test.corba.types.ScenarioFourStruct; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; + /** * Tests SCA default binding over CORBA binding */ @@ -42,6 +46,8 @@ public class ScenarioFourTestCase { private static int ORB_INITIAL_PORT = 5060; private static SCADomain domain; private static TransientNameServer server; + private static ScenarioFourComponent scenarioFourComponent; + private static ScenarioFour scenarioFour; /** * Sets up name service, creates and registers traditional CORBA service, @@ -63,6 +69,8 @@ public class ScenarioFourTestCase { } // obtain domain domain = SCADomain.newInstance("ScenarioFour.composite"); + scenarioFourComponent = domain.getService(ScenarioFourComponent.class, "ScenarioFour"); + scenarioFour = scenarioFourComponent.getScenarioFour(); } catch (Exception e) { e.printStackTrace(); } @@ -76,16 +84,17 @@ public class ScenarioFourTestCase { server.stop(); } + /** + * General tests for passing JAXB objects + */ @Test - public void test_generalTest() { + public void test_generalJAXB() { try { - ScenarioFourComponent soc = domain.getService(ScenarioFourComponent.class, "ScenarioFour"); - ScenarioFour so = soc.getScenarioFour(); ScenarioFourStruct input = new ScenarioFourStruct(); input.field1 = "Test"; input.field2 = 1; input.field3 = new double[1]; - ScenarioFourStruct output = so.setStruct(input); + ScenarioFourStruct output = scenarioFour.setStruct(input); assertTrue(input.equals(output)); } catch (Exception e) { e.printStackTrace(); @@ -93,4 +102,36 @@ public class ScenarioFourTestCase { } } + /** + * Test for JAXB exceptions + */ + @Test + public void test_exceptionsJAXB() { + try { + scenarioFour.exceptionTest(); + fail(); + } catch (ScenarioFourException e) { + assertTrue(ScenarioFourException.DEFAULT_CONTENT.equals(e.getContent())); + } catch (Exception e) { + e.printStackTrace(); + fail(); + } + } + + /** + * General test for passing SDO objects + */ + @Test + public void test_generalSDO() { + try { + ScenarioFourSdo scenarioFourSdo = ScenarioFourFactory.INSTANCE.createScenarioFourSdo(); + scenarioFourSdo.setMessage("Test1"); + scenarioFourSdo.setSymbol("Test2"); + ScenarioFourSdo result = scenarioFour.passScenarioFourStruct(scenarioFourSdo); + assertTrue(scenarioFourSdo.getMessage().equals(result.getMessage()) && scenarioFourSdo.getSymbol().equals(result.getSymbol())); + } catch (Exception e) { + e.printStackTrace(); + fail(); + } + } } diff --git a/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java b/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java index d1492f85e5..936021719e 100644 --- a/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java +++ b/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFour.java @@ -19,6 +19,7 @@ package org.apache.tuscany.sca.test.corba.types; +import org.apache.tuscany.sca.test.corba.scenariofour.ScenarioFourSdo; import org.osoa.sca.annotations.Remotable; /** @@ -29,4 +30,8 @@ public interface ScenarioFour { ScenarioFourStruct setStruct(ScenarioFourStruct struct); + void exceptionTest() throws ScenarioFourException; + + ScenarioFourSdo passScenarioFourStruct(ScenarioFourSdo scenarioFourSdo); + } diff --git a/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourException.java b/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourException.java new file mode 100644 index 0000000000..1afda33e35 --- /dev/null +++ b/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourException.java @@ -0,0 +1,37 @@ +/* + * 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.test.corba.types; + +public class ScenarioFourException extends Exception { + + public static final String DEFAULT_CONTENT = "Test"; + + private static final long serialVersionUID = 1L; + private String content; + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + +} diff --git a/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourImpl.java b/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourImpl.java index c047fafca4..35c3109ef4 100644 --- a/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourImpl.java +++ b/java/sca/itest/corba/src/test/java/org/apache/tuscany/sca/test/corba/types/ScenarioFourImpl.java @@ -19,6 +19,8 @@ package org.apache.tuscany.sca.test.corba.types; +import org.apache.tuscany.sca.test.corba.scenariofour.ScenarioFourSdo; + /** * Implementation of ScenarioFour service */ @@ -28,4 +30,14 @@ public class ScenarioFourImpl implements ScenarioFour { return struct; } + public void exceptionTest() throws ScenarioFourException { + ScenarioFourException exception = new ScenarioFourException(); + exception.setContent(ScenarioFourException.DEFAULT_CONTENT); + throw exception; + } + + public ScenarioFourSdo passScenarioFourStruct(ScenarioFourSdo scenarioFourSdo) { + return scenarioFourSdo; + } + } diff --git a/java/sca/itest/corba/src/test/resources/scenariofour.xsd b/java/sca/itest/corba/src/test/resources/scenariofour.xsd new file mode 100644 index 0000000000..2669b54be3 --- /dev/null +++ b/java/sca/itest/corba/src/test/resources/scenariofour.xsd @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + -- cgit v1.2.3