From 0a2c5554b9a4c665cffae9c044e110c766457476 Mon Sep 17 00:00:00 2001 From: Daniel Frey Date: Thu, 10 Nov 2022 12:55:47 -0500 Subject: [PATCH] Update XMPP supplier test for consistency (#412) --- .../xmpp/XmppSupplierConfigurationTests.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/functions/supplier/xmpp-supplier/src/test/java/org/springframework/cloud/fn/supplier/xmpp/XmppSupplierConfigurationTests.java b/functions/supplier/xmpp-supplier/src/test/java/org/springframework/cloud/fn/supplier/xmpp/XmppSupplierConfigurationTests.java index ce34757f..48acd9eb 100644 --- a/functions/supplier/xmpp-supplier/src/test/java/org/springframework/cloud/fn/supplier/xmpp/XmppSupplierConfigurationTests.java +++ b/functions/supplier/xmpp-supplier/src/test/java/org/springframework/cloud/fn/supplier/xmpp/XmppSupplierConfigurationTests.java @@ -47,21 +47,27 @@ import org.springframework.test.context.DynamicPropertyRegistry; import org.springframework.test.context.DynamicPropertySource; import static org.assertj.core.api.Assertions.assertThat; +import static org.springframework.cloud.fn.test.support.xmpp.XmppTestContainerSupport.JANE_USER; +import static org.springframework.cloud.fn.test.support.xmpp.XmppTestContainerSupport.SERVICE_NAME; +import static org.springframework.cloud.fn.test.support.xmpp.XmppTestContainerSupport.USER_PW; /** * @author Daniel Frey */ -@SpringBootTest +@SpringBootTest( + properties = { + "xmpp.factory.user=" + JANE_USER, // Connect as user intended to listen for messages on behalf of + "xmpp.factory.password=" + USER_PW, + "xmpp.factory.service-name=" + SERVICE_NAME, + "xmpp.factory.security-mode=disabled" + } +) public class XmppSupplierConfigurationTests implements XmppTestContainerSupport { @DynamicPropertySource static void registerConfigurationProperties(DynamicPropertyRegistry registry) { registry.add("xmpp.factory.host", () -> XmppTestContainerSupport.getXmppHost()); registry.add("xmpp.factory.port", () -> XmppTestContainerSupport.getXmppMappedPort()); - registry.add("xmpp.factory.user", () -> JANE_USER); // Connect as user intended to listen for messages on behalf of - registry.add("xmpp.factory.password", () -> USER_PW); - registry.add("xmpp.factory.service-name", () -> SERVICE_NAME); - registry.add("xmpp.factory.security-mode", () -> "disabled"); } @Autowired