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 7C52DC9D0 for ; Wed, 6 Jun 2012 17:57:36 +0000 (UTC) Received: (qmail 37637 invoked by uid 500); 6 Jun 2012 17:57:36 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 37586 invoked by uid 500); 6 Jun 2012 17:57:36 -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 37579 invoked by uid 99); 6 Jun 2012 17:57:36 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Jun 2012 17:57:36 +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; Wed, 06 Jun 2012 17:57:34 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C72E42388B43; Wed, 6 Jun 2012 17:57:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1347007 - in /cxf/branches/2.5.x-fixes/systests/jaxrs/src/test: java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPullSpringTest.java resources/jaxrs_logging_atompull/WEB-INF/beans.xml Date: Wed, 06 Jun 2012 17:57:14 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120606175714.C72E42388B43@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Wed Jun 6 17:57:14 2012 New Revision: 1347007 URL: http://svn.apache.org/viewvc?rev=1347007&view=rev Log: Merged revisions 1346559 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1346559 | dkulp | 2012-06-05 16:07:52 -0400 (Tue, 05 Jun 2012) | 2 lines Some java 7 test order and cleanup fixes. ........ Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPullSpringTest.java cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/resources/jaxrs_logging_atompull/WEB-INF/beans.xml Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPullSpringTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPullSpringTest.java?rev=1347007&r1=1347006&r2=1347007&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPullSpringTest.java (original) +++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPullSpringTest.java Wed Jun 6 17:57:14 2012 @@ -82,8 +82,10 @@ public class JAXRSLoggingAtomPullSpringT System.setProperty("systemtests.jaxrs.logs.folder", resourceDir); launchServer(SpringServer.class, true); context = JAXBContext.newInstance(org.apache.cxf.management.web.logging.LogRecord.class); + createStaticBus(); + System.clearProperty("systemtests.jaxrs.logs.folder"); } - + @Ignore public static class SpringServer extends AbstractSpringServer { public static final int PORT = allocatePortAsInt(SpringServer.class); @@ -97,7 +99,6 @@ public class JAXRSLoggingAtomPullSpringT Storage.clearRecords(); } - @Test public void testFeed() throws Exception { String listing = WebClient.create("http://localhost:" + PORT + "/services").get(String.class); @@ -135,6 +136,9 @@ public class JAXRSLoggingAtomPullSpringT @Test public void testPagedFeed() throws Exception { + WebClient wcReset = WebClient.create("http://localhost:" + PORT + "/reset"); + wcReset.post(null); + WebClient wc = WebClient.create("http://localhost:" + PORT + "/resource2/paged"); wc.path("/log").get(); Thread.sleep(3000); @@ -324,6 +328,7 @@ public class JAXRSLoggingAtomPullSpringT private String fillPagedEntries(List entries, String href, int expected, String rel, boolean relExpected) { Feed feed = getFeed(href); + assertEquals(expected, feed.getEntries().size()); entries.addAll(feed.getEntries()); Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/resources/jaxrs_logging_atompull/WEB-INF/beans.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/resources/jaxrs_logging_atompull/WEB-INF/beans.xml?rev=1347007&r1=1347006&r2=1347007&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/resources/jaxrs_logging_atompull/WEB-INF/beans.xml (original) +++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/resources/jaxrs_logging_atompull/WEB-INF/beans.xml Wed Jun 6 17:57:14 2012 @@ -35,7 +35,6 @@ http://www.springframework.org/schema/ut http://www.springframework.org/schema/util/spring-util.xsd"> -