Merge commit 'ee67a43' from 'stabilization-f69489' into 'master'
Change-Id: I2895436bd8a0de9a467409895f5363a7e8109b80
diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java
index f621d34..4e4b760 100644
--- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java
+++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java
@@ -187,8 +187,10 @@
public TestExecutor(List<InetSocketAddress> endpoints) {
this.endpoints = endpoints;
- this.allCharsets = Charset.availableCharsets().values().stream()
- .filter(c -> canEncodeDecode(c, "\n\t\\[]{}'\"")).collect(Collectors.toList());
+ this.allCharsets = Stream
+ .of("UTF-8", "UTF-16", "UTF-16BE", "UTF-16LE", "UTF-32", "UTF-32BE", "UTF-32LE", "x-UTF-32BE-BOM",
+ "x-UTF-32LE-BOM", "x-UTF-16LE-BOM")
+ .filter(Charset::isSupported).map(Charset::forName).collect(Collectors.toList());
}
public void setLibrarian(IExternalUDFLibrarian librarian) {