From 0b76ab1c78ee5dd5908b801853705e27c56b2bc6 Mon Sep 17 00:00:00 2001 From: Shashwat Jaiswal Date: Thu, 19 Aug 2021 13:04:17 +0530 Subject: [PATCH] Issue #10548: Migrate to Inline Config Parser in MatchXpathCheckTest --- .../checks/coding/MatchXpathCheckTest.java | 26 ++++++++++++------- .../coding/matchxpath/InputMatchXpath.java | 4 +-- .../coding/matchxpath/InputMatchXpath2.java | 4 +-- .../coding/matchxpath/InputMatchXpath4.java | 4 +-- .../InputMatchXpathBlockComments.java | 2 +- .../InputMatchXpathMultilineComments.java | 4 +-- 6 files changed, 26 insertions(+), 18 deletions(-) diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/MatchXpathCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/MatchXpathCheckTest.java index a387aaf10a2..031528b28a8 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/MatchXpathCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/MatchXpathCheckTest.java @@ -44,7 +44,8 @@ public void testCheckWithEmptyQuery() final DefaultConfiguration checkConfig = createModuleConfig(MatchXpathCheck.class); final String[] expected = CommonUtil.EMPTY_STRING_ARRAY; - verify(checkConfig, getPath("InputMatchXpath.java"), expected); + verifyWithInlineConfigParser(checkConfig, + getPath("InputMatchXpath.java"), expected); } @Test @@ -54,7 +55,8 @@ public void testNoStackoverflowError() createModuleConfig(MatchXpathCheck.class); checkConfig.addProperty("query", "//STRING_LITERAL[not(@text='')]"); final String[] expected = CommonUtil.EMPTY_STRING_ARRAY; - verify(checkConfig, getPath("InputMatchXpathNoStackoverflowError.java"), expected); + verifyWithInlineConfigParser(checkConfig, + getPath("InputMatchXpathNoStackoverflowError.java"), expected); } @Test @@ -64,7 +66,8 @@ public void testCheckWithImplicitEmptyQuery() createModuleConfig(MatchXpathCheck.class); checkConfig.addProperty("query", ""); final String[] expected = CommonUtil.EMPTY_STRING_ARRAY; - verify(checkConfig, getPath("InputMatchXpath2.java"), expected); + verifyWithInlineConfigParser(checkConfig, + getPath("InputMatchXpath2.java"), expected); } @Test @@ -77,7 +80,8 @@ public void testCheckWithMatchingMethodNames() "11:5: " + getCheckMessage(MatchXpathCheck.MSG_KEY), "13:5: " + getCheckMessage(MatchXpathCheck.MSG_KEY), }; - verify(checkConfig, getPath("InputMatchXpath3.java"), expected); + verifyWithInlineConfigParser(checkConfig, + getPath("InputMatchXpath3.java"), expected); } @Test @@ -88,7 +92,8 @@ public void testCheckWithNoMatchingMethodName() checkConfig.addProperty("query", "//METHOD_DEF[./IDENT[@text='wrongName' or " + "@text='nonExistingMethod']]"); final String[] expected = CommonUtil.EMPTY_STRING_ARRAY; - verify(checkConfig, getPath("InputMatchXpath4.java"), expected); + verifyWithInlineConfigParser(checkConfig, + getPath("InputMatchXpath4.java"), expected); } @Test @@ -101,7 +106,8 @@ public void testCheckWithSingleLineCommentsStartsWithSpace() throws Exception { "13:25: " + getCheckMessage(MatchXpathCheck.MSG_KEY), "14:27: " + getCheckMessage(MatchXpathCheck.MSG_KEY), }; - verify(checkConfig, getPath("InputMatchXpathSingleLineComments.java"), expected); + verifyWithInlineConfigParser(checkConfig, + getPath("InputMatchXpathSingleLineComments.java"), expected); } @Test @@ -115,7 +121,8 @@ public void testCheckWithBlockComments() throws Exception { "12:5: " + getCheckMessage(MatchXpathCheck.MSG_KEY), "14:5: " + getCheckMessage(MatchXpathCheck.MSG_KEY), }; - verify(checkConfig, getPath("InputMatchXpathBlockComments.java"), expected); + verifyWithInlineConfigParser(checkConfig, + getPath("InputMatchXpathBlockComments.java"), expected); } @Test @@ -129,7 +136,8 @@ public void testCheckWithMultilineComments() throws Exception { "14:5: " + getCheckMessage(MatchXpathCheck.MSG_KEY), "20:5: " + getCheckMessage(MatchXpathCheck.MSG_KEY), }; - verify(checkConfig, getPath("InputMatchXpathMultilineComments.java"), expected); + verifyWithInlineConfigParser(checkConfig, + getPath("InputMatchXpathMultilineComments.java"), expected); } @Test @@ -221,7 +229,7 @@ public void testAvoidInstanceCreationWithoutVar() final String[] expected = { "13:9: " + getCheckMessage(MatchXpathCheck.MSG_KEY), }; - verify(checkConfig, + verifyWithInlineConfigParser(checkConfig, getNonCompilablePath("InputMatchXpathAvoidInstanceCreationWithoutVar.java"), expected); } diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpath.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpath.java index 82509c9ed70..a7edd84e37b 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpath.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpath.java @@ -8,9 +8,9 @@ package com.puppycrawl.tools.checkstyle.checks.coding.matchxpath; public class InputMatchXpath { - public void test() { } // violation + public void test() { } - public void foo() { } // violation + public void foo() { } public void correct() { } // ok } diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpath2.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpath2.java index 19e6d503e91..d8febfbbf31 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpath2.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpath2.java @@ -8,9 +8,9 @@ package com.puppycrawl.tools.checkstyle.checks.coding.matchxpath; public class InputMatchXpath2 { - public void test() { } // violation + public void test() { } - public void foo() { } // violation + public void foo() { } public void correct() { } // ok } diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpath4.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpath4.java index b41b77f5ac6..32370b443a8 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpath4.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpath4.java @@ -8,9 +8,9 @@ package com.puppycrawl.tools.checkstyle.checks.coding.matchxpath; public class InputMatchXpath4 { - public void test() { } // violation + public void test() { } - public void foo() { } // violation + public void foo() { } public void correct() { } // ok } diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathBlockComments.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathBlockComments.java index cb32bf6f5f5..116be34da18 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathBlockComments.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathBlockComments.java @@ -1,7 +1,7 @@ /* MatchXpath query = //BLOCK_COMMENT_BEGIN[./COMMENT_CONTENT[contains(@text, '{') \ - and not(starts-with(@text, '\nMatchXpath'))]] + and not(starts-with(@text, '\\nMatchXpath'))]] */ diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathMultilineComments.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathMultilineComments.java index 2dbe4f7e63d..798cc0e4c1f 100644 --- a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathMultilineComments.java +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/coding/matchxpath/InputMatchXpathMultilineComments.java @@ -1,7 +1,7 @@ /* MatchXpath -query = //BLOCK_COMMENT_BEGIN[./COMMENT_CONTENT[contains(@text, '\n Forbidden comment\n') \ - and not(starts-with(@text, '\nMatchXpath'))]] +query = //BLOCK_COMMENT_BEGIN[./COMMENT_CONTENT[contains(@text, '\\n Forbidden comment\\n') \ + and not(starts-with(@text, '\\nMatchXpath'))]] */