Merge pull request #1323 from vl4ds4m/test-repair

Fixing tests

Author: yegor256

qulice-checkstyle/src/test/resources/com/qulice/checkstyle/ChecksTest/CurlyBracketsStructureCheck/violations.txt

@@ -1,12 +1,12 @@
+15:Closing bracket should be on a new line
+18:Closing bracket should be on a new line
+19:Parameters should start on a new line
+23:Closing bracket should be on a new line
+28:Closing bracket should be on a new line
+31:Closing bracket should be on a new line
+32:Parameters should start on a new line
+36:Closing bracket should be on a new line
 41:Closing bracket should be on a new line
 44:Closing bracket should be on a new line
 45:Parameters should start on a new line
 49:Closing bracket should be on a new line
-54:Closing bracket should be on a new line
-57:Closing bracket should be on a new line
-58:Parameters should start on a new line
-62:Closing bracket should be on a new line
-67:Closing bracket should be on a new line
-70:Closing bracket should be on a new line
-71:Parameters should start on a new line
-75:Closing bracket should be on a new line

qulice-checkstyle/src/test/resources/com/qulice/checkstyle/ChecksTest/MethodsOrderCheck/violations.txt

@@ -1,5 +1,5 @@
-42:Wrong method declaration order
-44:Wrong method declaration order
-55:Wrong method declaration order
-57:Wrong method declaration order
-72:Wrong method declaration order
+16:Wrong method declaration order
+18:Wrong method declaration order
+29:Wrong method declaration order
+31:Wrong method declaration order
+46:Wrong method declaration order

qulice-checkstyle/src/test/resources/com/qulice/checkstyle/ChecksTest/ProhibitNonFinalClassesCheck/violations.txt

@@ -1,2 +1,2 @@
-37:Classes should be final
-40:Classes should be final
+11:Classes should be final
+14:Classes should be final

qulice-checkstyle/src/test/resources/com/qulice/checkstyle/ChecksTest/ProhibitUnusedPrivateConstructorCheck/violations.txt

@@ -1 +1 @@
-45:Unused private constructor.
+19:Unused private constructor.

qulice-checkstyle/src/test/resources/com/qulice/checkstyle/ChecksTest/ProtectedMethodInFinalClassCheck/violations.txt

@@ -1,4 +1,4 @@
-39:Final class should not contain protected methods
-41:Final class should not contain protected methods
-44:Final class should not contain protected methods
-52:Protected method is overriding default scoped method
+13:Final class should not contain protected methods
+15:Final class should not contain protected methods
+18:Final class should not contain protected methods
+26:Protected method is overriding default scoped method

qulice-maven-plugin/src/it/checkstyle-violations/verify.groovy

@@ -6,14 +6,14 @@
 
 def log = new File(basedir, 'build.log')
 assert log.text.findAll('.*Brackets.java.*BracketsStructureCheck').size() == 4
-assert log.text.contains('Tabs.java[34]: Line contains a tab character. (FileTabCharacterCheck)')
+assert log.text.contains('Tabs.java[8]: Line contains a tab character. (FileTabCharacterCheck)')
 assert log.text.findAll('Brackets.java.*(HeaderCheck)').empty
 //assert log.text.contains('Violations.java[6]: This method must be static, because it does not refer to "this"')
-assert log.text.contains('Brackets.java[54]: Closing bracket should be on a new line (BracketsStructureCheck)')
-assert log.text.contains('Violations.java[44]: Parameter txt should be final. (FinalParametersCheck)')
-assert log.text.contains('Violations.java[55]: Parameter ex should be final. (FinalParametersCheck)')
-assert log.text.contains('Violations.java[63]: ArrayList should be initialized with a size parameter')
-assert log.text.contains('Violations.java[64]: ArrayList should be initialized with a size parameter')
+assert log.text.contains('Brackets.java[28]: Closing bracket should be on a new line (BracketsStructureCheck)')
+assert log.text.contains('Violations.java[18]: Parameter txt should be final. (FinalParametersCheck)')
+assert log.text.contains('Violations.java[29]: Parameter ex should be final. (FinalParametersCheck)')
+assert log.text.contains('Violations.java[37]: ArrayList should be initialized with a size parameter')
+assert log.text.contains('Violations.java[38]: ArrayList should be initialized with a size parameter')
 assert !log.text.contains('Got an exception - java.lang.NullPointerException')
 assert log.text.findAll('SomeTest.java .+ (JavadocMethodCheck)').isEmpty()
 assert !log.text.contains('IndentationChecks.java[49]: method call rparen at indentation level 12')

qulice-pmd/src/test/java/com/qulice/pmd/LocalVariableCouldBeFinalRuleTest.java

@@ -29,7 +29,7 @@ void detectLocalVariableCouldBeFinal() throws Exception {
             new StringStartsWith(
                 String.join(
                     " ",
-                    "PMD: LocalVariableCouldBeFinal.java[36-36]:",
+                    "PMD: LocalVariableCouldBeFinal.java[10-10]:",
                     "Local variable 'nonfinal' could be declared final",
                     "(LocalVariableCouldBeFinal)"
                 )

qulice-pmd/src/test/java/com/qulice/pmd/UnusedImportsRuleTest.java

@@ -29,7 +29,7 @@ void detectUnusedImportLine() throws Exception {
             new StringStartsWith(
                 String.join(
                     " ",
-                    "PMD: UnusedImports.java[33-33]: Unused import",
+                    "PMD: UnusedImports.java[7-7]: Unused import",
                     "'unused.bar.foo.UnusedImport'",
                     "(UnnecessaryImport)"
                 ).trim()

qulice-pmd/src/test/java/com/qulice/pmd/UseStringIsEmptyRuleTest.java

@@ -40,11 +40,11 @@ final class UseStringIsEmptyRuleTest {
     void detectLengthComparisons(final String file) throws Exception {
         new PmdAssert(
             file, new IsEqual<>(false),
-            new CombinableMatcher<>(containsMatcher(file, 46))
-                .and(containsMatcher(file, 50))
-                .and(containsMatcher(file, 54))
-                .and(containsMatcher(file, 58))
-                .and(containsMatcher(file, 62))
+            new CombinableMatcher<>(containsMatcher(file, 20))
+                .and(containsMatcher(file, 24))
+                .and(containsMatcher(file, 28))
+                .and(containsMatcher(file, 32))
+                .and(containsMatcher(file, 36))
         ).validate();
     }