Author: jboynes
Date: Fri Apr 14 11:12:36 2006
New Revision: 394164
URL: http://svn.apache.org/viewcvs?rev=394164&view=rev
Log:
more testing for EntryPoint loader
Added:
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/MockService.java
(with props)
Modified:
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/EntryPointLoaderTestCase.java
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/types/java/JavaServiceContract.java
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/types/java/impl/JavaServiceContractImpl.java
Modified:
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/EntryPointLoaderTestCase.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/EntryPointLoaderTestCase.java?rev=394164&r1=394163&r2=394164&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/EntryPointLoaderTestCase.java
(original)
+++
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/EntryPointLoaderTestCase.java
Fri Apr 14 11:12:36 2006
@@ -17,11 +17,14 @@
package org.apache.tuscany.core.loader.assembly;
import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
-import org.apache.tuscany.model.assembly.EntryPoint;
import org.apache.tuscany.core.config.ConfigurationLoadException;
+import static
org.apache.tuscany.core.loader.assembly.AssemblyConstants.ENTRY_POINT;
+import org.apache.tuscany.model.assembly.ConfiguredService;
+import org.apache.tuscany.model.assembly.EntryPoint;
+import org.apache.tuscany.model.types.java.JavaServiceContract;
/**
* @version $Rev$ $Date$
@@ -37,8 +40,23 @@
assertEquals(XMLStreamConstants.END_DOCUMENT, reader.next());
}
+ public void testInterface() throws XMLStreamException,
ConfigurationLoadException {
+ String interfaceName = MockService.class.getName();
+ String xml = "<entryPoint xmlns='http://www.osoa.org/xmlns/sca/0.9'
name='test'><interface.java interface='" + interfaceName + "'/></entryPoint>";
+ XMLStreamReader reader = getReader(xml);
+ EntryPoint ep = (EntryPoint) registry.load(reader, resourceLoader);
+ reader.require(XMLStreamConstants.END_ELEMENT,
ENTRY_POINT.getNamespaceURI(), ENTRY_POINT.getLocalPart());
+ assertEquals(XMLStreamConstants.END_DOCUMENT, reader.next());
+ assertNotNull(ep);
+ assertEquals("test", ep.getName());
+ ConfiguredService configuredService = ep.getConfiguredService();
+ JavaServiceContract serviceContract = (JavaServiceContract)
configuredService.getPort().getServiceContract();
+ assertEquals(interfaceName, serviceContract.getInterfaceName());
+ }
+
protected void setUp() throws Exception {
super.setUp();
registerLoader(new EntryPointLoader());
+ registerLoader(new InterfaceJavaLoader());
}
}
Added:
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/MockService.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/MockService.java?rev=394164&view=auto
==============================================================================
---
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/MockService.java
(added)
+++
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/MockService.java
Fri Apr 14 11:12:36 2006
@@ -0,0 +1,23 @@
+/**
+ *
+ * Copyright 2006 The Apache Software Foundation
+ *
+ * Licensed 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.core.loader.assembly;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public interface MockService {
+}
Propchange:
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/MockService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/loader/assembly/MockService.java
------------------------------------------------------------------------------
svn:keywords = Rev,Date
Modified:
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/types/java/JavaServiceContract.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/types/java/JavaServiceContract.java?rev=394164&r1=394163&r2=394164&view=diff
==============================================================================
---
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/types/java/JavaServiceContract.java
(original)
+++
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/types/java/JavaServiceContract.java
Fri Apr 14 11:12:36 2006
@@ -24,7 +24,11 @@
*/
public interface JavaServiceContract extends ServiceContract {
+ String getInterfaceName();
+
void setInterfaceName(String interfaceName);
+
+ String getCallbackInterfaceName();
void setCallbackInterfaceName(String callbackInterfaceName);
}
Modified:
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/types/java/impl/JavaServiceContractImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/types/java/impl/JavaServiceContractImpl.java?rev=394164&r1=394163&r2=394164&view=diff
==============================================================================
---
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/types/java/impl/JavaServiceContractImpl.java
(original)
+++
incubator/tuscany/java/sca/model/src/main/java/org/apache/tuscany/model/types/java/impl/JavaServiceContractImpl.java
Fri Apr 14 11:12:36 2006
@@ -47,7 +47,15 @@
public void setCallbackInterfaceName(String callbackInterfaceName) {
this.callbackInterfaceName = callbackInterfaceName;
}
-
+
+ public String getInterfaceName() {
+ return interfaceName;
+ }
+
+ public String getCallbackInterfaceName() {
+ return callbackInterfaceName;
+ }
+
/**
* @see
org.apache.tuscany.model.assembly.impl.ExtensibleImpl#initialize(org.apache.tuscany.model.assembly.AssemblyContext)
*/
