TouchInstinct
/
checkstyle
306
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Coverage has been increased to 100% in TrailingCommentCheck. Issue 1290

This commit is contained in:
Ilja Dubinin 2015-07-31 00:21:21 +01:00 committed by Roman Ivanov
parent d6a255f365
commit 688d428e55
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pom.xml
View File

@ -1092,7 +1092,6 @@
<regex><pattern>.*.checks.NewlineAtEndOfFileCheck</pattern><branchRate>83</branchRate><lineRate>88</lineRate></regex>
<regex><pattern>.*.checks.OuterTypeFilenameCheck</pattern><branchRate>71</branchRate><lineRate>92</lineRate></regex>
<regex><pattern>.*.checks.SuppressWarningsHolder</pattern><branchRate>75</branchRate><lineRate>93</lineRate></regex>
<regex><pattern>.*.checks.TrailingCommentCheck</pattern><branchRate>90</branchRate><lineRate>93</lineRate></regex>
<regex><pattern>.*.checks.TranslationCheck</pattern><branchRate>81</branchRate><lineRate>83</lineRate></regex>
<regex><pattern>.*.checks.UniquePropertiesCheck\$.*</pattern><branchRate>75</branchRate><lineRate>90</lineRate></regex>

5
src/main/java/com/puppycrawl/tools/checkstyle/checks/TrailingCommentCheck.java
View File

@ -155,7 +155,7 @@ public class TrailingCommentCheck extends AbstractFormatCheck {
comment = cppComments.get(lineNo);
lineBefore = line.substring(0, comment.getStartColNo());
}
else if (cComments.containsKey(lineNo)) {
else {
final List<TextBlock> commentList = cComments.get(lineNo);
comment = commentList.get(commentList.size() - 1);
lineBefore = line.substring(0, comment.getStartColNo());
@ -168,8 +168,7 @@ public class TrailingCommentCheck extends AbstractFormatCheck {
}
}
}
if (comment != null
&& !blankLinePattern.matcher(lineBefore).find()
if (!blankLinePattern.matcher(lineBefore).find()
&& !isLegalComment(comment)) {
log(lineNo.intValue(), MSG_KEY);
}

14
src/test/java/com/puppycrawl/tools/checkstyle/checks/TrailingCommentCheckTest.java
View File

@ -21,11 +21,13 @@ package com.puppycrawl.tools.checkstyle.checks;
import static com.puppycrawl.tools.checkstyle.checks.TrailingCommentCheck.MSG_KEY;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import com.puppycrawl.tools.checkstyle.BaseCheckTestSupport;
import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
import com.puppycrawl.tools.checkstyle.api.DetailAST;
public class TrailingCommentCheckTest extends BaseCheckTestSupport {
private DefaultConfiguration checkConfig;
@ -60,4 +62,16 @@ public class TrailingCommentCheckTest extends BaseCheckTestSupport {
};
verify(checkConfig, getPath("InputTrailingComment.java"), expected);
}
@Test
public void testCallVisitToken() throws Exception {
TrailingCommentCheck check = new TrailingCommentCheck();
try {
check.visitToken(new DetailAST());
Assert.fail();
}
catch (IllegalStateException ex) {
"visitToken() shouldn't be called.".equals(ex.getMessage());
}
}
}