[activemq-artemis] branch master updated: NO-JIRA Improve AMQP paging test coverage and determinism

[cl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/master by this push:
     new 891f281  NO-JIRA Improve AMQP paging test coverage and determinism
     new fb4b8ff  This closes #3045
891f281 is described below

commit 891f2817ff1452daf28223f976f1e206d5a34661
Author: Francesco Nigro <ni...@gmail.com>
AuthorDate: Mon Mar 23 18:14:37 2020 +0100

    NO-JIRA Improve AMQP paging test coverage and determinism
---
 .../integration/amqp/paging/AmqpPagingTest.java    | 31 +++++++++++++++++-----
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/paging/AmqpPagingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/paging/AmqpPagingTest.java
index b4085ed..5218a0d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/paging/AmqpPagingTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/paging/AmqpPagingTest.java
@@ -22,15 +22,19 @@ import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.paging.PagingStore;
 import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.Queue;
 import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
 import org.apache.activemq.artemis.tests.integration.amqp.AmqpClientTestSupport;
+import org.apache.activemq.artemis.tests.util.Wait;
 import org.apache.activemq.transport.amqp.client.AmqpClient;
 import org.apache.activemq.transport.amqp.client.AmqpConnection;
 import org.apache.activemq.transport.amqp.client.AmqpMessage;
 import org.apache.activemq.transport.amqp.client.AmqpReceiver;
 import org.apache.activemq.transport.amqp.client.AmqpSender;
 import org.apache.activemq.transport.amqp.client.AmqpSession;
+import org.hamcrest.Matchers;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -39,22 +43,31 @@ import org.junit.runners.Parameterized;
 @RunWith(Parameterized.class)
 public class AmqpPagingTest extends AmqpClientTestSupport {
 
-   @Parameterized.Parameters(name = "durability={0}")
+   @Parameterized.Parameters(name = "durability={0}, readWholePage={1}")
    public static Collection getParams() {
-      return Arrays.asList(new Object[][]{{Boolean.TRUE}, {Boolean.FALSE}, {null}});
+      return Arrays.asList(new Object[][]{
+         {Boolean.TRUE, true}, {Boolean.TRUE, false},
+         {Boolean.FALSE, true}, {Boolean.FALSE, false},
+         {null, true}, {null, false}});
    }
 
    private final Boolean durable;
+   private final boolean readWholePage;
 
-   public AmqpPagingTest(Boolean durable) {
+   public AmqpPagingTest(Boolean durable, boolean readWholePage) {
       this.durable = durable;
+      this.readWholePage = readWholePage;
    }
 
    @Override
    protected void addConfiguration(ActiveMQServer server) {
       super.addConfiguration(server);
-      final Map<String, AddressSettings> addressesSettings = server.getConfiguration().getAddressesSettings();
-      addressesSettings.get("#").setMaxSizeBytes(100000).setPageSizeBytes(10000);
+      final Map<String, AddressSettings> addressesSettings = server.getConfiguration()
+         .setReadWholePage(readWholePage)
+         .getAddressesSettings();
+      addressesSettings.get("#")
+         .setMaxSizeBytes(100000)
+         .setPageSizeBytes(10000);
    }
 
    @Test(timeout = 60000)
@@ -86,8 +99,14 @@ public class AmqpPagingTest extends AmqpClientTestSupport {
          }
          sender.send(message);
       }
-      Assert.assertTrue(server.getPagingManager().getPageStore(SimpleString.toSimpleString(getQueueName())).isPaging());
       sender.close();
+      final Queue queueView = getProxyToQueue(getQueueName());
+      Wait.assertEquals(MSG_COUNT, queueView::getMessageCount);
+      PagingStore pagingStore = server.getPagingManager().getPageStore(SimpleString.toSimpleString(getQueueName()));
+      Assert.assertTrue(pagingStore.isPaging());
+      final int pageCacheMaxSize = server.getConfiguration().getAddressesSettings().get("#").getPageCacheMaxSize();
+      Assert.assertThat("the size of the messages or the number of messages isn't enough",
+                        pagingStore.getNumberOfPages(), Matchers.greaterThan(pageCacheMaxSize));
       receiver.flow(MSG_COUNT);
       for (int i = 0; i < MSG_COUNT; i++) {
          AmqpMessage receive = receiver.receive(10, TimeUnit.SECONDS);