Tidy up tests

Author: jasperblues

src/test/kotlin/com/embabel/guide/TestApplicationContext.kt

@@ -15,26 +15,10 @@
  */
 package com.embabel.guide
 
-import com.embabel.GuideApplication
-import org.springframework.boot.test.context.TestConfiguration
 import org.springframework.context.ApplicationContextInitializer
 import org.springframework.context.ConfigurableApplicationContext
-import org.springframework.context.annotation.Import
 import org.springframework.core.env.MapPropertySource
 
-/**
- * Shared test configuration for all tests.
- *
- * Controls whether tests use local Neo4j or Testcontainers:
- * - Set useLocalNeo4j = true to use local Neo4j at localhost:7687
- * - Set useLocalNeo4j = false to use Testcontainers (slower, but isolated)
- *
- * Imports GuideApplication to enable full component scanning.
- */
-@TestConfiguration
-@Import(GuideApplication::class)
-class TestApplicationContext
-
 /**
  * Initializer that configures Neo4j properties before Spring context starts.
  * Add to test classes with: @ContextConfiguration(initializers = [Neo4jPropertiesInitializer::class])

src/test/kotlin/com/embabel/guide/domain/GuideUserServiceTest.kt

@@ -16,22 +16,16 @@
 package com.embabel.guide.domain
 
 import com.embabel.guide.Neo4jPropertiesInitializer
-import com.embabel.guide.Neo4jTestContainer
-import com.embabel.guide.TestApplicationContext
 import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.Test
 import org.springframework.ai.mcp.client.autoconfigure.McpClientAutoConfiguration
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration
 import org.springframework.boot.test.context.SpringBootTest
-import org.springframework.test.annotation.Rollback
 import org.springframework.test.context.ContextConfiguration
-import org.springframework.test.context.DynamicPropertyRegistry
-import org.springframework.test.context.DynamicPropertySource
 
-@SpringBootTest(classes = [TestApplicationContext::class])
+@SpringBootTest
 @ContextConfiguration(initializers = [Neo4jPropertiesInitializer::class])
-@Rollback(false)
 @ImportAutoConfiguration(exclude = [McpClientAutoConfiguration::class])
 class GuideUserServiceTest {
 

src/test/kotlin/com/embabel/hub/HubApiControllerTest.kt

@@ -1,6 +1,6 @@
 package com.embabel.hub
 
-import com.embabel.guide.TestApplicationContext
+import com.embabel.guide.Neo4jPropertiesInitializer
 import com.embabel.guide.domain.GuideUserRepository
 import com.fasterxml.jackson.databind.ObjectMapper
 import org.junit.jupiter.api.Assertions.*
@@ -20,9 +20,7 @@ import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post
 import org.springframework.test.web.servlet.result.MockMvcResultMatchers.*
 
 @SpringBootTest
-@AutoConfigureMockMvc
-@ContextConfiguration(classes = [TestApplicationContext::class])
-@Rollback(false)
+@ContextConfiguration(initializers = [Neo4jPropertiesInitializer::class])
 @ImportAutoConfiguration(exclude = [McpClientAutoConfiguration::class])
 class HubApiControllerTest {
 

src/test/kotlin/com/embabel/hub/HubServiceTest.kt

@@ -1,17 +1,18 @@
 package com.embabel.hub
 
-import com.embabel.guide.TestApplicationContext
+import com.embabel.guide.Neo4jPropertiesInitializer
 import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.Test
+import org.springframework.ai.mcp.client.autoconfigure.McpClientAutoConfiguration
 import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.autoconfigure.ImportAutoConfiguration
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder
-import org.springframework.test.annotation.Rollback
 import org.springframework.test.context.ContextConfiguration
 
 @SpringBootTest
-@ContextConfiguration(classes = [TestApplicationContext::class])
-@Rollback(false)
+@ContextConfiguration(initializers = [Neo4jPropertiesInitializer::class])
+@ImportAutoConfiguration(exclude = [McpClientAutoConfiguration::class])
 class HubServiceTest {
 
     @Autowired