From 8c52dd5db18dc178c152eeff4293aa7aba15e240 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Sat, 11 Aug 2018 23:09:17 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=94=A8CrudDao=E5=9F=BA=E7=B1=BB?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=89=A9=E7=90=86=E5=88=A0=E9=99=A4=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=EF=BC=8CphyDelete=E3=80=81phyDeleteByEntity=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jeesite/test/DaoMapperTest.java  | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/modules/core/src/test/java/com/jeesite/test/DaoMapperTest.java b/modules/core/src/test/java/com/jeesite/test/DaoMapperTest.java
index 820b73c6..c2bc713a 100644
--- a/modules/core/src/test/java/com/jeesite/test/DaoMapperTest.java
+++ b/modules/core/src/test/java/com/jeesite/test/DaoMapperTest.java
@@ -29,7 +29,7 @@ import com.jeesite.modules.sys.entity.User;
 /**
  * Mapper测试
  * @author ThinkGem
- * @version 2017年2月25日
+ * @version 2018-08-11
  */
 @ActiveProfiles("test")
 @SpringBootTest(classes=ApplicationTest.class)
@@ -50,7 +50,7 @@ public class DaoMapperTest extends BaseSpringContextTests {
 	public void testTableAnnotation() throws Exception{
 		try{
 			
-			System.out.println("============ 插入、批量插入测试 ============");
+			System.out.println("============ 插入和批量插入测试 ============");
 			Config config = new Config();
 			config.setId("1");
 			config.setConfigKey("test");
@@ -64,13 +64,13 @@ public class DaoMapperTest extends BaseSpringContextTests {
 			System.out.println(configDao.insert(config));
 			System.out.println(configDao.insertBatch(ListUtils.newArrayList(config2, config3)));
 			
-			System.out.println("============ 更新、删除测试 ============");
+			System.out.println("============ 更新测试 ============");
 			Area area = new Area();
 			area.setAreaCode("1");
 			area.setAreaName("你好");
 			area.setStatus("0");
 			Area where = new Area();
-			where.setAreaCode("2");
+			where.setId("2");
 			where.setId_in(new String[]{"1","2"});
 			where.setAreaName("你好2");
 			where.setStatus("0");
@@ -78,12 +78,18 @@ public class DaoMapperTest extends BaseSpringContextTests {
 			System.out.println(areaDao.updateByEntity(area, where));
 			System.out.println(areaDao.updateStatus(area));
 			System.out.println(areaDao.updateStatusByEntity(area, where));
+			
+			System.out.println("============ 逻辑删除测试 ============");
 			System.out.println(areaDao.delete(area));
-			System.out.println(areaDao.delete(where));
-			System.out.println(areaDao.deleteByEntity(where));
-			System.out.println(areaDao.findList(area));
+			System.out.println(areaDao.delete((Area)where.clone()));
+			System.out.println(areaDao.deleteByEntity((Area)where.clone()));
+
+			System.out.println("============ 物理删除测试 ============");
+			System.out.println(areaDao.phyDelete((Area)where.clone()));
+			System.out.println(areaDao.phyDeleteByEntity((Area)where.clone()));
 
 			System.out.println("============ 基本信息查询测试 ============");
+			System.out.println(areaDao.findList(area));
 			User user = new User();
 			user.setUserType(User.USER_TYPE_NONE);
 			System.out.println(userDao.findList(user));