Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5.1.x'

Browse Source
This commit is contained in:
Sam Brannen
2019-03-13 15:16:24 +01:00
parent 4bee5073a0 8f7b118701
commit f9e22a0f02
13 changed files with 81 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/docs/asciidoc/testing.adoc
View File

@@ -3234,11 +3234,11 @@ The first code listing shows a JUnit 4 based implementation of the test class th
----
@RunWith(SpringRunner.class)
// specifies the Spring configuration to load for this test fixture
**@ContextConfiguration("repository-config.xml")**
@ContextConfiguration("repository-config.xml")
public class HibernateTitleRepositoryTests {
// this instance will be dependency injected by type
**@Autowired**
@Autowired
private HibernateTitleRepository titleRepository;
@Test
@@ -3257,13 +3257,13 @@ follows:
----
@RunWith(SpringRunner.class)
// specifies the Spring configuration to load for this test fixture
**@ContextConfiguration("repository-config.xml")**
@ContextConfiguration("repository-config.xml")
public class HibernateTitleRepositoryTests {
// this instance will be dependency injected by type
private HibernateTitleRepository titleRepository;
**@Autowired**
@Autowired
public void setTitleRepository(HibernateTitleRepository titleRepository) {
this.titleRepository = titleRepository;
}
@@ -3290,7 +3290,7 @@ shows this configuration:
http://www.springframework.org/schema/beans/spring-beans.xsd">
<!-- this bean will be injected into the HibernateTitleRepositoryTests class -->
<bean id="**titleRepository**" class="**com.foo.repository.hibernate.HibernateTitleRepository**">
<bean id="titleRepository" class="com.foo.repository.hibernate.HibernateTitleRepository">
<property name="sessionFactory" ref="sessionFactory"/>
</bean>
@@ -3317,8 +3317,8 @@ method in the superclass as well):
@Autowired
@Override
public void setDataSource(**@Qualifier("myDataSource")** DataSource dataSource) {
**super**.setDataSource(dataSource);
public void setDataSource(@Qualifier("myDataSource") DataSource dataSource) {
super.setDataSource(dataSource);
}
// ...
@@ -3694,11 +3694,11 @@ following example shows the relevant annotations in bold:
----
@RunWith(SpringRunner.class)
@ContextConfiguration
**@Transactional(transactionManager = "txMgr")**
**@Commit**
@Transactional(transactionManager = "txMgr")
@Commit
public class FictitiousTransactionalTest {
**@BeforeTransaction**
@BeforeTransaction
void verifyInitialDatabaseState() {
// logic to verify the initial state before a transaction is started
}
@@ -3710,7 +3710,7 @@ following example shows the relevant annotations in bold:
@Test
// overrides the class-level @Commit setting
**@Rollback**
@Rollback
public void modifyDatabaseWithinTransaction() {
// logic which uses the test data and modifies database state
}
@@ -3720,7 +3720,7 @@ following example shows the relevant annotations in bold:
// execute "tear down" logic within the transaction
}
**@AfterTransaction**
@AfterTransaction
void verifyFinalDatabaseState() {
// logic to verify the final state after transaction has rolled back
}