You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ni...@apache.org on 2011/02/10 08:44:09 UTC
svn commit: r1069254 - in /cxf/branches/2.3.x-fixes: ./
rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/
Author: ningjiang
Date: Thu Feb 10 07:44:08 2011
New Revision: 1069254
URL: http://svn.apache.org/viewvc?rev=1069254&view=rev
Log:
Merged revisions 1069249 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1069249 | ningjiang | 2011-02-10 15:28:00 +0800 (Thu, 10 Feb 2011) | 1 line
CXF-3326 fixed the test error of RountripTest
........
Added:
cxf/branches/2.3.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/AbstractSimpleFrontendSpringTest.java
- copied unchanged from r1069249, cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/AbstractSimpleFrontendSpringTest.java
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/ClientServerTest.java
cxf/branches/2.3.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/SpringBeansTest.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 10 07:44:08 2011
@@ -1 +1 @@
-/cxf/trunk:1068320,1068337,1068525,1068867,1068877
+/cxf/trunk:1068320,1068337,1068525,1068867,1068877,1069249
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.3.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/ClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/ClientServerTest.java?rev=1069254&r1=1069253&r2=1069254&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/ClientServerTest.java (original)
+++ cxf/branches/2.3.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/ClientServerTest.java Thu Feb 10 07:44:08 2011
@@ -19,8 +19,6 @@
package org.apache.cxf.frontend.spring;
import java.util.Arrays;
-import junit.framework.Assert;
-
import org.apache.cxf.BusFactory;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.frontend.ClientProxy;
@@ -34,13 +32,15 @@ import org.junit.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+
// set up the client and server with spring bean configuration
-public class ClientServerTest extends Assert {
+public class ClientServerTest extends AbstractSimpleFrontendSpringTest {
+
@Test
public void testClientServer() {
- BusFactory.setDefaultBus(null);
- ClassPathXmlApplicationContext ctx =
+ ctx =
new ClassPathXmlApplicationContext(new String[] {"/org/apache/cxf/frontend/spring/rountrip.xml"});
HelloService greeter = (HelloService) ctx.getBean("client");
@@ -62,6 +62,8 @@ public class ClientServerTest extends As
result = greeter.sayHello();
assertTrue(out.wasCalled());
assertTrue(in.wasCalled());
+ ctx.close();
+ BusFactory.setDefaultBus(null);
}
private class TestInterceptor extends AbstractPhaseInterceptor<Message> {
Modified: cxf/branches/2.3.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/SpringBeansTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/SpringBeansTest.java?rev=1069254&r1=1069253&r2=1069254&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/SpringBeansTest.java (original)
+++ cxf/branches/2.3.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/SpringBeansTest.java Thu Feb 10 07:44:08 2011
@@ -19,7 +19,6 @@
package org.apache.cxf.frontend.spring;
import java.util.List;
-import junit.framework.Assert;
import org.apache.cxf.binding.BindingConfiguration;
import org.apache.cxf.binding.soap.Soap12;
@@ -44,11 +43,11 @@ import org.junit.Test;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-public class SpringBeansTest extends Assert {
+public class SpringBeansTest extends AbstractSimpleFrontendSpringTest {
@Test
public void testServers() throws Exception {
- ClassPathXmlApplicationContext ctx =
+ ctx =
new ClassPathXmlApplicationContext(new String[] {"/org/apache/cxf/frontend/spring/servers.xml"});
ServerFactoryBean bean = (ServerFactoryBean) ctx.getBean("simple");
@@ -86,7 +85,7 @@ public class SpringBeansTest extends Ass
@Test
public void testClients() throws Exception {
AbstractFactoryBeanDefinitionParser.setFactoriesAreAbstract(false);
- ClassPathXmlApplicationContext ctx =
+ ctx =
new ClassPathXmlApplicationContext(new String[] {"/org/apache/cxf/frontend/spring/clients.xml"});
Object bean = ctx.getBean("client1.proxyFactory");