Skip to content

Commit 2743c5e

Browse files
Atharv3221romani
Atharv3221
authored and
romani
committed
Issue #17845: Resolved error-prone violations
1 parent b53d245 commit 2743c5e

15 files changed

Lines changed: 85 additions & 82 deletions

‎src/test/java/com/puppycrawl/tools/checkstyle/IndentationTrailingCommentsVerticalAlignmentTest.java‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,8 @@ public void testTrailingCommentsAlignment(Path testFile) throws IOException {
9494
else {
9595
assertWithMessage("Trailing comment alignment mismatch in file: "
9696
+ testFile + " on line " + (idx + 1))
97-
.that(actualStartIndex).isEqualTo(expectedStartIndex);
97+
.that(actualStartIndex)
98+
.isEqualTo(expectedStartIndex);
9899
}
99100
}
100101
}
@@ -104,21 +105,22 @@ public void testTrailingCommentsAlignment(Path testFile) throws IOException {
104105
private static Stream<Path> indentationTestFiles() {
105106
final Path resourcesDir = Path.of("src", "test", "resources");
106107
final Path indentationDir = resourcesDir.resolve(INDENTATION_TEST_FILES_PATH);
107-
108-
Stream<Path> testFiles;
109-
try {
110-
testFiles = Files.walk(indentationDir)
108+
Stream<Path> result;
109+
try (Stream<Path> testFiles = Files.walk(indentationDir)) {
110+
final List<Path> collected = testFiles
111111
.filter(path -> {
112-
final String fileName = path.getFileName().toString();
113-
return fileName.startsWith("InputIndentation")
112+
final String fileName = path.getFileName().toString();
113+
return fileName.startsWith("InputIndentation")
114114
&& fileName.endsWith(".java");
115-
}
116-
);
115+
}).toList();
116+
result = collected.stream();
117117
}
118118
catch (IOException exception) {
119-
assertWithMessage("Failed to find indentation test files").fail();
120-
testFiles = Stream.empty();
119+
assertWithMessage("Failed to find indentation test files")
120+
.that(exception)
121+
.isNull();
122+
result = Stream.empty();
121123
}
122-
return testFiles;
124+
return result;
123125
}
124126
}

‎src/test/java/com/puppycrawl/tools/checkstyle/PropertyCacheFileTest.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import java.util.Comparator;
3939
import java.util.HashSet;
4040
import java.util.Iterator;
41+
import java.util.List;
4142
import java.util.Locale;
4243
import java.util.Properties;
4344
import java.util.Set;
@@ -52,6 +53,7 @@
5253
import org.junit.jupiter.params.provider.ValueSource;
5354
import org.mockito.MockedStatic;
5455

56+
import com.google.common.base.Splitter;
5557
import com.google.common.io.BaseEncoding;
5658
import com.google.common.io.ByteStreams;
5759
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
@@ -534,16 +536,16 @@ private static void deleteDirectoryRecursively(Path directory) throws IOExceptio
534536
public void testPutNonExistentExternalResource(String rawMessages) throws Exception {
535537
final String uniqueFileName = "junit_" + UUID.randomUUID() + ".java";
536538
final File cacheFile = new File(temporaryFolder, uniqueFileName);
537-
final String[] messages = rawMessages.split(";");
539+
final List<String> messages = Splitter.on(';').splitToList(rawMessages);
538540
// We mock getUriByFilename method of CommonUtil to guarantee that it will
539541
// throw CheckstyleException with the specific content.
540542
try (MockedStatic<CommonUtil> commonUtil = mockStatic(CommonUtil.class)) {
541-
final int numberOfRuns = messages.length;
543+
final int numberOfRuns = messages.size();
542544
final String[] configHashes = new String[numberOfRuns];
543545
final String[] externalResourceHashes = new String[numberOfRuns];
544546
for (int i = 0; i < numberOfRuns; i++) {
545547
commonUtil.when(() -> CommonUtil.getUriByFilename(any(String.class)))
546-
.thenThrow(new CheckstyleException(messages[i]));
548+
.thenThrow(new CheckstyleException(messages.get(i)));
547549
final Configuration config = new DefaultConfiguration("myConfig");
548550
final PropertyCacheFile cache = new PropertyCacheFile(config, cacheFile.getPath());
549551
cache.load();
@@ -579,7 +581,7 @@ public void testPutNonExistentExternalResource(String rawMessages) throws Except
579581
assertWithMessage("Invalid config hash")
580582
.that(configHashes[0])
581583
.isEqualTo(configHashes[1]);
582-
final boolean sameException = messages[0].equals(messages[1]);
584+
final boolean sameException = messages.get(0).equals(messages.get(1));
583585
assertWithMessage("Invalid external resource hashes")
584586
.that(externalResourceHashes[0].equals(externalResourceHashes[1]))
585587
.isEqualTo(sameException);

‎src/test/java/com/puppycrawl/tools/checkstyle/ant/CheckstyleAntTaskTest.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@
4545
import org.apache.tools.ant.types.resources.FileResource;
4646
import org.junit.jupiter.api.Test;
4747

48+
import com.google.common.base.Splitter;
49+
import com.google.common.collect.Iterables;
4850
import com.google.common.truth.StandardSubjectBuilder;
4951
import com.puppycrawl.tools.checkstyle.AbstractPathTestSupport;
5052
import com.puppycrawl.tools.checkstyle.DefaultLogger;
@@ -634,7 +636,8 @@ public final void testSarifOutput() throws IOException {
634636
final StandardSubjectBuilder assertWithMessage =
635637
assertWithMessage("Content of file with violations differs from expected");
636638
if (line.trim().startsWith("\"uri\"")) {
637-
final String expectedPathEnd = line.split("\\*\\*")[1];
639+
final String expectedPathEnd = Iterables.get(
640+
Splitter.on("**").split(line), 1);
638641
// normalize windows path
639642
final String actualLine = actual.get(lineNumber).replaceAll("\\\\", "/");
640643
assertWithMessage

‎src/test/java/com/puppycrawl/tools/checkstyle/checks/AvoidEscapedUnicodeCharactersCheckTest.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,14 @@
2323
import static com.puppycrawl.tools.checkstyle.checks.AvoidEscapedUnicodeCharactersCheck.MSG_KEY;
2424

2525
import java.util.Arrays;
26+
import java.util.List;
2627
import java.util.regex.Matcher;
2728
import java.util.regex.Pattern;
2829
import java.util.stream.IntStream;
2930

3031
import org.junit.jupiter.api.Test;
3132

33+
import com.google.common.base.Splitter;
3234
import com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport;
3335
import com.puppycrawl.tools.checkstyle.api.TokenTypes;
3436
import com.puppycrawl.tools.checkstyle.internal.utils.TestUtil;
@@ -531,11 +533,11 @@ public void testNonPrintableCharsAreSorted() {
531533
}
532534

533535
// Verifying character order
534-
final String[] expressionParts = expression.split("\\|");
536+
final List<String> expressionParts = Splitter.on("|").splitToList(expression);
535537
final Pattern unicodeCharPattern = Pattern.compile("^\\\\\\\\u[\\dA-F]{4}$");
536538
String lastChar = null;
537-
for (int i = 0; i < expressionParts.length; i++) {
538-
final String currentChar = expressionParts[i];
539+
for (int i = 0; i < expressionParts.size(); i++) {
540+
final String currentChar = expressionParts.get(i);
539541
final Matcher matcher = unicodeCharPattern.matcher(currentChar);
540542
if (!matcher.matches()) {
541543
final String message = "Character '" + currentChar + "' (at position " + i

‎src/test/java/com/puppycrawl/tools/checkstyle/checks/indentation/IndentationCheckTest.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,8 @@ private void verifyWarns(Configuration config, String filePath,
201201
verify(config, filePath, expected, linesWithWarn);
202202
assertWithMessage("Expected warning count in UT does not match warn comment count "
203203
+ "in input file")
204-
.that(expected.length)
205-
.isEqualTo(linesWithWarn.length);
204+
.that(linesWithWarn.length)
205+
.isEqualTo(expected.length);
206206
}
207207

208208
private void verify(Configuration config, String filePath, String[] expected,
@@ -4150,7 +4150,7 @@ private IndentComment(Matcher match, int lineNumber) {
41504150
warning = match.group(5) != null;
41514151
}
41524152

4153-
public String[] getExpectedMessages() {
4153+
private String[] getExpectedMessages() {
41544154
final String[] expectedMessages;
41554155
if (expectedWarning.contains(",")) {
41564156
expectedMessages = new String[] {
@@ -4175,27 +4175,27 @@ private String getExpectedMessagePostfix(final String messageKey) {
41754175
return msg.substring(indexOfMsgPostfix);
41764176
}
41774177

4178-
public int getLineNumber() {
4178+
private int getLineNumber() {
41794179
return lineNumber;
41804180
}
41814181

4182-
public int getIndent() {
4182+
private int getIndent() {
41834183
return indent;
41844184
}
41854185

4186-
public int getIndentOffset() {
4186+
private int getIndentOffset() {
41874187
return indentOffset;
41884188
}
41894189

4190-
public boolean isExpectedNonStrict() {
4190+
private boolean isExpectedNonStrict() {
41914191
return expectedNonStrict;
41924192
}
41934193

4194-
public String getExpectedWarning() {
4194+
private String getExpectedWarning() {
41954195
return expectedWarning;
41964196
}
41974197

4198-
public boolean isWarning() {
4198+
private boolean isWarning() {
41994199
return warning;
42004200
}
42014201

‎src/test/java/com/puppycrawl/tools/checkstyle/grammar/GeneratedJavaTokenTypesTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -785,8 +785,8 @@ public void testTokenHasBeenAddedToTokensBlockInLexerGrammar() {
785785
+ " lexer grammar.";
786786

787787
assertWithMessage(message)
788-
.that(expectedNumberOfUsedTokens)
789-
.isEqualTo(lastIndexOfSublist);
788+
.that(lastIndexOfSublist)
789+
.isEqualTo(expectedNumberOfUsedTokens);
790790
}
791791

792792
/**

‎src/test/java/com/puppycrawl/tools/checkstyle/gui/MainFrameTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public void testOpenNonExistentFile() throws IOException {
107107
public void testChangeMode() {
108108
final JComboBox<MainFrameModel.ParseMode> modesCombobox =
109109
findComponentComboBoxByName(mainFrame, "modesCombobox");
110-
modesCombobox.setSelectedIndex(MainFrameModel.ParseMode.JAVA_WITH_COMMENTS.ordinal());
110+
modesCombobox.setSelectedItem(MainFrameModel.ParseMode.JAVA_WITH_COMMENTS);
111111
final MainFrameModel model = TestUtil.getInternalState(mainFrame,
112112
"model", MainFrameModel.class);
113113
final MainFrameModel.ParseMode parseMode = TestUtil.getInternalState(model,

‎src/test/java/com/puppycrawl/tools/checkstyle/internal/AllChecksTest.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040

4141
import org.junit.jupiter.api.Test;
4242

43+
import com.google.common.base.Splitter;
4344
import com.puppycrawl.tools.checkstyle.AbstractModuleTestSupport;
4445
import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
4546
import com.puppycrawl.tools.checkstyle.Definitions;
@@ -260,8 +261,9 @@ public class AllChecksTest extends AbstractModuleTestSupport {
260261
"ELLIPSIS").collect(Collectors.toUnmodifiableSet()));
261262
INTERNAL_MODULES = Definitions.INTERNAL_MODULES.stream()
262263
.map(moduleName -> {
263-
final String[] packageTokens = moduleName.split("\\.");
264-
return packageTokens[packageTokens.length - 1];
264+
final List<String> packageTokens = Splitter
265+
.on(".").splitToList(moduleName);
266+
return packageTokens.get(packageTokens.size() - 1);
265267
})
266268
.collect(Collectors.toUnmodifiableSet());
267269
}

‎src/test/java/com/puppycrawl/tools/checkstyle/internal/ArchUnitSuperClassTest.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,10 +137,11 @@ public void check(JavaClass item, ConditionEvents events) {
137137
if (superclassOptional.isPresent()) {
138138
final JavaClass superclass = superclassOptional.get().toErasure();
139139
if (!superclass.isEquivalentTo(expectedSuperclass)) {
140-
final String format = "<%s> is subclass of <%s> instead of <%s>";
141-
final String message = String
142-
.format(Locale.ROOT, format, item.getFullName(), superclass.getFullName(),
143-
expectedSuperclass.getName());
140+
final String message = String.format(Locale.ROOT,
141+
"<%s> is subclass of <%s> instead of <%s>",
142+
item.getFullName(),
143+
superclass.getFullName(),
144+
expectedSuperclass.getName());
144145
events.add(SimpleConditionEvent.violated(item, message));
145146
}
146147
}

‎src/test/java/com/puppycrawl/tools/checkstyle/internal/CommitValidationTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
import static com.google.common.truth.Truth.assertWithMessage;
2323

2424
import java.io.IOException;
25+
import java.util.ArrayList;
2526
import java.util.Collections;
2627
import java.util.Iterator;
27-
import java.util.LinkedList;
2828
import java.util.List;
2929
import java.util.Spliterator;
3030
import java.util.Spliterators;
@@ -270,7 +270,7 @@ private static List<RevCommit> getCommitsToCheck() throws Exception {
270270
}
271271

272272
private static List<RevCommit> filterValidCommits(List<RevCommit> revCommits) {
273-
final List<RevCommit> filteredCommits = new LinkedList<>();
273+
final List<RevCommit> filteredCommits = new ArrayList<>();
274274
for (RevCommit commit : revCommits) {
275275
final String commitAuthor = commit.getAuthorIdent().getName();
276276
if (!USERS_EXCLUDED_FROM_VALIDATION.contains(commitAuthor)) {
@@ -326,7 +326,7 @@ private static List<RevCommit> getCommitsByCounter(
326326

327327
private static List<RevCommit> getCommitsByLastCommitAuthor(
328328
Iterator<RevCommit> previousCommitsIterator) {
329-
final List<RevCommit> commits = new LinkedList<>();
329+
final List<RevCommit> commits = new ArrayList<>();
330330

331331
if (previousCommitsIterator.hasNext()) {
332332
final RevCommit lastCommit = previousCommitsIterator.next();
@@ -392,11 +392,11 @@ private RevCommitsPair(Iterator<RevCommit> first, Iterator<RevCommit> second) {
392392
this.second = second;
393393
}
394394

395-
public Iterator<RevCommit> getFirst() {
395+
private Iterator<RevCommit> getFirst() {
396396
return first;
397397
}
398398

399-
public Iterator<RevCommit> getSecond() {
399+
private Iterator<RevCommit> getSecond() {
400400
return second;
401401
}
402402

0 commit comments

Comments
 (0)