From: David Gageot Date: Mon, 17 Sep 2012 14:27:08 +0000 (+0200) Subject: Don't use anyObject() matcher X-Git-Tag: 3.3~271 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1b000a65c28f43a3242c55f91a0cc7f6a210e979;p=sonarqube.git Don't use anyObject() matcher --- diff --git a/plugins/sonar-checkstyle-plugin/src/test/java/org/sonar/plugins/checkstyle/CheckstyleExecutorTest.java b/plugins/sonar-checkstyle-plugin/src/test/java/org/sonar/plugins/checkstyle/CheckstyleExecutorTest.java index f92e2259af3..6f7f320aa71 100644 --- a/plugins/sonar-checkstyle-plugin/src/test/java/org/sonar/plugins/checkstyle/CheckstyleExecutorTest.java +++ b/plugins/sonar-checkstyle-plugin/src/test/java/org/sonar/plugins/checkstyle/CheckstyleExecutorTest.java @@ -34,7 +34,7 @@ import java.util.Locale; import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertThat; import static org.junit.internal.matchers.StringContains.containsString; -import static org.mockito.Matchers.anyObject; +import static org.mockito.Matchers.any; import static org.mockito.Matchers.argThat; import static org.mockito.Mockito.atLeast; import static org.mockito.Mockito.mock; @@ -51,8 +51,8 @@ public class CheckstyleExecutorTest { CheckstyleExecutor executor = new CheckstyleExecutor(conf, listener, getClass().getClassLoader()); executor.execute(); - verify(listener, times(1)).auditStarted((AuditEvent) anyObject()); - verify(listener, times(1)).auditFinished((AuditEvent) anyObject()); + verify(listener, times(1)).auditStarted(any(AuditEvent.class)); + verify(listener, times(1)).auditFinished(any(AuditEvent.class)); verify(listener, times(1)).fileStarted(argThat(newFilenameMatcher("Hello.java"))); verify(listener, times(1)).fileFinished(argThat(newFilenameMatcher("Hello.java"))); verify(listener, times(1)).fileStarted(argThat(newFilenameMatcher("World.java"))); @@ -77,7 +77,7 @@ public class CheckstyleExecutorTest { return new ArgumentMatcher() { @Override public boolean matches(Object o) { - AuditEvent event = (AuditEvent)o; + AuditEvent event = (AuditEvent) o; return StringUtils.endsWith(event.getFileName(), filename) && StringUtils.equals(event.getSourceName(), rule); } }; @@ -87,7 +87,7 @@ public class CheckstyleExecutorTest { return new ArgumentMatcher() { @Override public boolean matches(Object o) { - AuditEvent event = (AuditEvent)o; + AuditEvent event = (AuditEvent) o; return StringUtils.endsWith(event.getFileName(), filename); } }; @@ -101,7 +101,7 @@ public class CheckstyleExecutorTest { CheckstyleConfiguration conf = mock(CheckstyleConfiguration.class); when(conf.getCharset()).thenReturn(Charset.defaultCharset()); when(conf.getCheckstyleConfiguration()).thenReturn(CheckstyleConfiguration.toCheckstyleConfiguration(new File("test-resources/checkstyle-conf.xml"))); - when(conf.getSourceFiles()).thenReturn(Arrays.asList(new File("test-resources/Hello.java"), new File("test-resources/World.java"))); + when(conf.getSourceFiles()).thenReturn(Arrays. asList(new File("test-resources/Hello.java"), new File("test-resources/World.java"))); when(conf.getLocale()).thenReturn(Locale.ENGLISH); return conf; } diff --git a/plugins/sonar-checkstyle-plugin/src/test/java/org/sonar/plugins/checkstyle/CheckstyleProfileImporterTest.java b/plugins/sonar-checkstyle-plugin/src/test/java/org/sonar/plugins/checkstyle/CheckstyleProfileImporterTest.java index 6fffd91a7fb..61f89285662 100644 --- a/plugins/sonar-checkstyle-plugin/src/test/java/org/sonar/plugins/checkstyle/CheckstyleProfileImporterTest.java +++ b/plugins/sonar-checkstyle-plugin/src/test/java/org/sonar/plugins/checkstyle/CheckstyleProfileImporterTest.java @@ -25,7 +25,11 @@ import org.junit.Test; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; import org.sonar.api.profiles.RulesProfile; -import org.sonar.api.rules.*; +import org.sonar.api.rules.ActiveRule; +import org.sonar.api.rules.Rule; +import org.sonar.api.rules.RuleFinder; +import org.sonar.api.rules.RulePriority; +import org.sonar.api.rules.RuleQuery; import org.sonar.api.utils.ValidationMessages; import org.sonar.test.TestUtils; @@ -37,7 +41,7 @@ import static org.hamcrest.core.IsNull.nullValue; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertThat; -import static org.mockito.Matchers.anyObject; +import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -115,7 +119,8 @@ public class CheckstyleProfileImporterTest { RulesProfile profile = importer.importProfile(reader, messages); assertNotNull(profile.getActiveRuleByConfigKey("checkstyle", "Checker/JavadocPackage")); - assertThat(profile.getActiveRuleByConfigKey("checkstyle", "Checker/JavadocPackage").getRule().getKey(), is("com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocPackageCheck_12345")); + assertThat(profile.getActiveRuleByConfigKey("checkstyle", "Checker/JavadocPackage").getRule().getKey(), + is("com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocPackageCheck_12345")); assertThat(messages.getWarnings().size(), is(0)); } @@ -139,7 +144,7 @@ public class CheckstyleProfileImporterTest { private RuleFinder newRuleFinder() { RuleFinder ruleFinder = mock(RuleFinder.class); - when(ruleFinder.find((RuleQuery) anyObject())).thenAnswer(new Answer() { + when(ruleFinder.find(any(RuleQuery.class))).thenAnswer(new Answer() { public Rule answer(InvocationOnMock iom) throws Throwable { RuleQuery query = (RuleQuery) iom.getArguments()[0]; Rule rule = null; diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/CheckAlertThresholdsTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/CheckAlertThresholdsTest.java index 9d9f3088164..1843350e396 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/CheckAlertThresholdsTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/CheckAlertThresholdsTest.java @@ -92,7 +92,7 @@ public class CheckAlertThresholdsTest { decorator.decorate(project, context); - verify(context, never()).saveMeasure((Measure) anyObject()); + verify(context, never()).saveMeasure(any(Measure.class)); } @Test diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/GenerateAlertEventsTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/GenerateAlertEventsTest.java index f6ccdb668b3..ddbd9cc18e4 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/GenerateAlertEventsTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/GenerateAlertEventsTest.java @@ -38,7 +38,7 @@ import java.util.Date; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; -import static org.mockito.Matchers.anyObject; +import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.isNull; import static org.mockito.Mockito.mock; @@ -89,7 +89,7 @@ public class GenerateAlertEventsTest { @Test public void shouldCreateEventWhenWarnToError() { - when(timeMachine.getMeasures((TimeMachineQuery) anyObject())).thenReturn(Arrays.asList(newAlertStatus(Metric.Level.WARN, "desc"))); + when(timeMachine.getMeasures(any(TimeMachineQuery.class))).thenReturn(Arrays.asList(newAlertStatus(Metric.Level.WARN, "desc"))); when(context.getMeasure(CoreMetrics.ALERT_STATUS)).thenReturn(newAlertStatus(Metric.Level.ERROR, "desc")); decorator.decorate(project, context); @@ -99,7 +99,7 @@ public class GenerateAlertEventsTest { @Test public void shouldCreateEventWhenErrorToOk() { - when(timeMachine.getMeasures((TimeMachineQuery) anyObject())).thenReturn(Arrays.asList(newAlertStatus(Metric.Level.ERROR, "desc"))); + when(timeMachine.getMeasures(any(TimeMachineQuery.class))).thenReturn(Arrays.asList(newAlertStatus(Metric.Level.ERROR, "desc"))); when(context.getMeasure(CoreMetrics.ALERT_STATUS)).thenReturn(newAlertStatus(Metric.Level.OK, null)); decorator.decorate(project, context); @@ -109,7 +109,7 @@ public class GenerateAlertEventsTest { @Test public void shouldCreateEventWhenErrorToWarn() { - when(timeMachine.getMeasures((TimeMachineQuery) anyObject())).thenReturn(Arrays.asList(newAlertStatus(Metric.Level.ERROR, "desc"))); + when(timeMachine.getMeasures(any(TimeMachineQuery.class))).thenReturn(Arrays.asList(newAlertStatus(Metric.Level.ERROR, "desc"))); when(context.getMeasure(CoreMetrics.ALERT_STATUS)).thenReturn(newAlertStatus(Metric.Level.WARN, "desc")); decorator.decorate(project, context); @@ -126,7 +126,7 @@ public class GenerateAlertEventsTest { @Test public void shouldNotCreateEventWhenSameLevel() { - when(timeMachine.getMeasures((TimeMachineQuery) anyObject())).thenReturn(Arrays.asList(newAlertStatus(Metric.Level.ERROR, "desc"))); + when(timeMachine.getMeasures(any(TimeMachineQuery.class))).thenReturn(Arrays.asList(newAlertStatus(Metric.Level.ERROR, "desc"))); when(context.getMeasure(CoreMetrics.ALERT_STATUS)).thenReturn(newAlertStatus(Metric.Level.ERROR, "desc")); decorator.decorate(project, context); @@ -136,7 +136,7 @@ public class GenerateAlertEventsTest { @Test public void shouldNotCreateEventIfNoMoreAlertStatus() { - when(timeMachine.getMeasures((TimeMachineQuery) anyObject())).thenReturn(Arrays.asList(newAlertStatus(Metric.Level.ERROR, "desc"))); + when(timeMachine.getMeasures(any(TimeMachineQuery.class))).thenReturn(Arrays.asList(newAlertStatus(Metric.Level.ERROR, "desc"))); when(context.getMeasure(CoreMetrics.ALERT_STATUS)).thenReturn(null); decorator.decorate(project, context); diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ProfileEventsSensorTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ProfileEventsSensorTest.java index 8ce2c25ebf8..2eb7f73a0f8 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ProfileEventsSensorTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ProfileEventsSensorTest.java @@ -38,7 +38,6 @@ import java.util.Date; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyObject; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; import static org.mockito.Matchers.same; @@ -73,7 +72,7 @@ public class ProfileEventsSensorTest { sensor.analyse(project, context); - verify(context, never()).createEvent((Resource) anyObject(), anyString(), anyString(), anyString(), (Date) anyObject()); + verify(context, never()).createEvent(any(Resource.class), anyString(), anyString(), anyString(), any(Date.class)); } @Test @@ -98,7 +97,7 @@ public class ProfileEventsSensorTest { verify(context).createEvent(same(project), eq("Foo version 1"), eq("Foo version 1 is used instead of Bar version 1"), - same(Event.CATEGORY_PROFILE), (Date) anyObject()); + same(Event.CATEGORY_PROFILE), any(Date.class)); } @Test @@ -112,7 +111,7 @@ public class ProfileEventsSensorTest { verify(context).createEvent(same(project), eq("Foo version 2"), eq("Foo version 2 is used instead of Foo version 1"), - same(Event.CATEGORY_PROFILE), (Date) anyObject()); + same(Event.CATEGORY_PROFILE), any(Date.class)); } @Test @@ -137,7 +136,7 @@ public class ProfileEventsSensorTest { verify(context).createEvent(same(project), eq("Foo version 2"), eq("Foo version 2 is used instead of Foo version 1"), - same(Event.CATEGORY_PROFILE), (Date) anyObject()); + same(Event.CATEGORY_PROFILE), any(Date.class)); } private RulesProfile mockProfileWithVersion(int version) { diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/VersionEventsSensorTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/VersionEventsSensorTest.java index c1dbd67d4f1..a93270a2882 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/VersionEventsSensorTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/VersionEventsSensorTest.java @@ -32,7 +32,7 @@ import java.util.Date; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; -import static org.mockito.Matchers.anyObject; +import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; import static org.mockito.Matchers.isNull; @@ -65,8 +65,8 @@ public class VersionEventsSensorTest { sensor.analyse(project, context); - verify(context, never()).createEvent((Resource) anyObject(), anyString(), anyString(), anyString(), (Date) anyObject()); - verify(context, never()).deleteEvent((Event) anyObject()); + verify(context, never()).createEvent(any(Resource.class), anyString(), anyString(), anyString(), any(Date.class)); + verify(context, never()).deleteEvent(any(Event.class)); } @Test diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ViolationsDecoratorTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ViolationsDecoratorTest.java index 665b59aa721..8bffe0e33aa 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ViolationsDecoratorTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ViolationsDecoratorTest.java @@ -36,8 +36,15 @@ import org.sonar.api.test.IsRuleMeasure; import java.util.Collections; import java.util.List; -import static org.mockito.Matchers.*; -import static org.mockito.Mockito.*; +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.anyDouble; +import static org.mockito.Matchers.argThat; +import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; public class ViolationsDecoratorTest { private Rule ruleA1; @@ -63,7 +70,7 @@ public class ViolationsDecoratorTest { public void shouldCountViolations() { when(resource.getScope()).thenReturn(Scopes.PROJECT); when(context.getViolations()).thenReturn(createViolations()); - when(context.getChildrenMeasures((MeasuresFilter) anyObject())).thenReturn(Collections.emptyList()); + when(context.getChildrenMeasures(any(MeasuresFilter.class))).thenReturn(Collections. emptyList()); decorator.decorate(resource, context); @@ -77,7 +84,7 @@ public class ViolationsDecoratorTest { public void shouldNotCountViolationsIfMeasureAlreadyExists() { when(resource.getScope()).thenReturn(Scopes.PROJECT); when(context.getViolations()).thenReturn(createViolations()); - when(context.getChildrenMeasures((MeasuresFilter) anyObject())).thenReturn(Collections.emptyList()); + when(context.getChildrenMeasures(any(MeasuresFilter.class))).thenReturn(Collections. emptyList()); when(context.getMeasure(CoreMetrics.VIOLATIONS)).thenReturn(new Measure(CoreMetrics.VIOLATIONS, 3000.0)); when(context.getMeasure(CoreMetrics.MAJOR_VIOLATIONS)).thenReturn(new Measure(CoreMetrics.MAJOR_VIOLATIONS, 500.0)); @@ -91,8 +98,8 @@ public class ViolationsDecoratorTest { @Test public void shouldSaveZeroOnProjects() { when(resource.getScope()).thenReturn(Scopes.PROJECT); - when(context.getViolations()).thenReturn(Collections.emptyList()); - when(context.getChildrenMeasures((MeasuresFilter) anyObject())).thenReturn(Collections.emptyList()); + when(context.getViolations()).thenReturn(Collections. emptyList()); + when(context.getChildrenMeasures(any(MeasuresFilter.class))).thenReturn(Collections. emptyList()); decorator.decorate(resource, context); @@ -102,8 +109,8 @@ public class ViolationsDecoratorTest { @Test public void shouldSaveZeroOnDirectories() { when(resource.getScope()).thenReturn(Scopes.DIRECTORY); - when(context.getViolations()).thenReturn(Collections.emptyList()); - when(context.getChildrenMeasures((MeasuresFilter) anyObject())).thenReturn(Collections.emptyList()); + when(context.getViolations()).thenReturn(Collections. emptyList()); + when(context.getChildrenMeasures(any(MeasuresFilter.class))).thenReturn(Collections. emptyList()); decorator.decorate(resource, context); @@ -114,7 +121,7 @@ public class ViolationsDecoratorTest { public void shouldCountViolationsBySeverity() { when(resource.getScope()).thenReturn(Scopes.PROJECT); when(context.getViolations()).thenReturn(createViolations()); - when(context.getChildrenMeasures((MeasuresFilter) anyObject())).thenReturn(Collections.emptyList()); + when(context.getChildrenMeasures(any(MeasuresFilter.class))).thenReturn(Collections. emptyList()); decorator.decorate(resource, context); diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/WeightedViolationsDecoratorTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/WeightedViolationsDecoratorTest.java index 0628860fe0a..106daee27ed 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/WeightedViolationsDecoratorTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/WeightedViolationsDecoratorTest.java @@ -19,13 +19,6 @@ */ package org.sonar.plugins.core.sensors; -import static org.junit.Assert.assertThat; -import static org.mockito.Matchers.anyObject; -import static org.mockito.Matchers.argThat; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - import org.hamcrest.core.Is; import org.junit.Test; import org.sonar.api.CoreProperties; @@ -36,6 +29,13 @@ import org.sonar.api.measures.Measure; import org.sonar.api.rules.RulePriority; import org.sonar.api.test.IsMeasure; +import static org.junit.Assert.assertThat; +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.argThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + public class WeightedViolationsDecoratorTest { @Test @@ -66,7 +66,7 @@ public class WeightedViolationsDecoratorTest { decorator.start(); decorator.decorate(context); - verify(context).saveMeasure((Measure) anyObject()); + verify(context).saveMeasure(any(Measure.class)); } @Test diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/timemachine/NewCoverageFileAnalyzerTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/timemachine/NewCoverageFileAnalyzerTest.java index e3c44deea6d..8cc276ae9ea 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/timemachine/NewCoverageFileAnalyzerTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/timemachine/NewCoverageFileAnalyzerTest.java @@ -33,7 +33,7 @@ import java.util.Arrays; import java.util.Date; import java.util.List; -import static org.mockito.Matchers.anyObject; +import static org.mockito.Matchers.any; import static org.mockito.Matchers.argThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -50,7 +50,7 @@ public class NewCoverageFileAnalyzerTest { AbstractNewCoverageFileAnalyzer decorator = newDecorator(); decorator.doDecorate(context); - verify(context, never()).saveMeasure((Measure) anyObject()); + verify(context, never()).saveMeasure(any(Measure.class)); } @Test @@ -62,7 +62,7 @@ public class NewCoverageFileAnalyzerTest { AbstractNewCoverageFileAnalyzer decorator = newDecorator(); decorator.doDecorate(context); - verify(context, never()).saveMeasure((Measure) anyObject()); + verify(context, never()).saveMeasure(any(Measure.class)); } @Test diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/timemachine/ViolationPersisterDecoratorTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/timemachine/ViolationPersisterDecoratorTest.java index e9c67c5e64b..5b70cfd69c1 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/timemachine/ViolationPersisterDecoratorTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/timemachine/ViolationPersisterDecoratorTest.java @@ -35,7 +35,7 @@ import org.sonar.jpa.test.AbstractDbUnitTestCase; import java.util.Arrays; -import static org.mockito.Matchers.anyObject; +import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -54,7 +54,7 @@ public class ViolationPersisterDecoratorTest extends AbstractDbUnitTestCase { setupData("shared"); Snapshot snapshot = getSession().getSingleResult(Snapshot.class, "id", 1000); ResourcePersister resourcePersister = mock(ResourcePersister.class); - when(resourcePersister.saveResource((Project) anyObject(), eq(javaFile))).thenReturn(snapshot); + when(resourcePersister.saveResource(any(Project.class), eq(javaFile))).thenReturn(snapshot); when(resourcePersister.getSnapshot(javaFile)).thenReturn(snapshot); tracker = mock(ViolationTrackingDecorator.class); decorator = new ViolationPersisterDecorator(tracker, resourcePersister, new DefaultRuleFinder(getSessionFactory()), getSession()); diff --git a/plugins/sonar-cpd-plugin/src/test/java/org/sonar/plugins/cpd/decorators/SumDuplicationsDecoratorTest.java b/plugins/sonar-cpd-plugin/src/test/java/org/sonar/plugins/cpd/decorators/SumDuplicationsDecoratorTest.java index 1b84b1aa166..070d4b7376a 100644 --- a/plugins/sonar-cpd-plugin/src/test/java/org/sonar/plugins/cpd/decorators/SumDuplicationsDecoratorTest.java +++ b/plugins/sonar-cpd-plugin/src/test/java/org/sonar/plugins/cpd/decorators/SumDuplicationsDecoratorTest.java @@ -19,13 +19,7 @@ */ package org.sonar.plugins.cpd.decorators; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.number.OrderingComparisons.greaterThan; -import static org.junit.Assert.assertThat; import org.junit.Test; -import static org.mockito.Matchers.anyObject; -import static org.mockito.Matchers.argThat; -import static org.mockito.Mockito.*; import org.sonar.api.batch.DecoratorContext; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.measures.Measure; @@ -33,6 +27,15 @@ import org.sonar.api.resources.JavaFile; import org.sonar.api.resources.Resource; import org.sonar.api.test.IsMeasure; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.number.OrderingComparisons.greaterThan; +import static org.junit.Assert.assertThat; +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.argThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; + public class SumDuplicationsDecoratorTest { @Test @@ -50,7 +53,7 @@ public class SumDuplicationsDecoratorTest { decorator.decorate(unitTest, context); - verify(context, never()).saveMeasure((Measure) anyObject()); + verify(context, never()).saveMeasure(any(Measure.class)); } @Test diff --git a/plugins/sonar-pmd-plugin/src/test/java/org/sonar/plugins/pmd/PmdProfileImporterTest.java b/plugins/sonar-pmd-plugin/src/test/java/org/sonar/plugins/pmd/PmdProfileImporterTest.java index 1920a580140..9744390354e 100644 --- a/plugins/sonar-pmd-plugin/src/test/java/org/sonar/plugins/pmd/PmdProfileImporterTest.java +++ b/plugins/sonar-pmd-plugin/src/test/java/org/sonar/plugins/pmd/PmdProfileImporterTest.java @@ -37,7 +37,7 @@ import java.io.Reader; import java.io.StringReader; import static org.fest.assertions.Assertions.assertThat; -import static org.mockito.Matchers.anyObject; +import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -161,7 +161,7 @@ public class PmdProfileImporterTest { static RuleFinder createRuleFinder() { RuleFinder ruleFinder = mock(RuleFinder.class); - when(ruleFinder.find((RuleQuery) anyObject())).then(new Answer() { + when(ruleFinder.find(any(RuleQuery.class))).then(new Answer() { public Rule answer(InvocationOnMock invocation) { RuleQuery query = (RuleQuery) invocation.getArguments()[0]; Rule rule = Rule.create(query.getRepositoryKey(), "", "").setConfigKey(query.getConfigKey()).setSeverity(RulePriority.BLOCKER); diff --git a/plugins/sonar-surefire-plugin/src/test/java/org/sonar/plugins/surefire/SurefireSensorTest.java b/plugins/sonar-surefire-plugin/src/test/java/org/sonar/plugins/surefire/SurefireSensorTest.java index 6e0c37c0996..e641d4a38b8 100644 --- a/plugins/sonar-surefire-plugin/src/test/java/org/sonar/plugins/surefire/SurefireSensorTest.java +++ b/plugins/sonar-surefire-plugin/src/test/java/org/sonar/plugins/surefire/SurefireSensorTest.java @@ -19,12 +19,6 @@ */ package org.sonar.plugins.surefire; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertThat; -import static org.mockito.Matchers.*; -import static org.mockito.Mockito.*; - import org.apache.commons.lang.ObjectUtils; import org.custommonkey.xmlunit.DetailedDiff; import org.custommonkey.xmlunit.Diff; @@ -36,7 +30,12 @@ import org.sonar.api.batch.SensorContext; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.measures.Measure; import org.sonar.api.measures.Metric; -import org.sonar.api.resources.*; +import org.sonar.api.resources.Java; +import org.sonar.api.resources.JavaFile; +import org.sonar.api.resources.Project; +import org.sonar.api.resources.Qualifiers; +import org.sonar.api.resources.Resource; +import org.sonar.api.resources.Scopes; import org.sonar.api.test.IsMeasure; import org.sonar.api.test.IsResource; import org.sonar.api.test.MavenTestUtils; @@ -46,6 +45,19 @@ import java.io.FileReader; import java.io.StringReader; import java.net.URISyntaxException; +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertThat; +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.anyDouble; +import static org.mockito.Matchers.argThat; +import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + public class SurefireSensorTest { @Test @@ -88,7 +100,7 @@ public class SurefireSensorTest { verify(context, times(3)).saveMeasure(argThat(new IsResource(Scopes.FILE, Qualifiers.UNIT_TEST_FILE)), eq(CoreMetrics.TESTS), anyDouble()); verify(context, times(18)).saveMeasure(argThat(new IsResource(Scopes.FILE, Qualifiers.UNIT_TEST_FILE)), - (Metric) anyObject(), anyDouble()); + any(Metric.class), anyDouble()); verify(context, times(3)).saveMeasure(argThat(new IsResource(Scopes.FILE, Qualifiers.UNIT_TEST_FILE)), argThat(new IsMeasure(CoreMetrics.TEST_DATA))); @@ -133,7 +145,7 @@ public class SurefireSensorTest { verify(context, times(1)).saveMeasure(argThat(new IsResource(Scopes.FILE, Qualifiers.UNIT_TEST_FILE)), eq(CoreMetrics.TESTS), anyDouble()); verify(context, times(6)).saveMeasure(argThat(new IsResource(Scopes.FILE, Qualifiers.UNIT_TEST_FILE)), - (Metric) anyObject(), anyDouble()); + any(Metric.class), anyDouble()); verify(context, times(1)).saveMeasure(argThat(new IsResource(Scopes.FILE, Qualifiers.UNIT_TEST_FILE)), argThat(new IsMeasure(CoreMetrics.TEST_DATA))); diff --git a/plugins/sonar-surefire-plugin/src/test/java/org/sonar/plugins/surefire/api/AbstractSurefireParserTest.java b/plugins/sonar-surefire-plugin/src/test/java/org/sonar/plugins/surefire/api/AbstractSurefireParserTest.java index b85b96a7910..7853b8d76b5 100644 --- a/plugins/sonar-surefire-plugin/src/test/java/org/sonar/plugins/surefire/api/AbstractSurefireParserTest.java +++ b/plugins/sonar-surefire-plugin/src/test/java/org/sonar/plugins/surefire/api/AbstractSurefireParserTest.java @@ -19,23 +19,8 @@ */ package org.sonar.plugins.surefire.api; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyDouble; -import static org.mockito.Matchers.anyObject; -import static org.mockito.Matchers.argThat; -import static org.mockito.Matchers.eq; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import org.mockito.ArgumentMatcher; - -import java.net.URISyntaxException; -import java.util.Arrays; - import org.junit.Test; +import org.mockito.ArgumentMatcher; import org.sonar.api.batch.SensorContext; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.measures.Metric; @@ -47,6 +32,19 @@ import org.sonar.api.resources.Scopes; import org.sonar.api.test.IsMeasure; import org.sonar.api.test.IsResource; +import java.net.URISyntaxException; +import java.util.Arrays; + +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.anyDouble; +import static org.mockito.Matchers.argThat; +import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + public class AbstractSurefireParserTest { @Test @@ -112,7 +110,7 @@ public class AbstractSurefireParserTest { parser.collect(new Project("foo"), context, getDir("noTests")); - verify(context, never()).saveMeasure(any(Resource.class), (Metric) anyObject(), anyDouble()); + verify(context, never()).saveMeasure(any(Resource.class), any(Metric.class), anyDouble()); } @Test diff --git a/sonar-batch/src/test/java/org/sonar/batch/FormulaDecoratorTest.java b/sonar-batch/src/test/java/org/sonar/batch/FormulaDecoratorTest.java index e648f9f1baf..db91c6434f1 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/FormulaDecoratorTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/FormulaDecoratorTest.java @@ -77,7 +77,7 @@ public class FormulaDecoratorTest { when(context.getMeasure(fake)).thenReturn(new Measure(fake, 10.0)); decorator.decorate(null, context); - verify(context, never()).saveMeasure((Measure) anyObject()); + verify(context, never()).saveMeasure(any(Measure.class)); } class FakeFormula implements Formula { diff --git a/sonar-batch/src/test/java/org/sonar/batch/components/PastSnapshotFinderTest.java b/sonar-batch/src/test/java/org/sonar/batch/components/PastSnapshotFinderTest.java index f25775962c6..ed37f5dcdbe 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/components/PastSnapshotFinderTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/components/PastSnapshotFinderTest.java @@ -33,6 +33,7 @@ import org.sonar.api.database.model.Snapshot; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; +import static org.mockito.Matchers.any; import static junit.framework.Assert.assertNull; import static org.hamcrest.Matchers.nullValue; @@ -40,7 +41,6 @@ import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsNot.not; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; -import static org.mockito.Matchers.anyObject; import static org.mockito.Matchers.argThat; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -111,7 +111,7 @@ public class PastSnapshotFinderTest { PastSnapshot variationSnapshot = finder.find(null, 2, "2010-05-18"); - verify(finderByDate).findByDate((Snapshot) anyObject(), argThat(new ArgumentMatcher() { + verify(finderByDate).findByDate(any(Snapshot.class), argThat(new ArgumentMatcher() { @Override public boolean matches(Object o) { return o.equals(date); @@ -124,11 +124,11 @@ public class PastSnapshotFinderTest { @Test public void shouldNotFindByDate() { - when(finderByDate.findByDate((Snapshot) anyObject(), (Date) anyObject())).thenReturn(null); + when(finderByDate.findByDate(any(Snapshot.class), any(Date.class))).thenReturn(null); PastSnapshot variationSnapshot = finder.find(null, 2, "2010-05-18"); - verify(finderByDate).findByDate((Snapshot) anyObject(), (Date) anyObject()); + verify(finderByDate).findByDate(any(Snapshot.class), any(Date.class)); assertNull(variationSnapshot); } diff --git a/sonar-batch/src/test/java/org/sonar/batch/index/SourcePersisterTest.java b/sonar-batch/src/test/java/org/sonar/batch/index/SourcePersisterTest.java index 4febb06f6d5..2fba10d0ee7 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/index/SourcePersisterTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/index/SourcePersisterTest.java @@ -27,7 +27,7 @@ import org.sonar.api.resources.JavaFile; import org.sonar.api.resources.Resource; import org.sonar.jpa.test.AbstractDbUnitTestCase; -import static org.mockito.Matchers.anyObject; +import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -40,7 +40,7 @@ public class SourcePersisterTest extends AbstractDbUnitTestCase { setupData("shared"); Snapshot snapshot = getSession().getSingleResult(Snapshot.class, "id", 1000); ResourcePersister resourcePersister = mock(ResourcePersister.class); - when(resourcePersister.getSnapshotOrFail((Resource) anyObject())).thenReturn(snapshot); + when(resourcePersister.getSnapshotOrFail(any(Resource.class))).thenReturn(snapshot); sourcePersister = new SourcePersister(getSession(), resourcePersister); } diff --git a/sonar-batch/src/test/java/org/sonar/batch/phases/MavenPluginsConfiguratorTest.java b/sonar-batch/src/test/java/org/sonar/batch/phases/MavenPluginsConfiguratorTest.java index bddf0031a1b..558d8df3049 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/phases/MavenPluginsConfiguratorTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/phases/MavenPluginsConfiguratorTest.java @@ -29,7 +29,7 @@ import org.sonar.api.test.MavenTestUtils; import java.util.Arrays; -import static org.mockito.Matchers.anyObject; +import static org.mockito.Matchers.any; import static org.mockito.Matchers.argThat; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; @@ -40,7 +40,7 @@ public class MavenPluginsConfiguratorTest { private MavenPluginsConfigurator newConfigurator(MavenPluginHandler... handlers) { BatchExtensionDictionnary selector = mock(BatchExtensionDictionnary.class); - when(selector.selectMavenPluginHandlers((Project) anyObject())).thenReturn(Arrays.asList(handlers)); + when(selector.selectMavenPluginHandlers(any(Project.class))).thenReturn(Arrays.asList(handlers)); return new MavenPluginsConfigurator(selector); } diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/batch/AbstractDivisionDecoratorTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/batch/AbstractDivisionDecoratorTest.java index 60b9d6cda1d..13ffa419564 100644 --- a/sonar-plugin-api/src/test/java/org/sonar/api/batch/AbstractDivisionDecoratorTest.java +++ b/sonar-plugin-api/src/test/java/org/sonar/api/batch/AbstractDivisionDecoratorTest.java @@ -55,7 +55,7 @@ public class AbstractDivisionDecoratorTest { decorator.decorate(mock(Resource.class), context); - verify(context, never()).saveMeasure((Measure) anyObject()); + verify(context, never()).saveMeasure(any(Measure.class)); } @Test @@ -83,7 +83,7 @@ public class AbstractDivisionDecoratorTest { decorator.decorate(mock(Resource.class), context); - verify(context, never()).saveMeasure((Measure) anyObject()); + verify(context, never()).saveMeasure(any(Measure.class)); } diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/batch/AbstractSourceImporterTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/batch/AbstractSourceImporterTest.java index aaabf657d59..d2be8f62f2b 100644 --- a/sonar-plugin-api/src/test/java/org/sonar/api/batch/AbstractSourceImporterTest.java +++ b/sonar-plugin-api/src/test/java/org/sonar/api/batch/AbstractSourceImporterTest.java @@ -27,7 +27,12 @@ import org.junit.Before; import org.junit.Test; import org.mockito.ArgumentMatcher; import org.mockito.exceptions.verification.junit.ArgumentsAreDifferent; -import org.sonar.api.resources.*; +import org.sonar.api.resources.Java; +import org.sonar.api.resources.JavaFile; +import org.sonar.api.resources.Language; +import org.sonar.api.resources.Project; +import org.sonar.api.resources.ProjectFileSystem; +import org.sonar.api.resources.Resource; import java.io.File; import java.io.UnsupportedEncodingException; @@ -39,7 +44,7 @@ import java.util.List; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; -import static org.mockito.Matchers.anyObject; +import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.argThat; import static org.mockito.Matchers.eq; @@ -83,7 +88,7 @@ public class AbstractSourceImporterTest { when(fileSystem.getSourceFiles(Java.INSTANCE)).thenReturn(Arrays. asList(new File("Foo.java"), new File("Bar.java"))); nullImporter.analyse(fileSystem, context); - verify(context, never()).saveSource((Resource) anyObject(), anyString()); + verify(context, never()).saveSource(any(Resource.class), anyString()); } @Test @@ -121,7 +126,7 @@ public class AbstractSourceImporterTest { when(project.getFileSystem()).thenReturn(fileSystem); when(fileSystem.getSourceCharset()).thenReturn(Charset.forName(encoding)); when(project.getConfiguration()).thenReturn(new MapConfiguration(new HashMap())); - when(fileSystem.getSourceFiles((Language) anyObject())).thenReturn(Arrays.asList( + when(fileSystem.getSourceFiles(any(Language.class))).thenReturn(Arrays.asList( new File("test-resources/org/sonar/api/batch/AbstractSourceImporterTest/encoding/" + testFile))); importer.shouldExecuteOnProject(project); diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/batch/AbstractSumChildrenDecoratorTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/batch/AbstractSumChildrenDecoratorTest.java index 3d3e07fd8fb..b5537f437f5 100644 --- a/sonar-plugin-api/src/test/java/org/sonar/api/batch/AbstractSumChildrenDecoratorTest.java +++ b/sonar-plugin-api/src/test/java/org/sonar/api/batch/AbstractSumChildrenDecoratorTest.java @@ -20,9 +20,6 @@ package org.sonar.api.batch; import org.junit.Test; -import static org.mockito.Matchers.anyObject; -import static org.mockito.Matchers.argThat; -import static org.mockito.Mockito.*; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.measures.Measure; import org.sonar.api.measures.Metric; @@ -31,6 +28,13 @@ import org.sonar.api.test.IsMeasure; import java.util.Arrays; import java.util.List; +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.argThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + public class AbstractSumChildrenDecoratorTest { @Test @@ -52,7 +56,7 @@ public class AbstractSumChildrenDecoratorTest { create(false).decorate(null, context); - verify(context, never()).saveMeasure((Measure) anyObject()); + verify(context, never()).saveMeasure(any(Measure.class)); } @Test