From 50b5525d41f8c6c4d4fb54b41d833abe861daf86 Mon Sep 17 00:00:00 2001
From: happyxiaofan <rhwayfun@gmail.com>
Date: Thu, 14 Sep 2017 13:46:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=B5=8B=E8=AF=95=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../springboot/mybatis/ApplicationTests.java  | 74 +++++++------------
 1 file changed, 26 insertions(+), 48 deletions(-)

diff --git a/spring-boot-mybatis/src/test/java/com/rhwayfun/springboot/mybatis/ApplicationTests.java b/spring-boot-mybatis/src/test/java/com/rhwayfun/springboot/mybatis/ApplicationTests.java
index 2690abd..abe3ee9 100644
--- a/spring-boot-mybatis/src/test/java/com/rhwayfun/springboot/mybatis/ApplicationTests.java
+++ b/spring-boot-mybatis/src/test/java/com/rhwayfun/springboot/mybatis/ApplicationTests.java
@@ -9,9 +9,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.util.CollectionUtils;
 
 import java.util.Date;
 import java.util.List;
@@ -20,7 +18,6 @@
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
-@DirtiesContext
 public class ApplicationTests {
 
 	@Autowired
@@ -41,10 +38,10 @@ public void setup() {
 				"  UNIQUE KEY `id_UNIQUE` (`id`)\n" +
 				") ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='用户信息表';\n";
 		jdbcTemplate.update(sql);
+		userMapper.deleteByExample(new UserExample());
 	}
 
-	@Test
-	public void insertTest() {
+	public void testUp() {
 		User user = new User();
 		user.setUserId(1L);
 		user.setUserName("springboot");
@@ -53,71 +50,50 @@ public void insertTest() {
 		assertTrue(userMapper.insertSelective(user) > 0);
 	}
 
-	@Test
-	public void insertTest2() {
-		User user = new User();
-		user.setUserId(2L);
-		user.setUserName("springboot2");
-		user.setAge(1);
-		user.setBirth(new Date());
-		assertTrue(userMapper.insert(user) > 0);
+	public void tearDown() {
+		UserExample example = new UserExample();
+		example.createCriteria().andUserIdEqualTo(1L);
+		assertTrue(userMapper.deleteByExample(example) > 0);
 	}
 
 	@Test
 	public void queryTest() {
+		testUp();
 		List<User> users = userMapper.selectByExample(new UserExample());
-		if (!CollectionUtils.isEmpty(users)) {
-			assertTrue(userMapper.selectByPrimaryKey(users.get(0).getId()).getAge() == 1);
-		}
+		assertTrue(userMapper.selectByPrimaryKey(users.get(0).getId()).getAge() == 1);
+		tearDown();
 	}
 
 	@Test
 	public void countTest() {
-		assertTrue(userMapper.countByExample(new UserExample()) > 0);
+		testUp();
+		assertTrue(userMapper.countByExample(new UserExample()) >= 0);
+		tearDown();
 	}
 
 	@Test
 	public void updateTest() {
+		testUp();
 		List<User> users = userMapper.selectByExample(new UserExample());
-		if (!CollectionUtils.isEmpty(users)) {
-			User user = users.get(users.size() - 1);
-			user.setUserName("updateTest");
-			assertTrue(userMapper.updateByPrimaryKeySelective(user) > 0);
-		}
+		User user = users.get(users.size() - 1);
+		user.setUserName("updateTest");
+		assertTrue(userMapper.updateByPrimaryKeySelective(user) > 0);
+		tearDown();
 	}
 
 	@Test
 	public void updateTest2() {
+		testUp();
 		List<User> users = userMapper.selectByExample(new UserExample());
-		if (!CollectionUtils.isEmpty(users)) {
-			User user = users.get(users.size() - 1);
-			user.setUserName("updateTest2");
-			assertTrue(userMapper.updateByPrimaryKey(user) > 0);
-		}
-	}
-
-	@Test
-	public void deleteTest() {
-		List<User> users = userMapper.selectByExample(new UserExample());
-		if (!CollectionUtils.isEmpty(users)) {
-			User user = users.get(0);
-			assertTrue(userMapper.deleteByPrimaryKey(user.getId()) > 0);
-		}
-	}
-
-	@Test
-	public void deleteTest2() {
-		List<User> users = userMapper.selectByExample(new UserExample());
-		if (!CollectionUtils.isEmpty(users)) {
-			User user = users.get(0);
-			UserExample example = new UserExample();
-			example.createCriteria().andIdEqualTo(user.getId());
-			assertTrue(userMapper.deleteByExample(example) > 0);
-		}
+		User user = users.get(users.size() - 1);
+		user.setUserName("updateTest2");
+		assertTrue(userMapper.updateByPrimaryKey(user) > 0);
+		tearDown();
 	}
 
 	@Test
 	public void distinctOrTest() {
+		testUp();
 		UserExample example = new UserExample();
 		example.setDistinct(true);
 		UserExample.Criteria criteria = example.createCriteria();
@@ -125,7 +101,9 @@ public void distinctOrTest() {
 		UserExample.Criteria or = example.or();
 		or.andIdIsNotNull();
 		example.setOrderByClause("id asc");
-		userMapper.selectByExample(example);
+		List<User> users = userMapper.selectByExample(example);
+		assertTrue(users.size() > 0);
+		tearDown();
 	}
 
 }