summaryrefslogtreecommitdiffstats
path: root/sonar-plugin-api/src/test
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@sonarsource.com>2014-12-09 23:16:18 +0100
committerSimon Brandhof <simon.brandhof@sonarsource.com>2014-12-09 23:16:18 +0100
commitb1ce54aa633f8773f7e149406837f6c96a420d8c (patch)
treeabe6599c90ca519128599f0d8ae9c38380860cd8 /sonar-plugin-api/src/test
parent0e74c4e6f9d352fe7965a63f6a1a48db2b56be49 (diff)
downloadsonarqube-b1ce54aa633f8773f7e149406837f6c96a420d8c.tar.gz
sonarqube-b1ce54aa633f8773f7e149406837f6c96a420d8c.zip
Upgrade to JUnit 4.12
Diffstat (limited to 'sonar-plugin-api/src/test')
-rw-r--r--sonar-plugin-api/src/test/java/org/sonar/api/utils/HttpDownloaderTest.java4
1 files changed, 3 insertions, 1 deletions
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;