]> source.dussan.org Git - sonarqube.git/commit
Remove unused and conflicting dependency on securemock in unit tests
authorSimon Brandhof <simon.brandhof@sonarsource.com>
Fri, 26 Jan 2018 17:40:31 +0000 (18:40 +0100)
committerSimon Brandhof <simon.brandhof@sonarsource.com>
Mon, 29 Jan 2018 09:14:16 +0000 (10:14 +0100)
commitff49002afd726123d6ed894c5a151cef2c250ffb
treeb1c5c25a50406f3991dd2f561a73f987168e657b
parent3490f424e0d84903a5a0dd8e7352e60c3ebabe64
Remove unused and conflicting dependency on securemock in unit tests

securemock is a fork of an old version of mockito. By removing it
some tests must be fixed to correctly support the latest version of
mockito:
- signature of ArgumentMatcher implementations (Object -> T). That's the
reason why they have been fixed and replaced by lambda
- any(Class) supports null values in securemock but not in mockito.
Replacing calls by any() fixes the issue.
16 files changed:
server/sonar-server/pom.xml
server/sonar-server/src/test/java/org/sonar/server/app/TomcatConnectorsTest.java
server/sonar-server/src/test/java/org/sonar/server/computation/dbcleaner/ProjectCleanerTest.java
server/sonar-server/src/test/java/org/sonar/server/computation/queue/ReportSubmitterTest.java
server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/QualityGateServiceImplTest.java
server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/BuildComponentTreeStepTest.java
server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PurgeDatastoresStepTest.java
server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/SendIssueNotificationsStepTest.java
server/sonar-server/src/test/java/org/sonar/server/issue/CommentActionTest.java
server/sonar-server/src/test/java/org/sonar/server/issue/notification/ChangesOnMyIssueNotificationDispatcherTest.java
server/sonar-server/src/test/java/org/sonar/server/platform/SettingsChangeNotifierTest.java
server/sonar-server/src/test/java/org/sonar/server/platform/web/RootFilterTest.java
server/sonar-server/src/test/java/org/sonar/server/plugins/PluginDownloaderTest.java
server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ActivateRulesActionTest.java
server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/DeactivateRulesActionTest.java
server/sonar-server/src/test/java/org/sonar/server/telemetry/TelemetryDaemonTest.java