diff options
Diffstat (limited to 'java/sca/itest/corba')
3 files changed, 37 insertions, 22 deletions
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 7ab5ca1e14..2f3e421392 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 @@ -23,8 +23,6 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; 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; @@ -43,30 +41,16 @@ import org.junit.Test; public class ScenarioFourTestCase { // note that those values are also used in resources/*.composite file - 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, - * obtains SCADomain + * Initial configuration */ @BeforeClass public static void setUp() { try { - try { - server = - new TransientNameServer("localhost", ORB_INITIAL_PORT, TransientNameService.DEFAULT_SERVICE_NAME); - Thread t = server.start(); - if (t == null) { - Assert.fail("The naming server cannot be started"); - } - } catch (Throwable e) { - e.printStackTrace(); - Assert.fail(e.getMessage()); - } // obtain domain domain = SCADomain.newInstance("ScenarioFour.composite"); scenarioFourComponent = domain.getService(ScenarioFourComponent.class, "ScenarioFour"); @@ -77,11 +61,11 @@ public class ScenarioFourTestCase { } /** - * Kills previously spawned name service. + * Test cleanup */ @AfterClass public static void tearDown() { - server.stop(); + // do nothing } /** @@ -133,5 +117,20 @@ public class ScenarioFourTestCase { e.printStackTrace(); fail(); } - } + } + + /** + * Tests reusing local name server with multiple bindings + */ + @Test + public void test_nameServerReuse() { + try { + ScenarioFour scenarioFour = domain.getService(ScenarioFourComponent.class, "ScenarioFourReuse").getScenarioFour(); + ScenarioFourStruct struct = new ScenarioFourStruct(); + scenarioFour.setStruct(struct); + } catch (Exception e) { + e.printStackTrace(); + fail(); + } + } } 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 index 1afda33e35..23b29be7f1 100644 --- 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 @@ -19,6 +19,9 @@ package org.apache.tuscany.sca.test.corba.types; +/** + * Exception for ScenarioFour tests + */ public class ScenarioFourException extends Exception { public static final String DEFAULT_CONTENT = "Test"; diff --git a/java/sca/itest/corba/src/test/resources/ScenarioFour.composite b/java/sca/itest/corba/src/test/resources/ScenarioFour.composite index c13bf7fd79..01d7e2314a 100644 --- a/java/sca/itest/corba/src/test/resources/ScenarioFour.composite +++ b/java/sca/itest/corba/src/test/resources/ScenarioFour.composite @@ -30,13 +30,26 @@ </component>
<service name="ScenarioFour" promote="ScenarioFourService">
<interface.java interface="org.apache.tuscany.sca.test.corba.types.ScenarioFour"/>
- <binding.sca uri="corbaname::localhost:5060#ScenarioFour"/>
+ <binding.sca uri="corbaname::localhost:5080#ScenarioFour"/>
</service>
<component name="ScenarioFour">
<implementation.java class="org.apache.tuscany.sca.test.corba.types.ScenarioFourComponent" />
<reference name="scenarioFour">
- <binding.sca uri="corbaname::localhost:5060#ScenarioFour"/>
+ <binding.sca uri="corbaname::localhost:5080#ScenarioFour"/>
+ </reference>
+ </component>
+
+ <!-- doubled service and reference to test reuse of name server -->
+ <service name="ScenarioFourDoubled" promote="ScenarioFourService">
+ <interface.java interface="org.apache.tuscany.sca.test.corba.types.ScenarioFour"/>
+ <binding.sca uri="corbaname::localhost:5080#ScenarioFourReuse"/>
+ </service>
+
+ <component name="ScenarioFourReuse">
+ <implementation.java class="org.apache.tuscany.sca.test.corba.types.ScenarioFourComponent" />
+ <reference name="scenarioFour">
+ <binding.sca uri="corbaname::localhost:5080#ScenarioFourReuse"/>
</reference>
</component>
|