SONAR-11631 Replace codePeriodVersion with buildString

8 files changed, 109 insertions, 86 deletions

diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/component/SnapshotDto.java b/server/sonar-db-dao/src/main/java/org/sonar/db/component/SnapshotDto.java
index d6c8766fc2e..7cdbdba7c51 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/component/SnapshotDto.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/component/SnapshotDto.java
@@ -24,6 +24,7 @@ import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
 
 import static com.google.common.base.Preconditions.checkArgument;
+import static org.apache.commons.lang.StringUtils.trimToNull;
 
 public final class SnapshotDto {
 
@@ -33,6 +34,7 @@ public final class SnapshotDto {
   public static final String STATUS_UNPROCESSED = "U";
   public static final String STATUS_PROCESSED = "P";
   public static final int MAX_VERSION_LENGTH = 100;
+  public static final int MAX_BUILD_STRING_LENGTH = 100;
 
   private Long id;
   private String uuid;
@@ -41,7 +43,7 @@ public final class SnapshotDto {
   private Long buildDate;
   private String status = STATUS_UNPROCESSED;
   private Boolean last;
-  private String codePeriodVersion;
+  // maps to "version" column in the table
   private String projectVersion;
   private String buildString;
   private String periodMode;
@@ -102,36 +104,15 @@ public final class SnapshotDto {
     return this;
   }
 
-  /**
-   * Version is only available on projects and modules
-   */
-  @CheckForNull
-  public String getCodePeriodVersion() {
-    return codePeriodVersion;
-  }
-
-  public SnapshotDto setCodePeriodVersion(@Nullable String codePeriodVersion) {
-    checkVersion(codePeriodVersion, "codePeriodVersion");
-    this.codePeriodVersion = codePeriodVersion;
-    return this;
-  }
-
-  private static void checkVersion(@Nullable String version, String versionLabel) {
-    if (version != null) {
-      checkArgument(version.length() <= MAX_VERSION_LENGTH,
-        "%s length (%s) is longer than the maximum authorized (%s). '%s' was provided.", versionLabel, version.length(), MAX_VERSION_LENGTH, version);
+  private static void checkLength(int maxLength, @Nullable String s, String label) {
+    if (s != null) {
+      checkArgument(s.length() <= maxLength,
+        "%s length (%s) is longer than the maximum authorized (%s). '%s' was provided.", label, s.length(), maxLength, s);
     }
   }
 
-  /**
-   * Used by MyBatis
-   */
-  private void setRawCodePeriodVersion(@Nullable String codePeriodVersion) {
-    this.codePeriodVersion = codePeriodVersion;
-  }
-
   public SnapshotDto setProjectVersion(@Nullable String projectVersion) {
-    checkVersion(projectVersion, "projectVersion");
+    checkLength(MAX_VERSION_LENGTH, projectVersion, "projectVersion");
     this.projectVersion = projectVersion;
     return this;
   }
@@ -145,7 +126,7 @@ public final class SnapshotDto {
    * Used by MyBatis
    */
   private void setRawProjectVersion(@Nullable String projectVersion) {
-    this.projectVersion = projectVersion;
+    this.projectVersion = trimToNull(projectVersion);
   }
 
   @CheckForNull
@@ -154,10 +135,18 @@ public final class SnapshotDto {
   }
 
   public SnapshotDto setBuildString(@Nullable String buildString) {
+    checkLength(MAX_BUILD_STRING_LENGTH, buildString, "buildString");
     this.buildString = buildString;
     return this;
   }
 
+  /**
+   * Used by MyBatis
+   */
+  private void setRawBuildString(@Nullable String buildString) {
+    this.buildString = trimToNull(buildString);
+  }
+
   public SnapshotDto setPeriodMode(@Nullable String p) {
     periodMode = p;
     return this;
@@ -216,8 +205,8 @@ public final class SnapshotDto {
       Objects.equals(buildDate, that.buildDate) &&
       Objects.equals(status, that.status) &&
       Objects.equals(last, that.last) &&
-      Objects.equals(codePeriodVersion, that.codePeriodVersion) &&
       Objects.equals(projectVersion, that.projectVersion) &&
+      Objects.equals(buildString, that.buildString) &&
       Objects.equals(periodMode, that.periodMode) &&
       Objects.equals(periodParam, that.periodParam) &&
       Objects.equals(periodDate, that.periodDate);
@@ -225,7 +214,7 @@ public final class SnapshotDto {
 
   @Override
   public int hashCode() {
-    return Objects.hash(id, uuid, componentUuid, createdAt, buildDate, status, last, codePeriodVersion, projectVersion, periodMode, periodParam, periodDate);
+    return Objects.hash(id, uuid, componentUuid, createdAt, buildDate, status, last, projectVersion, buildString, periodMode, periodParam, periodDate);
   }
 
   @Override
@@ -238,8 +227,8 @@ public final class SnapshotDto {
       ", buildDate=" + buildDate +
       ", status='" + status + '\'' +
       ", last=" + last +
-      ", codePeriodVersion='" + codePeriodVersion + '\'' +
       ", projectVersion='" + projectVersion + '\'' +
+      ", buildString='" + buildString + '\'' +
       ", periodMode='" + periodMode + '\'' +
       ", periodParam='" + periodParam + '\'' +
       ", periodDate=" + periodDate +
diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/component/SnapshotQuery.java b/server/sonar-db-dao/src/main/java/org/sonar/db/component/SnapshotQuery.java
index 4b11d588913..89b54eeb7cb 100644
--- a/server/sonar-db-dao/src/main/java/org/sonar/db/component/SnapshotQuery.java
+++ b/server/sonar-db-dao/src/main/java/org/sonar/db/component/SnapshotQuery.java
@@ -46,7 +46,7 @@ public final class SnapshotQuery {
   private Long createdAfter;
   private Long createdBefore;
   private String status;
-  private String codePeriodVersion;
+  private String projectVersion;
   private Boolean isLast;
   private String sortField;
   private String sortOrder;
@@ -108,12 +108,12 @@ public final class SnapshotQuery {
   }
 
   @CheckForNull
-  public String getCodePeriodVersion() {
-    return codePeriodVersion;
+  public String getProjectVersion() {
+    return projectVersion;
   }
 
-  public SnapshotQuery setCodePeriodVersion(@Nullable String codePeriodVersion) {
-    this.codePeriodVersion = codePeriodVersion;
+  public SnapshotQuery setProjectVersion(@Nullable String projectVersion) {
+    this.projectVersion = projectVersion;
     return this;
   }
 
diff --git a/server/sonar-db-dao/src/main/resources/org/sonar/db/component/SnapshotMapper.xml b/server/sonar-db-dao/src/main/resources/org/sonar/db/component/SnapshotMapper.xml
index 15fd8261549..7c760b5d5df 100644
--- a/server/sonar-db-dao/src/main/resources/org/sonar/db/component/SnapshotMapper.xml
+++ b/server/sonar-db-dao/src/main/resources/org/sonar/db/component/SnapshotMapper.xml
@@ -10,8 +10,7 @@
     s.build_date as buildDate,
     s.status as status,
     s.islast as last,
-    s.version as rawCodePeriodVersion,
-    s.project_version as rawProjectVersion,
+    s.version as rawProjectVersion,
     s.build_string as buildString,
     s.period1_mode as periodMode,
     s.period1_param as periodParam,
@@ -73,8 +72,8 @@
       <if test="query.status != null">
         AND s.status=#{query.status,jdbcType=VARCHAR}
       </if>
-      <if test="query.codePeriodVersion != null">
-        AND s.version=#{query.codePeriodVersion,jdbcType=VARCHAR}
+      <if test="query.projectVersion != null">
+        AND s.version=#{query.projectVersion,jdbcType=VARCHAR}
       </if>
       <if test="query.isLast != null">
         AND s.islast=#{query.isLast}
@@ -152,7 +151,7 @@
 
   <update id="update" parameterType="Snapshot">
     update snapshots
-    set version = #{codePeriodVersion, jdbcType=VARCHAR},
+    set version = #{projectVersion, jdbcType=VARCHAR},
         status = #{status, jdbcType=VARCHAR}
     where uuid = #{uuid,jdbcType=VARCHAR}
   </update>
@@ -166,7 +165,6 @@
       status,
       islast,
       version,
-      project_version,
       build_string,
       period1_mode,
       period1_param,
@@ -179,7 +177,6 @@
       #{buildDate, jdbcType=BIGINT},
       #{status, jdbcType=VARCHAR},
       #{last, jdbcType=BOOLEAN},
-      #{codePeriodVersion, jdbcType=VARCHAR},
       #{projectVersion, jdbcType=VARCHAR},
       #{buildString, jdbcType=VARCHAR},
       #{periodMode, jdbcType=VARCHAR},
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/component/SnapshotDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/component/SnapshotDaoTest.java
index 8041a7b6e60..62592fb6d82 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/component/SnapshotDaoTest.java
+++ b/server/sonar-db-dao/src/test/java/org/sonar/db/component/SnapshotDaoTest.java
@@ -19,14 +19,19 @@
  */
 package org.sonar.db.component;
 
+import com.tngtech.java.junit.dataprovider.DataProvider;
+import com.tngtech.java.junit.dataprovider.DataProviderRunner;
+import com.tngtech.java.junit.dataprovider.UseDataProvider;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Optional;
+import javax.annotation.Nullable;
 import org.apache.commons.lang.StringUtils;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
+import org.junit.runner.RunWith;
 import org.sonar.api.utils.DateUtils;
 import org.sonar.api.utils.System2;
 import org.sonar.db.DbClient;
@@ -43,6 +48,7 @@ import static java.util.Collections.singletonList;
 import static org.apache.commons.lang.RandomStringUtils.randomAlphanumeric;
 import static org.apache.commons.lang.math.RandomUtils.nextLong;
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
 import static org.assertj.core.groups.Tuple.tuple;
 import static org.sonar.db.ce.CeActivityDto.Status.CANCELED;
 import static org.sonar.db.ce.CeActivityDto.Status.SUCCESS;
@@ -54,6 +60,7 @@ import static org.sonar.db.component.SnapshotQuery.SORT_ORDER.ASC;
 import static org.sonar.db.component.SnapshotQuery.SORT_ORDER.DESC;
 import static org.sonar.db.component.SnapshotTesting.newAnalysis;
 
+@RunWith(DataProviderRunner.class)
 public class SnapshotDaoTest {
 
   @Rule
@@ -76,8 +83,8 @@ public class SnapshotDaoTest {
       .setPeriodMode("days")
       .setPeriodParam("30")
       .setPeriodDate(1500000000001L)
-      .setCodePeriodVersion("2.1-SNAPSHOT")
-      .setProjectVersion("2.1.0.2336")
+      .setProjectVersion("2.1.0")
+      .setBuildString("2.1.0.2336")
       .setBuildDate(1500000000006L)
       .setCreatedAt(1403042400000L));
 
@@ -87,14 +94,13 @@ public class SnapshotDaoTest {
     assertThat(result.getComponentUuid()).isEqualTo(project.uuid());
     assertThat(result.getStatus()).isEqualTo("P");
     assertThat(result.getLast()).isTrue();
-    assertThat(result.getCodePeriodVersion()).isEqualTo("2.1-SNAPSHOT");
-    assertThat(result.getProjectVersion()).isEqualTo("2.1.0.2336");
+    assertThat(result.getProjectVersion()).isEqualTo("2.1.0");
+    assertThat(result.getBuildString()).isEqualTo("2.1.0.2336");
     assertThat(result.getPeriodMode()).isEqualTo("days");
     assertThat(result.getPeriodModeParameter()).isEqualTo("30");
     assertThat(result.getPeriodDate()).isEqualTo(1500000000001L);
     assertThat(result.getBuildDate()).isEqualTo(1500000000006L);
     assertThat(result.getCreatedAt()).isEqualTo(1403042400000L);
-    assertThat(result.getCodePeriodVersion()).isEqualTo("2.1-SNAPSHOT");
 
     assertThat(underTest.selectByUuid(db.getSession(), "DOES_NOT_EXIST").isPresent()).isFalse();
   }
@@ -152,14 +158,14 @@ public class SnapshotDaoTest {
     assertThat(underTest.selectAnalysesByQuery(db.getSession(), new SnapshotQuery())).hasSize(6);
 
     assertThat(underTest.selectAnalysesByQuery(db.getSession(), new SnapshotQuery().setComponentUuid("ABCD").setSort(BY_DATE, ASC)))
-      .extracting(SnapshotDto::getId, SnapshotDto::getCodePeriodVersion, SnapshotDto::getProjectVersion)
+      .extracting(SnapshotDto::getId, SnapshotDto::getProjectVersion, SnapshotDto::getBuildString)
       .containsOnly(
         tuple(1L, "2.0-SNAPSHOT", "2.0.0.2363"),
         tuple(2L, "2.1-SNAPSHOT", "2.1.0.11"),
         tuple(3L, "2.2-SNAPSHOT", "2.2.0.8869")
       );
     assertThat(underTest.selectAnalysesByQuery(db.getSession(), new SnapshotQuery().setComponentUuid("ABCD").setSort(BY_DATE, DESC)))
-      .extracting(SnapshotDto::getId, SnapshotDto::getCodePeriodVersion, SnapshotDto::getProjectVersion)
+      .extracting(SnapshotDto::getId, SnapshotDto::getProjectVersion, SnapshotDto::getBuildString)
       .containsOnly(
         tuple(3L, "2.2-SNAPSHOT", "2.2.0.8869"),
         tuple(2L, "2.1-SNAPSHOT", "2.1.0.11"),
@@ -300,7 +306,7 @@ public class SnapshotDaoTest {
       .setPeriodMode("days")
       .setPeriodParam("30")
       .setPeriodDate(1500000000001L)
-      .setCodePeriodVersion("2.1-SNAPSHOT")
+      .setProjectVersion("2.1-SNAPSHOT")
       .setBuildDate(1500000000006L)
       .setCreatedAt(1403042400000L));
 
@@ -314,8 +320,36 @@ public class SnapshotDaoTest {
     assertThat(dto.getPeriodDate()).isEqualTo(1500000000001L);
     assertThat(dto.getBuildDate()).isEqualTo(1500000000006L);
     assertThat(dto.getCreatedAt()).isEqualTo(1403042400000L);
-    assertThat(dto.getCodePeriodVersion()).isEqualTo("2.1-SNAPSHOT");
+    assertThat(dto.getProjectVersion()).isEqualTo("2.1-SNAPSHOT");
+  }
+
+  @Test
+  @UseDataProvider("nullAndEmptyNonEmptyStrings")
+  public void insert_with_null_and_empty_and_non_empty_projectVersion(@Nullable String projectVersion) {
+    ComponentDto project = db.components().insertPrivateProject();
+
+    SnapshotDto dto = underTest.insert(db.getSession(), newAnalysis(project).setProjectVersion(projectVersion));
 
+    assertThat(dto.getProjectVersion()).isEqualTo(projectVersion);
+  }
+
+  @Test
+  @UseDataProvider("nullAndEmptyNonEmptyStrings")
+  public void insert_with_null_and_empty_and_non_empty_buildString(@Nullable String buildString) {
+    ComponentDto project = db.components().insertPrivateProject();
+
+    SnapshotDto dto = underTest.insert(db.getSession(), newAnalysis(project).setBuildString(buildString));
+
+    assertThat(dto.getBuildString()).isEqualTo(buildString);
+  }
+
+  @DataProvider
+  public static Object[][] nullAndEmptyNonEmptyStrings() {
+    return new Object[][] {
+      {null},
+      {""},
+      {randomAlphanumeric(7)},
+    };
   }
 
   @Test
@@ -386,31 +420,17 @@ public class SnapshotDaoTest {
     db.commit();
     analysis
       .setComponentUuid("P42")
-      .setCodePeriodVersion("5.6.3")
+      .setProjectVersion("5.6.3")
       .setStatus(STATUS_UNPROCESSED);
 
     underTest.update(dbSession, analysis);
 
     SnapshotDto result = underTest.selectByUuid(dbSession, "A1").get();
-    assertThat(result.getCodePeriodVersion()).isEqualTo("5.6.3");
+    assertThat(result.getProjectVersion()).isEqualTo("5.6.3");
     assertThat(result.getStatus()).isEqualTo(STATUS_UNPROCESSED);
     assertThat(result.getComponentUuid()).isEqualTo("P1");
   }
 
-  @Test
-  public void snashotDto_can_hold_version_larger_than_100_read_from_database() {
-    SnapshotDto analysis = insertAnalysis("P1", "A1", STATUS_PROCESSED, false);
-    db.commit();
-    String tooLongVersion = StringUtils.repeat("d", 200);
-    db.executeUpdateSql("update snapshots set version='" + tooLongVersion + "' where uuid='" + analysis.getUuid() + "'");
-    db.commit();
-
-    assertThat(underTest.selectByUuid(dbSession, analysis.getUuid())
-      .map(SnapshotDto::getCodePeriodVersion))
-        .contains(tooLongVersion);
-
-  }
-
   private SnapshotDto insertAnalysis(String projectUuid, String uuid, String status, boolean isLastFlag) {
     SnapshotDto snapshot = newAnalysis(newPrivateProjectDto(OrganizationTesting.newOrganizationDto(), projectUuid))
       .setLast(isLastFlag)
@@ -432,7 +452,7 @@ public class SnapshotDaoTest {
       .setComponentUuid("uuid_3")
       .setStatus("P")
       .setLast(true)
-      .setCodePeriodVersion("2.1-SNAPSHOT")
+      .setProjectVersion("2.1-SNAPSHOT")
       .setPeriodMode("days1")
       .setPeriodParam("30")
       .setPeriodDate(1_500_000_000_001L)
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/component/SnapshotDtoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/component/SnapshotDtoTest.java
index bc5eaa6a8a8..7ce0746dac1 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/component/SnapshotDtoTest.java
+++ b/server/sonar-db-dao/src/test/java/org/sonar/db/component/SnapshotDtoTest.java
@@ -39,7 +39,8 @@ public class SnapshotDtoTest {
       .setBuildDate(parseDate("2014-07-02").getTime())
       .setComponentUuid("uuid_21")
       .setLast(true)
-      .setCodePeriodVersion("1.0")
+      .setProjectVersion("1.0")
+      .setBuildString("1.0.1.123")
       .setPeriodMode("mode1")
       .setPeriodParam("param1")
       .setPeriodDate(parseDate("2014-06-01").getTime());
@@ -48,24 +49,40 @@ public class SnapshotDtoTest {
     assertThat(snapshotDto.getBuildDate()).isEqualTo(parseDate("2014-07-02").getTime());
     assertThat(snapshotDto.getComponentUuid()).isEqualTo("uuid_21");
     assertThat(snapshotDto.getLast()).isTrue();
-    assertThat(snapshotDto.getCodePeriodVersion()).isEqualTo("1.0");
+    assertThat(snapshotDto.getProjectVersion()).isEqualTo("1.0");
+    assertThat(snapshotDto.getBuildString()).isEqualTo("1.0.1.123");
     assertThat(snapshotDto.getPeriodMode()).isEqualTo("mode1");
     assertThat(snapshotDto.getPeriodModeParameter()).isEqualTo("param1");
     assertThat(snapshotDto.getPeriodDate()).isEqualTo(parseDate("2014-06-01").getTime());
   }
 
   @Test
-  public void fail_if_version_name_is_longer_then_100_characters() {
+  public void fail_if_projectVersion_is_longer_then_100_characters() {
     SnapshotDto snapshotDto = new SnapshotDto();
-    snapshotDto.setCodePeriodVersion(null);
-    snapshotDto.setCodePeriodVersion("1.0");
-    snapshotDto.setCodePeriodVersion(repeat("a", 100));
+    snapshotDto.setProjectVersion(null);
+    snapshotDto.setProjectVersion("1.0");
+    snapshotDto.setProjectVersion(repeat("a", 100));
 
     expectedException.expect(IllegalArgumentException.class);
-    expectedException.expectMessage("codePeriodVersion" +
+    expectedException.expectMessage("projectVersion" +
       " length (101) is longer than the maximum authorized (100). " +
       "'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' was provided.");
 
-    snapshotDto.setCodePeriodVersion(repeat("a", 101));
+    snapshotDto.setProjectVersion(repeat("a", 101));
+  }
+
+  @Test
+  public void fail_if_buildString_is_longer_then_100_characters() {
+    SnapshotDto snapshotDto = new SnapshotDto();
+    snapshotDto.setBuildString(null);
+    snapshotDto.setBuildString("1.0");
+    snapshotDto.setBuildString(repeat("a", 100));
+
+    expectedException.expect(IllegalArgumentException.class);
+    expectedException.expectMessage("buildString" +
+      " length (101) is longer than the maximum authorized (100). " +
+      "'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' was provided.");
+
+    snapshotDto.setBuildString(repeat("a", 101));
   }
 }
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/component/SnapshotQueryTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/component/SnapshotQueryTest.java
index 95ab68f9107..2faa3bba864 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/component/SnapshotQueryTest.java
+++ b/server/sonar-db-dao/src/test/java/org/sonar/db/component/SnapshotQueryTest.java
@@ -33,7 +33,7 @@ public class SnapshotQueryTest {
       .setComponentUuid("abcd")
       .setIsLast(true)
       .setStatus("P")
-      .setCodePeriodVersion("1.0")
+      .setProjectVersion("1.0")
       .setCreatedAfter(10L)
       .setCreatedBefore(20L)
       .setSort(BY_DATE, ASC);
@@ -41,7 +41,7 @@ public class SnapshotQueryTest {
     assertThat(query.getComponentUuid()).isEqualTo("abcd");
     assertThat(query.getIsLast()).isTrue();
     assertThat(query.getStatus()).isEqualTo("P");
-    assertThat(query.getCodePeriodVersion()).isEqualTo("1.0");
+    assertThat(query.getProjectVersion()).isEqualTo("1.0");
     assertThat(query.getCreatedAfter()).isEqualTo(10L);
     assertThat(query.getCreatedBefore()).isEqualTo(20L);
     assertThat(query.getSortField()).isEqualTo("created_at");
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/purge/PurgeDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/purge/PurgeDaoTest.java
index c772a438cd8..d9fbfce6e4f 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/purge/PurgeDaoTest.java
+++ b/server/sonar-db-dao/src/test/java/org/sonar/db/purge/PurgeDaoTest.java
@@ -399,7 +399,7 @@ public class PurgeDaoTest {
         .setComponentUuid(PROJECT_UUID)
         .setStatus(STATUS_PROCESSED)
         .setLast(false)
-        .setCodePeriodVersion("V5")
+        .setProjectVersion("V5")
     };
     db.components().insertSnapshots(analyses);
     db.events().insertEvent(EventTesting.newEvent(analyses[4])
diff --git a/server/sonar-db-dao/src/test/resources/org/sonar/db/component/SnapshotDaoTest/select_snapshots_by_query.xml b/server/sonar-db-dao/src/test/resources/org/sonar/db/component/SnapshotDaoTest/select_snapshots_by_query.xml
index 79cc26947fd..f957a9bcc64 100644
--- a/server/sonar-db-dao/src/test/resources/org/sonar/db/component/SnapshotDaoTest/select_snapshots_by_query.xml
+++ b/server/sonar-db-dao/src/test/resources/org/sonar/db/component/SnapshotDaoTest/select_snapshots_by_query.xml
@@ -47,7 +47,7 @@
              created_at="1228172400001"
              build_date="1317247200000"
              version="2.0-SNAPSHOT"
-             project_version="2.0.0.2363"
+             build_string="2.0.0.2363"
   />
   <snapshots id="2"
              uuid="u2"
@@ -73,7 +73,7 @@
              created_at="1228172400002"
              build_date="1317247200000"
              version="2.1-SNAPSHOT"
-             project_version="2.1.0.11"
+             build_string="2.1.0.11"
   />
   <snapshots id="3"
              uuid="u3"
@@ -99,7 +99,7 @@
              created_at="1228172400003"
              build_date="1317247200000"
              version="2.2-SNAPSHOT"
-             project_version="2.2.0.8869"
+             build_string="2.2.0.8869"
   />
 
   <!-- PROJECT_ID = 2 -->
@@ -148,7 +148,7 @@
              created_at="1228172400000"
              build_date="1317247200000"
              version="2.1-SNAPSHOT"
-             project_version="2.1.0.66"
+             build_string="2.1.0.66"
   />
   <!-- Unprocessed snapshot -->
   <snapshots organization_uuid="org1"
@@ -176,7 +176,7 @@
              created_at="1228172400000"
              build_date="1317247200000"
              version="2.1-SNAPSHOT"
-             project_version="2.1.0.1"
+             build_string="2.1.0.1"
   />
 
   <!-- PROJECT_ID = 3 - no last snapshot -->
@@ -225,7 +225,7 @@
              created_at="1228172400000"
              build_date="1317247200000"
              version="2.1-SNAPSHOT"
-             project_version="2.1.0.5586"
+             build_string="2.1.0.5586"
   />
 
   <!-- PROJECT_ID = 4 - no snapshot -->