Added:
incubator/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMUtilsTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMUtilsTest.java?view=auto&rev=541364
==============================================================================
---
incubator/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMUtilsTest.java
(added)
+++
incubator/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMUtilsTest.java
Thu May 24 10:33:11 2007
@@ -0,0 +1,65 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.ws.rm;
+
+import javax.xml.namespace.QName;
+
+import org.apache.cxf.endpoint.Endpoint;
+import org.apache.cxf.service.model.EndpointInfo;
+import org.apache.cxf.service.model.ServiceInfo;
+import org.easymock.classextension.EasyMock;
+import org.easymock.classextension.IMocksControl;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ *
+ */
+public class RMUtilsTest extends Assert {
+
+ private IMocksControl control;
+
+ @Before
+ public void setUp() {
+ control = EasyMock.createNiceControl();
+ }
+
+ @After
+ public void tearDown() {
+ control.verify();
+ }
+
+ @Test
+ public void testGetName() {
+ Endpoint e = control.createMock(Endpoint.class);
+ EndpointInfo ei = control.createMock(EndpointInfo.class);
+ EasyMock.expect(e.getEndpointInfo()).andReturn(ei).times(2);
+ QName eqn = new QName("ns2", "endpoint");
+ EasyMock.expect(ei.getName()).andReturn(eqn);
+ ServiceInfo si = control.createMock(ServiceInfo.class);
+ EasyMock.expect(ei.getService()).andReturn(si);
+ QName sqn = new QName("ns1", "service");
+ EasyMock.expect(si.getName()).andReturn(sqn);
+ control.replay();
+ assertEquals("{ns1}service.{ns2}endpoint",
RMUtils.getEndpointIdentifier(e));
+ }
+}
Propchange:
incubator/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMUtilsTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/cxf/trunk/rt/ws/rm/src/test/java/org/apache/cxf/ws/rm/RMUtilsTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/ClientPersistenceTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/ClientPersistenceTest.java?view=auto&rev=541364
==============================================================================
---
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/ClientPersistenceTest.java
(added)
+++
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/ClientPersistenceTest.java
Thu May 24 10:33:11 2007
@@ -0,0 +1,265 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.systest.ws.rm;
+
+import java.math.BigInteger;
+import java.util.Collection;
+import java.util.logging.Logger;
+
+import javax.xml.ws.Endpoint;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.BusFactory;
+import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.endpoint.Client;
+import org.apache.cxf.frontend.ClientProxy;
+import org.apache.cxf.greeter_control.Greeter;
+import org.apache.cxf.greeter_control.GreeterService;
+import org.apache.cxf.interceptor.LoggingInInterceptor;
+import org.apache.cxf.interceptor.LoggingOutInterceptor;
+import org.apache.cxf.systest.ws.policy.GreeterImpl;
+import org.apache.cxf.systest.ws.util.InMessageRecorder;
+import org.apache.cxf.systest.ws.util.MessageFlow;
+import org.apache.cxf.systest.ws.util.MessageRecorder;
+import org.apache.cxf.systest.ws.util.OutMessageRecorder;
+import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.cxf.ws.rm.DestinationSequence;
+import org.apache.cxf.ws.rm.RMConstants;
+import org.apache.cxf.ws.rm.RMManager;
+import org.apache.cxf.ws.rm.RMUtils;
+import org.apache.cxf.ws.rm.SourceSequence;
+import org.apache.cxf.ws.rm.persistence.RMMessage;
+import org.apache.cxf.ws.rm.persistence.RMStore;
+import org.apache.cxf.ws.rm.persistence.jdbc.RMTxStore;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * Tests the addition of WS-RM properties to application messages and the
+ * exchange of WS-RM protocol messages.
+ */
+public class ClientPersistenceTest extends AbstractBusClientServerTestBase {
+
+ public static final String GREETMEONEWAY_ACTION = null;
+ public static final String GREETME_ACTION = null;
+ private static final Logger LOG =
Logger.getLogger(ClientPersistenceTest.class.getName());
+
+ private Greeter greeter;
+ private OutMessageRecorder out;
+ private InMessageRecorder in;
+
+ public static class Server extends AbstractBusTestServerBase {
+
+ protected void run() {
+ SpringBusFactory bf = new SpringBusFactory();
+ Bus bus =
bf.createBus("/org/apache/cxf/systest/ws/rm/oneway-client-crash.xml");
+ BusFactory.setDefaultBus(bus);
+
+ LoggingInInterceptor logIn = new LoggingInInterceptor();
+ bus.getInInterceptors().add(logIn);
+ LoggingOutInterceptor logOut = new LoggingOutInterceptor();
+ bus.getOutFaultInterceptors().add(logOut);
+ bus.getOutFaultInterceptors().add(logOut);
+
+
bus.getExtension(RMManager.class).getRMAssertion().getBaseRetransmissionInterval()
+ .setMilliseconds(new BigInteger("60000"));
+
+ GreeterImpl implementor = new GreeterImpl();
+ String address = "http://localhost:9020/SoapContext/GreeterPort";;
+ Endpoint.publish(address, implementor);
+ LOG.info("Published greeter endpoint.");
+ }
+
+ public static void main(String[] args) {
+ try {
+ RMTxStore.deleteDatabaseFiles();
+ Server s = new Server();
+ s.start();
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ System.exit(-1);
+ } finally {
+ System.out.println("done!");
+ }
+ }
+ }
+
+ @BeforeClass
+ public static void startServers() throws Exception {
+ String derbyHome = System.getProperty("derby.system.home");
+ try {
+ System.setProperty("derby.system.home", derbyHome + "-server");
+ assertTrue("server did not launch correctly",
launchServer(Server.class));
+ } finally {
+ System.setProperty("derby.system.home", derbyHome);
+ }
+ RMTxStore.deleteDatabaseFiles();
+ }
+
+ @AfterClass
+ public static void tearDownOnce() {
+ RMTxStore.deleteDatabaseFiles(RMTxStore.DEFAULT_DATABASE_DIR, false);
+ }
+
+ @Test
+ public void testRecovery() throws Exception {
+ startClient();
+ populateStore();
+ verifyStorePopulation();
+ stopClient();
+ startClient();
+ recover();
+ verifyRecovery();
+ }
+
+ void startClient() {
+ LOG.fine("Creating greeter client");
+ SpringBusFactory bf = new SpringBusFactory();
+ bus =
bf.createBus("/org/apache/cxf/systest/ws/rm/oneway-client-crash.xml");
+ BusFactory.setDefaultBus(bus);
+
+ GreeterService gs = new GreeterService();
+ greeter = gs.getGreeterPort();
+
+ out = new OutMessageRecorder();
+ in = new InMessageRecorder();
+
+ bus.getOutInterceptors().add(out);
+ bus.getInInterceptors().add(in);
+ }
+
+ void populateStore() throws Exception {
+
+
bus.getExtension(RMManager.class).getRMAssertion().getBaseRetransmissionInterval()
+ .setMilliseconds(new BigInteger("60000"));
+ bus.getOutInterceptors().add(new MessageLossSimulator());
+
+ greeter.greetMeOneWay("one");
+ greeter.greetMeOneWay("two");
+ greeter.greetMeOneWay("three");
+ greeter.greetMeOneWay("four");
+
+ MessageFlow mf = new MessageFlow(out.getOutboundMessages(),
in.getInboundMessages());
+
+ assertNotNull(mf);
+ awaitMessages(5, 3);
+
+ mf.verifyMessages(5, true);
+ String[] expectedActions = new String[]
{RMConstants.getCreateSequenceAction(),
+ GREETMEONEWAY_ACTION,
+ GREETMEONEWAY_ACTION,
+ GREETMEONEWAY_ACTION,
+ GREETMEONEWAY_ACTION};
+ mf.verifyActions(expectedActions, true);
+ mf.verifyMessageNumbers(new String[] {null, "1", "2", "3", "4"}, true);
+ mf.verifyAcknowledgements(new boolean[5], true);
+
+
+ mf.verifyMessages(3, false);
+ mf.verifyPartialResponses(2);
+ mf.verifyAcknowledgements(new boolean[] {false, true, true}, false);
+ mf.purgePartialResponses();
+ expectedActions = new String[]
{RMConstants.getCreateSequenceResponseAction()};
+ mf.verifyActions(expectedActions, false);
+ }
+
+ void verifyStorePopulation() {
+
+ RMManager manager = bus.getExtension(RMManager.class);
+ assertNotNull(manager);
+
+ RMStore store = manager.getStore();
+ assertNotNull(store);
+
+ Client client = ClientProxy.getClient(greeter);
+ String id = RMUtils.getEndpointIdentifier(client.getEndpoint());
+
+ Collection<DestinationSequence> dss =
+ store.getDestinationSequences(id);
+ assertEquals(1, dss.size());
+
+ Collection<SourceSequence> sss =
+ store.getSourceSequences(id);
+ assertEquals(1, sss.size());
+
+ Collection<RMMessage> msgs =
+ store.getMessages(sss.iterator().next().getIdentifier(), true);
+ assertEquals(2, msgs.size());
+
+ msgs =
+ store.getMessages(sss.iterator().next().getIdentifier(), false);
+ assertEquals(0, msgs.size());
+ }
+
+ void stopClient() {
+ // ClientProxy.getClient(greeter).destroy();
+ bus.shutdown(true);
+ }
+
+ void recover() throws Exception {
+
+ // do nothing - resends should happen in the background
+
+ Thread.sleep(5000);
+ LOG.info("Recovered messages should have been resent by now.");
+
+ }
+
+ void verifyRecovery() throws Exception {
+
+ RMManager manager = bus.getExtension(RMManager.class);
+ assertNotNull(manager);
+
+ RMStore store = manager.getStore();
+ assertNotNull(store);
+
+ Client client = ClientProxy.getClient(greeter);
+ String id = RMUtils.getEndpointIdentifier(client.getEndpoint());
+
+ Collection<DestinationSequence> dss =
+ store.getDestinationSequences(id);
+ assertEquals(1, dss.size());
+
+ Collection<SourceSequence> sss =
+ store.getSourceSequences(id);
+ assertEquals(1, sss.size());
+
+ int i = 0;
+ while (store.getMessages(sss.iterator().next().getIdentifier(),
true).size() > 0 && i < 10) {
+ Thread.sleep(200);
+ i++;
+ }
+
+ assertEquals(0,
store.getMessages(sss.iterator().next().getIdentifier(), true).size());
+ assertEquals(0,
store.getMessages(sss.iterator().next().getIdentifier(), false).size());
+ }
+
+ private void awaitMessages(int nExpectedOut, int nExpectedIn) {
+ awaitMessages(nExpectedOut, nExpectedIn, 10000);
+ }
+
+ private void awaitMessages(int nExpectedOut, int nExpectedIn, int timeout)
{
+ MessageRecorder mr = new MessageRecorder(out, in);
+ mr.awaitMessages(nExpectedOut, nExpectedIn, timeout);
+ }
+
+}
Propchange:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/ClientPersistenceTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/ClientPersistenceTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/oneway-client-crash.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/oneway-client-crash.xml?view=diff&rev=541364&r1=541363&r2=541364
==============================================================================
---
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/oneway-client-crash.xml
(original)
+++
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/ws/rm/oneway-client-crash.xml
Thu May 24 10:33:11 2007
@@ -21,7 +21,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:wsrm-mgr="http://cxf.apache.org/ws/rm/manager";
xmlns:wsrm-policy="http://schemas.xmlsoap.org/ws/2005/02/rm/policy";
+ xmlns:http="http://cxf.apache.org/transports/http/configuration";
xsi:schemaLocation="
+http://cxf.apache.org/transports/http/configuration
http://cxf.apache.org/schema/transports/http.xsd
http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/ws/rm/manager.xsd
http://schemas.xmlsoap.org/ws/2005/02/rm/policy
http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd
http://cxf.apache.org/configuration/beans
http://cxf.apache.org/schemas/configuration/cxf-beans.xsd
@@ -31,17 +33,8 @@
<bean class="org.apache.cxf.ws.rm.persistence.jdbc.RMTxStore"/>
-
- <wsrm-mgr:rmManager id="org.apache.cxf.ws.rm.RMManager">
- <wsrm-policy:RMAssertion>
- <wsrm-policy:BaseRetransmissionInterval Milliseconds="10000"/>
- <wsrm-policy:AcknowledgementInterval Milliseconds="2000"/>
- </wsrm-policy:RMAssertion>
- <wsrm-mgr:destinationPolicy>
- <wsrm-mgr:acksPolicy intraMessageThreshold="0"/>
- </wsrm-mgr:destinationPolicy>
+ <wsrm-mgr:rmManager id="org.apache.cxf.ws.rm.RMManager">
<property name="store"
ref="org.apache.cxf.ws.rm.persistence.jdbc.RMTxStore"/>
-
</wsrm-mgr:rmManager>
</beans>
