Importer Tests now running

Author: JohannesRabauer

spring-data-eclipse-store-jpa/src/test/java/software/xdev/spring/data/eclipse/store/jpa/DefaultTestAnnotations.java

@@ -28,16 +28,13 @@
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-import software.xdev.spring.data.eclipse.store.repository.config.EnableEclipseStoreRepositories;
-
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = {TestConfiguration.class})
 @DirtiesContext(classMode = BEFORE_EACH_TEST_METHOD)
 @TestPropertySource("/application.properties")
-@EnableEclipseStoreRepositories
 public @interface DefaultTestAnnotations
 {
 }

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

@@ -20,6 +20,8 @@
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.SpringBootConfiguration;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.event.ContextRefreshedEvent;
@@ -33,6 +35,8 @@
 @Configuration
 @ComponentScan("software.xdev.spring.data.eclipse.store.importer")
 @EnableEclipseStoreRepositories
+@SpringBootConfiguration
+@EnableAutoConfiguration
 public class TestConfiguration implements DisposableBean
 {
 	@Autowired

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

@@ -60,7 +60,7 @@ void testBasicSaveAndFindSingleRecords()
 	@Test
 	void testEclipseStoreImport()
 	{
-		final PersonToTestInJpa customer = new PersonToTestInJpa("", "");
+		final PersonToTestInJpa customer = new PersonToTestInJpa("1", "", "");
 		this.personToTestInJpaRepository.save(customer);
 
 		final List<SimpleEclipseStoreRepository<?, ?>> simpleEclipseStoreRepositories =

spring-data-eclipse-store-jpa/src/test/java/software/xdev/spring/data/eclipse/store/jpa/integration/repository/PersonToTestInJpa.java

@@ -15,8 +15,9 @@ public class PersonToTestInJpa
 	private String firstName;
 	private String lastName;
 
-	public PersonToTestInJpa(final String firstName, final String lastName)
+	public PersonToTestInJpa(final String id, final String firstName, final String lastName)
 	{
+		this.id = id;
 		this.firstName = firstName;
 		this.lastName = lastName;
 	}

spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/EclipseStoreStorage.java

@@ -153,6 +153,15 @@ public synchronized <T> IdentitySet<T> getEntityList(final Class<T> clazz)
 		return (IdentitySet<T>)this.root.getEntityLists().get(this.getEntityName(clazz));
 	}
 
+	@SuppressWarnings("unchecked")
+	@Override
+	public synchronized <T> long getEntityCount(final Class<T> clazz)
+	{
+		this.ensureEntitiesInRoot();
+		final IdentitySet<T> entityList = (IdentitySet<T>)this.root.getEntityLists().get(this.getEntityName(clazz));
+		return entityList == null ? 0 : entityList.size();
+	}
+	
 	public synchronized <T> void store(
 		final Collection<Object> nonEntitiesToStore,
 		final Class<T> clazz,

spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/EntityListProvider.java

@@ -21,4 +21,6 @@
 public interface EntityListProvider
 {
 	<T> IdentitySet<T> getEntityList(final Class<T> clazz);
+	
+	<T> long getEntityCount(final Class<T> clazz);
 }

spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/SimpleEclipseStoreRepository.java

@@ -227,7 +227,7 @@ public List<T> findAllById(@Nonnull final Iterable<ID> ids)
 	@Override
 	public long count()
 	{
-		return this.storage.getEntityList(this.domainClass).size();
+		return this.storage.getEntityCount(this.domainClass);
 	}
 
 	@Override