From 064a699b7a3843cc11be3ffd27f4f5c52ac2563c Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Fri, 20 Mar 2015 08:43:03 +0100 Subject: [PATCH] Improve memory consumption of SourceDbBenchmarkTest and fix EsUtilsTest on GMT TZ --- .../org/sonar/server/benchmark/SourceDbBenchmarkTest.java | 6 ++++-- .../src/test/java/org/sonar/server/es/EsUtilsTest.java | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) 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 1e244992e02..389c29b740f 100644 --- 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 c9f2890d349..4473a02a85e 100644 --- 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); -- 2.39.5