From b79979d1cd18126a5e7876508552fdfaf4d5dfd0 Mon Sep 17 00:00:00 2001
From: Woonduk Kang <wd.kang@navercorp.com>
Date: Fri, 24 Jan 2014 07:05:15 +0000
Subject: [PATCH] =?UTF-8?q?[=EA=B0=95=EC=9A=B4=EB=8D=95]=20[PINPOINT-267]?=
 =?UTF-8?q?=20SpanService=EC=9D=98=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?=
 =?UTF-8?q?=EC=BC=80=EC=9D=B4=EC=8A=A4=20=EC=8B=A4=ED=8C=A8=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://svn.bds.nhncorp.com/pe/hippo-web/trunk@3212 84d0f5b1-2673-498c-a247-62c4ff18d310
---
 src/main/java/com/nhn/pinpoint/web/util/Stack.java     |  7 ++++++-
 .../com/nhn/pinpoint/web/service/SpanServiceTest.java  | 10 ++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/nhn/pinpoint/web/util/Stack.java b/src/main/java/com/nhn/pinpoint/web/util/Stack.java
index 89d168d4f..8f42b9a0e 100644
--- a/src/main/java/com/nhn/pinpoint/web/util/Stack.java
+++ b/src/main/java/com/nhn/pinpoint/web/util/Stack.java
@@ -33,5 +33,10 @@ public class Stack<T> {
         return stack.get(parent);
     }
 
-
+    @Override
+    public String toString() {
+        return "Stack{" +
+                "stack=" + stack +
+                '}';
+    }
 }
diff --git a/src/test/java/com/nhn/pinpoint/web/service/SpanServiceTest.java b/src/test/java/com/nhn/pinpoint/web/service/SpanServiceTest.java
index 72df1fcdc..6b6e16f8e 100644
--- a/src/test/java/com/nhn/pinpoint/web/service/SpanServiceTest.java
+++ b/src/test/java/com/nhn/pinpoint/web/service/SpanServiceTest.java
@@ -8,6 +8,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 
 import com.nhn.pinpoint.collector.dao.TracesDao;
+import com.nhn.pinpoint.collector.util.AcceptedTimeService;
 import com.nhn.pinpoint.common.util.TransactionIdUtils;
 import com.nhn.pinpoint.thrift.dto.TAnnotation;
 import com.nhn.pinpoint.thrift.dto.TAnnotationValue;
@@ -51,6 +52,10 @@ public class SpanServiceTest {
 
 	private TSpan root;
 	private List<TSpan> deleteSpans = new LinkedList<TSpan>();
+    private long spanAcceptTime = System.currentTimeMillis();
+
+    @Autowired
+    private AcceptedTimeService acceptedTimeService;
 
 	@Before
 	public void before() throws TException {
@@ -108,7 +113,7 @@ public class SpanServiceTest {
         com.nhn.pinpoint.common.util.TransactionId id = TransactionIdUtils.parseTransactionId(span.getTransactionId());
         TransactionId traceId = new TransactionId(id.getAgentId(), id.getAgentStartTime(), id.getTransactionSequence());
         // selectedHint를 좀더 정확히 수정할것.
-        SpanResult spanResult = spanService.selectSpan(traceId, System.currentTimeMillis());
+        SpanResult spanResult = spanService.selectSpan(traceId, spanAcceptTime);
         List<SpanAlign> sort = spanResult.getSpanAlignList();
 		for (SpanAlign spanAlign : sort) {
 			logger.info("depth:{} {}", spanAlign.getDepth(), spanAlign.getSpanBo());
@@ -117,6 +122,7 @@ public class SpanServiceTest {
 	}
 
 	private void insert(TSpan span) throws TException {
+        acceptedTimeService.accept(this.spanAcceptTime);
 		traceDao.insert(span);
 	}
 
@@ -125,7 +131,7 @@ public class SpanServiceTest {
 	private TSpan createRootSpan() {
 		// 별도 생성기로 뽑을것.
 		List<TAnnotation> ano = Collections.emptyList();
-		long time = System.currentTimeMillis();
+		long time = this.spanAcceptTime;
 		int andIncrement = id.getAndIncrement();
 
 		TSpan span = new TSpan();