From 37b90dce6d62b1b5b2c2b6fddd48a45de2ea710f Mon Sep 17 00:00:00 2001 From: yakunw2 Date: Fri, 24 Oct 2025 13:18:41 -0500 Subject: [PATCH] Reset the polluted database to ensure some tests work as expected --- .../country/TestExistsWithPrimaryKey.java | 22 +++++++++++++++++++ .../mapper/test/country/TestInsert.java | 22 +++++++++++++++++++ .../test/example/TestSelectByExample.java | 22 +++++++++++++++++++ 3 files changed, 66 insertions(+) diff --git a/base/src/test/java/tk/mybatis/mapper/test/country/TestExistsWithPrimaryKey.java b/base/src/test/java/tk/mybatis/mapper/test/country/TestExistsWithPrimaryKey.java index 635d0c7d2..eebeabf81 100644 --- a/base/src/test/java/tk/mybatis/mapper/test/country/TestExistsWithPrimaryKey.java +++ b/base/src/test/java/tk/mybatis/mapper/test/country/TestExistsWithPrimaryKey.java @@ -24,12 +24,18 @@ package tk.mybatis.mapper.test.country; +import org.apache.ibatis.io.Resources; +import org.apache.ibatis.jdbc.ScriptRunner; import org.apache.ibatis.session.SqlSession; import org.junit.Assert; +import org.junit.Before; import org.junit.Test; import tk.mybatis.mapper.mapper.CountryMapper; import tk.mybatis.mapper.mapper.MybatisHelper; import tk.mybatis.mapper.model.Country; +import java.io.IOException; +import java.io.Reader; +import java.sql.Connection; /** * 通过主键查询 @@ -38,6 +44,22 @@ */ public class TestExistsWithPrimaryKey { + @Before + public void setupDB() { + SqlSession sqlSession = MybatisHelper.getSqlSession(); + try { + Connection conn = sqlSession.getConnection(); + Reader reader = Resources.getResourceAsReader("CreateDB.sql"); + ScriptRunner runner = new ScriptRunner(conn); + runner.setLogWriter(null); + runner.runScript(reader); + reader.close(); + } catch (IOException e) {} + finally { + sqlSession.close(); + } + } + /** * 根据PK进行查询 */ diff --git a/base/src/test/java/tk/mybatis/mapper/test/country/TestInsert.java b/base/src/test/java/tk/mybatis/mapper/test/country/TestInsert.java index a7c6fe3a9..938bf9090 100644 --- a/base/src/test/java/tk/mybatis/mapper/test/country/TestInsert.java +++ b/base/src/test/java/tk/mybatis/mapper/test/country/TestInsert.java @@ -25,13 +25,19 @@ package tk.mybatis.mapper.test.country; import org.apache.ibatis.exceptions.PersistenceException; +import org.apache.ibatis.io.Resources; +import org.apache.ibatis.jdbc.ScriptRunner; import org.apache.ibatis.session.SqlSession; import org.junit.Assert; +import org.junit.Before; import org.junit.Test; import tk.mybatis.mapper.mapper.CountryMapper; import tk.mybatis.mapper.mapper.MybatisHelper; import tk.mybatis.mapper.model.Country; +import java.io.IOException; +import java.io.Reader; +import java.sql.Connection; import java.util.List; /** @@ -41,6 +47,22 @@ */ public class TestInsert { + @Before + public void setupDB() { + SqlSession sqlSession = MybatisHelper.getSqlSession(); + try { + Connection conn = sqlSession.getConnection(); + Reader reader = Resources.getResourceAsReader("CreateDB.sql"); + ScriptRunner runner = new ScriptRunner(conn); + runner.setLogWriter(null); + runner.runScript(reader); + reader.close(); + } catch (IOException e) {} + finally { + sqlSession.close(); + } + } + /** * 插入空数据,id不能为null,会报错 */ diff --git a/base/src/test/java/tk/mybatis/mapper/test/example/TestSelectByExample.java b/base/src/test/java/tk/mybatis/mapper/test/example/TestSelectByExample.java index cfdcb7e93..a65218d3e 100644 --- a/base/src/test/java/tk/mybatis/mapper/test/example/TestSelectByExample.java +++ b/base/src/test/java/tk/mybatis/mapper/test/example/TestSelectByExample.java @@ -24,8 +24,11 @@ package tk.mybatis.mapper.test.example; +import org.apache.ibatis.io.Resources; +import org.apache.ibatis.jdbc.ScriptRunner; import org.apache.ibatis.session.SqlSession; import org.junit.Assert; +import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -37,6 +40,9 @@ import tk.mybatis.mapper.model.Country; import tk.mybatis.mapper.model.Country2; +import java.io.IOException; +import java.io.Reader; +import java.sql.Connection; import java.util.Arrays; import java.util.HashSet; import java.util.List; @@ -49,6 +55,22 @@ public class TestSelectByExample { @Rule public ExpectedException exception = ExpectedException.none(); + @Before + public void setupDB() { + SqlSession sqlSession = MybatisHelper.getSqlSession(); + try { + Connection conn = sqlSession.getConnection(); + Reader reader = Resources.getResourceAsReader("CreateDB.sql"); + ScriptRunner runner = new ScriptRunner(conn); + runner.setLogWriter(null); + runner.runScript(reader); + reader.close(); + } catch (IOException e) {} + finally { + sqlSession.close(); + } + } + @Test public void testSelectByExample() { SqlSession sqlSession = MybatisHelper.getSqlSession();