You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2008/08/14 15:47:22 UTC
svn commit: r685895 - in /tuscany/java/sca/itest/validation/src/test/java:
calculator/warning/DuplicateComponentNameTestCase.java
domain/CustomCompositeBuilder.java
Author: antelder
Date: Thu Aug 14 06:47:22 2008
New Revision: 685895
URL: http://svn.apache.org/viewvc?rev=685895&view=rev
Log:
TUSCANY-2455: apply patch from Ramkumar Ramalingam for a test for Exception not thrown on duplicate component names within a composite
Modified:
tuscany/java/sca/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java
tuscany/java/sca/itest/validation/src/test/java/domain/CustomCompositeBuilder.java
Modified: tuscany/java/sca/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java?rev=685895&r1=685894&r2=685895&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java Thu Aug 14 06:47:22 2008
@@ -18,57 +18,44 @@
*/
package calculator.warning;
-import java.io.File;
-
import junit.framework.TestCase;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.UtilityExtensionPoint;
import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.MonitorFactory;
import org.apache.tuscany.sca.monitor.Problem;
import org.apache.tuscany.sca.monitor.logging.impl.DefaultLoggingMonitorImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.apache.tuscany.sca.node.impl.NodeImpl;
+
+import domain.CustomCompositeBuilder;
/**
* This shows how to test the Calculator service component.
*/
public class DuplicateComponentNameTestCase extends TestCase {
- private CalculatorService calculatorService;
- private SCANode2 node;
-
+ private CustomCompositeBuilder customDomain;
+
@Override
- protected void setUp() throws Exception {
- SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
- node = nodeFactory.createSCANode(new File("src/main/resources/DuplicateComponentName/Calculator.composite").toURL().toString(),
- new SCAContribution("TestContribution",
- new File("src/main/resources/DuplicateComponentName").toURL().toString()));
- /*
- node = SCANode2Factory.createSCANodeWithComposite("DuplicateComponentName/Calculator.composite");
- */
- node.start();
- calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
+ protected void setUp() throws Exception
+ {
+ customDomain = CustomCompositeBuilder.getInstance();
+ try {
+ customDomain.loadContribution("src/main/resources/DuplicateComponentName/Calculator.composite",
+ "TestContribution", "src/main/resources/DuplicateComponentName/");
+ customDomain.buildContribution();
+ } catch (Exception ex){
+ //throw ex;
+ }
}
@Override
protected void tearDown() throws Exception {
- node.stop();
+ //nothing to do
}
- public void testCalculator() throws Exception {
- ExtensionPointRegistry registry = ((NodeImpl)node).getExtensionPointRegistry();
- UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
- MonitorFactory monitorFactory = utilities.getUtility(MonitorFactory.class);
- Monitor monitor = monitorFactory.createMonitor();
+ public void testCalculator() {
+ Monitor monitor = customDomain.getMonitorInstance();
Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
assertNotNull(problem);
assertEquals("DuplicateComponentName", problem.getMessageId());
-
}
}
Modified: tuscany/java/sca/itest/validation/src/test/java/domain/CustomCompositeBuilder.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/domain/CustomCompositeBuilder.java?rev=685895&r1=685894&r2=685895&view=diff
==============================================================================
--- tuscany/java/sca/itest/validation/src/test/java/domain/CustomCompositeBuilder.java (original)
+++ tuscany/java/sca/itest/validation/src/test/java/domain/CustomCompositeBuilder.java Thu Aug 14 06:47:22 2008
@@ -27,10 +27,12 @@
import java.util.Map;
import java.util.Set;
+import javax.xml.namespace.QName;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLOutputFactory;
import org.apache.tuscany.sca.assembly.AssemblyFactory;
+import org.apache.tuscany.sca.assembly.Composite;
import org.apache.tuscany.sca.assembly.SCABindingFactory;
import org.apache.tuscany.sca.assembly.builder.CompositeBuilder;
import org.apache.tuscany.sca.assembly.builder.impl.CompositeBuilderImpl;
@@ -189,6 +191,19 @@
return monitor;
}
+ public void buildContribution() throws Exception {
+ // Create a composite model for the domain
+ Composite domainComposite = assemblyFactory.createComposite();
+ domainComposite.setName(new QName("http://customdomain", "domain"));
+
+ // Add all deployables to it, normally the domain administrator would select
+ // the deployables to include
+ domainComposite.getIncludes().addAll(workspace.getDeployables());
+
+ // Build the domain composite and wire the components included in it
+ domainCompositeBuilder.build(domainComposite);
+ }
+
public void readContribution(String compositeURL, String sourceURI, String sourceURL) throws Exception {
init();