aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-server/src/test/java
diff options
context:
space:
mode:
Diffstat (limited to 'server/sonar-server/src/test/java')
-rw-r--r--server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/DeleteActionTest.java8
-rw-r--r--server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileReferenceTest.java2
-rw-r--r--server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SetDefaultActionTest.java2
3 files changed, 6 insertions, 6 deletions
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/DeleteActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/DeleteActionTest.java
index 48cdeca47ff..2b68cec4651 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/DeleteActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/DeleteActionTest.java
@@ -204,7 +204,7 @@ public class DeleteActionTest {
userSession.logIn();
expectedException.expect(IllegalArgumentException.class);
- expectedException.expectMessage("If no quality profile key is specified, language and name must be set");
+ expectedException.expectMessage("If 'key' is not specified, 'qualityProfile' and 'language' must be set");
ws.newRequest()
.setMethod("POST")
@@ -218,7 +218,7 @@ public class DeleteActionTest {
logInAsQProfileAdministrator(organization);
expectedException.expect(IllegalArgumentException.class);
- expectedException.expectMessage("If no quality profile key is specified, language and name must be set");
+ expectedException.expectMessage("If 'key' is not specified, 'qualityProfile' and 'language' must be set");
ws.newRequest()
.setMethod("POST")
@@ -234,7 +234,7 @@ public class DeleteActionTest {
logInAsQProfileAdministrator(organization);
expectedException.expect(IllegalArgumentException.class);
- expectedException.expectMessage("If no quality profile key is specified, language and name must be set");
+ expectedException.expectMessage("If 'key' is not specified, 'qualityProfile' and 'language' must be set");
ws.newRequest()
.setMethod("POST")
@@ -250,7 +250,7 @@ public class DeleteActionTest {
logInAsQProfileAdministrator(organization);
expectedException.expect(IllegalArgumentException.class);
- expectedException.expectMessage("When providing a quality profile key, neither of organization/language/name must be set");
+ expectedException.expectMessage("When a quality profile key is set, 'organization' 'language' and 'qualityProfile' can't be set");
ws.newRequest()
.setMethod("POST")
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileReferenceTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileReferenceTest.java
index b15a3800c75..8320116e216 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileReferenceTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileReferenceTest.java
@@ -138,7 +138,7 @@ public class QProfileReferenceTest {
req.setParam("profileName", "the name");
expectedException.expect(IllegalArgumentException.class);
- expectedException.expectMessage("If no quality profile key is specified, language and name must be set");
+ expectedException.expectMessage("If 'key' is not specified, 'qualityProfile' and 'language' must be set");
QProfileReference.from(req);
}
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SetDefaultActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SetDefaultActionTest.java
index c97854fea42..fc23a0b1ee8 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SetDefaultActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SetDefaultActionTest.java
@@ -233,7 +233,7 @@ public class SetDefaultActionTest {
userSessionRule.logIn();
expectedException.expect(IllegalArgumentException.class);
- expectedException.expectMessage("When providing a quality profile key, neither of organization/language/name must be set");
+ expectedException.expectMessage("When a quality profile key is set, 'organization' 'language' and 'qualityProfile' can't be set");
ws.newRequest().setMethod("POST")
.setParam(PARAM_KEY, xoo2Profile.getKee())