Fixed Queue test (EnMasseProject#4766)

Per address-settings for global-max-size has limited the maxSizeBytes per queue. Used a medium plan (instead of small), to send the 500 messages without exceeding the resource-limit. Signed-off-by: Vanessa Busch <[email protected]>
lulf · Jun 18, 2020 · c0e299f · c0e299f
1 parent bdd7f64
commit c0e299f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/systemtests/src/main/java/io/enmasse/systemtest/model/addressplan/DestinationPlan.java b/systemtests/src/main/java/io/enmasse/systemtest/model/addressplan/DestinationPlan.java
@@ -9,6 +9,7 @@ public interface DestinationPlan {
     String BROKERED_TOPIC = "brokered-topic";
     String STANDARD_SMALL_QUEUE = "standard-small-queue";
     String STANDARD_SMALL_TOPIC = "standard-small-topic";
+    String STANDARD_MEDIUM_QUEUE = "standard-medium-queue";
     String STANDARD_LARGE_QUEUE = "standard-large-queue";
     String STANDARD_LARGE_TOPIC = "standard-large-topic";
     String STANDARD_XLARGE_QUEUE = "standard-xlarge-queue";

diff --git a/systemtests/src/test/java/io/enmasse/systemtest/shared/standard/QueueTest.java b/systemtests/src/test/java/io/enmasse/systemtest/shared/standard/QueueTest.java
@@ -368,19 +368,19 @@ void testScaleup() throws Exception {
                 .withPlan(DestinationPlan.STANDARD_LARGE_QUEUE)
                 .endSpec()
                 .build();
-        Address small = new AddressBuilder()
+        Address medium = new AddressBuilder()
                 .withNewMetadata()
                 .withNamespace(getSharedAddressSpace().getMetadata().getNamespace())
                 .withName(AddressUtils.generateAddressMetadataName(getSharedAddressSpace(), "scalequeue"))
                 .endMetadata()
                 .withNewSpec()
                 .withType("queue")
                 .withAddress("scalequeue")
-                .withPlan(DestinationPlan.STANDARD_SMALL_QUEUE)
+                .withPlan(DestinationPlan.STANDARD_MEDIUM_QUEUE)
                 .endSpec()
                 .build();
 
-        testScale(small, large, true);
+        testScale(medium, large, true);
         testScale(large, xlarge, false);
     }
 
@@ -395,7 +395,7 @@ private void testScale(Address before, Address after, boolean createInitial) thr
 
         AmqpClient client = getAmqpClientFactory().createQueueClient();
         final List<String> prefixes = Arrays.asList("foo", "bar", "baz", "quux");
-        final int numMessages = 500;
+        final int numMessages = 450;
         final int totalNumMessages = numMessages * prefixes.size();
         final int numReceiveBeforeDraining = numMessages / 2;
         final int numReceivedAfterScaled = totalNumMessages - numReceiveBeforeDraining;