diff options
Diffstat (limited to 'branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src')
20 files changed, 0 insertions, 1727 deletions
diff --git a/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java b/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java deleted file mode 100644 index 3b5e808d1b..0000000000 --- a/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/FelixTestRuntime.java +++ /dev/null @@ -1,185 +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 org.apache.tuscany.sca.test.osgi.runtime.impl; - -import java.io.File; -import java.util.ArrayList; -import java.util.List; -import java.util.Properties; - -import org.apache.felix.framework.Felix; -import org.apache.felix.main.AutoActivator; -import org.apache.felix.main.Main; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; - -public class FelixTestRuntime extends OSGiTestRuntime implements BundleActivator { - - private static BundleContext bundleContext; - - private static FelixTestRuntime instance; - - private static Felix felix; - - - public static OSGiTestRuntime getInstance() throws Exception { - if (instance == null) { - - FelixTestRuntime runtime = new FelixTestRuntime(); - instance = runtime; - } - return instance; - } - - - private void deleteDirectory(File dir) { - File[] files = dir.listFiles(); - for (int i = 0; i < files.length; i++) { - if (files[i].isDirectory()) - deleteDirectory(files[i]); - else { - files[i].delete(); - } - } - dir.delete(); - - } - - private void deleteProfile() { - String profileDirName = System.getProperty("felix.cache.profiledir"); - if (profileDirName == null) profileDirName = ".felix"; - File profileDir = new File(profileDirName); - if (profileDir.isDirectory()) - deleteDirectory(profileDir); - else - profileDir.delete(); - } - - protected BundleContext startRuntime() throws Exception { - - if (bundleContext != null) - return bundleContext; - - Properties props = Main.loadConfigProperties(); - - deleteProfile(); - // Create profile directory - String profileDirName = System.getProperty("felix.cache.profiledir"); - if (profileDirName == null) profileDirName = ".felix"; - File profileDir = new File(profileDirName); - profileDir.mkdir(); - - props.put("felix.cache.profiledir", profileDir.getAbsolutePath()); - props.put("felix.embedded.execution", "true"); - String systemPackages = - "org.osgi.framework; version=1.3.0," + - "org.osgi.service.packageadmin; version=1.2.0, " + - "org.osgi.service.startlevel; version=1.0.0, " + - "org.osgi.service.url; version=1.0.0, " + - "org.osgi.util.tracker; version=1.3.2, " + - "javax.xml, " + - "javax.xml.datatype, " + - "javax.xml.namespace, " + - "javax.xml.parsers, " + - "javax.xml.transform, " + - "javax.xml.transform.dom, " + - "javax.xml.transform.sax, " + - "javax.xml.transform.stream, " + - "javax.xml.validation, " + - "javax.xml.xpath, " + - "javax.sql," + - "org.w3c.dom, " + - "org.xml.sax, " + - "org.xml.sax.ext, " + - "org.xml.sax.helpers, " + - "javax.security.auth, " + - "javax.security.auth.login, " + - "javax.security.auth.callback, " + - "javax.naming, " + - "javax.naming.spi, " + - "javax.naming.directory, " + - "javax.management, " + - "sun.misc, " + - "javax.net, " + - "javax.crypto, " + - "org.apache.felix.main"; - - - props.put("org.osgi.framework.system.packages", systemPackages); - - List<BundleActivator> activators = new ArrayList<BundleActivator>(); - AutoActivator autoActivator = new AutoActivator(props); - activators.add(autoActivator); - felix = new Felix(props, activators); - ((Bundle)felix).start(); - bundleContext = ((Bundle)felix).getBundleContext(); - - return bundleContext; - - } - - public void start(BundleContext context) throws Exception { - - bundleContext = context; - synchronized (this) { - this.notify(); - } - } - - public void stop(BundleContext context) throws Exception { - bundleContext = null; - } - - - - @Override - public BundleContext getBundleContext() { - return bundleContext; - } - - @Override - protected void setBundleContext(BundleContext bundleContext) { - super.setBundleContext(bundleContext); - FelixTestRuntime.bundleContext = bundleContext; - } - - - @Override - public void shutdown() throws Exception { - - if (bundleContext == null) - return; - - bundleContext = null; - instance = null; - - felix.stop(); - int retries = 50; - synchronized (felix) { - while (retries-- > 0 && felix.getState() != Bundle.UNINSTALLED) { - felix.wait(100); - } - } - - super.shutdown(); - } - - -} diff --git a/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java b/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java deleted file mode 100644 index bb3a263632..0000000000 --- a/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/osgi/runtime/impl/OSGiTestRuntime.java +++ /dev/null @@ -1,109 +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 org.apache.tuscany.sca.test.osgi.runtime.impl; - -import java.lang.reflect.Method; - -import org.osgi.framework.BundleContext; -import org.osgi.framework.BundleException; - -public abstract class OSGiTestRuntime { - - public abstract BundleContext getBundleContext(); - - protected abstract BundleContext startRuntime() throws Exception; - - private static OSGiTestRuntime instance; - - private BundleContext bundleContext; - - - /** - * System property org.apache.tuscany.implementation.osgi.runtime.OSGiRuntime can be set to the - * name of the OSGiRuntime class (eg. EquinoxRuntime). If set, start this runtime and return the - * system bundlecontext. If not set, start Felix from the classpath. - * - * @throws BundleException - */ - public synchronized static OSGiTestRuntime findRuntime() throws Exception { - if (instance != null) { - return instance; - } - String runtimeClassName = System.getProperty(OSGiTestRuntime.class.getName()); - - if (instance != null) - return instance; - - if (runtimeClassName != null) { - try { - Class<?> runtimeClass = OSGiTestRuntime.class.getClassLoader().loadClass(runtimeClassName); - Method method = runtimeClass.getMethod("getInstance"); - instance = (OSGiTestRuntime) method.invoke(null); - return instance; - - } catch (Exception e) { - throw new BundleException("Could not start OSGi runtime " + runtimeClassName, e); - } - } - - instance = FelixTestRuntime.getInstance(); - return instance; - - } - - - public synchronized static OSGiTestRuntime getRuntime() throws Exception { - - instance = findRuntime(); - - if (instance != null) { - - if (instance.bundleContext == null) { - instance.startRuntime(); - instance.bundleContext = instance.getBundleContext(); - } - return instance; - } - return instance; - } - - - public void shutdown() throws Exception { - - bundleContext = null; - if (this == instance) - instance = null; - } - - protected void setBundleContext(BundleContext bundleContext) { - this.bundleContext = bundleContext; - } - - - /** - * @return the instance - */ - public synchronized static void stop() throws Exception { - if (instance != null) { - instance.shutdown(); - instance = null; - } - } - -} diff --git a/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/OSGiRuntimeLoader.java b/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/OSGiRuntimeLoader.java deleted file mode 100644 index 270f589f7c..0000000000 --- a/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/OSGiRuntimeLoader.java +++ /dev/null @@ -1,86 +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 org.apache.tuscany.sca.test.util; - -import org.apache.felix.main.Main; -import org.apache.tuscany.sca.test.osgi.runtime.impl.OSGiTestRuntime; - - - -/** - * OSGi Test Utils : Set up OSGi runtime - */ -public class OSGiRuntimeLoader { - - public static OSGiTestRuntime startOSGiTestRuntime() throws Exception { - - setUpFelixTestRuntime(); - - - System.setProperty("felix.cache.profiledir", ".felix.test"); - - OSGiTestRuntime osgiRuntime = OSGiTestRuntime.getRuntime(); - - System.setProperty("felix.cache.profiledir", ".felix"); - - return osgiRuntime; - - } - - public static void setUpOSGiTestRuntime() throws Exception { - - setUpFelixTestRuntime(); - - } - - - private static void setUpFelixTestRuntime() throws Exception { - - String felixConfigFileName = "file:target/test-classes/felix/felix.config.properties"; - - System.setProperty("felix.config.properties", felixConfigFileName); - - System.setProperty("felix.service.urlhandlers", "false"); - - - try { - String felixDir = Main.class.getProtectionDomain().getCodeSource().getLocation().getPath(); - int index = 0; - if ((index = felixDir.indexOf("/org.apache.felix.main")) >= 0) { - felixDir = felixDir.substring(0, index); - System.setProperty("FELIX_DIR", felixDir); - } - - } catch (Exception e) { - // Ignore - } - - - } - - public static void shutdownOSGiRuntime() { - try { - OSGiTestRuntime.stop(); - - } catch (Exception e) { - // Ignore - } - } - -} diff --git a/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/TuscanyLoader.java b/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/TuscanyLoader.java deleted file mode 100644 index 30be1feee9..0000000000 --- a/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/main/java/org/apache/tuscany/sca/test/util/TuscanyLoader.java +++ /dev/null @@ -1,105 +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 org.apache.tuscany.sca.test.util; - -import java.io.File; -import java.io.FilenameFilter; - -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; - -/** - * Load Tuscany into an OSGi runtime - * - */ -public class TuscanyLoader { - - private static final String scaApiDir = "sca-api"; - private static final String tuscanySpiDir = "tuscany-spi"; - private static final String tuscanyRuntimeDir = "tuscany-runtime"; - private static final String tuscanyExtensionsDir = "tuscany-extensions"; - private static final String thirdPartyDir = "tuscany-3rdparty"; - - private static Bundle tuscanyRuntimeBundle; - - - private static String findBundle(String subDirName) throws Exception { - - File dir = new File("../" + subDirName + "/target"); - if (dir.exists() && dir.isDirectory()) { - File[] files = dir.listFiles(new FilenameFilter() { - - public boolean accept(File dir, String name) { - return name.endsWith(".jar"); - } - - }); - - if (files != null && files.length > 0) - return files[0].toURI().toURL().toString(); - } - return null; - } - - - /** - * Load four Tuscany bundles (API, Core-SPI, Runtime, Extensions) and - * one 3rd party bundle - * - * @param bundleContext - */ - public static Bundle loadTuscanyIntoOSGi(BundleContext bundleContext) throws Exception { - - if (tuscanyRuntimeBundle != null) - return tuscanyRuntimeBundle; - - long startTime = System.currentTimeMillis(); - - String thirdPartyBundleName = findBundle(thirdPartyDir); - Bundle thirdPartyBundle = bundleContext.installBundle(thirdPartyBundleName); - thirdPartyBundle.start(); - - - String scaApiBundleName = findBundle(scaApiDir); - Bundle scaApiBundle = bundleContext.installBundle(scaApiBundleName); - scaApiBundle.start(); - - String tuscanySpiBundleName = findBundle(tuscanySpiDir); - Bundle tuscanySpiBundle = bundleContext.installBundle(tuscanySpiBundleName); - - String tuscanyRuntimeBundleName = findBundle(tuscanyRuntimeDir); - Bundle tuscanyRuntimeBundle = bundleContext.installBundle(tuscanyRuntimeBundleName); - - String tuscanyExtensionsBundleName = findBundle(tuscanyExtensionsDir); - Bundle tuscanyExtensionsBundle = bundleContext.installBundle(tuscanyExtensionsBundleName); - - - tuscanySpiBundle.start(); - tuscanyExtensionsBundle.start(); - - - long endTime = System.currentTimeMillis(); - - System.out.println("Loaded Tuscany, time taken = " + (endTime-startTime) + " ms" ); - - return tuscanyRuntimeBundle; - - } - -} diff --git a/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyTestHarness.java b/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyTestHarness.java deleted file mode 100644 index 5d9ce2bdfe..0000000000 --- a/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/OSGiTuscanyTestHarness.java +++ /dev/null @@ -1,304 +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 org.apache.tuscany.sca.test.osgi.harness; - - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.lang.reflect.Method; -import java.net.URL; -import java.security.AccessController; -import java.security.PrivilegedAction; -import java.util.ArrayList; -import java.util.Enumeration; -import java.util.jar.JarOutputStream; -import java.util.jar.Manifest; -import java.util.zip.ZipEntry; - -import junit.framework.Assert; -import junit.framework.TestCase; -import junit.framework.TestResult; - -import org.apache.tuscany.sca.test.osgi.runtime.impl.OSGiTestRuntime; -import org.apache.tuscany.sca.test.util.OSGiRuntimeLoader; -import org.apache.tuscany.sca.test.util.TuscanyLoader; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; - -/* - * Test Tuscany running in an OSGi container - * Harness can be used to run Tuscany samples with Tuscany running in OSGi - */ -public class OSGiTuscanyTestHarness { - - - private OSGiTestRuntime osgiRuntime; - private Bundle tuscanyRuntime; - private BundleContext bundleContext; - - public void setUp() throws Exception { - - osgiRuntime = OSGiRuntimeLoader.startOSGiTestRuntime(); - bundleContext = osgiRuntime.getBundleContext(); - } - - - public void tearDown() throws Exception { - - if (tuscanyRuntime != null) { - tuscanyRuntime.stop(); - tuscanyRuntime.uninstall(); - } - OSGiRuntimeLoader.shutdownOSGiRuntime(); - } - - - public void runTest(String... testDirs) throws Exception { - - String mainTestDir = testDirs[0]; - - File testDir = new File(mainTestDir + "/target/test-classes"); - if (!testDir.exists()) { - System.err.println("Test directory " + testDir + " does not exist"); - return; - } - - System.out.println("Run tests from : " + mainTestDir); - - tuscanyRuntime = TuscanyLoader.loadTuscanyIntoOSGi(bundleContext); - - String[] dirs = new String[testDirs.length + 2]; - int i = 0; - dirs[i++] = mainTestDir + "/target/test-classes"; - dirs[i++] = "target/test-classes"; - for (int j = 0; j < testDirs.length; j++) { - dirs[i++] = testDirs[j] + "/target/classes"; - } - - String manifestFile = "target/test-classes/META-INF/MANIFEST.MF"; - - Bundle testBundle = createAndInstallBundle( - "file:" + mainTestDir + "/target/classes", // Bundle location: used to get File URLs for DefaultSCADomain - manifestFile, // Test bundle manifest file - dirs // Directory entries to be added to bundle - ); - - - tuscanyRuntime.start(); - - testBundle.start(); - - Class<?> testClass = testBundle.loadClass(this.getClass().getName()); - Method testMethod = testClass.getMethod("runAllTestsFromBundle", Bundle.class); - Object testObject = testClass.newInstance(); - testMethod.invoke(testObject, testBundle); - - testBundle.stop(); - testBundle.uninstall(); - } - - // Create and install a bundle with the specified manifest file - // The bundle contains all files from the list of directories specified - public Bundle createAndInstallBundle(String bundleLocation, String manifestFileName, - String[] dirNames) throws Exception { - - ByteArrayOutputStream out = new ByteArrayOutputStream(); - - File manifestFile = new File(manifestFileName); - Manifest manifest = new Manifest(); - manifest.read(new FileInputStream(manifestFile)); - - JarOutputStream jarOut = new JarOutputStream(out, manifest); - - for (int i = 0; i < dirNames.length; i++) { - File dir = new File(dirNames[i]); - addFilesToJar(dir, dirNames[i], jarOut); - } - - jarOut.close(); - out.close(); - - ByteArrayInputStream inStream = new ByteArrayInputStream(out.toByteArray()); - return bundleContext.installBundle(bundleLocation, inStream); - - } - - // Add all the files from a build directory into a jar file - // This method is used to create bundles on the fly - private void addFilesToJar(File dir, String rootDirName, JarOutputStream jarOut) throws Exception { - - if (dir.getName().equals(".svn")) - return; - - File[] files = dir.listFiles(); - - if (files == null) - return; - - for (int i = 0; i < files.length; i++) { - - if (files[i].isDirectory()) { - addFilesToJar(files[i], rootDirName, jarOut); - } - if (files[i].getName().endsWith("MANIFEST.MF")) - continue; - - String entryName = files[i].getPath().substring(rootDirName.length()+1); - entryName = entryName.replaceAll("\\\\", "/"); - if (files[i].isDirectory()) { - entryName += "/"; - } - ZipEntry ze = new ZipEntry(entryName); - - try { - jarOut.putNextEntry(ze); - FileInputStream file = new FileInputStream(files[i]); - byte[] fileContents = new byte[file.available()]; - file.read(fileContents); - jarOut.write(fileContents); - } catch (Exception e) { - // Ignore duplicate entry errors - } - } - } - - - public void runAllTestsFromBundle(Bundle bundle) throws Exception { - - TestResult testResult = new TestResult(); - Enumeration entries = bundle.findEntries("/", "*TestCase.class", true); - while (entries.hasMoreElements()) { - URL entry = (URL)entries.nextElement(); - String className = entry.getFile(); - className = className.substring(1, className.length()-6); // remove leading / and trailing .class - className = className.replaceAll("/", "."); - Class testClass = bundle.loadClass(className); - boolean isJunitTest = TestCase.class.isAssignableFrom(testClass); - if (testClass.getName().endsWith("TestCase") && - !testClass.getPackage().getName().startsWith("org.apache.tuscany.sca.test.osgi")) { - Object test = (Object)testClass.newInstance(); - - System.out.println("Running test " + test + " "); - int ran = 0; - int failed = 0; - ArrayList<Method> testMethods = new ArrayList<Method>(); - Method setupMethod = null; - Method tearDownMethod = null; - Method setupClassMethod = null; - Method tearDownClassMethod = null; - Method[] methods = testClass.getDeclaredMethods(); - for (final Method method : methods) { - if ((isJunitTest && method.getName().startsWith("test")) - || method.getAnnotation(Test.class) != null) { - testMethods.add(method); - - } - else if ((isJunitTest && method.getName().equals("setUp")) - || method.getAnnotation(Before.class) != null) { - - setupMethod = method; - AccessController.doPrivileged(new PrivilegedAction<Object>() { - public Object run() { - method.setAccessible(true); - return null; - } - }); - - } - else if ((isJunitTest && method.getName().equals("tearDown")) - || method.getAnnotation(After.class) != null) { - - tearDownMethod = method; - AccessController.doPrivileged(new PrivilegedAction<Object>() { - public Object run() { - method.setAccessible(true); - return null; - } - }); - - } - else if (method.getAnnotation(BeforeClass.class) != null) { - - setupClassMethod = method; - AccessController.doPrivileged(new PrivilegedAction<Object>() { - public Object run() { - method.setAccessible(true); - return null; - } - }); - - } - else if (method.getAnnotation(AfterClass.class) != null) { - - tearDownClassMethod = method; - AccessController.doPrivileged(new PrivilegedAction<Object>() { - public Object run() { - method.setAccessible(true); - return null; - } - }); - - } - } - try { - if (setupClassMethod != null) - setupClassMethod.invoke(null); - for (Method testMethod : testMethods) { - - ran++; - failed++; - try { - if (setupMethod != null) - setupMethod.invoke(test); - - testMethod.invoke(test); - failed--; - - } catch (Exception e) { - e.printStackTrace(); - throw e; - } finally { - if (tearDownMethod != null) - tearDownMethod.invoke(test); - } - } - } catch (Exception e) { - e.printStackTrace(); - throw e; - } finally { - - System.out.println("Ran: " + ran + ", Passed: " + (ran-failed) + ", Failed: " + failed); - if (tearDownClassMethod != null) - tearDownClassMethod.invoke(null); - } - } - - } - - Assert.assertEquals(0, testResult.errorCount()); - - } -} diff --git a/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/TestBundleActivator.java b/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/TestBundleActivator.java deleted file mode 100644 index a354ae0443..0000000000 --- a/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/harness/TestBundleActivator.java +++ /dev/null @@ -1,38 +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 org.apache.tuscany.sca.test.osgi.harness; - -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; - - -/* - * Bundle activator for running the Tuscany SCA tests under OSGi - */ -public class TestBundleActivator implements BundleActivator { - - public void start(BundleContext bundleContext) throws Exception { - - } - - public void stop(BundleContext bundleContext) throws Exception { - } - -} diff --git a/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorImplementationPoliciesTestCase.java b/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorImplementationPoliciesTestCase.java deleted file mode 100644 index 179ca9ac53..0000000000 --- a/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorImplementationPoliciesTestCase.java +++ /dev/null @@ -1,61 +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 org.apache.tuscany.sca.test.osgi.tuscany; - - -import org.apache.tuscany.sca.test.osgi.harness.OSGiTuscanyTestHarness; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -/* - * Test Tuscany running in an OSGi container - * - * Run samples-calculator-implementation-policies - */ -public class CalculatorImplementationPoliciesTestCase { - - - private OSGiTuscanyTestHarness testHarness; - - @Before - public void setUp() throws Exception { - - testHarness = new OSGiTuscanyTestHarness(); - testHarness.setUp(); - } - - - @After - public void tearDown() throws Exception { - - if (testHarness != null) { - testHarness.tearDown(); - } - } - - - @Test - public void runTest() throws Exception { - - testHarness.runTest("../../../samples/" + "calculator-implementation-policies"); - - } - -} diff --git a/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorRmiTestCase.java b/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorRmiTestCase.java deleted file mode 100644 index 067071e93c..0000000000 --- a/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorRmiTestCase.java +++ /dev/null @@ -1,62 +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 org.apache.tuscany.sca.test.osgi.tuscany; - - -import org.apache.tuscany.sca.test.osgi.harness.OSGiTuscanyTestHarness; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -/* - * Test Tuscany running in an OSGi container - * - * Run samples-calculator-rmi-reference and samples-calculator-rmi-service - */ -public class CalculatorRmiTestCase { - - - private OSGiTuscanyTestHarness testHarness; - - @Before - public void setUp() throws Exception { - - testHarness = new OSGiTuscanyTestHarness(); - testHarness.setUp(); - } - - - @After - public void tearDown() throws Exception { - - if (testHarness != null) { - testHarness.tearDown(); - } - } - - - @Test - public void runTest() throws Exception { - - testHarness.runTest("../../../samples/" + "calculator-rmi-reference"); - testHarness.runTest("../../../samples/" + "calculator-rmi-service"); - - } - -} diff --git a/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorScriptTestCase.java b/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorScriptTestCase.java deleted file mode 100644 index f3dd7c2392..0000000000 --- a/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CalculatorScriptTestCase.java +++ /dev/null @@ -1,61 +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 org.apache.tuscany.sca.test.osgi.tuscany; - - -import org.apache.tuscany.sca.test.osgi.harness.OSGiTuscanyTestHarness; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -/* - * Test Tuscany running in an OSGi container - * - * Run samples-calculator-script - */ -public class CalculatorScriptTestCase { - - - private OSGiTuscanyTestHarness testHarness; - - @Before - public void setUp() throws Exception { - - testHarness = new OSGiTuscanyTestHarness(); - testHarness.setUp(); - } - - - @After - public void tearDown() throws Exception { - - if (testHarness != null) { - testHarness.tearDown(); - } - } - - - @Test - public void runTest() throws Exception { - - testHarness.runTest("../../../samples/" + "calculator-script"); - - } - -} diff --git a/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsClientTestCase.java b/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsClientTestCase.java deleted file mode 100644 index acdc14153c..0000000000 --- a/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsClientTestCase.java +++ /dev/null @@ -1,61 +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 org.apache.tuscany.sca.test.osgi.tuscany; - - -import org.apache.tuscany.sca.test.osgi.harness.OSGiTuscanyTestHarness; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -/* - * Test Tuscany running in an OSGi container - * - * Run samples-callback-ws - */ -public class CallbackWsClientTestCase { - - - private OSGiTuscanyTestHarness testHarness; - - @Before - public void setUp() throws Exception { - - testHarness = new OSGiTuscanyTestHarness(); - testHarness.setUp(); - } - - - @After - public void tearDown() throws Exception { - - if (testHarness != null) { - testHarness.tearDown(); - } - } - - - @Test - public void runTest() throws Exception { - - testHarness.runTest("../../../samples/" + "callback-ws-client", - "../../../samples/" + "callback-ws-service"); - } - -} diff --git a/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsServiceTestCase.java b/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsServiceTestCase.java deleted file mode 100644 index d009ab116f..0000000000 --- a/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/CallbackWsServiceTestCase.java +++ /dev/null @@ -1,61 +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 org.apache.tuscany.sca.test.osgi.tuscany; - - -import org.apache.tuscany.sca.test.osgi.harness.OSGiTuscanyTestHarness; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -/* - * Test Tuscany running in an OSGi container - * - * Run samples-callback-ws - */ -public class CallbackWsServiceTestCase { - - - private OSGiTuscanyTestHarness testHarness; - - @Before - public void setUp() throws Exception { - - testHarness = new OSGiTuscanyTestHarness(); - testHarness.setUp(); - } - - - @After - public void tearDown() throws Exception { - - if (testHarness != null) { - testHarness.tearDown(); - } - } - - - @Test - public void runTest() throws Exception { - - testHarness.runTest("../../../samples/" + "callback-ws-service"); - - } - -} diff --git a/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceJmsTestCase.java b/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceJmsTestCase.java deleted file mode 100644 index 44fcd77036..0000000000 --- a/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceJmsTestCase.java +++ /dev/null @@ -1,61 +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 org.apache.tuscany.sca.test.osgi.tuscany; - - -import org.apache.tuscany.sca.test.osgi.harness.OSGiTuscanyTestHarness; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -/* - * Test Tuscany running in an OSGi container - * - * Run samples-helloworld-ws-service-jms - */ -public class HelloworldWsServiceJmsTestCase { - - - private OSGiTuscanyTestHarness testHarness; - - @Before - public void setUp() throws Exception { - - testHarness = new OSGiTuscanyTestHarness(); - testHarness.setUp(); - } - - - @After - public void tearDown() throws Exception { - - if (testHarness != null) { - testHarness.tearDown(); - } - } - - - @Test - public void runTest() throws Exception { - - testHarness.runTest("../../../samples/" + "helloworld-ws-service-jms"); - - } - -} diff --git a/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceSecureTestCase.java b/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceSecureTestCase.java deleted file mode 100644 index c3d7237470..0000000000 --- a/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceSecureTestCase.java +++ /dev/null @@ -1,61 +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 org.apache.tuscany.sca.test.osgi.tuscany; - - -import org.apache.tuscany.sca.test.osgi.harness.OSGiTuscanyTestHarness; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -/* - * Test Tuscany running in an OSGi container - * - * Run samples-helloworld-ws-service-secure - */ -public class HelloworldWsServiceSecureTestCase { - - - private OSGiTuscanyTestHarness testHarness; - - @Before - public void setUp() throws Exception { - - testHarness = new OSGiTuscanyTestHarness(); - testHarness.setUp(); - } - - - @After - public void tearDown() throws Exception { - - if (testHarness != null) { - testHarness.tearDown(); - } - } - - - @Test - public void runTest() throws Exception { - - testHarness.runTest("../../../samples/" + "helloworld-ws-service-secure"); - - } - -} diff --git a/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceTestCase.java b/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceTestCase.java deleted file mode 100644 index 6a4553bdb6..0000000000 --- a/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/HelloworldWsServiceTestCase.java +++ /dev/null @@ -1,61 +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 org.apache.tuscany.sca.test.osgi.tuscany; - - -import org.apache.tuscany.sca.test.osgi.harness.OSGiTuscanyTestHarness; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -/* - * Test Tuscany running in an OSGi container - * - * Run samples-helloworld-ws-service - */ -public class HelloworldWsServiceTestCase { - - - private OSGiTuscanyTestHarness testHarness; - - @Before - public void setUp() throws Exception { - - testHarness = new OSGiTuscanyTestHarness(); - testHarness.setUp(); - } - - - @After - public void tearDown() throws Exception { - - if (testHarness != null) { - testHarness.tearDown(); - } - } - - - @Test - public void runTest() throws Exception { - - testHarness.runTest("../../../samples/" + "helloworld-ws-service"); - - } - -} diff --git a/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiSupplyChainTestCase.java b/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiSupplyChainTestCase.java deleted file mode 100644 index 6ab92ffc5a..0000000000 --- a/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiSupplyChainTestCase.java +++ /dev/null @@ -1,61 +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 org.apache.tuscany.sca.test.osgi.tuscany; - - -import org.apache.tuscany.sca.test.osgi.harness.OSGiTuscanyTestHarness; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -/* - * Test Tuscany running in an OSGi container - * - * Run samples-osgi-supplychain - */ -public class OSGiSupplyChainTestCase { - - - private OSGiTuscanyTestHarness testHarness; - - @Before - public void setUp() throws Exception { - - testHarness = new OSGiTuscanyTestHarness(); - testHarness.setUp(); - } - - - @After - public void tearDown() throws Exception { - - if (testHarness != null) { - testHarness.tearDown(); - } - } - - - @Test - public void runTest() throws Exception { - - testHarness.runTest("../../../samples/" + "osgi-supplychain"); - - } - -} diff --git a/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiTuscanyRuntimeTestCase.java b/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiTuscanyRuntimeTestCase.java deleted file mode 100644 index 6bbac4c72d..0000000000 --- a/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/OSGiTuscanyRuntimeTestCase.java +++ /dev/null @@ -1,115 +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 org.apache.tuscany.sca.test.osgi.tuscany; - - -import java.io.File; -import java.lang.reflect.Method; -import java.net.URL; - -import org.apache.tuscany.sca.test.osgi.runtime.impl.OSGiTestRuntime; -import org.apache.tuscany.sca.test.util.OSGiRuntimeLoader; -import org.apache.tuscany.sca.test.util.TuscanyLoader; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.osgi.framework.Bundle; -import org.osgi.framework.ServiceReference; - -/* - * Test Tuscany running inside OSGi - */ -public class OSGiTuscanyRuntimeTestCase { - - private OSGiTestRuntime osgiRuntime; - private Bundle tuscanyRuntime; - - - @Before - public void setUp() throws Exception { - - osgiRuntime = OSGiRuntimeLoader.startOSGiTestRuntime(); - } - - - @After - public void tearDown() throws Exception { - - if (tuscanyRuntime != null) { - tuscanyRuntime.stop(); - tuscanyRuntime.uninstall(); - } - OSGiRuntimeLoader.shutdownOSGiRuntime(); - } - - - - @Test - public void startTuscanyRuntimeInOSGi() throws Exception { - - tuscanyRuntime = TuscanyLoader.loadTuscanyIntoOSGi(osgiRuntime.getBundleContext()); - Assert.assertNotNull(tuscanyRuntime); - tuscanyRuntime.start(); - Class<?> clazz = tuscanyRuntime.loadClass("org.apache.tuscany.sca.osgi.runtime.OSGiRuntime"); - Assert.assertNotNull(clazz); - - } - - @Test - public void testOSGiTuscany_ImplementationJava() throws Exception { - testOSGiTuscanyUsingOSGiClient("SupplyChain.jar"); - } - - @Test - public void testOSGiTuscany_BindingWS() throws Exception { - testOSGiTuscanyUsingOSGiClient("SupplyChainWS.jar"); - } - - - private void testOSGiTuscanyUsingOSGiClient(String contributionJarName) throws Exception { - - tuscanyRuntime = TuscanyLoader.loadTuscanyIntoOSGi(osgiRuntime.getBundleContext()); - tuscanyRuntime.start(); - - String folderName = "../test-bundles/target/"; - String supplychainJarName = contributionJarName; - String supplychainClientJarName = "SupplyChainClient.jar"; - URL supplyChainURL = new File(folderName + supplychainJarName).toURI().toURL(); - URL supplyChainClientURL = new File(folderName + supplychainClientJarName).toURI().toURL(); - - Bundle supplyChainBundle = osgiRuntime.getBundleContext().installBundle(supplyChainURL.toString()); - supplyChainBundle.start(); - Bundle clientBundle = osgiRuntime.getBundleContext().installBundle(supplyChainClientURL.toString()); - clientBundle.start(); - - String clientClassName = "supplychain.client.SupplyChainClient"; - Class<?> clientClass = clientBundle.loadClass(clientClassName); - ServiceReference testServiceRef = clientBundle.getBundleContext().getServiceReference(clientClassName); - Object testService = clientBundle.getBundleContext().getService(testServiceRef); - - Method m = clientClass.getMethod("runTest", String.class); - m.invoke(testService, contributionJarName); - - System.out.println("OSGi Client test completed successfully."); - } - - - -} diff --git a/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySampleExtensionsTestCase.java b/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySampleExtensionsTestCase.java deleted file mode 100644 index 99748739f6..0000000000 --- a/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySampleExtensionsTestCase.java +++ /dev/null @@ -1,93 +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 org.apache.tuscany.sca.test.osgi.tuscany; - - -import org.apache.tuscany.sca.test.osgi.harness.OSGiTuscanyTestHarness; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -/* - * Test Tuscany running in an OSGi container - * - * Run samples which use provide Tuscany extensions - */ -public class TuscanySampleExtensionsTestCase { - - private OSGiTuscanyTestHarness testHarness; - - @Before - public void setUp() throws Exception { - - testHarness = new OSGiTuscanyTestHarness(); - testHarness.setUp(); - } - - - @After - public void tearDown() throws Exception { - - if (testHarness != null) { - testHarness.tearDown(); - testHarness = null; - } - } - - - @Test - public void testBindingEchoExtension() throws Exception { - - testHarness.runTest("../../../samples/" + "binding-echo-extension"); - } - - @Test - public void testBindingEcho() throws Exception { - - testHarness.runTest("../../../samples/" + "binding-echo", "../../../samples/" + "binding-echo-extension"); - - } - - @Test - public void testDataBindingEcho() throws Exception { - - testHarness.runTest("../../../samples/" + "databinding-echo", "../../../samples/" + "binding-echo-extension"); - - } - - @Test - public void testImplementationCrudExtension() throws Exception { - - testHarness.runTest("../../../samples/" + "implementation-crud-extension"); - } - - @Test - public void testImplementationCrud() throws Exception { - - testHarness.runTest("../../../samples/" + "implementation-crud", "../../../samples/" + "implementation-crud-extension"); - - } - - @Test - public void testImplementationPojoExtension() throws Exception { - - testHarness.runTest("../../../samples/" + "implementation-pojo-extension"); - } - -} diff --git a/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySamplesUsingOldDomainTestCase.java b/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySamplesUsingOldDomainTestCase.java deleted file mode 100644 index 6f459face6..0000000000 --- a/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/java/org/apache/tuscany/sca/test/osgi/tuscany/TuscanySamplesUsingOldDomainTestCase.java +++ /dev/null @@ -1,80 +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 org.apache.tuscany.sca.test.osgi.tuscany; - - -import org.apache.tuscany.sca.test.osgi.harness.OSGiTuscanyTestHarness; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -/* - * Test Tuscany running in an OSGi container - * - * Run samples which use old domain code - */ -public class TuscanySamplesUsingOldDomainTestCase { - - - private static String[] SAMPLES = { - - "binding-notification-consumer", - "binding-notification-producer", - "calculator", - "implementation-composite", - "implementation-notification", - "loanapplication", - "quote-xquery", - "simple-bigbank", - "simple-callback", - "supplychain" - - }; - - - private OSGiTuscanyTestHarness testHarness; - - @Before - public void setUp() throws Exception { - - testHarness = new OSGiTuscanyTestHarness(); - testHarness.setUp(); - } - - - @After - public void tearDown() throws Exception { - - if (testHarness != null) { - testHarness.tearDown(); - testHarness = null; - } - } - - - @Test - public void runTestsUsingOldDomainCode() throws Exception { - - for (String testDir : SAMPLES) { - testHarness.runTest("../../../samples/" + testDir); - } - } - - -} diff --git a/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF b/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF deleted file mode 100644 index e1ea45120f..0000000000 --- a/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/META-INF/MANIFEST.MF +++ /dev/null @@ -1,17 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: tuscany.sca.samples -Bundle-SymbolicName: org.apache.tuscany.sca.test.samples -Bundle-Version: 1.0.0 -Bundle-Localization: plugin -Import-Package: org.osgi.framework, - junit.framework, - org.junit, - org.apache.tuscany.sca.host.embedded, - org.osoa.sca, - org.osoa.sca.annotations, - org.apache.tuscany.sca.databinding.annotation, - org.apache.tuscany.sca.domain, - org.apache.tuscany.sca.node -DynamicImport-Package: * -Bundle-Activator: org.apache.tuscany.sca.test.osgi.harness.TestBundleActivator diff --git a/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties b/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties deleted file mode 100644 index 51ce909cbd..0000000000 --- a/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties +++ /dev/null @@ -1,45 +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. -# -# -# Framework config properties. -# -org.osgi.framework.system.packages=org.osgi.framework; version=1.3.0, \ - org.osgi.service.packageadmin; version=1.2.0, \ - org.osgi.service.startlevel; version=1.0.0, \ - org.osgi.service.url; version=1.0.0 \ - org.osgi.util.tracker; version=1.3.2 - - -felix.auto.start.1= \ - "file://${FELIX_DIR}/org.apache.felix.scr/1.0.0/org.apache.felix.scr-1.0.0.jar" - -# "file://${FELIX_DIR}/org.apache.felix.configadmin/1.0.0/org.apache.felix.configadmin-1.0.0.jar" -# "file://${FELIX_DIR}/org.apache.felix.shell/1.1.0-SNAPSHOT/org.apache.felix.shell-1.1.0-SNAPSHOT.jar" \ -# "file://${FELIX_DIR}/org.apache.felix.shell.tui/1.1.0-SNAPSHOT/org.apache.felix.shell.tui-1.1.0-SNAPSHOT.jar" \ -# "file://${FELIX_DIR}/org.apache.felix.bundlerepository/1.1.0-SNAPSHOT/org.apache.felix.bundlerepository-1.1.0-SNAPSHOT.jar" \ - - -felix.startlevel.framework=1 -felix.startlevel.bundle=1 - -# -# Bundle config properties. -# -org.osgi.service.http.port=8080 -obr.shell.telnet=on |