aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJulien HENRY <julien.henry@sonarsource.com>2017-06-30 15:06:49 +0200
committerJulien HENRY <julien.henry@sonarsource.com>2017-07-04 23:47:46 +0200
commitccde391eea15c4e3661031778c8725c145845e48 (patch)
tree588fb63d1a1200ba9dac149757c8c5e07474f026 /tests
parent9a7dcc5b3ce82c75de74ea3fc20e8d69f8e43a24 (diff)
downloadsonarqube-ccde391eea15c4e3661031778c8725c145845e48.tar.gz
sonarqube-ccde391eea15c4e3661031778c8725c145845e48.zip
SONAR-9478 Missing Settings -> Configuration replacement
Diffstat (limited to 'tests')
-rw-r--r--tests/plugins/security-plugin/src/test/java/FakeAuthenticatorTest.java2
-rw-r--r--tests/src/test/java/org/sonarqube/tests/performance/scanner/MemoryTest.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/plugins/security-plugin/src/test/java/FakeAuthenticatorTest.java b/tests/plugins/security-plugin/src/test/java/FakeAuthenticatorTest.java
index e55aacb9478..37f5fc038ad 100644
--- a/tests/plugins/security-plugin/src/test/java/FakeAuthenticatorTest.java
+++ b/tests/plugins/security-plugin/src/test/java/FakeAuthenticatorTest.java
@@ -20,7 +20,7 @@
import java.util.Map;
import org.junit.Before;
import org.junit.Test;
-import org.sonar.api.config.MapSettings;
+import org.sonar.api.config.internal.MapSettings;
import org.sonar.api.config.Settings;
import org.sonar.api.security.UserDetails;
diff --git a/tests/src/test/java/org/sonarqube/tests/performance/scanner/MemoryTest.java b/tests/src/test/java/org/sonarqube/tests/performance/scanner/MemoryTest.java
index 877c3a32f09..837d42ebd67 100644
--- a/tests/src/test/java/org/sonarqube/tests/performance/scanner/MemoryTest.java
+++ b/tests/src/test/java/org/sonarqube/tests/performance/scanner/MemoryTest.java
@@ -89,7 +89,7 @@ public class MemoryTest extends AbstractPerfTest {
.setProjectDir(baseDir);
BuildResult result = orchestrator.executeBuild(scanner);
- perfRule.assertDurationAround(MavenLogs.extractTotalTime(result.getLogs()), 6190L);
+ perfRule.assertDurationAround(MavenLogs.extractTotalTime(result.getLogs()), 6740L);
// Second execution with a property on server side
orchestrator.getServer().newHttpCall("/api/settings/set")
@@ -100,7 +100,7 @@ public class MemoryTest extends AbstractPerfTest {
.setParam("component", "big-module-tree")
.execute();
result = orchestrator.executeBuild(scanner);
- perfRule.assertDurationAround(MavenLogs.extractTotalTime(result.getLogs()), 6120L);
+ perfRule.assertDurationAround(MavenLogs.extractTotalTime(result.getLogs()), 6720L);
}
private void prepareModule(File parentDir, String moduleName, int depth) throws IOException {