feature: change deprecated method code

myoss-cloud · Jul 21, 2020 · da7c834 · da7c834
1 parent 135ee7a
commit da7c834
Show file tree

Hide file tree

Showing 43 changed files with 59 additions and 221 deletions.
diff --git a/...apm/src/test/java/app/myoss/cloud/apm/log/method/DisableMonitorMethodAfterCase1Tests.java b/...apm/src/test/java/app/myoss/cloud/apm/log/method/DisableMonitorMethodAfterCase1Tests.java
@@ -17,9 +17,8 @@
 
 package app.myoss.cloud.apm.log.method;
 
-import org.junit.Rule;
+import org.junit.Assert;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,9 +43,6 @@
  */
 @RunWith(SpringRunner.class)
 public class DisableMonitorMethodAfterCase1Tests {
-    @Rule
-    public ExpectedException   thrown = ExpectedException.none();
-
     @Autowired
     private ApplicationContext context;
 
@@ -59,20 +55,17 @@ public void isInjectComponent() {
 
     @Test
     public void didNotInjectMonitorMethodBefore() {
-        thrown.expect(NoSuchBeanDefinitionException.class);
-        context.getBean(MonitorMethodBefore.class);
+        Assert.assertThrows(NoSuchBeanDefinitionException.class, () -> context.getBean(MonitorMethodBefore.class));
     }
 
     @Test
     public void didNotInjectMonitorMethodAfter() {
-        thrown.expect(NoSuchBeanDefinitionException.class);
-        context.getBean(MonitorMethodAfter.class);
+        Assert.assertThrows(NoSuchBeanDefinitionException.class, () -> context.getBean(MonitorMethodAfter.class));
     }
 
     @Test
     public void didNotInjectMonitorMethodAround() {
-        thrown.expect(NoSuchBeanDefinitionException.class);
-        context.getBean(MonitorMethodAround.class);
+        Assert.assertThrows(NoSuchBeanDefinitionException.class, () -> context.getBean(MonitorMethodAround.class));
     }
 
     // 开启AspectJ

diff --git a/...pm/src/test/java/app/myoss/cloud/apm/log/method/DisableMonitorMethodAroundCase1Tests.java b/...pm/src/test/java/app/myoss/cloud/apm/log/method/DisableMonitorMethodAroundCase1Tests.java
@@ -17,9 +17,8 @@
 
 package app.myoss.cloud.apm.log.method;
 
-import org.junit.Rule;
+import org.junit.Assert;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,9 +43,6 @@
  */
 @RunWith(SpringRunner.class)
 public class DisableMonitorMethodAroundCase1Tests {
-    @Rule
-    public ExpectedException   thrown = ExpectedException.none();
-
     @Autowired
     private ApplicationContext context;
 
@@ -59,20 +55,17 @@ public void isInjectComponent() {
 
     @Test
     public void didNotInjectMonitorMethodBefore() {
-        thrown.expect(NoSuchBeanDefinitionException.class);
-        context.getBean(MonitorMethodBefore.class);
+        Assert.assertThrows(NoSuchBeanDefinitionException.class, () -> context.getBean(MonitorMethodBefore.class));
     }
 
     @Test
     public void didNotInjectMonitorMethodAfter() {
-        thrown.expect(NoSuchBeanDefinitionException.class);
-        context.getBean(MonitorMethodAfter.class);
+        Assert.assertThrows(NoSuchBeanDefinitionException.class, () -> context.getBean(MonitorMethodAfter.class));
     }
 
     @Test
     public void didNotInjectMonitorMethodAround() {
-        thrown.expect(NoSuchBeanDefinitionException.class);
-        context.getBean(MonitorMethodAround.class);
+        Assert.assertThrows(NoSuchBeanDefinitionException.class, () -> context.getBean(MonitorMethodAround.class));
     }
 
     // 开启AspectJ

diff --git a/...pm/src/test/java/app/myoss/cloud/apm/log/method/DisableMonitorMethodAroundCase2Tests.java b/...pm/src/test/java/app/myoss/cloud/apm/log/method/DisableMonitorMethodAroundCase2Tests.java
@@ -17,9 +17,8 @@
 
 package app.myoss.cloud.apm.log.method;
 
-import org.junit.Rule;
+import org.junit.Assert;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,9 +45,6 @@
  */
 @RunWith(SpringRunner.class)
 public class DisableMonitorMethodAroundCase2Tests {
-    @Rule
-    public ExpectedException   thrown = ExpectedException.none();
-
     @Autowired
     private ApplicationContext context;
 
@@ -61,20 +57,17 @@ public void isInjectComponent() {
 
     @Test
     public void didNotInjectMonitorMethodBefore() {
-        thrown.expect(NoSuchBeanDefinitionException.class);
-        context.getBean(MonitorMethodBefore.class);
+        Assert.assertThrows(NoSuchBeanDefinitionException.class, () -> context.getBean(MonitorMethodBefore.class));
     }
 
     @Test
     public void didNotInjectMonitorMethodAfter() {
-        thrown.expect(NoSuchBeanDefinitionException.class);
-        context.getBean(MonitorMethodAfter.class);
+        Assert.assertThrows(NoSuchBeanDefinitionException.class, () -> context.getBean(MonitorMethodAfter.class));
     }
 
     @Test
     public void didNotInjectMonitorMethodAround() {
-        thrown.expect(NoSuchBeanDefinitionException.class);
-        context.getBean(MonitorMethodAround.class);
+        Assert.assertThrows(NoSuchBeanDefinitionException.class, () -> context.getBean(MonitorMethodAround.class));
     }
 
     // 开启AspectJ

diff --git a/...pm/src/test/java/app/myoss/cloud/apm/log/method/DisableMonitorMethodBeforeCase1Tests.java b/...pm/src/test/java/app/myoss/cloud/apm/log/method/DisableMonitorMethodBeforeCase1Tests.java
@@ -19,9 +19,8 @@
 
 import java.io.Writer;
 
-import org.junit.Rule;
+import org.junit.Assert;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -46,9 +45,6 @@
  */
 @RunWith(SpringRunner.class)
 public class DisableMonitorMethodBeforeCase1Tests {
-    @Rule
-    public ExpectedException   thrown = ExpectedException.none();
-
     @Autowired
     private ApplicationContext context;
 
@@ -62,20 +58,17 @@ public void isInjectComponent() {
 
     @Test
     public void didNotInjectMonitorMethodBefore() {
-        thrown.expect(NoSuchBeanDefinitionException.class);
-        context.getBean(MonitorMethodBefore.class);
+        Assert.assertThrows(NoSuchBeanDefinitionException.class, () -> context.getBean(MonitorMethodBefore.class));
     }
 
     @Test
     public void didNotInjectMonitorMethodAfter() {
-        thrown.expect(NoSuchBeanDefinitionException.class);
-        context.getBean(MonitorMethodAfter.class);
+        Assert.assertThrows(NoSuchBeanDefinitionException.class, () -> context.getBean(MonitorMethodAfter.class));
     }
 
     @Test
     public void didNotInjectMonitorMethodAround() {
-        thrown.expect(NoSuchBeanDefinitionException.class);
-        context.getBean(MonitorMethodAround.class);
+        Assert.assertThrows(NoSuchBeanDefinitionException.class, () -> context.getBean(MonitorMethodAround.class));
     }
 
     // 开启AspectJ

diff --git a/...m/src/test/java/app/myoss/cloud/apm/log/method/DisableUnMonitorMethodAfterCase1Tests.java b/...m/src/test/java/app/myoss/cloud/apm/log/method/DisableUnMonitorMethodAfterCase1Tests.java
@@ -17,9 +17,8 @@
 
 package app.myoss.cloud.apm.log.method;
 
-import org.junit.Rule;
+import org.junit.Assert;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,9 +44,6 @@
  */
 @RunWith(SpringRunner.class)
 public class DisableUnMonitorMethodAfterCase1Tests {
-    @Rule
-    public ExpectedException   thrown = ExpectedException.none();
-
     @Autowired
     private ApplicationContext context;
 
@@ -60,20 +56,17 @@ public void isInjectComponent() {
 
     @Test
     public void didNotInjectMonitorMethodBefore() {
-        thrown.expect(NoSuchBeanDefinitionException.class);
-        context.getBean(MonitorMethodBefore.class);
+        Assert.assertThrows(NoSuchBeanDefinitionException.class, () -> context.getBean(MonitorMethodBefore.class));
     }
 
     @Test
     public void didNotInjectMonitorMethodAfter() {
-        thrown.expect(NoSuchBeanDefinitionException.class);
-        context.getBean(MonitorMethodAfter.class);
+        Assert.assertThrows(NoSuchBeanDefinitionException.class, () -> context.getBean(MonitorMethodAfter.class));
     }
 
     @Test
     public void didNotInjectMonitorMethodAround() {
-        thrown.expect(NoSuchBeanDefinitionException.class);
-        context.getBean(MonitorMethodAround.class);
+        Assert.assertThrows(NoSuchBeanDefinitionException.class, () -> context.getBean(MonitorMethodAround.class));
     }
 
     // 开启AspectJ

diff --git a/.../src/test/java/app/myoss/cloud/apm/log/method/DisableUnMonitorMethodAroundCase1Tests.java b/.../src/test/java/app/myoss/cloud/apm/log/method/DisableUnMonitorMethodAroundCase1Tests.java
@@ -17,9 +17,8 @@
 
 package app.myoss.cloud.apm.log.method;
 
-import org.junit.Rule;
+import org.junit.Assert;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,9 +44,6 @@
  */
 @RunWith(SpringRunner.class)
 public class DisableUnMonitorMethodAroundCase1Tests {
-    @Rule
-    public ExpectedException   thrown = ExpectedException.none();
-
     @Autowired
     private ApplicationContext context;
 
@@ -60,20 +56,17 @@ public void isInjectComponent() {
 
     @Test
     public void didNotInjectMonitorMethodBefore() {
-        thrown.expect(NoSuchBeanDefinitionException.class);
-        context.getBean(MonitorMethodBefore.class);
+        Assert.assertThrows(NoSuchBeanDefinitionException.class, () -> context.getBean(MonitorMethodBefore.class));
     }
 
     @Test
     public void didNotInjectMonitorMethodAfter() {
-        thrown.expect(NoSuchBeanDefinitionException.class);
-        context.getBean(MonitorMethodAfter.class);
+        Assert.assertThrows(NoSuchBeanDefinitionException.class, () -> context.getBean(MonitorMethodAfter.class));
     }
 
     @Test
     public void didNotInjectMonitorMethodAround() {
-        thrown.expect(NoSuchBeanDefinitionException.class);
-        context.getBean(MonitorMethodAround.class);
+        Assert.assertThrows(NoSuchBeanDefinitionException.class, () -> context.getBean(MonitorMethodAround.class));
     }
 
     // 开启AspectJ

diff --git a/.../src/test/java/app/myoss/cloud/apm/log/method/DisableUnMonitorMethodAroundCase2Tests.java b/.../src/test/java/app/myoss/cloud/apm/log/method/DisableUnMonitorMethodAroundCase2Tests.java
@@ -17,9 +17,8 @@
 
 package app.myoss.cloud.apm.log.method;
 
-import org.junit.Rule;
+import org.junit.Assert;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -47,9 +46,6 @@
  */
 @RunWith(SpringRunner.class)
 public class DisableUnMonitorMethodAroundCase2Tests {
-    @Rule
-    public ExpectedException   thrown = ExpectedException.none();
-
     @Autowired
     private ApplicationContext context;
 
@@ -62,20 +58,17 @@ public void isInjectComponent() {
 
     @Test
     public void didNotInjectMonitorMethodBefore() {
-        thrown.expect(NoSuchBeanDefinitionException.class);
-        context.getBean(MonitorMethodBefore.class);
+        Assert.assertThrows(NoSuchBeanDefinitionException.class, () -> context.getBean(MonitorMethodBefore.class));
     }
 
     @Test
     public void didNotInjectMonitorMethodAfter() {
-        thrown.expect(NoSuchBeanDefinitionException.class);
-        context.getBean(MonitorMethodAfter.class);
+        Assert.assertThrows(NoSuchBeanDefinitionException.class, () -> context.getBean(MonitorMethodAfter.class));
     }
 
     @Test
     public void didNotInjectMonitorMethodAround() {
-        thrown.expect(NoSuchBeanDefinitionException.class);
-        context.getBean(MonitorMethodAround.class);
+        Assert.assertThrows(NoSuchBeanDefinitionException.class, () -> context.getBean(MonitorMethodAround.class));
     }
 
     // 开启AspectJ

diff --git a/.../src/test/java/app/myoss/cloud/apm/log/method/DisableUnMonitorMethodBeforeCase1Tests.java b/.../src/test/java/app/myoss/cloud/apm/log/method/DisableUnMonitorMethodBeforeCase1Tests.java
@@ -17,9 +17,8 @@
 
 package app.myoss.cloud.apm.log.method;
 
-import org.junit.Rule;
+import org.junit.Assert;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,9 +44,6 @@
  */
 @RunWith(SpringRunner.class)
 public class DisableUnMonitorMethodBeforeCase1Tests {
-    @Rule
-    public ExpectedException   thrown = ExpectedException.none();
-
     @Autowired
     private ApplicationContext context;
 
@@ -60,20 +56,17 @@ public void isInjectComponent() {
 
     @Test
     public void didNotInjectMonitorMethodBefore() {
-        thrown.expect(NoSuchBeanDefinitionException.class);
-        context.getBean(MonitorMethodBefore.class);
+        Assert.assertThrows(NoSuchBeanDefinitionException.class, () -> context.getBean(MonitorMethodBefore.class));
     }
 
     @Test
     public void didNotInjectMonitorMethodAfter() {
-        thrown.expect(NoSuchBeanDefinitionException.class);
-        context.getBean(MonitorMethodAfter.class);
+        Assert.assertThrows(NoSuchBeanDefinitionException.class, () -> context.getBean(MonitorMethodAfter.class));
     }
 
     @Test
     public void didNotInjectMonitorMethodAround() {
-        thrown.expect(NoSuchBeanDefinitionException.class);
-        context.getBean(MonitorMethodAround.class);
+        Assert.assertThrows(NoSuchBeanDefinitionException.class, () -> context.getBean(MonitorMethodAround.class));
     }
 
     // 开启AspectJ

diff --git a/...tarter-apm/src/test/java/app/myoss/cloud/apm/log/method/MonitorMethodAfterCase1Tests.java b/...tarter-apm/src/test/java/app/myoss/cloud/apm/log/method/MonitorMethodAfterCase1Tests.java
@@ -22,7 +22,6 @@
 import org.apache.commons.lang3.StringUtils;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -52,8 +51,6 @@
 public class MonitorMethodAfterCase1Tests {
     @Rule
     public OutputCaptureRule   output = new OutputCaptureRule();
-    @Rule
-    public ExpectedException   thrown = ExpectedException.none();
 
     @Autowired
     private ApplicationContext context;

diff --git a/...tarter-apm/src/test/java/app/myoss/cloud/apm/log/method/MonitorMethodAfterCase2Tests.java b/...tarter-apm/src/test/java/app/myoss/cloud/apm/log/method/MonitorMethodAfterCase2Tests.java
@@ -22,7 +22,6 @@
 import org.apache.commons.lang3.StringUtils;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -52,8 +51,6 @@
 public class MonitorMethodAfterCase2Tests {
     @Rule
     public OutputCaptureRule   output = new OutputCaptureRule();
-    @Rule
-    public ExpectedException   thrown = ExpectedException.none();
 
     @Autowired
     private ApplicationContext context;