apache
diff --git a/‎apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/test/tools/TracingSegmentRunner.java‎
Lines changed: 3 additions & 1 deletion b/‎apm-sniffer/apm-agent-core/src/test/java/org/apache/skywalking/apm/agent/core/test/tools/TracingSegmentRunner.java‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎apm-sniffer/apm-test-tools/src/main/java/org/apache/skywalking/apm/agent/test/tools/TracingSegmentRunner.java‎
Lines changed: 3 additions & 1 deletion b/‎apm-sniffer/apm-test-tools/src/main/java/org/apache/skywalking/apm/agent/test/tools/TracingSegmentRunner.java‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎apm-sniffer/apm-toolkit-activation/apm-toolkit-micrometer-activation/src/test/java/org/apache/skywalking/apm/toolkit/activation/micrometer/MicrometerContextSnapshotThreadLocalAccessorInterceptorTest.java‎
Lines changed: 2 additions & 2 deletions b/‎apm-sniffer/apm-toolkit-activation/apm-toolkit-micrometer-activation/src/test/java/org/apache/skywalking/apm/toolkit/activation/micrometer/MicrometerContextSnapshotThreadLocalAccessorInterceptorTest.java‎
Lines changed: 2 additions & 2 deletions
@@ -55,7 +55,7 @@ protected Object createTest() throws Exception {
 
     @Override
     protected Statement withAfters(FrameworkMethod method, Object target, final Statement statement) {
-        return new Statement() {
+        Statement st = new Statement() {
             @Override
             public void evaluate() throws Throwable {
                 if (field != null) {
@@ -89,5 +89,7 @@ public void afterFinished(IgnoredTracerContext tracerContext) {
                 }
             }
         };
+
+        return super.withAfters(method, target, st);
     }
 }
@@ -55,7 +55,7 @@ protected Object createTest() throws Exception {
 
     @Override
     protected Statement withAfters(FrameworkMethod method, Object target, final Statement statement) {
-        return new Statement() {
+        Statement st = new Statement() {
             @Override
             public void evaluate() throws Throwable {
                 if (field != null) {
@@ -89,5 +89,7 @@ public void afterFinished(IgnoredTracerContext tracerContext) {
                 }
             }
         };
+
+        return super.withAfters(method, target, st);
     }
 }
@@ -92,8 +92,6 @@ public void clear() {
     @AfterClass
     public static void clearAfterAll() {
         // test from threadlocalaccessor test x 2 TODO: I have no idea what is going on
-        ContextManager.stopSpan();
-        ContextManager.stopSpan();
         assertThat(ContextManager.isActive(), is(false));
     }
 
@@ -103,13 +101,15 @@ public void testServiceFromPlugin() {
             PluginBootService.class);
 
         Assert.assertNotNull(service);
+        ContextManager.stopSpan();
     }
 
     @Test
     public void testServiceOverrideFromPlugin() {
         ContextManagerExtendService service = ServiceManager.INSTANCE.findService(ContextManagerExtendService.class);
 
         Assert.assertTrue(service instanceof ContextManagerExtendOverrideService);
+        ContextManager.stopSpan();
     }
 
     @Test
Original file line number	Diff line number	Diff line change
@@ -55,7 +55,7 @@ protected Object createTest() throws Exception {
55	55
56	56	@Override
57	57	protected Statement withAfters(FrameworkMethod method, Object target, final Statement statement) {
58		- return new Statement() {
	58	+ Statement st = new Statement() {
59	59	@Override
60	60	public void evaluate() throws Throwable {
61	61	if (field != null) {
@@ -89,5 +89,7 @@ public void afterFinished(IgnoredTracerContext tracerContext) {
89	89	}
90	90	}
91	91	};
	92	+
	93	+ return super.withAfters(method, target, st);
92	94	}
93	95	}
Original file line number	Diff line number	Diff line change
@@ -92,8 +92,6 @@ public void clear() {
92	92	@AfterClass
93	93	public static void clearAfterAll() {
94	94	// test from threadlocalaccessor test x 2 TODO: I have no idea what is going on
95		- ContextManager.stopSpan();
96		- ContextManager.stopSpan();
97	95	assertThat(ContextManager.isActive(), is(false));
98	96	}
99	97
@@ -103,13 +101,15 @@ public void testServiceFromPlugin() {
103	101	PluginBootService.class);
104	102
105	103	Assert.assertNotNull(service);
	104	+ ContextManager.stopSpan();
106	105	}
107	106
108	107	@Test
109	108	public void testServiceOverrideFromPlugin() {
110	109	ContextManagerExtendService service = ServiceManager.INSTANCE.findService(ContextManagerExtendService.class);
111	110
112	111	Assert.assertTrue(service instanceof ContextManagerExtendOverrideService);
	112	+ ContextManager.stopSpan();
113	113	}
114	114
115	115	@Test