From ebfe276ced481fa31703826210299155d18cb05d Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <marcin@grzejszczak.pl>
Date: Tue, 9 Feb 2016 10:23:57 +0100
Subject: [PATCH]     [#148] Resetting custom hystrix strategy before tests

fixes #148
---
 .../cloud/sleuth/assertions/SpanAssert.java        |  2 +-
 .../HystrixAnnotationsIntegrationTests.java        | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/assertions/SpanAssert.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/assertions/SpanAssert.java
index 11f1dd188..d2e997c8d 100644
--- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/assertions/SpanAssert.java
+++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/assertions/SpanAssert.java
@@ -18,7 +18,7 @@ public class SpanAssert extends AbstractAssert<SpanAssert, Span> {
 		return new SpanAssert(actual);
 	}
 
-	public SpanAssert hasTraceIdEqualTo(long traceId) {
+	public SpanAssert hasTraceIdEqualTo(Long traceId) {
 		isNotNull();
 		if (!Objects.equals(this.actual.getTraceId(), traceId)) {
 			String message = String.format("Expected span's traceId to be <%s> but was <%s>", traceId, this.actual.getTraceId());
diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/hystrix/HystrixAnnotationsIntegrationTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/hystrix/HystrixAnnotationsIntegrationTests.java
index 5d0c5a8d3..d142fbbb9 100644
--- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/hystrix/HystrixAnnotationsIntegrationTests.java
+++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/hystrix/HystrixAnnotationsIntegrationTests.java
@@ -1,11 +1,9 @@
 package org.springframework.cloud.sleuth.instrument.hystrix;
 
-import static org.assertj.core.api.BDDAssertions.then;
-import static org.springframework.cloud.sleuth.assertions.SleuthAssertions.then;
-
 import java.util.concurrent.atomic.AtomicReference;
 
 import org.junit.After;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,6 +20,10 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import com.jayway.awaitility.Awaitility;
 import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
+import com.netflix.hystrix.strategy.HystrixPlugins;
+
+import static org.assertj.core.api.BDDAssertions.then;
+import static org.springframework.cloud.sleuth.assertions.SleuthAssertions.then;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringApplicationConfiguration(classes = {
@@ -34,9 +36,15 @@ public class HystrixAnnotationsIntegrationTests {
 	@Autowired
 	Tracer tracer;
 
+	@BeforeClass
+	public static void reset() {
+		HystrixPlugins.reset();
+	}
+
 	@After
 	public void cleanTrace() {
 		TestSpanContextHolder.removeCurrentSpan();
+		HystrixPlugins.reset();
 	}
 
 	@Test