diff --git a/htrace-core/src/test/java/org/apache/htrace/TestBadClient.java b/htrace-core/src/test/java/org/apache/htrace/TestBadClient.java index cf060d5..e13a0f8 100644 --- a/htrace-core/src/test/java/org/apache/htrace/TestBadClient.java +++ b/htrace-core/src/test/java/org/apache/htrace/TestBadClient.java @@ -23,12 +23,14 @@ import static org.hamcrest.CoreMatchers.containsString; import org.apache.htrace.HTraceConfiguration; import org.apache.htrace.Span; import org.apache.htrace.SpanReceiver; +import org.apache.htrace.Tracer; import org.apache.htrace.TraceTree.SpansByParent; import org.apache.htrace.TraceTree; import org.apache.htrace.impl.AlwaysSampler; import org.apache.htrace.impl.LocalFileSpanReceiver; import org.apache.htrace.impl.POJOSpanReceiver; import org.apache.htrace.impl.StandardOutSpanReceiver; +import org.junit.After; import org.junit.Assert; import org.junit.Test; @@ -57,7 +59,6 @@ public class TestBadClient { assertTrue("Expected to get exception because of improper " + "scope closure.", gotException); innerScope.close(); - Tracer.getInstance().setCurrentSpan(null); } /** @@ -147,4 +148,9 @@ public class TestBadClient { assertTrue("Expected to get exception because of incorrect startSpan.", gotException); } + + @After + public void resetCurrentSpan() { + Tracer.getInstance().setCurrentSpan(null); + } } diff --git a/htrace-core/src/test/java/org/apache/htrace/TestSampler.java b/htrace-core/src/test/java/org/apache/htrace/TestSampler.java index e848e5e..c878f0f 100644 --- a/htrace-core/src/test/java/org/apache/htrace/TestSampler.java +++ b/htrace-core/src/test/java/org/apache/htrace/TestSampler.java @@ -53,10 +53,10 @@ public class TestSampler { @Test public void testParamterizedSampler() { TestParamSampler sampler = new TestParamSampler(); - TraceScope s = Trace.startSpan("test", sampler, 1); + TraceScope s = Trace.startSpan("testParamterizedSampler", sampler, 1); Assert.assertNotNull(s.getSpan()); s.close(); - s = Trace.startSpan("test", sampler, -1); + s = Trace.startSpan("shouldNotBeStarted", sampler, -1); Assert.assertNull(s.getSpan()); s.close(); }