From e1bf52667209e48b3396c16c3a8e92e734b7fa2b Mon Sep 17 00:00:00 2001
From: hewei <hewei@itfsw.com>
Date: Tue, 27 Jun 2017 17:52:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E7=BC=96=E8=AF=91=E8=BE=93?=
 =?UTF-8?q?=E5=87=BA=E7=9B=AE=E5=BD=95=E7=A7=BB=E5=8A=A8=E5=88=B0class?=
 =?UTF-8?q?=E7=9B=AE=E5=BD=95=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../generator/plugins/BatchInsertPluginTest.java |  2 +-
 .../plugins/tools/AbstractShellCallback.java     | 16 ++++------------
 .../generator/plugins/tools/DBHelper.java        |  7 +++++++
 3 files changed, 12 insertions(+), 13 deletions(-)

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<String> warnings = new ArrayList<String>();
+        List<String> 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<String> 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()));
+        }
     }
 
     /**