SONAR-2005: Remove the useless Findbugs rule "DMI_VACUOUS_CALL_TO_EASYMOCK_METHOD"

4 files changed, 5 insertions, 12 deletions

diff --git a/plugins/sonar-findbugs-plugin/src/main/resources/org/sonar/plugins/findbugs/profile-sonar-way-findbugs.xml b/plugins/sonar-findbugs-plugin/src/main/resources/org/sonar/plugins/findbugs/profile-sonar-way-findbugs.xml
index 4de545b9191..ffa99664c9d 100644
--- a/plugins/sonar-findbugs-plugin/src/main/resources/org/sonar/plugins/findbugs/profile-sonar-way-findbugs.xml
+++ b/plugins/sonar-findbugs-plugin/src/main/resources/org/sonar/plugins/findbugs/profile-sonar-way-findbugs.xml
@@ -956,9 +956,6 @@
     <Bug pattern="RV_ABSOLUTE_VALUE_OF_RANDOM_INT"/>
   </Match>
   <Match>
-    <Bug pattern="DMI_VACUOUS_CALL_TO_EASYMOCK_METHOD"/>
-  </Match>
-  <Match>
     <Bug pattern="FE_FLOATING_POINT_EQUALITY"/>
   </Match>
   <Match>
diff --git a/plugins/sonar-findbugs-plugin/src/main/resources/org/sonar/plugins/findbugs/rules.xml b/plugins/sonar-findbugs-plugin/src/main/resources/org/sonar/plugins/findbugs/rules.xml
index 4f5be6190c2..909109f919c 100644
--- a/plugins/sonar-findbugs-plugin/src/main/resources/org/sonar/plugins/findbugs/rules.xml
+++ b/plugins/sonar-findbugs-plugin/src/main/resources/org/sonar/plugins/findbugs/rules.xml
@@ -159,13 +159,6 @@
     <description><![CDATA[<p>This class is bigger than can be effectively handled, and was not fully analyzed for errors.
 </p>]]></description>
   </rule>
-  <rule key="DMI_VACUOUS_CALL_TO_EASYMOCK_METHOD" priority="MINOR">
-    <name><![CDATA[Correctness - Useless/vacuous call to EasyMock method]]></name>
-    <configKey><![CDATA[DMI_VACUOUS_CALL_TO_EASYMOCK_METHOD]]></configKey>
-    <category name="Reliability"/>
-    <description><![CDATA[<p>This call doesn't pass any objects to the EasyMock method, so the call doesn't do anything.
-</p>]]></description>
-  </rule>
   <rule key="DMI_SCHEDULED_THREAD_POOL_EXECUTOR_WITH_ZERO_CORE_THREADS" priority="MINOR">
     <name><![CDATA[Correctness - Creation of ScheduledThreadPoolExecutor with zero core threads]]></name>
     <configKey><![CDATA[DMI_SCHEDULED_THREAD_POOL_EXECUTOR_WITH_ZERO_CORE_THREADS]]></configKey>
diff --git a/plugins/sonar-findbugs-plugin/src/test/java/org/sonar/plugins/findbugs/FindbugsProfileImporterTest.java b/plugins/sonar-findbugs-plugin/src/test/java/org/sonar/plugins/findbugs/FindbugsProfileImporterTest.java
index b8ccd2e4b5a..9296f03613e 100644
--- a/plugins/sonar-findbugs-plugin/src/test/java/org/sonar/plugins/findbugs/FindbugsProfileImporterTest.java
+++ b/plugins/sonar-findbugs-plugin/src/test/java/org/sonar/plugins/findbugs/FindbugsProfileImporterTest.java
@@ -71,7 +71,7 @@ public class FindbugsProfileImporterTest {
     RulesProfile profile = importer.importProfile(new InputStreamReader(input), ValidationMessages.create());
     List<ActiveRule> results = profile.getActiveRules();
 
-    assertThat(results.size(), is(183));
+    assertThat(results.size(), is(182));
     assertThat(profile.getActiveRule(FindbugsConstants.REPOSITORY_KEY, "LG_LOST_LOGGER_DUE_TO_WEAK_REFERENCE"), is(notNullValue()));
   }
 
@@ -127,7 +127,7 @@ public class FindbugsProfileImporterTest {
     RulesProfile profile = importer.importProfile(new StringReader(uncorrectFindbugsXml), messages);
     List<ActiveRule> results = profile.getActiveRules();
 
-    assertThat(results.size(), is(142));
+    assertThat(results.size(), is(141));
     assertThat(messages.getWarnings().size(), is(1));
   }
 
diff --git a/plugins/sonar-findbugs-plugin/test-resources/findbugs-include.xml b/plugins/sonar-findbugs-plugin/test-resources/findbugs-include.xml
index e9a13f8b40c..56da1d47614 100644
--- a/plugins/sonar-findbugs-plugin/test-resources/findbugs-include.xml
+++ b/plugins/sonar-findbugs-plugin/test-resources/findbugs-include.xml
@@ -38,6 +38,9 @@
     <Bug pattern="SF_DEAD_STORE_DUE_TO_SWITCH_FALLTHROUGH"/>
   </Match>
   <Match>
+    <Bug pattern="SF_DEAD_STORE_DUE_TO_SWITCH_FALLTHROUGH_TO_THROW"/>
+  </Match>
+  <Match>
     <Bug pattern="EQ_COMPARETO_USE_OBJECT_EQUALS"/>
   </Match>
   <Match>