Add h2database

build.gradle

@@ -130,7 +130,7 @@ allprojects {
         testImplementation group: 'org.apache.groovy', name: 'groovy-xml', version: groovyVersion
         testImplementation group: 'org.apache.groovy', name: 'groovy-json', version: groovyVersion
         testImplementation group: 'com.github.hmcts', name: 'fortify-client', version: '1.4.10', classifier: 'all'
-
+        testImplementation 'com.h2database:h2'
     }
 
 }

elastic-search-support/src/test/java/uk/gov/hmcts/ccd/definition/store/elastic/ElasticDefinitionImportListenerTest.java

@@ -199,7 +199,7 @@ void initialiseElasticSearchWhenReindexAndDeleteOldIndexAreTrue() throws IOExcep
         verify(ccdElasticClient).reindexData(eq(caseTypeName), eq(incrementedCaseTypeName), any());
         verify(ccdElasticClient).setIndexReadOnly(baseIndexName, false);
         verify(ccdElasticClient).updateAlias(baseIndexName, caseTypeName, incrementedCaseTypeName);
-        verify(reindexEntityService).persistSuccess(incrementedCaseTypeName, anyString());
+        verify(reindexEntityService).persistSuccess(eq(incrementedCaseTypeName), anyString());
 
         verify(ccdElasticClient).removeIndex(caseTypeName);
         ArgumentCaptor<String> oldIndexCaptor = ArgumentCaptor.forClass(String.class);

elastic-search-support/src/test/java/uk/gov/hmcts/ccd/definition/store/elastic/ElasticsearchBaseTest.java

@@ -23,6 +23,7 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.Bean;
 import org.springframework.core.env.Environment;
+import org.springframework.test.context.ActiveProfiles;
 import org.springframework.util.StringUtils;
 import uk.gov.hmcts.ccd.definition.store.CaseDataAPIApplication;
 
@@ -35,7 +36,8 @@
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
     classes = {ServletWebServerFactoryAutoConfiguration.class, ElasticsearchConfigurationIT.class,
-        CaseDataAPIApplication.class})
+        CaseDataAPIApplication.class, TestReindexConfig.class, ElasticsearchTestApplication.class})
+@ActiveProfiles("test")
 public abstract class ElasticsearchBaseTest implements TestUtils {
 
     private static final String GET = "GET";

elastic-search-support/src/test/java/uk/gov/hmcts/ccd/definition/store/elastic/ElasticsearchTestApplication.java

@@ -0,0 +1,13 @@
+package uk.gov.hmcts.ccd.definition.store.elastic;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+
+@SpringBootApplication(scanBasePackages = "uk.gov.hmcts.ccd.definition.store.elastic")
+@EnableConfigurationProperties
+public class ElasticsearchTestApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(ElasticsearchTestApplication.class, args);
+    }
+}

elastic-search-support/src/test/java/uk/gov/hmcts/ccd/definition/store/elastic/TestReindexConfig.java

@@ -0,0 +1,148 @@
+package uk.gov.hmcts.ccd.definition.store.elastic;
+
+import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Primary;
+import org.springframework.context.annotation.Profile;
+import uk.gov.hmcts.ccd.definition.store.domain.service.JurisdictionService;
+import uk.gov.hmcts.ccd.definition.store.event.DefinitionImportedEvent;
+import uk.gov.hmcts.ccd.definition.store.repository.BannerRepository;
+import uk.gov.hmcts.ccd.definition.store.repository.CaseFieldRepository;
+import uk.gov.hmcts.ccd.definition.store.repository.CaseTypeLiteRepository;
+import uk.gov.hmcts.ccd.definition.store.repository.CaseTypeRepository;
+import uk.gov.hmcts.ccd.definition.store.repository.DisplayGroupRepository;
+import uk.gov.hmcts.ccd.definition.store.repository.EventRepository;
+import uk.gov.hmcts.ccd.definition.store.repository.FieldTypeRepository;
+import uk.gov.hmcts.ccd.definition.store.repository.GenericLayoutRepository;
+import uk.gov.hmcts.ccd.definition.store.repository.JurisdictionRepository;
+import uk.gov.hmcts.ccd.definition.store.repository.JurisdictionUiConfigRepository;
+import uk.gov.hmcts.ccd.definition.store.repository.ReindexRepository;
+import uk.gov.hmcts.ccd.definition.store.repository.entity.ReindexEntity;
+import uk.gov.hmcts.reform.idam.client.IdamApi;
+import uk.gov.hmcts.reform.idam.client.IdamClient;
+
+import java.time.LocalDateTime;
+import java.util.Collections;
+import java.util.Optional;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+@TestConfiguration
+@Profile("test")
+public class TestReindexConfig {
+
+    @Bean
+    @Primary
+    public ReindexEntityService mockReindexEntityService() {
+        ReindexEntityService mockService = mock(ReindexEntityService.class);
+
+        ReindexEntity mockEntity = new ReindexEntity();
+        mockEntity.setId(1);
+        mockEntity.setReindex(true);
+        mockEntity.setDeleteOldIndex(true);
+        mockEntity.setCaseType("TestCaseType");
+        mockEntity.setJurisdiction("TestJur");
+        mockEntity.setIndexName("test-index-000001");
+        mockEntity.setStartTime(LocalDateTime.now());
+        mockEntity.setStatus("STARTED");
+
+        when(mockService.persistInitialReindexMetadata(any(), any(), any(), any()))
+            .thenReturn(mockEntity);
+
+        doNothing().when(mockService).persistSuccess(any(), any());
+        doNothing().when(mockService).persistFailure(any(), any());
+
+        return mockService;
+    }
+
+    @Bean
+    @Primary
+    public ReindexRepository mockReindexRepository() {
+        ReindexRepository mockRepo = mock(ReindexRepository.class);
+        when(mockRepo.findByIndexName(any())).thenReturn(Optional.empty());
+        when(mockRepo.saveAndFlush(any())).thenReturn(new ReindexEntity());
+        when(mockRepo.save(any())).thenReturn(new ReindexEntity());
+        doNothing().when(mockRepo).deleteAll();
+        when(mockRepo.findAll()).thenReturn(Collections.emptyList());
+        return mockRepo;
+    }
+
+    @Bean
+    @Primary
+    public SynchronousElasticDefinitionImportListener mockSynchronousElasticDefinitionImportListener() {
+        SynchronousElasticDefinitionImportListener mockListener = mock(SynchronousElasticDefinitionImportListener.class);
+
+        doNothing().when(mockListener).onDefinitionImported(any(DefinitionImportedEvent.class));
+
+        return mockListener;
+    }
+
+    @Bean
+    @Primary
+    public FieldTypeRepository mockFieldTypeRepository() {
+        return mock(FieldTypeRepository.class);
+    }
+
+    @Bean
+    @Primary
+    public CaseFieldRepository mockCaseFieldRepository() {
+        return mock(CaseFieldRepository.class);
+    }
+
+    @Bean
+    @Primary
+    public JurisdictionRepository mockJurisdictionRepository() {
+        return mock(JurisdictionRepository.class);
+    }
+
+    @Bean
+    @Primary
+    public JurisdictionUiConfigRepository mockJurisdictionUiConfigRepository() {
+        return mock(JurisdictionUiConfigRepository.class);
+    }
+
+    @Bean
+    @Primary
+    public BannerRepository mockBannerRepository() {
+        return mock(BannerRepository.class);
+    }
+
+    @Bean
+    @Primary
+    public JurisdictionService mockJurisdictionService() {
+        return mock(JurisdictionService.class);
+    }
+
+    @Bean
+    @Primary
+    public GenericLayoutRepository mockLayoutService() {
+        return mock(GenericLayoutRepository.class);
+    }
+
+    @Bean
+    @Primary
+    public DisplayGroupRepository mockDisplayGroupRepository() {
+        return mock(DisplayGroupRepository.class);
+    }
+
+    @Bean
+    @Primary
+    public EventRepository mockEventRepository() {
+        return mock(EventRepository.class);
+    }
+
+    @Bean
+    @Primary
+    public IdamClient mockIdamClient() {
+        return mock(IdamClient.class);
+    }
+
+    @Bean
+    @Primary
+    public IdamApi mockIdamApi() {
+        return mock(IdamApi.class);
+    }
+}

elastic-search-support/src/test/resources/application-test.properties

@@ -0,0 +1,41 @@
+# Completely disable OIDC client and provider config
+spring.security.oauth2.client.registration=
+spring.security.oauth2.client.provider=
+
+# Override the issuer-uri that's causing the connection issue
+spring.security.oauth2.client.provider.oidc.issuer-uri=
+
+# Disable flyway + database
+spring.flyway.enabled=false
+
+# Avoid elastic health failing test context
+management.health.elasticsearch.enabled=false
+
+# Disable component scanning for problematic packages
+spring.main.sources=uk.gov.hmcts.ccd.definition.store.elastic
+management.endpoints.enabled-by-default=false
+
+# Disable SpringDoc entirely for tests
+springdoc.api-docs.enabled=false
+springdoc.swagger-ui.enabled=false
+
+# Disable all management endpoints to avoid security issues
+management.endpoint.health.enabled=false
+management.endpoint.info.enabled=false
+
+# Add to application-test.properties - exclude IDAM auto-configuration
+spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.security.oauth2.client.servlet.OAuth2ClientAutoConfiguration,org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration,org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration,org.springdoc.core.configuration.SpringDocConfiguration,org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration,uk.gov.hmcts.reform.idam.client.config.IdamClientAutoConfiguration
+
+# Also disable IDAM properties
+idam.api.url=disabled
+idam.client.id=disabled
+idam.client.secret=disabled
+
+elasticsearch.host=localhost
+elasticsearch.port=9200
+elasticsearch.scheme=http
+elasticsearch.enabled=true
+elasticsearch.indexShards=8
+elasticsearch.indexShardsReplicas=3
+elasticsearch.failImportIfError=true
+elasticsearch.dynamic=true