This is an automated email from the ASF dual-hosted git repository. mblow pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 1c3aa58d3b034f40587dc6edf37d57fc2b3e8afb Author: Michael Blow <[email protected]> AuthorDate: Tue Oct 15 11:40:48 2019 -0400 [NO ISSUE][TEST] Default test charsets to UTF-8 only Change-Id: Ia7278fa522d484a4d686cb6436d7e2f50bd7a170 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/3765 Reviewed-by: Murtadha Hubail <[email protected]> Tested-by: Jenkins <[email protected]> Integration-Tests: Jenkins <[email protected]> --- .../org/apache/asterix/test/common/TestExecutor.java | 17 ++++++++--------- .../asterix/test/server/SqlppExecutionNCServiceIT.java | 12 ++++++++++++ 2 files changed, 20 insertions(+), 9 deletions(-) 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 af82754..15711d0 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 @@ -64,7 +64,6 @@ import java.util.concurrent.TimeoutException; import java.util.function.Predicate; import java.util.regex.Matcher; import java.util.regex.Pattern; -import java.util.stream.Collectors; import java.util.stream.Stream; import org.apache.asterix.api.http.server.QueryServiceServlet; @@ -173,7 +172,7 @@ public class TestExecutor { private static List<InetSocketAddress> ncEndPointsList = new ArrayList<>(); private static Map<String, InetSocketAddress> replicationAddress; - private final List<Charset> allCharsets; + private List<Charset> allCharsets; private final Queue<Charset> charsetsRemaining = new ArrayDeque<>(); /* @@ -199,10 +198,7 @@ public class TestExecutor { public TestExecutor(List<InetSocketAddress> endpoints) { this.endpoints = endpoints; - 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()); + this.allCharsets = Collections.singletonList(UTF_8); } public void setLibrarian(IExternalUDFLibrarian librarian) { @@ -669,9 +665,12 @@ public class TestExecutor { responseCharset, responseCodeValidator, cancellable); } - public synchronized void setAvailableCharsets(Charset... charsets) { - allCharsets.clear(); - allCharsets.addAll(Arrays.asList(charsets)); + public void setAvailableCharsets(Charset... charsets) { + setAvailableCharsets(Arrays.asList(charsets)); + } + + public synchronized void setAvailableCharsets(List<Charset> charsets) { + allCharsets = charsets; charsetsRemaining.clear(); } diff --git a/asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/SqlppExecutionNCServiceIT.java b/asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/SqlppExecutionNCServiceIT.java index 88ada80..47e6f80 100644 --- a/asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/SqlppExecutionNCServiceIT.java +++ b/asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/SqlppExecutionNCServiceIT.java @@ -15,10 +15,14 @@ package org.apache.asterix.test.server; import java.io.File; +import java.nio.charset.Charset; import java.util.ArrayList; import java.util.Collection; +import java.util.stream.Collectors; +import java.util.stream.Stream; import org.apache.asterix.testframework.context.TestCaseContext; +import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; @@ -38,6 +42,14 @@ public class SqlppExecutionNCServiceIT extends AbstractExecutionIT { return testArgs; } + @BeforeClass + public static void setup() { + testExecutor.setAvailableCharsets(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())); + } + protected static Collection<Object[]> buildTestsInXml(String xmlfile) throws Exception { Collection<Object[]> testArgs = new ArrayList<Object[]>(); TestCaseContext.Builder b = new TestCaseContext.Builder();
