[BAEL-9326] fixes for packaging

Author: venkat1701

spring-ai-modules/spring-ai-mcp/mcp-spring/mcp-client-oauth2/src/test/java/com/baeldung/mcp/mcpclientoauth2/CalculatorControllerTest.java

@@ -0,0 +1,51 @@
+package com.baeldung.mcp.mcpclientoauth2;
+
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+import org.springframework.ai.chat.client.ChatClient;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+
+public class CalculatorControllerTest {
+
+    private MockMvc mockMvc;
+    private ChatClient chatClient;
+
+    @BeforeEach
+    void setUp() {
+        chatClient = mock(ChatClient.class, Mockito.RETURNS_DEEP_STUBS);
+        CalculatorController controller = new CalculatorController(chatClient);
+        mockMvc = MockMvcBuilders.standaloneSetup(controller)
+            .build();
+    }
+
+    @Test
+    void givenValidExpression_whenCalculateEndpointCalled_thenReturnsExpectedResult() throws Exception {
+        when(chatClient.prompt()
+            .user(anyString())
+            .call()
+            .content()).thenReturn("42");
+        mockMvc.perform(MockMvcRequestBuilders.get("/calculate")
+                .param("expression", "40 + 2"))
+            .andExpect(MockMvcResultMatchers.status()
+                .isOk())
+            .andExpect(MockMvcResultMatchers.content()
+                .string("42"));
+    }
+
+    @Test
+    void givenHomeRequest_whenHomeEndpointCalled_thenReturnsHtmlWithTitle() throws Exception {
+        mockMvc.perform(MockMvcRequestBuilders.get("/"))
+            .andExpect(MockMvcResultMatchers.status()
+                .isOk())
+            .andExpect(MockMvcResultMatchers.content()
+                .string(org.hamcrest.Matchers.containsString("MCP Calculator with OAuth2")));
+    }
+}

spring-ai-modules/spring-ai-mcp/mcp-spring/oauth2-authorization-server/src/test/java/com/baeldung/mcp/oauth2authorizationserver/config/AuthorizationServerConfigTest.java

@@ -0,0 +1,63 @@
+package com.baeldung.mcp.oauth2authorizationserver.config;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.ApplicationContext;
+import org.springframework.security.oauth2.server.authorization.client.RegisteredClient;
+import org.springframework.security.oauth2.server.authorization.client.RegisteredClientRepository;
+import org.springframework.security.oauth2.server.authorization.settings.AuthorizationServerSettings;
+import org.springframework.security.web.SecurityFilterChain;
+
+@SpringBootTest(classes = AuthorizationServerConfig.class)
+class AuthorizationServerConfigTest {
+
+    private final ApplicationContext context;
+
+    private final RegisteredClientRepository registeredClientRepository;
+
+    private final AuthorizationServerSettings authorizationServerSettings;
+
+    public AuthorizationServerConfigTest(ApplicationContext context, RegisteredClientRepository registeredClientRepository,
+        AuthorizationServerSettings authorizationServerSettings) {
+        this.authorizationServerSettings = authorizationServerSettings;
+        this.registeredClientRepository = registeredClientRepository;
+        this.context = context;
+    }
+
+    @Test
+    void givenContext_whenLoaded_thenSecurityFilterChainsPresent() {
+        SecurityFilterChain chain1 = (SecurityFilterChain) context.getBean("authorizationServerSecurityFilterChain");
+        SecurityFilterChain chain2 = (SecurityFilterChain) context.getBean("defaultSecurityFilterChain");
+        assertNotNull(chain1);
+        assertNotNull(chain2);
+    }
+
+    @Test
+    void givenRegisteredClientRepository_whenQueried_thenContainsExpectedClient() {
+        RegisteredClient client = registeredClientRepository.findByClientId("mcp-client");
+        assertNotNull(client);
+        assertEquals("mcp-client", client.getClientId());
+        assertTrue(client.getClientAuthenticationMethods()
+            .stream()
+            .anyMatch(m -> m.getValue()
+                .equals("client_secret_basic")));
+        assertTrue(client.getAuthorizationGrantTypes()
+            .stream()
+            .anyMatch(g -> g.getValue()
+                .equals("authorization_code")));
+        assertTrue(client.getScopes()
+            .contains("mcp.read"));
+        assertTrue(client.getScopes()
+            .contains("mcp.write"));
+    }
+
+    @Test
+    void givenAuthorizationServerSettings_whenLoaded_thenIssuerIsCorrect() {
+        assertEquals("http://localhost:9000", authorizationServerSettings.getIssuer());
+    }
+}
+

spring-ai-modules/spring-ai-mcp/mcp-spring/pom.xml

@@ -10,6 +10,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>spring-ai-mcp</artifactId>
         <version>0.0.1</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modules>

spring-ai-modules/spring-ai-mcp/pom.xml

@@ -13,6 +13,7 @@
     <groupId>com.baeldung</groupId>
     <artifactId>spring-ai-mcp</artifactId>
     <version>0.0.1</version>
+    <packaging>pom</packaging>
     <name>spring-ai-mcp</name>
 
     <dependencies>