You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by pv...@apache.org on 2018/10/10 07:38:25 UTC
nifi git commit: NIFI-5676: Fix a timezone-dependent test in
PutORCTest
Repository: nifi
Updated Branches:
refs/heads/master dd5032274 -> fc5c8baeb
NIFI-5676: Fix a timezone-dependent test in PutORCTest
Signed-off-by: Pierre Villard <pi...@gmail.com>
This closes #3059.
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/fc5c8bae
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/fc5c8bae
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/fc5c8bae
Branch: refs/heads/master
Commit: fc5c8baeb3c0e2fbed2cefd11752c40aa06e5783
Parents: dd50322
Author: Kotaro Terada <ko...@yahoo-corp.jp>
Authored: Tue Oct 9 14:12:53 2018 +0900
Committer: Pierre Villard <pi...@gmail.com>
Committed: Wed Oct 10 09:38:06 2018 +0200
----------------------------------------------------------------------
.../test/java/org/apache/nifi/processors/orc/PutORCTest.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/fc5c8bae/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/test/java/org/apache/nifi/processors/orc/PutORCTest.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/test/java/org/apache/nifi/processors/orc/PutORCTest.java b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/test/java/org/apache/nifi/processors/orc/PutORCTest.java
index 552544f..3cc6fba 100644
--- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/test/java/org/apache/nifi/processors/orc/PutORCTest.java
+++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/src/test/java/org/apache/nifi/processors/orc/PutORCTest.java
@@ -66,6 +66,8 @@ import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.sql.Date;
import java.sql.Timestamp;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
@@ -74,6 +76,7 @@ import java.util.Calendar;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.TimeZone;
import java.util.function.BiFunction;
import static org.junit.Assert.assertEquals;
@@ -247,7 +250,9 @@ public class PutORCTest {
assertEquals((int) currUser, ((IntWritable) x.get(0)).get());
assertEquals(timeMillis, ((IntWritable) x.get(1)).get());
assertEquals(timestampMillis, ((TimestampWritableV2) x.get(2)).getTimestamp().toSqlTimestamp());
- assertEquals(dt.toLocalDate().toEpochDay(), ((DateWritableV2) x.get(3)).get().toEpochDay());
+ final DateFormat noTimeOfDayDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ noTimeOfDayDateFormat.setTimeZone(TimeZone.getTimeZone("gmt"));
+ assertEquals(noTimeOfDayDateFormat.format(dt), ((DateWritableV2) x.get(3)).get().toString());
assertEquals(dec, ((DoubleWritable) x.get(4)).get(), Double.MIN_VALUE);
return null;
}