From b1ce54aa633f8773f7e149406837f6c96a420d8c Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Tue, 9 Dec 2014 23:16:18 +0100
Subject: Upgrade to JUnit 4.12

---
 .../src/test/java/org/sonar/api/utils/HttpDownloaderTest.java         | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'sonar-plugin-api/src/test')

diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/utils/HttpDownloaderTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/utils/HttpDownloaderTest.java
index fa9d2edc866..3c7cbf1acec 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/utils/HttpDownloaderTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/utils/HttpDownloaderTest.java
@@ -26,8 +26,10 @@ import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.DisableOnDebug;
 import org.junit.rules.ExpectedException;
 import org.junit.rules.TemporaryFolder;
+import org.junit.rules.TestRule;
 import org.junit.rules.Timeout;
 import org.simpleframework.http.Request;
 import org.simpleframework.http.Response;
@@ -64,7 +66,7 @@ public class HttpDownloaderTest {
   public ExpectedException thrown = ExpectedException.none();
 
   @Rule
-  public Timeout timeout = new Timeout(2000);
+  public TestRule timeout = new DisableOnDebug(Timeout.seconds(2));
 
   private static SocketConnection socketConnection;
   private static String baseUrl;
-- 
cgit v1.2.3