Repository: orc Updated Branches: refs/heads/branch-1.5 a67c03fdc -> ade4c5bd7
ORC-410: Fix a locale-dependent test in TestCsvReader Fixes #314 Signed-off-by: Owen O'Malley <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/orc/repo Commit: http://git-wip-us.apache.org/repos/asf/orc/commit/ade4c5bd Tree: http://git-wip-us.apache.org/repos/asf/orc/tree/ade4c5bd Diff: http://git-wip-us.apache.org/repos/asf/orc/diff/ade4c5bd Branch: refs/heads/branch-1.5 Commit: ade4c5bd7a411a38cbe1b5795f2fc95d5bd8d384 Parents: a67c03f Author: Kotaro Terada <[email protected]> Authored: Thu Sep 27 12:45:31 2018 +0900 Committer: Owen O'Malley <[email protected]> Committed: Mon Oct 1 08:51:29 2018 -0700 ---------------------------------------------------------------------- .../org/apache/orc/tools/convert/TestCsvReader.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/orc/blob/ade4c5bd/java/tools/src/test/org/apache/orc/tools/convert/TestCsvReader.java ---------------------------------------------------------------------- diff --git a/java/tools/src/test/org/apache/orc/tools/convert/TestCsvReader.java b/java/tools/src/test/org/apache/orc/tools/convert/TestCsvReader.java index ed24c1e..12a72dc 100644 --- a/java/tools/src/test/org/apache/orc/tools/convert/TestCsvReader.java +++ b/java/tools/src/test/org/apache/orc/tools/convert/TestCsvReader.java @@ -28,10 +28,12 @@ import org.apache.hadoop.hive.ql.exec.vector.TimestampColumnVector; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.orc.RecordReader; import org.apache.orc.TypeDescription; +import org.junit.After; import org.junit.Before; import org.junit.Test; import java.io.StringReader; +import java.util.Locale; import static org.apache.orc.tools.convert.ConvertTool.DEFAULT_TIMESTAMP_FORMAT; import static org.junit.Assert.assertEquals; @@ -39,12 +41,24 @@ import static org.junit.Assert.assertEquals; public class TestCsvReader { Configuration conf; + Locale defaultLocale; @Before public void openFileSystem () throws Exception { conf = new Configuration(); } + @Before + public void storeDefaultLocale() { + defaultLocale = Locale.getDefault(); + Locale.setDefault(Locale.US); + } + + @After + public void restoreDefaultLocale() { + Locale.setDefault(defaultLocale); + } + @Test public void testSimple() throws Exception { // yyyy[[-][/]]MM[[-][/]]dd[['T'][ ]]HH:mm:ss[ ][XXX][X]
