Skip to content

Fix to close the ApplicationContext at assertion failing #232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 6, 2017
Merged

Fix to close the ApplicationContext at assertion failing #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions src/test/java/org/mybatis/spring/annotation/MapperScanTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,17 @@ private void startContext() {

@AfterEach
void assertNoMapperClass() {
// concrete classes should always be ignored by MapperScannerPostProcessor
assertBeanNotLoaded("mapperClass");

// no method interfaces should be ignored too
assertBeanNotLoaded("package-info");
// assertBeanNotLoaded("annotatedMapperZeroMethods"); // as of 1.1.0 mappers
// with no methods are loaded

applicationContext.close();
try {
// concrete classes should always be ignored by MapperScannerPostProcessor
assertBeanNotLoaded("mapperClass");

// no method interfaces should be ignored too
assertBeanNotLoaded("package-info");
// assertBeanNotLoaded("annotatedMapperZeroMethods"); // as of 1.1.0 mappers
// with no methods are loaded
} finally {
applicationContext.close();
}
}

@Test
Expand Down
20 changes: 11 additions & 9 deletions src/test/java/org/mybatis/spring/config/NamespaceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,17 @@ private void startContext() {

@AfterEach
void assertNoMapperClass() {
// concrete classes should always be ignored by MapperScannerPostProcessor
assertBeanNotLoaded("mapperClass");

// no method interfaces should be ignored too
assertBeanNotLoaded("package-info");
// assertBeanNotLoaded("annotatedMapperZeroMethods"); // as of 1.1.0 mappers
// with no methods are loaded

applicationContext.close();
try {
// concrete classes should always be ignored by MapperScannerPostProcessor
assertBeanNotLoaded("mapperClass");

// no method interfaces should be ignored too
assertBeanNotLoaded("package-info");
// assertBeanNotLoaded("annotatedMapperZeroMethods"); // as of 1.1.0 mappers
// with no methods are loaded
} finally {
applicationContext.close();
}
}

@Test
Expand Down
18 changes: 10 additions & 8 deletions src/test/java/org/mybatis/spring/mapper/MapperScannerConfigurerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,16 @@ private void startContext() {

@AfterEach
void assertNoMapperClass() {
// concrete classes should always be ignored by MapperScannerPostProcessor
assertBeanNotLoaded("mapperClass");

// no method interfaces should be ignored too
assertBeanNotLoaded("package-info");
// assertBeanNotLoaded("annotatedMapperZeroMethods"); // as of 1.1.0 mappers with no methods are loaded

applicationContext.close();
try {
// concrete classes should always be ignored by MapperScannerPostProcessor
assertBeanNotLoaded("mapperClass");

// no method interfaces should be ignored too
assertBeanNotLoaded("package-info");
// assertBeanNotLoaded("annotatedMapperZeroMethods"); // as of 1.1.0 mappers with no methods are loaded
} finally {
applicationContext.close();
}
}

@Test
Expand Down