From 22dd2ce77421ca588d903c6af921ef0daa1be37a Mon Sep 17 00:00:00 2001 From: edwardsmj Date: Thu, 11 Dec 2008 23:38:59 +0000 Subject: Changed Name of the Base TestCase to conform to JUnit naming conventions git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@725856 13f79535-47bb-0310-9956-ffa450edef68 --- .../sampleTest/src/test/java/client/BaseTest.java | 122 --------------------- .../src/test/java/client/BaseTestCase.java | 122 +++++++++++++++++++++ .../src/test/java/client/Test_ASM_0002.java | 2 +- .../src/test/java/client/Test_ASM_0003.java | 2 +- .../src/test/java/client/Test_ASM_0004.java | 2 +- 5 files changed, 125 insertions(+), 125 deletions(-) delete mode 100644 java/sca/stest/sampleTest/src/test/java/client/BaseTest.java create mode 100644 java/sca/stest/sampleTest/src/test/java/client/BaseTestCase.java (limited to 'java/sca/stest/sampleTest') diff --git a/java/sca/stest/sampleTest/src/test/java/client/BaseTest.java b/java/sca/stest/sampleTest/src/test/java/client/BaseTest.java deleted file mode 100644 index 8c373beb61..0000000000 --- a/java/sca/stest/sampleTest/src/test/java/client/BaseTest.java +++ /dev/null @@ -1,122 +0,0 @@ -/* - * 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 client; - -import static org.junit.Assert.*; - -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.equinox.launcher.Contribution; -import org.apache.tuscany.sca.node.equinox.launcher.ContributionLocationHelper; -import org.apache.tuscany.sca.node.equinox.launcher.NodeLauncher; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.osoa.sca.annotations.Reference; - -import test.ASM_0001_Client; -import test.TestInvocation; - -/** - * A generic test client based on Tuscany APIs - */ -public class BaseTest { - - protected NodeLauncher launcher; - protected Node node; - protected TestConfiguration testConfiguration = getTestConfiguration(); - - public static void main(String[] args) throws Exception { - BaseTest test = new BaseTest(); - test.setUp(); - test.tearDown(); - } - - @Before - public void setUp() throws Exception { - startContribution(); - } - - @After - public void tearDown() throws Exception { - stopContribution(); - } - - @Test - public void testDummy() throws Exception { - // System.out.println("Test " + testName + " starting"); - try { - String output = invokeTest( testConfiguration.getInput() ); - assertEquals( output, testConfiguration.getExpectedOutput() ); - } catch (Exception e) { - assertEquals( "exception", testConfiguration.getExpectedOutput() ); - System.out.println( "Expected exception - detail: " + e.getMessage() ); - } - System.out.println("Test " + testConfiguration.getTestName() + " completed successfully"); - } - - public String invokeTest( String input ) { - - TestInvocation service = (TestInvocation) getService( testConfiguration.getServiceInterface(), - testConfiguration.getTestServiceName() ); - - return service.invokeTest( input ); - } // end method invokeTest - - protected T getService( Class interfaze, String serviceName ) { - T service = node.getService( interfaze, serviceName ); - return service; - } // end getService - - protected void startContribution() throws Exception { - // Tuscany specific code which starts the contribution holding the test - launcher = NodeLauncher.newInstance(); - node = launcher.createNode(testConfiguration.getComposite(), - new Contribution(testConfiguration.getTestName(), getContributionURI())); - System.out.println("SCA Node API ClassLoader: " + node.getClass().getClassLoader()); - node.start(); - } // end method startContribution - - protected void stopContribution() throws Exception { - if (node != null) { - node.stop(); - node.destroy(); - } - if (launcher != null) { - launcher.destroy(); - } - } // end method stopContribution - - protected String getContributionURI() { - String location = ContributionLocationHelper.getContributionLocation(testConfiguration.getTestClass()); - return location; - } - - protected TestConfiguration getTestConfiguration() { - TestConfiguration config = new TestConfiguration(); - config.testName = "ASM_0001"; - config.input = "request"; - config.output = config.testName + " " + config.input + " invoked ok"; - config.composite = "Test_ASM_0001.composite"; - config.testServiceName = "TestClient"; - config.testClass = ASM_0001_Client.class; - config.serviceInterface = TestInvocation.class; - return config; - } - -} // end class BaseTest diff --git a/java/sca/stest/sampleTest/src/test/java/client/BaseTestCase.java b/java/sca/stest/sampleTest/src/test/java/client/BaseTestCase.java new file mode 100644 index 0000000000..f20f2923aa --- /dev/null +++ b/java/sca/stest/sampleTest/src/test/java/client/BaseTestCase.java @@ -0,0 +1,122 @@ +/* + * 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 client; + +import static org.junit.Assert.*; + +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.equinox.launcher.Contribution; +import org.apache.tuscany.sca.node.equinox.launcher.ContributionLocationHelper; +import org.apache.tuscany.sca.node.equinox.launcher.NodeLauncher; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.osoa.sca.annotations.Reference; + +import test.ASM_0001_Client; +import test.TestInvocation; + +/** + * A generic test client based on Tuscany APIs + */ +public class BaseTestCase { + + protected NodeLauncher launcher; + protected Node node; + protected TestConfiguration testConfiguration = getTestConfiguration(); + + public static void main(String[] args) throws Exception { + BaseTestCase test = new BaseTestCase(); + test.setUp(); + test.tearDown(); + } + + @Before + public void setUp() throws Exception { + startContribution(); + } + + @After + public void tearDown() throws Exception { + stopContribution(); + } + + @Test + public void testDummy() throws Exception { + // System.out.println("Test " + testName + " starting"); + try { + String output = invokeTest( testConfiguration.getInput() ); + assertEquals( output, testConfiguration.getExpectedOutput() ); + } catch (Exception e) { + assertEquals( "exception", testConfiguration.getExpectedOutput() ); + System.out.println( "Expected exception - detail: " + e.getMessage() ); + } + System.out.println("Test " + testConfiguration.getTestName() + " completed successfully"); + } + + public String invokeTest( String input ) { + + TestInvocation service = (TestInvocation) getService( testConfiguration.getServiceInterface(), + testConfiguration.getTestServiceName() ); + + return service.invokeTest( input ); + } // end method invokeTest + + protected T getService( Class interfaze, String serviceName ) { + T service = node.getService( interfaze, serviceName ); + return service; + } // end getService + + protected void startContribution() throws Exception { + // Tuscany specific code which starts the contribution holding the test + launcher = NodeLauncher.newInstance(); + node = launcher.createNode(testConfiguration.getComposite(), + new Contribution(testConfiguration.getTestName(), getContributionURI())); + System.out.println("SCA Node API ClassLoader: " + node.getClass().getClassLoader()); + node.start(); + } // end method startContribution + + protected void stopContribution() throws Exception { + if (node != null) { + node.stop(); + node.destroy(); + } + if (launcher != null) { + launcher.destroy(); + } + } // end method stopContribution + + protected String getContributionURI() { + String location = ContributionLocationHelper.getContributionLocation(testConfiguration.getTestClass()); + return location; + } + + protected TestConfiguration getTestConfiguration() { + TestConfiguration config = new TestConfiguration(); + config.testName = "ASM_0001"; + config.input = "request"; + config.output = config.testName + " " + config.input + " invoked ok"; + config.composite = "Test_ASM_0001.composite"; + config.testServiceName = "TestClient"; + config.testClass = ASM_0001_Client.class; + config.serviceInterface = TestInvocation.class; + return config; + } + +} // end class BaseTest diff --git a/java/sca/stest/sampleTest/src/test/java/client/Test_ASM_0002.java b/java/sca/stest/sampleTest/src/test/java/client/Test_ASM_0002.java index 10c1b78608..cafabb78eb 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/Test_ASM_0002.java +++ b/java/sca/stest/sampleTest/src/test/java/client/Test_ASM_0002.java @@ -25,7 +25,7 @@ import test.TestInvocation; /** * A generic test client based on Tuscany APIs */ -public class Test_ASM_0002 extends BaseTest { +public class Test_ASM_0002 extends BaseTestCase { protected TestConfiguration getTestConfiguration() { diff --git a/java/sca/stest/sampleTest/src/test/java/client/Test_ASM_0003.java b/java/sca/stest/sampleTest/src/test/java/client/Test_ASM_0003.java index e68c2acbbb..c459a1188e 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/Test_ASM_0003.java +++ b/java/sca/stest/sampleTest/src/test/java/client/Test_ASM_0003.java @@ -25,7 +25,7 @@ import test.TestInvocation; /** * A generic test client based on Tuscany APIs */ -public class Test_ASM_0003 extends BaseTest { +public class Test_ASM_0003 extends BaseTestCase { protected TestConfiguration getTestConfiguration() { diff --git a/java/sca/stest/sampleTest/src/test/java/client/Test_ASM_0004.java b/java/sca/stest/sampleTest/src/test/java/client/Test_ASM_0004.java index 78a9cac2ab..0189f409d4 100644 --- a/java/sca/stest/sampleTest/src/test/java/client/Test_ASM_0004.java +++ b/java/sca/stest/sampleTest/src/test/java/client/Test_ASM_0004.java @@ -25,7 +25,7 @@ import test.TestInvocation; /** * A generic test client based on Tuscany APIs */ -public class Test_ASM_0004 extends BaseTest { +public class Test_ASM_0004 extends BaseTestCase { protected TestConfiguration getTestConfiguration() { -- cgit v1.2.3