summaryrefslogtreecommitdiffstats
path: root/sonar-core
diff options
context:
space:
mode:
authorJean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com>2014-03-03 11:22:19 +0100
committerJean-Baptiste Lievremont <jean-baptiste.lievremont@sonarsource.com>2014-03-03 11:44:20 +0100
commit44ef70b2f924c27e7965f2da6f941def610acf24 (patch)
treeb653e7f4b401815192cda95f56a0a7cab1a691f0 /sonar-core
parent9583493ec5d4dd3b87578248e1a018646784f8dc (diff)
downloadsonarqube-44ef70b2f924c27e7965f2da6f941def610acf24.tar.gz
sonarqube-44ef70b2f924c27e7965f2da6f941def610acf24.zip
SONAR-4366 Fix bug on insertion of quality gate conditions
Diffstat (limited to 'sonar-core')
-rw-r--r--sonar-core/src/main/resources/org/sonar/core/qualitygate/db/QualityGateConditionMapper.xml2
-rw-r--r--sonar-core/src/test/java/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest.java4
-rw-r--r--sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest/insert-result.xml2
3 files changed, 4 insertions, 4 deletions
diff --git a/sonar-core/src/main/resources/org/sonar/core/qualitygate/db/QualityGateConditionMapper.xml b/sonar-core/src/main/resources/org/sonar/core/qualitygate/db/QualityGateConditionMapper.xml
index 3c8179772bf..afc56564b42 100644
--- a/sonar-core/src/main/resources/org/sonar/core/qualitygate/db/QualityGateConditionMapper.xml
+++ b/sonar-core/src/main/resources/org/sonar/core/qualitygate/db/QualityGateConditionMapper.xml
@@ -5,7 +5,7 @@
<insert id="insert" parameterType="QualityGateCondition" keyColumn="id" useGeneratedKeys="true" keyProperty="id">
insert into quality_gate_conditions (qgate_id, metric_id, operator, value_error, value_warning, period, created_at, updated_at)
- values (#{qualityGateId}, #{metricId}, #{operator}, #{warningThreshold}, #{errorThreshold}, #{period}, #{createdAt}, #{updatedAt})
+ values (#{qualityGateId}, #{metricId}, #{operator}, #{errorThreshold}, #{warningThreshold}, #{period}, #{createdAt}, #{updatedAt})
</insert>
<sql id="conditionColumns">
diff --git a/sonar-core/src/test/java/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest.java b/sonar-core/src/test/java/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest.java
index ac808d81770..db4ffa5cf38 100644
--- a/sonar-core/src/test/java/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest.java
@@ -42,9 +42,9 @@ public class QualityGateConditionDaoTest extends AbstractDaoTestCase {
public void testInsert() throws Exception {
setupData("insert");
QualityGateConditionDto newCondition = new QualityGateConditionDto()
- .setQualityGateId(1L).setMetricId(2L).setOperator(">").setWarningThreshold("10").setErrorThreshold("20").setPeriod(3);
+ .setQualityGateId(1L).setMetricId(2L).setOperator("GT").setWarningThreshold("10").setErrorThreshold("20").setPeriod(3);
dao.insert(newCondition);
- checkTable("insert", "quality_gate_conditions", "name");
+ checkTable("insert", "quality_gate_conditions", "metric_id", "operator", "error_value", "warning_value", "period");
assertThat(newCondition.getId()).isNotNull();
}
diff --git a/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest/insert-result.xml b/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest/insert-result.xml
index 4037e3783bc..b6c99280a4e 100644
--- a/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest/insert-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest/insert-result.xml
@@ -1,5 +1,5 @@
<dataset>
- <quality_gate_conditions id="1" qgate_id="1" metric_id="2" operator="&lt;" value_warning="10" value_error="20" period="3" />
+ <quality_gate_conditions id="1" qgate_id="1" metric_id="2" operator="GT" value_warning="10" value_error="20" period="3" />
</dataset>