Merge pull request alibaba#135 from alibaba/develop-for-20181227

Develop for 20181227
shenenlutc · Feb 1, 2019 · c472dec · c472dec
2 parents 8557ef2 + f55bb6e
commit c472dec
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 17 deletions.
diff --git a/pom.xml b/pom.xml
@@ -68,12 +68,6 @@
                 </executions>
             </plugin>
 
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>cobertura-maven-plugin</artifactId>
-                <version>2.7</version>
-            </plugin>
-
             <!-- 为了发布到MAVEN中央仓库而用的插件 -->
             <plugin>
                 <groupId>org.sonatype.plugins</groupId>
@@ -103,6 +97,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>cobertura-maven-plugin</artifactId>
+                <version>2.7</version>
                 <configuration>
                     <outputDirectory>./target/tmpCobertura</outputDirectory>
                     <aggregate>true</aggregate>

diff --git a/sandbox-core/src/main/java/com/alibaba/jvm/sandbox/core/util/AsmUtils.java b/sandbox-core/src/main/java/com/alibaba/jvm/sandbox/core/util/AsmUtils.java
@@ -16,7 +16,8 @@
 public class AsmUtils {
 
     /**
-     * {@see org.objectweb.asm.ClassWriter#getCommonSuperClass(String, String)}
+     * just the same
+     * {@code org.objectweb.asm.ClassWriter#getCommonSuperClass(String, String)}
      */
     public static String getCommonSuperClass(String type1, String type2, ClassLoader loader) {
         return getCommonSuperClassImplByAsm(type1, type2, loader);

diff --git a/...lculatorTestCaseImplByAdviceListener.java → ...lculatorImplByAdviceListenerTestCase.java b/...lculatorTestCaseImplByAdviceListener.java → ...lculatorImplByAdviceListenerTestCase.java
@@ -22,7 +22,7 @@
 /**
  * AdviceListener相关测试用例
  */
-public class CalculatorTestCaseImplByAdviceListener implements ICalculatorTestCase {
+public class CalculatorImplByAdviceListenerTestCase implements ICalculatorTestCase {
 
     @BeforeClass
     public static void initSpy() {

diff --git a/...alculatorTestCaseImplByEventListener.java → ...alculatorImplByEventListenerTestCase.java b/...alculatorTestCaseImplByEventListener.java → ...alculatorImplByEventListenerTestCase.java
@@ -21,7 +21,7 @@
 import static com.alibaba.jvm.sandbox.qatest.core.util.CalculatorHelper.*;
 import static org.junit.Assert.assertEquals;
 
-public class CalculatorTestCaseImplByEventListener implements ICalculatorTestCase {
+public class CalculatorImplByEventListenerTestCase implements ICalculatorTestCase {
 
     @BeforeClass
     public static void initSpy() {

diff --git a/...sandbox/qatest/core/issues/Issues125.java → ...box/qatest/core/issues/TestIssues125.java b/...sandbox/qatest/core/issues/Issues125.java → ...box/qatest/core/issues/TestIssues125.java
@@ -5,7 +5,7 @@
 /**
  * 修复<a href="https://github.com/alibaba/jvm-sandbox/issues/125">#125</a>
  */
-public class Issues125 {
+public class TestIssues125 {
 
     /**
      * 怀疑Spy被重新加载后EventListenerHandlers的计数器被重置

diff --git a/...sandbox/qatest/core/issues/Issues130.java → ...box/qatest/core/issues/TestIssues130.java b/...sandbox/qatest/core/issues/Issues130.java → ...box/qatest/core/issues/TestIssues130.java
@@ -14,7 +14,7 @@
 /**
  * 修复<a href="https://github.com/alibaba/jvm-sandbox/issues/130">#130</a>
  */
-public class Issues130 {
+public class TestIssues130 {
 
     @Test
     public void cal$sum_add$call_before() throws Throwable {

diff --git a/...sandbox/qatest/core/issues/Issues133.java → ...box/qatest/core/issues/TestIssues133.java b/...sandbox/qatest/core/issues/Issues133.java → ...box/qatest/core/issues/TestIssues133.java
@@ -3,11 +3,9 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-import java.io.InputStream;
-
 import static com.alibaba.jvm.sandbox.core.util.AsmUtils.getCommonSuperClass;
 
-public class Issues133 {
+public class TestIssues133 {
 
     @Test
     public void test() {

diff --git a/...r/ClassStructureTestCaseByChildClass.java → ...r/ClassStructureByChildClassTestCase.java b/...r/ClassStructureTestCaseByChildClass.java → ...r/ClassStructureByChildClassTestCase.java
@@ -23,7 +23,7 @@
 import static java.util.Arrays.asList;
 
 @RunWith(Parameterized.class)
-public class ClassStructureTestCaseByChildClass {
+public class ClassStructureByChildClassTestCase {
 
     private static final String PACKAGE_PREFIX = "com.alibaba.jvm.sandbox.qatest.core.util.matcher.target.";
 
@@ -37,7 +37,7 @@ public static Collection<Object[]> getData() throws IOException {
 
     private final ClassStructure childClassStructure;
 
-    public ClassStructureTestCaseByChildClass(ClassStructure childClassStructure) {
+    public ClassStructureByChildClassTestCase(ClassStructure childClassStructure) {
         this.childClassStructure = childClassStructure;
     }
 

diff --git a/sandbox-core/src/test/resources/lib/sandbox-spy-1.2.0-for-qatest.jar b/sandbox-core/src/test/resources/lib/sandbox-spy-1.2.0-for-qatest.jar
diff --git a/...box-debug-module/src/main/java/com/alibaba/jvm/sandbox/module/debug/DebugTraceModule.java b/...box-debug-module/src/main/java/com/alibaba/jvm/sandbox/module/debug/DebugTraceModule.java
@@ -10,7 +10,6 @@
 import com.alibaba.jvm.sandbox.api.listener.ext.EventWatchBuilder;
 import com.alibaba.jvm.sandbox.api.listener.ext.EventWatcher;
 import com.alibaba.jvm.sandbox.api.resource.ModuleEventWatcher;
-import com.alibaba.jvm.sandbox.api.resource.ModuleManager;
 import com.alibaba.jvm.sandbox.module.debug.textui.TTree;
 import org.kohsuke.MetaInfServices;