Fix MyBatis tests for Oracle (PropertiesDaoTest + ResourceIndexerDaoTest)

6 files changed, 17 insertions, 17 deletions

diff --git a/sonar-core/src/test/java/org/sonar/core/properties/PropertiesDaoTest.java b/sonar-core/src/test/java/org/sonar/core/properties/PropertiesDaoTest.java
index 092dd43cf5a..080f3390d73 100644
--- a/sonar-core/src/test/java/org/sonar/core/properties/PropertiesDaoTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/properties/PropertiesDaoTest.java
@@ -91,7 +91,7 @@ public class PropertiesDaoTest extends DaoTestCase {
     dao.setProperty(new PropertyDto().setKey("project.key").setResourceId(10L).setValue("new_project"));
     dao.setProperty(new PropertyDto().setKey("user.key").setUserId(100L).setValue("new_user"));
 
-    checkTables("insert", new String[]{"id"}, "properties");
+    checkTables("insert", "properties");
   }
 
   private PropertyDto findById(List<PropertyDto> properties, int id) {
diff --git a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/insert-result.xml b/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/insert-result.xml
index 3d4da8c80bc..3e5eb87705c 100644
--- a/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/insert-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/properties/PropertiesDaoTest/insert-result.xml
@@ -1,12 +1,12 @@
 <dataset>
 
   <!-- global -->
-  <properties prop_key="global.key" text_value="new_global" resource_id="[null]" user_id="[null]"/>
+  <properties id="1" prop_key="global.key" text_value="new_global" resource_id="[null]" user_id="[null]"/>
 
   <!-- project -->
-  <properties prop_key="project.key" text_value="new_project" resource_id="10" user_id="[null]"/>
+  <properties id="2" prop_key="project.key" text_value="new_project" resource_id="10" user_id="[null]"/>
 
   <!-- user -->
-  <properties prop_key="user.key" text_value="new_user" resource_id="[null]" user_id="100"/>
+  <properties id="3" prop_key="user.key" text_value="new_user" resource_id="[null]" user_id="100"/>
 
 </dataset>
diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/empty.xml b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/empty.xml
index df17d4185c2..35999df443d 100644
--- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/empty.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/empty.xml
@@ -1,3 +1,3 @@
 <dataset>
-  <resource_index kee="other" position="0" name_size="5" resource_id="4" root_project_id="1" qualifier="CLA"/>
+  <resource_index id="1" kee="other" position="0" name_size="5" resource_id="4" root_project_id="1" qualifier="CLA"/>
 </dataset>
\ No newline at end of file
diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldNotReindexUnchangedResource.xml b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldNotReindexUnchangedResource.xml
index 4292af5708d..89a3a8c465d 100644
--- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldNotReindexUnchangedResource.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldNotReindexUnchangedResource.xml
@@ -1,6 +1,6 @@
 <dataset>
-  <resource_index kee="struts" position="0" name_size="6" resource_id="1" root_project_id="1" qualifier="TRK"/>
-  <resource_index kee="truts" position="1" name_size="6" resource_id="1" root_project_id="1" qualifier="TRK"/>
-  <resource_index kee="ruts" position="2" name_size="6" resource_id="1" root_project_id="1" qualifier="TRK"/>
-  <resource_index kee="uts" position="3" name_size="6" resource_id="1" root_project_id="1" qualifier="TRK"/>
+  <resource_index id="1" kee="struts" position="0" name_size="6" resource_id="1" root_project_id="1" qualifier="TRK"/>
+  <resource_index id="2" kee="truts" position="1" name_size="6" resource_id="1" root_project_id="1" qualifier="TRK"/>
+  <resource_index id="3" kee="ruts" position="2" name_size="6" resource_id="1" root_project_id="1" qualifier="TRK"/>
+  <resource_index id="4" kee="uts" position="3" name_size="6" resource_id="1" root_project_id="1" qualifier="TRK"/>
 </dataset>
\ No newline at end of file
diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldReindexProjectAfterRenaming.xml b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldReindexProjectAfterRenaming.xml
index fae54763976..b499760cfd5 100644
--- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldReindexProjectAfterRenaming.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldReindexProjectAfterRenaming.xml
@@ -8,9 +8,9 @@
   <snapshots purge_status="[null]" id="1" islast="[true]" root_project_id="1" project_id="1" scope="PRJ" qualifier="TRK"/>
 
   <!-- the index is on the old name "Struts" but not on "Apache Struts -->
-  <resource_index kee="struts" position="0" name_size="6" resource_id="1" root_project_id="1" qualifier="TRK"/>
-  <resource_index kee="truts" position="1" name_size="6" resource_id="1" root_project_id="1" qualifier="TRK"/>
-  <resource_index kee="ruts" position="2" name_size="6" resource_id="1" root_project_id="1" qualifier="TRK"/>
-  <resource_index kee="uts" position="3" name_size="6" resource_id="1" root_project_id="1" qualifier="TRK"/>
+  <resource_index id="1" kee="struts" position="0" name_size="6" resource_id="1" root_project_id="1" qualifier="TRK"/>
+  <resource_index id="2" kee="truts" position="1" name_size="6" resource_id="1" root_project_id="1" qualifier="TRK"/>
+  <resource_index id="3" kee="ruts" position="2" name_size="6" resource_id="1" root_project_id="1" qualifier="TRK"/>
+  <resource_index id="4" kee="uts" position="3" name_size="6" resource_id="1" root_project_id="1" qualifier="TRK"/>
 
 </dataset>
diff --git a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldReindexResource.xml b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldReindexResource.xml
index 4292af5708d..89a3a8c465d 100644
--- a/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldReindexResource.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/resource/ResourceIndexerDaoTest/shouldReindexResource.xml
@@ -1,6 +1,6 @@
 <dataset>
-  <resource_index kee="struts" position="0" name_size="6" resource_id="1" root_project_id="1" qualifier="TRK"/>
-  <resource_index kee="truts" position="1" name_size="6" resource_id="1" root_project_id="1" qualifier="TRK"/>
-  <resource_index kee="ruts" position="2" name_size="6" resource_id="1" root_project_id="1" qualifier="TRK"/>
-  <resource_index kee="uts" position="3" name_size="6" resource_id="1" root_project_id="1" qualifier="TRK"/>
+  <resource_index id="1" kee="struts" position="0" name_size="6" resource_id="1" root_project_id="1" qualifier="TRK"/>
+  <resource_index id="2" kee="truts" position="1" name_size="6" resource_id="1" root_project_id="1" qualifier="TRK"/>
+  <resource_index id="3" kee="ruts" position="2" name_size="6" resource_id="1" root_project_id="1" qualifier="TRK"/>
+  <resource_index id="4" kee="uts" position="3" name_size="6" resource_id="1" root_project_id="1" qualifier="TRK"/>
 </dataset>
\ No newline at end of file