From ce5574b3f4fc9748e7b8ffd0fc784a5a23281502 Mon Sep 17 00:00:00 2001 From: Roman Ivanov Date: Thu, 23 Jun 2016 06:41:32 -0700 Subject: [PATCH] minor: fix for IntelijIdea inspection violations --- .../checks/UniquePropertiesCheckTest.java | 2 +- .../filters/SuppressElementTest.java | 32 +++++++++++-------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/UniquePropertiesCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/UniquePropertiesCheckTest.java index db098c38d..2486d0510 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/UniquePropertiesCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/UniquePropertiesCheckTest.java @@ -114,7 +114,7 @@ public class UniquePropertiesCheckTest extends BaseFileSetCheckTestSupport { getPath("InputUniquePropertiesCheckNotExisting.properties"); final File file = new File(fileName); final SortedSet messages = - check.process(file, Collections.emptyList()); + check.process(file, Collections.emptyList()); assertEquals("Wrong messages count: " + messages.size(), 1, messages.size()); final LocalizedMessage message = messages.iterator().next(); diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressElementTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressElementTest.java index 21aea966c..921a12cb4 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressElementTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressElementTest.java @@ -21,6 +21,7 @@ package com.puppycrawl.tools.checkstyle.filters; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertTrue; import org.junit.Before; @@ -160,27 +161,32 @@ public class SuppressElementTest { @Test public void testEquals() { + // filterBased is used instead of filter field only to satisfy IntelijIdea Inspection + // Inspection "Arguments to assertEquals() in wrong order " + final SuppressElement filterBased = new SuppressElement("Test"); + filterBased.setChecks("Test"); + final SuppressElement filter2 = new SuppressElement("Test"); filter2.setChecks("Test"); - assertEquals("filter, filter2", filter, filter2); + assertEquals("filter, filter2", filterBased, filter2); final SuppressElement filter3 = new SuppressElement("Test"); filter3.setChecks("Test3"); - assertFalse("filter, filter3", filter.equals(filter3)); - filter.setColumns("1-10"); - assertFalse("filter, filter2", filter.equals(filter2)); + assertNotEquals("filter, filter3", filterBased, filter3); + filterBased.setColumns("1-10"); + assertNotEquals("filter, filter2", filterBased, filter2); filter2.setColumns("1-10"); - assertEquals("filter, filter2", filter, filter2); - filter.setColumns(null); - assertFalse("filter, filter2", filter.equals(filter2)); + assertEquals("filter, filter2", filterBased, filter2); + filterBased.setColumns(null); + assertNotEquals("filter, filter2", filterBased, filter2); filter2.setColumns(null); - filter.setLines("3,4"); - assertFalse("filter, filter2", filter.equals(filter2)); + filterBased.setLines("3,4"); + assertNotEquals("filter, filter2", filterBased, filter2); filter2.setLines("3,4"); - assertEquals("filter, filter2", filter, filter2); - filter.setColumns("1-10"); - assertFalse("filter, filter2", filter.equals(filter2)); + assertEquals("filter, filter2", filterBased, filter2); + filterBased.setColumns("1-10"); + assertNotEquals("filter, filter2", filterBased, filter2); filter2.setColumns("1-10"); - assertEquals("filter, filter2", filter, filter2); + assertEquals("filter, filter2", filterBased, filter2); } @Test