Author: dkulp
Date: Tue Jun 5 20:07:52 2012
New Revision: 1346559
URL: http://svn.apache.org/viewvc?rev=1346559&view=rev
Log:
Some java 7 test order and cleanup fixes.
Modified:
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPullSpringTest.java
cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_logging_atompull/WEB-INF/beans.xml
Modified:
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPullSpringTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPullSpringTest.java?rev=1346559&r1=1346558&r2=1346559&view=diff
==============================================================================
---
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPullSpringTest.java
(original)
+++
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPullSpringTest.java
Tue Jun 5 20:07:52 2012
@@ -83,8 +83,9 @@ public class JAXRSLoggingAtomPullSpringT
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);
@@ -98,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);
@@ -136,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);
@@ -325,6 +328,7 @@ public class JAXRSLoggingAtomPullSpringT
private String fillPagedEntries(List<Entry> entries, String href, int
expected,
String rel, boolean relExpected) {
Feed feed = getFeed(href);
+
assertEquals(expected, feed.getEntries().size());
entries.addAll(feed.getEntries());
Modified:
cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_logging_atompull/WEB-INF/beans.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_logging_atompull/WEB-INF/beans.xml?rev=1346559&r1=1346558&r2=1346559&view=diff
==============================================================================
---
cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_logging_atompull/WEB-INF/beans.xml
(original)
+++
cxf/trunk/systests/jaxrs/src/test/resources/jaxrs_logging_atompull/WEB-INF/beans.xml
Tue Jun 5 20:07:52 2012
@@ -35,7 +35,6 @@ http://www.springframework.org/schema/ut
http://www.springframework.org/schema/util/spring-util.xsd";>
<import resource="classpath:META-INF/cxf/cxf.xml" />
- <import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
<bean id = "atomPullServer"
class="org.apache.cxf.management.web.logging.atom.AtomPullServer"
init-method="init">
