Browse Source

跑一把测试

hubin 7 years ago
parent
commit
393fb26ace

+ 1 - 0
mybatis-plus-adapter/src/main/java/com/baomidou/mybatisplus/mapper/EntityWrapper.java

@@ -44,6 +44,7 @@ public class EntityWrapper<T> extends Wrapper<T> {
         this.entity = entity;
     }
 
+    @Override
     public String getSqlSelect() {
         return StringUtils.isEmpty(sqlSelect) ? null : SqlUtils.stripSqlInjection(sqlSelect);
     }

+ 5 - 0
mybatis-plus-adapter/src/main/java/com/baomidou/mybatisplus/mapper/Wrapper.java

@@ -76,6 +76,10 @@ public class Wrapper<T> extends com.baomidou.mybatisplus.core.conditions.Wrapper
      */
     protected String AND_OR = "AND";
 
+    public static Wrapper getInstance() {
+        return new Wrapper();
+    }
+
     /**
      * <p>
      * 兼容EntityWrapper
@@ -106,6 +110,7 @@ public class Wrapper<T> extends com.baomidou.mybatisplus.core.conditions.Wrapper
         return !isEmptyOfWhere();
     }
 
+    @Override
     public String getSqlSelect() {
         return StringUtils.isEmpty(sqlSelect) ? null : SqlUtils.stripSqlInjection(sqlSelect);
     }

+ 14 - 0
mybatis-plus-core/src/main/java/com/baomidou/mybatisplus/core/conditions/AbstractWrapper.java

@@ -80,6 +80,20 @@ public abstract class AbstractWrapper<T, R, This extends AbstractWrapper<T, R, T
      */
     protected T entity;
 
+    /**
+     * 判断构造条件不为空
+     */
+    public boolean isNotEmptyOfWhere() {
+        return CollectionUtils.isNotEmpty(expression);
+    }
+
+    /**
+     * 判断构造条件为空
+     */
+    public boolean isEmptyOfWhere() {
+        return CollectionUtils.isEmpty(expression);
+    }
+
     @Override
     public T getEntity() {
         return this.entity;

+ 1 - 0
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/BaseTest.java

@@ -9,6 +9,7 @@ import java.sql.Statement;
 
 public class BaseTest {
 
+    protected final String NQQ = "聂秋秋";
 
     protected void log(Object object) {
         System.out.println(object);

+ 27 - 5
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/H2UserMapperTest.java

@@ -11,6 +11,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+import com.baomidou.mybatisplus.core.conditions.select.EntityWrapper;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.test.h2.config.H2Db;
 import com.baomidou.mybatisplus.test.h2.entity.mapper.H2UserMapper;
 import com.baomidou.mybatisplus.test.h2.entity.persistent.H2User;
@@ -20,8 +22,8 @@ import com.baomidou.mybatisplus.test.h2.entity.persistent.H2User;
  * Mybatis Plus H2 Junit Test
  * </p>
  *
- * @author Caratacus
- * @date 2017/4/1
+ * @author hubin
+ * @since 2018-06-05
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"classpath:h2/spring-test-h2.xml"})
@@ -31,14 +33,14 @@ public class H2UserMapperTest extends BaseTest {
     protected H2UserMapper userMapper;
 
     @BeforeClass
-    public static void initDB() throws SQLException, IOException {
+    public static void aInitDB() throws SQLException, IOException {
         H2Db.initH2User();
     }
 
     @Test
-    public void insert() {
+    public void bInsert() {
         H2User h2User = new H2User();
-        h2User.setName("聂秋秋");
+        h2User.setName(NQQ);
         h2User.setAge(1);
         h2User.setDesc("这是一个不错的小伙子");
         Assert.assertTrue(1 == userMapper.insert(h2User));
@@ -46,4 +48,24 @@ public class H2UserMapperTest extends BaseTest {
         log(h2User.getId());
     }
 
+    @Test
+    public void cUpdate() {
+        H2User h2User = new H2User();
+        h2User.setAge(2);
+        Assert.assertTrue(1 == userMapper.update(h2User,
+            new EntityWrapper<H2User>().eq("name", NQQ)));
+
+        h2User.setAge(3);
+        Assert.assertTrue(1 == userMapper.update(h2User,
+            new EntityWrapper<H2User>().stream().eq(H2User::getName, NQQ)));
+    }
+
+    @Test
+    public void dSelectOne() {
+        H2User h2User = userMapper.selectOne(new H2User().setName(NQQ));
+        Assert.assertNotNull(h2User);
+
+        log(h2User.toString());
+    }
+
 }

+ 3 - 2
mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/H2UserTest.java

@@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+import com.baomidou.mybatisplus.core.conditions.select.EntityWrapper;
 import com.baomidou.mybatisplus.core.pagination.Page;
 import com.baomidou.mybatisplus.test.h2.config.H2Db;
 import com.baomidou.mybatisplus.test.h2.entity.persistent.H2User;
@@ -65,8 +66,8 @@ public class H2UserTest extends BaseTest {
 
     @Test
     public void testEntityWrapperSelectSql() {
-        StrEntityWrapper<H2User> ew = new StrEntityWrapper<>();
-        ew.setSqlSelect("test_id as id, name, age");
+        EntityWrapper<H2User> ew = new EntityWrapper<>();
+        ew.select("test_id as id, name, age");
         List<H2User> list = userService.selectList(ew);
         for (H2User u : list) {
             Assert.assertNotNull(u.getId());