cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r1069265 - in /cxf/branches/2.2.x-fixes: ./ rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/
Date Thu, 10 Feb 2011 08:17:11 GMT
Author: ningjiang
Date: Thu Feb 10 08:17:11 2011
New Revision: 1069265

URL: http://svn.apache.org/viewvc?rev=1069265&view=rev
Log:
Merged revisions 1069254 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.3.x-fixes

................
  r1069254 | ningjiang | 2011-02-10 15:44:08 +0800 (Thu, 10 Feb 2011) | 9 lines
  
  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.2.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/AbstractSimpleFrontendSpringTest.java
      - copied, changed from r1069254, cxf/branches/2.3.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/AbstractSimpleFrontendSpringTest.java
Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/ClientServerTest.java
    cxf/branches/2.2.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/SpringBeansTest.java

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 10 08:17:11 2011
@@ -1,2 +1,2 @@
-/cxf/branches/2.3.x-fixes:1041185,1044309,1051780,1051809,1051817,1059819,1062789
-/cxf/trunk:1041183,1044238-1044305,1049426,1051790,1051792,1059815,1062778
+/cxf/branches/2.3.x-fixes:1041185,1044309,1051780,1051809,1051817,1059819,1062789,1069254
+/cxf/trunk:1041183,1044238-1044305,1049426,1051790,1051792,1059815,1062778,1069249

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Copied: cxf/branches/2.2.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/AbstractSimpleFrontendSpringTest.java
(from r1069254, cxf/branches/2.3.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/AbstractSimpleFrontendSpringTest.java)
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/AbstractSimpleFrontendSpringTest.java?p2=cxf/branches/2.2.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/AbstractSimpleFrontendSpringTest.java&p1=cxf/branches/2.3.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/AbstractSimpleFrontendSpringTest.java&r1=1069254&r2=1069265&rev=1069265&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/AbstractSimpleFrontendSpringTest.java
(original)
+++ cxf/branches/2.2.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/AbstractSimpleFrontendSpringTest.java
Thu Feb 10 08:17:11 2011
@@ -23,6 +23,7 @@ import org.junit.After;
 import org.junit.Assert;
 import org.springframework.context.support.AbstractApplicationContext;
 
+@org.junit.Ignore
 public class AbstractSimpleFrontendSpringTest extends Assert {
     protected AbstractApplicationContext ctx;
 

Modified: cxf/branches/2.2.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/ClientServerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/ClientServerTest.java?rev=1069265&r1=1069264&r2=1069265&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/ClientServerTest.java
(original)
+++ cxf/branches/2.2.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/ClientServerTest.java
Thu Feb 10 08:17:11 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.2.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/SpringBeansTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/SpringBeansTest.java?rev=1069265&r1=1069264&r2=1069265&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/SpringBeansTest.java
(original)
+++ cxf/branches/2.2.x-fixes/rt/frontend/simple/src/test/java/org/apache/cxf/frontend/spring/SpringBeansTest.java
Thu Feb 10 08:17:11 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;
@@ -43,11 +42,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");
@@ -85,7 +84,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");



Mime
View raw message