From 73097f55e73cd2a11812b47eb98a52fbaf4918bc Mon Sep 17 00:00:00 2001 From: Jason Tedor Date: Sat, 18 Mar 2017 11:13:59 -0400 Subject: [PATCH] Format EvilJNANativesTests to 100-column limit This commit formats EvilJNANativesTests.java to the 100-column limit and removes this file from the list of suppressions. --- .../main/resources/checkstyle_suppressions.xml | 1 - .../bootstrap/EvilJNANativesTests.java | 17 ++++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/buildSrc/src/main/resources/checkstyle_suppressions.xml b/buildSrc/src/main/resources/checkstyle_suppressions.xml index 659d31186f1..fc440eee7dd 100644 --- a/buildSrc/src/main/resources/checkstyle_suppressions.xml +++ b/buildSrc/src/main/resources/checkstyle_suppressions.xml @@ -3945,7 +3945,6 @@ - diff --git a/qa/evil-tests/src/test/java/org/elasticsearch/bootstrap/EvilJNANativesTests.java b/qa/evil-tests/src/test/java/org/elasticsearch/bootstrap/EvilJNANativesTests.java index 069f7e1aeff..3f0709f1a30 100644 --- a/qa/evil-tests/src/test/java/org/elasticsearch/bootstrap/EvilJNANativesTests.java +++ b/qa/evil-tests/src/test/java/org/elasticsearch/bootstrap/EvilJNANativesTests.java @@ -37,10 +37,13 @@ public class EvilJNANativesTests extends ESTestCase { if (Constants.LINUX) { final List lines = Files.readAllLines(PathUtils.get("/proc/self/limits")); if (!lines.isEmpty()) { - for (String line : lines) { + for (final String line : lines) { if (line != null && line.startsWith("Max processes")) { final String[] fields = line.split("\\s+"); - final long limit = "unlimited".equals(fields[2]) ? JNACLibrary.RLIM_INFINITY : Long.parseLong(fields[2]); + final long limit = + "unlimited".equals(fields[2]) + ? JNACLibrary.RLIM_INFINITY + : Long.parseLong(fields[2]); assertThat(JNANatives.MAX_NUMBER_OF_THREADS, equalTo(limit)); return; } @@ -56,18 +59,22 @@ public class EvilJNANativesTests extends ESTestCase { if (Constants.LINUX) { final List lines = Files.readAllLines(PathUtils.get("/proc/self/limits")); if (!lines.isEmpty()) { - for (String line : lines) { + for (final String line : lines) { if (line != null && line.startsWith("Max address space")) { final String[] fields = line.split("\\s+"); final String limit = fields[3]; - assertEquals(JNANatives.rlimitToString(JNANatives.MAX_SIZE_VIRTUAL_MEMORY), limit); + assertThat( + JNANatives.rlimitToString(JNANatives.MAX_SIZE_VIRTUAL_MEMORY), + equalTo(limit)); return; } } } fail("should have read max size virtual memory from /proc/self/limits"); } else if (Constants.MAC_OS_X) { - assertThat(JNANatives.MAX_SIZE_VIRTUAL_MEMORY, anyOf(equalTo(Long.MIN_VALUE), greaterThanOrEqualTo(0L))); + assertThat( + JNANatives.MAX_SIZE_VIRTUAL_MEMORY, + anyOf(equalTo(Long.MIN_VALUE), greaterThanOrEqualTo(0L))); } else { assertThat(JNANatives.MAX_SIZE_VIRTUAL_MEMORY, equalTo(Long.MIN_VALUE)); }