Skip to content

Commit

Permalink
#153 PuzzleDuplicateCheck disabled
Browse files Browse the repository at this point in the history
  • Loading branch information
Yegor Bugayenko committed Mar 11, 2014
1 parent 3687e5f commit aba30b6
Show file tree
Hide file tree
Showing 12 changed files with 28 additions and 16 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
</parent>
<groupId>com.qulice</groupId>
<artifactId>qulice</artifactId>
<version>1.0-SNAPSHOT</version>
<version>0.5.1</version>
<packaging>pom</packaging>
<name>qulice</name>
<modules>
Expand Down
2 changes: 1 addition & 1 deletion qulice-checkstyle/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<parent>
<groupId>com.qulice</groupId>
<artifactId>qulice</artifactId>
<version>1.0-SNAPSHOT</version>
<version>0.5.1</version>
</parent>
<artifactId>qulice-checkstyle</artifactId>
<packaging>jar</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
import com.puppycrawl.tools.checkstyle.api.AbstractFileSetCheck;
import java.io.File;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.concurrent.ConcurrentSkipListSet;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.commons.lang3.StringUtils;
Expand Down Expand Up @@ -71,7 +71,8 @@ public final class PuzzleDuplicateCheck extends AbstractFileSetCheck {
/**
* All seen puzzle texts.
*/
private final transient Collection<String> puzzles = new HashSet<String>();
private final transient Collection<String> puzzles =
new ConcurrentSkipListSet<String>();

@Override
@SuppressWarnings("PMD.AvoidInstantiatingObjectsInLoops")
Expand All @@ -90,7 +91,10 @@ public void processFiltered(final File file, final List<String> lines) {
if (this.puzzles.contains(text.toString())) {
this.log(
pos + 1,
"@todo With this description already exists in project"
String.format(
"@todo \"%s\" already exists in the project",
text.toString()
)
);
} else {
this.puzzles.add(text.toString());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -376,9 +376,11 @@
<module name="com.qulice.checkstyle.PuzzleFormatCheck">
<property name="fileExtensions" value="java"/>
</module>
<!--
<module name="com.qulice.checkstyle.PuzzleDuplicateCheck">
<property name="fileExtensions" value="java"/>
</module>
-->
<module name="com.qulice.checkstyle.ImportCohesionCheck">
<property name="fileExtensions" value="java"/>
</module>
Expand Down
2 changes: 1 addition & 1 deletion qulice-codenarc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<parent>
<groupId>com.qulice</groupId>
<artifactId>qulice</artifactId>
<version>1.0-SNAPSHOT</version>
<version>0.5.1</version>
</parent>
<artifactId>qulice-codenarc</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion qulice-findbugs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<parent>
<groupId>com.qulice</groupId>
<artifactId>qulice</artifactId>
<version>1.0-SNAPSHOT</version>
<version>0.5.1</version>
</parent>
<artifactId>qulice-findbugs</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion qulice-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<parent>
<groupId>com.qulice</groupId>
<artifactId>qulice</artifactId>
<version>1.0-SNAPSHOT</version>
<version>0.5.1</version>
</parent>
<artifactId>qulice-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ public void test() {

/**
* Test method.
* @todo #123 First
* second
*/
public final void foreach() {
for (String txt : new String[] {"test"}) {
Expand All @@ -15,8 +17,8 @@ public final void foreach() {

/**
* Missing final in catch.
* @todo #123 Make this better
* in multiple lines.
* @todo #123 First
* second
*/
public final void catchFinal() {
try {
Expand Down
10 changes: 7 additions & 3 deletions qulice-maven-plugin/src/it/checkstyle-violations/verify.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,12 @@ assert log.text.contains('Tabs.java[4]: Line contains a tab character. (FileTabC
assert log.text.contains('tabs.txt[1]: Line contains a tab character. (FileTabCharacterCheck)')
assert log.text.findAll('Brackets.java.*(HeaderCheck)').empty
assert log.text.contains('Brackets.java[58]: Closing bracket should be on a new line (BracketsStructureCheck)')
assert log.text.contains('Violations.java[11]: Parameter txt should be final. (FinalParametersCheck)')
assert log.text.contains('Violations.java[24]: Parameter ex should be final. (FinalParametersCheck)')
assert log.text.contains('Violations.java[13]: Parameter txt should be final. (FinalParametersCheck)')
assert log.text.contains('Violations.java[26]: Parameter ex should be final. (FinalParametersCheck)')
assert log.text.contains('NewLines.java[4]: Lines in file should end with Unix-like end of line')
assert log.text.contains('newlines.txt[3]: Lines in file should end with Unix-like end of line')
assert log.text.findAll('todo With this description already exists in project .PuzzleDuplicateCheck.').size() == 1
// @todo #1 PuzzleDuplicateCheck doesn't work, for some reason. In order to make
// it working we should enable the next line, and add a validation to
// ChecksTest in qulice-checkstyle module. Besides that, don't forget to
// enable it again in checks.xml
// assert log.text.findAll('Violations.java[20]: @todo "First second" already exists in the project').size() == 1
2 changes: 1 addition & 1 deletion qulice-pmd/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<parent>
<groupId>com.qulice</groupId>
<artifactId>qulice</artifactId>
<version>1.0-SNAPSHOT</version>
<version>0.5.1</version>
</parent>
<artifactId>qulice-pmd</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion qulice-spi/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<parent>
<groupId>com.qulice</groupId>
<artifactId>qulice</artifactId>
<version>1.0-SNAPSHOT</version>
<version>0.5.1</version>
</parent>
<artifactId>qulice-spi</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion qulice-xml/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<parent>
<groupId>com.qulice</groupId>
<artifactId>qulice</artifactId>
<version>1.0-SNAPSHOT</version>
<version>0.5.1</version>
</parent>
<artifactId>qulice-xml</artifactId>
<packaging>jar</packaging>
Expand Down

0 comments on commit aba30b6

Please sign in to comment.