From 8381ab5fc298ed1413890e85f81e4122379294b1 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Tue, 6 Sep 2016 10:50:11 +0200 Subject: [PATCH] Fix merge --- .../org/sonar/server/setting/ws/CheckSecretKeyActionTest.java | 3 ++- .../java/org/sonar/server/setting/ws/EncryptActionTest.java | 3 ++- .../sonar/server/setting/ws/GenerateSecretKeyActionTest.java | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/server/sonar-server/src/test/java/org/sonar/server/setting/ws/CheckSecretKeyActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/setting/ws/CheckSecretKeyActionTest.java index 00c55ea695d..16ec66b53ea 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/setting/ws/CheckSecretKeyActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/setting/ws/CheckSecretKeyActionTest.java @@ -29,6 +29,7 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.rules.TemporaryFolder; import org.sonar.api.config.Encryption; +import org.sonar.api.config.MapSettings; import org.sonar.api.config.Settings; import org.sonar.api.server.ws.WebService; import org.sonar.server.exceptions.ForbiddenException; @@ -51,7 +52,7 @@ public class CheckSecretKeyActionTest { @Rule public TemporaryFolder temporaryFolder = new TemporaryFolder(); - Settings settings = new Settings(); + Settings settings = new MapSettings(); Encryption encryption = settings.getEncryption(); CheckSecretKeyAction underTest = new CheckSecretKeyAction(settings, userSession); diff --git a/server/sonar-server/src/test/java/org/sonar/server/setting/ws/EncryptActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/setting/ws/EncryptActionTest.java index a9665351790..43b05f269ff 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/setting/ws/EncryptActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/setting/ws/EncryptActionTest.java @@ -31,6 +31,7 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.rules.TemporaryFolder; import org.sonar.api.config.Encryption; +import org.sonar.api.config.MapSettings; import org.sonar.api.config.Settings; import org.sonar.api.server.ws.WebService; import org.sonar.server.exceptions.BadRequestException; @@ -55,7 +56,7 @@ public class EncryptActionTest { @Rule public TemporaryFolder folder = new TemporaryFolder(); - Settings settings = new Settings(); + Settings settings = new MapSettings(); Encryption encryption = settings.getEncryption(); EncryptAction underTest = new EncryptAction(userSession, settings); diff --git a/server/sonar-server/src/test/java/org/sonar/server/setting/ws/GenerateSecretKeyActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/setting/ws/GenerateSecretKeyActionTest.java index 3a91a9d4c02..1214adadbc8 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/setting/ws/GenerateSecretKeyActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/setting/ws/GenerateSecretKeyActionTest.java @@ -29,6 +29,7 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.rules.TemporaryFolder; import org.sonar.api.config.Encryption; +import org.sonar.api.config.MapSettings; import org.sonar.api.config.Settings; import org.sonar.api.server.ws.WebService; import org.sonar.server.exceptions.ForbiddenException; @@ -50,7 +51,7 @@ public class GenerateSecretKeyActionTest { @Rule public TemporaryFolder temporaryFolder = new TemporaryFolder(); - Settings settings = new Settings(); + Settings settings = new MapSettings(); Encryption encryption = settings.getEncryption(); GenerateSecretKeyAction underTest = new GenerateSecretKeyAction(settings, userSession); -- 2.39.5