优化测试用例

src/test/java/com/baomidou/mybatisplus/test/h2/H2MetaObjectHandlerTest.java

@@ -1,18 +1,7 @@
 package com.baomidou.mybatisplus.test.h2;
 
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.IOException;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.sql.Timestamp;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-
-import javax.sql.DataSource;
-
+import com.baomidou.mybatisplus.test.h2.entity.mapper.H2UserMetaobjMapper;
+import com.baomidou.mybatisplus.test.h2.entity.persistent.H2UserMetaObj;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -23,8 +12,17 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import com.baomidou.mybatisplus.test.h2.entity.mapper.H2UserMetaobjMapper;
-import com.baomidou.mybatisplus.test.h2.entity.persistent.H2UserMetaObj;
+import javax.sql.DataSource;
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.sql.Timestamp;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
 
 /**
  * <p>
@@ -36,7 +34,10 @@ import com.baomidou.mybatisplus.test.h2.entity.persistent.H2UserMetaObj;
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"classpath:h2/spring-test-h2-metaobj.xml"})
-public class H2MetaObjectHandlerTest {
+public class H2MetaObjectHandlerTest extends H2Test {
+
+    @Autowired
+    private H2UserMetaobjMapper userMapper;
 
     @BeforeClass
     public static void initDB() throws SQLException, IOException {
@@ -48,42 +49,11 @@ public class H2MetaObjectHandlerTest {
             Statement stmt = conn.createStatement();
             stmt.execute(createTableSql);
             stmt.execute("truncate table h2user");
-            insertUsers(stmt);
+            executeSql(stmt, "user.insert.sql");
             conn.commit();
         }
     }
 
-    private static void insertUsers(Statement stmt) throws SQLException, IOException {
-        String filename = "user.insert.sql";
-        String filePath = H2UserTest.class.getClassLoader().getResource("").getPath() + "/h2/" + filename;
-        try (
-                BufferedReader reader = new BufferedReader(new FileReader(filePath))
-        ) {
-            String line;
-            while ((line = reader.readLine()) != null) {
-                stmt.execute(line.replace(";", ""));
-            }
-        }
-    }
-
-    private static String readFile(String filename) {
-        StringBuilder builder = new StringBuilder();
-        String filePath = H2UserTest.class.getClassLoader().getResource("").getPath() + "/h2/" + filename;
-        try (
-                BufferedReader reader = new BufferedReader(new FileReader(filePath))
-        ) {
-            String line;
-            while ((line = reader.readLine()) != null)
-                builder.append(line).append(" ");
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return builder.toString();
-    }
-
-    @Autowired
-    H2UserMetaobjMapper userMapper;
-
     @Test
     public void testMetaObjectHandler() {
         H2UserMetaObj user = new H2UserMetaObj();

src/test/java/com/baomidou/mybatisplus/test/h2/H2Test.java

@@ -0,0 +1,45 @@
+package com.baomidou.mybatisplus.test.h2;
+
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.IOException;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+/**
+ * <p>
+ * Mybatis Plus H2 Junit Test
+ * </p>
+ *
+ * @author hubin
+ * @since 2017-06-15
+ */
+public class H2Test {
+
+    public static void executeSql(Statement stmt, String sqlFilename) throws SQLException, IOException {
+        String filePath = H2UserNoOptLockTest.class.getResource("/h2/" + sqlFilename).getPath();
+        try (
+                BufferedReader reader = new BufferedReader(new FileReader(filePath))
+        ) {
+            String line;
+            while ((line = reader.readLine()) != null) {
+                stmt.execute(line.replace(";", ""));
+            }
+        }
+    }
+
+    public static String readFile(String filename) {
+        StringBuilder builder = new StringBuilder();
+        String filePath = H2UserNoOptLockTest.class.getResource("/h2/" + filename).getPath();
+        try (
+                BufferedReader reader = new BufferedReader(new FileReader(filePath))
+        ) {
+            String line;
+            while ((line = reader.readLine()) != null)
+                builder.append(line).append(" ");
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return builder.toString();
+    }
+}

src/test/java/com/baomidou/mybatisplus/test/h2/H2UserAddrJoinTest.java

@@ -34,7 +34,7 @@ import com.baomidou.mybatisplus.test.h2.entity.persistent.H2Addr;
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"classpath:h2/spring-test-h2.xml"})
-public class H2UserAddrJoinTest {
+public class H2UserAddrJoinTest extends H2Test {
 
     @Autowired
     private H2UserMapper userMapper;
@@ -50,60 +50,12 @@ public class H2UserAddrJoinTest {
             stmt.execute("truncate table h2user");
             stmt.execute(readFile("addr.ddl.sql"));
             stmt.execute("truncate table h2address");
-            insertUsers(stmt);
-            insertAddr(stmt);
+            executeSql(stmt, "user.insert.sql");
+            executeSql(stmt, "addr.insert.sql");
             conn.commit();
         }
     }
 
-    private static void insertUsers(Statement stmt) throws SQLException, IOException {
-        String filename = "user.insert.sql";
-        String filePath = H2UserAddrJoinTest.class.getClassLoader().getResource("").getPath() + "/h2/" + filename;
-        try (
-                BufferedReader reader = new BufferedReader(new FileReader(filePath))
-        ) {
-            String line;
-            while ((line = reader.readLine()) != null) {
-                if (line.isEmpty()) {
-                    continue;
-                }
-                stmt.execute(line.replace(";", ""));
-            }
-        }
-    }
-
-    private static void insertAddr(Statement stmt) throws SQLException, IOException {
-        String filename = "addr.insert.sql";
-        String filePath = H2UserAddrJoinTest.class.getClassLoader().getResource("").getPath() + "/h2/" + filename;
-        try (
-                BufferedReader reader = new BufferedReader(new FileReader(filePath))
-        ) {
-            String line;
-            while ((line = reader.readLine()) != null) {
-                if (line.isEmpty()) {
-                    continue;
-                }
-                stmt.execute(line.replace(";", ""));
-            }
-        }
-    }
-
-    private static String readFile(String filename) {
-        StringBuilder builder = new StringBuilder();
-        String filePath = H2UserAddrJoinTest.class.getClassLoader().getResource("").getPath() + "/h2/" + filename;
-        try (
-                BufferedReader reader = new BufferedReader(new FileReader(filePath))
-        ) {
-            String line;
-            while ((line = reader.readLine()) != null)
-                builder.append(line).append(" ");
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return builder.toString();
-    }
-
-
     @Test
     public void testJoinTableWithoutPagination() {
         List<H2Addr> addrList = userMapper.getAddrListByUserId(101L);
@@ -116,5 +68,4 @@ public class H2UserAddrJoinTest {
         Assert.assertEquals(3, addrList.size());
     }
 
-
 }

src/test/java/com/baomidou/mybatisplus/test/h2/H2UserAutoincrementTest.java

@@ -33,7 +33,7 @@ import com.baomidou.mybatisplus.test.h2.entity.persistent.H2UserMetaObj;
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"classpath:h2/spring-test-h2.xml"})
-public class H2UserAutoincrementTest {
+public class H2UserAutoincrementTest extends H2Test {
 
     @Autowired
     private H2UserMetaobjMapper userMapper;
@@ -48,39 +48,11 @@ public class H2UserAutoincrementTest {
             Statement stmt = conn.createStatement();
             stmt.execute(createTableSql);
             stmt.execute("truncate table h2user");
-            insertUsers(stmt);
+            executeSql(stmt, "user.insert.sql");
             conn.commit();
         }
     }
 
-    private static void insertUsers(Statement stmt) throws SQLException, IOException {
-        String filename = "user.insert.sql";
-        String filePath = H2UserAutoincrementTest.class.getClassLoader().getResource("").getPath() + "/h2/" + filename;
-        try (
-                BufferedReader reader = new BufferedReader(new FileReader(filePath))
-        ) {
-            String line;
-            while ((line = reader.readLine()) != null) {
-                stmt.execute(line.replace(";", ""));
-            }
-        }
-    }
-
-    private static String readFile(String filename) {
-        StringBuilder builder = new StringBuilder();
-        String filePath = H2UserAutoincrementTest.class.getClassLoader().getResource("").getPath() + "/h2/" + filename;
-        try (
-                BufferedReader reader = new BufferedReader(new FileReader(filePath))
-        ) {
-            String line;
-            while ((line = reader.readLine()) != null)
-                builder.append(line).append(" ");
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return builder.toString();
-    }
-
     @Test
     public void testInsert() {
         H2UserMetaObj user = new H2UserMetaObj();

src/test/java/com/baomidou/mybatisplus/test/h2/H2UserDateVersionTest.java

@@ -37,7 +37,7 @@ import com.baomidou.mybatisplus.test.h2.entity.persistent.H2UserDateVersion;
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"classpath:h2/spring-test-h2.xml"})
-public class H2UserDateVersionTest {
+public class H2UserDateVersionTest extends H2Test {
 
     @Autowired
     private H2UserDateVersionMapper userMapper;
@@ -52,39 +52,11 @@ public class H2UserDateVersionTest {
             Statement stmt = conn.createStatement();
             stmt.execute(createTableSql);
             stmt.execute("truncate table h2user");
-            insertUsers(stmt);
+            executeSql(stmt, "user.insert.sql");
             conn.commit();
         }
     }
 
-    private static void insertUsers(Statement stmt) throws SQLException, IOException {
-        String filename = "user.insert.sql";
-        String filePath = H2UserDateVersionTest.class.getClassLoader().getResource("").getPath() + "/h2/" + filename;
-        try (
-                BufferedReader reader = new BufferedReader(new FileReader(filePath))
-        ) {
-            String line;
-            while ((line = reader.readLine()) != null) {
-                stmt.execute(line.replace(";", ""));
-            }
-        }
-    }
-
-    private static String readFile(String filename) {
-        StringBuilder builder = new StringBuilder();
-        String filePath = H2UserDateVersionTest.class.getClassLoader().getResource("").getPath() + "/h2/" + filename;
-        try (
-                BufferedReader reader = new BufferedReader(new FileReader(filePath))
-        ) {
-            String line;
-            while ((line = reader.readLine()) != null)
-                builder.append(line).append(" ");
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return builder.toString();
-    }
-
 
     @Test
     public void testUpdateByIdNoDateVersion() {

src/test/java/com/baomidou/mybatisplus/test/h2/H2UserNoOptLockTest.java

@@ -1,19 +1,9 @@
 package com.baomidou.mybatisplus.test.h2;
 
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-
-import javax.sql.DataSource;
-
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.test.h2.entity.persistent.H2User;
+import com.baomidou.mybatisplus.test.h2.entity.service.IH2UserService;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -24,10 +14,16 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.test.h2.entity.persistent.H2User;
-import com.baomidou.mybatisplus.test.h2.entity.service.IH2UserService;
+import javax.sql.DataSource;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
 
 /**
  * <p>
@@ -39,7 +35,7 @@ import com.baomidou.mybatisplus.test.h2.entity.service.IH2UserService;
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"classpath:h2/spring-test-no-opt-lock-h2.xml"})
-public class H2UserNoOptLockTest {
+public class H2UserNoOptLockTest extends H2Test {
 
     @Autowired
     private IH2UserService userService;
@@ -54,39 +50,11 @@ public class H2UserNoOptLockTest {
             Statement stmt = conn.createStatement();
             stmt.execute(createTableSql);
             stmt.execute("truncate table h2user");
-            insertUsers(stmt);
+            executeSql(stmt, "user.insert.sql");
             conn.commit();
         }
     }
 
-    private static void insertUsers(Statement stmt) throws SQLException, IOException {
-        String filename = "user.insert.sql";
-        String filePath = H2UserNoOptLockTest.class.getClassLoader().getResource("").getPath() + "/h2/" + filename;
-        try (
-                BufferedReader reader = new BufferedReader(new FileReader(filePath))
-        ) {
-            String line;
-            while ((line = reader.readLine()) != null) {
-                stmt.execute(line.replace(";", ""));
-            }
-        }
-    }
-
-    private static String readFile(String filename) {
-        StringBuilder builder = new StringBuilder();
-        String filePath = H2UserNoOptLockTest.class.getClassLoader().getResource("").getPath() + "/h2/" + filename;
-        try (
-                BufferedReader reader = new BufferedReader(new FileReader(filePath))
-        ) {
-            String line;
-            while ((line = reader.readLine()) != null)
-                builder.append(line).append(" ");
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return builder.toString();
-    }
-
     @Test
     public void testInsert() {
         H2User user = new H2User();

src/test/java/com/baomidou/mybatisplus/test/h2/H2UserNoVersionTest.java

@@ -1,18 +1,9 @@
 package com.baomidou.mybatisplus.test.h2;
 
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.sql.DataSource;
-
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.test.h2.entity.persistent.H2UserNoVersion;
+import com.baomidou.mybatisplus.test.h2.entity.service.IH2UserNoVersionService;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -23,10 +14,15 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.test.h2.entity.persistent.H2UserNoVersion;
-import com.baomidou.mybatisplus.test.h2.entity.service.IH2UserNoVersionService;
+import javax.sql.DataSource;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -38,7 +34,7 @@ import com.baomidou.mybatisplus.test.h2.entity.service.IH2UserNoVersionService;
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"classpath:h2/spring-test-h2.xml"})
-public class H2UserNoVersionTest {
+public class H2UserNoVersionTest extends H2Test {
 
     @Autowired
     private IH2UserNoVersionService userService;
@@ -53,39 +49,11 @@ public class H2UserNoVersionTest {
             Statement stmt = conn.createStatement();
             stmt.execute(createTableSql);
             stmt.execute("truncate table h2user");
-            insertUsers(stmt);
+            executeSql(stmt, "user.insert.sql");
             conn.commit();
         }
     }
 
-    private static void insertUsers(Statement stmt) throws SQLException, IOException {
-        String filename = "user.insert.sql";
-        String filePath = H2UserNoVersionTest.class.getClassLoader().getResource("").getPath() + "/h2/" + filename;
-        try (
-                BufferedReader reader = new BufferedReader(new FileReader(filePath))
-        ) {
-            String line;
-            while ((line = reader.readLine()) != null) {
-                stmt.execute(line.replace(";", ""));
-            }
-        }
-    }
-
-    private static String readFile(String filename) {
-        StringBuilder builder = new StringBuilder();
-        String filePath = H2UserNoVersionTest.class.getClassLoader().getResource("").getPath() + "/h2/" + filename;
-        try (
-                BufferedReader reader = new BufferedReader(new FileReader(filePath))
-        ) {
-            String line;
-            while ((line = reader.readLine()) != null)
-                builder.append(line).append(" ");
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return builder.toString();
-    }
-
     @Test
     public void testInsert() {
         H2UserNoVersion user = new H2UserNoVersion();

src/test/java/com/baomidou/mybatisplus/test/h2/H2UserTest.java

@@ -1,20 +1,9 @@
 package com.baomidou.mybatisplus.test.h2;
 
-import java.io.BufferedReader;
-import java.io.FileReader;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-
-import javax.sql.DataSource;
-
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.test.h2.entity.persistent.H2User;
+import com.baomidou.mybatisplus.test.h2.entity.service.IH2UserService;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -25,10 +14,13 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.test.h2.entity.persistent.H2User;
-import com.baomidou.mybatisplus.test.h2.entity.service.IH2UserService;
+import javax.sql.DataSource;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.*;
 
 /**
  * <p>
@@ -40,7 +32,7 @@ import com.baomidou.mybatisplus.test.h2.entity.service.IH2UserService;
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"classpath:h2/spring-test-h2.xml"})
-public class H2UserTest {
+public class H2UserTest extends H2Test {
 
     @Autowired
     private IH2UserService userService;
@@ -55,39 +47,11 @@ public class H2UserTest {
             Statement stmt = conn.createStatement();
             stmt.execute(createTableSql);
             stmt.execute("truncate table h2user");
-            insertUsers(stmt);
+            executeSql(stmt, "user.insert.sql");
             conn.commit();
         }
     }
 
-    private static void insertUsers(Statement stmt) throws SQLException, IOException {
-        String filename = "user.insert.sql";
-        String filePath = H2UserTest.class.getClassLoader().getResource("").getPath() + "/h2/" + filename;
-        try (
-                BufferedReader reader = new BufferedReader(new FileReader(filePath))
-        ) {
-            String line;
-            while ((line = reader.readLine()) != null) {
-                stmt.execute(line.replace(";", ""));
-            }
-        }
-    }
-
-    private static String readFile(String filename) {
-        StringBuilder builder = new StringBuilder();
-        String filePath = H2UserTest.class.getClassLoader().getResource("").getPath() + "/h2/" + filename;
-        try (
-                BufferedReader reader = new BufferedReader(new FileReader(filePath))
-        ) {
-            String line;
-            while ((line = reader.readLine()) != null)
-                builder.append(line).append(" ");
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return builder.toString();
-    }
-
     @Test
     public void testInsert() {
         H2User user = new H2User();
@@ -101,7 +65,6 @@ public class H2UserTest {
         Assert.assertEquals("Caratacus", userFromDB.getDesc());
     }
 
-
     @Test
     public void testInsertBatch() {
         userService.insert(new H2User("sanmao", 1));