diff options
| author | Stas Vilchik <vilchiks@gmail.com> | 2014-03-20 13:30:21 +0600 |
|---|---|---|
| committer | Stas Vilchik <vilchiks@gmail.com> | 2014-03-20 13:30:21 +0600 |
| commit | ea2f43be47be01cb790348d90b7cc12db5d27f48 (patch) | |
| tree | d548181596fba60ca3fab48c67bdae18a178d1c6 /sonar-batch/src/test/java/org | |
| parent | 27447442880586ef8636448b07857eee75d270c1 (diff) | |
| parent | 02b1910cacbc3c5e563d55779ea13bb0c6dca528 (diff) | |
| download | sonarqube-ea2f43be47be01cb790348d90b7cc12db5d27f48.tar.gz sonarqube-ea2f43be47be01cb790348d90b7cc12db5d27f48.zip | |
Merge branch 'master' into grunt
Conflicts:
sonar-server/src/main/webapp/WEB-INF/app/views/quality_gates/templates/_quality_gate_detail_conditions_template.hbs.erb
sonar-server/src/main/webapp/javascripts/quality-gate/views/quality-gate-detail-condition-view.js
sonar-server/src/main/webapp/javascripts/quality-gate/views/quality-gate-detail-header-view.js
Diffstat (limited to 'sonar-batch/src/test/java/org')
| -rw-r--r-- | sonar-batch/src/test/java/org/sonar/batch/qualitygate/ConditionUtilsTest.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sonar-batch/src/test/java/org/sonar/batch/qualitygate/ConditionUtilsTest.java b/sonar-batch/src/test/java/org/sonar/batch/qualitygate/ConditionUtilsTest.java index 6ea5bee366f..91f7a4fc72a 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/qualitygate/ConditionUtilsTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/qualitygate/ConditionUtilsTest.java @@ -237,7 +237,7 @@ public class ConditionUtilsTest { ConditionUtils.getLevel(condition, measure); fail(); } catch(Exception expected) { - assertThat(expected).isInstanceOf(IllegalArgumentException.class).hasMessage("Unable to parse value 'polop' to compare against name"); + assertThat(expected).isInstanceOf(IllegalArgumentException.class).hasMessage("Quality Gate: Unable to parse value 'polop' to compare against name"); } } @@ -256,7 +256,7 @@ public class ConditionUtilsTest { ConditionUtils.getLevel(condition, measure); fail(); } catch(Exception expected) { - assertThat(expected).isInstanceOf(IllegalArgumentException.class).hasMessage("Unable to parse value 'polop' to compare against name"); + assertThat(expected).isInstanceOf(IllegalArgumentException.class).hasMessage("Quality Gate: Unable to parse value 'polop' to compare against name"); } } |