From e45ec84a038b03cffe559c82f3721551c2530cdb Mon Sep 17 00:00:00 2001 From: Nik Everett Date: Fri, 29 Dec 2017 16:51:59 -0500 Subject: [PATCH] SQL: Fix long lines in tests (elastic/x-pack-elasticsearch#3450) We had three tests with lines > 140 characters. This reflows those lines. Original commit: elastic/x-pack-elasticsearch@71b2e5fa089369426c8d0439c875ec4a159e268a --- dev-tools/checkstyle_suppressions.xml | 3 --- .../elasticsearch/xpack/sql/execution/search/CursorTests.java | 3 ++- .../search/extractor/ProcessingHitExtractorTests.java | 4 +++- .../function/scalar/datetime/DateTimeProcessorTests.java | 3 ++- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dev-tools/checkstyle_suppressions.xml b/dev-tools/checkstyle_suppressions.xml index 8ed9353e0db..8268d58f7fd 100644 --- a/dev-tools/checkstyle_suppressions.xml +++ b/dev-tools/checkstyle_suppressions.xml @@ -44,9 +44,6 @@ - - - diff --git a/sql/server/src/test/java/org/elasticsearch/xpack/sql/execution/search/CursorTests.java b/sql/server/src/test/java/org/elasticsearch/xpack/sql/execution/search/CursorTests.java index 335c603e41f..f460105c790 100644 --- a/sql/server/src/test/java/org/elasticsearch/xpack/sql/execution/search/CursorTests.java +++ b/sql/server/src/test/java/org/elasticsearch/xpack/sql/execution/search/CursorTests.java @@ -64,7 +64,8 @@ public class CursorTests extends ESTestCase { if (randomBoolean()) { columns = new ArrayList<>(columnCount); for (int i = 0; i < columnCount; i++) { - columns.add(new SqlResponse.ColumnInfo(randomAlphaOfLength(10), randomAlphaOfLength(10), randomFrom(JDBCType.values()), randomInt(25))); + columns.add(new SqlResponse.ColumnInfo(randomAlphaOfLength(10), randomAlphaOfLength(10), + randomFrom(JDBCType.values()), randomInt(25))); } } return new SqlResponse("", columns, Collections.emptyList()); diff --git a/sql/server/src/test/java/org/elasticsearch/xpack/sql/execution/search/extractor/ProcessingHitExtractorTests.java b/sql/server/src/test/java/org/elasticsearch/xpack/sql/execution/search/extractor/ProcessingHitExtractorTests.java index dcbe0d78645..f82504986f1 100644 --- a/sql/server/src/test/java/org/elasticsearch/xpack/sql/execution/search/extractor/ProcessingHitExtractorTests.java +++ b/sql/server/src/test/java/org/elasticsearch/xpack/sql/execution/search/extractor/ProcessingHitExtractorTests.java @@ -69,7 +69,9 @@ public class ProcessingHitExtractorTests extends AbstractWireSerializingTestCase public void testGet() { String fieldName = randomAlphaOfLength(5); - ChainingProcessor extractor = new ChainingProcessor(new HitExtractorProcessor(new FieldHitExtractor(fieldName, true)), new MathProcessor(MathOperation.LOG)); + ChainingProcessor extractor = new ChainingProcessor( + new HitExtractorProcessor(new FieldHitExtractor(fieldName, true)), + new MathProcessor(MathOperation.LOG)); int times = between(1, 1000); for (int i = 0; i < times; i++) { diff --git a/sql/server/src/test/java/org/elasticsearch/xpack/sql/expression/function/scalar/datetime/DateTimeProcessorTests.java b/sql/server/src/test/java/org/elasticsearch/xpack/sql/expression/function/scalar/datetime/DateTimeProcessorTests.java index 70ccad04087..8945944e126 100644 --- a/sql/server/src/test/java/org/elasticsearch/xpack/sql/expression/function/scalar/datetime/DateTimeProcessorTests.java +++ b/sql/server/src/test/java/org/elasticsearch/xpack/sql/expression/function/scalar/datetime/DateTimeProcessorTests.java @@ -30,7 +30,8 @@ public class DateTimeProcessorTests extends AbstractWireSerializingTestCase randomFrom(DateTimeExtractor.values())), DateTimeZone.UTC); + DateTimeExtractor replaced = randomValueOtherThan(instance.extractor(), () -> randomFrom(DateTimeExtractor.values())); + return new DateTimeProcessor(replaced, DateTimeZone.UTC); } public void testApply() {