Refactored ID tests to be isolated

Author: JohannesRabauer

spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/TestConfiguration.java

@@ -55,7 +55,7 @@ public EmbeddedStorageFoundation<?> createEmbeddedStorageFoundation()
 	}
 
 	@EventListener
-	public void handleContextRefresh(final ContextRefreshedEvent event)
+	public void handleContextRefresh(final ContextRefreshedEvent event) throws IOException
 	{
 		// Init with empty root object
 		this.getStorageInstance().clearData();

…ore/integration/shared/tests/IdTest.java …ntegration/isolated/tests/id/IdTest.javaspring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/shared/tests/IdTest.java renamed to spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/id/IdTest.java spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/shared/tests/IdTest.java renamed to spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/id/IdTest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package software.xdev.spring.data.eclipse.store.integration.shared.tests;
+package software.xdev.spring.data.eclipse.store.integration.isolated.tests.id;
 
 import static software.xdev.spring.data.eclipse.store.helper.TestUtil.restartDatastore;
 
@@ -23,33 +23,39 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
 
 import software.xdev.spring.data.eclipse.store.helper.TestData;
 import software.xdev.spring.data.eclipse.store.helper.TestUtil;
-import software.xdev.spring.data.eclipse.store.integration.shared.DefaultTestAnnotations;
-import software.xdev.spring.data.eclipse.store.integration.shared.SharedTestConfiguration;
-import software.xdev.spring.data.eclipse.store.integration.shared.repositories.id.CustomerWithIdInt;
-import software.xdev.spring.data.eclipse.store.integration.shared.repositories.id.CustomerWithIdIntRepository;
-import software.xdev.spring.data.eclipse.store.integration.shared.repositories.id.CustomerWithIdInteger;
-import software.xdev.spring.data.eclipse.store.integration.shared.repositories.id.CustomerWithIdIntegerNoAutoGenerate;
-import software.xdev.spring.data.eclipse.store.integration.shared.repositories.id.CustomerWithIdIntegerNoAutoGenerateRepository;
-import software.xdev.spring.data.eclipse.store.integration.shared.repositories.id.CustomerWithIdIntegerRepository;
-import software.xdev.spring.data.eclipse.store.integration.shared.repositories.id.CustomerWithIdLong;
-import software.xdev.spring.data.eclipse.store.integration.shared.repositories.id.CustomerWithIdLongRepository;
-import software.xdev.spring.data.eclipse.store.integration.shared.repositories.id.CustomerWithIdString;
-import software.xdev.spring.data.eclipse.store.integration.shared.repositories.id.CustomerWithIdStringRepository;
-import software.xdev.spring.data.eclipse.store.integration.shared.repositories.id.CustomerWithPurchase;
-import software.xdev.spring.data.eclipse.store.integration.shared.repositories.id.CustomerWithPurchaseRepository;
-import software.xdev.spring.data.eclipse.store.integration.shared.repositories.id.Purchase;
+import software.xdev.spring.data.eclipse.store.integration.isolated.IsolatedTestAnnotations;
+import software.xdev.spring.data.eclipse.store.integration.isolated.tests.id.model.CustomerWithIdInt;
+import software.xdev.spring.data.eclipse.store.integration.isolated.tests.id.model.CustomerWithIdIntRepository;
+import software.xdev.spring.data.eclipse.store.integration.isolated.tests.id.model.CustomerWithIdInteger;
+import software.xdev.spring.data.eclipse.store.integration.isolated.tests.id.model.CustomerWithIdIntegerNoAutoGenerate;
+import software.xdev.spring.data.eclipse.store.integration.isolated.tests.id.model.CustomerWithIdIntegerNoAutoGenerateRepository;
+import software.xdev.spring.data.eclipse.store.integration.isolated.tests.id.model.CustomerWithIdIntegerRepository;
+import software.xdev.spring.data.eclipse.store.integration.isolated.tests.id.model.CustomerWithIdLong;
+import software.xdev.spring.data.eclipse.store.integration.isolated.tests.id.model.CustomerWithIdLongRepository;
+import software.xdev.spring.data.eclipse.store.integration.isolated.tests.id.model.CustomerWithIdString;
+import software.xdev.spring.data.eclipse.store.integration.isolated.tests.id.model.CustomerWithIdStringRepository;
+import software.xdev.spring.data.eclipse.store.integration.isolated.tests.id.model.CustomerWithPurchase;
+import software.xdev.spring.data.eclipse.store.integration.isolated.tests.id.model.CustomerWithPurchaseRepository;
+import software.xdev.spring.data.eclipse.store.integration.isolated.tests.id.model.Purchase;
 import software.xdev.spring.data.eclipse.store.repository.EclipseStoreStorage;
 
 
 @SuppressWarnings("OptionalGetWithoutIsPresent")
-@DefaultTestAnnotations
+@IsolatedTestAnnotations
+@ContextConfiguration(classes = {IdTestConfiguration.class})
 class IdTest
 {
+	private final IdTestConfiguration configuration;
+	
 	@Autowired
-	private SharedTestConfiguration configuration;
+	public IdTest(final IdTestConfiguration configuration)
+	{
+		this.configuration = configuration;
+	}
 
 	@Test
 	void testCreateSingleWithAutoIdInteger(@Autowired final CustomerWithIdIntegerRepository customerRepository)
@@ -90,7 +96,8 @@ void testSaveSingleWithoutAnyPreviousCall(@Autowired final CustomerWithIdInteger
 
 	@Test
 	void testCreateSingleWithAutoIdIntegerWorkingCopyIdSet(
-		@Autowired final CustomerWithIdIntegerRepository customerRepository)
+		@Autowired final CustomerWithIdIntegerRepository customerRepository
+	)
 	{
 		final CustomerWithIdInteger customer1 = new CustomerWithIdInteger(TestData.FIRST_NAME, TestData.LAST_NAME);
 		Assertions.assertNull(customer1.getId());
@@ -120,7 +127,8 @@ void testCreateMultipleWithAutoIdInteger(@Autowired final CustomerWithIdIntegerR
 
 	@Test
 	void testCreateMultipleWithAutoIdIntegerSingleFinds(
-		@Autowired final CustomerWithIdIntegerRepository customerRepository)
+		@Autowired final CustomerWithIdIntegerRepository customerRepository
+	)
 	{
 		final CustomerWithIdInteger customer1 = new CustomerWithIdInteger(TestData.FIRST_NAME, TestData.LAST_NAME);
 		customerRepository.save(customer1);
@@ -274,7 +282,8 @@ void testCreateMultipleWithNoAutoIdInteger(
 
 	@Test
 	void testSaveSingleWithAutoIdInteger(
-		@Autowired final CustomerWithIdIntegerRepository customerRepository)
+		@Autowired final CustomerWithIdIntegerRepository customerRepository
+	)
 	{
 		final CustomerWithIdInteger customer1 =
 			new CustomerWithIdInteger();

spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/id/IdTestConfiguration.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2024 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.spring.data.eclipse.store.integration.isolated.tests.id;
+
+import org.eclipse.store.integrations.spring.boot.types.configuration.EclipseStoreProperties;
+import org.eclipse.store.integrations.spring.boot.types.factories.EmbeddedStorageFoundationFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+
+import software.xdev.spring.data.eclipse.store.integration.TestConfiguration;
+import software.xdev.spring.data.eclipse.store.repository.config.EnableEclipseStoreRepositories;
+
+
+@Configuration
+@EnableEclipseStoreRepositories
+public class IdTestConfiguration extends TestConfiguration
+{
+	@Autowired
+	protected IdTestConfiguration(
+		final EclipseStoreProperties defaultEclipseStoreProperties,
+		final EmbeddedStorageFoundationFactory defaultEclipseStoreProvider)
+	{
+		super(defaultEclipseStoreProperties, defaultEclipseStoreProvider);
+	}
+}

…d/repositories/id/CustomerWithIdInt.java …ed/tests/id/model/CustomerWithIdInt.javaspring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/shared/repositories/id/CustomerWithIdInt.java renamed to spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/id/model/CustomerWithIdInt.java spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/shared/repositories/id/CustomerWithIdInt.java renamed to spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/id/model/CustomerWithIdInt.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package software.xdev.spring.data.eclipse.store.integration.shared.repositories.id;
+package software.xdev.spring.data.eclipse.store.integration.isolated.tests.id.model;
 
 import java.util.List;
 import java.util.Objects;

…ries/id/CustomerWithIdIntRepository.java …d/model/CustomerWithIdIntRepository.javaspring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/shared/repositories/id/CustomerWithIdIntRepository.java renamed to spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/id/model/CustomerWithIdIntRepository.java spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/shared/repositories/id/CustomerWithIdIntRepository.java renamed to spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/id/model/CustomerWithIdIntRepository.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package software.xdev.spring.data.eclipse.store.integration.shared.repositories.id;
+package software.xdev.spring.data.eclipse.store.integration.isolated.tests.id.model;
 
 import org.springframework.data.repository.CrudRepository;
 

…positories/id/CustomerWithIdInteger.java …ests/id/model/CustomerWithIdInteger.javaspring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/shared/repositories/id/CustomerWithIdInteger.java renamed to spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/id/model/CustomerWithIdInteger.java spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/shared/repositories/id/CustomerWithIdInteger.java renamed to spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/id/model/CustomerWithIdInteger.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package software.xdev.spring.data.eclipse.store.integration.shared.repositories.id;
+package software.xdev.spring.data.eclipse.store.integration.isolated.tests.id.model;
 
 import java.util.List;
 import java.util.Objects;

…CustomerWithIdIntegerNoAutoGenerate.java …CustomerWithIdIntegerNoAutoGenerate.javaspring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/shared/repositories/id/CustomerWithIdIntegerNoAutoGenerate.java renamed to spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/id/model/CustomerWithIdIntegerNoAutoGenerate.java spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/shared/repositories/id/CustomerWithIdIntegerNoAutoGenerate.java renamed to spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/id/model/CustomerWithIdIntegerNoAutoGenerate.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package software.xdev.spring.data.eclipse.store.integration.shared.repositories.id;
+package software.xdev.spring.data.eclipse.store.integration.isolated.tests.id.model;
 
 import java.util.List;
 import java.util.Objects;

…thIdIntegerNoAutoGenerateRepository.java …thIdIntegerNoAutoGenerateRepository.javaspring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/shared/repositories/id/CustomerWithIdIntegerNoAutoGenerateRepository.java renamed to spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/id/model/CustomerWithIdIntegerNoAutoGenerateRepository.java spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/shared/repositories/id/CustomerWithIdIntegerNoAutoGenerateRepository.java renamed to spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/id/model/CustomerWithIdIntegerNoAutoGenerateRepository.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package software.xdev.spring.data.eclipse.store.integration.shared.repositories.id;
+package software.xdev.spring.data.eclipse.store.integration.isolated.tests.id.model;
 
 import org.springframework.data.repository.CrudRepository;
 

…/id/CustomerWithIdIntegerRepository.java …del/CustomerWithIdIntegerRepository.javaspring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/shared/repositories/id/CustomerWithIdIntegerRepository.java renamed to spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/id/model/CustomerWithIdIntegerRepository.java spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/shared/repositories/id/CustomerWithIdIntegerRepository.java renamed to spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/id/model/CustomerWithIdIntegerRepository.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package software.xdev.spring.data.eclipse.store.integration.shared.repositories.id;
+package software.xdev.spring.data.eclipse.store.integration.isolated.tests.id.model;
 
 import org.springframework.data.repository.CrudRepository;
 

…/repositories/id/CustomerWithIdLong.java …d/tests/id/model/CustomerWithIdLong.javaspring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/shared/repositories/id/CustomerWithIdLong.java renamed to spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/id/model/CustomerWithIdLong.java spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/shared/repositories/id/CustomerWithIdLong.java renamed to spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/id/model/CustomerWithIdLong.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package software.xdev.spring.data.eclipse.store.integration.shared.repositories.id;
+package software.xdev.spring.data.eclipse.store.integration.isolated.tests.id.model;
 
 import java.util.Objects;