From 5c863291f9978d27cdfaabb3f832271a6aa87bb0 Mon Sep 17 00:00:00 2001 From: Denes Arvay Date: Wed, 18 Nov 2020 15:02:42 +0100 Subject: [PATCH] NIFI-8023 Test failure after NIFI-7996 commit if system default TZ is CET --- .../test/java/org/apache/nifi/util/db/TestJdbcCommon.java | 4 ++-- .../src/test/java/org/apache/nifi/avro/TestAvroTypeUtil.java | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-database-utils/src/test/java/org/apache/nifi/util/db/TestJdbcCommon.java b/nifi-nar-bundles/nifi-extension-utils/nifi-database-utils/src/test/java/org/apache/nifi/util/db/TestJdbcCommon.java index bbf2bdb4a9b1..d82be05d90c6 100644 --- a/nifi-nar-bundles/nifi-extension-utils/nifi-database-utils/src/test/java/org/apache/nifi/util/db/TestJdbcCommon.java +++ b/nifi-nar-bundles/nifi-extension-utils/nifi-database-utils/src/test/java/org/apache/nifi/util/db/TestJdbcCommon.java @@ -683,7 +683,7 @@ public void testConvertToAvroStreamForDateTimeAsLogicalType() throws SQLExceptio final long millisSinceEpoch = TimeUnit.MILLISECONDS.convert(daysSinceEpoch, TimeUnit.DAYS); java.sql.Date actual = java.sql.Date.valueOf(Instant.ofEpochMilli(millisSinceEpoch).atZone(ZoneOffset.UTC).toLocalDate()); LOGGER.debug("comparing dates, expecting '{}', actual '{}'", date, actual); - assertEquals(date, actual); + assertEquals(date.toLocalDate(), actual.toLocalDate()); }, (record, time) -> { int millisSinceMidnight = (int) record.get("time"); @@ -739,7 +739,7 @@ private void testConvertToAvroStreamForDateTime( when(metadata.getColumnType(1)).thenReturn(Types.DATE); when(metadata.getColumnName(1)).thenReturn("date"); ZonedDateTime parsedDate = toZonedDateTime.apply("yyyy/MM/dd", "2017/05/10"); - final java.sql.Date date = java.sql.Date.valueOf(parsedDate.toLocalDate()); + final java.sql.Date date = new java.sql.Date(parsedDate.toInstant().toEpochMilli()); when(rs.getObject(1)).thenReturn(date); when(metadata.getColumnType(2)).thenReturn(Types.TIME); diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-avro-record-utils/src/test/java/org/apache/nifi/avro/TestAvroTypeUtil.java b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-avro-record-utils/src/test/java/org/apache/nifi/avro/TestAvroTypeUtil.java index 6cc6f4f30467..c519f3548616 100644 --- a/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-avro-record-utils/src/test/java/org/apache/nifi/avro/TestAvroTypeUtil.java +++ b/nifi-nar-bundles/nifi-extension-utils/nifi-record-utils/nifi-avro-record-utils/src/test/java/org/apache/nifi/avro/TestAvroTypeUtil.java @@ -56,6 +56,7 @@ import java.util.List; import java.util.Map; import java.util.Optional; +import java.util.TimeZone; import java.util.UUID; import java.util.stream.Collectors; @@ -483,7 +484,7 @@ public void testBytesDecimalConversion(){ @Test public void testDateConversion() { - final Calendar c = Calendar.getInstance(); + final Calendar c = Calendar.getInstance(TimeZone.getTimeZone("UTC")); c.set(2019, Calendar.JANUARY, 1, 0, 0, 0); final long epochMillis = c.getTimeInMillis(); @@ -492,7 +493,7 @@ public void testDateConversion() { dateType.addToSchema(fieldSchema); final Object convertedValue = AvroTypeUtil.convertToAvroObject(new Date(epochMillis), fieldSchema); assertTrue(convertedValue instanceof Integer); - assertEquals((int) convertedValue, LocalDate.of(2019, 1, 1).toEpochDay()); + assertEquals(LocalDate.of(2019, 1, 1).toEpochDay(), (int) convertedValue); } @Test