Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8E0E0CF44 for ; Mon, 7 May 2012 15:13:49 +0000 (UTC) Received: (qmail 84472 invoked by uid 500); 7 May 2012 15:13:49 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 84431 invoked by uid 500); 7 May 2012 15:13:49 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 84424 invoked by uid 99); 7 May 2012 15:13:49 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 May 2012 15:13:49 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 May 2012 15:13:48 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C7DF623888EA; Mon, 7 May 2012 15:13:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1335054 - in /cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring: ApplicationContextTest.java bean.properties beans-props.xml Date: Mon, 07 May 2012 15:13:27 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120507151327.C7DF623888EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Mon May 7 15:13:27 2012 New Revision: 1335054 URL: http://svn.apache.org/viewvc?rev=1335054&view=rev Log: Fix tests that fail if run in different order (required proper cleanups) Modified: cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/bean.properties cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/beans-props.xml Modified: cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java?rev=1335054&r1=1335053&r2=1335054&view=diff ============================================================================== --- cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java (original) +++ cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/ApplicationContextTest.java Mon May 7 15:13:27 2012 @@ -37,9 +37,10 @@ import org.apache.cxf.transport.Destinat import org.apache.cxf.transport.http.HTTPConduit; import org.apache.cxf.transport.http_jetty.JettyHTTPDestination; import org.apache.cxf.transport.http_jetty.JettyHTTPServerEngine; -import org.junit.AfterClass; + +import org.junit.After; import org.junit.Assert; -import org.junit.BeforeClass; +import org.junit.Before; import org.junit.Test; import org.springframework.beans.factory.xml.XmlBeanDefinitionStoreException; @@ -49,13 +50,13 @@ public class ApplicationContextTest exte private static final String S1 = ApplicationContextTest.class.getResource("/META-INF/cxf/cxf.xml").toString(); - @BeforeClass - public static void classUp() { + @Before + public void setUp() { BusFactory.setDefaultBus(null); } - @AfterClass - public static void classDown() { + @After + public void clearBus() { BusFactory.setDefaultBus(null); } @@ -83,6 +84,8 @@ public class ApplicationContextTest exte //ctx.refresh(); checkContext(ctx); + ctx.close(); + ctx.destroy(); } @Test public void testContextWithProperties() throws Exception { @@ -92,6 +95,8 @@ public class ApplicationContextTest exte TestApplicationContext ctx = new TestApplicationContext( new String[] {S1, s4}); checkContext(ctx); + ctx.close(); + ctx.destroy(); } private void checkContext(TestApplicationContext ctx) throws Exception { ConfigurerImpl cfg = new ConfigurerImpl(ctx); Modified: cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/bean.properties URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/bean.properties?rev=1335054&r1=1335053&r2=1335054&view=diff ============================================================================== --- cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/bean.properties (original) +++ cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/bean.properties Mon May 7 15:13:27 2012 @@ -26,3 +26,4 @@ engine.port.zero.minThreads=21 engine.port.zero.maxThreads=389 engine.port.nine.one.minThreads=99 engine.port.nine.one.maxThreads=777 +engine.port.nine.one.maxIdle=40000 \ No newline at end of file Modified: cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/beans-props.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/beans-props.xml?rev=1335054&r1=1335053&r2=1335054&view=diff ============================================================================== --- cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/beans-props.xml (original) +++ cxf/trunk/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/spring/beans-props.xml Mon May 7 15:13:27 2012 @@ -80,7 +80,7 @@ - +