This is an automated email from the ASF dual-hosted git repository. jensdeppe pushed a commit to branch release/1.9.2 in repository https://gitbox.apache.org/repos/asf/geode.git
commit d339954fc6c552a760c4cf1876cfb325b39e4aeb Author: nabarunnag <[email protected]> AuthorDate: Tue Sep 17 10:57:29 2019 -0700 GEODE-7124: Fixing tests for older version --- .../wan/asyncqueue/AsyncEventQueuePausedDUnitTest.java | 2 -- .../commands/CreateAsyncEventQueueCommandDUnitTest.java | 8 ++++---- .../cli/commands/ListAsyncEventQueuesCommandDUnitTest.java | 2 +- .../commands/ResumeAsyncEventQueueDispatcherDUnitTest.java | 14 +++++++------- .../asyncqueue/AsyncEventQueueValidationsJUnitTest.java | 5 ++--- 5 files changed, 14 insertions(+), 17 deletions(-) diff --git a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueuePausedDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueuePausedDUnitTest.java index 62e9c38..b38560e 100644 --- a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueuePausedDUnitTest.java +++ b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueuePausedDUnitTest.java @@ -28,7 +28,6 @@ import java.util.Properties; import java.util.concurrent.TimeUnit; import org.awaitility.core.ConditionTimeoutException; -import org.jetbrains.annotations.NotNull; import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -147,7 +146,6 @@ public class AsyncEventQueuePausedDUnitTest implements Serializable { } - @NotNull private static Integer getEventDispatchedSize() { Cache cache = ClusterStartupRule.getCache(); AsyncEventQueueImpl aeq = (AsyncEventQueueImpl) cache.getAsyncEventQueue("aeqID"); diff --git a/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommandDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommandDUnitTest.java index 9054f67..3871c91 100644 --- a/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommandDUnitTest.java +++ b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommandDUnitTest.java @@ -117,12 +117,12 @@ public class CreateAsyncEventQueueCommandDUnitTest { // create queue without start paused set gfsh.executeAndAssertThat(VALID_COMMAND + " --id=queue1 " + "--batch-size=1024 --max-queue-memory=512 --listener-param=param1,param2#value2 ") - .statusIsSuccess().tableHasRowCount(1); + .statusIsSuccess().tableHasRowCount("Member", 1); // list the queue to verify the the queue has start paused set to false gfsh.executeAndAssertThat("list async-event-queue").statusIsSuccess() - .tableHasRowCount(1).tableHasRowWithValues("Member", "ID", "Batch Size", + .tableHasRowCount("Member", 1).tableHasRowWithValues("Member", "ID", "Batch Size", "Persistent", "Disk Store", "Max Memory", "Created with paused event processing", "Currently Paused", "server-1", "queue1", "1024", "false", @@ -131,12 +131,12 @@ public class CreateAsyncEventQueueCommandDUnitTest { // create queue with start paused set gfsh.executeAndAssertThat(VALID_COMMAND + " --id=queue2 " + "--batch-size=1024 --max-queue-memory=512 --listener-param=param1,param2#value2 --pause-event-processing") - .statusIsSuccess().tableHasRowCount(1); + .statusIsSuccess().tableHasRowCount("Member", 1); // list the queue to verify the the queue has start paused set to true gfsh.executeAndAssertThat("list async-event-queue").statusIsSuccess() - .tableHasRowCount(2).tableHasRowWithValues("Member", "ID", "Batch Size", + .tableHasRowCount("Member", 2).tableHasRowWithValues("Member", "ID", "Batch Size", "Persistent", "Disk Store", "Max Memory", "Created with paused event processing", "Currently Paused", "server-1", "queue2", "1024", "false", diff --git a/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ListAsyncEventQueuesCommandDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ListAsyncEventQueuesCommandDUnitTest.java index 040ac95..d8a6046 100644 --- a/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ListAsyncEventQueuesCommandDUnitTest.java +++ b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ListAsyncEventQueuesCommandDUnitTest.java @@ -84,7 +84,7 @@ public class ListAsyncEventQueuesCommandDUnitTest { // locator.waitUntilAsyncEventQueuesAreReadyOnExactlyThisManyServers("queue3", 1); gfsh.executeAndAssertThat("list async-event-queue").statusIsSuccess() - .tableHasRowCount("Member",6) + .tableHasRowCount("Member", 6) .tableHasRowWithValues("Member", "ID", "Created with paused event processing", "Currently Paused", "server-1", "queue3", "true", "true") diff --git a/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ResumeAsyncEventQueueDispatcherDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ResumeAsyncEventQueueDispatcherDUnitTest.java index 03020c2..779a461 100644 --- a/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ResumeAsyncEventQueueDispatcherDUnitTest.java +++ b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ResumeAsyncEventQueueDispatcherDUnitTest.java @@ -50,41 +50,41 @@ public class ResumeAsyncEventQueueDispatcherDUnitTest { // create an AEQ with start paused set to false to verify proper behavior gfsh.executeAndAssertThat(CREATE_COMMAND + " --id=unpausedqueue --pause-event-processing=false") .statusIsSuccess() - .tableHasRowCount(1) + .tableHasRowCount("Member", 1) .tableHasRowWithValues("Member", "Status", "Message", "server-1", "OK", "Success"); // verify our AEQ was created as expected gfsh.executeAndAssertThat(LIST_COMMAND).statusIsSuccess() - .tableHasRowCount(1).tableHasRowWithValues("Member", "ID", + .tableHasRowCount("Member", 1).tableHasRowWithValues("Member", "ID", "Created with paused event processing", "Currently Paused", "server-1", "unpausedqueue", "false", "false"); // Issue the resume command and confirm it reports that the queue is already dispatching gfsh.executeAndAssertThat(RESUME_COMMAND + " --id=unpausedqueue").statusIsSuccess() - .tableHasRowCount(1) + .tableHasRowCount("Member", 1) .containsOutput("Async Event Queue \"unpausedqueue\" dispatching was not paused."); // create an AEQ with start paused set so we have a queue to unpause gfsh.executeAndAssertThat(CREATE_COMMAND + " --id=queue --pause-event-processing") .statusIsSuccess() - .tableHasRowCount(1) + .tableHasRowCount("Member", 1) .tableHasRowWithValues("Member", "Status", "Message", "server-1", "OK", "Success"); // verify our AEQ was created as expected gfsh.executeAndAssertThat(LIST_COMMAND).statusIsSuccess() - .tableHasRowCount(2).tableHasRowWithValues("Member", "ID", + .tableHasRowCount("Member", 2).tableHasRowWithValues("Member", "ID", "Created with paused event processing", "Currently Paused", "server-1", "queue", "true", "true"); // Issue the resume command and confirm it reports success gfsh.executeAndAssertThat(RESUME_COMMAND + " --id=queue").statusIsSuccess() - .tableHasRowCount(1) + .tableHasRowCount("Member", 1) .containsOutput("Async Event Queue \"queue\" dispatching was resumed successfully"); // list the queue to verify the result gfsh.executeAndAssertThat(LIST_COMMAND).statusIsSuccess() - .tableHasRowCount(2).tableHasRowWithValues("Member", "ID", + .tableHasRowCount("Member", 2).tableHasRowWithValues("Member", "ID", "Created with paused event processing", "Currently Paused", "server-1", "queue", "true", "false"); } diff --git a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.java index 1c323d8..6a273bb 100644 --- a/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.java +++ b/geode-core/src/integrationTest/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventQueueValidationsJUnitTest.java @@ -159,9 +159,8 @@ public class AsyncEventQueueValidationsJUnitTest { String cacheXmlFileBaseName) { // Create cache with xml String cacheXmlFileName = - createTempFileFromResource(getClass(), - getClass().getSimpleName() + "." + cacheXmlFileBaseName + ".cache.xml") - .getAbsolutePath(); + TestUtil.getResourcePath(getClass(), + getClass().getSimpleName() + "." + cacheXmlFileBaseName + ".cache.xml"); cache = new CacheFactory().set(MCAST_PORT, "0").set(CACHE_XML_FILE, cacheXmlFileName).create(); // Get AsyncEventQueue and GatewayEventFilter
