From d5f1d093fe6fa491cdec392dca7137639e98d149 Mon Sep 17 00:00:00 2001 From: jsdelfino Date: Mon, 15 Sep 2008 00:26:00 +0000 Subject: Pulled a recent revision of trunk into the sca-android branch, to apply the android patches from JIRA TUSCANY-2440 to it. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@695318 13f79535-47bb-0310-9956-ffa450edef68 --- .../vtest/java-api/apis/requestcontext/pom.xml | 45 +++++++++ .../javaapi/apis/requestcontext/AComponent.java | 35 +++++++ .../javaapi/apis/requestcontext/BCallback.java | 27 +++++ .../javaapi/apis/requestcontext/BComponent.java | 35 +++++++ .../apis/requestcontext/impl/AComponentImpl.java | 102 +++++++++++++++++++ .../apis/requestcontext/impl/BComponentImpl.java | 61 ++++++++++++ .../src/main/resources/requestcontext.composite | 34 +++++++ .../requestcontext/RequestContextTestCase.java | 109 +++++++++++++++++++++ 8 files changed, 448 insertions(+) create mode 100644 branches/sca-android/vtest/java-api/apis/requestcontext/pom.xml create mode 100644 branches/sca-android/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/AComponent.java create mode 100644 branches/sca-android/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BCallback.java create mode 100644 branches/sca-android/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BComponent.java create mode 100644 branches/sca-android/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/AComponentImpl.java create mode 100644 branches/sca-android/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/BComponentImpl.java create mode 100644 branches/sca-android/vtest/java-api/apis/requestcontext/src/main/resources/requestcontext.composite create mode 100644 branches/sca-android/vtest/java-api/apis/requestcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/RequestContextTestCase.java (limited to 'branches/sca-android/vtest/java-api/apis/requestcontext') diff --git a/branches/sca-android/vtest/java-api/apis/requestcontext/pom.xml b/branches/sca-android/vtest/java-api/apis/requestcontext/pom.xml new file mode 100644 index 0000000000..7f18df910c --- /dev/null +++ b/branches/sca-android/vtest/java-api/apis/requestcontext/pom.xml @@ -0,0 +1,45 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + java-api-apis + 1.4-SNAPSHOT + ../pom.xml + + vtest-java-api-apis-requestcontext + Apache Tuscany SCA Java APIs and Annotations Verification Tests - APIs - RequestContext + + + + org.apache.tuscany.sca + tuscany-host-embedded + 1.4-SNAPSHOT + + + + org.apache.tuscany.sca + tuscany-implementation-java-runtime + 1.4-SNAPSHOT + runtime + + + diff --git a/branches/sca-android/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/AComponent.java b/branches/sca-android/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/AComponent.java new file mode 100644 index 0000000000..6fec5cada3 --- /dev/null +++ b/branches/sca-android/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/AComponent.java @@ -0,0 +1,35 @@ +/* + * 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.vtest.javaapi.apis.requestcontext; + +/** + * Simple Service A. + */ +public interface AComponent { + + public String getName(); + + public boolean isJAASSubject(); + public String getServiceName(); + public String getCallbackResult(); + public String getServiceReferenceName(); + public String getCallbackServiceReferenceName(); + +} diff --git a/branches/sca-android/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BCallback.java b/branches/sca-android/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BCallback.java new file mode 100644 index 0000000000..4dd2088f90 --- /dev/null +++ b/branches/sca-android/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BCallback.java @@ -0,0 +1,27 @@ +/* + * 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.vtest.javaapi.apis.requestcontext; + +public interface BCallback { + + public String getCallbackName(); + public void processResults(String result); + +} diff --git a/branches/sca-android/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BComponent.java b/branches/sca-android/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BComponent.java new file mode 100644 index 0000000000..34f709d175 --- /dev/null +++ b/branches/sca-android/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/BComponent.java @@ -0,0 +1,35 @@ +/* + * 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.vtest.javaapi.apis.requestcontext; + +import org.osoa.sca.annotations.Callback; + +/** + * Simple Service B. + */ +@Callback(BCallback.class) +public interface BComponent { + + public String getName(); + + public void testCallback(); + public String getServiceReferenceName(); + +} diff --git a/branches/sca-android/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/AComponentImpl.java b/branches/sca-android/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/AComponentImpl.java new file mode 100644 index 0000000000..c6fa589ed4 --- /dev/null +++ b/branches/sca-android/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/AComponentImpl.java @@ -0,0 +1,102 @@ +/* + * 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.vtest.javaapi.apis.requestcontext.impl; + +import javax.security.auth.Subject; + +import org.apache.tuscany.sca.vtest.javaapi.apis.requestcontext.AComponent; +import org.apache.tuscany.sca.vtest.javaapi.apis.requestcontext.BCallback; +import org.apache.tuscany.sca.vtest.javaapi.apis.requestcontext.BComponent; +import org.osoa.sca.CallableReference; +import org.osoa.sca.ComponentContext; +import org.osoa.sca.ServiceReference; +import org.osoa.sca.annotations.Context; +import org.osoa.sca.annotations.Reference; +import org.osoa.sca.annotations.Service; + +@Service(AComponent.class) +public class AComponentImpl implements AComponent, BCallback { + + private static Object monitor = new Object(); + private static String returnMessage = null; + private static CallableReference cbCR; + + protected ComponentContext componentContext; + + @Reference + protected BComponent bReference; + + public String getName() { + return "ComponentA"; + } + + @Context + public void setComponentContext(ComponentContext context) { + this.componentContext = context; + } + + public boolean isJAASSubject() { + return componentContext.getRequestContext().getSecuritySubject() instanceof Subject; + } + + public String getServiceName() { + return componentContext.getRequestContext().getServiceName(); + } + + public String getCallbackResult() { + ServiceReference bSR = componentContext.getServiceReference(BComponent.class, "bReference"); + String cbID = "ComponentACallBack"; + bSR.setCallbackID(cbID); + bSR.getService().testCallback(); + + // Wait for 30s max. + int count = 0; + synchronized(monitor) { + while (returnMessage == null && count++ < 30) { + try { + monitor.wait(1000L); + } catch (InterruptedException e) { + e.printStackTrace(); + } + } + } + + return returnMessage; + } + + public void processResults(String result) { + returnMessage = result; + cbCR = componentContext.getRequestContext().getServiceReference(); + } + + public String getServiceReferenceName() { + CallableReference aCR = componentContext.getRequestContext().getServiceReference(); + return aCR.getService().getName(); + } + + public String getCallbackServiceReferenceName() { + return cbCR.getService().getCallbackName(); + } + + public String getCallbackName() { + return "CallBackB"; + } + +} diff --git a/branches/sca-android/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/BComponentImpl.java b/branches/sca-android/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/BComponentImpl.java new file mode 100644 index 0000000000..33ff829357 --- /dev/null +++ b/branches/sca-android/vtest/java-api/apis/requestcontext/src/main/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/impl/BComponentImpl.java @@ -0,0 +1,61 @@ +/* + * 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.vtest.javaapi.apis.requestcontext.impl; + +import org.apache.tuscany.sca.vtest.javaapi.apis.requestcontext.BCallback; +import org.apache.tuscany.sca.vtest.javaapi.apis.requestcontext.BComponent; +import org.junit.Assert; +import org.osoa.sca.CallableReference; +import org.osoa.sca.ComponentContext; +import org.osoa.sca.annotations.Callback; +import org.osoa.sca.annotations.Context; +import org.osoa.sca.annotations.Service; + +@Service(BComponent.class) +public class BComponentImpl implements BComponent { + + protected ComponentContext componentContext; + + @Callback + protected BCallback callback; + + @Context + public void setComponentContext(ComponentContext context) { + this.componentContext = context; + } + + public String getName() { + return "ComponentB"; + } + + public void testCallback() { + callback = componentContext.getRequestContext().getCallback(); + callback.processResults("CallBackFromB"); + + CallableReference bCR = componentContext.getRequestContext().getCallbackReference(); + Assert.assertEquals("ComponentACallBack", bCR.getCallbackID()); + } + + public String getServiceReferenceName() { + CallableReference bCR = componentContext.getRequestContext().getServiceReference(); + return bCR.getService().getName(); + } + +} diff --git a/branches/sca-android/vtest/java-api/apis/requestcontext/src/main/resources/requestcontext.composite b/branches/sca-android/vtest/java-api/apis/requestcontext/src/main/resources/requestcontext.composite new file mode 100644 index 0000000000..4aa5eeb25a --- /dev/null +++ b/branches/sca-android/vtest/java-api/apis/requestcontext/src/main/resources/requestcontext.composite @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + diff --git a/branches/sca-android/vtest/java-api/apis/requestcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/RequestContextTestCase.java b/branches/sca-android/vtest/java-api/apis/requestcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/RequestContextTestCase.java new file mode 100644 index 0000000000..65a1dbf88b --- /dev/null +++ b/branches/sca-android/vtest/java-api/apis/requestcontext/src/test/java/org/apache/tuscany/sca/vtest/javaapi/apis/requestcontext/RequestContextTestCase.java @@ -0,0 +1,109 @@ +/* + * 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.vtest.javaapi.apis.requestcontext; + +import org.apache.tuscany.sca.vtest.utilities.ServiceFinder; +import org.junit.AfterClass; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Ignore; +import org.junit.Test; + +/** + * This test class tests the RequestContext interface described in 1.7.2 of the + * SCA Java Annotations & APIs Specification 1.0. + */ +public class RequestContextTestCase { + + protected static String compositeName = "requestcontext.composite"; + protected static AComponent a; + protected static BComponent b; + + @BeforeClass + public static void init() throws Exception { + try { + System.out.println("Setting up"); + ServiceFinder.init(compositeName); + a = ServiceFinder.getService(AComponent.class, "AComponent"); + b = ServiceFinder.getService(BComponent.class, "BComponent"); + } catch (Exception e) { + e.printStackTrace(); + } + } + + @AfterClass + public static void destroy() throws Exception { + System.out.println("Cleaning up"); + ServiceFinder.cleanup(); + } + + /** + * Lines 858
+ * getSecuritySubject() – Returns the JAAS Subject of the current request. + * + * @throws Exception + */ + @Ignore + public void testGetSecuritySubject() throws Exception { + Assert.assertTrue(a.isJAASSubject()); + } + + /** + * Lines 860
+ * getServiceName() – Returns the name of the service on the Java + * implementation the request came in on. + * + * @throws Exception + */ + @Test + public void testGetServiceName() throws Exception { + Assert.assertEquals("AComponent", a.getServiceName()); + } + + /** + * Lines 861, 862
+ * getCallbackReference() – Returns a callable reference to the callback as + * specified by the caller. getCallback() – Returns a proxy for the callback + * as specified by the caller. + * + * @throws Exception + */ + @Test + public void testGetCallback() throws Exception { + Assert.assertEquals("CallBackFromB", a.getCallbackResult()); + } + + /** + * Lines 863
+ * getServiceReference() – When invoked during the execution of a service + * operation, this API MUST return a CallableReference that represents the + * service. When invoked during the execution of a callback operation, this + * API MUST return a CallableReference that represents the callback service. + * + * @throws Exception + */ + @Test + public void testGetServiceReference() throws Exception { + Assert.assertEquals("ComponentA", a.getServiceReferenceName()); + Assert.assertEquals("ComponentB", b.getServiceReferenceName()); + Assert.assertEquals("CallBackB", a.getCallbackServiceReferenceName()); + } + +} -- cgit v1.2.3