Skip to content

Commit 1dbdcd6

Browse files
committed
Polishing the SqlProviderTest
1 parent 636e0c6 commit 1dbdcd6

File tree

1 file changed

+10
-18
lines changed

1 file changed

+10
-18
lines changed

src/test/java/org/apache/ibatis/submitted/sqlprovider/SqlProviderTest.java

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -478,6 +478,7 @@ public interface ErrorMapper {
478478
void multipleProviderContext();
479479
}
480480

481+
@SuppressWarnings("unused")
481482
public static class ErrorSqlBuilder {
482483
public void methodNotFound() {
483484
throw new UnsupportedOperationException("methodNotFound");
@@ -516,6 +517,7 @@ public interface StaticMethodSqlProviderMapper {
516517
@SelectProvider(type = SqlProvider.class, method = "oneArgumentAndProviderContext")
517518
String oneArgumentAndProviderContext(Integer value);
518519

520+
@SuppressWarnings("unused")
519521
class SqlProvider {
520522

521523
public static String noArgument() {
@@ -547,27 +549,22 @@ public static String oneArgumentAndProviderContext(Integer value, ProviderContex
547549
}
548550

549551
@Test
550-
public void shouldInsertUserSelective() {
551-
SqlSession sqlSession = sqlSessionFactory.openSession();
552-
try {
552+
void shouldInsertUserSelective() {
553+
try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
553554
Mapper mapper = sqlSession.getMapper(Mapper.class);
554555
User user = new User();
555556
user.setId(999);
556557
mapper.insertSelective(user);
557558

558559
User loadedUser = mapper.getUser(999);
559-
assertEquals(null, loadedUser.getName());
560-
561-
} finally {
562-
sqlSession.close();
560+
assertNull(loadedUser.getName());
563561
}
564562
}
565563

566564

567565
@Test
568-
public void shouldUpdateUserSelective() {
569-
SqlSession sqlSession = sqlSessionFactory.openSession();
570-
try {
566+
void shouldUpdateUserSelective() {
567+
try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
571568
Mapper mapper = sqlSession.getMapper(Mapper.class);
572569
User user = new User();
573570
user.setId(999);
@@ -579,16 +576,12 @@ public void shouldUpdateUserSelective() {
579576

580577
User loadedUser = mapper.getUser(999);
581578
assertEquals("MyBatis", loadedUser.getName());
582-
583-
} finally {
584-
sqlSession.close();
585579
}
586580
}
587581

588582
@Test
589-
public void mapperGetByEntity() {
590-
SqlSession sqlSession = sqlSessionFactory.openSession();
591-
try {
583+
void mapperGetByEntity() {
584+
try (SqlSession sqlSession = sqlSessionFactory.openSession()) {
592585
Mapper mapper = sqlSession.getMapper(Mapper.class);
593586
User query = new User();
594587
query.setName("User4");
@@ -600,8 +593,6 @@ public void mapperGetByEntity() {
600593
query.setId(1);
601594
query.setName("User4");
602595
assertEquals(0, mapper.getByEntity(query).size());
603-
} finally {
604-
sqlSession.close();
605596
}
606597
}
607598

@@ -621,6 +612,7 @@ interface DatabaseIdMapper {
621612
@SelectProvider(type = SqlProvider.class)
622613
String selectDatabaseId();
623614

615+
@SuppressWarnings("unused")
624616
class SqlProvider {
625617
public static String provideSql(ProviderContext context) {
626618
if ("hsql".equals(context.getDatabaseId())) {

0 commit comments

Comments
 (0)