opendev/gerrit
Code Issues Proposed changes

OutputStreamQueryTest: Remove test proving equivalence to Joda time

Browse Source 
Change-Id: I72c50b8148f0d1c0174fe492be0d16deefb7e985
This commit is contained in:
Alice Kober-Sotzek
2017-09-30 14:59:35 +02:00
parent 2c2360aa03
commit 45e2d94b7b
3 changed files with 2 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gerrit-server/src/main/java/com/google/gerrit/server/query/change/OutputStreamQuery.java
View File

@@ -17,7 +17,6 @@ package com.google.gerrit.server.query.change;
import static com.google.common.base.Preconditions.checkState;
import static java.nio.charset.StandardCharsets.UTF_8;
import com.google.common.annotations.VisibleForTesting;
import com.google.gerrit.common.TimeUtil;
import com.google.gerrit.common.data.LabelTypes;
import com.google.gerrit.index.query.QueryParseException;
@@ -67,10 +66,9 @@ import org.slf4j.LoggerFactory;
*/
public class OutputStreamQuery {
private static final Logger log = LoggerFactory.getLogger(OutputStreamQuery.class);
@VisibleForTesting static final String TIMESTAMP_FORMAT = "yyyy-MM-dd HH:mm:ss zzz";
private static final DateTimeFormatter dtf =
DateTimeFormatter.ofPattern(TIMESTAMP_FORMAT)
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss zzz")
.withLocale(Locale.US)
.withZone(ZoneId.systemDefault());
@@ -409,7 +407,7 @@ public class OutputStreamQuery {
out.print('\n');
} else if (value instanceof Long && isDateField(field)) {
out.print(' ');
out.print(formatDateTime((Long) value));
out.print(dtf.format(Instant.ofEpochSecond((Long) value)));
out.print('\n');
} else if (isPrimitive(value)) {
out.print(' ');
@@ -445,11 +443,6 @@ public class OutputStreamQuery {
}
}
@VisibleForTesting
static String formatDateTime(Long value) {
return dtf.format(Instant.ofEpochSecond(value));
}
private static boolean isPrimitive(Object value) {
return value instanceof String //
|| value instanceof Number //