You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2009/04/24 14:01:49 UTC
svn commit: r768265 - in /tuscany/branches/sca-java-1.x/itest/jms-format/src:
main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/
main/resources/jmsdefault/
test/java/org/apache/tuscany/sca/binding/jms/format/
Author: slaws
Date: Fri Apr 24 12:01:49 2009
New Revision: 768265
URL: http://svn.apache.org/viewvc?rev=768265&view=rev
Log:
TUSCANY-2930 extend default format test for the chase where default is specified on reference but not on the service
Modified:
tuscany/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java
tuscany/branches/sca-java-1.x/itest/jms-format/src/main/resources/jmsdefault/helloworld.composite
tuscany/branches/sca-java-1.x/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java
Modified: tuscany/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java?rev=768265&r1=768264&r2=768265&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java (original)
+++ tuscany/branches/sca-java-1.x/itest/jms-format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java Fri Apr 24 12:01:49 2009
@@ -31,17 +31,22 @@
@Reference
protected HelloWorldService helloWorldService3;
+
+ @Reference
+ protected HelloWorldService helloWorldService4;
public String getGreetings(String name){
return helloWorldService1.getGreetings(name) + " " +
helloWorldService2.getGreetings(name) + " " +
- helloWorldService3.getGreetings(name);
+ helloWorldService3.getGreetings(name) + " " +
+ helloWorldService4.getGreetings(name);
}
public String getPersonGreetings(Person person){
return helloWorldService1.getPersonGreetings(person) + " " +
helloWorldService2.getPersonGreetings(person) + " " +
- helloWorldService3.getPersonGreetings(person);
+ helloWorldService3.getPersonGreetings(person) + " " +
+ helloWorldService4.getPersonGreetings(person);
}
}
Modified: tuscany/branches/sca-java-1.x/itest/jms-format/src/main/resources/jmsdefault/helloworld.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/jms-format/src/main/resources/jmsdefault/helloworld.composite?rev=768265&r1=768264&r2=768265&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/jms-format/src/main/resources/jmsdefault/helloworld.composite (original)
+++ tuscany/branches/sca-java-1.x/itest/jms-format/src/main/resources/jmsdefault/helloworld.composite Fri Apr 24 12:01:49 2009
@@ -39,9 +39,15 @@
<reference name="helloWorldService3" >
<binding.jms>
<destination name="HelloWorldService3"/>
+ <tuscany:wireFormat.jmsdefault/>
+ </binding.jms>
+ </reference>
+ <reference name="helloWorldService4" >
+ <binding.jms>
+ <destination name="HelloWorldService4"/>
<tuscany:wireFormat.jmsdefault sendFormat="text"/>
</binding.jms>
- </reference>
+ </reference>
</component>
<component name="HelloWorldServiceComponent1">
@@ -59,7 +65,6 @@
<interface.java interface="org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld.HelloWorldService" />
<binding.jms>
<destination name="HelloWorldService2"/>
- <tuscany:wireFormat.jmsdefault/>
</binding.jms>
</service>
</component>
@@ -70,9 +75,20 @@
<!--interface.wsdl interface="http://helloworld/textxml#wsdl.interface(HelloWorld)" /-->
<binding.jms>
<destination name="HelloWorldService3"/>
- <tuscany:wireFormat.jmsdefault sendFormat="text"/>
+ <tuscany:wireFormat.jmsdefault />
</binding.jms>
</service>
</component>
+ <component name="HelloWorldServiceComponent4">
+ <implementation.java class="org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld.HelloWorldServiceImpl" />
+ <service name="HelloWorldService">
+ <!--interface.wsdl interface="http://helloworld/textxml#wsdl.interface(HelloWorld)" /-->
+ <binding.jms>
+ <destination name="HelloWorldService4"/>
+ <tuscany:wireFormat.jmsdefault />
+ </binding.jms>
+ </service>
+ </component>
+
</composite>
\ No newline at end of file
Modified: tuscany/branches/sca-java-1.x/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java?rev=768265&r1=768264&r2=768265&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java (original)
+++ tuscany/branches/sca-java-1.x/itest/jms-format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java Fri Apr 24 12:01:49 2009
@@ -51,12 +51,12 @@
public void testHelloWorldCreate() throws Exception {
HelloWorldService helloWorldService = ((SCAClient)node).getService(HelloWorldService.class, "HelloWorldReferenceComponent");
- assertEquals("Hello Fred Bloggs Hello Fred Bloggs Hello Fred Bloggs", helloWorldService.getGreetings("Fred Bloggs"));
+ assertEquals("Hello Fred Bloggs Hello Fred Bloggs Hello Fred Bloggs Hello Fred Bloggs", helloWorldService.getGreetings("Fred Bloggs"));
Person person = new Person();
person.setFirstName("Fred");
person.setLastName("Bloggs");
- assertEquals("Hello Fred Bloggs Hello Fred Bloggs Hello Fred Bloggs", helloWorldService.getPersonGreetings(person));
+ assertEquals("Hello Fred Bloggs Hello Fred Bloggs Hello Fred Bloggs Hello Fred Bloggs", helloWorldService.getPersonGreetings(person));
}
@After