adapt spring xsuaa sample

Signed-off-by: liga-oz <[email protected]>
SAP · Nov 24, 2023 · 97a77a5 · 97a77a5
1 parent 932bacb
commit 97a77a5
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/...les/spring-security-xsuaa-usage/src/test/java/sample/spring/xsuaa/TestControllerTest.java b/...les/spring-security-xsuaa-usage/src/test/java/sample/spring/xsuaa/TestControllerTest.java
@@ -21,14 +21,18 @@
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.RequestPostProcessor;
 
+import static com.sap.cloud.security.test.SecurityTest.*;
 import static org.junit.Assert.assertTrue;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
 @AutoConfigureMockMvc
-@TestPropertySource(properties = {"xsuaa.uaadomain=localhost", "xsuaa.xsappname=xsapp!t0815", "xsuaa.clientid=sb-clientId!t0815" })
+@TestPropertySource(properties = {
+        "xsuaa.uaadomain=" + DEFAULT_UAA_DOMAIN + ":2225",
+        "xsuaa.xsappname=" + DEFAULT_APP_ID,
+        "xsuaa.clientid=" + DEFAULT_CLIENT_ID })
 public class TestControllerTest {
 
     @Autowired
@@ -39,7 +43,7 @@ public class TestControllerTest {
     private String jwtAdmin;
 
     @ClassRule
-    public static SecurityTestRule rule = SecurityTestRule.getInstance(Service.XSUAA);
+    public static SecurityTestRule rule = SecurityTestRule.getInstance(Service.XSUAA).setPort(2225);
 
     @Before
     public void setUp() {

diff --git a/...curity-xsuaa-usage/src/test/java/sample/spring/xsuaa/junitjupiter/TestControllerTest.java b/...curity-xsuaa-usage/src/test/java/sample/spring/xsuaa/junitjupiter/TestControllerTest.java
@@ -6,7 +6,6 @@
 package sample.spring.xsuaa.junitjupiter;
 
 import com.sap.cloud.security.test.api.SecurityTestContext;
-import com.sap.cloud.security.test.extension.XsuaaExtension;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -27,10 +26,10 @@
 @SpringBootTest
 @AutoConfigureMockMvc
 @TestPropertySource(properties = {
-		"xsuaa.uaadomain=" + DEFAULT_DOMAIN,
+		"xsuaa.uaadomain=" + DEFAULT_UAA_DOMAIN + ":2224",
 		"xsuaa.xsappname=" + DEFAULT_APP_ID,
 		"xsuaa.clientid=" + DEFAULT_CLIENT_ID })
-@ExtendWith(XsuaaExtension.class)
+@ExtendWith(XsuaaExtensionFixedPort.class)
 class TestControllerTest {
 
 	@Autowired

diff --git a/...y-xsuaa-usage/src/test/java/sample/spring/xsuaa/junitjupiter/XsuaaExtensionFixedPort.java b/...y-xsuaa-usage/src/test/java/sample/spring/xsuaa/junitjupiter/XsuaaExtensionFixedPort.java
@@ -0,0 +1,15 @@
+/**
+ * SPDX-FileCopyrightText: 2018-2023 SAP SE or an SAP affiliate company and Cloud Security Client Java contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package sample.spring.xsuaa.junitjupiter;
+
+import com.sap.cloud.security.test.extension.XsuaaExtension;
+
+public class XsuaaExtensionFixedPort extends XsuaaExtension {
+
+	public XsuaaExtensionFixedPort() {
+		super();
+		this.setPort(2224);
+	}
+}