From f0b106ab600f31c132b58c534b3870c1585c5d7b Mon Sep 17 00:00:00 2001 From: eugenp Date: Tue, 3 Jun 2014 19:58:42 +0200 Subject: [PATCH] persistence cleanup work --- .../baeldung/config/PersistenceJPAConfig.java | 2 +- ... => FooServiceSortingWitNullsManualTest.java} | 2 +- .../service/PersistenceTestSuite.java | 16 ++++++++++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) rename spring-jpa/src/test/java/org/baeldung/persistence/service/{FooServiceSortingTestsWithNulls.java => FooServiceSortingWitNullsManualTest.java} (97%) create mode 100644 spring-jpa/src/test/java/org/baeldung/persistence/service/PersistenceTestSuite.java diff --git a/spring-jpa/src/main/java/org/baeldung/config/PersistenceJPAConfig.java b/spring-jpa/src/main/java/org/baeldung/config/PersistenceJPAConfig.java index 2e6882c684..76fc96b3ce 100644 --- a/spring-jpa/src/main/java/org/baeldung/config/PersistenceJPAConfig.java +++ b/spring-jpa/src/main/java/org/baeldung/config/PersistenceJPAConfig.java @@ -37,7 +37,7 @@ public class PersistenceJPAConfig { // beans @Bean - public LocalContainerEntityManagerFactoryBean entityManagerFactoryBean() { + public LocalContainerEntityManagerFactoryBean entityManagerFactory() { final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean(); em.setDataSource(dataSource()); em.setPackagesToScan(new String[] { "org.baeldung.persistence.model" }); diff --git a/spring-jpa/src/test/java/org/baeldung/persistence/service/FooServiceSortingTestsWithNulls.java b/spring-jpa/src/test/java/org/baeldung/persistence/service/FooServiceSortingWitNullsManualTest.java similarity index 97% rename from spring-jpa/src/test/java/org/baeldung/persistence/service/FooServiceSortingTestsWithNulls.java rename to spring-jpa/src/test/java/org/baeldung/persistence/service/FooServiceSortingWitNullsManualTest.java index 7af2c1b692..986e4e4a7d 100644 --- a/spring-jpa/src/test/java/org/baeldung/persistence/service/FooServiceSortingTestsWithNulls.java +++ b/spring-jpa/src/test/java/org/baeldung/persistence/service/FooServiceSortingWitNullsManualTest.java @@ -20,7 +20,7 @@ import org.springframework.test.context.support.AnnotationConfigContextLoader; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = { PersistenceJPAConfig.class }, loader = AnnotationConfigContextLoader.class) -public class FooServiceSortingTestsWithNulls { +public class FooServiceSortingWitNullsManualTest { @PersistenceContext private EntityManager entityManager; diff --git a/spring-jpa/src/test/java/org/baeldung/persistence/service/PersistenceTestSuite.java b/spring-jpa/src/test/java/org/baeldung/persistence/service/PersistenceTestSuite.java new file mode 100644 index 0000000000..35f648b5a0 --- /dev/null +++ b/spring-jpa/src/test/java/org/baeldung/persistence/service/PersistenceTestSuite.java @@ -0,0 +1,16 @@ +package org.baeldung.persistence.service; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + +@RunWith(Suite.class) +@Suite.SuiteClasses({// @formatter:off + FooPaginationPersistenceIntegrationTest.class + ,FooServicePersistenceIntegrationTest.class + ,FooServiceSortingTests.class + // manual only + // ,FooServiceSortingWitNullsManualTest.class +}) // @formatter:on +public class PersistenceTestSuite { + // +}