diff --git a/sermant-integration-tests/mq-grayscale-rocketmq-test/grayscale-rocketmq-integration-test/src/test/java/io/sermant/demo/grayscale/rocketmq/integration/GrayscaleRocketmqTest.java b/sermant-integration-tests/mq-grayscale-rocketmq-test/grayscale-rocketmq-integration-test/src/test/java/io/sermant/demo/grayscale/rocketmq/integration/GrayscaleRocketmqTest.java index 501fcd7bf0..9cfc8b9278 100644 --- a/sermant-integration-tests/mq-grayscale-rocketmq-test/grayscale-rocketmq-integration-test/src/test/java/io/sermant/demo/grayscale/rocketmq/integration/GrayscaleRocketmqTest.java +++ b/sermant-integration-tests/mq-grayscale-rocketmq-test/grayscale-rocketmq-integration-test/src/test/java/io/sermant/demo/grayscale/rocketmq/integration/GrayscaleRocketmqTest.java @@ -48,13 +48,9 @@ public class GrayscaleRocketmqTest { private static final String CONSUMER_TYPE_PUSH = "PUSH"; - @Value("${test.version}") - private String testVersion; - @Test @EnabledIfSystemProperty(named = "grayscale.rocketmq.integration.test.type", matches = "PLUGIN_ENABLED_FALSE_PULL") public void testPluginEnabledFalsePullConsumeMessage() throws InterruptedException { - System.out.println("===================testVersion===================" + testVersion); initAndProduceMessage(true, CONSUMER_TYPE_PULL); Thread.sleep(5000); int baseBaseCount = parseBaseMessageCount(getPullBaseResult()); @@ -66,8 +62,14 @@ public void testPluginEnabledFalsePullConsumeMessage() throws InterruptedExcepti @EnabledIfSystemProperty(named = "grayscale.rocketmq.integration.test.type", matches = "PLUGIN_ENABLED_FALSE_LITE_PULL") public void testPluginEnabledFalseLitePullConsumeMessage() throws InterruptedException { - initAndProduceMessage(true, CONSUMER_TYPE_LITE_PULL); - Thread.sleep(120000); + String clientVersion = System.getProperty("test.version"); + System.out.println("===========clientVersion========" + clientVersion); + if ("5.0.0".equals(clientVersion)) { + initAndProduceLitePullMessage(true); + } else { + initAndProduceMessage(true, CONSUMER_TYPE_LITE_PULL); + } + Thread.sleep(60000); int baseBaseCount = parseBaseMessageCount(getLitePullBaseResult()); int grayBaseCount = parseBaseMessageCount(getLitePullGrayResult()); Assertions.assertEquals(2, baseBaseCount + grayBaseCount); @@ -108,8 +110,14 @@ public void testAutoOnlyBasePullConsumeMessage() throws InterruptedException { "CONSUMER_BASE_ONLY_LITE_PULL") public void testAutoOnlyBaseLitePullConsumeMessage() throws InterruptedException { createGrayscaleConfig("AUTO", ""); - initAndProduceMessage(false, CONSUMER_TYPE_LITE_PULL); - Thread.sleep(120000); + String clientVersion = System.getProperty("test.version"); + System.out.println("===========clientVersion========" + clientVersion); + if ("5.0.0".equals(clientVersion)) { + initAndProduceLitePullMessage(false); + } else { + initAndProduceMessage(false, CONSUMER_TYPE_LITE_PULL); + } + Thread.sleep(60000); String litePullBaseResult = getLitePullBaseResult(); int baseBaseCount = parseBaseMessageCount(litePullBaseResult); int baseGrayCount = parseGrayMessageCount(litePullBaseResult); @@ -145,8 +153,14 @@ public void testAutoBaseExcPullConsumeMessage() throws InterruptedException { "CONSUMER_BASE_ONLY_LITE_PULL") public void testAutoBaseExcLitePullConsumeMessage() throws InterruptedException { createGrayscaleConfig("AUTO", "gray"); - initAndProduceMessage(false, CONSUMER_TYPE_LITE_PULL); - Thread.sleep(120000); + String clientVersion = System.getProperty("test.version"); + System.out.println("===========clientVersion========" + clientVersion); + if ("5.0.0".equals(clientVersion)) { + initAndProduceLitePullMessage(false); + } else { + initAndProduceMessage(false, CONSUMER_TYPE_LITE_PULL); + } + Thread.sleep(60000); String litePullBaseResult = getLitePullBaseResult(); int baseBaseCount = parseBaseMessageCount(litePullBaseResult); int baseGrayCount = parseGrayMessageCount(litePullBaseResult); @@ -181,8 +195,14 @@ public void testAutoBaseGrayPullConsumeMessage() throws InterruptedException { "CONSUMER_BASE_GRAY_LITE_PULL") public void testAutoBaseGrayLitePullConsumeMessage() throws InterruptedException { createGrayscaleConfig("AUTO", ""); - initAndProduceMessage(true, CONSUMER_TYPE_LITE_PULL); - Thread.sleep(120000); + String clientVersion = System.getProperty("test.version"); + System.out.println("===========clientVersion========" + clientVersion); + if ("5.0.0".equals(clientVersion)) { + initAndProduceLitePullMessage(true); + } else { + initAndProduceMessage(true, CONSUMER_TYPE_LITE_PULL); + } + Thread.sleep(60000); int baseBaseCount = parseBaseMessageCount(getLitePullBaseResult()); int grayGrayCount = parseGrayMessageCount(getLitePullGrayResult()); Assertions.assertTrue(baseBaseCount == 1 && grayGrayCount == 1); @@ -216,8 +236,14 @@ public void testBaseBaseOnlyPullConsumeMessage() throws InterruptedException { "CONSUMER_BASE_ONLY_LITE_PULL") public void testBaseBaseOnlyLitePullConsumeMessage() throws InterruptedException { createGrayscaleConfig("BASE", ""); - initAndProduceMessage(false, CONSUMER_TYPE_LITE_PULL); - Thread.sleep(120000); + String clientVersion = System.getProperty("test.version"); + System.out.println("===========clientVersion========" + clientVersion); + if ("5.0.0".equals(clientVersion)) { + initAndProduceLitePullMessage(false); + } else { + initAndProduceMessage(false, CONSUMER_TYPE_LITE_PULL); + } + Thread.sleep(60000); String litePullBaseResult = getLitePullBaseResult(); int baseBaseCount = parseBaseMessageCount(litePullBaseResult); int baseGrayCount = parseGrayMessageCount(litePullBaseResult); @@ -253,8 +279,14 @@ public void testBaseBaseExcGrayPullConsumeMessage() throws InterruptedException "CONSUMER_BASE_ONLY_LITE_PULL") public void testBaseBaseExcGrayLitePullConsumeMessage() throws InterruptedException { createGrayscaleConfig("BASE", "gray"); - initAndProduceMessage(false, CONSUMER_TYPE_LITE_PULL); - Thread.sleep(120000); + String clientVersion = System.getProperty("test.version"); + System.out.println("===========clientVersion========" + clientVersion); + if ("5.0.0".equals(clientVersion)) { + initAndProduceLitePullMessage(false); + } else { + initAndProduceMessage(false, CONSUMER_TYPE_LITE_PULL); + } + Thread.sleep(60000); String litePullBaseResult = getLitePullBaseResult(); int baseBaseCount = parseBaseMessageCount(litePullBaseResult); int baseGrayCount = parseGrayMessageCount(litePullBaseResult); @@ -289,8 +321,14 @@ public void testBaseBaseGrayPullConsumeMessage() throws InterruptedException { "CONSUMER_BASE_GRAY_LITE_PULL") public void testBaseBaseGrayLitePullConsumeMessage() throws InterruptedException { createGrayscaleConfig("BASE", ""); - initAndProduceMessage(true, CONSUMER_TYPE_LITE_PULL); - Thread.sleep(120000); + String clientVersion = System.getProperty("test.version"); + System.out.println("===========clientVersion========" + clientVersion); + if ("5.0.0".equals(clientVersion)) { + initAndProduceLitePullMessage(true); + } else { + initAndProduceMessage(true, CONSUMER_TYPE_LITE_PULL); + } + Thread.sleep(60000); int baseBaseCount = parseBaseMessageCount(getLitePullBaseResult()); int grayGrayCount = parseGrayMessageCount(getLitePullGrayResult()); Assertions.assertTrue(baseBaseCount == 1 && grayGrayCount <= 1); @@ -323,8 +361,14 @@ public void testBaseBaseGrayExcGrayPullConsumeMessage() throws InterruptedExcept "CONSUMER_BASE_GRAY_LITE_PULL") public void testBaseBaseGrayExcGrayLitePullConsumeMessage() throws InterruptedException { createGrayscaleConfig("BASE", "gray"); - initAndProduceMessage(true, CONSUMER_TYPE_LITE_PULL); - Thread.sleep(120000); + String clientVersion = System.getProperty("test.version"); + System.out.println("===========clientVersion========" + clientVersion); + if ("5.0.0".equals(clientVersion)) { + initAndProduceLitePullMessage(true); + } else { + initAndProduceMessage(true, CONSUMER_TYPE_LITE_PULL); + } + Thread.sleep(60000); int baseBaseCount = parseBaseMessageCount(getLitePullBaseResult()); int grayGrayCount = parseGrayMessageCount(getLitePullGrayResult()); Assertions.assertTrue(baseBaseCount == 1 && grayGrayCount == 1); @@ -351,6 +395,13 @@ private void initAndProduceMessage(boolean isGrayInstanceInit, String consumerTy consumerType.equals(CONSUMER_TYPE_LITE_PULL) ? "produceLitePullMessage" : "producePushMessage"); } + private void initAndProduceLitePullMessage(boolean isGrayInstanceInit) { + clearCacheCount(isGrayInstanceInit); + initProducer("initLitePullProducer"); + produceMessage("produceLitePullMessage"); + initConsumer(isGrayInstanceInit, CONSUMER_TYPE_LITE_PULL); + } + private String getPullBaseResult() { return restTemplate.getForObject("http://127.0.0.1:9000/getPullConsumerMessageCount", String.class); }