DevFW-CICD/spring-petclinic
16
0
Fork 1
mirror of https://github.com/spring-projects/spring-petclinic.git synced 2025-07-15 20:25:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

renamed profiles and removed unnecessary@DirtiesContext annotation so the Test suite now runs in 40% less time

Browse source
This commit is contained in:
Mic 2013-01-29 17:47:45 +08:00
parent 87e08f7b99
commit 3482d549ea
14 changed files with 11 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/resources/spring/applicationContext-dao.xml
View file

@ -62,7 +62,7 @@
<beans profile="jpa"> <beans profile="jpa,spring-data-jpa">
<!-- JPA EntityManagerFactory --> <!-- JPA EntityManagerFactory -->
<bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean" <bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean"
p:dataSource-ref="dataSource"> p:dataSource-ref="dataSource">
@ -109,7 +109,7 @@
</beans> </beans>
<beans profile="plain-jpa"> <beans profile="jpa">
<!-- <!--
Will automatically be transactional due to @Transactional. Will automatically be transactional due to @Transactional.
EntityManager will be auto-injected due to @PersistenceContext. EntityManager will be auto-injected due to @PersistenceContext.

2
src/test/java/org/springframework/samples/petclinic/jdbc/JdbcOwnerRepositoryImplTests.java
View file

@ -2,7 +2,6 @@ package org.springframework.samples.petclinic.jdbc;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.samples.petclinic.AbstractOwnerRepositoryTests; import org.springframework.samples.petclinic.AbstractOwnerRepositoryTests;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@ -19,7 +18,6 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
*/ */
@ContextConfiguration(locations={"classpath:spring/applicationContext-dao.xml"}) @ContextConfiguration(locations={"classpath:spring/applicationContext-dao.xml"})
@RunWith(SpringJUnit4ClassRunner.class) @RunWith(SpringJUnit4ClassRunner.class)
@DirtiesContext
@ActiveProfiles("jdbc") @ActiveProfiles("jdbc")
public class JdbcOwnerRepositoryImplTests extends AbstractOwnerRepositoryTests { public class JdbcOwnerRepositoryImplTests extends AbstractOwnerRepositoryTests {

2
src/test/java/org/springframework/samples/petclinic/jdbc/JdbcPetRepositoryImplTests.java
View file

@ -2,7 +2,6 @@ package org.springframework.samples.petclinic.jdbc;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.samples.petclinic.AbstractPetRepositoryTests; import org.springframework.samples.petclinic.AbstractPetRepositoryTests;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@ -19,7 +18,6 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
*/ */
@ContextConfiguration(locations={"classpath:spring/applicationContext-dao.xml"}) @ContextConfiguration(locations={"classpath:spring/applicationContext-dao.xml"})
@RunWith(SpringJUnit4ClassRunner.class) @RunWith(SpringJUnit4ClassRunner.class)
@DirtiesContext
@ActiveProfiles("jdbc") @ActiveProfiles("jdbc")
public class JdbcPetRepositoryImplTests extends AbstractPetRepositoryTests { public class JdbcPetRepositoryImplTests extends AbstractPetRepositoryTests {

2
src/test/java/org/springframework/samples/petclinic/jdbc/JdbcVetRepositoryImplTests.java
View file

@ -2,7 +2,6 @@ package org.springframework.samples.petclinic.jdbc;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.samples.petclinic.AbstractVetRepositoryTests; import org.springframework.samples.petclinic.AbstractVetRepositoryTests;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@ -19,7 +18,6 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
*/ */
@ContextConfiguration(locations={"classpath:spring/applicationContext-dao.xml"}) @ContextConfiguration(locations={"classpath:spring/applicationContext-dao.xml"})
@RunWith(SpringJUnit4ClassRunner.class) @RunWith(SpringJUnit4ClassRunner.class)
@DirtiesContext
@ActiveProfiles("jdbc") @ActiveProfiles("jdbc")
public class JdbcVetRepositoryImplTests extends AbstractVetRepositoryTests { public class JdbcVetRepositoryImplTests extends AbstractVetRepositoryTests {

2
src/test/java/org/springframework/samples/petclinic/jdbc/JdbcVisitRepositoryImplTests.java
View file

@ -2,7 +2,6 @@ package org.springframework.samples.petclinic.jdbc;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.samples.petclinic.AbstractVisitRepositoryTests; import org.springframework.samples.petclinic.AbstractVisitRepositoryTests;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@ -19,7 +18,6 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
*/ */
@ContextConfiguration(locations={"classpath:spring/applicationContext-dao.xml"}) @ContextConfiguration(locations={"classpath:spring/applicationContext-dao.xml"})
@RunWith(SpringJUnit4ClassRunner.class) @RunWith(SpringJUnit4ClassRunner.class)
@DirtiesContext
@ActiveProfiles("jdbc") @ActiveProfiles("jdbc")
public class JdbcVisitRepositoryImplTests extends AbstractVisitRepositoryTests { public class JdbcVisitRepositoryImplTests extends AbstractVisitRepositoryTests {

2
src/test/java/org/springframework/samples/petclinic/jpa/JpaOwnerRepositoryImplTests.java
View file

@ -28,7 +28,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@ContextConfiguration(locations={"classpath:spring/applicationContext-dao.xml"}) @ContextConfiguration(locations={"classpath:spring/applicationContext-dao.xml"})
@RunWith(SpringJUnit4ClassRunner.class) @RunWith(SpringJUnit4ClassRunner.class)
@ActiveProfiles({"jpa","plain-jpa"}) @ActiveProfiles("jpa")
public class JpaOwnerRepositoryImplTests extends AbstractOwnerRepositoryTests { public class JpaOwnerRepositoryImplTests extends AbstractOwnerRepositoryTests {
} }

4
src/test/java/org/springframework/samples/petclinic/jpa/JpaPetRepositoryImplTests.java
View file

@ -2,7 +2,6 @@ package org.springframework.samples.petclinic.jpa;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.samples.petclinic.AbstractPetRepositoryTests; import org.springframework.samples.petclinic.AbstractPetRepositoryTests;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@ -19,8 +18,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
*/ */
@ContextConfiguration(locations={"classpath:spring/applicationContext-dao.xml"}) @ContextConfiguration(locations={"classpath:spring/applicationContext-dao.xml"})
@RunWith(SpringJUnit4ClassRunner.class) @RunWith(SpringJUnit4ClassRunner.class)
@DirtiesContext @ActiveProfiles("jpa")
@ActiveProfiles({"jpa","plain-jpa"})
public class JpaPetRepositoryImplTests extends AbstractPetRepositoryTests { public class JpaPetRepositoryImplTests extends AbstractPetRepositoryTests {

4
src/test/java/org/springframework/samples/petclinic/jpa/JpaVetRepositoryImplTests.java
View file

@ -2,7 +2,6 @@ package org.springframework.samples.petclinic.jpa;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.samples.petclinic.AbstractVetRepositoryTests; import org.springframework.samples.petclinic.AbstractVetRepositoryTests;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@ -19,8 +18,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
*/ */
@ContextConfiguration(locations={"classpath:spring/applicationContext-dao.xml"}) @ContextConfiguration(locations={"classpath:spring/applicationContext-dao.xml"})
@RunWith(SpringJUnit4ClassRunner.class) @RunWith(SpringJUnit4ClassRunner.class)
@DirtiesContext @ActiveProfiles("jpa")
@ActiveProfiles({"jpa","plain-jpa"})
public class JpaVetRepositoryImplTests extends AbstractVetRepositoryTests { public class JpaVetRepositoryImplTests extends AbstractVetRepositoryTests {

4
src/test/java/org/springframework/samples/petclinic/jpa/JpaVisitRepositoryImplTests.java
View file

@ -2,7 +2,6 @@ package org.springframework.samples.petclinic.jpa;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.samples.petclinic.AbstractVisitRepositoryTests; import org.springframework.samples.petclinic.AbstractVisitRepositoryTests;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@ -19,8 +18,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
*/ */
@ContextConfiguration(locations={"classpath:spring/applicationContext-dao.xml"}) @ContextConfiguration(locations={"classpath:spring/applicationContext-dao.xml"})
@RunWith(SpringJUnit4ClassRunner.class) @RunWith(SpringJUnit4ClassRunner.class)
@DirtiesContext @ActiveProfiles("jpa")
@ActiveProfiles({"jpa","plain-jpa"})
public class JpaVisitRepositoryImplTests extends AbstractVisitRepositoryTests { public class JpaVisitRepositoryImplTests extends AbstractVisitRepositoryTests {

2
src/test/java/org/springframework/samples/petclinic/springdatajpa/JpaOwnerRepositoryImplTests.java
View file

@ -28,7 +28,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@ContextConfiguration(locations={"classpath:spring/applicationContext-dao.xml"}) @ContextConfiguration(locations={"classpath:spring/applicationContext-dao.xml"})
@RunWith(SpringJUnit4ClassRunner.class) @RunWith(SpringJUnit4ClassRunner.class)
@ActiveProfiles({"jpa","spring-data-jpa"}) @ActiveProfiles("spring-data-jpa")
public class JpaOwnerRepositoryImplTests extends AbstractOwnerRepositoryTests { public class JpaOwnerRepositoryImplTests extends AbstractOwnerRepositoryTests {
} }

4
src/test/java/org/springframework/samples/petclinic/springdatajpa/JpaPetRepositoryImplTests.java
View file

@ -2,7 +2,6 @@ package org.springframework.samples.petclinic.springdatajpa;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.samples.petclinic.AbstractPetRepositoryTests; import org.springframework.samples.petclinic.AbstractPetRepositoryTests;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@ -19,8 +18,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
*/ */
@ContextConfiguration(locations={"classpath:spring/applicationContext-dao.xml"}) @ContextConfiguration(locations={"classpath:spring/applicationContext-dao.xml"})
@RunWith(SpringJUnit4ClassRunner.class) @RunWith(SpringJUnit4ClassRunner.class)
@DirtiesContext @ActiveProfiles("spring-data-jpa")
@ActiveProfiles({"jpa","spring-data-jpa"})
public class JpaPetRepositoryImplTests extends AbstractPetRepositoryTests { public class JpaPetRepositoryImplTests extends AbstractPetRepositoryTests {

4
src/test/java/org/springframework/samples/petclinic/springdatajpa/JpaVetRepositoryImplTests.java
View file

@ -2,7 +2,6 @@ package org.springframework.samples.petclinic.springdatajpa;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.samples.petclinic.AbstractVetRepositoryTests; import org.springframework.samples.petclinic.AbstractVetRepositoryTests;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@ -19,8 +18,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
*/ */
@ContextConfiguration(locations={"classpath:spring/applicationContext-dao.xml"}) @ContextConfiguration(locations={"classpath:spring/applicationContext-dao.xml"})
@RunWith(SpringJUnit4ClassRunner.class) @RunWith(SpringJUnit4ClassRunner.class)
@DirtiesContext @ActiveProfiles("spring-data-jpa")
@ActiveProfiles({"jpa","spring-data-jpa"})
public class JpaVetRepositoryImplTests extends AbstractVetRepositoryTests { public class JpaVetRepositoryImplTests extends AbstractVetRepositoryTests {

4
src/test/java/org/springframework/samples/petclinic/springdatajpa/JpaVisitRepositoryImplTests.java
View file

@ -2,7 +2,6 @@ package org.springframework.samples.petclinic.springdatajpa;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.springframework.samples.petclinic.AbstractVisitRepositoryTests; import org.springframework.samples.petclinic.AbstractVisitRepositoryTests;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@ -19,8 +18,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
*/ */
@ContextConfiguration(locations={"classpath:spring/applicationContext-dao.xml"}) @ContextConfiguration(locations={"classpath:spring/applicationContext-dao.xml"})
@RunWith(SpringJUnit4ClassRunner.class) @RunWith(SpringJUnit4ClassRunner.class)
@DirtiesContext @ActiveProfiles("spring-data-jpa")
@ActiveProfiles({"jpa","spring-data-jpa"})
public class JpaVisitRepositoryImplTests extends AbstractVisitRepositoryTests { public class JpaVisitRepositoryImplTests extends AbstractVisitRepositoryTests {

2
src/test/java/org/springframework/samples/petclinic/springdatajpa/SpringDataOwnerRepositoryTests.java
View file

@ -13,7 +13,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@ContextConfiguration(locations={"classpath:spring/applicationContext-dao.xml"}) @ContextConfiguration(locations={"classpath:spring/applicationContext-dao.xml"})
@RunWith(SpringJUnit4ClassRunner.class) @RunWith(SpringJUnit4ClassRunner.class)
@ActiveProfiles({"jpa","spring-data-jpa"}) @ActiveProfiles("spring-data-jpa")
public class SpringDataOwnerRepositoryTests extends AbstractOwnerRepositoryTests { public class SpringDataOwnerRepositoryTests extends AbstractOwnerRepositoryTests {
} }