From 2210917cd18959e62d07411eaae712c89e932750 Mon Sep 17 00:00:00 2001
From: ruansheng <chrisruans@gmail.com>
Date: Tue, 13 Dec 2022 20:11:41 +0800
Subject: [PATCH] Fix #2963 RocketMQ binder test NPE

---
 .../RocketMQMessageChannelBinderTest.java     | 45 +++++++++----------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/test/java/com/alibaba/cloud/stream/binder/rocketmq/RocketMQMessageChannelBinderTest.java b/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/test/java/com/alibaba/cloud/stream/binder/rocketmq/RocketMQMessageChannelBinderTest.java
index 4821fa080..41adeb3a3 100644
--- a/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/test/java/com/alibaba/cloud/stream/binder/rocketmq/RocketMQMessageChannelBinderTest.java
+++ b/spring-cloud-alibaba-starters/spring-cloud-starter-stream-rocketmq/src/test/java/com/alibaba/cloud/stream/binder/rocketmq/RocketMQMessageChannelBinderTest.java
@@ -16,12 +16,12 @@
 
 package com.alibaba.cloud.stream.binder.rocketmq;
 
-import javax.annotation.Resource;
 
 import com.alibaba.cloud.stream.binder.rocketmq.autoconfigurate.ExtendedBindingHandlerMappingsProviderConfiguration;
 import com.alibaba.cloud.stream.binder.rocketmq.autoconfigurate.RocketMQBinderAutoConfiguration;
 import com.alibaba.cloud.stream.binder.rocketmq.constant.RocketMQConst;
 import com.alibaba.cloud.stream.binder.rocketmq.properties.RocketMQConsumerProperties;
+import jakarta.annotation.Resource;
 import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 
@@ -56,28 +56,27 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
 public class RocketMQMessageChannelBinderTest {
 	@Resource
 	RocketMQMessageChannelBinder binder;
-	
-	// todo spring boot 3.0 upgrade: fix spring cloud stream binder
-	// @Test
-	// public void createConsumerEndpoint() throws Exception {
-	// 	TestConsumerDestination destination = new TestConsumerDestination("test");
-	// 	MessageProducer consumerEndpoint = binder.createConsumerEndpoint(destination, "test",
-	// 			new ExtendedConsumerProperties<>(new RocketMQConsumerProperties()));
-	// 	Assertions.assertThat(consumerEndpoint).isNotNull();
-	// }
-	//
-	// @Test
-	// public void createAnymousConsumerEndpoint() throws Exception {
-	// 	ExtendedConsumerProperties<RocketMQConsumerProperties> extendedConsumerProperties
-	// 			= new ExtendedConsumerProperties<>(new RocketMQConsumerProperties());
-	//
-	// 	TestConsumerDestination destination = new TestConsumerDestination("test");
-	// 	MessageProducer consumerEndpoint = binder.createConsumerEndpoint(destination, null,
-	// 			extendedConsumerProperties);
-	// 	Assertions.assertThat(consumerEndpoint).isNotNull();
-	// 	Assertions.assertThat(extendedConsumerProperties.getExtension().getGroup())
-	// 			.isEqualTo(RocketMQConst.DEFAULT_GROUP + "_test");
-	// }
+
+	@Test
+	public void createConsumerEndpoint() throws Exception {
+		TestConsumerDestination destination = new TestConsumerDestination("test");
+		MessageProducer consumerEndpoint = binder.createConsumerEndpoint(destination, "test",
+				new ExtendedConsumerProperties<>(new RocketMQConsumerProperties()));
+		Assertions.assertThat(consumerEndpoint).isNotNull();
+	}
+
+	@Test
+	public void createAnymousConsumerEndpoint() throws Exception {
+		ExtendedConsumerProperties<RocketMQConsumerProperties> extendedConsumerProperties
+				= new ExtendedConsumerProperties<>(new RocketMQConsumerProperties());
+
+		TestConsumerDestination destination = new TestConsumerDestination("test");
+		MessageProducer consumerEndpoint = binder.createConsumerEndpoint(destination, null,
+				extendedConsumerProperties);
+		Assertions.assertThat(consumerEndpoint).isNotNull();
+		Assertions.assertThat(extendedConsumerProperties.getExtension().getGroup())
+				.isEqualTo(RocketMQConst.DEFAULT_GROUP + "_test");
+	}
 
 	@Test
 	public void createDLQAnymousConsumerEndpoint() throws Exception {