Author: sergeyb
Date: Sun Apr 25 17:26:40 2010
New Revision: 937833
URL: http://svn.apache.org/viewvc?rev=937833&view=rev
Log:
Attempting to fix JAXRSLoggingAtomPushTest
Modified:
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPushTest.java
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush.properties
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush_atompub.properties
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush_disabled.properties
Modified:
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPushTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPushTest.java?rev=937833&r1=937832&r2=937833&view=diff
==============================================================================
---
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPushTest.java
(original)
+++
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSLoggingAtomPushTest.java
Sun Apr 25 17:26:40 2010
@@ -119,25 +119,6 @@ public class JAXRSLoggingAtomPushTest ex
}
@Test
- public void testOneElementBatch() throws Exception {
- configureLogging("resources/logging_atompush.properties");
- logSixEvents(LOG);
- // need to wait: multithreaded and client-server journey
- Thread.sleep(3000);
- assertEquals("Different logged events count;", 6,
Resource.feeds.size());
- }
-
- @Test
- public void testMultiElementBatch() throws Exception {
- configureLogging("resources/logging_atompush_batch.properties");
- logSixEvents(LOG);
- // need to wait: multithreaded and client-server journey
- Thread.sleep(3000);
- // 6 events / 3 element batch = 2 feeds expected
- assertEquals("Different logged events count;", 2,
Resource.feeds.size());
- }
-
- @Test
public void testPrivateLogger() throws Exception {
configureLogging("resources/logging_atompush_disabled.properties");
Logger log = LogUtils.getL7dLogger(JAXRSLoggingAtomPushTest.class,
null, "private-log");
@@ -152,7 +133,7 @@ public class JAXRSLoggingAtomPushTest ex
// 6 events / 2 element batch = 3 feeds expected
assertEquals("Different logged events count;", 3,
Resource.feeds.size());
}
-
+
@Test
public void testPrivateLoggerCustomBuilders() throws Exception {
configureLogging("resources/logging_atompush_disabled.properties");
@@ -172,8 +153,28 @@ public class JAXRSLoggingAtomPushTest ex
// 6 events / 2 element batch = 3 feeds expected
assertEquals("Different logged events count;", 3,
Resource.feeds.size());
}
+
+ @Test
+ public void testOneElementBatch() throws Exception {
+ configureLogging("resources/logging_atompush.properties");
+ logSixEvents(LOG);
+ // need to wait: multithreaded and client-server journey
+ Thread.sleep(3000);
+ assertEquals("Different logged events count;", 6,
Resource.feeds.size());
+ }
+ @Test
+ public void testMultiElementBatch() throws Exception {
+ configureLogging("resources/logging_atompush_batch.properties");
+ logSixEvents(LOG);
+ // need to wait: multithreaded and client-server journey
+ Thread.sleep(3000);
+ // 6 events / 3 element batch = 2 feeds expected
+ assertEquals("Different logged events count;", 2,
Resource.feeds.size());
+ }
+
+
@Ignore
private
AbstractFeedBuilder<List<org.apache.cxf.management.web.logging.LogRecord>>
createCustomFeedBuilder() {
Modified:
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush.properties
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush.properties?rev=937833&r1=937832&r2=937833&view=diff
==============================================================================
---
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush.properties
(original)
+++
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush.properties
Sun Apr 25 17:26:40 2010
@@ -21,6 +21,7 @@ org.apache.cxf.resource.level = OFF
org.springframework.level = OFF
org.mortbay.level = OFF
org.apache.axiom.level = OFF
+org.apache.cxf.ws.policy.level = OFF
# Atom handler specific settings
org.apache.cxf.management.web.logging.atom.AtomPushHandler.url =
http://localhost:9080
Modified:
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush_atompub.properties
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush_atompub.properties?rev=937833&r1=937832&r2=937833&view=diff
==============================================================================
---
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush_atompub.properties
(original)
+++
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush_atompub.properties
Sun Apr 25 17:26:40 2010
@@ -21,6 +21,7 @@ org.apache.cxf.resource.level = OFF
org.springframework.level = OFF
org.mortbay.level = OFF
org.apache.axiom.level = OFF
+org.apache.cxf.ws.policy.level = OFF
# Atom handler specific settings
org.apache.cxf.management.web.logging.atom.AtomPushHandler.url =
http://localhost:9080/atomPub
Modified:
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush_disabled.properties
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush_disabled.properties?rev=937833&r1=937832&r2=937833&view=diff
==============================================================================
---
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush_disabled.properties
(original)
+++
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/resources/logging_atompush_disabled.properties
Sun Apr 25 17:26:40 2010
@@ -12,4 +12,4 @@ org.apache.cxf.resource.level = OFF
org.springframework.level = OFF
org.mortbay.level = OFF
org.apache.axiom.level = OFF
-
+org.apache.cxf.ws.policy.level = OFF
