Improve memory consumption of SourceDbBenchmarkTest and fix EsUtilsTest on GMT TZ

diff --git a/server/sonar-server-benchmarks/src/test/java/org/sonar/server/benchmark/SourceDbBenchmarkTest.java b/server/sonar-server-benchmarks/src/test/java/org/sonar/server/benchmark/SourceDbBenchmarkTest.java
index 1e244992e02b82dde567d6d9f193bd32f03e7179..389c29b740f9d591d072151c033ef0cfc73027a8 100644 (file)
--- a/server/sonar-server-benchmarks/src/test/java/org/sonar/server/benchmark/SourceDbBenchmarkTest.java
+++ b/server/sonar-server-benchmarks/src/test/java/org/sonar/server/benchmark/SourceDbBenchmarkTest.java
@@ -116,8 +116,10 @@ public class SourceDbBenchmarkTest {
 
   private byte[] generateData() throws IOException {
     FileSourceDb.Data.Builder dataBuilder = FileSourceDb.Data.newBuilder();
+    FileSourceDb.Line.Builder lineBuilder = FileSourceDb.Line.newBuilder();
     for (int i = 1; i <= NUMBER_OF_LINES; i++) {
-      dataBuilder.addLinesBuilder()
+      lineBuilder.clear();
+      dataBuilder.addLines(lineBuilder
         .setLine(i)
         .setScmRevision("REVISION_" + i)
         .setScmAuthor("a_guy")
@@ -134,7 +136,7 @@ public class SourceDbBenchmarkTest {
         .setScmDate(1_500_000_000_000L)
         .setHighlighting("2,9,k;9,18,k")
         .addAllDuplication(Arrays.asList(19, 33, 141))
-        .build();
+        .build());
     }
     return FileSourceDto.encodeData(dataBuilder.build());
   }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/EsUtilsTest.java b/server/sonar-server/src/test/java/org/sonar/server/es/EsUtilsTest.java
index c9f2890d349baf9c2aa5b00b9301396511074e47..4473a02a85e20621df4e65cb27b26a74fb63d6e5 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/es/EsUtilsTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/es/EsUtilsTest.java
@@ -70,7 +70,7 @@ public class EsUtilsTest {
 
   @Test
   public void es_date_format() throws Exception {
-    assertThat(EsUtils.formatDateTime(new Date(1_500_000_000_000L))).startsWith("2017-07-").hasSize(29);
+    assertThat(EsUtils.formatDateTime(new Date(1_500_000_000_000L))).startsWith("2017-07-");
     assertThat(EsUtils.formatDateTime(null)).isNull();
 
     assertThat(EsUtils.parseDateTime("2017-07-14T04:40:00.000+02:00").getTime()).isEqualTo(1_500_000_000_000L);