From d76de4b5a6bb2d1eb519a5641da44486c616d243 Mon Sep 17 00:00:00 2001
From: xiaolongzuo <150349407@qq.com>
Date: Thu, 14 Feb 2019 17:41:58 +0800
Subject: [PATCH] Add test case.
# Conflicts:
# spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/sms/SmsConfigProperties.java
# spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/sms/SmsConfigRegistration.java
# spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/ans/AnsPropertiesTests.java
# spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/oss/OssAutoConfigurationTests.java
# spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/AbstractSmsService.java
# spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/SmsInitializerEventListener.java
# spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/config/SmsAutoConfiguration.java
---
spring-cloud-alicloud-context/pom.xml | 8 +--
.../AbstractOnceApplicationListener.java | 5 +-
.../AliCloudPropertiesDefaultTests.java | 7 ++-
.../context/AliCloudPropertiesLoadTests.java | 12 ++--
.../AcmIntegrationPropertiesLoad2Tests.java | 6 +-
.../AcmIntegrationPropertiesLoadTests.java | 27 +++++---
.../acm/AcmPropertiesDefaultTests.java | 9 ++-
.../context/acm/AcmPropertiesLoadTests.java | 25 +++++---
.../AnsContextApplicationListenerTests.java | 2 +-
.../context/ans/AnsPropertiesLoadTests.java | 63 ++++++++++++++++---
.../edas/EdasPropertiesDefaultTests.java | 5 +-
.../edas/EdasPropertiesLoad2Tests.java | 10 ++-
.../context/edas/EdasPropertiesLoadTests.java | 9 ++-
.../NacosParameterInitListenerTests.java | 2 +-
.../alicloud/context/oss/OssLoadTests.java | 15 +++--
.../context/scx/ScxPropertiesLoadTests.java | 11 +++-
.../SentinelAliCloudListenerTests.java | 2 +-
.../sms/SmsPropertiesDefaultTests.java | 19 +++++-
.../context/sms/SmsPropertiesLoadTests.java | 14 +++--
.../cloud/alicloud/sms/SmsInitializer.java | 23 ++++---
20 files changed, 193 insertions(+), 81 deletions(-)
diff --git a/spring-cloud-alicloud-context/pom.xml b/spring-cloud-alicloud-context/pom.xml
index cc3628a5..2afd459d 100644
--- a/spring-cloud-alicloud-context/pom.xml
+++ b/spring-cloud-alicloud-context/pom.xml
@@ -110,14 +110,14 @@
org.powermock
powermock-module-junit4
- 2.0.0
+ 1.7.1
test
-
+
org.powermock
- powermock-api-mockito2
- 2.0.0
+ powermock-api-mockito
+ 1.7.1
test
diff --git a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/listener/AbstractOnceApplicationListener.java b/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/listener/AbstractOnceApplicationListener.java
index d8b822a9..dbe554d9 100644
--- a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/listener/AbstractOnceApplicationListener.java
+++ b/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/listener/AbstractOnceApplicationListener.java
@@ -42,9 +42,8 @@ public abstract class AbstractOnceApplicationListener 0) {
+ if (smsProperties.getReportQueueName() != null
+ && smsProperties.getReportQueueName().trim().length() > 0) {
smsService.startSmsReportMessageListener(
(SmsReportMessageListener) messageListener);
return;
@@ -89,8 +88,8 @@ public class SmsInitializer implements BeanPostProcessor, SmartInitializingSingl
if (SmsUpMessageListener.class.isInstance(messageListener)) {
- if (msConfigProperties.getUpQueueName() != null
- && msConfigProperties.getUpQueueName().trim().length() > 0) {
+ if (smsProperties.getUpQueueName() != null
+ && smsProperties.getUpQueueName().trim().length() > 0) {
smsService.startSmsUpMessageListener(
(SmsUpMessageListener) messageListener);
return;