From bb3e993e62950b7907566d97bdc63c55d0fff38b Mon Sep 17 00:00:00 2001
From: slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 31 Aug 2008 13:09:18 +0000
Subject: TUSCANY-2501 - raise an error if the user tries to mix annotated and
 unannotated references in a component. Change the vtests and validation tests
 to take account of this change.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@690691 13f79535-47bb-0310-9956-ffa450edef68
---
 .../warning/ReferenceNotFoundTestCase.java         | 30 +++++++++++-----------
 .../test/java/domain/CustomCompositeBuilder.java   | 14 ++++++++++
 2 files changed, 29 insertions(+), 15 deletions(-)

(limited to 'branches/sca-java-1.3.2/itest')

diff --git a/branches/sca-java-1.3.2/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java b/branches/sca-java-1.3.2/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java
index 4856ba507f..ed70839dcf 100644
--- a/branches/sca-java-1.3.2/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java
+++ b/branches/sca-java-1.3.2/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java
@@ -30,38 +30,38 @@ 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 ReferenceNotFoundTestCase 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/ReferenceNotFound/Calculator.composite").toURL().toString(),
-        		                 new SCAContribution("TestContribution", 
-        		                                     new File("src/main/resources/ReferenceNotFound").toURL().toString()));
-        node.start();
-        calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
+        customDomain = CustomCompositeBuilder.getInstance();
+        try {
+            customDomain.loadContribution("src/main/resources/ReferenceNotFound/Calculator.composite", 
+                                          "TestContribution", 
+                                          "src/main/resources/ReferenceNotFound/");
+            customDomain.buildContribution();
+        } catch (Exception ex){
+            throw ex;
+        }   
+        
     }
 
     @Override
     protected void tearDown() throws Exception {
-        node.stop();
+        //node.stop();
     }
 
     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();
+        Monitor monitor = customDomain.getMonitorInstance();
         Problem problem = ((DefaultLoggingMonitorImpl)monitor).getLastLoggedProblem();
         
         assertNotNull(problem);
diff --git a/branches/sca-java-1.3.2/itest/validation/src/test/java/domain/CustomCompositeBuilder.java b/branches/sca-java-1.3.2/itest/validation/src/test/java/domain/CustomCompositeBuilder.java
index 9ad5407ed6..dc82e55cd0 100644
--- a/branches/sca-java-1.3.2/itest/validation/src/test/java/domain/CustomCompositeBuilder.java
+++ b/branches/sca-java-1.3.2/itest/validation/src/test/java/domain/CustomCompositeBuilder.java
@@ -27,10 +27,12 @@ import java.util.List;
 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,18 @@ public class CustomCompositeBuilder {
     	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();
 
-- 
cgit v1.2.3