新增 service 层测试

mybatis-plus/pom.xml

@@ -107,6 +107,12 @@
 			<version>${spring.version}</version>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-test</artifactId>
+			<version>${spring.version}</version>
+			<scope>provided</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.aspectj</groupId>
 			<artifactId>aspectjweaver</artifactId>

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

@@ -28,17 +28,10 @@ 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,13 +28,9 @@ 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
+//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,13 +24,8 @@ 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

@@ -15,24 +15,21 @@
  */
 package com.baomidou.mybatisplus.test.mysql;
 
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.SqlSessionFactory;
+
 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;
-
-import java.io.InputStream;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-
 /**
  * <p>
  * 循环标签 查询分页失效 测试类

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

@@ -15,22 +15,21 @@
  */
 package com.baomidou.mybatisplus.test.mysql;
 
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.session.RowBounds;
+import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.SqlSessionFactory;
+
 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
+//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;
-import org.apache.ibatis.session.SqlSessionFactory;
-
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 /**
  * <p>

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

@@ -1,31 +0,0 @@
-/**
- * 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

@@ -1,12 +0,0 @@
-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

@@ -1,39 +0,0 @@
-/**
- * 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,10 +22,7 @@ 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,11 +26,8 @@ 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

@@ -1,65 +0,0 @@
-/**
- * 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

@@ -15,6 +15,15 @@
  */
 package com.baomidou.mybatisplus.test.mysql;
 
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.SqlSessionFactory;
+
 import com.baomidou.mybatisplus.MybatisSessionFactoryBuilder;
 import com.baomidou.mybatisplus.entity.GlobalConfiguration;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -22,19 +31,8 @@ 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;
-
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 /**
  * <p>

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.RoleMapper"/>
-        <mapper class="com.baomidou.mybatisplus.test.mysql.TestMapper"/>
+        <mapper class="com.baomidou.mybatisplus.test.mysql.mapper.RoleMapper"/>
+        <mapper class="com.baomidou.mybatisplus.test.mysql.mapper.TestMapper"/>
     </mappers>
 </configuration>

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

@@ -39,6 +39,6 @@
                 typeHandler="com.baomidou.mybatisplus.test.mysql.typehandler.PhoneTypeHandler"/>
 
         <!-- 级联查询 -->
-        <association column="role" property="role" select="com.baomidou.mybatisplus.test.mysql.RoleMapper.selectById"/>
+        <association column="role" property="role" select="com.baomidou.mybatisplus.test.mysql.mapper.RoleMapper.selectById"/>
     </resultMap>
 </mapper>

mybatis-plus/src/test/resources/spring/spring-jdbc.xml

@@ -78,7 +78,7 @@
 	<bean id="sqlSessionFactory"
 		class="com.baomidou.mybatisplus.spring.MybatisSqlSessionFactoryBean">
 		<property name="dataSource" ref="dataSource" />
-		<property name="configLocation" value="classpath:xml/mybatis-config.xml" />
+		<property name="configLocation" value="classpath:mybatis-config.xml" />
 		<property name="typeAliasesPackage" value="com.baomidou.mybatisplus.test.mysql.entity" />
 		<property name="mapperLocations" value="classpath:mysql/*Mapper.xml" />
 		<property name="plugins">