From 88241cd56ffd5fd66249b31ce642e570c062ea59 Mon Sep 17 00:00:00 2001
From: Woonduk Kang <wd.kang@navercorp.com>
Date: Fri, 18 Oct 2013 07:09:55 +0000
Subject: [PATCH] =?UTF-8?q?[=EA=B0=95=EC=9A=B4=EB=8D=95]=20[LUCYSUS-1744]?=
 =?UTF-8?q?=20=EA=B0=9C=EB=B3=84=20transactionId=EB=A5=BC=201=EA=B0=9C?=
 =?UTF-8?q?=EC=9D=98=20binary=EB=A1=9C=20=EB=AC=B6=EC=9D=8C.=20=EB=B2=84?=
 =?UTF-8?q?=EC=A0=84=20=ED=95=84=EB=93=9C=EB=A5=BC=20=EC=B6=94=EA=B0=80?=
 =?UTF-8?q?=ED=95=98=EC=97=AC=20=ED=96=A5=ED=9B=84=20=EB=B3=80=EA=B2=BD?=
 =?UTF-8?q?=EB=90=A0=20=EA=B2=BD=EC=9A=B0=20=EB=B3=84=EB=8F=84=20=EC=B2=98?=
 =?UTF-8?q?=EB=A6=AC=EA=B0=80=20=EA=B0=80=EB=8A=A5=ED=95=98=EB=8F=84?=
 =?UTF-8?q?=EB=A1=9D=20=ED=95=A8.?=
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@2554 84d0f5b1-2673-498c-a247-62c4ff18d310
---
 .../pinpoint/web/service/SpanServiceTest.java | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

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 2b779791b..64a8dc05b 100644
--- a/src/test/java/com/nhn/pinpoint/web/service/SpanServiceTest.java
+++ b/src/test/java/com/nhn/pinpoint/web/service/SpanServiceTest.java
@@ -9,6 +9,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 
 import com.nhn.pinpoint.collector.dao.TracesDao;
+import com.nhn.pinpoint.common.util.TransactionIdUtils;
 import com.nhn.pinpoint.thrift.dto.TAnnotation;
 import com.nhn.pinpoint.thrift.dto.TAnnotationValue;
 import com.nhn.pinpoint.thrift.dto.TSpan;
@@ -55,7 +56,8 @@ public class SpanServiceTest {
 	@Before
 	public void before() throws TException {
 		TSpan span = createRootSpan();
-		logger.debug("id:{}", new TransactionId(span.getTraceAgentId(), span.getTraceAgentStartTime(), span.getTraceTransactionSequence()));
+        com.nhn.pinpoint.common.util.TransactionId id = TransactionIdUtils.parseTransactionId(span.getTransactionId());
+		logger.debug("id:{}", new TransactionId(id.getAgentId(), id.getAgentStartTime(), id.getTransactionSequence()));
 		insert(span);
 		deleteSpans.add(span);
 
@@ -104,7 +106,8 @@ public class SpanServiceTest {
 	}
 
 	private void doRead(TSpan span) {
-		TransactionId traceId = new TransactionId(span.getTraceAgentId(), span.getTraceAgentStartTime(), span.getTraceTransactionSequence());
+        com.nhn.pinpoint.common.util.TransactionId id = TransactionIdUtils.parseTransactionId(span.getTransactionId());
+        TransactionId traceId = new TransactionId(id.getAgentId(), id.getAgentStartTime(), id.getTransactionSequence());
 
 		List<SpanAlign> sort = spanService.selectSpan(traceId);
 		for (SpanAlign spanAlign : sort) {
@@ -130,9 +133,9 @@ public class SpanServiceTest {
 
 		span.setAgentId("UnitTest");
 		span.setApplicationName("ApplicationId");
-        span.setTraceAgentId("traceAgentId");
-		span.setTraceAgentStartTime(System.currentTimeMillis());
-		span.setTraceTransactionSequence(0);
+        byte[] bytes = TransactionIdUtils.formatBytes("traceAgentId", System.currentTimeMillis(), 0);
+        span.setTransactionId(bytes);
+
 		span.setStartTime(time);
 		span.setElapsed(5);
 		span.setRpc("RPC");
@@ -159,9 +162,9 @@ public class SpanServiceTest {
 		sub.setAgentId("UnitTest");
 		sub.setApplicationName("ApplicationId");
         sub.setAgentStartTime(123);
-        sub.setTraceAgentId(span.getTraceAgentId());
-		sub.setTraceAgentStartTime(span.getTraceAgentStartTime());
-		sub.setTraceTransactionSequence(span.getTraceTransactionSequence());
+
+        sub.setTransactionId(span.getTransactionId());
+
 		sub.setStartTime(time);
 		sub.setElapsed(5);
 		sub.setRpc("RPC");