Added tests for pool maxSize and fix test for the default pool size (cherry picked from commit 39a27ab079b7dbf6e9f6f9462cefee8f92356713)
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/bc006cdd Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/bc006cdd Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/bc006cdd Branch: refs/heads/tomee-1.7.x Commit: bc006cdde73b4f3537f4b3a7ec66b12fff138630 Parents: 7592b0d Author: Daniel Cunha (soro) <[email protected]> Authored: Wed Jan 10 14:09:36 2018 -0300 Committer: Thiago Veronezi <[email protected]> Committed: Wed Jan 17 13:16:30 2018 -0500 ---------------------------------------------------------------------- .../mdb/MaxSizePoolEndpointHandlerTest.java | 159 +++++++++++++++++++ .../connector/impl/SampleResourceAdapter.java | 2 +- 2 files changed, 160 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/bc006cdd/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/MaxSizePoolEndpointHandlerTest.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/MaxSizePoolEndpointHandlerTest.java b/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/MaxSizePoolEndpointHandlerTest.java new file mode 100644 index 0000000..af50393 --- /dev/null +++ b/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/MaxSizePoolEndpointHandlerTest.java @@ -0,0 +1,159 @@ +/* + * 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.openejb.core.mdb; + +import org.apache.openejb.core.mdb.connector.api.InboundListener; +import org.apache.openejb.core.mdb.connector.api.SampleConnection; +import org.apache.openejb.core.mdb.connector.api.SampleConnectionFactory; +import org.apache.openejb.core.mdb.connector.impl.SampleActivationSpec; +import org.apache.openejb.core.mdb.connector.impl.SampleManagedConnectionFactory; +import org.apache.openejb.core.mdb.connector.impl.SampleResourceAdapter; +import org.apache.openejb.jee.MessageDrivenBean; +import org.apache.openejb.junit.ApplicationComposer; +import org.apache.openejb.monitoring.LocalMBeanServer; +import org.apache.openejb.testing.Configuration; +import org.apache.openejb.testing.Module; +import org.apache.openejb.testng.PropertiesBuilder; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; + +import javax.annotation.PostConstruct; +import javax.annotation.Resource; +import javax.ejb.ActivationConfigProperty; +import javax.ejb.MessageDriven; +import javax.jms.Queue; +import javax.management.ObjectName; +import java.util.List; +import java.util.Properties; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicLong; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +@RunWith(ApplicationComposer.class) +public class MaxSizePoolEndpointHandlerTest { + + private static final String TEXT = "foo"; + + @Configuration + public Properties config() { + return new PropertiesBuilder() + + .p("sra", "new://Resource?class-name=" + SampleResourceAdapter.class.getName()) + + .p("mdbs", "new://Container?type=MESSAGE") + .p("mdbs.ResourceAdapter", "sra") + .p("mdbs.pool", "true") + .p("mdbs.maxSize", "30") + .p("mdbs.ActivationSpecClass", SampleActivationSpec.class.getName()) + .p("mdbs.MessageListenerInterface", InboundListener.class.getName()) + + .p("cf", "new://Resource?type=" + SampleConnectionFactory.class.getName() + "&class-name=" + SampleManagedConnectionFactory.class.getName()) + .p("cf.ResourceAdapter", "sra") + .p("cf.TransactionSupport", "none") + .build(); + } + + @Module + public MessageDrivenBean jar() { + return new MessageDrivenBean(Listener.class); + } + + @Resource(name = "target") + private Queue destination; + + @Resource(name = "cf") + private SampleConnectionFactory cf; + + @Before + public void resetLatch() { + Listener.reset(); + } + + @Test + public void shouldSendMessage() throws Exception { + assertNotNull(cf); + + for (int i = 0; i < 100; i++) { + final SampleConnection connection = cf.getConnection(); + try { + connection.sendMessage(TEXT); + } finally { + connection.close(); + } + } + + // start MDB delivery + setControl("start"); + + assertTrue(Listener.sync()); + assertEquals(30, Listener.COUNTER.get()); + } + + private void setControl(final String action) throws Exception { + LocalMBeanServer.get().invoke( + new ObjectName("default:type=test"), + action, new Object[0], new String[0]); + } + + @MessageDriven(activationConfig = { + @ActivationConfigProperty(propertyName = "DeliveryActive", propertyValue = "false"), + @ActivationConfigProperty(propertyName = "MdbJMXControl", propertyValue = "default:type=test") + }) + public static class Listener implements InboundListener { + public static CountDownLatch latch; + private static final List<Boolean> BOOLEANS = new CopyOnWriteArrayList<>(); + + static final AtomicLong COUNTER = new AtomicLong(); + + @PostConstruct + public void postConstruct() { + COUNTER.incrementAndGet(); + } + + public static void reset() { + latch = new CountDownLatch(100); + BOOLEANS.clear(); + } + + public static boolean sync() throws InterruptedException { + latch.await(1, TimeUnit.MINUTES); + for (boolean result : BOOLEANS) { + if(!result) { + return false; + } + } + return true; + } + + @Override + public void receiveMessage(String message) { + try { + boolean ok = TEXT.equals(message); + BOOLEANS.add(ok); + } finally { + latch.countDown(); + } + } + } + +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tomee/blob/bc006cdd/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/connector/impl/SampleResourceAdapter.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/connector/impl/SampleResourceAdapter.java b/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/connector/impl/SampleResourceAdapter.java index fdf011e..b135df8 100644 --- a/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/connector/impl/SampleResourceAdapter.java +++ b/container/openejb-core/src/test/java/org/apache/openejb/core/mdb/connector/impl/SampleResourceAdapter.java @@ -38,7 +38,7 @@ import java.util.concurrent.Executors; public class SampleResourceAdapter implements ResourceAdapter { private final Map<SampleActivationSpec, MessageEndpointFactory> targets = new ConcurrentHashMap<SampleActivationSpec, MessageEndpointFactory>(); - private final ExecutorService threadPool = Executors.newFixedThreadPool(10); + private final ExecutorService threadPool = Executors.newFixedThreadPool(50); public void start(BootstrapContext bootstrapContext) throws ResourceAdapterInternalException { }
