diff --git a/skywalking-api/src/test/java/test/ai/cloud/bufferGroup.java b/skywalking-api/src/test/java/test/ai/cloud/consumerworker/ConsumerWorkerTest.java similarity index 93% rename from skywalking-api/src/test/java/test/ai/cloud/bufferGroup.java rename to skywalking-api/src/test/java/test/ai/cloud/consumerworker/ConsumerWorkerTest.java index 968786fc9..52f6d96f2 100644 --- a/skywalking-api/src/test/java/test/ai/cloud/bufferGroup.java +++ b/skywalking-api/src/test/java/test/ai/cloud/consumerworker/ConsumerWorkerTest.java @@ -1,4 +1,4 @@ -package test.ai.cloud; +package test.ai.cloud.consumerworker; import com.ai.cloud.skywalking.buffer.BufferGroup; import com.ai.cloud.skywalking.conf.Config; @@ -6,7 +6,7 @@ import org.junit.Test; import static org.junit.Assert.assertEquals; -public class bufferGroup { +public class ConsumerWorkerTest { @Test public void checkConsumerWorkerIsStartIfConsumerSizeIsZero() { @@ -14,6 +14,7 @@ public class bufferGroup { BufferGroup bufferGroup = new BufferGroup("testBufferGroup"); int count = getConsumerWorkerThreadCount(); assertEquals(Config.Consumer.MAX_CONSUMER, count); + } private int getConsumerWorkerThreadCount() { diff --git a/test/skywalking-test-api/src/main/java/test/com/ai/skywalking/api/TraceTreeAssert.java b/test/skywalking-test-api/src/main/java/test/com/ai/skywalking/api/TraceTreeAssert.java index d3609813a..969bde189 100644 --- a/test/skywalking-test-api/src/main/java/test/com/ai/skywalking/api/TraceTreeAssert.java +++ b/test/skywalking-test-api/src/main/java/test/com/ai/skywalking/api/TraceTreeAssert.java @@ -6,11 +6,17 @@ import java.util.List; public class TraceTreeAssert { - public static void assertEquals(String[][] traceTree) { - List traceSpanList = TraceTreeDataAcquirer.acquireCurrentTraceSpanData(); + public static void assertEquals(String[][] assertTraceTree) { + List bufferTraceSpanList = TraceTreeDataAcquirer.acquireCurrentTraceSpanData(); + validateTraceId(bufferTraceSpanList); + validateTraceSpanSize(bufferTraceSpanList.size(), assertTraceTree.length); + validateSpanData(bufferTraceSpanList, assertTraceTree); + } - validateTraceId(traceSpanList); - validateSpanData(traceSpanList, traceTree); + private static void validateTraceSpanSize(int actualSpanSize, int expectedSpanSize) { + if (actualSpanSize != expectedSpanSize) { + throw new RuntimeException("expected span size : " + expectedSpanSize + "\n actual span size : " + actualSpanSize); + } } private static void validateSpanData(List traceSpanList, String[][] traceTree) { @@ -18,5 +24,9 @@ public class TraceTreeAssert { } private static void validateTraceId(List traceSpanList) { + String traceId = null; + for (Span span : traceSpanList) { + + } } } diff --git a/test/skywalking-test-api/src/main/java/test/com/ai/skywalking/api/TraceTreeDataAcquirer.java b/test/skywalking-test-api/src/main/java/test/com/ai/skywalking/api/TraceTreeDataAcquirer.java index 002e33dee..99d7b058b 100644 --- a/test/skywalking-test-api/src/main/java/test/com/ai/skywalking/api/TraceTreeDataAcquirer.java +++ b/test/skywalking-test-api/src/main/java/test/com/ai/skywalking/api/TraceTreeDataAcquirer.java @@ -4,9 +4,6 @@ import com.ai.cloud.skywalking.protocol.Span; import java.util.List; -/** - * Created by xin on 16-6-6. - */ public class TraceTreeDataAcquirer { public static List acquireCurrentTraceSpanData() {