修改h2脚本初始化加载,去除测试用例注入.

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/config/DBConfig.java

@@ -1,19 +1,17 @@
 package com.baomidou.mybatisplus.test.h2.config;
 
-import java.sql.SQLException;
-
 import javax.sql.DataSource;
-
 import org.h2.Driver;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 import org.springframework.jdbc.datasource.SimpleDriverDataSource;
 import org.springframework.jdbc.datasource.init.DataSourceInitializer;
 import org.springframework.jdbc.datasource.init.DatabasePopulator;
 import org.springframework.jdbc.datasource.init.ResourceDatabasePopulator;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
+import java.io.IOException;
 
 /**
  * <p>
@@ -43,7 +41,7 @@ public class DBConfig {
     }
     
     @Bean
-    public DataSourceInitializer dataSourceInitializer(DataSource dataSource) {
+    public DataSourceInitializer dataSourceInitializer(DataSource dataSource) throws IOException {
         final DataSourceInitializer initializer = new DataSourceInitializer();
         initializer.setDataSource(dataSource);
         initializer.setDatabasePopulator(databasePopulator());
@@ -51,15 +49,11 @@ public class DBConfig {
         return initializer;
     }
     
-    private DatabasePopulator databasePopulator() {
+    private DatabasePopulator databasePopulator() throws IOException {
         ResourceDatabasePopulator resourceDatabasePopulator = new ResourceDatabasePopulator();
         resourceDatabasePopulator.setContinueOnError(false);
         resourceDatabasePopulator.addScripts(
-            //todo 这里由你们来进化一下.
-            new ClassPathResource("/h2/student.ddl.sql"),
-            new ClassPathResource("/h2/student.insert.sql"),
-            new ClassPathResource("/h2/user.ddl.sql"),
-            new ClassPathResource("/h2/user.insert.sql")
+            new PathMatchingResourcePatternResolver().getResources("classpath:/h2/*.sql")
         );
         return resourceDatabasePopulator;
     }

mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/h2/service/impl/H2UserServiceImpl.java

@@ -20,8 +20,6 @@ import java.util.List;
 import java.util.Map;
 
 import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException;
-import com.baomidou.mybatisplus.test.h2.entity.persistent.H2Student;
-import com.baomidou.mybatisplus.test.h2.service.IH2StudentService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -46,9 +44,6 @@ public class H2UserServiceImpl extends ServiceImpl<H2UserMapper, H2User> impleme
     @Autowired
     private H2UserMapper userMapper;
     
-    @Autowired
-    private IH2StudentService h2StudentService;
-
     @Override
     public int myInsert(String name, int version) {
         return userMapper.myInsertWithNameVersion(name, version);
@@ -126,7 +121,6 @@ public class H2UserServiceImpl extends ServiceImpl<H2UserMapper, H2User> impleme
     @Transactional(rollbackFor = RuntimeException.class)
     public void testSimpleAndBatchTransactional() {
         save(new H2User("simpleAndBatchTx1",0));
-        h2StudentService.saveBatch(Arrays.asList(new H2Student(null, "tx1", 2),new H2Student(null, "tx1", 2),new H2Student(null, "tx1", 2)));
         saveBatch(Arrays.asList(new H2User("simpleAndBatchTx2",0),new H2User("simpleAndBatchTx3",0),new H2User("simpleAndBatchTx4",0)),1);
         saveOrUpdateBatch(Arrays.asList(new H2User("simpleAndBatchTx5",0),new H2User("simpleAndBatchTx6",0),new H2User("simpleAndBatchTx7",0)),1);
         throw new MybatisPlusException("测试事务回滚");