You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2022/05/23 18:42:18 UTC

[activemq-artemis] 06/07: fixing a few tests

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

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

commit 75d3b72bf6d21be7defd37f40e9c8d195d3770cb
Author: Clebert Suconic <cl...@apache.org>
AuthorDate: Thu May 19 19:06:49 2022 -0400

    fixing a few tests
---
 .../activemq/artemis/core/paging/cursor/impl/PageSubscriptionImpl.java | 3 ---
 .../artemis/tests/integration/client/JMSPagingFileDeleteTest.java      | 2 +-
 .../apache/activemq/artemis/tests/integration/paging/PagingTest.java   | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionImpl.java
index c3d4b895a4..b367ed991a 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionImpl.java
@@ -1081,9 +1081,6 @@ public final class PageSubscriptionImpl implements PageSubscription {
       }
 
       private PageCursorInfo(final long pageId, final int numberOfMessages) {
-         if (pageId == 11) {
-            new Exception("pageId=" + pageId).printStackTrace(System.out);
-         }
          if (numberOfMessages < 0) {
             throw new IllegalStateException("numberOfMessages = " + numberOfMessages + " instead of being >=0");
          }
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JMSPagingFileDeleteTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JMSPagingFileDeleteTest.java
index 5e883a679f..2ee100951b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JMSPagingFileDeleteTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JMSPagingFileDeleteTest.java
@@ -196,7 +196,7 @@ public class JMSPagingFileDeleteTest extends JMSTestBase {
 
          timeout = System.currentTimeMillis() + 10000;
 
-         Wait.assertEquals(0, pagingStore::getNumberOfPages); //I expected number of the page is 1, but It was not.
+         Wait.assertEquals(1, pagingStore::getNumberOfPages);
       } finally {
          if (connection != null) {
             connection.close();
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingTest.java
index 36e178969b..21fe776dc0 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingTest.java
@@ -5507,7 +5507,7 @@ public class PagingTest extends ActiveMQTestBase {
       // It's async, so need to wait a bit for it happening
       Wait.assertFalse(server.getPagingManager().getPageStore(ADDRESS)::isPaging);
 
-      Wait.assertEquals(0, ()->server.getPagingManager().getPageStore(ADDRESS).getNumberOfPages());
+      Wait.assertEquals(1, ()->server.getPagingManager().getPageStore(ADDRESS).getNumberOfPages());
    }
 
    @Test