Author: kwilliams
Date: Thu Mar 27 15:29:39 2008
New Revision: 642008
URL: http://svn.apache.org/viewvc?rev=642008&view=rev
Log:
Adding two variations of @reference test
Modified:
incubator/tuscany/java/sca/vtest/java-api/src/main/java/org/apache/tuscany/sca/vtest/javaapi/AService.java
incubator/tuscany/java/sca/vtest/java-api/src/main/java/org/apache/tuscany/sca/vtest/javaapi/impl/AServiceImpl.java
incubator/tuscany/java/sca/vtest/java-api/src/main/resources/ab.composite
incubator/tuscany/java/sca/vtest/java-api/src/test/java/org/apache/tuscany/sca/vtest/javaapi/JavaApiTestCase.java
Modified:
incubator/tuscany/java/sca/vtest/java-api/src/main/java/org/apache/tuscany/sca/vtest/javaapi/AService.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/src/main/java/org/apache/tuscany/sca/vtest/javaapi/AService.java?rev=642008&r1=642007&r2=642008&view=diff
==============================================================================
---
incubator/tuscany/java/sca/vtest/java-api/src/main/java/org/apache/tuscany/sca/vtest/javaapi/AService.java
(original)
+++
incubator/tuscany/java/sca/vtest/java-api/src/main/java/org/apache/tuscany/sca/vtest/javaapi/AService.java
Thu Mar 27 15:29:39 2008
@@ -25,7 +25,8 @@
public interface AService {
public String getName();
-
- public String getDelegateName();
+ public String getB1Name();
+ public String getB2Name();
+ public String getB3Name();
}
Modified:
incubator/tuscany/java/sca/vtest/java-api/src/main/java/org/apache/tuscany/sca/vtest/javaapi/impl/AServiceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/src/main/java/org/apache/tuscany/sca/vtest/javaapi/impl/AServiceImpl.java?rev=642008&r1=642007&r2=642008&view=diff
==============================================================================
---
incubator/tuscany/java/sca/vtest/java-api/src/main/java/org/apache/tuscany/sca/vtest/javaapi/impl/AServiceImpl.java
(original)
+++
incubator/tuscany/java/sca/vtest/java-api/src/main/java/org/apache/tuscany/sca/vtest/javaapi/impl/AServiceImpl.java
Thu Mar 27 15:29:39 2008
@@ -26,16 +26,38 @@
@Service(AService.class)
public class AServiceImpl implements AService {
+
+ @Reference
+ protected BService b1; // field injection
+
+ protected BService b2; // injected via constructor parameter
+
+ protected BService b3; // injected via setter
+
+ public AServiceImpl(@Reference(name = "b2") BService b2) {
+ super();
+ this.b2 = b2;
+ }
@Reference
- protected BService delegate;
+ public void setB3(BService b3) {
+ this.b3 = b3;
+ }
public String getName() {
return "AService";
}
- public String getDelegateName() {
- return delegate.getName();
+ public String getB1Name() {
+ return b1.getName();
+ }
+
+ public String getB2Name() {
+ return b2.getName();
+ }
+
+ public String getB3Name() {
+ return b3.getName();
}
}
Modified:
incubator/tuscany/java/sca/vtest/java-api/src/main/resources/ab.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/src/main/resources/ab.composite?rev=642008&r1=642007&r2=642008&view=diff
==============================================================================
--- incubator/tuscany/java/sca/vtest/java-api/src/main/resources/ab.composite
(original)
+++ incubator/tuscany/java/sca/vtest/java-api/src/main/resources/ab.composite
Thu Mar 27 15:29:39 2008
@@ -23,7 +23,9 @@
<component name="AComponent">
<implementation.java
class="org.apache.tuscany.sca.vtest.javaapi.impl.AServiceImpl"/>
- <reference name="delegate" target="BComponent"/>
+ <reference name="b1" target="BComponent"/>
+ <reference name="b2" target="BComponent"/>
+ <reference name="b3" target="BComponent"/>
</component>
<component name="BComponent">
Modified:
incubator/tuscany/java/sca/vtest/java-api/src/test/java/org/apache/tuscany/sca/vtest/javaapi/JavaApiTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/vtest/java-api/src/test/java/org/apache/tuscany/sca/vtest/javaapi/JavaApiTestCase.java?rev=642008&r1=642007&r2=642008&view=diff
==============================================================================
---
incubator/tuscany/java/sca/vtest/java-api/src/test/java/org/apache/tuscany/sca/vtest/javaapi/JavaApiTestCase.java
(original)
+++
incubator/tuscany/java/sca/vtest/java-api/src/test/java/org/apache/tuscany/sca/vtest/javaapi/JavaApiTestCase.java
Thu Mar 27 15:29:39 2008
@@ -57,13 +57,11 @@
}
- @Test
- public void firstTest() throws Exception {
- Assert.assertTrue(true);
- }
@Test
@Ignore
+ //Temporary test unrelated to spec test effort. Remove after resolution
of
+ //JIRA T-2145
public void bogusComponentName() throws Exception {
SCADomain tempDomain = SCADomain.newInstance(compositeName);
try {
@@ -79,14 +77,20 @@
}
- @Test
- public void accessAService() throws Exception {
- Assert.assertEquals("AService", a.getName());
- }
+ /**
+ * This tests the use of the three usages of the @Reference annotation
+ * B1 is injected via field injection
+ * B2 is injected via constructor parameter
+ * B3 is injected via setter method
+ */
@Test
public void atReference() throws Exception {
- Assert.assertEquals("BService", a.getDelegateName());
+
+ Assert.assertEquals("BService", a.getB1Name());
+ Assert.assertEquals("BService", a.getB2Name());
+ Assert.assertEquals("BService", a.getB3Name());
+
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
