Branch for 1.5.1

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@791397 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 236 insertions, 0 deletions

diff --git a/branches/sca-java-1.5.1/samples/helloworld-service-erlang/src/test/java/helloworld/HelloWorldErlangServerTestCase.java b/branches/sca-java-1.5.1/samples/helloworld-service-erlang/src/test/java/helloworld/HelloWorldErlangServerTestCase.java
new file mode 100644
index 0000000000..7f7d78c50d
--- /dev/null
+++ b/branches/sca-java-1.5.1/samples/helloworld-service-erlang/src/test/java/helloworld/HelloWorldErlangServerTestCase.java
@@ -0,0 +1,68 @@
+/*

+ * 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 helloworld;

+

+import static junit.framework.Assert.assertEquals;

+import static junit.framework.Assert.assertNotNull;

+

+import helloworld.dynaignore.IgnorableRunner;

+import helloworld.dynaignore.IgnoreTest;

+

+import java.io.IOException;

+

+import org.apache.tuscany.sca.host.embedded.SCADomain;

+import org.junit.Test;

+import org.junit.runner.RunWith;

+

+

+

+/**

+ * Tests that the helloworld server is available

+ */

+@RunWith(IgnorableRunner.class)

+public class HelloWorldErlangServerTestCase {

+

+	private static final String EPMD_COMMAND = "epmd";

+

+	@Test

+	public void testServiceCall() throws IOException {

+		Process epmdProcess = null;

+		try {

+			epmdProcess = Runtime.getRuntime().exec(EPMD_COMMAND);

+		} catch (Exception e) {

+			System.out

+					.println("Cannot proceed - exception while executing "

+							+ EPMD_COMMAND

+							+ ": "

+							+ e.getMessage()

+							+ ". Valid and working Erlang/OTP distribution is required.");

+			throw new IgnoreTest();

+		}

+		SCADomain scaDomain = SCADomain

+				.newInstance("helloworlderlangservice.composite");

+		HelloWorldService helloWorldService = scaDomain.getService(

+				HelloWorldService.class,

+				"HelloWorldServiceComponent/HelloWorldService");

+		assertNotNull(helloWorldService);

+		assertEquals("Hello Smith", helloWorldService.getGreetings("Smith"));

+		scaDomain.close();

+		epmdProcess.destroy();

+	}

+

+}

diff --git a/branches/sca-java-1.5.1/samples/helloworld-service-erlang/src/test/java/helloworld/dynaignore/IgnorableRunner.java b/branches/sca-java-1.5.1/samples/helloworld-service-erlang/src/test/java/helloworld/dynaignore/IgnorableRunner.java
new file mode 100644
index 0000000000..6943c1df80
--- /dev/null
+++ b/branches/sca-java-1.5.1/samples/helloworld-service-erlang/src/test/java/helloworld/dynaignore/IgnorableRunner.java
@@ -0,0 +1,139 @@
+/*
+ * 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 helloworld.dynaignore;
+
+import org.junit.runner.Description;
+import org.junit.runner.Result;
+import org.junit.runner.Runner;
+import org.junit.runner.notification.Failure;
+import org.junit.runner.notification.RunListener;
+import org.junit.runner.notification.RunNotifier;
+import org.junit.runner.notification.StoppedByUserException;
+import org.junit.runners.BlockJUnit4ClassRunner;
+import org.junit.runners.model.InitializationError;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class IgnorableRunner extends Runner {
+
+	private static final class Notifier extends RunNotifier {
+		private final RunNotifier notifier;
+
+		public Notifier(final RunNotifier notifier) {
+			this.notifier = notifier;
+		}
+
+		public void addFirstListener(final RunListener listener) {
+			notifier.addFirstListener(listener);
+		}
+
+		public void addListener(final RunListener listener) {
+			notifier.addListener(listener);
+		}
+
+		@Override
+		public boolean equals(final Object obj) {
+			return notifier.equals(obj);
+		}
+
+		@Override
+		public void fireTestFailure(final Failure failure) {
+			if (failure.getException().getClass() == IgnoreTest.class) {
+				notifier.fireTestIgnored(failure.getDescription());
+			} else {
+				notifier.fireTestFailure(failure);
+			}
+		}
+
+		@Override
+		public void fireTestFinished(final Description description) {
+			notifier.fireTestFinished(description);
+		}
+
+		@Override
+		public void fireTestIgnored(final Description description) {
+			notifier.fireTestIgnored(description);
+		}
+
+		@Override
+		public void fireTestRunFinished(final Result result) {
+			notifier.fireTestRunFinished(result);
+		}
+
+		@Override
+		public void fireTestRunStarted(final Description description) {
+			notifier.fireTestRunStarted(description);
+		}
+
+		@Override
+		public void fireTestStarted(final Description description)
+				throws StoppedByUserException {
+			notifier.fireTestStarted(description);
+		}
+
+		@Override
+		public int hashCode() {
+			return notifier.hashCode();
+		}
+
+		@Override
+		public void pleaseStop() {
+			notifier.pleaseStop();
+		}
+
+		@Override
+		public void removeListener(final RunListener listener) {
+			notifier.removeListener(listener);
+		}
+
+		public void testAborted(final Description description,
+				final Throwable cause) {
+			((Notifier) notifier).testAborted(description, cause);
+		}
+
+		@Override
+		public String toString() {
+			return notifier.toString();
+		}
+
+	}
+
+	Runner runner = null;
+
+	public IgnorableRunner(Class<?> testClass) {
+		try {
+			runner = new BlockJUnit4ClassRunner(testClass);
+		} catch (InitializationError e) {
+			e.printStackTrace();
+		}
+	}
+
+	@Override
+	public Description getDescription() {
+		return runner.getDescription();
+	}
+
+	@Override
+	public void run(RunNotifier notifier) {
+		runner.run(new Notifier(notifier));
+	}
+
+}
diff --git a/branches/sca-java-1.5.1/samples/helloworld-service-erlang/src/test/java/helloworld/dynaignore/IgnoreTest.java b/branches/sca-java-1.5.1/samples/helloworld-service-erlang/src/test/java/helloworld/dynaignore/IgnoreTest.java
new file mode 100644
index 0000000000..99d961bdea
--- /dev/null
+++ b/branches/sca-java-1.5.1/samples/helloworld-service-erlang/src/test/java/helloworld/dynaignore/IgnoreTest.java
@@ -0,0 +1,29 @@
+/*
+ * 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 helloworld.dynaignore;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public final class IgnoreTest extends Error {
+
+	private static final long serialVersionUID = 1L;
+
+}