You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jm...@apache.org on 2006/03/08 07:54:05 UTC

svn commit: r384135 [2/2] - in /incubator/tuscany/java/sca: container.java/src/main/java/org/apache/tuscany/container/java/builder/ container.java/src/main/java/org/apache/tuscany/container/java/config/ container.java/src/test/java/org/apache/tuscany/c...

Added: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/config/SuperBean.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/config/SuperBean.java?rev=384135&view=auto
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/config/SuperBean.java (added)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/config/SuperBean.java Tue Mar  7 22:53:58 2006
@@ -0,0 +1,27 @@
+package org.apache.tuscany.core.config;
+
+/**
+ * @version $Rev: 368822 $ $Date: 2006-01-13 10:54:38 -0800 (Fri, 13 Jan 2006) $
+ */
+public class SuperBean {
+
+    public static final int ALL_SUPER_FIELDS = 3;
+
+    public static final int ALL_SUPER_METHODS = 4;
+
+    private String superField1;
+
+    public void setSuperMethod1(String param) {
+    }
+
+    public void setSuperMethod1(int param) {
+    }
+
+    public void override(String param) throws Exception {
+        throw new Exception("Override not handled");
+    }
+
+    public void noOverride() throws Exception {
+    }
+
+}

Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/mock/MockFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/mock/MockFactory.java?rev=384135&r1=384134&r2=384135&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/mock/MockFactory.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/mock/MockFactory.java Tue Mar  7 22:53:58 2006
@@ -222,6 +222,9 @@
         cRef.getTargetConfiguredServices().add(cService);
         cRef.initialize(assemblyContext);
         cService.initialize(assemblyContext);
+        JavaServiceContract contract = systemFactory.createJavaServiceContract();
+        contract.setInterface(interfaz);
+        ref.setServiceContract(contract);
         ep.setConfiguredReference(cRef);
         ep.initialize(assemblyContext);
         return ep;
@@ -346,6 +349,33 @@
         cReference.initialize(assemblyContext);
         source.getConfiguredReferences().add(cReference);
         source.initialize(assemblyContext);
+        
+        // wire multiplicity using a setter
+        JavaServiceContract refContract2 = systemFactory.createJavaServiceContract();
+        refContract2.setInterface(List.class);
+        Reference reference2 = systemFactory.createReference();
+        reference2.setName("setTargets");
+        reference2.setServiceContract(refContract2);
+        ConfiguredReference cReference2 = systemFactory.createConfiguredReference();
+        cReference2.setReference(reference2);
+        cReference2.getTargetConfiguredServices().add(cTargetService);
+        cReference2.initialize(assemblyContext);
+        source.getConfiguredReferences().add(cReference2);
+        source.initialize(assemblyContext);
+
+        // wire multiplicity using a field
+        JavaServiceContract refContract3 = systemFactory.createJavaServiceContract();
+        refContract3.setInterface(List.class);
+        Reference reference3 = systemFactory.createReference();
+        reference3.setName("targetsThroughField");
+        reference3.setServiceContract(refContract3);
+        ConfiguredReference cReference3 = systemFactory.createConfiguredReference();
+        cReference3.setReference(reference3);
+        cReference3.getTargetConfiguredServices().add(cTargetService);
+        cReference3.initialize(assemblyContext);
+        source.getConfiguredReferences().add(cReference3);
+        source.initialize(assemblyContext);
+   
         
         Module module = systemFactory.createModule();
         module.setName("system.module");

Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/mock/component/Source.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/mock/component/Source.java?rev=384135&r1=384134&r2=384135&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/mock/component/Source.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/mock/component/Source.java Tue Mar  7 22:53:58 2006
@@ -13,6 +13,8 @@
  */
 package org.apache.tuscany.core.mock.component;
 
+import java.util.List;
+
 /**
  * Implementations are used in wiring tests
  * 
@@ -21,5 +23,10 @@
 public interface Source {
 
     public Target getTarget();
+    
+    public List<Target> getTargets();
+
+    public List<Target> getTargetsThroughField();
+
 }
 

Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/mock/component/SourceImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/mock/component/SourceImpl.java?rev=384135&r1=384134&r2=384135&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/mock/component/SourceImpl.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/mock/component/SourceImpl.java Tue Mar  7 22:53:58 2006
@@ -13,6 +13,9 @@
  */
 package org.apache.tuscany.core.mock.component;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Mock system component implementation used in wiring tests
  * 
@@ -21,13 +24,30 @@
 public class SourceImpl implements Source {
 
     private Target target;
+    
+    private List<Target> targets;
+
+    private List<Target> targetsThroughField;
 
     public void setTarget(Target target) {
         this.target = target;
+        this.targets = new ArrayList();
     }
 
     public Target getTarget() {
         return target;
+    }
+
+    public List<Target> getTargets() {
+        return targets;
+    }
+
+    public void setTargets(List<Target> targets) {
+        this.targets = targets;
+    }
+
+    public List<Target> getTargetsThroughField() {
+        return targetsThroughField;
     }
 
 }

Modified: incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/IntraAggregateWireTestCase.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/IntraAggregateWireTestCase.java?rev=384135&r1=384134&r2=384135&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/IntraAggregateWireTestCase.java (original)
+++ incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/IntraAggregateWireTestCase.java Tue Mar  7 22:53:58 2006
@@ -13,6 +13,8 @@
  */
 package org.apache.tuscany.core.system.context;
 
+import java.util.List;
+
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
@@ -84,10 +86,33 @@
         context.stop();
     }
 
+    public void testMultiplicity() throws Exception {
+        SystemAggregateContext context = createContext();
+        context.start();
+        context.registerModelObject(MockFactory.createSystemModuleWithWiredComponents(Scope.MODULE, Scope.MODULE));
+        context.fireEvent(EventContext.MODULE_START, null);
+        Source source = (Source) context.getContext("source").getImplementationInstance();
+        Assert.assertNotNull(source);
+        Target target = (Target) context.getContext("target").getImplementationInstance();
+        Assert.assertNotNull(target);
+        // test setter injection
+        List<Target> targets = source.getTargets();
+        Assert.assertEquals(1,targets.size());
+        assertSame(target,targets.get(0));
+        
+        // test field injection
+        targets = source.getTargetsThroughField();
+        Assert.assertEquals(1,targets.size());
+        assertSame(target,targets.get(0));
+    }
+
     private SystemAggregateContext createContext() {
         SystemAggregateContextImpl context = new SystemAggregateContextImpl();
         context.setName("system.context");
         context.setConfigurationContext(new MockConfigContext(MockFactory.createSystemBuilders()));
         return context;
     }
+
+
+
 }