Fix mybatis integration tests for Oracle/SQLServer

diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteWastedMeasuresWhenPurgingSnapshot-result.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteWastedMeasuresWhenPurgingSnapshot-result.xml
index 3ada3c43bdd1c4a2a8450674940018bfa70e793e..0d7755009b65488d7faf0fd085d84c5e4d6cdc19 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteWastedMeasuresWhenPurgingSnapshot-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteWastedMeasuresWhenPurgingSnapshot-result.xml
@@ -1,19 +1,19 @@
 <dataset>
 
   <metrics id="1" delete_historical_data="[null]"
-           name="ncloc" VAL_TYPE="INT" DESCRIPTION="[null]" domain="[null]" short_name="" enabled="[true]"
+           name="ncloc" val_type="INT" description="[null]" domain="[null]" short_name="" enabled="[true]"
            worst_value="[null]" optimized_best_value="[null]" best_value="[null]"
            direction="0" hidden="[false]"/>
 
   <metrics id="2" delete_historical_data="[true]"
-           name="coverage" VAL_TYPE="INT" DESCRIPTION="[null]" domain="[null]" short_name="" enabled="[true]"
+           name="coverage" val_type="INT" description="[null]" domain="[null]" short_name="" enabled="[true]"
            worst_value="0" optimized_best_value="[true]" best_value="100"
            direction="1" hidden="[false]"/>
 
   <characteristics id="1" kee="M1C1" name="M1C1" quality_model_id="1" rule_id="[null]" characteristic_order="1"
-                   depth="1" description="[null]" enabled="true"/>
+                   depth="1" description="[null]" enabled="[true]"/>
   <characteristics id="2" kee="M1C2" name="M1C2" quality_model_id="1" rule_id="333" characteristic_order="1"
-                   depth="2" description="[null]" enabled="true"/>
+                   depth="2" description="[null]" enabled="[true]"/>
 
   <snapshots id="1"
              project_id="1" parent_snapshot_id="[null]" root_project_id="1" root_snapshot_id="[null]"
@@ -27,10 +27,10 @@
              build_date="2008-12-02 13:58:00.00" version="[null]" path="[null]"/>
 
   <!-- do not delete standard measure -->
-  <project_measures ID="1" project_id="1" SNAPSHOT_ID="1" RULE_ID="[null]" characteristic_id="[null]" METRIC_ID="1"
+  <project_measures id="1" project_id="1" snapshot_id="1" rule_id="[null]" characteristic_id="[null]" metric_id="1"
                     url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]"
                     variation_value_4="[null]"
-                    variation_value_5="[null]" rule_priority="[null]" alert_text="[null]" VALUE="10.0"
+                    variation_value_5="[null]" rule_priority="[null]" alert_text="[null]" value="10.0"
                     rules_category_id="[null]"
                     committer="[null]"
                     text_value="[null]" tendency="[null]" measure_date="[null]" alert_status="[null]"
@@ -47,10 +47,10 @@
                     description="[null]"/>-->
 
   <!-- do not delete measure on quality model characteristic -->
-  <project_measures ID="3" project_id="1" SNAPSHOT_ID="1" RULE_ID="[null]" characteristic_id="1" METRIC_ID="1"
+  <project_measures ID="3" project_id="1" snapshot_id="1" rule_id="[null]" characteristic_id="1" metric_id="1"
                     url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]"
                     variation_value_4="[null]"
-                    variation_value_5="[null]" rule_priority="[null]" alert_text="[null]" VALUE="10.0"
+                    variation_value_5="[null]" rule_priority="[null]" alert_text="[null]" value="10.0"
                     rules_category_id="[null]"
                     committer="[null]"
                     text_value="[null]" tendency="[null]" measure_date="[null]" alert_status="[null]"

diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteWastedMeasuresWhenPurgingSnapshot.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteWastedMeasuresWhenPurgingSnapshot.xml
index 297829d1f12f1f5257b67a78e9cf5c12040a5bff..ea089568c10aece314c2d72c55dbc6dfc8702aaf 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteWastedMeasuresWhenPurgingSnapshot.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteWastedMeasuresWhenPurgingSnapshot.xml
@@ -1,19 +1,19 @@
 <dataset>
 
   <metrics id="1" delete_historical_data="[null]"
-           name="ncloc" VAL_TYPE="INT" DESCRIPTION="[null]" domain="[null]" short_name="" enabled="[true]"
+           name="ncloc" val_type="INT" description="[null]" domain="[null]" short_name="" enabled="[true]"
            worst_value="[null]" optimized_best_value="[null]" best_value="[null]"
            direction="0" hidden="[false]"/>
 
   <metrics id="2" delete_historical_data="[true]"
-           name="coverage" VAL_TYPE="INT" DESCRIPTION="[null]" domain="[null]" short_name="" enabled="[true]"
+           name="coverage" val_type="INT" description="[null]" domain="[null]" short_name="" enabled="[true]"
            worst_value="0" optimized_best_value="[true]" best_value="100"
            direction="1" hidden="[false]"/>
 
   <characteristics id="1" kee="M1C1" name="M1C1" quality_model_id="1" rule_id="[null]" characteristic_order="1"
-                   depth="1" description="[null]" enabled="true"/>
+                   depth="1" description="[null]" enabled="[true]"/>
   <characteristics id="2" kee="M1C2" name="M1C2" quality_model_id="1" rule_id="333" characteristic_order="1"
-                   depth="2" description="[null]" enabled="true"/>
+                   depth="2" description="[null]" enabled="[true]"/>
 
   <snapshots id="1"
              project_id="1" parent_snapshot_id="[null]" root_project_id="1" root_snapshot_id="[null]"
@@ -27,7 +27,7 @@
              build_date="2008-12-02 13:58:00.00" version="[null]" path="[null]"/>
 
   <!-- do not delete standard measure -->
-  <project_measures ID="1" project_id="1" SNAPSHOT_ID="1" RULE_ID="[null]" characteristic_id="[null]" METRIC_ID="1"
+  <project_measures ID="1" project_id="1" snapshot_id="1" rule_id="[null]" characteristic_id="[null]" metric_id="1"
                     url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]"
                     variation_value_4="[null]"
                     variation_value_5="[null]" rule_priority="[null]" alert_text="[null]" VALUE="10.0"
@@ -37,7 +37,7 @@
                     description="[null]"/>
 
   <!-- delete measure on rule -->
-  <project_measures ID="2" project_id="1" SNAPSHOT_ID="1" RULE_ID="33" characteristic_id="[null]" METRIC_ID="1"
+  <project_measures ID="2" project_id="1" snapshot_id="1" rule_id="33" characteristic_id="[null]" metric_id="1"
                     url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]"
                     variation_value_4="[null]"
                     variation_value_5="[null]" rule_priority="[null]" alert_text="[null]" VALUE="10.0"