From ef91c907105638fe4d839dc891d3af33ba35e2a8 Mon Sep 17 00:00:00 2001 From: Stefano Baghino Date: Sat, 6 Feb 2016 22:57:33 +0100 Subject: [PATCH] [FLINK-3353] CSV-related tests may fail depending on locale --- .../test/java/org/apache/flink/test/io/CsvReaderITCase.java | 3 ++- .../flink/test/iterative/KMeansWithBroadcastSetITCase.java | 3 ++- .../flink/api/scala/io/ScalaCsvReaderWithPOJOITCase.scala | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/flink-tests/src/test/java/org/apache/flink/test/io/CsvReaderITCase.java b/flink-tests/src/test/java/org/apache/flink/test/io/CsvReaderITCase.java index 4d20b54d7925d1..e50dfd3bc7d44e 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/io/CsvReaderITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/io/CsvReaderITCase.java @@ -40,6 +40,7 @@ import java.io.File; import java.util.List; +import java.util.Locale; @RunWith(Parameterized.class) public class CsvReaderITCase extends MultipleProgramsTestBase { @@ -136,7 +137,7 @@ public void setF2(int f2) { @Override public String toString() { - return String.format("%s,%d,%.02f", f1, f2, f3); + return String.format(Locale.US, "%s,%d,%.02f", f1, f2, f3); } } } diff --git a/flink-tests/src/test/java/org/apache/flink/test/iterative/KMeansWithBroadcastSetITCase.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/KMeansWithBroadcastSetITCase.java index 8edc2aacb24bf0..7bd9934001a7b8 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/iterative/KMeansWithBroadcastSetITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/iterative/KMeansWithBroadcastSetITCase.java @@ -29,6 +29,7 @@ import org.apache.flink.test.testdata.KMeansData; import java.util.List; +import java.util.Locale; public class KMeansWithBroadcastSetITCase extends JavaProgramTestBase { @@ -83,7 +84,7 @@ public Centroid map(String c) { .map(new MapFunction() { @Override public String map(Centroid c) throws Exception { - return String.format("%d|%.2f|%.2f|", c.id, c.x, c.y); + return String.format(Locale.US, "%d|%.2f|%.2f|", c.id, c.x, c.y); } }); diff --git a/flink-tests/src/test/scala/org/apache/flink/api/scala/io/ScalaCsvReaderWithPOJOITCase.scala b/flink-tests/src/test/scala/org/apache/flink/api/scala/io/ScalaCsvReaderWithPOJOITCase.scala index eb5ee585e2c516..b2c5d0cda99e74 100644 --- a/flink-tests/src/test/scala/org/apache/flink/api/scala/io/ScalaCsvReaderWithPOJOITCase.scala +++ b/flink-tests/src/test/scala/org/apache/flink/api/scala/io/ScalaCsvReaderWithPOJOITCase.scala @@ -18,6 +18,8 @@ package org.apache.flink.api.scala.io +import java.util.Locale + import com.google.common.base.Charsets import com.google.common.io.Files import org.apache.flink.api.scala._ @@ -120,5 +122,5 @@ class POJOItem(var f1: String, var f2: Double, var f3: Int) { this("", 0.0, 0) } - override def toString: String = "%s,%.02f,%d".format(f1, f2, f3) + override def toString: String = "%s,%.02f,%d".formatLocal(Locale.US, f1, f2, f3) }