新增 service 层测试

mybatis-plus/pom.xml

@@ -107,12 +107,6 @@
 			<version>${spring.version}</version>
 			<scope>provided</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-test</artifactId>
-			<version>${spring.version}</version>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.aspectj</groupId>
 			<artifactId>aspectjweaver</artifactId>
@@ -127,6 +121,13 @@
 			<version>${jsqlparser.version}</version>
 			<scope>provided</scope>
 		</dependency>
+		<!--jsqlparser -->
+		<dependency>
+			<groupId>com.github.jsqlparser</groupId>
+			<artifactId>jsqlparser</artifactId>
+			<version>${jsqlparser.version}</version>
+			<scope>provided</scope>
+		</dependency>
 		<!--druid -->
 		<dependency>
 			<groupId>com.alibaba</groupId>

mybatis-plus/src/main/java/com/baomidou/mybatisplus/service/impl/ServiceImpl.java

@@ -294,4 +294,5 @@ public class ServiceImpl<M extends BaseMapper<T>, T> implements IService<T> {
 		page.setRecords(baseMapper.selectPage(page, wrapper));
 		return page;
 	}
+
 }

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/GlobalConfigurationTest.java

@@ -28,10 +28,17 @@ import org.junit.Assert;
 import com.baomidou.mybatisplus.MybatisSessionFactoryBuilder;
 import com.baomidou.mybatisplus.entity.GlobalConfiguration;
 import com.baomidou.mybatisplus.mapper.Condition;
+<<<<<<< HEAD
 import com.baomidou.mybatisplus.test.mysql.entity.NotPK;
 import com.baomidou.mybatisplus.test.mysql.entity.Test;
 import com.baomidou.mybatisplus.test.mysql.mapper.NotPKMapper;
 import com.baomidou.mybatisplus.test.mysql.mapper.TestMapper;
+=======
+import com.baomidou.mybatisplus.test.mysql.NotPKMapper;
+import com.baomidou.mybatisplus.test.mysql.TestMapper;
+import com.baomidou.mybatisplus.test.mysql.entity.NotPK;
+import com.baomidou.mybatisplus.test.mysql.entity.Test;
+>>>>>>> branch 'dev' of https://git.oschina.net/baomidou/mybatis-plus.git
 
 /**
  * <p>

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/MybatisMapperRefreshTest.java

@@ -28,8 +28,13 @@ import com.baomidou.mybatisplus.entity.GlobalConfiguration;
 import com.baomidou.mybatisplus.plugins.pagination.Pagination;
 import com.baomidou.mybatisplus.spring.MybatisMapperRefresh;
 import com.baomidou.mybatisplus.test.mysql.MySqlInjector;
+<<<<<<< HEAD
 import com.baomidou.mybatisplus.test.mysql.UserMapperTest;
 import com.baomidou.mybatisplus.test.mysql.mapper.UserMapper;
+=======
+import com.baomidou.mybatisplus.test.mysql.UserMapper;
+import com.baomidou.mybatisplus.test.mysql.UserMapperTest;
+>>>>>>> branch 'dev' of https://git.oschina.net/baomidou/mybatis-plus.git
 import com.baomidou.mybatisplus.toolkit.SystemClock;
 
 /**

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/activerecord/ActiveRecordTest.java

@@ -24,8 +24,13 @@ import org.apache.ibatis.session.SqlSessionFactory;
 
 import com.baomidou.mybatisplus.MybatisSessionFactoryBuilder;
 import com.baomidou.mybatisplus.plugins.Page;
+<<<<<<< HEAD
 import com.baomidou.mybatisplus.test.mysql.entity.Test;
 import com.baomidou.mybatisplus.test.mysql.mapper.TestMapper;
+=======
+import com.baomidou.mybatisplus.test.mysql.TestMapper;
+import com.baomidou.mybatisplus.test.mysql.entity.Test;
+>>>>>>> branch 'dev' of https://git.oschina.net/baomidou/mybatis-plus.git
 import com.baomidou.mybatisplus.toolkit.IdWorker;
 import com.baomidou.mybatisplus.toolkit.TableInfoHelper;
 

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/CircularLabelsTest.java

@@ -19,9 +19,12 @@ import com.baomidou.mybatisplus.MybatisSessionFactoryBuilder;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.test.mysql.entity.Test;
 import com.baomidou.mybatisplus.test.mysql.entity.User;
+<<<<<<< HEAD
 import com.baomidou.mybatisplus.test.mysql.mapper.TestMapper;
 import com.baomidou.mybatisplus.test.mysql.mapper.UserMapper;
 
+=======
+>>>>>>> branch 'dev' of https://git.oschina.net/baomidou/mybatis-plus.git
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
 

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/NoXMLTest.java

@@ -18,7 +18,10 @@ package com.baomidou.mybatisplus.test.mysql;
 import com.baomidou.mybatisplus.MybatisSessionFactoryBuilder;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.test.mysql.entity.Test;
+<<<<<<< HEAD
 import com.baomidou.mybatisplus.test.mysql.mapper.TestMapper;
+=======
+>>>>>>> branch 'dev' of https://git.oschina.net/baomidou/mybatis-plus.git
 import com.baomidou.mybatisplus.toolkit.IdWorker;
 import org.apache.ibatis.session.RowBounds;
 import org.apache.ibatis.session.SqlSession;

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/NotPKMapper.java

@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) 2011-2014, hubin (jobob@qq.com).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.baomidou.mybatisplus.test.mysql;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.test.mysql.entity.NotPK;
+
+/**
+ * <p>
+ * 继承 BaseMapper，就自动拥有CRUD方法
+ * </p>
+ *
+ * @author Caratacus
+ * @Date 2016-12-22
+ */
+public interface NotPKMapper extends BaseMapper<NotPK> {
+
+}

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/RoleMapper.java

@@ -0,0 +1,12 @@
+package com.baomidou.mybatisplus.test.mysql;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.test.mysql.entity.Role;
+
+/**
+ * @author junyu
+ * @Date 2016-09-09
+ */
+public interface RoleMapper extends BaseMapper<Role> {
+
+}

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/TestMapper.java

@@ -0,0 +1,39 @@
+/**
+ * Copyright (c) 2011-2014, hubin (jobob@qq.com).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.baomidou.mybatisplus.test.mysql;
+
+import org.apache.ibatis.annotations.Insert;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.test.mysql.entity.Test;
+
+/**
+ * <p>
+ * 继承 BaseMapper，就自动拥有CRUD方法
+ * </p>
+ *
+ * @author Caratacus hubin
+ * @Date 2016-09-25
+ */
+public interface TestMapper extends BaseMapper<Test> {
+
+	/**
+	 * 注解插入【测试】
+	 */
+	@Insert("insert into test(id,type) values(#{id},#{type})")
+	int insertInjector(Test test);
+
+}

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/TransactionalTest.java

@@ -22,7 +22,10 @@ import org.apache.ibatis.session.SqlSessionFactory;
 
 import com.baomidou.mybatisplus.MybatisSessionFactoryBuilder;
 import com.baomidou.mybatisplus.test.mysql.entity.User;
+<<<<<<< HEAD
 import com.baomidou.mybatisplus.test.mysql.mapper.UserMapper;
+=======
+>>>>>>> branch 'dev' of https://git.oschina.net/baomidou/mybatis-plus.git
 import com.baomidou.mybatisplus.toolkit.IdWorker;
 
 /**

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/URPTest.java

@@ -26,8 +26,11 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.test.mysql.entity.PhoneNumber;
 import com.baomidou.mybatisplus.test.mysql.entity.Role;
 import com.baomidou.mybatisplus.test.mysql.entity.User;
+<<<<<<< HEAD
 import com.baomidou.mybatisplus.test.mysql.mapper.RoleMapper;
 import com.baomidou.mybatisplus.test.mysql.mapper.UserMapper;
+=======
+>>>>>>> branch 'dev' of https://git.oschina.net/baomidou/mybatis-plus.git
 import com.baomidou.mybatisplus.toolkit.IdWorker;
 
 /**

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/UserMapper.java

@@ -0,0 +1,65 @@
+/**
+ * Copyright (c) 2011-2014, hubin (jobob@qq.com).
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.baomidou.mybatisplus.test.mysql;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.test.mysql.entity.User;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.session.RowBounds;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 继承 BaseMapper，就自动拥有CRUD方法
+ * </p>
+ *
+ * @author hubin
+ * @Date 2016-01-23
+ */
+public interface UserMapper extends BaseMapper<User> {
+
+	/**
+	 * 用户列表，分页显示
+	 *
+	 * @param pagination
+	 *            传递参数包含该属性，即自动分页
+	 * @return
+	 */
+	List<User> selectListRow(RowBounds pagination);
+
+	/**
+	 * 注解插入【测试】
+	 */
+	@Insert("insert into user(test_id,name,age) values(#{id},#{name},#{age})")
+	int insertInjector(User user);
+
+	/**
+	 * 自定义注入方法
+	 */
+	int deleteAll();
+
+	/**
+	 * 根据主键批量查询
+	 * 
+	 * @param pagination
+	 * @param ids
+	 * @return
+	 */
+	List<User> forSelect(RowBounds pagination, @Param("ids") List<String> ids);
+
+}

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/mysql/UserMapperTest.java

@@ -22,7 +22,10 @@ import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.plugins.pagination.Pagination;
 import com.baomidou.mybatisplus.test.mysql.entity.Role;
 import com.baomidou.mybatisplus.test.mysql.entity.User;
+<<<<<<< HEAD
 import com.baomidou.mybatisplus.test.mysql.mapper.UserMapper;
+=======
+>>>>>>> branch 'dev' of https://git.oschina.net/baomidou/mybatis-plus.git
 import com.baomidou.mybatisplus.toolkit.IdWorker;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;

mybatis-plus/src/test/resources/mysql-config.xml

@@ -112,7 +112,7 @@
         <mapper class="com.baomidou.mybatisplus.test.mysql.mapper.UserMapper"/>
         <mapper class="com.baomidou.mybatisplus.test.mysql.mapper.NotPKMapper"/>
         <mapper resource="mysql/UserMapper.xml"/>
-        <mapper class="com.baomidou.mybatisplus.test.mysql.mapper.RoleMapper"/>
-        <mapper class="com.baomidou.mybatisplus.test.mysql.mapper.TestMapper"/>
+        <mapper class="com.baomidou.mybatisplus.test.mysql.RoleMapper"/>
+        <mapper class="com.baomidou.mybatisplus.test.mysql.TestMapper"/>
     </mappers>
 </configuration>

mybatis-plus/src/test/resources/mysql/RoleMapper.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.baomidou.mybatisplus.test.mysql.mapper.RoleMapper">
-    
-    <resultMap id="RoleMap" type="Role" autoMapping="true">
-        <id property="id" column="id"/>
-    </resultMap>
+
+	<resultMap id="RoleMap" type="Role" autoMapping="true">
+		<id property="id" column="id" />
+	</resultMap>
 </mapper>