Fix test on Oracle and MySQL

diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/db/ComponentLinkDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/db/ComponentLinkDaoTest.java
index 9c0c4b21fe61a19476f126eb76bd5f57f7bda60d..d1586ef2db41c39c2170cdf3e63c6447c3cda867 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/component/db/ComponentLinkDaoTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/component/db/ComponentLinkDaoTest.java
@@ -31,6 +31,7 @@ import org.sonar.core.persistence.DbTester;
 import org.sonar.test.DbTests;
 
 import java.util.List;
+import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -78,14 +79,20 @@ public class ComponentLinkDaoTest {
     dbTester.prepareDbUnit(getClass(), "empty.xml");
 
     dao.insert(session, new ComponentLinkDto()
-      .setComponentUuid("ABCD")
-      .setType("homepage")
-      .setName("Home")
-      .setHref("http://www.sonarqube.org")
+        .setComponentUuid("ABCD")
+        .setType("homepage")
+        .setName("Home")
+        .setHref("http://www.sonarqube.org")
       );
     session.commit();
 
-    dbTester.assertDbUnit(getClass(), "insert.xml", "project_links");
+    // For an unknown reason, on MySQL the id of the links is set to 2, so we can't use assertDbUnit() to check inserted values
+    Map<String, Object> result = dbTester.selectFirst("select id as \"id\", component_uuid as \"componentUuid\", link_type as \"type\", name as \"name\", href as \"href\" from project_links");
+    assertThat(result.get("id")).isNotNull();
+    assertThat(result.get("componentUuid")).isEqualTo("ABCD");
+    assertThat(result.get("type")).isEqualTo("homepage");
+    assertThat(result.get("name")).isEqualTo("Home");
+    assertThat(result.get("href")).isEqualTo("http://www.sonarqube.org");
   }
 
   @Test

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/component/db/ComponentLinkDaoTest/insert.xml b/server/sonar-server/src/test/resources/org/sonar/server/component/db/ComponentLinkDaoTest/insert.xml
deleted file mode 100644 (file)
index 8b89e72..0000000
--- a/server/sonar-server/src/test/resources/org/sonar/server/component/db/ComponentLinkDaoTest/insert.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<dataset>
-
-  <project_links id="1" component_uuid="ABCD" link_type="homepage" name="Home" href="http://www.sonarqube.org"/>
-
-</dataset>

diff --git a/sonar-core/src/main/resources/org/sonar/core/component/db/ComponentLinkMapper.xml b/sonar-core/src/main/resources/org/sonar/core/component/db/ComponentLinkMapper.xml
index a89efc62bfab5dd8cca0bf2efce64e90c104fc20..9d87b6078d728e049f195310bc6a54b9fa373845 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/core/component/db/ComponentLinkMapper.xml
+++ b/sonar-core/src/main/resources/org/sonar/core/component/db/ComponentLinkMapper.xml
@@ -24,7 +24,7 @@
     VALUES (#{componentUuid,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{href,jdbcType=VARCHAR})
   </insert>
 
-  <insert id="update" parameterType="ComponentLink" keyColumn="id" useGeneratedKeys="true" keyProperty="id">
+  <insert id="update" parameterType="ComponentLink" useGeneratedKeys="false">
     UPDATE project_links SET component_uuid=#{componentUuid,jdbcType=VARCHAR}, link_type=#{type,jdbcType=VARCHAR}, name=#{name,jdbcType=VARCHAR}, href=#{href,jdbcType=VARCHAR}
     WHERE id=#{id}
   </insert>