From 406435360f01dab8729475a5d57731f10efaaefd Mon Sep 17 00:00:00 2001
From: Teryk Bellahsene <teryk.bellahsene@sonarsource.com>
Date: Thu, 4 Jun 2015 11:40:21 +0200
Subject: SONAR-6606 drop origin column from metrics table

---
 .../db/QualityGateConditionDaoTest/shouldCleanConditions-result.xml | 6 +++---
 .../db/QualityGateConditionDaoTest/shouldCleanConditions.xml        | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'sonar-core/src/test/resources')

diff --git a/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest/shouldCleanConditions-result.xml b/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest/shouldCleanConditions-result.xml
index 1dd295d9e98..dec565c9b87 100644
--- a/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest/shouldCleanConditions-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest/shouldCleanConditions-result.xml
@@ -1,10 +1,10 @@
 <dataset>
 
   <metrics delete_historical_data="false" id="1" name="key1" val_type="INT" description="description"  domain="domain"
-           short_name="name1" qualitative="false" user_managed="false" enabled="true" origin="JAV" worst_value="[null]" optimized_best_value="false" best_value="[null]" direction="1" hidden="false" />
+           short_name="name1" qualitative="false" user_managed="false" enabled="true"  worst_value="[null]" optimized_best_value="false" best_value="[null]" direction="1" hidden="false" />
 
   <metrics delete_historical_data="false" id="2" name="disabledkey2" val_type="INT" description="description"  domain="domain"
-           short_name="name2" qualitative="false" user_managed="false" enabled="false" origin="JAV" worst_value="[null]" optimized_best_value="false" best_value="[null]" direction="1" hidden="false"/>
+           short_name="name2" qualitative="false" user_managed="false" enabled="false"  worst_value="[null]" optimized_best_value="false" best_value="[null]" direction="1" hidden="false"/>
 
   <!-- ok -->
   <quality_gate_conditions id="1" qgate_id="1" metric_id="1" operator="GT" value_error="30" value_warning="[null]" period="[null]"/>
@@ -16,4 +16,4 @@
   <!-- unknown metric -->
   <!--<quality_gate_conditions id="4" qgate_id="1" metric_id="999" operator="GT" value_error="30" value_warning="[null]" period="[null]"/>-->
 
-</dataset>
\ No newline at end of file
+</dataset>
diff --git a/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest/shouldCleanConditions.xml b/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest/shouldCleanConditions.xml
index 73a9a3647f1..764d97e999c 100644
--- a/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest/shouldCleanConditions.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/qualitygate/db/QualityGateConditionDaoTest/shouldCleanConditions.xml
@@ -1,10 +1,10 @@
 <dataset>
 
   <metrics delete_historical_data="false" id="1" name="key1" val_type="INT" description="description"  domain="domain"
-           short_name="name1" qualitative="false" user_managed="false" enabled="true" origin="JAV" worst_value="[null]" optimized_best_value="false" best_value="[null]" direction="1" hidden="false"/>
+           short_name="name1" qualitative="false" user_managed="false" enabled="true"  worst_value="[null]" optimized_best_value="false" best_value="[null]" direction="1" hidden="false"/>
 
   <metrics delete_historical_data="false" id="2" name="disabledkey2" val_type="INT" description="description"  domain="domain"
-           short_name="name2" qualitative="false" user_managed="false" enabled="false" origin="JAV" worst_value="[null]" optimized_best_value="false" best_value="[null]" direction="1" hidden="false"/>
+           short_name="name2" qualitative="false" user_managed="false" enabled="false"  worst_value="[null]" optimized_best_value="false" best_value="[null]" direction="1" hidden="false"/>
 
   <!-- ok -->
   <quality_gate_conditions id="1" qgate_id="1" metric_id="1" operator="GT" value_error="30" value_warning="[null]" period="[null]"/>
@@ -16,4 +16,4 @@
   <!-- unknown metric -->
   <quality_gate_conditions id="4" qgate_id="1" metric_id="999" operator="GT" value_error="30" value_warning="[null]" period="[null]"/>
 
-</dataset>
\ No newline at end of file
+</dataset>
-- 
cgit v1.2.3