From c4252b4297e277f263154a8bb896fb160cfbca7d Mon Sep 17 00:00:00 2001 From: Keith Wall Date: Sat, 26 May 2012 00:32:54 +0000 Subject: QPID-3936: Java Performance Test Framework - better PSFC support Change ProducerParticipant to cancel the sending test messages after maximumDuration is reached. This is required for deterministic behaviour when using the Producer Side Flow Control feature of the Java Broker, otherwise the send() can hang indefinitely after consumers have shutdown. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1342843 13f79535-47bb-0310-9956-ffa450edef68 --- .../client/utils/ExecutorWithNoLimitsTest.java | 61 +++++++++++ .../client/utils/ExecutorWithTimeLimitTest.java | 118 +++++++++++++++++++++ 2 files changed, 179 insertions(+) create mode 100644 qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/utils/ExecutorWithNoLimitsTest.java create mode 100644 qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/utils/ExecutorWithTimeLimitTest.java (limited to 'qpid/java/perftests/src/test') diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/utils/ExecutorWithNoLimitsTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/utils/ExecutorWithNoLimitsTest.java new file mode 100644 index 0000000000..37820d2582 --- /dev/null +++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/utils/ExecutorWithNoLimitsTest.java @@ -0,0 +1,61 @@ +/* + * 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.qpid.disttest.client.utils; + +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import java.util.concurrent.Callable; + +import junit.framework.TestCase; + +public class ExecutorWithNoLimitsTest extends TestCase +{ + private final static Object RESULT = new Object(); + + private ExecutorWithLimits _limiter = new ExecutorWithNoLimits(); + @SuppressWarnings("unchecked") + private Callable _callback = mock(Callable.class); + + public void testNormalExecution() throws Exception + { + when(_callback.call()).thenReturn(RESULT); + final Object actualResult = _limiter.execute(_callback); + verify(_callback).call(); + assertEquals(RESULT, actualResult); + } + + public void testCallableThrowsException() throws Exception + { + when(_callback.call()).thenThrow(new Exception("mocked exception")); + + try + { + _limiter.execute(_callback); + fail("Exception not thrown"); + } + catch (Exception e) + { + // PASS + } + verify(_callback).call(); + } +} diff --git a/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/utils/ExecutorWithTimeLimitTest.java b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/utils/ExecutorWithTimeLimitTest.java new file mode 100644 index 0000000000..7a85de99ee --- /dev/null +++ b/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/utils/ExecutorWithTimeLimitTest.java @@ -0,0 +1,118 @@ +/* + * 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.qpid.disttest.client.utils; + +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import static org.mockito.Mockito.never; + +import java.util.concurrent.Callable; +import java.util.concurrent.CancellationException; + +import junit.framework.TestCase; + +public class ExecutorWithTimeLimitTest extends TestCase +{ + private static final int TIMEOUT = 500; + private static final Object RESULT = new Object(); + + private ExecutorWithLimits _limiter = new ExecutorWithTimeLimit(System.currentTimeMillis(), TIMEOUT); + @SuppressWarnings("unchecked") + private Callable _callback = mock(Callable.class); + + @Override + protected void tearDown() throws Exception + { + super.tearDown(); + _limiter.shutdown(); + } + + public void testCallableCompletesNormally() throws Exception + { + when(_callback.call()).thenReturn(RESULT); + + final Object actualResult = _limiter.execute(_callback); + + verify(_callback).call(); + assertEquals(RESULT, actualResult); + } + + public void testCallableThrowsException() throws Exception + { + when(_callback.call()).thenThrow(new Exception("mocked exception")); + + try + { + _limiter.execute(_callback); + fail("Exception not thrown"); + } + catch (CancellationException ce) + { + fail("Wrong exception thrown"); + } + catch (Exception e) + { + // PASS + } + verify(_callback).call(); + } + + public void testCallableNotRunDueToInsufficentTimeRemaining() throws Exception + { + long now = System.currentTimeMillis(); + _limiter = new ExecutorWithTimeLimit(now - 100, 100); + + try + { + _limiter.execute(_callback); + fail("Exception not thrown"); + } + catch (CancellationException ca) + { + // PASS + } + + verify(_callback, never()).call(); + } + + public void testExecutionInterruptedByTimeout() throws Exception + { + Callable oversleepingCallback = new Callable() + { + @Override + public Void call() throws Exception + { + Thread.sleep(TIMEOUT * 2); + return null; + } + }; + + try + { + _limiter.execute(oversleepingCallback); + fail("Exception not thrown"); + } + catch (CancellationException ca) + { + // PASS + } + } +} -- cgit v1.2.1