[rocketmq-e2e] branch master updated: Delete useless case and add a delay message case (#20)

[jinrongtong]

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

jinrongtong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/rocketmq-e2e.git


The following commit(s) were added to refs/heads/master by this push:
     new 4b50a2c  Delete useless case and add a delay message case (#20)
4b50a2c is described below

commit 4b50a2cff8705f33cefbc7c0cdf71271fda28efa
Author: yueya <102146039+crypt...@users.noreply.github.com>
AuthorDate: Tue Apr 18 15:32:24 2023 +0800

    Delete useless case and add a delay message case (#20)
---
 .../broker/client/producer/ProducerInitTest.java    | 12 ------------
 .../rocketmq/broker/server/DelayMessageTest.java    | 21 +++++++++++++++++++--
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git 
a/java/e2e/src/test/java/org/apache/rocketmq/broker/client/producer/ProducerInitTest.java
 
b/java/e2e/src/test/java/org/apache/rocketmq/broker/client/producer/ProducerInitTest.java
index 3d9f2f2..b6ba8b2 100644
--- 
a/java/e2e/src/test/java/org/apache/rocketmq/broker/client/producer/ProducerInitTest.java
+++ 
b/java/e2e/src/test/java/org/apache/rocketmq/broker/client/producer/ProducerInitTest.java
@@ -193,18 +193,6 @@ public class ProducerInitTest extends BaseOperate {
         }, "Expected ClientException to throw, but it didn't");
     }
 
-    @Test
-    @DisplayName("The Producer sets the maximum retry times to 100, expect the 
client start failed")
-    public void testSet100MaxAttempts() {
-        assertThrows(Exception.class, () -> {
-            provider.newProducerBuilder()
-                
.setClientConfiguration(ClientConfigurationFactory.build(account))
-                .setMaxAttempts(-1)
-                .setTopics(topic)
-                .build();
-        }, "Expected ClientException to throw, but it didn't");
-    }
-
     @Test
     @DisplayName("The Producer sets a non-existent topic, expect the client 
start failed")
     public void testSetNotExistTopic() {
diff --git 
a/java/e2e/src/test/java/org/apache/rocketmq/broker/server/DelayMessageTest.java
 
b/java/e2e/src/test/java/org/apache/rocketmq/broker/server/DelayMessageTest.java
index d88d3ae..040a0b6 100644
--- 
a/java/e2e/src/test/java/org/apache/rocketmq/broker/server/DelayMessageTest.java
+++ 
b/java/e2e/src/test/java/org/apache/rocketmq/broker/server/DelayMessageTest.java
@@ -17,10 +17,9 @@
 
 package org.apache.rocketmq.broker.server;
 
-import java.time.Duration;
-import java.util.concurrent.Callable;
 import org.apache.rocketmq.client.apis.consumer.FilterExpression;
 import org.apache.rocketmq.client.apis.message.Message;
+import org.apache.rocketmq.client.java.exception.BadRequestException;
 import org.apache.rocketmq.client.rmq.RMQNormalConsumer;
 import org.apache.rocketmq.client.rmq.RMQNormalProducer;
 import org.apache.rocketmq.common.attribute.TopicMessageType;
@@ -42,8 +41,12 @@ import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.time.Duration;
+import java.util.concurrent.Callable;
+
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.awaitility.Awaitility.await;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 @Tag(TESTSET.DELAY)
 @Tag(TESTSET.SMOKE)
@@ -141,5 +144,19 @@ public class DelayMessageTest extends BaseOperate {
         VerifyUtils.verifyDelayMessage(producer.getEnqueueMessages(), 
pushConsumer.getListener().getDequeueMessages(), 0);
     }
 
+    @Test
+    @DisplayName("Send 10 timed messages (after 24 hours) , expected message 
fails to be sent")
+    public void testDelayTime24hAfter() {
+        String methodName = 
Thread.currentThread().getStackTrace()[1].getMethodName();
+        String topic = getTopic(TopicMessageType.DELAY.getValue(), methodName);
+
+        producer = ProducerFactory.getRMQProducer(account, topic);
+
+        Assertions.assertNotNull(producer, "Get Producer failed");
+        Message message = MessageFactory.buildDelayMessage(topic, tag, 
RandomUtils.getStringByUUID(), System.currentTimeMillis() + (24 * 60 * 60 + 5) 
* 1000);
+        assertThrows(BadRequestException.class, () -> {
+            producer.getProducer().send(message);
+        }, "Expected BadRequestException to throw, but it didn't");
+    }
 }