Skip to content

Commit 1fc499b

Browse files
authored
Merge pull request #502 from jborgers/master-remove-junit-test-for-pmd7
removed all junit tests, they have been removed from PMD7
2 parents 9a7265c + 682c4e1 commit 1fc499b

File tree

2 files changed

+26
-24
lines changed

2 files changed

+26
-24
lines changed

sonar-pmd-plugin/src/main/resources/org/sonar/plugins/pmd/rules-unit-tests.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<rules>
2-
<rule key="JUnitStaticSuite">
2+
<!--NOTE: the following rules have been removed in pmd-7
3+
rule key="JUnitStaticSuite">
34
<priority>MAJOR</priority>
45
<configKey><![CDATA[rulesets/java/junit.xml/JUnitStaticSuite]]></configKey>
56
</rule>
@@ -24,8 +25,7 @@
2425
<priority>MINOR</priority>
2526
<configKey><![CDATA[rulesets/java/junit.xml/UnnecessaryBooleanAssertion]]></configKey>
2627
</rule>
27-
<!--NOTE: the following rules have been removed in pmd-7
28-
rule key="UseAssertEqualsInsteadOfAssertTrue">
28+
<rule key="UseAssertEqualsInsteadOfAssertTrue">
2929
<priority>MINOR</priority>
3030
<configKey><![CDATA[rulesets/java/junit.xml/UseAssertEqualsInsteadOfAssertTrue]]></configKey>
3131
</rule>
@@ -44,7 +44,7 @@
4444
<rule key="UseAssertTrueInsteadOfAssertEquals">
4545
<priority>MINOR</priority>
4646
<configKey><![CDATA[rulesets/java/junit.xml/UseAssertTrueInsteadOfAssertEquals]]></configKey>
47-
</rule-->
47+
</rule>
4848
<rule key="JUnitTestContainsTooManyAsserts">
4949
<priority>MAJOR</priority>
5050
<configKey><![CDATA[rulesets/java/junit.xml/JUnitTestContainsTooManyAsserts]]></configKey>
@@ -72,5 +72,5 @@
7272
<rule key="JUnit4TestShouldUseTestAnnotation">
7373
<priority>MAJOR</priority>
7474
<configKey><![CDATA[rulesets/java/migrating.xml/JUnit4TestShouldUseTestAnnotation]]></configKey>
75-
</rule>
75+
</rule-->
7676
</rules>

sonar-pmd-plugin/src/test/java/org/sonar/plugins/pmd/PmdUnitTestsRulesDefinitionTest.java

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -45,29 +45,31 @@ void test() {
4545
.hasFieldOrPropertyWithValue("language", PmdConstants.LANGUAGE_JAVA_KEY);
4646

4747
List<Rule> rules = repository.rules();
48-
//assertThat(rules).hasSize(17); NOTE: 5 rules have been removed in pmd-7
49-
assertThat(rules).hasSize(12);
48+
//assertThat(rules).hasSize(17); NOTE: all junit rules have been removed in pmd-7
49+
assertThat(rules).hasSize(0);
5050

5151
for (Rule rule : rules) {
5252
assertThat(rule.key()).isNotNull();
53+
// all junit rules have been removed in pmd-7
5354
assertThat(rule.key()).isIn(
54-
"JUnitStaticSuite",
55-
"JUnitSpelling",
56-
"JUnitAssertionsShouldIncludeMessage",
57-
"JUnitTestsShouldIncludeAssert",
58-
"TestClassWithoutTestCases",
59-
"UnnecessaryBooleanAssertion",
60-
//"UseAssertEqualsInsteadOfAssertTrue", // 5 rules have been removed in pmd-7
61-
//"UseAssertSameInsteadOfAssertTrue",
62-
//"UseAssertNullInsteadOfAssertTrue",
63-
//"SimplifyBooleanAssertion",
64-
//"UseAssertTrueInsteadOfAssertEquals",
65-
"JUnitTestContainsTooManyAsserts",
66-
"JUnit4SuitesShouldUseSuiteAnnotation",
67-
"JUnit4TestShouldUseAfterAnnotation",
68-
"JUnit4TestShouldUseBeforeAnnotation",
69-
"JUnit4TestShouldUseTestAnnotation",
70-
"JUnitUseExpected");
55+
// "JUnitStaticSuite",
56+
// "JUnitSpelling",
57+
// "JUnitAssertionsShouldIncludeMessage",
58+
// "JUnitTestsShouldIncludeAssert",
59+
// "TestClassWithoutTestCases",
60+
// "UnnecessaryBooleanAssertion",
61+
// "UseAssertEqualsInsteadOfAssertTrue",
62+
// "UseAssertSameInsteadOfAssertTrue",
63+
// "UseAssertNullInsteadOfAssertTrue",
64+
// "SimplifyBooleanAssertion",
65+
// "UseAssertTrueInsteadOfAssertEquals",
66+
// "JUnitTestContainsTooManyAsserts",
67+
// "JUnit4SuitesShouldUseSuiteAnnotation",
68+
// "JUnit4TestShouldUseAfterAnnotation",
69+
// "JUnit4TestShouldUseBeforeAnnotation",
70+
// "JUnit4TestShouldUseTestAnnotation",
71+
// "JUnitUseExpected"
72+
);
7173
assertThat(rule.internalKey()).isNotNull();
7274
assertThat(rule.name()).isNotNull();
7375
assertThat(rule.htmlDescription()).isNotNull();

0 commit comments

Comments
 (0)