refactor test

eclipse-store · Nov 7, 2023 · 441e7bb · 441e7bb
1 parent ae9c364
commit 441e7bb
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 13 deletions.
diff --git a/...a/org/eclipse/store/integrations/spring/boot/types/EclipseConfigurationSqlSpringTest.java b/...a/org/eclipse/store/integrations/spring/boot/types/EclipseConfigurationSqlSpringTest.java
@@ -25,7 +25,7 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-@TestPropertySource("classpath:sql-test.properties")
+@TestPropertySource("classpath:application-sql.properties")
 @SpringBootTest(classes = {EclipseStoreConfiguration.class})
 public class EclipseConfigurationSqlSpringTest
 {

diff --git a/...boot3/src/test/java/org/eclipse/store/integrations/spring/boot/types/StorageBeanTest.java b/...boot3/src/test/java/org/eclipse/store/integrations/spring/boot/types/StorageBeanTest.java
@@ -27,7 +27,7 @@
 import org.springframework.context.annotation.Primary;
 import org.springframework.test.context.TestPropertySource;
 
-@TestPropertySource("classpath:application-test.properties")
+@TestPropertySource("classpath:application-run.properties")
 @SpringBootTest(classes = {EclipseStoreConfiguration.class, StorageBeanTest.class})
 public class StorageBeanTest
 {

diff --git a/...rc/test/java/org/eclipse/store/integrations/spring/boot/types/root/AutostartRootTest.java b/...rc/test/java/org/eclipse/store/integrations/spring/boot/types/root/AutostartRootTest.java
@@ -1,17 +1,15 @@
 package org.eclipse.store.integrations.spring.boot.types.root;
 
 import org.eclipse.store.integrations.spring.boot.types.EclipseStoreConfiguration;
-import org.eclipse.store.storage.embedded.types.EmbeddedStorage;
 import org.eclipse.store.storage.embedded.types.EmbeddedStorageManager;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.TestPropertySource;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-@TestPropertySource("classpath:autostart-root.properties")
+@TestPropertySource("classpath:application-autostart-root.properties")
 @SpringBootTest(classes = {EclipseStoreConfiguration.class})
 public class AutostartRootTest
 {

diff --git a/integrations/spring-boot3/src/test/resources/application-autostart-root.properties b/integrations/spring-boot3/src/test/resources/application-autostart-root.properties
@@ -0,0 +1,4 @@
+debug=true
+org.eclipse.store.storage-directory=${java.io.tmpdir}/${random.int}
+org.eclipse.store.auto-start=true
+org.eclipse.store.root=org.eclipse.store.integrations.spring.boot.types.root.Root
diff --git a/integrations/spring-boot3/src/test/resources/application-run.properties b/integrations/spring-boot3/src/test/resources/application-run.properties
@@ -0,0 +1,3 @@
+debug=true
+org.eclipse.store.storage-directory=${java.io.tmpdir}/${random.int}
+org.eclipse.store.auto-start=false
diff --git a/...t3/src/test/resources/sql-test.properties → ...test/resources/application-sql.properties b/...t3/src/test/resources/sql-test.properties → ...test/resources/application-sql.properties
diff --git a/integrations/spring-boot3/src/test/resources/autostart-root.properties b/integrations/spring-boot3/src/test/resources/autostart-root.properties