From 1b59d03bd6769ccfd1ea53d8572a3e0b4ee6d712 Mon Sep 17 00:00:00 2001 From: Kevin222004 Date: Fri, 7 Oct 2022 20:27:10 +0530 Subject: [PATCH] Issue #12266: Resolve Pitest suppression for OperatorWrapCheck --- .../pitest-whitespace-suppressions.xml | 18 ---------------- .../whitespace/OperatorWrapCheckTest.java | 9 ++++++++ .../operatorwrap/InputOperatorWrapEol.java | 2 +- ...putOperatorWrapWithTrimOptionProperty.java | 21 +++++++++++++++++++ 4 files changed, 31 insertions(+), 19 deletions(-) create mode 100644 src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/operatorwrap/InputOperatorWrapWithTrimOptionProperty.java diff --git a/.ci/pitest-suppressions/pitest-whitespace-suppressions.xml b/.ci/pitest-suppressions/pitest-whitespace-suppressions.xml index 8c241d861ca..6f8eca5e5d0 100644 --- a/.ci/pitest-suppressions/pitest-whitespace-suppressions.xml +++ b/.ci/pitest-suppressions/pitest-whitespace-suppressions.xml @@ -108,24 +108,6 @@ option = PadOption.valueOf(optionStr.trim().toUpperCase(Locale.ENGLISH)); - - OperatorWrapCheck.java - com.puppycrawl.tools.checkstyle.checks.whitespace.OperatorWrapCheck - setOption - org.pitest.mutationtest.engine.gregor.mutators.experimental.NakedReceiverMutator - replaced call to java/lang/String::toUpperCase with receiver - option = WrapOption.valueOf(optionStr.trim().toUpperCase(Locale.ENGLISH)); - - - - OperatorWrapCheck.java - com.puppycrawl.tools.checkstyle.checks.whitespace.OperatorWrapCheck - setOption - org.pitest.mutationtest.engine.gregor.mutators.experimental.NakedReceiverMutator - replaced call to java/lang/String::trim with receiver - option = WrapOption.valueOf(optionStr.trim().toUpperCase(Locale.ENGLISH)); - - ParenPadCheck.java com.puppycrawl.tools.checkstyle.checks.whitespace.ParenPadCheck diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/OperatorWrapCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/OperatorWrapCheckTest.java index b2ff7c5725e..af08c8f2173 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/OperatorWrapCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/OperatorWrapCheckTest.java @@ -183,4 +183,13 @@ public void testInvalidOption() throws Exception { } } + @Test + public void testTrimOptionProperty() throws Exception { + final String[] expected = { + "18:21: " + getCheckMessage(MSG_LINE_PREVIOUS, ":"), + "19:21: " + getCheckMessage(MSG_LINE_PREVIOUS, "?"), + }; + verifyWithInlineConfigParser( + getPath("InputOperatorWrapWithTrimOptionProperty.java"), expected); + } } diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/operatorwrap/InputOperatorWrapEol.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/operatorwrap/InputOperatorWrapEol.java index d508c5a035c..ab4e8caa45a 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/operatorwrap/InputOperatorWrapEol.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/operatorwrap/InputOperatorWrapEol.java @@ -1,6 +1,6 @@ /* OperatorWrap -option = EOL +option = eol tokens = ASSIGN,COLON,LAND,LOR,STAR,QUESTION diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/operatorwrap/InputOperatorWrapWithTrimOptionProperty.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/operatorwrap/InputOperatorWrapWithTrimOptionProperty.java new file mode 100644 index 00000000000..d2d40db59e8 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/whitespace/operatorwrap/InputOperatorWrapWithTrimOptionProperty.java @@ -0,0 +1,21 @@ +/* +OperatorWrap +option = \tEOL +tokens = QUESTION, COLON, EQUAL, NOT_EQUAL, DIV, PLUS, MINUS, STAR, MOD, \ + SR, BSR, GE, GT, SL, LE, LT, BXOR, BOR, LOR, BAND, LAND, TYPE_EXTENSION_AND, \ + LITERAL_INSTANCEOF + + +*/ + +package com.puppycrawl.tools.checkstyle.checks.whitespace.operatorwrap; + +public class InputOperatorWrapWithTrimOptionProperty { + + int x = (1 < 2) ? // ok + false ? "".substring(0, + 0).length() + : false // violation '':' should be on the previous line.' + ? 2 : 3 : 4; // violation ''?' should be on the previous line.' + +}