Author: antelder
Date: Sun Jun 19 06:37:19 2011
New Revision: 1137302
URL: http://svn.apache.org/viewvc?rev=1137302&view=rev
Log:
Add another test for recursive composites
Added:
tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/resources/helloworld2.jar
(with props)
tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/resources/nested.composite
Modified:
tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/impl/UsedCompositesTestCase.java
Modified:
tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/impl/UsedCompositesTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/impl/UsedCompositesTestCase.java?rev=1137302&r1=1137301&r2=1137302&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/impl/UsedCompositesTestCase.java
(original)
+++
tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/java/org/apache/tuscany/sca/impl/UsedCompositesTestCase.java
Sun Jun 19 06:37:19 2011
@@ -29,6 +29,7 @@ import org.apache.tuscany.sca.TuscanyRun
import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
import org.apache.tuscany.sca.monitor.ValidationException;
import org.apache.tuscany.sca.runtime.ActivationException;
+import org.junit.Assert;
import org.junit.Test;
import org.oasisopen.sca.NoSuchDomainException;
import org.oasisopen.sca.NoSuchServiceException;
@@ -36,7 +37,7 @@ import org.oasisopen.sca.NoSuchServiceEx
public class UsedCompositesTestCase {
@Test
- public void UsedTest1() throws NoSuchServiceException,
NoSuchDomainException, ContributionReadException, ActivationException,
ValidationException, XMLStreamException, FileNotFoundException {
+ public void includeTest1() throws NoSuchServiceException,
NoSuchDomainException, ContributionReadException, ActivationException,
ValidationException, XMLStreamException, FileNotFoundException {
Node node = TuscanyRuntime.newInstance().createNode("localTest");
String curi =
node.installContribution("src/test/resources/sample-helloworld.jar");
String compositeURI = node.addDeploymentComposite(curi, new
FileReader("src/test/resources/include.composite"));
@@ -44,11 +45,11 @@ public class UsedCompositesTestCase {
node.startComposite(curi, compositeURI);
List<String> xs = ((NodeImpl)node).updateUsingComposites(curi,
"helloworld.composite");
- System.out.println(xs);
-// Assert.assertEquals(",mn,mn", s.doit("xyz"));
+ Assert.assertEquals(1, xs.size());
+ Assert.assertEquals("sample-helloworld/include.composite", xs.get(0));
}
@Test
- public void UsedTest2() throws NoSuchServiceException,
NoSuchDomainException, ContributionReadException, ActivationException,
ValidationException, XMLStreamException, FileNotFoundException {
+ public void implCompositeTest() throws NoSuchServiceException,
NoSuchDomainException, ContributionReadException, ActivationException,
ValidationException, XMLStreamException, FileNotFoundException {
Node node = TuscanyRuntime.newInstance().createNode("localTest");
String curi =
node.installContribution("src/test/resources/sample-helloworld.jar");
String compositeURI = node.addDeploymentComposite(curi, new
FileReader("src/test/resources/compositeImpl.composite"));
@@ -56,7 +57,23 @@ public class UsedCompositesTestCase {
node.startComposite(curi, compositeURI);
List<String> xs = ((NodeImpl)node).updateUsingComposites(curi,
"helloworld.composite");
- System.out.println(xs);
-// Assert.assertEquals(",mn,mn", s.doit("xyz"));
+ Assert.assertEquals(1, xs.size());
+ Assert.assertEquals("sample-helloworld/compositeImpl.composite",
xs.get(0));
+ }
+
+ @Test
+ public void nestedTest1() throws NoSuchServiceException,
NoSuchDomainException, ContributionReadException, ActivationException,
ValidationException, XMLStreamException, FileNotFoundException {
+ Node node = TuscanyRuntime.newInstance().createNode("NestedTest");
+ String curi =
node.installContribution("src/test/resources/helloworld2.jar");
+
+ node.startComposite(curi, "compositeImpl.composite");
+
+ String compositeURI = node.addDeploymentComposite(curi, new
FileReader("src/test/resources/nested.composite"));
+ node.startComposite(curi, compositeURI);
+
+ List<String> xs = ((NodeImpl)node).updateUsingComposites(curi,
"helloworld.composite");
+ Assert.assertEquals(2, xs.size());
+ Assert.assertTrue(xs.contains("helloworld2/compositeImpl.composite"));
+ Assert.assertTrue(xs.contains("helloworld2/nested.composite"));
}
}
Added:
tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/resources/helloworld2.jar
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/resources/helloworld2.jar?rev=1137302&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/resources/helloworld2.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/resources/nested.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/resources/nested.composite?rev=1137302&view=auto
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/resources/nested.composite
(added)
+++
tuscany/sca-java-2.x/trunk/modules/domain-node/src/test/resources/nested.composite
Sun Jun 19 06:37:19 2011
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912";
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1";
+ xmlns:sample="http://sample";
+ targetNamespace="http://sample";
+ name="nested">
+
+ <include name="sample:compositeImpl" />
+
+</composite>
