diff --git a/src/test/java/com/itfsw/mybatis/generator/plugins/BatchInsertPluginTest.java b/src/test/java/com/itfsw/mybatis/generator/plugins/BatchInsertPluginTest.java index c140bc2..4b2a9e2 100644 --- a/src/test/java/com/itfsw/mybatis/generator/plugins/BatchInsertPluginTest.java +++ b/src/test/java/com/itfsw/mybatis/generator/plugins/BatchInsertPluginTest.java @@ -88,7 +88,7 @@ public class BatchInsertPluginTest { @Test public void testMethods() throws IOException, XMLParserException, InvalidConfigurationException, SQLException, InterruptedException, ClassNotFoundException, NoSuchMethodException { - List warnings = new ArrayList(); + List warnings = new ArrayList<>(); ConfigurationParser cp = new ConfigurationParser(warnings); Configuration config = cp.parseConfiguration(Resources.getResourceAsStream("scripts/BatchInsertPlugin/mybatis-generator.xml")); diff --git a/src/test/java/com/itfsw/mybatis/generator/plugins/tools/AbstractShellCallback.java b/src/test/java/com/itfsw/mybatis/generator/plugins/tools/AbstractShellCallback.java index 5d3ebd4..243cc19 100644 --- a/src/test/java/com/itfsw/mybatis/generator/plugins/tools/AbstractShellCallback.java +++ b/src/test/java/com/itfsw/mybatis/generator/plugins/tools/AbstractShellCallback.java @@ -16,7 +16,6 @@ package com.itfsw.mybatis.generator.plugins.tools; -import org.junit.Assert; import org.mybatis.generator.api.ShellCallback; import org.mybatis.generator.exception.ShellException; @@ -25,9 +24,6 @@ import javax.tools.JavaFileObject; import javax.tools.StandardJavaFileManager; import javax.tools.ToolProvider; import java.io.File; -import java.net.MalformedURLException; -import java.net.URL; -import java.net.URLClassLoader; import java.util.ArrayList; import java.util.List; import java.util.StringTokenizer; @@ -74,20 +70,16 @@ public abstract class AbstractShellCallback implements ShellCallback { //设置编译参数 ArrayList ops = new ArrayList<>(); ops.add("-Xlint:unchecked"); + // 设置输出目录 + ops.add("-d"); + ops.add(this.getClass().getClassLoader().getResource("").getPath()); //获取编译任务 JavaCompiler.CompilationTask task = compiler.getTask(null, manager, null, ops, null, it); //执行编译任务 task.call(); - try { - reloadProject(new URLClassLoader(new URL[]{new File(project).toURI().toURL()})); - } catch (MalformedURLException e) { - e.printStackTrace(); - Assert.assertTrue(false); - } - } else { - reloadProject(this.getClass().getClassLoader()); } + reloadProject(this.getClass().getClassLoader()); } public abstract void reloadProject(ClassLoader loader); diff --git a/src/test/java/com/itfsw/mybatis/generator/plugins/tools/DBHelper.java b/src/test/java/com/itfsw/mybatis/generator/plugins/tools/DBHelper.java index 15b11e1..8e574b6 100644 --- a/src/test/java/com/itfsw/mybatis/generator/plugins/tools/DBHelper.java +++ b/src/test/java/com/itfsw/mybatis/generator/plugins/tools/DBHelper.java @@ -22,6 +22,7 @@ import org.apache.ibatis.session.SqlSessionFactory; import org.apache.ibatis.session.SqlSessionFactoryBuilder; import java.io.*; +import java.net.URL; import java.sql.Connection; import java.sql.SQLException; import java.sql.Statement; @@ -118,6 +119,12 @@ public class DBHelper { */ public static void cleanDao(){ delDir(new File("src/test/java/com/itfsw/mybatis/generator/plugins/dao")); + + // 清理Dao class目录 + URL daoClass = DBHelper.class.getClassLoader().getResource("com/itfsw/mybatis/generator/plugins/dao"); + if (daoClass != null){ + delDir(new File(daoClass.getPath())); + } } /**