From d55f047c445daf698ccde5f0af9d0669804c818b Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Wed, 10 Jan 2018 21:14:52 +0100 Subject: [PATCH] Cleanup code based on Intellij inspections --- .../sonar/xoo/rule/MultilineIssuesSensor.java | 4 +- .../sonar/xoo/extensions/XooPostJobTest.java | 4 +- .../sonar/xoo/scm/XooBlameCommandTest.java | 2 +- .../StandaloneCeDistributedInformation.java | 4 +- .../sonar/ce/taskprocessor/CeWorkerImpl.java | 2 +- .../EnabledCeWorkerControllerImpl.java | 2 +- .../java/org/sonar/ce/app/CeServerTest.java | 10 +-- .../cleaning/CeCleaningSchedulerImplTest.java | 10 +-- .../ce/container/CePluginJarExploderTest.java | 4 +- .../ce/container/CePluginRepositoryTest.java | 2 +- .../org/sonar/ce/httpd/CeHttpServerTest.java | 2 +- .../CEQueueStatusImplConcurrentTest.java | 2 +- ...lureNotificationExecutionListenerTest.java | 2 +- .../sonar/ce/queue/CeQueueCleanerTest.java | 4 +- .../ce/queue/CeQueueInitializerTest.java | 2 +- .../ce/queue/InternalCeQueueImplTest.java | 16 ++-- .../sonar/ce/queue/PurgeCeActivitiesTest.java | 2 +- .../systeminfo/SystemInfoHttpActionTest.java | 2 +- .../CeProcessingSchedulerImplTest.java | 18 ++--- .../ce/taskprocessor/CeWorkerImplTest.java | 2 +- .../db/profiling/ProfiledDataSource.java | 3 +- .../test/java/org/sonar/db/CoreDbTester.java | 2 +- .../java/org/sonar/db/DatabaseCommands.java | 2 +- .../test/java/org/sonar/db/DdlUtilsTest.java | 2 +- .../java/org/sonar/db/dialect/H2Test.java | 2 +- .../java/org/sonar/db/dialect/MsSqlTest.java | 2 +- .../java/org/sonar/db/dialect/MySqlTest.java | 2 +- .../java/org/sonar/db/dialect/OracleTest.java | 2 +- .../org/sonar/db/dialect/PostgreSqlTest.java | 2 +- .../sonar/db/ce/LogsIteratorInputStream.java | 2 +- .../ProjectMeasuresIndexerIterator.java | 12 +-- .../permission/ProjectPermissionsTest.java | 4 +- .../java/org/sonar/db/DBSessionsImplTest.java | 2 +- .../src/test/java/org/sonar/db/DbTester.java | 2 +- .../test/java/org/sonar/db/MyBatisTest.java | 2 +- .../org/sonar/db/ce/CeActivityDaoTest.java | 2 +- .../java/org/sonar/db/ce/CeQueueDaoTest.java | 10 +-- .../org/sonar/db/ce/CeTaskInputDaoTest.java | 2 +- .../java/org/sonar/db/ce/CeTaskQueryTest.java | 2 +- .../db/ce/LogsIteratorInputStreamTest.java | 4 +- .../sonar/db/component/ComponentDaoTest.java | 4 +- .../db/component/ComponentLinkDtoTest.java | 4 +- .../db/component/ComponentQueryTest.java | 6 +- .../db/component/ComponentTreeQueryTest.java | 10 +-- .../sonar/db/component/SnapshotDaoTest.java | 2 +- .../sonar/db/component/SnapshotDtoTest.java | 4 +- .../sonar/db/component/SnapshotQueryTest.java | 2 +- .../java/org/sonar/db/event/EventDtoTest.java | 2 +- .../sonar/db/favorite/FavoriteDbTester.java | 2 +- .../java/org/sonar/db/issue/IssueDtoTest.java | 2 +- .../org/sonar/db/measure/MeasureDtoTest.java | 2 +- .../db/measure/MeasureTreeQueryTest.java | 14 ++-- .../sonar/db/measure/PastMeasureDtoTest.java | 4 +- .../ProjectMeasuresIndexerIteratorTest.java | 24 +++--- .../measure/custom/CustomMeasureDaoTest.java | 2 +- .../org/sonar/db/metric/MetricDtoTest.java | 2 +- .../db/permission/GroupPermissionDaoTest.java | 4 +- ...rmissionTemplateCharacteristicDaoTest.java | 2 +- .../template/PermissionTemplateDaoTest.java | 2 +- .../UserWithPermissionTemplateDaoTest.java | 4 +- .../sonar/db/property/PropertiesDaoTest.java | 8 +- .../org/sonar/db/purge/PurgeMapperTest.java | 2 +- .../db/purge/period/KeepOneFilterTest.java | 4 +- .../QualityGateConditionDaoTest.java | 10 +-- .../QualityGateConditionDtoTest.java | 8 +- .../qualityprofile/QualityProfileDaoTest.java | 6 +- .../java/org/sonar/db/rule/RuleDaoTest.java | 2 +- .../java/org/sonar/db/rule/RuleDtoTest.java | 2 +- .../sonar/db/user/GroupMembershipDaoTest.java | 2 +- .../db/user/GroupMembershipQueryTest.java | 2 +- .../java/org/sonar/db/user/UserDtoTest.java | 8 +- .../org/sonar/db/user/UserGroupDaoTest.java | 2 +- .../charset/DatabaseCharsetCheckerTest.java | 12 +-- .../def/BigIntegerColumnDefTest.java | 10 +-- .../migration/def/BooleanColumnDefTest.java | 10 +-- .../db/migration/def/ClobColumnDefTest.java | 18 ++--- .../migration/def/DecimalColumnDefTest.java | 16 ++-- .../migration/def/TimestampColumnDefTest.java | 10 +-- .../migration/def/TinyIntColumnDefTest.java | 6 +- .../db/migration/def/ValidationsTest.java | 4 +- .../migration/def/VarcharColumnDefTest.java | 14 ++-- .../NoTableMigrationHistoryImplTest.java | 2 +- .../migration/sql/DropTableBuilderTest.java | 4 +- .../db/migration/step/DataChangeTest.java | 12 +-- .../version/v60/Migration1223Test.java | 4 +- .../version/v61/Migration1304Test.java | 4 +- .../TestDefaultOrganizationUuidProvider.java | 4 +- .../v64/PopulateRulesMetadataTest.java | 1 - .../RenameOldSonarQubeWayQualityGateTest.java | 2 +- .../org/sonar/application/AppLoggingTest.java | 2 +- .../sonar/application/SchedulerImplTest.java | 2 +- .../cluster/ClusterAppStateImplTest.java | 8 +- .../command/AbstractCommandTest.java | 2 +- .../command/CommandFactoryImplTest.java | 4 +- .../config/AppSettingsLoaderImplTest.java | 2 +- .../config/ClusterSettingsLoopbackTest.java | 6 +- .../config/ClusterSettingsTest.java | 4 +- .../config/FileSystemSettingsTest.java | 2 +- .../application/config/JdbcSettingsTest.java | 2 +- .../sonar/application/es/EsSettingsTest.java | 4 +- .../ProcessCommandsProcessMonitorTest.java | 2 +- .../process/ProcessLauncherImplTest.java | 2 +- .../application/process/SQProcessTest.java | 2 +- .../process/StopRequestWatcherImplTest.java | 2 +- .../process/cluster/health/NodeDetails.java | 2 +- .../cluster/health/NodeDetailsTest.java | 2 +- .../cluster/health/NodeHealthTest.java | 4 +- .../cluster/hz/HazelcastMemberImplTest.java | 4 +- .../hz/HazelcastMemberSelectorsTest.java | 6 +- .../cluster/hz/SuccessfulDistributedCall.java | 2 +- .../org/sonar/process/test/HttpProcess.java | 2 +- .../sonar/process/PropsTest/sonar.properties | 2 +- .../server/authentication/InitFilter.java | 6 +- .../authentication/OAuth2CallbackFilter.java | 6 +- .../server/authentication/ws/LoginAction.java | 6 +- .../authentication/ws/LogoutAction.java | 6 +- .../authentication/ws/ValidateAction.java | 5 +- .../batch/BatchReportReaderImpl.java | 2 +- .../projectanalysis/component/Component.java | 2 +- .../duplication/DuplicationMeasures.java | 2 +- .../issue/TrackerBaseInputFactory.java | 2 +- .../issue/TrackerMergeBranchInputFactory.java | 2 +- .../measure/BestValueOptimization.java | 2 +- .../source/SourceLinesRepositoryImpl.java | 2 +- .../step/CommentMeasuresStep.java | 2 +- .../step/ComplexityMeasuresStep.java | 2 +- .../step/CoverageMeasuresStep.java | 2 +- .../LanguageDistributionMeasuresStep.java | 2 +- .../step/NewCoverageMeasuresStep.java | 2 +- .../step/UnitTestMeasuresStep.java | 2 +- .../ComponentTextSearchFeature.java | 2 +- .../sonar/server/issue/ws/SearchAction.java | 2 +- .../server/metric/CoreCustomMetrics.java | 2 +- .../platform/web/MasterServletFilter.java | 6 +- .../server/platform/web/RedirectFilter.java | 2 +- .../sonar/server/platform/web/RootFilter.java | 2 +- .../platform/web/SecurityServletFilter.java | 2 +- .../server/platform/web/WebPagesFilter.java | 2 +- .../web/requestid/RequestIdFilter.java | 2 +- .../plugins/StaticResourcesServlet.java | 3 +- .../server/plugins/ws/InstalledAction.java | 4 +- .../server/plugins/ws/PluginWSCommons.java | 2 +- .../server/qualityprofile/ActiveRule.java | 2 +- .../sonar/server/rule/ws/UpdateAction.java | 2 +- .../sonar/server/source/OpeningHtmlTag.java | 5 +- .../org/sonar/server/test/index/TestDoc.java | 2 +- .../sonar/server/text/MacroInterpreter.java | 2 +- .../sonar/server/user/UserSessionFilter.java | 2 +- .../sonar/server/user/ws/UserJsonWriter.java | 2 +- .../sonar/server/util/cache/DiskCache.java | 2 +- .../org/sonar/server/view/index/ViewDoc.java | 2 +- .../ws/DeprecatedPropertiesWsFilter.java | 5 +- .../server/ws/RemovedWebServiceHandler.java | 2 +- .../org/sonar/server/ws/WebServiceFilter.java | 6 +- .../server/ws/WebServiceReroutingFilter.java | 6 +- .../org/sonar/ce/http/CeHttpClientTest.java | 6 +- .../java/org/sonar/ce/log/CeLoggingTest.java | 2 +- .../org/sonar/ce/queue/CeQueueImplTest.java | 8 +- .../elasticsearch/test/EsTestCluster.java | 6 +- .../app/ProcessCommandWrapperImplTest.java | 10 +-- .../server/app/TomcatConnectorsTest.java | 2 +- .../AuthenticatorsImplTest.java | 8 +- .../BaseContextFactoryTest.java | 4 +- .../BasicAuthenticatorTest.java | 18 ++--- .../server/authentication/CookiesTest.java | 20 ++--- .../CredentialsAuthenticatorTest.java | 12 +-- .../IdentityProviderRepositoryTest.java | 10 +-- .../server/authentication/InitFilterTest.java | 2 +- .../authentication/JwtCsrfVerifierTest.java | 24 +++--- .../authentication/JwtHttpHandlerTest.java | 36 ++++----- .../authentication/JwtSerializerTest.java | 36 ++++----- .../authentication/LogOAuthWarningTest.java | 6 +- .../OAuth2CallbackFilterTest.java | 2 +- .../OAuth2ContextFactoryTest.java | 10 +-- .../authentication/OAuth2RedirectionTest.java | 10 +-- .../authentication/OAuthCsrfVerifierTest.java | 12 +-- .../RealmAuthenticatorTest.java | 26 +++--- .../authentication/SsoAuthenticatorTest.java | 34 ++++---- .../UserSessionInitializerTest.java | 8 +- .../authentication/ws/LoginActionTest.java | 2 +- .../authentication/ws/LogoutActionTest.java | 2 +- .../sonar/server/batch/FileActionTest.java | 4 +- .../sonar/server/batch/IndexActionTest.java | 4 +- .../sonar/server/batch/ProjectActionTest.java | 4 +- .../server/branch/ws/BranchesWsTest.java | 2 +- .../server/ce/ws/ActivityActionTest.java | 4 +- .../java/org/sonar/server/ce/ws/CeWsTest.java | 2 +- .../server/ce/ws/ComponentActionTest.java | 2 +- .../sonar/server/ce/ws/TaskActionTest.java | 6 +- .../sonar/server/ce/ws/TaskFormatterTest.java | 6 +- .../ComponentCleanerServiceTest.java | 6 +- .../component/ComponentUpdaterTest.java | 22 ++--- .../sonar/server/component/index/NewTest.java | 2 +- .../server/component/ws/AppActionTest.java | 14 ++-- .../server/component/ws/ComponentsWsTest.java | 2 +- .../server/component/ws/FilterParserTest.java | 28 +++---- .../ws/ProjectMeasuresQueryFactoryTest.java | 56 ++++++------- .../ws/ProjectMeasuresQueryValidatorTest.java | 74 ++++++++--------- .../server/component/ws/SearchActionTest.java | 12 +-- .../ws/SearchProjectsActionTest.java | 14 ++-- .../server/component/ws/ShowActionTest.java | 26 +++--- .../component/ws/SuggestionsActionTest.java | 40 +++++----- .../queue/ReportSubmitterTest.java | 2 +- .../analysis/AnalysisImplTest.java | 12 +-- .../AnalysisMetadataHolderImplTest.java | 8 +- .../measurecomputer/ComponentImplTest.java | 20 ++--- .../MeasureComputerContextImplTest.java | 40 +++++----- .../MeasureComputerDefinitionImplTest.java | 24 +++--- .../api/measurecomputer/MeasureImplTest.java | 26 +++--- .../api/posttask/QualityGateImplTest.java | 6 +- .../batch/BatchReportReaderRule.java | 2 +- .../component/ComponentImplTest.java | 4 +- .../component/ComponentTreeBuilderTest.java | 2 +- .../component/FileAttributesTest.java | 12 +-- .../component/MutableDbIdsRepositoryRule.java | 2 +- .../component/ReportVisitorsCrawlerTest.java | 6 +- .../component/ViewsVisitorsCrawlerTest.java | 8 +- ...rojectDuplicationStatusHolderImplTest.java | 12 +-- .../DuplicationRepositoryImplTest.java | 2 +- .../DuplicationRepositoryRule.java | 6 +- .../duplication/DuplicationTest.java | 24 +++--- ...IntegrateCrossProjectDuplicationsTest.java | 8 +- .../ReportDuplicationMeasuresTest.java | 14 ++-- .../ViewsDuplicationMeasuresTest.java | 14 ++-- .../MutableMovedFilesRepositoryRule.java | 2 +- .../formula/AverageFormulaExecutionTest.java | 2 +- .../formula/AverageFormulaTest.java | 4 +- .../DistributionFormulaExecutionTest.java | 2 +- .../formula/DistributionFormulaTest.java | 2 +- .../formula/IntSumFormulaTest.java | 2 +- .../formula/LongSumFormulaTest.java | 2 +- ...rtFormulaExecutorComponentVisitorTest.java | 10 +-- .../formula/SumFormulaExecutionTest.java | 2 +- ...wsFormulaExecutorComponentVisitorTest.java | 10 +-- .../formula/counter/IntSumCounterTest.java | 2 +- .../formula/counter/LongSumCounterTest.java | 2 +- ...eIssuesOnRemovedComponentsVisitorTest.java | 14 ++-- .../ComponentIssuesRepositoryImplTest.java | 14 ++-- .../ComponentsWithUnprocessedIssuesTest.java | 14 ++-- .../issue/IntegrateIssuesVisitorTest.java | 12 +-- .../issue/IssueAssignerTest.java | 24 +++--- .../issue/IssueCounterTest.java | 2 +- .../issue/IssueLifecycleTest.java | 12 +-- .../issue/IssuesRepositoryVisitorTest.java | 4 +- ...onentUuidsHavingOpenIssuesVisitorTest.java | 6 +- .../issue/MovedIssueVisitorTest.java | 2 +- .../issue/RuleTagsCopierTest.java | 2 +- .../issue/ScmAccountToUserLoaderTest.java | 6 +- .../issue/TrackerBaseInputFactoryTest.java | 2 +- .../issue/TrackerRawInputFactoryTest.java | 14 ++-- .../commonrule/CommonRuleEngineImplTest.java | 6 +- .../issue/commonrule/CommonRuleTest.java | 10 +-- .../commonrule/DuplicatedBlockRuleTest.java | 8 +- .../issue/commonrule/SkippedTestRuleTest.java | 12 +-- .../issue/commonrule/TestErrorRuleTest.java | 12 +-- .../issue/filter/IssueFilterTest.java | 22 ++--- .../MeasureComputersHolderImplTest.java | 4 +- .../measure/MeasureComputersHolderRule.java | 2 +- .../measure/MeasureKeyTest.java | 2 +- .../projectanalysis/measure/MeasureTest.java | 4 +- .../ReportMeasureComputersVisitorTest.java | 10 +-- .../ViewsMeasureComputersVisitorTest.java | 16 ++-- .../QualityGateDetailsDataTest.java | 8 +- .../metric/ReportMetricValidatorImplTest.java | 12 +-- .../qualitygate/ConditionEvaluatorTest.java | 6 +- .../MaintainabilityMeasuresVisitorTest.java | 10 +-- ...yAndSecurityRatingMeasuresVisitorTest.java | 22 ++--- ...yAndSecurityRatingMeasuresVisitorTest.java | 14 ++-- .../ActiveRulesHolderImplTest.java | 22 ++--- .../projectanalysis/scm/ChangesetTest.java | 16 ++-- .../projectanalysis/scm/DbScmInfoTest.java | 16 ++-- .../scm/ReportScmInfoTest.java | 14 ++-- .../scm/ScmInfoDbLoaderTest.java | 6 +- .../projectanalysis/scm/ScmInfoImplTest.java | 18 ++--- .../scm/ScmInfoRepositoryImplTest.java | 14 ++-- .../source/ComputeFileSourceDataTest.java | 10 +-- .../source/DuplicationLineReaderTest.java | 2 +- .../source/HighlightingLineReaderTest.java | 2 +- .../source/LastCommitVisitorTest.java | 12 +-- .../source/ReportIteratorTest.java | 2 +- .../source/SourceLinesRepositoryImplTest.java | 14 ++-- .../step/BuildComponentTreeStepTest.java | 6 +- .../step/ComputeQProfileMeasureStepTest.java | 6 +- .../step/CustomMeasuresCopyStepTest.java | 20 ++--- .../step/ExecuteVisitorsStepTest.java | 4 +- .../step/ExtractReportStepTest.java | 2 +- ...ProjectDuplicationsRepositoryStepTest.java | 12 +-- .../step/LoadMeasureComputersStepTest.java | 28 +++---- .../step/LoadQualityProfilesStepTest.java | 6 +- ...tCrossProjectDuplicationIndexStepTest.java | 10 +-- .../step/PersistEventsStepTest.java | 2 +- .../step/PersistFileSourcesStepTest.java | 2 +- .../step/QualityGateEventsStepTest.java | 4 +- .../step/QualityGateMeasuresStepTest.java | 4 +- .../step/QualityProfileEventsStepTest.java | 12 +-- .../ReportComplexityMeasuresStepTest.java | 20 ++--- .../step/ReportComputationStepsTest.java | 4 +- ...eportComputeMeasureVariationsStepTest.java | 4 +- .../step/SendIssueNotificationsStepTest.java | 20 ++--- ...llChangesetQualityGateSpecialCaseTest.java | 16 ++-- ...teQualityProfilesLastUsedDateStepTest.java | 4 +- .../step/ViewsComplexityMeasuresStepTest.java | 20 ++--- .../webhook/WebhookPostTaskTest.java | 2 +- .../debt/DebtModelPluginRepositoryTest.java | 2 +- .../ws/DuplicationsParserTest.java | 12 +-- .../server/duplication/ws/ShowActionTest.java | 12 +-- .../server/edition/ws/FormDataActionTest.java | 2 +- .../sonar/server/email/ws/SendActionTest.java | 4 +- .../org/sonar/server/es/BulkIndexerTest.java | 2 +- .../sonar/server/es/EsClientProviderTest.java | 10 +-- .../java/org/sonar/server/es/EsTester.java | 4 +- .../java/org/sonar/server/es/FakeDoc.java | 2 +- .../org/sonar/server/es/IndexCreatorTest.java | 8 +- .../server/es/IndexerStartupTaskTest.java | 8 +- .../org/sonar/server/es/NewIndexTest.java | 4 +- .../sonar/server/es/RecoveryIndexerTest.java | 2 +- .../java/org/sonar/server/es/SortingTest.java | 6 +- .../server/es/metadata/MetadataIndexTest.java | 8 +- .../ComponentTextSearchFeatureRule.java | 2 +- .../ComponentTextSearchQueryFactoryTest.java | 10 +-- .../exceptions/BadRequestExceptionTest.java | 12 +-- .../sonar/server/exceptions/MessageTest.java | 6 +- .../server/favorite/FavoriteUpdaterTest.java | 4 +- .../health/DbConnectionNodeCheckTest.java | 4 +- .../sonar/server/issue/CommentActionTest.java | 2 +- .../sonar/server/issue/IssueDocTesting.java | 2 +- .../server/issue/IssueFieldsSetterTest.java | 14 ++-- .../sonar/server/issue/IssueFinderTest.java | 6 +- .../sonar/server/issue/IssueQueryTest.java | 2 +- .../org/sonar/server/issue/ResultTest.java | 10 +-- .../sonar/server/issue/RulesAggregation.java | 6 +- .../server/issue/RulesAggregationTest.java | 2 +- .../server/issue/TransitionActionTest.java | 2 +- .../server/issue/TransitionServiceTest.java | 6 +- .../IssueIndexProjectStatisticsTest.java | 26 +++--- ...esOnMyIssueNotificationDispatcherTest.java | 2 +- .../DoNotFixNotificationDispatcherTest.java | 4 +- .../MyNewIssuesEmailTemplateTest.java | 6 +- .../NewIssuesEmailTemplateTest.java | 10 +-- .../server/issue/workflow/TransitionTest.java | 10 +-- .../issue/ws/AvatarResolverImplTest.java | 10 +-- .../server/issue/ws/ChangelogActionTest.java | 24 +++--- .../issue/ws/ComponentTagsActionTest.java | 6 +- .../issue/ws/DeleteCommentActionTest.java | 16 ++-- .../issue/ws/EditCommentActionTest.java | 20 ++--- .../issue/ws/SearchActionComponentsTest.java | 14 ++-- .../server/issue/ws/SearchActionTest.java | 2 +- .../server/issue/ws/SetTagsActionTest.java | 6 +- .../sonar/server/issue/ws/TagsActionTest.java | 16 ++-- .../index/ProjectMeasuresIndexTest.java | 22 ++--- .../index/ProjectMeasuresQueryTest.java | 18 ++--- .../measure/ws/ComponentActionTest.java | 2 +- .../measure/ws/ComponentTreeActionTest.java | 2 +- .../server/measure/ws/SearchActionTest.java | 12 +-- .../notification/ws/NotificationsWsTest.java | 2 +- .../organization/ws/AddMemberActionTest.java | 2 +- .../organization/ws/CreateActionTest.java | 2 +- .../organization/ws/DeleteActionTest.java | 2 +- .../ws/EnableSupportActionTest.java | 8 +- .../ws/RemoveMemberActionTest.java | 6 +- .../ApplyPermissionTemplateQueryTest.java | 2 +- .../index/PermissionIndexerDaoTest.java | 2 +- .../permission/ws/AddGroupActionTest.java | 46 +++++------ .../permission/ws/AddUserActionTest.java | 42 +++++----- .../permission/ws/GroupsActionTest.java | 24 +++--- .../permission/ws/RemoveGroupActionTest.java | 40 +++++----- .../permission/ws/RemoveUserActionTest.java | 38 ++++----- .../ws/SearchGlobalPermissionsActionTest.java | 14 ++-- .../SearchProjectPermissionsActionTest.java | 22 ++--- .../server/permission/ws/UsersActionTest.java | 32 ++++---- .../AddGroupToTemplateActionTest.java | 6 +- ...AddProjectCreatorToTemplateActionTest.java | 10 +-- .../template/AddUserToTemplateActionTest.java | 10 +-- .../ws/template/ApplyTemplateActionTest.java | 4 +- .../template/BulkApplyTemplateActionTest.java | 12 +-- .../ws/template/CreateTemplateActionTest.java | 2 +- .../DefaultTemplatesResolverRule.java | 2 +- .../ws/template/DeleteTemplateActionTest.java | 8 +- .../RemoveGroupFromTemplateActionTest.java | 6 +- ...eProjectCreatorFromTemplateActionTest.java | 12 +-- .../RemoveUserFromTemplateActionTest.java | 4 +- .../template/SearchTemplatesActionTest.java | 2 +- .../SetDefaultTemplateActionTest.java | 4 +- .../ws/template/TemplateGroupsActionTest.java | 28 +++---- .../ws/template/TemplateUsersActionTest.java | 26 +++--- .../ws/template/UpdateTemplateActionTest.java | 2 +- .../server/platform/BackendCleanupTest.java | 6 +- .../sonar/server/platform/ServerImplTest.java | 6 +- .../server/platform/UrlSettingsTest.java | 8 +- .../platform/db/EmbeddedDatabaseTest.java | 2 +- ...tabaseMigrationExecutorServiceAdaptor.java | 10 +-- ...DatabaseMigrationImplAsynchronousTest.java | 2 +- .../StandaloneSystemSectionTest.java | 12 +-- .../cluster/GlobalSystemSectionTest.java | 8 +- .../platform/web/MasterServletFilterTest.java | 6 +- .../platform/web/WebPagesFilterTest.java | 8 +- .../server/platform/ws/IndexActionTest.java | 10 +-- .../server/platform/ws/RestartActionTest.java | 4 +- .../server/platform/ws/ServerWsTest.java | 2 +- .../server/platform/ws/StatusActionTest.java | 6 +- .../server/plugins/PluginDownloaderTest.java | 2 +- .../server/plugins/PluginUninstallerTest.java | 2 +- .../server/plugins/UpdateCenterServlet.java | 2 +- .../edition/EditionPluginDownloaderTest.java | 4 +- .../plugins/ws/AvailableActionTest.java | 2 +- .../server/plugins/ws/InstallActionTest.java | 2 +- .../plugins/ws/InstalledActionTest.java | 12 +-- .../server/plugins/ws/PendingActionTest.java | 2 +- .../ws/PluginUpdateAggregatorTest.java | 2 +- .../server/plugins/ws/PluginsWsTest.java | 2 +- .../server/plugins/ws/UpdateActionTest.java | 2 +- .../project/ws/BulkDeleteActionTest.java | 20 ++--- .../project/ws/BulkUpdateKeyActionTest.java | 2 +- .../server/project/ws/CreateActionTest.java | 14 ++-- .../server/project/ws/GhostsActionTest.java | 14 ++-- .../server/project/ws/IndexActionTest.java | 18 ++--- .../project/ws/ProvisionedActionTest.java | 12 +-- .../server/project/ws/SearchActionTest.java | 24 +++--- .../project/ws/UpdateKeyActionTest.java | 2 +- .../projectlink/ws/CreateActionTest.java | 4 +- .../projectlink/ws/SearchActionTest.java | 6 +- .../projecttag/ws/ProjectTagsWsTest.java | 2 +- .../projecttag/ws/SearchActionTest.java | 2 +- .../server/property/ws/IndexActionTest.java | 54 ++++++------- .../QualityGateConditionsUpdaterTest.java | 6 +- .../ws/CreateConditionActionTest.java | 12 +-- .../qualitygate/ws/SearchActionTest.java | 2 +- .../BuiltInQProfileRepositoryRule.java | 2 +- ...ltInQualityProfilesUpdateListenerTest.java | 10 +-- .../QProfileBackuperImplTest.java | 4 +- .../ws/AddProjectActionTest.java | 8 +- .../qualityprofile/ws/BackupActionTest.java | 14 ++-- .../ws/ChangeParentActionTest.java | 20 ++--- .../ws/ChangelogActionTest.java | 14 ++-- .../qualityprofile/ws/CompareActionTest.java | 8 +- .../qualityprofile/ws/CopyActionTest.java | 10 +-- .../qualityprofile/ws/CreateActionTest.java | 2 +- .../qualityprofile/ws/DeleteActionTest.java | 4 +- .../qualityprofile/ws/ExportActionTest.java | 8 +- .../ws/ExportersActionTest.java | 2 +- .../ws/ImportersActionTest.java | 2 +- .../ws/InheritanceActionTest.java | 6 +- .../ws/QProfilesWsMediumTest.java | 20 ++--- .../ws/RemoveProjectActionTest.java | 4 +- .../qualityprofile/ws/RenameActionTest.java | 10 +-- .../qualityprofile/ws/RestoreActionTest.java | 14 ++-- .../ws/SetDefaultActionTest.java | 16 ++-- .../org/sonar/server/root/ws/RootsWsTest.java | 2 +- .../sonar/server/rule/CommonRuleKeysTest.java | 4 +- .../sonar/server/rule/RegisterRulesTest.java | 6 +- .../sonar/server/rule/RuleCreatorTest.java | 2 +- .../rule/RuleDefinitionsLoaderTest.java | 4 +- .../sonar/server/rule/RuleTagHelperTest.java | 2 +- .../rule/index/RuleIndexDefinitionTest.java | 2 +- .../server/rule/ws/CreateActionTest.java | 4 +- .../server/rule/ws/DeleteActionTest.java | 6 +- .../sonar/server/rule/ws/ListActionTest.java | 4 +- .../server/rule/ws/RuleQueryFactoryTest.java | 18 ++--- .../server/rule/ws/SearchActionTest.java | 45 +++++------ .../sonar/server/rule/ws/ShowActionTest.java | 14 ++-- .../sonar/server/rule/ws/TagsActionTest.java | 4 +- .../server/rule/ws/UpdateActionTest.java | 18 ++--- .../server/setting/ws/EncryptActionTest.java | 2 +- .../setting/ws/ListDefinitionsActionTest.java | 30 +++---- .../server/setting/ws/ResetActionTest.java | 30 +++---- .../server/setting/ws/SettingsFinderTest.java | 14 ++-- .../setting/ws/SettingsUpdaterTest.java | 18 ++--- .../server/setting/ws/ValuesActionTest.java | 80 +++++++++---------- .../source/HtmlSourceDecoratorTest.java | 6 +- .../server/source/OpeningHtmlTagTest.java | 6 +- .../server/source/SourceServiceTest.java | 10 +-- .../source/index/FileSourceTesting.java | 4 +- .../server/source/ws/IndexActionTest.java | 6 +- .../server/source/ws/LinesActionTest.java | 4 +- .../sonar/server/source/ws/RawActionTest.java | 10 +-- .../server/startup/RegisterMetricsTest.java | 2 +- .../server/telemetry/TelemetryDaemonTest.java | 2 +- .../org/sonar/server/test/db/TestTesting.java | 2 +- .../test/index/TestResultSetIteratorTest.java | 1 - .../sonar/server/test/ws/ListActionTest.java | 44 +++++----- .../tester/AttributeHolderServletContext.java | 10 +-- .../AttributeHolderServletContextTest.java | 8 +- .../sonar/server/tester/UserSessionRule.java | 2 +- .../sonar/server/ui/ws/GlobalActionTest.java | 24 +++--- .../ws/InstalledPluginsActionTest.java | 4 +- .../updatecenter/ws/UpdateCenterWsTest.java | 2 +- .../updatecenter/ws/UploadActionTest.java | 2 +- .../sonar/server/user/DefaultUserTest.java | 2 +- .../server/user/ExternalIdentityTest.java | 6 +- .../org/sonar/server/user/NewUserTest.java | 8 +- .../server/user/ServerUserSessionTest.java | 2 +- .../server/user/UserUpdaterCreateTest.java | 6 +- .../server/user/ws/CreateActionTest.java | 34 ++++---- .../server/user/ws/DeactivateActionTest.java | 2 +- .../server/user/ws/GroupsActionTest.java | 34 ++++---- .../user/ws/IdentityProvidersActionTest.java | 2 +- .../server/user/ws/SearchActionTest.java | 2 +- .../server/user/ws/UpdateActionTest.java | 16 ++-- .../DefaultGroupCreatorImplTest.java | 4 +- .../usergroups/DefaultGroupFinderTest.java | 6 +- .../usergroups/ws/AddUserActionTest.java | 30 +++---- .../usergroups/ws/DeleteActionTest.java | 28 +++---- .../usergroups/ws/RemoveUserActionTest.java | 22 ++--- .../usergroups/ws/SearchActionTest.java | 18 ++--- .../usergroups/ws/UpdateActionTest.java | 24 +++--- .../server/usergroups/ws/UsersActionTest.java | 24 +++--- .../AbstractStoppableExecutorServiceTest.java | 2 +- .../server/view/index/ViewIndexTest.java | 2 +- .../server/webhook/WebhookCallerImplTest.java | 6 +- .../ws/DeprecatedPropertiesWsFilterTest.java | 4 +- .../sonar/server/ws/ServletRequestTest.java | 12 +-- .../sonar/server/ws/ServletResponseTest.java | 16 ++-- .../org/sonar/server/ws/TestResponse.java | 4 +- .../sonar/server/ws/WebServiceFilterTest.java | 10 +-- .../ws/WebServiceReroutingFilterTest.java | 2 +- .../java/org/sonar/server/ws/WsTester.java | 4 +- .../java/org/sonar/server/ws/WsUtilsTest.java | 4 +- .../org/sonar/core/issue/DefaultIssue.java | 2 +- .../sonar/core/util/CloseableIterator.java | 4 +- .../sonar/core/util/logs/DefaultProfiler.java | 5 +- .../sonar/core/i18n/I18nClassloaderTest.java | 2 +- .../core/util/CloseableIteratorTest.java | 6 +- .../sonar/core/util/ContextExceptionTest.java | 16 ++-- .../org/sonar/core/util/HttpsTrustTest.java | 2 +- .../core/util/MacAddressProviderTest.java | 2 +- .../sonar/core/util/ProgressLoggerTest.java | 2 +- .../core/util/ProtobufJsonFormatTest.java | 2 +- .../sonar/core/util/UuidFactoryFastTest.java | 2 +- .../sonar/core/util/UuidFactoryImplTest.java | 2 +- .../core/util/logs/DefaultProfilerTest.java | 2 +- .../main/java/ce/ws/BombActivatorAction.java | 2 +- .../src/main/java/ce/ws/SubmitAction.java | 2 +- .../SystemPasscodeWebService.java | 2 +- .../workerCount/RefreshWorkerCountAction.java | 2 +- .../src/main/java/LocalCallWebService.java | 6 +- .../tests/analysis/IssueJsonReportTest.java | 6 +- .../tests/analysis/PermissionTest.java | 4 +- .../tests/analysis/ReportDumpTest.java | 2 +- .../sonarqube/tests/analysis/ScannerTest.java | 6 +- .../analysis/SettingsEncryptionTest.java | 2 +- .../ExecuteAnalysisPermissionTest.java | 6 +- .../ProvisioningPermissionTest.java | 2 +- .../tests/ce/BackgroundTasksTest.java | 2 +- .../sonarqube/tests/ce/CeShutdownTest.java | 8 +- .../org/sonarqube/tests/ce/CeWorkersTest.java | 2 +- .../ce/ReportFailureNotificationTest.java | 4 +- .../CrossModuleDuplicationsTest.java | 4 +- .../CrossProjectDuplicationsTest.java | 12 +-- .../tests/duplication/DuplicationsTest.java | 2 +- .../duplication/NewDuplicationsTest.java | 6 +- .../sonarqube/tests/issue/AutoAssignTest.java | 6 +- .../tests/issue/CustomRulesTest.java | 2 +- .../tests/issue/IssueActionTest.java | 6 +- .../tests/issue/IssueBulkChangeTest.java | 2 +- .../tests/issue/IssueChangelogTest.java | 4 +- .../IssueCreationDatePluginChangedTest.java | 6 +- .../issue/IssueCreationDateQPChangedTest.java | 10 +-- .../tests/issue/IssueCreationTest.java | 2 +- .../tests/issue/IssueFilterExtensionTest.java | 2 +- .../tests/issue/IssueNotificationsTest.java | 2 +- .../tests/issue/IssueSearchTest.java | 6 +- .../tests/issue/IssueTrackingTest.java | 8 +- .../tests/issue/IssueWorkflowTest.java | 2 +- .../issue/OrganizationIssueAssignTest.java | 2 +- .../issue/OrganizationIssuesPageTest.java | 2 +- .../tests/marketplace/UpdateCenterTest.java | 2 +- .../measure/DifferentialPeriodsTest.java | 8 +- .../tests/measure/ProjectDashboardTest.java | 4 +- .../SincePreviousVersionHistoryTest.java | 2 +- .../tests/measure/SinceXDaysHistoryTest.java | 6 +- .../tests/organization/OrganizationTest.java | 2 +- .../tests/organization/RootUserTest.java | 2 +- .../tests/performance/MavenLogsTest.java | 6 +- .../tests/performance/ServerLogsTest.java | 2 +- .../scanner/BootstrappingTest.java | 4 +- .../performance/scanner/DuplicationTest.java | 2 +- .../performance/scanner/HighlightingTest.java | 2 +- .../scanner/ScannerPerformanceSuite.java | 2 +- .../server/ComputeEnginePerfTest.java | 2 +- .../performance/server/ServerPerfTest.java | 2 +- .../tests/plugins/CompressPluginsTest.java | 2 +- .../sonarqube/tests/plugins/PluginsTest.java | 2 +- .../tests/plugins/VersionPluginTest.java | 2 +- .../project/ProjectBulkDeletionPageTest.java | 2 +- .../tests/project/ProjectFilterTest.java | 3 +- .../project/ProjectKeyUpdatePageTest.java | 2 +- .../tests/project/ProjectListTest.java | 2 +- .../tests/project/ProjectSettingsTest.java | 2 +- .../project/ProjectVisibilityPageTest.java | 2 +- .../ProjectPermissionsTest.java | 2 +- .../OrganizationQualityGateTest.java | 4 +- .../QualityGateNotificationTest.java | 4 +- .../QualityGateOnRatingMeasuresTest.java | 4 +- .../MaintainabilityRatingMeasureTest.java | 6 +- .../qualityModel/NewDebtRatioMeasureTest.java | 4 +- .../TechnicalDebtAndIssueNewMeasuresTest.java | 8 +- .../TechnicalDebtInIssueChangelogTest.java | 2 +- .../tests/qualityModel/TechnicalDebtTest.java | 2 +- ...uiltInQualityProfilesNotificationTest.java | 4 +- .../qualityProfile/QualityProfilesUiTest.java | 2 +- .../tests/serverSystem/HttpHeadersTest.java | 16 ++-- .../tests/serverSystem/PingTest.java | 2 +- .../tests/serverSystem/ServerSystemTest.java | 2 +- .../settings/DeprecatedPropertiesWsTest.java | 14 ++-- .../sonarqube/tests/settings/EmailsTest.java | 4 +- .../tests/settings/PropertySetsTest.java | 10 +-- .../tests/settings/SettingsTest.java | 12 +-- .../SettingsTestRestartingOrchestrator.java | 4 +- .../tests/startup/StartupIndexationTest.java | 2 +- .../sonarqube/tests/test/NewCoverageTest.java | 2 +- .../tests/test/TestExecutionTest.java | 2 +- .../tests/user/BaseIdentityProviderTest.java | 24 +++--- .../tests/user/LocalAuthenticationTest.java | 6 +- .../tests/user/MyAccountPageTest.java | 6 +- .../user/OAuth2IdentityProviderTest.java | 8 +- .../tests/user/RealmAuthenticationTest.java | 10 +-- .../tests/user/SsoAuthenticationTest.java | 8 +- .../sonarqube/tests/user/UsersPageTest.java | 2 +- .../tests/webhook/ExternalServer.java | 2 +- .../test/java/util/ProjectAnalysisRule.java | 2 +- 620 files changed, 2385 insertions(+), 2419 deletions(-) diff --git a/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/rule/MultilineIssuesSensor.java b/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/rule/MultilineIssuesSensor.java index 6894a96436b..bf1d64b44a3 100644 --- a/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/rule/MultilineIssuesSensor.java +++ b/plugins/sonar-xoo-plugin/src/main/java/org/sonar/xoo/rule/MultilineIssuesSensor.java @@ -94,7 +94,7 @@ public class MultilineIssuesSensor implements Sensor { Integer issueFlowNum = Integer.parseInt(m.group(3)); TextPointer newPointer = file.newPointer(currentLine, m.end()); if (!startFlowsPositions.containsKey(issueId)) { - startFlowsPositions.put(issueId, HashBasedTable.create()); + startFlowsPositions.put(issueId, HashBasedTable.create()); } startFlowsPositions.get(issueId).row(issueFlowId).put(issueFlowNum, newPointer); } @@ -106,7 +106,7 @@ public class MultilineIssuesSensor implements Sensor { Integer issueFlowNum = Integer.parseInt(m.group(3)); TextPointer newPointer = file.newPointer(currentLine, m.start()); if (!endFlowsPositions.containsKey(issueId)) { - endFlowsPositions.put(issueId, HashBasedTable.create()); + endFlowsPositions.put(issueId, HashBasedTable.create()); } endFlowsPositions.get(issueId).row(issueFlowId).put(issueFlowNum, newPointer); } diff --git a/plugins/sonar-xoo-plugin/src/test/java/org/sonar/xoo/extensions/XooPostJobTest.java b/plugins/sonar-xoo-plugin/src/test/java/org/sonar/xoo/extensions/XooPostJobTest.java index 3e0154067c2..4ba546c0ebb 100644 --- a/plugins/sonar-xoo-plugin/src/test/java/org/sonar/xoo/extensions/XooPostJobTest.java +++ b/plugins/sonar-xoo-plugin/src/test/java/org/sonar/xoo/extensions/XooPostJobTest.java @@ -41,8 +41,8 @@ public class XooPostJobTest { public void increaseCoverage() { new XooPostJob().describe(new DefaultPostJobDescriptor()); PostJobContext context = mock(PostJobContext.class); - when(context.issues()).thenReturn(Arrays.asList()); - when(context.resolvedIssues()).thenReturn(Arrays.asList()); + when(context.issues()).thenReturn(Arrays.asList()); + when(context.resolvedIssues()).thenReturn(Arrays.asList()); new XooPostJob().execute(context); assertThat(logTester.logs()).contains("Resolved issues: 0", "Open issues: 0"); } diff --git a/plugins/sonar-xoo-plugin/src/test/java/org/sonar/xoo/scm/XooBlameCommandTest.java b/plugins/sonar-xoo-plugin/src/test/java/org/sonar/xoo/scm/XooBlameCommandTest.java index a3df4d6dead..63174745eec 100644 --- a/plugins/sonar-xoo-plugin/src/test/java/org/sonar/xoo/scm/XooBlameCommandTest.java +++ b/plugins/sonar-xoo-plugin/src/test/java/org/sonar/xoo/scm/XooBlameCommandTest.java @@ -76,7 +76,7 @@ public class XooBlameCommandTest { fs.add(inputFile); BlameOutput result = mock(BlameOutput.class); - when(input.filesToBlame()).thenReturn(Arrays.asList(inputFile)); + when(input.filesToBlame()).thenReturn(Arrays.asList(inputFile)); new XooBlameCommand().blame(input, result); verify(result).blameResult(inputFile, Arrays.asList( new BlameLine().revision("123").author("julien").date(DateUtils.parseDate("2014-12-12")), diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/StandaloneCeDistributedInformation.java b/server/sonar-ce/src/main/java/org/sonar/ce/StandaloneCeDistributedInformation.java index e08d709fc20..4063ac676a9 100644 --- a/server/sonar-ce/src/main/java/org/sonar/ce/StandaloneCeDistributedInformation.java +++ b/server/sonar-ce/src/main/java/org/sonar/ce/StandaloneCeDistributedInformation.java @@ -67,7 +67,7 @@ public class StandaloneCeDistributedInformation implements CeDistributedInformat } @Override - public void lockInterruptibly() throws InterruptedException { + public void lockInterruptibly() { // return immediately and never block } @@ -78,7 +78,7 @@ public class StandaloneCeDistributedInformation implements CeDistributedInformat } @Override - public boolean tryLock(long time, TimeUnit unit) throws InterruptedException { + public boolean tryLock(long time, TimeUnit unit) { // always succeed return true; } diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeWorkerImpl.java b/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeWorkerImpl.java index 20c72c40937..2e5696782e5 100644 --- a/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeWorkerImpl.java +++ b/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/CeWorkerImpl.java @@ -69,7 +69,7 @@ public class CeWorkerImpl implements CeWorker { } @Override - public Result call() throws Exception { + public Result call() { return withCustomizedThreadName(this::findAndProcessTask); } diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/EnabledCeWorkerControllerImpl.java b/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/EnabledCeWorkerControllerImpl.java index cb60089505c..a438ad8bd69 100644 --- a/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/EnabledCeWorkerControllerImpl.java +++ b/server/sonar-ce/src/main/java/org/sonar/ce/taskprocessor/EnabledCeWorkerControllerImpl.java @@ -82,7 +82,7 @@ public class EnabledCeWorkerControllerImpl implements EnabledCeWorkerController } @Override - public void close() throws Exception { + public void close() { map.put(ceWorker, Status.PAUSED); } } diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/app/CeServerTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/app/CeServerTest.java index d513f8123e3..41235ebb3c0 100644 --- a/server/sonar-ce/src/test/java/org/sonar/ce/app/CeServerTest.java +++ b/server/sonar-ce/src/test/java/org/sonar/ce/app/CeServerTest.java @@ -104,7 +104,7 @@ public class CeServerTest { } @Test - public void getStatus_does_not_return_OPERATIONAL_until_ComputeEngine_startup_returns() throws InterruptedException, IOException { + public void getStatus_does_not_return_OPERATIONAL_until_ComputeEngine_startup_returns() throws IOException { BlockingStartupComputeEngine computeEngine = new BlockingStartupComputeEngine(null); CeServer ceServer = newCeServer(computeEngine); @@ -122,7 +122,7 @@ public class CeServerTest { } @Test - public void getStatus_returns_OPERATIONAL_when_ComputeEngine_startup_throws_any_Exception_or_Error() throws InterruptedException, IOException { + public void getStatus_returns_OPERATIONAL_when_ComputeEngine_startup_throws_any_Exception_or_Error() throws IOException { Throwable startupException = new Throwable("Faking failing ComputeEngine#startup()"); BlockingStartupComputeEngine computeEngine = new BlockingStartupComputeEngine(startupException); @@ -152,7 +152,7 @@ public class CeServerTest { } @Test - public void awaitStop_throws_ISE_if_called_twice() throws InterruptedException, IOException { + public void awaitStop_throws_ISE_if_called_twice() throws IOException { final CeServer ceServer = newCeServer(); ExceptionCatcherWaitingThread waitingThread1 = new ExceptionCatcherWaitingThread(ceServer); ExceptionCatcherWaitingThread waitingThread2 = new ExceptionCatcherWaitingThread(ceServer); @@ -197,7 +197,7 @@ public class CeServerTest { } @Test - public void awaitStop_unblocks_when_waiting_for_ComputeEngine_startup_fails() throws InterruptedException, IOException { + public void awaitStop_unblocks_when_waiting_for_ComputeEngine_startup_fails() throws IOException { CeServer ceServer = newCeServer(new ComputeEngine() { @Override public void startup() { @@ -242,7 +242,7 @@ public class CeServerTest { return newCeServer(DoNothingComputeEngine.INSTANCE); } - private CeServer newCeServer(ComputeEngine computeEngine) throws IOException { + private CeServer newCeServer(ComputeEngine computeEngine) { checkState(this.underTest == null, "Only one CeServer can be created per test method"); this.underTest = new CeServer( computeEngine, minimumViableSystem); diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/cleaning/CeCleaningSchedulerImplTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/cleaning/CeCleaningSchedulerImplTest.java index 294fa73f958..489933bbb18 100644 --- a/server/sonar-ce/src/test/java/org/sonar/ce/cleaning/CeCleaningSchedulerImplTest.java +++ b/server/sonar-ce/src/test/java/org/sonar/ce/cleaning/CeCleaningSchedulerImplTest.java @@ -237,7 +237,7 @@ public class CeCleaningSchedulerImplTest { } @Override - public boolean awaitTermination(long timeout, TimeUnit unit) throws InterruptedException { + public boolean awaitTermination(long timeout, TimeUnit unit) { throw createUnsupportedOperationException(); } @@ -257,22 +257,22 @@ public class CeCleaningSchedulerImplTest { } @Override - public List> invokeAll(Collection> tasks) throws InterruptedException { + public List> invokeAll(Collection> tasks) { throw createUnsupportedOperationException(); } @Override - public List> invokeAll(Collection> tasks, long timeout, TimeUnit unit) throws InterruptedException { + public List> invokeAll(Collection> tasks, long timeout, TimeUnit unit) { throw createUnsupportedOperationException(); } @Override - public T invokeAny(Collection> tasks) throws InterruptedException, ExecutionException { + public T invokeAny(Collection> tasks) { throw createUnsupportedOperationException(); } @Override - public T invokeAny(Collection> tasks, long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException { + public T invokeAny(Collection> tasks, long timeout, TimeUnit unit) { throw createUnsupportedOperationException(); } diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/container/CePluginJarExploderTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/container/CePluginJarExploderTest.java index f5ae9beca0e..9a93936177d 100644 --- a/server/sonar-ce/src/test/java/org/sonar/ce/container/CePluginJarExploderTest.java +++ b/server/sonar-ce/src/test/java/org/sonar/ce/container/CePluginJarExploderTest.java @@ -40,7 +40,7 @@ public class CePluginJarExploderTest { CePluginJarExploder underTest = new CePluginJarExploder(fs); @Test - public void explode_jar_to_temp_directory() throws Exception { + public void explode_jar_to_temp_directory() { PluginInfo info = PluginInfo.create(plugin1Jar()); ExplodedPlugin exploded = underTest.explode(info); @@ -55,7 +55,7 @@ public class CePluginJarExploderTest { } @Test - public void plugins_do_not_overlap() throws Exception { + public void plugins_do_not_overlap() { PluginInfo info1 = PluginInfo.create(plugin1Jar()); PluginInfo info2 = PluginInfo.create(plugin2Jar()); diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/container/CePluginRepositoryTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/container/CePluginRepositoryTest.java index 267cc08b294..c8f8d99291b 100644 --- a/server/sonar-ce/src/test/java/org/sonar/ce/container/CePluginRepositoryTest.java +++ b/server/sonar-ce/src/test/java/org/sonar/ce/container/CePluginRepositoryTest.java @@ -67,7 +67,7 @@ public class CePluginRepositoryTest { } @Test - public void load_plugins() throws Exception { + public void load_plugins() { String pluginKey = "test"; when(fs.getInstalledPluginsDir()).thenReturn(new File("src/test/plugins/sonar-test-plugin/target")); diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/httpd/CeHttpServerTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/httpd/CeHttpServerTest.java index c136f414a78..a323b195a17 100644 --- a/server/sonar-ce/src/test/java/org/sonar/ce/httpd/CeHttpServerTest.java +++ b/server/sonar-ce/src/test/java/org/sonar/ce/httpd/CeHttpServerTest.java @@ -68,7 +68,7 @@ public class CeHttpServerTest { } @Test - public void start_publishes_URL_in_IPC() throws Exception { + public void start_publishes_URL_in_IPC() { try (DefaultProcessCommands commands = DefaultProcessCommands.secondary(this.sharedDir, 1)) { assertThat(commands.getHttpUrl()).startsWith("http://127.0.0.1:"); } diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/monitoring/CEQueueStatusImplConcurrentTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/monitoring/CEQueueStatusImplConcurrentTest.java index 8553d3f7652..deb06a4efd5 100644 --- a/server/sonar-ce/src/test/java/org/sonar/ce/monitoring/CEQueueStatusImplConcurrentTest.java +++ b/server/sonar-ce/src/test/java/org/sonar/ce/monitoring/CEQueueStatusImplConcurrentTest.java @@ -45,7 +45,7 @@ public class CEQueueStatusImplConcurrentTest { private CEQueueStatusImpl underTest = new CEQueueStatusImpl(mock(DbClient.class)); @After - public void tearDown() throws Exception { + public void tearDown() { executorService.shutdownNow(); } diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/notification/ReportAnalysisFailureNotificationExecutionListenerTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/notification/ReportAnalysisFailureNotificationExecutionListenerTest.java index a6011327269..242856862f2 100644 --- a/server/sonar-ce/src/test/java/org/sonar/ce/notification/ReportAnalysisFailureNotificationExecutionListenerTest.java +++ b/server/sonar-ce/src/test/java/org/sonar/ce/notification/ReportAnalysisFailureNotificationExecutionListenerTest.java @@ -77,7 +77,7 @@ public class ReportAnalysisFailureNotificationExecutionListenerTest { notificationService, dbClient, serializer, system2); @Before - public void setUp() throws Exception { + public void setUp() { } diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/queue/CeQueueCleanerTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/queue/CeQueueCleanerTest.java index db7ef7cef2e..a9bbcbe8177 100644 --- a/server/sonar-ce/src/test/java/org/sonar/ce/queue/CeQueueCleanerTest.java +++ b/server/sonar-ce/src/test/java/org/sonar/ce/queue/CeQueueCleanerTest.java @@ -83,7 +83,7 @@ public class CeQueueCleanerTest { assertThat(dataDao.selectData(dbTester.getSession(), "TASK_2")).isNotPresent(); } - private CeQueueDto insertInQueue(String taskUuid, CeQueueDto.Status status) throws IOException { + private CeQueueDto insertInQueue(String taskUuid, CeQueueDto.Status status) { CeQueueDto dto = new CeQueueDto(); dto.setTaskType(CeTaskTypes.REPORT); dto.setComponentUuid("PROJECT_1"); @@ -94,7 +94,7 @@ public class CeQueueCleanerTest { return dto; } - private void insertTaskData(String taskUuid) throws IOException { + private void insertTaskData(String taskUuid) { dbTester.getDbClient().ceTaskInputDao().insert(dbTester.getSession(), taskUuid, IOUtils.toInputStream("{binary}")); dbTester.getSession().commit(); } diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/queue/CeQueueInitializerTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/queue/CeQueueInitializerTest.java index e8890191361..fb3337fd66c 100644 --- a/server/sonar-ce/src/test/java/org/sonar/ce/queue/CeQueueInitializerTest.java +++ b/server/sonar-ce/src/test/java/org/sonar/ce/queue/CeQueueInitializerTest.java @@ -39,7 +39,7 @@ public class CeQueueInitializerTest { private CeQueueInitializer underTest = new CeQueueInitializer(processingScheduler, cleaningScheduler, mock(CeDistributedInformation.class)); @Test - public void clean_queue_then_start_scheduler_of_workers() throws IOException { + public void clean_queue_then_start_scheduler_of_workers() { underTest.onServerStart(server); verify(processingScheduler).startScheduling(); diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/queue/InternalCeQueueImplTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/queue/InternalCeQueueImplTest.java index 2d1a89c2ba2..fdb7b951f8a 100644 --- a/server/sonar-ce/src/test/java/org/sonar/ce/queue/InternalCeQueueImplTest.java +++ b/server/sonar-ce/src/test/java/org/sonar/ce/queue/InternalCeQueueImplTest.java @@ -79,7 +79,7 @@ public class InternalCeQueueImplTest { private InternalCeQueue underTest = new InternalCeQueueImpl(system2, db.getDbClient(), uuidFactory, queueStatus, defaultOrganizationProvider, computeEngineStatus); @Before - public void setUp() throws Exception { + public void setUp() { OrganizationDto defaultOrganization = db.getDefaultOrganization(); when(defaultOrganizationProvider.get()).thenReturn(DefaultOrganization.newBuilder() .setUuid(defaultOrganization.getUuid()) @@ -289,7 +289,7 @@ public class InternalCeQueueImplTest { } @Test - public void fail_to_remove_if_not_in_queue() throws Exception { + public void fail_to_remove_if_not_in_queue() { CeTask task = submit(CeTaskTypes.REPORT, "PROJECT_1"); underTest.remove(task, CeActivityDto.Status.SUCCESS, null, null); @@ -299,7 +299,7 @@ public class InternalCeQueueImplTest { } @Test - public void test_peek() throws Exception { + public void test_peek() { CeTask task = submit(CeTaskTypes.REPORT, "PROJECT_1"); Optional peek = underTest.peek(WORKER_UUID_1); @@ -329,7 +329,7 @@ public class InternalCeQueueImplTest { } @Test - public void peek_nothing_if_application_status_stopping() throws Exception { + public void peek_nothing_if_application_status_stopping() { submit(CeTaskTypes.REPORT, "PROJECT_1"); when(computeEngineStatus.getStatus()).thenReturn(STOPPING); @@ -492,7 +492,7 @@ public class InternalCeQueueImplTest { } @Test - public void cancel_pending() throws Exception { + public void cancel_pending() { CeTask task = submit(CeTaskTypes.REPORT, "PROJECT_1"); CeQueueDto queueDto = db.getDbClient().ceQueueDao().selectByUuid(db.getSession(), task.getUuid()).get(); @@ -521,7 +521,7 @@ public class InternalCeQueueImplTest { } @Test - public void fail_to_cancel_if_in_progress() throws Exception { + public void fail_to_cancel_if_in_progress() { CeTask task = submit(CeTaskTypes.REPORT, "PROJECT_1"); underTest.peek(WORKER_UUID_2); CeQueueDto queueDto = db.getDbClient().ceQueueDao().selectByUuid(db.getSession(), task.getUuid()).get(); @@ -533,7 +533,7 @@ public class InternalCeQueueImplTest { } @Test - public void cancelAll_pendings_but_not_in_progress() throws Exception { + public void cancelAll_pendings_but_not_in_progress() { CeTask inProgressTask = submit(CeTaskTypes.REPORT, "PROJECT_1"); CeTask pendingTask1 = submit(CeTaskTypes.REPORT, "PROJECT_2"); CeTask pendingTask2 = submit(CeTaskTypes.REPORT, "PROJECT_3"); @@ -698,7 +698,7 @@ public class InternalCeQueueImplTest { } @Test - public void pause_and_resume_submits() throws Exception { + public void pause_and_resume_submits() { assertThat(underTest.isSubmitPaused()).isFalse(); underTest.pauseSubmit(); assertThat(underTest.isSubmitPaused()).isTrue(); diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/queue/PurgeCeActivitiesTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/queue/PurgeCeActivitiesTest.java index d84423d78c1..5cb0603c805 100644 --- a/server/sonar-ce/src/test/java/org/sonar/ce/queue/PurgeCeActivitiesTest.java +++ b/server/sonar-ce/src/test/java/org/sonar/ce/queue/PurgeCeActivitiesTest.java @@ -41,7 +41,7 @@ public class PurgeCeActivitiesTest { private PurgeCeActivities underTest = new PurgeCeActivities(dbTester.getDbClient(), system2); @Test - public void delete_older_than_6_months() throws Exception { + public void delete_older_than_6_months() { insertWithDate("VERY_OLD", 1_000_000_000_000L); insertWithDate("RECENT", 1_500_000_000_000L); when(system2.now()).thenReturn(1_500_000_000_100L); diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/systeminfo/SystemInfoHttpActionTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/systeminfo/SystemInfoHttpActionTest.java index 25c7ad25f02..8a102f44cbb 100644 --- a/server/sonar-ce/src/test/java/org/sonar/ce/systeminfo/SystemInfoHttpActionTest.java +++ b/server/sonar-ce/src/test/java/org/sonar/ce/systeminfo/SystemInfoHttpActionTest.java @@ -49,7 +49,7 @@ public class SystemInfoHttpActionTest { private SystemInfoHttpAction underTest; @Before - public void setUp() throws Exception { + public void setUp() { underTest = new SystemInfoHttpAction(Arrays.asList(stateProvider1, stateProvider2)); } diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeProcessingSchedulerImplTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeProcessingSchedulerImplTest.java index abbb3e364d4..068692cbd48 100644 --- a/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeProcessingSchedulerImplTest.java +++ b/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeProcessingSchedulerImplTest.java @@ -391,7 +391,7 @@ public class CeProcessingSchedulerImplTest { public ScheduledFuture schedule(final Runnable command, long delay, TimeUnit unit) { ScheduledFuture res = new AbstractPartiallyImplementedScheduledFuture() { @Override - public Void get() throws InterruptedException, ExecutionException { + public Void get() { command.run(); return null; } @@ -405,7 +405,7 @@ public class CeProcessingSchedulerImplTest { ScheduledFuture res = new AbstractPartiallyImplementedScheduledFuture() { @Override - public V get() throws InterruptedException, ExecutionException { + public V get() throws ExecutionException { try { return callable.call(); } catch (Exception e) { @@ -422,7 +422,7 @@ public class CeProcessingSchedulerImplTest { Future res = new AbstractPartiallyImplementedFuture() { @Override - public T get() throws InterruptedException, ExecutionException { + public T get() throws ExecutionException { try { return task.call(); } catch (Exception e) { @@ -473,7 +473,7 @@ public class CeProcessingSchedulerImplTest { } @Override - public boolean awaitTermination(long timeout, TimeUnit unit) throws InterruptedException { + public boolean awaitTermination(long timeout, TimeUnit unit) { throw new UnsupportedOperationException("awaitTermination(long timeout, TimeUnit unit) not implemented"); } @@ -488,22 +488,22 @@ public class CeProcessingSchedulerImplTest { } @Override - public List> invokeAll(Collection> tasks) throws InterruptedException { + public List> invokeAll(Collection> tasks) { throw new UnsupportedOperationException("invokeAll(Collection> tasks) not implemented"); } @Override - public List> invokeAll(Collection> tasks, long timeout, TimeUnit unit) throws InterruptedException { + public List> invokeAll(Collection> tasks, long timeout, TimeUnit unit) { throw new UnsupportedOperationException("invokeAll(Collection> tasks, long timeout, TimeUnit unit) not implemented"); } @Override - public T invokeAny(Collection> tasks) throws InterruptedException, ExecutionException { + public T invokeAny(Collection> tasks) { throw new UnsupportedOperationException("invokeAny(Collection> tasks) not implemented"); } @Override - public T invokeAny(Collection> tasks, long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException { + public T invokeAny(Collection> tasks, long timeout, TimeUnit unit) { throw new UnsupportedOperationException("invokeAny(Collection> tasks, long timeout, TimeUnit unit) not implemented"); } } @@ -542,7 +542,7 @@ public class CeProcessingSchedulerImplTest { } @Override - public T get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException { + public T get(long timeout, TimeUnit unit) { throw new UnsupportedOperationException("get(long timeout, TimeUnit unit) not implemented"); } } diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeWorkerImplTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeWorkerImplTest.java index c41b7aaaff1..be6f45222d2 100644 --- a/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeWorkerImplTest.java +++ b/server/sonar-ce/src/test/java/org/sonar/ce/taskprocessor/CeWorkerImplTest.java @@ -77,7 +77,7 @@ public class CeWorkerImplTest { private InOrder inOrder = Mockito.inOrder(taskProcessor, queue, executionListener1, executionListener2); @Before - public void setUp() throws Exception { + public void setUp() { when(enabledCeWorkerController.isEnabled(any(CeWorker.class))).thenReturn(true); } diff --git a/server/sonar-db-core/src/main/java/org/sonar/db/profiling/ProfiledDataSource.java b/server/sonar-db-core/src/main/java/org/sonar/db/profiling/ProfiledDataSource.java index f6a86d00092..2c0fa00317f 100644 --- a/server/sonar-db-core/src/main/java/org/sonar/db/profiling/ProfiledDataSource.java +++ b/server/sonar-db-core/src/main/java/org/sonar/db/profiling/ProfiledDataSource.java @@ -22,7 +22,6 @@ package org.sonar.db.profiling; import java.io.PrintWriter; import java.sql.Connection; import java.sql.SQLException; -import java.sql.SQLFeatureNotSupportedException; import java.util.Collection; import org.apache.commons.dbcp.BasicDataSource; import org.sonar.api.utils.log.Logger; @@ -334,7 +333,7 @@ public class ProfiledDataSource extends BasicDataSource { } @Override - public java.util.logging.Logger getParentLogger() throws SQLFeatureNotSupportedException { + public java.util.logging.Logger getParentLogger() { return java.util.logging.Logger.getLogger(getClass().getName()); } diff --git a/server/sonar-db-core/src/test/java/org/sonar/db/CoreDbTester.java b/server/sonar-db-core/src/test/java/org/sonar/db/CoreDbTester.java index 44583130153..82889a2a5d1 100644 --- a/server/sonar-db-core/src/test/java/org/sonar/db/CoreDbTester.java +++ b/server/sonar-db-core/src/test/java/org/sonar/db/CoreDbTester.java @@ -47,7 +47,7 @@ public class CoreDbTester extends AbstractDbTester { } @Override - protected void before() throws Throwable { + protected void before() { db.start(); db.truncateTables(); } diff --git a/server/sonar-db-core/src/test/java/org/sonar/db/DatabaseCommands.java b/server/sonar-db-core/src/test/java/org/sonar/db/DatabaseCommands.java index ae4b6a68b25..e126f335640 100644 --- a/server/sonar-db-core/src/test/java/org/sonar/db/DatabaseCommands.java +++ b/server/sonar-db-core/src/test/java/org/sonar/db/DatabaseCommands.java @@ -126,7 +126,7 @@ public abstract class DatabaseCommands { } @Override - protected boolean shouldTruncate(Connection connection, String table) throws SQLException { + protected boolean shouldTruncate(Connection connection, String table) { // truncate all tables on mssql, else unexpected errors in some tests return true; } diff --git a/server/sonar-db-core/src/test/java/org/sonar/db/DdlUtilsTest.java b/server/sonar-db-core/src/test/java/org/sonar/db/DdlUtilsTest.java index 2c056305179..94a01346efa 100644 --- a/server/sonar-db-core/src/test/java/org/sonar/db/DdlUtilsTest.java +++ b/server/sonar-db-core/src/test/java/org/sonar/db/DdlUtilsTest.java @@ -47,7 +47,7 @@ public class DdlUtilsTest { @Test public void shouldCreateSchema_with_schema_migrations() throws SQLException { DriverManager.registerDriver(new Driver()); - try (Connection connection = DriverManager.getConnection("jdbc:h2:mem:sonar_test");) { + try (Connection connection = DriverManager.getConnection("jdbc:h2:mem:sonar_test")) { DdlUtils.createSchema(connection, "h2", true); int tableCount = countTables(connection); diff --git a/server/sonar-db-core/src/test/java/org/sonar/db/dialect/H2Test.java b/server/sonar-db-core/src/test/java/org/sonar/db/dialect/H2Test.java index 3539d4837ec..5ca459fe845 100644 --- a/server/sonar-db-core/src/test/java/org/sonar/db/dialect/H2Test.java +++ b/server/sonar-db-core/src/test/java/org/sonar/db/dialect/H2Test.java @@ -47,7 +47,7 @@ public class H2Test { } @Test - public void testFetchSizeForScrolling() throws Exception { + public void testFetchSizeForScrolling() { assertThat(dialect.getScrollDefaultFetchSize()).isEqualTo(200); } diff --git a/server/sonar-db-core/src/test/java/org/sonar/db/dialect/MsSqlTest.java b/server/sonar-db-core/src/test/java/org/sonar/db/dialect/MsSqlTest.java index e3969b7d65c..6fb49868151 100644 --- a/server/sonar-db-core/src/test/java/org/sonar/db/dialect/MsSqlTest.java +++ b/server/sonar-db-core/src/test/java/org/sonar/db/dialect/MsSqlTest.java @@ -49,7 +49,7 @@ public class MsSqlTest { } @Test - public void do_not_support_jtds_since_5_2() throws Exception { + public void do_not_support_jtds_since_5_2() { assertThat(msSql.matchesJdbcURL("jdbc:jtds:sqlserver://localhost;databaseName=SONAR;SelectMethod=Cursor")).isFalse(); } diff --git a/server/sonar-db-core/src/test/java/org/sonar/db/dialect/MySqlTest.java b/server/sonar-db-core/src/test/java/org/sonar/db/dialect/MySqlTest.java index 17df8304a46..039bb76bbed 100644 --- a/server/sonar-db-core/src/test/java/org/sonar/db/dialect/MySqlTest.java +++ b/server/sonar-db-core/src/test/java/org/sonar/db/dialect/MySqlTest.java @@ -50,7 +50,7 @@ public class MySqlTest { } @Test - public void testFetchSizeForScrolling() throws Exception { + public void testFetchSizeForScrolling() { assertThat(mySql.getScrollDefaultFetchSize()).isEqualTo(Integer.MIN_VALUE); assertThat(mySql.getScrollSingleRowFetchSize()).isEqualTo(Integer.MIN_VALUE); } diff --git a/server/sonar-db-core/src/test/java/org/sonar/db/dialect/OracleTest.java b/server/sonar-db-core/src/test/java/org/sonar/db/dialect/OracleTest.java index 4911fff411b..3e7d55613b6 100644 --- a/server/sonar-db-core/src/test/java/org/sonar/db/dialect/OracleTest.java +++ b/server/sonar-db-core/src/test/java/org/sonar/db/dialect/OracleTest.java @@ -47,7 +47,7 @@ public class OracleTest { } @Test - public void testFetchSizeForScrolling() throws Exception { + public void testFetchSizeForScrolling() { assertThat(underTest.getScrollDefaultFetchSize()).isEqualTo(200); assertThat(underTest.getScrollSingleRowFetchSize()).isEqualTo(1); } diff --git a/server/sonar-db-core/src/test/java/org/sonar/db/dialect/PostgreSqlTest.java b/server/sonar-db-core/src/test/java/org/sonar/db/dialect/PostgreSqlTest.java index e703f3b9a67..67dd06a7fdd 100644 --- a/server/sonar-db-core/src/test/java/org/sonar/db/dialect/PostgreSqlTest.java +++ b/server/sonar-db-core/src/test/java/org/sonar/db/dialect/PostgreSqlTest.java @@ -52,7 +52,7 @@ public class PostgreSqlTest { } @Test - public void testFetchSizeForScrolling() throws Exception { + public void testFetchSizeForScrolling() { assertThat(dialect.getScrollDefaultFetchSize()).isEqualTo(200); } diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/ce/LogsIteratorInputStream.java b/server/sonar-db-dao/src/main/java/org/sonar/db/ce/LogsIteratorInputStream.java index 8a1d09b0851..2a7b2ff177c 100644 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/ce/LogsIteratorInputStream.java +++ b/server/sonar-db-dao/src/main/java/org/sonar/db/ce/LogsIteratorInputStream.java @@ -48,7 +48,7 @@ final class LogsIteratorInputStream extends InputStream { } @Override - public int read() throws IOException { + public int read() { if (nextChar == UNSET || nextChar >= buf.length) { fill(); if (nextChar == UNSET) { diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/measure/ProjectMeasuresIndexerIterator.java b/server/sonar-db-dao/src/main/java/org/sonar/db/measure/ProjectMeasuresIndexerIterator.java index 21528e32981..5fa50371054 100644 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/measure/ProjectMeasuresIndexerIterator.java +++ b/server/sonar-db-dao/src/main/java/org/sonar/db/measure/ProjectMeasuresIndexerIterator.java @@ -97,13 +97,9 @@ public class ProjectMeasuresIndexerIterator extends CloseableIterator projects = selectProjects(session, projectUuid); - PreparedStatement projectsStatement = createMeasuresStatement(session); - return new ProjectMeasuresIndexerIterator(projectsStatement, projects); - } catch (SQLException e) { - throw new IllegalStateException("Fail to execute request to select all project measures", e); - } + List projects = selectProjects(session, projectUuid); + PreparedStatement projectsStatement = createMeasuresStatement(session); + return new ProjectMeasuresIndexerIterator(projectsStatement, projects); } private static List selectProjects(DbSession session, @Nullable String projectUuid) { @@ -146,7 +142,7 @@ public class ProjectMeasuresIndexerIterator extends CloseableIterator "?").collect(Collectors.joining(",")); String sql = StringUtils.replace(SQL_MEASURES, "{metricNames}", metricNameQuestionMarks); diff --git a/server/sonar-db-dao/src/test/java/org/sonar/core/permission/ProjectPermissionsTest.java b/server/sonar-db-dao/src/test/java/org/sonar/core/permission/ProjectPermissionsTest.java index 4e38ee1aa75..dd86d8d7099 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/core/permission/ProjectPermissionsTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/core/permission/ProjectPermissionsTest.java @@ -27,12 +27,12 @@ import static org.assertj.core.api.Assertions.assertThat; public class ProjectPermissionsTest { @Test - public void all_permissions() throws Exception { + public void all_permissions() { assertThat(ProjectPermissions.ALL).containsExactly(UserRole.ADMIN, UserRole.CODEVIEWER, UserRole.ISSUE_ADMIN, GlobalPermissions.SCAN_EXECUTION, UserRole.USER); } @Test - public void all_permissions_as_string() throws Exception { + public void all_permissions_as_string() { assertThat(ProjectPermissions.ALL_ON_ONE_LINE).isEqualTo("admin, codeviewer, issueadmin, scan, user"); } } diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/DBSessionsImplTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/DBSessionsImplTest.java index 66aa4babfdc..bee042455f2 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/DBSessionsImplTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/DBSessionsImplTest.java @@ -62,7 +62,7 @@ public class DBSessionsImplTest { private final DBSessionsImpl underTest = new DBSessionsImpl(myBatis); @After - public void tearDown() throws Exception { + public void tearDown() { underTest.disableCaching(); } diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/DbTester.java b/server/sonar-db-dao/src/test/java/org/sonar/db/DbTester.java index 6147aa787a3..01e64c19a3c 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/DbTester.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/DbTester.java @@ -319,7 +319,7 @@ public class DbTester extends AbstractDbTester { } @Override - public Connection get() throws SQLException { + public Connection get() { return dbSession.getConnection(); } diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/MyBatisTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/MyBatisTest.java index 7c5b64e8b07..e1fad91b57a 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/MyBatisTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/MyBatisTest.java @@ -47,7 +47,7 @@ public class MyBatisTest { private MyBatis underTest = new MyBatis(database); @After - public void tearDown() throws Exception { + public void tearDown() { underTest.stop(); } diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/ce/CeActivityDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/ce/CeActivityDaoTest.java index 1f257aa785b..8fcdb1080be 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/ce/CeActivityDaoTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/ce/CeActivityDaoTest.java @@ -158,7 +158,7 @@ public class CeActivityDaoTest { insert("TASK_4", "views", null, CeActivityDto.Status.SUCCESS); // no filters - CeTaskQuery query = new CeTaskQuery().setStatuses(Collections.emptyList()); + CeTaskQuery query = new CeTaskQuery().setStatuses(Collections.emptyList()); List dtos = underTest.selectByQuery(db.getSession(), query, forPage(1).andSize(10)); assertThat(dtos).extracting("uuid").containsExactly("TASK_4", "TASK_3", "TASK_2", "TASK_1"); diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/ce/CeQueueDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/ce/CeQueueDaoTest.java index 41d24b67d1b..1a6c1b7d9d1 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/ce/CeQueueDaoTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/ce/CeQueueDaoTest.java @@ -201,7 +201,7 @@ public class CeQueueDaoTest { } @Test - public void test_resetAllToPendingStatus() throws Exception { + public void test_resetAllToPendingStatus() { insert(TASK_UUID_1, COMPONENT_UUID_1, PENDING); insert(TASK_UUID_2, COMPONENT_UUID_1, IN_PROGRESS); insert(TASK_UUID_3, COMPONENT_UUID_1, IN_PROGRESS); @@ -361,7 +361,7 @@ public class CeQueueDaoTest { } @Test - public void peek_none_if_no_pendings() throws Exception { + public void peek_none_if_no_pendings() { assertThat(underTest.peek(db.getSession(), WORKER_UUID_1, MAX_EXECUTION_COUNT).isPresent()).isFalse(); // not pending, but in progress @@ -370,7 +370,7 @@ public class CeQueueDaoTest { } @Test - public void peek_oldest_pending() throws Exception { + public void peek_oldest_pending() { insert(TASK_UUID_1, COMPONENT_UUID_1, PENDING); system2.setNow(INIT_TIME + 3_000_000); insert(TASK_UUID_2, COMPONENT_UUID_2, PENDING); @@ -401,7 +401,7 @@ public class CeQueueDaoTest { } @Test - public void do_not_peek_multiple_tasks_on_same_project_at_the_same_time() throws Exception { + public void do_not_peek_multiple_tasks_on_same_project_at_the_same_time() { // two pending tasks on the same project insert(TASK_UUID_1, COMPONENT_UUID_1, PENDING); system2.setNow(INIT_TIME + 3_000_000); @@ -563,7 +563,7 @@ public class CeQueueDaoTest { .setTaskType(CeTaskTypes.REPORT) .setCreatedAt(100_000L)); - CeTaskQuery query = new CeTaskQuery().setComponentUuids(Collections.emptyList()); + CeTaskQuery query = new CeTaskQuery().setComponentUuids(Collections.emptyList()); List result = underTest.selectByQueryInDescOrder(db.getSession(), query, 1_000); int total = underTest.countByQuery(db.getSession(), query); diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/ce/CeTaskInputDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/ce/CeTaskInputDaoTest.java index f2e41fa2bac..2f63398d6c3 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/ce/CeTaskInputDaoTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/ce/CeTaskInputDaoTest.java @@ -66,7 +66,7 @@ public class CeTaskInputDaoTest { } @Test - public void fail_to_insert_invalid_row() throws Exception { + public void fail_to_insert_invalid_row() { expectedException.expectMessage("Fail to insert data of CE task null"); underTest.insert(dbTester.getSession(), null, IOUtils.toInputStream(SOME_DATA)); } diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/ce/CeTaskQueryTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/ce/CeTaskQueryTest.java index 0954a0e4e26..8322735f85f 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/ce/CeTaskQueryTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/ce/CeTaskQueryTest.java @@ -57,7 +57,7 @@ public class CeTaskQueryTest { */ @Test public void short_circuited_if_empty_component_uuid_filter() { - underTest.setComponentUuids(Collections.emptyList()); + underTest.setComponentUuids(Collections.emptyList()); assertThat(underTest.getComponentUuids()).isEmpty(); assertThat(underTest.isShortCircuitedByComponentUuids()).isTrue(); } diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/ce/LogsIteratorInputStreamTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/ce/LogsIteratorInputStreamTest.java index ec9d6dfe7eb..d21f9a1f492 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/ce/LogsIteratorInputStreamTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/ce/LogsIteratorInputStreamTest.java @@ -56,7 +56,7 @@ public class LogsIteratorInputStreamTest { } @Test - public void constructor_throws_IAE_when_ClosableIterator_is_empty() throws IOException { + public void constructor_throws_IAE_when_ClosableIterator_is_empty() { expectedException.expect(IllegalArgumentException.class); expectedException.expectMessage("LogsIterator can't be empty or already read"); @@ -64,7 +64,7 @@ public class LogsIteratorInputStreamTest { } @Test - public void constructor_throws_IAE_when_ClosableIterator_has_already_been_read() throws IOException { + public void constructor_throws_IAE_when_ClosableIterator_has_already_been_read() { CloseableIterator iterator = CloseableIterator.from(Arrays.asList("line1").iterator()); // read iterator to the end diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentDaoTest.java index 7db5ff0c21a..8daf11c63bb 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentDaoTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentDaoTest.java @@ -375,7 +375,7 @@ public class ComponentDaoTest { } @Test - public void fail_with_IAE_select_component_keys_by_qualifiers_on_empty_qualifier() throws Exception { + public void fail_with_IAE_select_component_keys_by_qualifiers_on_empty_qualifier() { expectedException.expect(IllegalArgumentException.class); expectedException.expectMessage("Qualifiers cannot be empty"); @@ -987,7 +987,7 @@ public class ComponentDaoTest { } @Test - public void delete() throws Exception { + public void delete() { ComponentDto project1 = db.components().insertPrivateProject(db.getDefaultOrganization(), (t) -> t.setDbKey("PROJECT_1")); db.components().insertPrivateProject(db.getDefaultOrganization(), (t) -> t.setDbKey("PROJECT_2")); diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentLinkDtoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentLinkDtoTest.java index ced3e075f45..6e3c8ef5e2f 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentLinkDtoTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentLinkDtoTest.java @@ -26,7 +26,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class ComponentLinkDtoTest { @Test - public void test_getters_and_setters() throws Exception { + public void test_getters_and_setters() { ComponentLinkDto dto = new ComponentLinkDto() .setId(1L) .setComponentUuid("ABCD") @@ -42,7 +42,7 @@ public class ComponentLinkDtoTest { } @Test - public void test_provided_types() throws Exception { + public void test_provided_types() { assertThat(ComponentLinkDto.PROVIDED_TYPES).hasSize(5); } } diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentQueryTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentQueryTest.java index c39004a9ed2..10e8d6389a2 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentQueryTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentQueryTest.java @@ -35,7 +35,7 @@ public class ComponentQueryTest { public ExpectedException expectedException = ExpectedException.none(); @Test - public void build_query() throws Exception { + public void build_query() { ComponentQuery underTest = ComponentQuery.builder() .setNameOrKeyQuery("key") .setLanguage("java") @@ -53,7 +53,7 @@ public class ComponentQueryTest { } @Test - public void build_query_minimal_properties() throws Exception { + public void build_query_minimal_properties() { ComponentQuery underTest = ComponentQuery.builder() .setQualifiers(PROJECT) .build(); @@ -64,7 +64,7 @@ public class ComponentQueryTest { } @Test - public void test_getNameOrKeyUpperLikeQuery() throws Exception { + public void test_getNameOrKeyUpperLikeQuery() { ComponentQuery underTest = ComponentQuery.builder() .setNameOrKeyQuery("NAME/key") .setQualifiers(PROJECT) diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentTreeQueryTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentTreeQueryTest.java index 941b5f727bf..e1138b66f89 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentTreeQueryTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/component/ComponentTreeQueryTest.java @@ -38,7 +38,7 @@ public class ComponentTreeQueryTest { public ExpectedException expectedException = ExpectedException.none(); @Test - public void create_query() throws Exception { + public void create_query() { ComponentTreeQuery query = ComponentTreeQuery.builder() .setBaseUuid(BASE_UUID) .setStrategy(CHILDREN) @@ -54,7 +54,7 @@ public class ComponentTreeQueryTest { } @Test - public void create_minimal_query() throws Exception { + public void create_minimal_query() { ComponentTreeQuery query = ComponentTreeQuery.builder() .setBaseUuid(BASE_UUID) .setStrategy(CHILDREN) @@ -68,7 +68,7 @@ public class ComponentTreeQueryTest { } @Test - public void test_getUuidPath() throws Exception { + public void test_getUuidPath() { assertThat(ComponentTreeQuery.builder().setBaseUuid(BASE_UUID).setStrategy(CHILDREN) .build().getUuidPath(newPrivateProjectDto(newOrganizationDto(), "PROJECT_UUID"))).isEqualTo(".PROJECT_UUID."); @@ -77,7 +77,7 @@ public class ComponentTreeQueryTest { } @Test - public void fail_when_no_base_uuid() throws Exception { + public void fail_when_no_base_uuid() { expectedException.expect(NullPointerException.class); ComponentTreeQuery.builder() .setStrategy(CHILDREN) @@ -85,7 +85,7 @@ public class ComponentTreeQueryTest { } @Test - public void fail_when_no_strategy() throws Exception { + public void fail_when_no_strategy() { expectedException.expect(NullPointerException.class); ComponentTreeQuery.builder() .setBaseUuid(BASE_UUID) diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/component/SnapshotDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/component/SnapshotDaoTest.java index 7804f25aa5b..d993ed585b1 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/component/SnapshotDaoTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/component/SnapshotDaoTest.java @@ -190,7 +190,7 @@ public class SnapshotDaoTest { } @Test - public void select_first_snapshots() throws Exception { + public void select_first_snapshots() { ComponentDto project = newPrivateProjectDto(db.getDefaultOrganization()); db.getDbClient().componentDao().insert(dbSession, project); diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/component/SnapshotDtoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/component/SnapshotDtoTest.java index f6fdfc0b4a0..e13f2e446f8 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/component/SnapshotDtoTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/component/SnapshotDtoTest.java @@ -33,7 +33,7 @@ public class SnapshotDtoTest { public ExpectedException expectedException = ExpectedException.none(); @Test - public void test_getter_and_setter() throws Exception { + public void test_getter_and_setter() { SnapshotDto snapshotDto = new SnapshotDto() .setId(10L) .setBuildDate(parseDate("2014-07-02").getTime()) @@ -55,7 +55,7 @@ public class SnapshotDtoTest { } @Test - public void fail_if_version_name_is_longer_then_100_characters() throws Exception { + public void fail_if_version_name_is_longer_then_100_characters() { SnapshotDto snapshotDto = new SnapshotDto(); snapshotDto.setVersion(null); snapshotDto.setVersion("1.0"); diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/component/SnapshotQueryTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/component/SnapshotQueryTest.java index 9b3871f587b..bd267765128 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/component/SnapshotQueryTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/component/SnapshotQueryTest.java @@ -28,7 +28,7 @@ import static org.sonar.db.component.SnapshotQuery.SORT_ORDER.ASC; public class SnapshotQueryTest { @Test - public void test_setters_and_getters() throws Exception { + public void test_setters_and_getters() { SnapshotQuery query = new SnapshotQuery() .setComponentUuid("abcd") .setIsLast(true) diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/event/EventDtoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/event/EventDtoTest.java index 3982b9764ec..bea8d7db1d4 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/event/EventDtoTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/event/EventDtoTest.java @@ -26,7 +26,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class EventDtoTest { @Test - public void test_getters_and_setters() throws Exception { + public void test_getters_and_setters() { EventDto dto = new EventDto() .setId(1L) .setAnalysisUuid("uuid_1") diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/favorite/FavoriteDbTester.java b/server/sonar-db-dao/src/test/java/org/sonar/db/favorite/FavoriteDbTester.java index 6c3e8dce0f0..0423a490466 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/favorite/FavoriteDbTester.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/favorite/FavoriteDbTester.java @@ -50,7 +50,7 @@ public class FavoriteDbTester { List result = dbClient.propertiesDao().selectByQuery(PropertyQuery.builder() .setKey(PROP_FAVORITE_KEY) .setComponentId(componentDto.getId()) - .setUserId((int) userId) + .setUserId(userId) .build(), dbSession); return !result.isEmpty(); diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/issue/IssueDtoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/issue/IssueDtoTest.java index f5ad1e85522..c9ef120abde 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/issue/IssueDtoTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/issue/IssueDtoTest.java @@ -136,7 +136,7 @@ public class IssueDtoTest { assertThat(dto.getTags()).containsOnly("tag1", "tag2", "tag3"); assertThat(dto.getTagsString()).isEqualTo("tag1,tag2,tag3"); - dto.setTags(Arrays.asList()); + dto.setTags(Arrays.asList()); assertThat(dto.getTags()).isEmpty(); dto.setTagsString("tag1, tag2 ,,tag3"); diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/measure/MeasureDtoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/measure/MeasureDtoTest.java index 75363bf293a..eb8b1ac86d4 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/measure/MeasureDtoTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/measure/MeasureDtoTest.java @@ -29,7 +29,7 @@ public class MeasureDtoTest { MeasureDto underTest = new MeasureDto(); @Test - public void test_getter_and_setter() throws Exception { + public void test_getter_and_setter() { underTest .setValue(2d) .setData("text value") diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/measure/MeasureTreeQueryTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/measure/MeasureTreeQueryTest.java index a65cd4adf5c..90d7aaedbd8 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/measure/MeasureTreeQueryTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/measure/MeasureTreeQueryTest.java @@ -37,7 +37,7 @@ public class MeasureTreeQueryTest { public ExpectedException expectedException = ExpectedException.none(); @Test - public void create_query() throws Exception { + public void create_query() { MeasureTreeQuery query = MeasureTreeQuery.builder() .setStrategy(CHILDREN) .setQualifiers(asList("FIL", "DIR")) @@ -52,7 +52,7 @@ public class MeasureTreeQueryTest { } @Test - public void create_minimal_query() throws Exception { + public void create_minimal_query() { MeasureTreeQuery query = MeasureTreeQuery.builder() .setStrategy(CHILDREN) .build(); @@ -64,7 +64,7 @@ public class MeasureTreeQueryTest { } @Test - public void test_getNameOrKeyUpperLikeQuery() throws Exception { + public void test_getNameOrKeyUpperLikeQuery() { assertThat(MeasureTreeQuery.builder() .setNameOrKeyQuery("like-\\_%/-value") .setStrategy(CHILDREN) @@ -76,7 +76,7 @@ public class MeasureTreeQueryTest { } @Test - public void test_getUuidPath() throws Exception { + public void test_getUuidPath() { assertThat(MeasureTreeQuery.builder().setStrategy(CHILDREN) .build().getUuidPath(ComponentTesting.newPrivateProjectDto(OrganizationTesting.newOrganizationDto(), "PROJECT_UUID"))).isEqualTo(".PROJECT_UUID."); @@ -85,7 +85,7 @@ public class MeasureTreeQueryTest { } @Test - public void return_empty_when_metrics_is_empty() throws Exception { + public void return_empty_when_metrics_is_empty() { assertThat(MeasureTreeQuery.builder() .setStrategy(CHILDREN) .setMetricIds(Collections.emptyList()) @@ -98,7 +98,7 @@ public class MeasureTreeQueryTest { } @Test - public void return_empty_when_qualifiers_is_empty() throws Exception { + public void return_empty_when_qualifiers_is_empty() { assertThat(MeasureTreeQuery.builder() .setStrategy(CHILDREN) .setQualifiers(Collections.emptyList()) @@ -111,7 +111,7 @@ public class MeasureTreeQueryTest { } @Test - public void fail_when_no_strategy() throws Exception { + public void fail_when_no_strategy() { expectedException.expect(NullPointerException.class); MeasureTreeQuery.builder() .build(); diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/measure/PastMeasureDtoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/measure/PastMeasureDtoTest.java index 71f54ef139a..c754fa8dfc9 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/measure/PastMeasureDtoTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/measure/PastMeasureDtoTest.java @@ -26,7 +26,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class PastMeasureDtoTest { @Test - public void test_getter_and_setter() throws Exception { + public void test_getter_and_setter() { PastMeasureDto dto = new PastMeasureDto() .setValue(1d) .setMetricId(2); @@ -37,7 +37,7 @@ public class PastMeasureDtoTest { } @Test - public void test_has_value() throws Exception { + public void test_has_value() { PastMeasureDto measureWithValue = new PastMeasureDto() .setValue(1d) .setMetricId(2); diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/measure/ProjectMeasuresIndexerIteratorTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/measure/ProjectMeasuresIndexerIteratorTest.java index 1f5ef5692ac..3b5cd58dd61 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/measure/ProjectMeasuresIndexerIteratorTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/measure/ProjectMeasuresIndexerIteratorTest.java @@ -83,7 +83,7 @@ public class ProjectMeasuresIndexerIteratorTest { } @Test - public void return_project_measure_having_leak() throws Exception { + public void return_project_measure_having_leak() { OrganizationDto organization = dbTester.organizations().insert(); ComponentDto project = dbTester.components().insertPrivateProject(organization, p -> p.setDbKey("Project-Key").setName("Project Name").setTagsString("platform,java")); MetricDto metric = dbTester.measures().insertMetric(m -> m.setValueType(INT.name()).setKey("new_lines")); @@ -95,7 +95,7 @@ public class ProjectMeasuresIndexerIteratorTest { } @Test - public void return_quality_gate_status_measure() throws Exception { + public void return_quality_gate_status_measure() { OrganizationDto organization = dbTester.organizations().insert(); ComponentDto project1 = dbTester.components().insertPrivateProject(organization); ComponentDto project2 = dbTester.components().insertPrivateProject(organization); @@ -113,7 +113,7 @@ public class ProjectMeasuresIndexerIteratorTest { } @Test - public void does_not_fail_when_quality_gate_has_no_value() throws Exception { + public void does_not_fail_when_quality_gate_has_no_value() { OrganizationDto organization = dbTester.organizations().insert(); ComponentDto project = dbTester.components().insertPrivateProject(organization); MetricDto metric = dbTester.measures().insertMetric(m -> m.setValueType(LEVEL.name()).setKey("alert_status")); @@ -125,7 +125,7 @@ public class ProjectMeasuresIndexerIteratorTest { } @Test - public void return_language_distribution_measure() throws Exception { + public void return_language_distribution_measure() { OrganizationDto organization = dbTester.organizations().insert(); ComponentDto project = dbTester.components().insertPrivateProject(organization); MetricDto metric = dbTester.measures().insertMetric(m -> m.setValueType(DATA.name()).setKey("ncloc_language_distribution")); @@ -138,7 +138,7 @@ public class ProjectMeasuresIndexerIteratorTest { } @Test - public void does_not_return_none_numeric_metrics() throws Exception { + public void does_not_return_none_numeric_metrics() { OrganizationDto organization = dbTester.organizations().insert(); ComponentDto project = dbTester.components().insertPrivateProject(organization); MetricDto dataMetric = dbTester.measures().insertMetric(m -> m.setValueType(DATA.name()).setKey("data")); @@ -154,7 +154,7 @@ public class ProjectMeasuresIndexerIteratorTest { } @Test - public void does_not_return_disabled_metrics() throws Exception { + public void does_not_return_disabled_metrics() { OrganizationDto organization = dbTester.organizations().insert(); ComponentDto project = dbTester.components().insertPrivateProject(organization); MetricDto disabledMetric = dbTester.measures().insertMetric(m -> m.setValueType(INT.name()).setEnabled(false).setHidden(false).setKey("disabled")); @@ -166,7 +166,7 @@ public class ProjectMeasuresIndexerIteratorTest { } @Test - public void ignore_measure_that_does_not_have_value() throws Exception { + public void ignore_measure_that_does_not_have_value() { OrganizationDto organization = dbTester.organizations().insert(); MetricDto metric1 = dbTester.measures().insertMetric(m -> m.setValueType(INT.name()).setKey("coverage")); MetricDto metric2 = dbTester.measures().insertMetric(m -> m.setValueType(INT.name()).setKey("ncloc")); @@ -182,7 +182,7 @@ public class ProjectMeasuresIndexerIteratorTest { } @Test - public void ignore_numeric_measure_that_has_text_value_but_not_numeric_value() throws Exception { + public void ignore_numeric_measure_that_has_text_value_but_not_numeric_value() { OrganizationDto organization = dbTester.organizations().insert(); MetricDto metric1 = dbTester.measures().insertMetric(m -> m.setValueType(INT.name()).setKey("coverage")); MetricDto metric2 = dbTester.measures().insertMetric(m -> m.setValueType(INT.name()).setKey("ncloc")); @@ -208,7 +208,7 @@ public class ProjectMeasuresIndexerIteratorTest { } @Test - public void return_project_without_analysis() throws Exception { + public void return_project_without_analysis() { ComponentDto project = dbTester.components().insertComponent(ComponentTesting.newPrivateProjectDto(dbTester.organizations().insert())); dbClient.snapshotDao().insert(dbSession, newAnalysis(project).setLast(false)); dbSession.commit(); @@ -221,7 +221,7 @@ public class ProjectMeasuresIndexerIteratorTest { } @Test - public void does_not_return_non_active_projects() throws Exception { + public void does_not_return_non_active_projects() { OrganizationDto organization = dbTester.organizations().insert(); // Disabled project dbTester.components().insertProjectAndSnapshot(ComponentTesting.newPrivateProjectDto(organization).setEnabled(false)); @@ -238,7 +238,7 @@ public class ProjectMeasuresIndexerIteratorTest { } @Test - public void return_only_docs_from_given_project() throws Exception { + public void return_only_docs_from_given_project() { OrganizationDto organization = dbTester.organizations().insert(); ComponentDto project1 = dbTester.components().insertPrivateProject(organization); ComponentDto project2 = dbTester.components().insertPrivateProject(organization); @@ -259,7 +259,7 @@ public class ProjectMeasuresIndexerIteratorTest { } @Test - public void return_nothing_on_unknown_project() throws Exception { + public void return_nothing_on_unknown_project() { OrganizationDto organization = dbTester.organizations().insert(); ComponentDto project = dbTester.components().insertPrivateProject(organization); dbTester.components().insertSnapshot(project); diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/measure/custom/CustomMeasureDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/measure/custom/CustomMeasureDaoTest.java index 4aba961640d..4f4adcac167 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/measure/custom/CustomMeasureDaoTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/measure/custom/CustomMeasureDaoTest.java @@ -154,7 +154,7 @@ public class CustomMeasureDaoTest { } @Test - public void select_by_metric_key_and_text_value() throws Exception { + public void select_by_metric_key_and_text_value() { db.prepareDbUnit(getClass(), "select_by_metric_key_and_text_value.xml"); List result = underTest.selectByMetricKeyAndTextValue(session, "customKey", "value1"); diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/metric/MetricDtoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/metric/MetricDtoTest.java index fa6cdc63d47..9c4e6e12bf2 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/metric/MetricDtoTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/metric/MetricDtoTest.java @@ -72,7 +72,7 @@ public class MetricDtoTest { } @Test - public void is_data_type() throws Exception { + public void is_data_type() { assertThat(MetricTesting.newMetricDto().setValueType(INT.name()).isDataType()).isFalse(); assertThat(MetricTesting.newMetricDto().setValueType(DATA.name()).isDataType()).isTrue(); diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/permission/GroupPermissionDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/permission/GroupPermissionDaoTest.java index 2b94d1df826..1eb03a1aad5 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/permission/GroupPermissionDaoTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/permission/GroupPermissionDaoTest.java @@ -447,7 +447,7 @@ public class GroupPermissionDaoTest { } @Test - public void selectAllPermissionsByGroupId_on_public_project() throws Exception { + public void selectAllPermissionsByGroupId_on_public_project() { OrganizationDto org1 = db.organizations().insert(); GroupDto group1 = db.users().insertGroup(org1, "group1"); ComponentDto project1 = db.components().insertPublicProject(org1); @@ -467,7 +467,7 @@ public class GroupPermissionDaoTest { } @Test - public void selectAllPermissionsByGroupId_on_private_project() throws Exception { + public void selectAllPermissionsByGroupId_on_private_project() { OrganizationDto org1 = db.organizations().insert(); GroupDto group1 = db.users().insertGroup(org1, "group1"); ComponentDto project1 = db.components().insertPrivateProject(org1); diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/permission/template/PermissionTemplateCharacteristicDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/permission/template/PermissionTemplateCharacteristicDaoTest.java index 710f8fb629b..43a2b3b3dd6 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/permission/template/PermissionTemplateCharacteristicDaoTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/permission/template/PermissionTemplateCharacteristicDaoTest.java @@ -180,7 +180,7 @@ public class PermissionTemplateCharacteristicDaoTest { } @Test - public void delete_by_permission_template_id() throws Exception { + public void delete_by_permission_template_id() { underTest.insert(dbSession, new PermissionTemplateCharacteristicDto() .setPermission(UserRole.USER) .setTemplateId(1L) diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/permission/template/PermissionTemplateDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/permission/template/PermissionTemplateDaoTest.java index 9597629fc02..e7c25e3d7b2 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/permission/template/PermissionTemplateDaoTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/permission/template/PermissionTemplateDaoTest.java @@ -71,7 +71,7 @@ public class PermissionTemplateDaoTest { } @Test - public void should_create_permission_template() throws ParseException { + public void should_create_permission_template() { PermissionTemplateDto permissionTemplate = underTest.insert(db.getSession(), newPermissionTemplateDto() .setUuid("ABCD") .setName("my template") diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/permission/template/UserWithPermissionTemplateDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/permission/template/UserWithPermissionTemplateDaoTest.java index 135257dd5d8..f5ad3d6d2ca 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/permission/template/UserWithPermissionTemplateDaoTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/permission/template/UserWithPermissionTemplateDaoTest.java @@ -115,7 +115,7 @@ public class UserWithPermissionTemplateDaoTest { } @Test - public void count_users() throws Exception { + public void count_users() { dbTester.prepareDbUnit(getClass(), "users_with_permissions.xml"); assertThat(underTest.countUserLoginsByQueryAndTemplate(dbSession, newQuery().build(), TEMPLATE_ID)).isEqualTo(3); @@ -123,7 +123,7 @@ public class UserWithPermissionTemplateDaoTest { } @Test - public void select_user_permission_templates_by_template_and_logins() throws Exception { + public void select_user_permission_templates_by_template_and_logins() { dbTester.prepareDbUnit(getClass(), "users_with_permissions.xml"); assertThat(underTest.selectUserPermissionsByTemplateIdAndUserLogins(dbSession, 50L, singletonList("user1"))) diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/property/PropertiesDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/property/PropertiesDaoTest.java index 7ea2f10fab2..4d0616529c1 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/property/PropertiesDaoTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/property/PropertiesDaoTest.java @@ -375,7 +375,7 @@ public class PropertiesDaoTest { } @Test - public void select_component_properties_by_ids() throws Exception { + public void select_component_properties_by_ids() { ComponentDto project = dbTester.components().insertPrivateProject(); ComponentDto project2 = dbTester.components().insertPrivateProject(); @@ -403,7 +403,7 @@ public class PropertiesDaoTest { } @Test - public void select_properties_by_keys_and_component_ids() throws Exception { + public void select_properties_by_keys_and_component_ids() { ComponentDto project = dbTester.components().insertPrivateProject(); ComponentDto project2 = dbTester.components().insertPrivateProject(); @@ -1008,10 +1008,10 @@ public class PropertiesDaoTest { return insertProperty(key, value, resourceId, userId); } - private long insertProperty(String key, @Nullable String value, @Nullable Long resourceId, @Nullable Integer userId) throws SQLException { + private long insertProperty(String key, @Nullable String value, @Nullable Long resourceId, @Nullable Integer userId) { PropertyDto dto = new PropertyDto().setKey(key) .setResourceId(resourceId) - .setUserId(userId == null ? null : userId) + .setUserId(userId) .setValue(value); dbTester.properties().insertProperty(dto); diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/purge/PurgeMapperTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/purge/PurgeMapperTest.java index 29efe6e059a..cfa055da7fb 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/purge/PurgeMapperTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/purge/PurgeMapperTest.java @@ -47,7 +47,7 @@ public class PurgeMapperTest { } @After - public void tearDown() throws Exception { + public void tearDown() { if (dbSession != null) { dbSession.close(); } diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/purge/period/KeepOneFilterTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/purge/period/KeepOneFilterTest.java index bf6c058689c..673c775b119 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/purge/period/KeepOneFilterTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/purge/period/KeepOneFilterTest.java @@ -40,7 +40,7 @@ public class KeepOneFilterTest { public void shouldOnlyOneSnapshotPerInterval() { Filter filter = new KeepOneFilter(DateUtils.parseDate("2011-03-25"), DateUtils.parseDate("2011-08-25"), Calendar.MONTH, "month"); - List toDelete = filter.filter(Arrays.asList( + List toDelete = filter.filter(Arrays.asList( DbCleanerTestUtils.createAnalysisWithDate("u1", "2010-01-01"), // out of scope -> keep DbCleanerTestUtils.createAnalysisWithDate("u2", "2011-05-01"), // may -> keep DbCleanerTestUtils.createAnalysisWithDate("u3", "2011-05-02"), // may -> to be deleted @@ -58,7 +58,7 @@ public class KeepOneFilterTest { public void shouldKeepNonDeletableSnapshots() { Filter filter = new KeepOneFilter(DateUtils.parseDate("2011-03-25"), DateUtils.parseDate("2011-08-25"), Calendar.MONTH, "month"); - List toDelete = filter.filter(Arrays.asList( + List toDelete = filter.filter(Arrays.asList( DbCleanerTestUtils.createAnalysisWithDate("u1", "2011-05-01"), // to be deleted DbCleanerTestUtils.createAnalysisWithDate("u2", "2011-05-02").setLast(true), DbCleanerTestUtils.createAnalysisWithDate("u3", "2011-05-19").setHasEvents(true).setLast(false), diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/qualitygate/QualityGateConditionDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/qualitygate/QualityGateConditionDaoTest.java index 674c7275651..2abe83e4e23 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/qualitygate/QualityGateConditionDaoTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/qualitygate/QualityGateConditionDaoTest.java @@ -40,7 +40,7 @@ public class QualityGateConditionDaoTest { private QualityGateConditionDao underTest = dbTester.getDbClient().gateConditionDao(); @Test - public void testInsert() throws Exception { + public void testInsert() { dbTester.prepareDbUnit(getClass(), "insert.xml"); QualityGateConditionDto newCondition = new QualityGateConditionDto() .setQualityGateId(1L).setMetricId(2L).setOperator("GT").setWarningThreshold("10").setErrorThreshold("20").setPeriod(3); @@ -53,14 +53,14 @@ public class QualityGateConditionDaoTest { } @Test - public void testSelectForQualityGate() throws Exception { + public void testSelectForQualityGate() { dbTester.prepareDbUnit(getClass(), "selectForQualityGate.xml"); assertThat(underTest.selectForQualityGate(dbSession, 1L)).hasSize(3); assertThat(underTest.selectForQualityGate(dbSession, 2L)).hasSize(2); } @Test - public void testSelectById() throws Exception { + public void testSelectById() { dbTester.prepareDbUnit(getClass(), "selectForQualityGate.xml"); QualityGateConditionDto selectById = underTest.selectById(1L, dbSession); assertThat(selectById).isNotNull(); @@ -75,7 +75,7 @@ public class QualityGateConditionDaoTest { } @Test - public void testDelete() throws Exception { + public void testDelete() { dbTester.prepareDbUnit(getClass(), "selectForQualityGate.xml"); underTest.delete(new QualityGateConditionDto().setId(1L), dbSession); @@ -85,7 +85,7 @@ public class QualityGateConditionDaoTest { } @Test - public void testUpdate() throws Exception { + public void testUpdate() { dbTester.prepareDbUnit(getClass(), "selectForQualityGate.xml"); underTest.update(new QualityGateConditionDto().setId(1L).setMetricId(7L).setOperator(">").setPeriod(1).setWarningThreshold("50").setErrorThreshold("80"), dbSession); diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/qualitygate/QualityGateConditionDtoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/qualitygate/QualityGateConditionDtoTest.java index e7f5f01b4b8..d02ab85f0f7 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/qualitygate/QualityGateConditionDtoTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/qualitygate/QualityGateConditionDtoTest.java @@ -43,7 +43,7 @@ public class QualityGateConditionDtoTest { } @Test - public void validate_operators_for_BOOL() throws Exception { + public void validate_operators_for_BOOL() { assertThat(isOperatorAllowed("EQ", BOOL)).isTrue(); assertThat(isOperatorAllowed("NE", BOOL)).isFalse(); assertThat(isOperatorAllowed("LT", BOOL)).isFalse(); @@ -51,7 +51,7 @@ public class QualityGateConditionDtoTest { } @Test - public void validate_operators_for_LEVEL() throws Exception { + public void validate_operators_for_LEVEL() { assertThat(isOperatorAllowed("EQ", LEVEL)).isTrue(); assertThat(isOperatorAllowed("NE", LEVEL)).isTrue(); assertThat(isOperatorAllowed("LT", LEVEL)).isFalse(); @@ -59,7 +59,7 @@ public class QualityGateConditionDtoTest { } @Test - public void validate_operators_for_RATING() throws Exception { + public void validate_operators_for_RATING() { assertThat(isOperatorAllowed("EQ", RATING)).isFalse(); assertThat(isOperatorAllowed("NE", RATING)).isFalse(); assertThat(isOperatorAllowed("LT", RATING)).isFalse(); @@ -67,7 +67,7 @@ public class QualityGateConditionDtoTest { } @Test - public void validate_operators_for_other_types() throws Exception { + public void validate_operators_for_other_types() { Arrays.stream(new ValueType[] {STRING, INT, FLOAT, PERCENT, MILLISEC}).forEach(type -> { assertThat(isOperatorAllowed("EQ", type)).isTrue(); assertThat(isOperatorAllowed("NE", type)).isTrue(); diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/qualityprofile/QualityProfileDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/qualityprofile/QualityProfileDaoTest.java index 837401583e2..3f728a0d2a3 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/qualityprofile/QualityProfileDaoTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/qualityprofile/QualityProfileDaoTest.java @@ -575,7 +575,7 @@ public class QualityProfileDaoTest { } @Test - public void select_selected_projects() throws Exception { + public void select_selected_projects() { ComponentDto project1 = db.components().insertPrivateProject(t -> t.setName("Project1 name"), t -> t.setOrganizationUuid(organization.getUuid())); ComponentDto project2 = db.components().insertPrivateProject(t -> t.setName("Project2 name"), t -> t.setOrganizationUuid(organization.getUuid())); ComponentDto project3 = db.components().insertPrivateProject(t -> t.setName("Project3 name"), t -> t.setOrganizationUuid(organization.getUuid())); @@ -604,7 +604,7 @@ public class QualityProfileDaoTest { } @Test - public void select_deselected_projects() throws Exception { + public void select_deselected_projects() { ComponentDto project1 = db.components().insertPrivateProject(t -> t.setName("Project1 name"), t -> t.setOrganizationUuid(organization.getUuid())); ComponentDto project2 = db.components().insertPrivateProject(t -> t.setName("Project2 name"), t -> t.setOrganizationUuid(organization.getUuid())); ComponentDto project3 = db.components().insertPrivateProject(t -> t.setName("Project3 name"), t -> t.setOrganizationUuid(organization.getUuid())); @@ -632,7 +632,7 @@ public class QualityProfileDaoTest { } @Test - public void select_project_associations() throws Exception { + public void select_project_associations() { ComponentDto project1 = db.components().insertPrivateProject(t -> t.setName("Project1 name"), t -> t.setOrganizationUuid(organization.getUuid())); ComponentDto project2 = db.components().insertPrivateProject(t -> t.setName("Project2 name"), t -> t.setOrganizationUuid(organization.getUuid())); ComponentDto project3 = db.components().insertPrivateProject(t -> t.setName("Project3 name"), t -> t.setOrganizationUuid(organization.getUuid())); diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleDaoTest.java index cd8e0c9bd42..c96f3c36e1b 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleDaoTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleDaoTest.java @@ -310,7 +310,7 @@ public class RuleDaoTest { } @Test - public void insert() throws Exception { + public void insert() { RuleDefinitionDto newRule = new RuleDefinitionDto() .setRuleKey("NewRuleKey") .setRepositoryKey("plugin") diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleDtoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleDtoTest.java index 4c956ee6eb0..ea82d7e7379 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleDtoTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/rule/RuleDtoTest.java @@ -61,7 +61,7 @@ public class RuleDtoTest { @Test public void tags_are_optional() { - RuleDto dto = new RuleDto().setTags(Collections.emptySet()); + RuleDto dto = new RuleDto().setTags(Collections.emptySet()); assertThat(dto.getTags()).isEmpty(); } } diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/user/GroupMembershipDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/user/GroupMembershipDaoTest.java index 8694d204fe3..bed7f51695a 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/user/GroupMembershipDaoTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/user/GroupMembershipDaoTest.java @@ -87,7 +87,7 @@ public class GroupMembershipDaoTest { } @Test - public void count_groups_only_from_given_organization() throws Exception { + public void count_groups_only_from_given_organization() { OrganizationDto otherOrganization = db.organizations().insert(); GroupDto otherGroup = db.users().insertGroup(otherOrganization, "sonar-administrators-other_orga"); db.users().insertMember(group1, user1); diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/user/GroupMembershipQueryTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/user/GroupMembershipQueryTest.java index fbc69990403..57f2e108761 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/user/GroupMembershipQueryTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/user/GroupMembershipQueryTest.java @@ -31,7 +31,7 @@ public class GroupMembershipQueryTest { public ExpectedException expectedException = ExpectedException.none(); @Test - public void create_query() throws Exception { + public void create_query() { GroupMembershipQuery underTest = GroupMembershipQuery.builder() .groupSearch("sonar-users") .membership(GroupMembershipQuery.IN) diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/user/UserDtoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/user/UserDtoTest.java index 71b9e69a855..f34a9c226ed 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/user/UserDtoTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/user/UserDtoTest.java @@ -35,7 +35,7 @@ public class UserDtoTest { @Test public void encode_scm_accounts() { assertThat(UserDto.encodeScmAccounts(null)).isNull(); - assertThat(UserDto.encodeScmAccounts(Collections.emptyList())).isNull(); + assertThat(UserDto.encodeScmAccounts(Collections.emptyList())).isNull(); assertThat(UserDto.encodeScmAccounts(Arrays.asList("foo"))).isEqualTo("\nfoo\n"); assertThat(UserDto.encodeScmAccounts(Arrays.asList("foo", "bar"))).isEqualTo("\nfoo\nbar\n"); } @@ -48,18 +48,18 @@ public class UserDtoTest { } @Test - public void encrypt_password() throws Exception { + public void encrypt_password() { assertThat(UserDto.encryptPassword("PASSWORD", "0242b0b4c0a93ddfe09dd886de50bc25ba000b51")).isEqualTo("540e4fc4be4e047db995bc76d18374a5b5db08cc"); } @Test - public void fail_to_encrypt_password_when_password_is_null() throws Exception { + public void fail_to_encrypt_password_when_password_is_null() { expectedException.expect(NullPointerException.class); UserDto.encryptPassword(null, "salt"); } @Test - public void fail_to_encrypt_password_when_salt_is_null() throws Exception { + public void fail_to_encrypt_password_when_salt_is_null() { expectedException.expect(NullPointerException.class); UserDto.encryptPassword("password", null); } diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/user/UserGroupDaoTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/user/UserGroupDaoTest.java index c8a481c9db1..72d237b92f6 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/user/UserGroupDaoTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/user/UserGroupDaoTest.java @@ -88,7 +88,7 @@ public class UserGroupDaoTest { } @Test - public void delete_by_user() throws Exception { + public void delete_by_user() { UserDto user1 = dbTester.users().insertUser(); UserDto user2 = dbTester.users().insertUser(); GroupDto group1 = dbTester.users().insertGroup(); diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/charset/DatabaseCharsetCheckerTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/charset/DatabaseCharsetCheckerTest.java index 65badeebd24..912c21c622e 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/charset/DatabaseCharsetCheckerTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/charset/DatabaseCharsetCheckerTest.java @@ -74,32 +74,32 @@ public class DatabaseCharsetCheckerTest { } @Test - public void does_nothing_if_h2() throws Exception { + public void does_nothing_if_h2() { assertThat(underTest.getHandler(new H2())).isNull(); } @Test - public void getHandler_returns_MysqlCharsetHandler_if_mysql() throws Exception { + public void getHandler_returns_MysqlCharsetHandler_if_mysql() { assertThat(underTest.getHandler(new MySql())).isInstanceOf(MysqlCharsetHandler.class); } @Test - public void getHandler_returns_MssqlCharsetHandler_if_mssql() throws Exception { + public void getHandler_returns_MssqlCharsetHandler_if_mssql() { assertThat(underTest.getHandler(new MsSql())).isInstanceOf(MssqlCharsetHandler.class); } @Test - public void getHandler_returns_OracleCharsetHandler_if_oracle() throws Exception { + public void getHandler_returns_OracleCharsetHandler_if_oracle() { assertThat(underTest.getHandler(new Oracle())).isInstanceOf(OracleCharsetHandler.class); } @Test - public void getHandler_returns_PostgresCharsetHandler_if_postgres() throws Exception { + public void getHandler_returns_PostgresCharsetHandler_if_postgres() { assertThat(underTest.getHandler(new PostgreSql())).isInstanceOf(PostgresCharsetHandler.class); } @Test - public void getHandler_throws_IAE_if_unsupported_db() throws Exception { + public void getHandler_throws_IAE_if_unsupported_db() { Dialect unsupportedDialect = mock(Dialect.class); when(unsupportedDialect.getId()).thenReturn("foo"); diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/def/BigIntegerColumnDefTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/def/BigIntegerColumnDefTest.java index 41162ca2825..ffd6fe9dbd3 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/def/BigIntegerColumnDefTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/def/BigIntegerColumnDefTest.java @@ -36,7 +36,7 @@ public class BigIntegerColumnDefTest { public ExpectedException thrown = ExpectedException.none(); @Test - public void build_string_column_def() throws Exception { + public void build_string_column_def() { BigIntegerColumnDef def = new BigIntegerColumnDef.Builder() .setColumnName("issues") .setIsNullable(true) @@ -47,7 +47,7 @@ public class BigIntegerColumnDefTest { } @Test - public void build_string_column_def_with_default_values() throws Exception { + public void build_string_column_def_with_default_values() { BigIntegerColumnDef def = new BigIntegerColumnDef.Builder() .setColumnName("issues") .build(); @@ -57,7 +57,7 @@ public class BigIntegerColumnDefTest { } @Test - public void generate_sql_type() throws Exception { + public void generate_sql_type() { BigIntegerColumnDef def = new BigIntegerColumnDef.Builder() .setColumnName("issues") .setIsNullable(true) @@ -71,7 +71,7 @@ public class BigIntegerColumnDefTest { } @Test - public void fail_with_NPE_if_name_is_null() throws Exception { + public void fail_with_NPE_if_name_is_null() { thrown.expect(NullPointerException.class); thrown.expectMessage("Column name cannot be null"); @@ -80,7 +80,7 @@ public class BigIntegerColumnDefTest { } @Test - public void fail_with_NPE_if_no_name() throws Exception { + public void fail_with_NPE_if_no_name() { thrown.expect(NullPointerException.class); thrown.expectMessage("Column name cannot be null"); diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/def/BooleanColumnDefTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/def/BooleanColumnDefTest.java index e0149bf41c0..9521b7e5ffb 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/def/BooleanColumnDefTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/def/BooleanColumnDefTest.java @@ -37,7 +37,7 @@ public class BooleanColumnDefTest { public ExpectedException thrown = ExpectedException.none(); @Test - public void build_column_def() throws Exception { + public void build_column_def() { BooleanColumnDef def = new BooleanColumnDef.Builder() .setColumnName("enabled") .setIsNullable(false) @@ -50,7 +50,7 @@ public class BooleanColumnDefTest { } @Test - public void build_column_def_with_only_required_attributes() throws Exception { + public void build_column_def_with_only_required_attributes() { BooleanColumnDef def = new BooleanColumnDef.Builder() .setColumnName("enabled") .build(); @@ -61,7 +61,7 @@ public class BooleanColumnDefTest { } @Test - public void generate_sql_type() throws Exception { + public void generate_sql_type() { BooleanColumnDef def = new BooleanColumnDef.Builder() .setColumnName("enabled") .setIsNullable(true) @@ -75,7 +75,7 @@ public class BooleanColumnDefTest { } @Test - public void fail_with_NPE_if_name_is_null() throws Exception { + public void fail_with_NPE_if_name_is_null() { thrown.expect(NullPointerException.class); thrown.expectMessage("Column name cannot be null"); @@ -83,7 +83,7 @@ public class BooleanColumnDefTest { } @Test - public void fail_with_NPE_if_no_name() throws Exception { + public void fail_with_NPE_if_no_name() { thrown.expect(NullPointerException.class); thrown.expectMessage("Column name cannot be null"); diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/def/ClobColumnDefTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/def/ClobColumnDefTest.java index e65f13ca2d8..dab891080ea 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/def/ClobColumnDefTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/def/ClobColumnDefTest.java @@ -40,14 +40,14 @@ public class ClobColumnDefTest { .build(); @Test - public void build_string_column_def() throws Exception { + public void build_string_column_def() { assertThat(underTest.getName()).isEqualTo("issues"); assertThat(underTest.isNullable()).isTrue(); assertThat(underTest.getDefaultValue()).isNull(); } @Test - public void build_string_column_def_with_only_required_attributes() throws Exception { + public void build_string_column_def_with_only_required_attributes() { ClobColumnDef def = new ClobColumnDef.Builder() .setColumnName("issues") .build(); @@ -58,32 +58,32 @@ public class ClobColumnDefTest { } @Test - public void generate_sql_type_on_mssql() throws Exception { + public void generate_sql_type_on_mssql() { assertThat(underTest.generateSqlType(new MsSql())).isEqualTo("NVARCHAR (MAX)"); } @Test - public void generate_sql_type_on_h2() throws Exception { + public void generate_sql_type_on_h2() { assertThat(underTest.generateSqlType(new H2())).isEqualTo("CLOB(2147483647)"); } @Test - public void generate_sql_type_on_mysql() throws Exception { + public void generate_sql_type_on_mysql() { assertThat(underTest.generateSqlType(new MySql())).isEqualTo("LONGTEXT"); } @Test - public void generate_sql_type_on_oracle() throws Exception { + public void generate_sql_type_on_oracle() { assertThat(underTest.generateSqlType(new Oracle())).isEqualTo("CLOB"); } @Test - public void generate_sql_type_on_postgre() throws Exception { + public void generate_sql_type_on_postgre() { assertThat(underTest.generateSqlType(new PostgreSql())).isEqualTo("TEXT"); } @Test - public void fail_with_NPE_if_name_is_null() throws Exception { + public void fail_with_NPE_if_name_is_null() { thrown.expect(NullPointerException.class); thrown.expectMessage("Column name cannot be null"); @@ -92,7 +92,7 @@ public class ClobColumnDefTest { } @Test - public void fail_with_NPE_if_no_name() throws Exception { + public void fail_with_NPE_if_no_name() { thrown.expect(NullPointerException.class); thrown.expectMessage("Column name cannot be null"); diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/def/DecimalColumnDefTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/def/DecimalColumnDefTest.java index c9b24611511..effa7b9cfed 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/def/DecimalColumnDefTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/def/DecimalColumnDefTest.java @@ -39,7 +39,7 @@ public class DecimalColumnDefTest { public ExpectedException thrown = ExpectedException.none(); @Test - public void build_string_column_def() throws Exception { + public void build_string_column_def() { DecimalColumnDef def = new DecimalColumnDef.Builder() .setColumnName("issues") .setPrecision(30) @@ -55,7 +55,7 @@ public class DecimalColumnDefTest { } @Test - public void fail_with_NPE_if_name_is_null() throws Exception { + public void fail_with_NPE_if_name_is_null() { thrown.expect(NullPointerException.class); thrown.expectMessage("Column name cannot be null"); @@ -64,7 +64,7 @@ public class DecimalColumnDefTest { } @Test - public void fail_with_NPE_if_no_name() throws Exception { + public void fail_with_NPE_if_no_name() { thrown.expect(NullPointerException.class); thrown.expectMessage("Column name cannot be null"); @@ -73,7 +73,7 @@ public class DecimalColumnDefTest { } @Test - public void default_precision_is_38() throws Exception { + public void default_precision_is_38() { DecimalColumnDef def = new DecimalColumnDef.Builder() .setColumnName("issues") .setScale(20) @@ -84,7 +84,7 @@ public class DecimalColumnDefTest { } @Test - public void default_precision_is_20() throws Exception { + public void default_precision_is_20() { DecimalColumnDef def = new DecimalColumnDef.Builder() .setColumnName("issues") .setPrecision(30) @@ -95,7 +95,7 @@ public class DecimalColumnDefTest { } @Test - public void create_builder_with_only_required_attributes() throws Exception { + public void create_builder_with_only_required_attributes() { DecimalColumnDef def = new DecimalColumnDef.Builder() .setColumnName("issues") .build(); @@ -107,7 +107,7 @@ public class DecimalColumnDefTest { } @Test - public void generate_sql_type() throws Exception { + public void generate_sql_type() { DecimalColumnDef def = new DecimalColumnDef.Builder() .setColumnName("issues") .setPrecision(30) @@ -123,7 +123,7 @@ public class DecimalColumnDefTest { } @Test - public void fail_with_UOE_to_generate_sql_type_when_unknown_dialect() throws Exception { + public void fail_with_UOE_to_generate_sql_type_when_unknown_dialect() { thrown.expect(UnsupportedOperationException.class); thrown.expectMessage("Unknown dialect 'unknown'"); diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/def/TimestampColumnDefTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/def/TimestampColumnDefTest.java index 0ce4910f7ba..15da755165b 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/def/TimestampColumnDefTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/def/TimestampColumnDefTest.java @@ -37,7 +37,7 @@ public class TimestampColumnDefTest { public ExpectedException thrown = ExpectedException.none(); @Test - public void build_column_def() throws Exception { + public void build_column_def() { TimestampColumnDef def = newTimestampColumnDefBuilder() .setColumnName("created_at") .setIsNullable(false) @@ -49,7 +49,7 @@ public class TimestampColumnDefTest { } @Test - public void build_column_def_with_only_required_attributes() throws Exception { + public void build_column_def_with_only_required_attributes() { TimestampColumnDef def = newTimestampColumnDefBuilder() .setColumnName("created_at") .build(); @@ -60,7 +60,7 @@ public class TimestampColumnDefTest { } @Test - public void generate_sql_type() throws Exception { + public void generate_sql_type() { TimestampColumnDef def = newTimestampColumnDefBuilder() .setColumnName("created_at") .build(); @@ -73,7 +73,7 @@ public class TimestampColumnDefTest { } @Test - public void fail_with_NPE_if_name_is_null() throws Exception { + public void fail_with_NPE_if_name_is_null() { thrown.expect(NullPointerException.class); thrown.expectMessage("Column name cannot be null"); @@ -81,7 +81,7 @@ public class TimestampColumnDefTest { } @Test - public void fail_with_NPE_if_no_name() throws Exception { + public void fail_with_NPE_if_no_name() { thrown.expect(NullPointerException.class); thrown.expectMessage("Column name cannot be null"); diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/def/TinyIntColumnDefTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/def/TinyIntColumnDefTest.java index 5393ecfc86b..073f614896e 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/def/TinyIntColumnDefTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/def/TinyIntColumnDefTest.java @@ -39,7 +39,7 @@ public class TinyIntColumnDefTest { public ExpectedException thrown = ExpectedException.none(); @Test - public void build_string_column_def() throws Exception { + public void build_string_column_def() { TinyIntColumnDef def = new TinyIntColumnDef.Builder() .setColumnName("foo") .setIsNullable(true) @@ -51,7 +51,7 @@ public class TinyIntColumnDefTest { } @Test - public void generate_sql_type() throws Exception { + public void generate_sql_type() { TinyIntColumnDef def = new TinyIntColumnDef.Builder() .setColumnName("foo") .setIsNullable(true) @@ -65,7 +65,7 @@ public class TinyIntColumnDefTest { } @Test - public void fail_with_UOE_to_generate_sql_type_when_unknown_dialect() throws Exception { + public void fail_with_UOE_to_generate_sql_type_when_unknown_dialect() { thrown.expect(UnsupportedOperationException.class); thrown.expectMessage("Unknown dialect 'unknown'"); diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/def/ValidationsTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/def/ValidationsTest.java index 0f7d1e753d9..6baf90a516f 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/def/ValidationsTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/def/ValidationsTest.java @@ -33,13 +33,13 @@ public class ValidationsTest { public ExpectedException thrown = ExpectedException.none(); @Test - public void accept_valid_table_name() throws Exception { + public void accept_valid_table_name() { validateColumnName("date_in_ms"); validateColumnName("date_in_ms_1"); } @Test - public void fail_with_NPE_if_name_is_null() throws Exception { + public void fail_with_NPE_if_name_is_null() { thrown.expect(NullPointerException.class); thrown.expectMessage("Column name cannot be null"); diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/def/VarcharColumnDefTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/def/VarcharColumnDefTest.java index f1ea7878508..ecdc79d57d1 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/def/VarcharColumnDefTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/def/VarcharColumnDefTest.java @@ -36,7 +36,7 @@ public class VarcharColumnDefTest { public ExpectedException thrown = ExpectedException.none(); @Test - public void build_string_column_def() throws Exception { + public void build_string_column_def() { VarcharColumnDef def = new VarcharColumnDef.Builder() .setColumnName("issues") .setLimit(10) @@ -51,7 +51,7 @@ public class VarcharColumnDefTest { } @Test - public void build_string_column_def_with_only_required_attributes() throws Exception { + public void build_string_column_def_with_only_required_attributes() { VarcharColumnDef def = new VarcharColumnDef.Builder() .setColumnName("issues") .setLimit(10) @@ -64,7 +64,7 @@ public class VarcharColumnDefTest { } @Test - public void generate_sql_type() throws Exception { + public void generate_sql_type() { VarcharColumnDef def = new VarcharColumnDef.Builder() .setColumnName("issues") .setLimit(10) @@ -79,7 +79,7 @@ public class VarcharColumnDefTest { } @Test - public void generateSqlType_does_not_set_unit_on_oracle_if_legacy_mode() throws Exception { + public void generateSqlType_does_not_set_unit_on_oracle_if_legacy_mode() { VarcharColumnDef def = new VarcharColumnDef.Builder() .setColumnName("issues") .setLimit(10) @@ -91,7 +91,7 @@ public class VarcharColumnDefTest { } @Test - public void fail_with_NPE_if_name_is_null() throws Exception { + public void fail_with_NPE_if_name_is_null() { thrown.expect(NullPointerException.class); thrown.expectMessage("Column name cannot be null"); @@ -100,7 +100,7 @@ public class VarcharColumnDefTest { } @Test - public void fail_with_NPE_if_no_name() throws Exception { + public void fail_with_NPE_if_no_name() { thrown.expect(NullPointerException.class); thrown.expectMessage("Column name cannot be null"); @@ -109,7 +109,7 @@ public class VarcharColumnDefTest { } @Test - public void fail_with_NPE_if_size_is_null() throws Exception { + public void fail_with_NPE_if_size_is_null() { thrown.expect(NullPointerException.class); thrown.expectMessage("Limit cannot be null"); diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/history/NoTableMigrationHistoryImplTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/history/NoTableMigrationHistoryImplTest.java index 17a682f89b4..b1e8979212a 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/history/NoTableMigrationHistoryImplTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/history/NoTableMigrationHistoryImplTest.java @@ -34,7 +34,7 @@ public class NoTableMigrationHistoryImplTest { private MigrationHistoryImpl underTest = new MigrationHistoryImpl(dbTester.database()); @Test - public void start_fails_with_ISE_if_table_history_does_not_exist() throws SQLException { + public void start_fails_with_ISE_if_table_history_does_not_exist() { expectedException.expect(IllegalStateException.class); expectedException.expectMessage("Migration history table is missing"); diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/sql/DropTableBuilderTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/sql/DropTableBuilderTest.java index 51332818092..34351b5791f 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/sql/DropTableBuilderTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/sql/DropTableBuilderTest.java @@ -83,13 +83,13 @@ public class DropTableBuilderTest { } @Test - public void fail_when_dialect_is_null() throws Exception { + public void fail_when_dialect_is_null() { expectedException.expect(NullPointerException.class); new DropTableBuilder(null, "issues"); } @Test - public void fail_when_table_is_null() throws Exception { + public void fail_when_table_is_null() { expectedException.expect(NullPointerException.class); new DropTableBuilder(new PostgreSql(), null); } diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/step/DataChangeTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/step/DataChangeTest.java index 2bef4b89686..cad65f9c290 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/step/DataChangeTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/step/DataChangeTest.java @@ -117,7 +117,7 @@ public class DataChangeTest { public void execute(Context context) throws SQLException { context.prepareSelect("select id from persons where id>=?").setLong(1, 2L).get(new RowReader() { @Override - public Long read(Row row) throws SQLException { + public Long read(Row row) { throw new IllegalStateException("Unexpected error"); } }); @@ -138,7 +138,7 @@ public class DataChangeTest { public void execute(Context context) throws SQLException { context.prepareSelect("select id from persons where id>=?").setLong(1, 2L).list(new RowReader() { @Override - public Long read(Row row) throws SQLException { + public Long read(Row row) { throw new IllegalStateException("Unexpected error"); } }); @@ -319,7 +319,7 @@ public class DataChangeTest { final Upsert upsert = context.prepareUpsert("update persons set login=?, age=? where id=?"); context.prepareSelect("select id from persons").scroll(new Select.RowHandler() { @Override - public void handle(Row row) throws SQLException { + public void handle(Row row) { throw new IllegalStateException("Unexpected error"); } }); @@ -370,7 +370,7 @@ public class DataChangeTest { massUpdate.update("update persons set login=?, age=? where id=?"); massUpdate.execute(new MassUpdate.Handler() { @Override - public boolean handle(Row row, SqlStatement update) throws SQLException { + public boolean handle(Row row, SqlStatement update) { throw new IllegalStateException("Unexpected error"); } }); @@ -390,7 +390,7 @@ public class DataChangeTest { massUpdate.update("update persons set login=?, age=? where id=?"); massUpdate.execute(new MassUpdate.Handler() { @Override - public boolean handle(Row row, SqlStatement update) throws SQLException { + public boolean handle(Row row, SqlStatement update) { return false; } }); @@ -412,7 +412,7 @@ public class DataChangeTest { // update is not set massUpdate.execute(new MassUpdate.Handler() { @Override - public boolean handle(Row row, SqlStatement update) throws SQLException { + public boolean handle(Row row, SqlStatement update) { return false; } }); diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v60/Migration1223Test.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v60/Migration1223Test.java index b9b8645a436..546b9293b1a 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v60/Migration1223Test.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v60/Migration1223Test.java @@ -45,13 +45,13 @@ public class Migration1223Test { private FixProjectUuidOfDeveloperProjects projectUuidOfDeveloperProjects = new FixProjectUuidOfDeveloperProjects(database) { @Override - public void execute(Context context) throws SQLException { + public void execute(Context context) { calls.add(Call.CALL_1); } }; private CleanUsurperRootComponents cleanUsurperRootComponents = new CleanUsurperRootComponents(database) { @Override - public void execute(Context context) throws SQLException { + public void execute(Context context) { calls.add(Call.CALL_2); } }; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v61/Migration1304Test.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v61/Migration1304Test.java index a9310b40648..fa0d52bfe56 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v61/Migration1304Test.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v61/Migration1304Test.java @@ -46,13 +46,13 @@ public class Migration1304Test { private ShrinkModuleUuidPathOfProjects shrinkModuleUuidPathOfProjects = new ShrinkModuleUuidPathOfProjects(database) { @Override - public void execute(Context context) throws SQLException { + public void execute(Context context) { calls.add(Call.CALL_1); } }; private AddBUuidPathToProjects addBUuidPathToProjects = new AddBUuidPathToProjects(database) { @Override - public void execute(Context context) throws SQLException { + public void execute(Context context) { calls.add(Call.CALL_2); } }; diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v63/TestDefaultOrganizationUuidProvider.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v63/TestDefaultOrganizationUuidProvider.java index cf0d2d0362d..816d20a7d6d 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v63/TestDefaultOrganizationUuidProvider.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v63/TestDefaultOrganizationUuidProvider.java @@ -35,12 +35,12 @@ public class TestDefaultOrganizationUuidProvider implements DefaultOrganizationU } @Override - public String get(DataChange.Context context) throws SQLException { + public String get(DataChange.Context context) { return organizationUuid; } @Override - public String getAndCheck(DataChange.Context context) throws SQLException { + public String getAndCheck(DataChange.Context context) { return organizationUuid; } } diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v64/PopulateRulesMetadataTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v64/PopulateRulesMetadataTest.java index 58777a8c2d0..7b1364ee189 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v64/PopulateRulesMetadataTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v64/PopulateRulesMetadataTest.java @@ -232,7 +232,6 @@ public class PopulateRulesMetadataTest { this.noteData = seed + "_noteData"; this.noteUserLogin = seed + "_noteUserLogin"; this.noteDates = new Dates(seed.hashCode()); - ; return this; } diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v70/RenameOldSonarQubeWayQualityGateTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v70/RenameOldSonarQubeWayQualityGateTest.java index a2443cd6eb2..67f3e000a87 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v70/RenameOldSonarQubeWayQualityGateTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v70/RenameOldSonarQubeWayQualityGateTest.java @@ -84,7 +84,7 @@ public class RenameOldSonarQubeWayQualityGateTest { } @Test - public void should_log_a_meaningful_info_if_outdated_copy_exists() throws SQLException { + public void should_log_a_meaningful_info_if_outdated_copy_exists() { insertQualityGate(SONARQUBE_WAY_QUALITY_GATE, false); insertQualityGate(SONAR_WAY_OUTDATED_QUALITY_GATE, false); diff --git a/server/sonar-main/src/test/java/org/sonar/application/AppLoggingTest.java b/server/sonar-main/src/test/java/org/sonar/application/AppLoggingTest.java index 6d81706cc93..537e970e35d 100644 --- a/server/sonar-main/src/test/java/org/sonar/application/AppLoggingTest.java +++ b/server/sonar-main/src/test/java/org/sonar/application/AppLoggingTest.java @@ -248,7 +248,7 @@ public class AppLoggingTest { } @Test - public void no_info_log_from_hazelcast() throws IOException { + public void no_info_log_from_hazelcast() { settings.getProps().set(CLUSTER_ENABLED, "true"); underTest.configure(); diff --git a/server/sonar-main/src/test/java/org/sonar/application/SchedulerImplTest.java b/server/sonar-main/src/test/java/org/sonar/application/SchedulerImplTest.java index 708e8fbb2b9..dc8c597afcc 100644 --- a/server/sonar-main/src/test/java/org/sonar/application/SchedulerImplTest.java +++ b/server/sonar-main/src/test/java/org/sonar/application/SchedulerImplTest.java @@ -96,7 +96,7 @@ public class SchedulerImplTest { } @After - public void tearDown() throws Exception { + public void tearDown() { processLauncher.close(); } diff --git a/server/sonar-main/src/test/java/org/sonar/application/cluster/ClusterAppStateImplTest.java b/server/sonar-main/src/test/java/org/sonar/application/cluster/ClusterAppStateImplTest.java index 2dac6994733..262ff716687 100644 --- a/server/sonar-main/src/test/java/org/sonar/application/cluster/ClusterAppStateImplTest.java +++ b/server/sonar-main/src/test/java/org/sonar/application/cluster/ClusterAppStateImplTest.java @@ -51,7 +51,7 @@ public class ClusterAppStateImplTest { public TestRule safeguardTimeout = new DisableOnDebug(Timeout.seconds(60)); @Test - public void tryToLockWebLeader_returns_true_only_for_the_first_call() throws Exception { + public void tryToLockWebLeader_returns_true_only_for_the_first_call() { try (ClusterAppStateImpl underTest = new ClusterAppStateImpl(new TestAppSettings(), newHzMember())) { assertThat(underTest.tryToLockWebLeader()).isEqualTo(true); assertThat(underTest.tryToLockWebLeader()).isEqualTo(false); @@ -59,7 +59,7 @@ public class ClusterAppStateImplTest { } @Test - public void test_listeners() throws InterruptedException { + public void test_listeners() { AppStateListener listener = mock(AppStateListener.class); try (ClusterAppStateImpl underTest = new ClusterAppStateImpl(new TestAppSettings(), newHzMember())) { underTest.addListener(listener); @@ -106,7 +106,7 @@ public class ClusterAppStateImplTest { } @Test - public void registerSonarQubeVersion_throws_ISE_if_initial_version_is_different() throws Exception { + public void registerSonarQubeVersion_throws_ISE_if_initial_version_is_different() { // Now launch an instance that try to be part of the hzInstance cluster try (ClusterAppStateImpl underTest = new ClusterAppStateImpl(new TestAppSettings(), newHzMember())) { // Register first version @@ -121,7 +121,7 @@ public class ClusterAppStateImplTest { } @Test - public void registerClusterName_throws_MessageException_if_clusterName_is_different() throws Exception { + public void registerClusterName_throws_MessageException_if_clusterName_is_different() { try (ClusterAppStateImpl underTest = new ClusterAppStateImpl(new TestAppSettings(), newHzMember())) { // Register first version underTest.getHazelcastMember().getAtomicReference(CLUSTER_NAME).set("goodClusterName"); diff --git a/server/sonar-main/src/test/java/org/sonar/application/command/AbstractCommandTest.java b/server/sonar-main/src/test/java/org/sonar/application/command/AbstractCommandTest.java index 4c10e3942fa..cf19a2de482 100644 --- a/server/sonar-main/src/test/java/org/sonar/application/command/AbstractCommandTest.java +++ b/server/sonar-main/src/test/java/org/sonar/application/command/AbstractCommandTest.java @@ -57,7 +57,7 @@ public class AbstractCommandTest { } @Test - public void constructor_throws_NPE_of_workDir_is_null() throws IOException { + public void constructor_throws_NPE_of_workDir_is_null() { expectedException.expect(NullPointerException.class); expectedException.expectMessage("workDir can't be null"); diff --git a/server/sonar-main/src/test/java/org/sonar/application/command/CommandFactoryImplTest.java b/server/sonar-main/src/test/java/org/sonar/application/command/CommandFactoryImplTest.java index 71a38bd90e6..4438fb768b6 100644 --- a/server/sonar-main/src/test/java/org/sonar/application/command/CommandFactoryImplTest.java +++ b/server/sonar-main/src/test/java/org/sonar/application/command/CommandFactoryImplTest.java @@ -63,7 +63,7 @@ public class CommandFactoryImplTest { } @After - public void tearDown() throws Exception { + public void tearDown() { if (listAppender != null) { ListAppender.detachMemoryAppenderToLoggerOf(CommandFactoryImpl.class, listAppender); } @@ -287,7 +287,7 @@ public class CommandFactoryImplTest { return newFactory(userProps, System2.INSTANCE); } - private CommandFactoryImpl newFactory(Properties userProps, System2 system2) throws IOException { + private CommandFactoryImpl newFactory(Properties userProps, System2 system2) { Properties p = new Properties(); p.setProperty("sonar.path.home", homeDir.getAbsolutePath()); p.setProperty("sonar.path.temp", tempDir.getAbsolutePath()); diff --git a/server/sonar-main/src/test/java/org/sonar/application/config/AppSettingsLoaderImplTest.java b/server/sonar-main/src/test/java/org/sonar/application/config/AppSettingsLoaderImplTest.java index cc12dc0e5e5..7261704b905 100644 --- a/server/sonar-main/src/test/java/org/sonar/application/config/AppSettingsLoaderImplTest.java +++ b/server/sonar-main/src/test/java/org/sonar/application/config/AppSettingsLoaderImplTest.java @@ -97,7 +97,7 @@ public class AppSettingsLoaderImplTest { } @Test - public void detectHomeDir_returns_existing_dir() throws Exception { + public void detectHomeDir_returns_existing_dir() { assertThat(new AppSettingsLoaderImpl(new String[0]).getHomeDir()).exists().isDirectory(); } diff --git a/server/sonar-main/src/test/java/org/sonar/application/config/ClusterSettingsLoopbackTest.java b/server/sonar-main/src/test/java/org/sonar/application/config/ClusterSettingsLoopbackTest.java index fbe5fb3519a..3c8abc90770 100644 --- a/server/sonar-main/src/test/java/org/sonar/application/config/ClusterSettingsLoopbackTest.java +++ b/server/sonar-main/src/test/java/org/sonar/application/config/ClusterSettingsLoopbackTest.java @@ -52,7 +52,7 @@ public class ClusterSettingsLoopbackTest { private NetworkUtils network = spy(NetworkUtilsImpl.INSTANCE); @Before - public void setUp() throws Exception { + public void setUp() { Optional opt = network.getLocalNonLoopbackIpv4Address(); assumeThat(opt.isPresent(), CoreMatchers.is(true)); @@ -93,7 +93,7 @@ public class ClusterSettingsLoopbackTest { new ClusterSettings(network).accept(settings.getProps()); } - private TestAppSettings newSettingsForAppNode() throws SocketException { + private TestAppSettings newSettingsForAppNode() { return new TestAppSettings() .set(CLUSTER_ENABLED, "true") .set(CLUSTER_NODE_TYPE, "application") @@ -104,7 +104,7 @@ public class ClusterSettingsLoopbackTest { .set(JDBC_URL, "jdbc:mysql://localhost:3306/sonar"); } - private TestAppSettings newSettingsForSearchNode() throws SocketException { + private TestAppSettings newSettingsForSearchNode() { return new TestAppSettings() .set(CLUSTER_ENABLED, "true") .set(CLUSTER_NODE_TYPE, "search") diff --git a/server/sonar-main/src/test/java/org/sonar/application/config/ClusterSettingsTest.java b/server/sonar-main/src/test/java/org/sonar/application/config/ClusterSettingsTest.java index 3cfc1c8bc6c..4418808b4b7 100644 --- a/server/sonar-main/src/test/java/org/sonar/application/config/ClusterSettingsTest.java +++ b/server/sonar-main/src/test/java/org/sonar/application/config/ClusterSettingsTest.java @@ -231,7 +231,7 @@ public class ClusterSettingsTest { new ClusterSettings(network).accept(settings.getProps()); } - private TestAppSettings newSettingsForAppNode() throws SocketException { + private TestAppSettings newSettingsForAppNode() { return new TestAppSettings() .set(CLUSTER_ENABLED, "true") .set(CLUSTER_NODE_TYPE, "application") @@ -242,7 +242,7 @@ public class ClusterSettingsTest { .set(JDBC_URL, "jdbc:mysql://localhost:3306/sonar"); } - private TestAppSettings newSettingsForSearchNode() throws SocketException { + private TestAppSettings newSettingsForSearchNode() { return new TestAppSettings() .set(CLUSTER_ENABLED, "true") .set(CLUSTER_NODE_TYPE, "search") diff --git a/server/sonar-main/src/test/java/org/sonar/application/config/FileSystemSettingsTest.java b/server/sonar-main/src/test/java/org/sonar/application/config/FileSystemSettingsTest.java index d4994889037..4120596bfca 100644 --- a/server/sonar-main/src/test/java/org/sonar/application/config/FileSystemSettingsTest.java +++ b/server/sonar-main/src/test/java/org/sonar/application/config/FileSystemSettingsTest.java @@ -52,7 +52,7 @@ public class FileSystemSettingsTest { } @Test - public void relative_paths_are_converted_to_absolute_paths() throws Exception { + public void relative_paths_are_converted_to_absolute_paths() { Props props = new Props(new Properties()); props.set(PATH_HOME, homeDir.getAbsolutePath()); diff --git a/server/sonar-main/src/test/java/org/sonar/application/config/JdbcSettingsTest.java b/server/sonar-main/src/test/java/org/sonar/application/config/JdbcSettingsTest.java index 125ba8a0f98..c7f89f7c33d 100644 --- a/server/sonar-main/src/test/java/org/sonar/application/config/JdbcSettingsTest.java +++ b/server/sonar-main/src/test/java/org/sonar/application/config/JdbcSettingsTest.java @@ -181,7 +181,7 @@ public class JdbcSettingsTest { } @Test - public void driver_dir_does_not_exist() throws Exception { + public void driver_dir_does_not_exist() { expectedException.expect(MessageException.class); expectedException.expectMessage("Directory does not exist: extensions/jdbc-driver/oracle"); diff --git a/server/sonar-main/src/test/java/org/sonar/application/es/EsSettingsTest.java b/server/sonar-main/src/test/java/org/sonar/application/es/EsSettingsTest.java index 7d715511cb8..104a727146b 100644 --- a/server/sonar-main/src/test/java/org/sonar/application/es/EsSettingsTest.java +++ b/server/sonar-main/src/test/java/org/sonar/application/es/EsSettingsTest.java @@ -54,7 +54,7 @@ public class EsSettingsTest { private ListAppender listAppender; @After - public void tearDown() throws Exception { + public void tearDown() { if (listAppender != null) { ListAppender.detachMemoryAppenderToLoggerOf(EsSettings.class, listAppender); } @@ -82,7 +82,7 @@ public class EsSettingsTest { } @Test - public void constructor_logs_warning_if_env_variable_ES_JVM_OPTIONS_is_set_and_non_empty() throws IOException { + public void constructor_logs_warning_if_env_variable_ES_JVM_OPTIONS_is_set_and_non_empty() { this.listAppender = ListAppender.attachMemoryAppenderToLoggerOf(EsSettings.class); Props props = minimalProps(); System2 system2 = mock(System2.class); diff --git a/server/sonar-main/src/test/java/org/sonar/application/process/ProcessCommandsProcessMonitorTest.java b/server/sonar-main/src/test/java/org/sonar/application/process/ProcessCommandsProcessMonitorTest.java index 6cdd7614e55..719f2a350de 100644 --- a/server/sonar-main/src/test/java/org/sonar/application/process/ProcessCommandsProcessMonitorTest.java +++ b/server/sonar-main/src/test/java/org/sonar/application/process/ProcessCommandsProcessMonitorTest.java @@ -65,7 +65,7 @@ public class ProcessCommandsProcessMonitorTest { } @Test - public void ProcessMonitorImpl_is_a_proxy_of_Commands() throws Exception { + public void ProcessMonitorImpl_is_a_proxy_of_Commands() { Process process = mock(Process.class, RETURNS_DEEP_STUBS); ProcessCommands commands = mock(ProcessCommands.class, RETURNS_DEEP_STUBS); diff --git a/server/sonar-main/src/test/java/org/sonar/application/process/ProcessLauncherImplTest.java b/server/sonar-main/src/test/java/org/sonar/application/process/ProcessLauncherImplTest.java index e467eb10362..910b99d42be 100644 --- a/server/sonar-main/src/test/java/org/sonar/application/process/ProcessLauncherImplTest.java +++ b/server/sonar-main/src/test/java/org/sonar/application/process/ProcessLauncherImplTest.java @@ -233,7 +233,7 @@ public class ProcessLauncherImplTest { } @Override - public Process start() throws IOException { + public Process start() { this.started = true; return mock(Process.class); } diff --git a/server/sonar-main/src/test/java/org/sonar/application/process/SQProcessTest.java b/server/sonar-main/src/test/java/org/sonar/application/process/SQProcessTest.java index 19d66737ced..376a05bfdc0 100644 --- a/server/sonar-main/src/test/java/org/sonar/application/process/SQProcessTest.java +++ b/server/sonar-main/src/test/java/org/sonar/application/process/SQProcessTest.java @@ -235,7 +235,7 @@ public class SQProcessTest { } @Test - public void process_requests_are_listened_on_regular_basis() throws Exception { + public void process_requests_are_listened_on_regular_basis() { ProcessEventListener listener = mock(ProcessEventListener.class); SQProcess underTest = SQProcess.builder(A_PROCESS_ID) .addEventListener(listener) diff --git a/server/sonar-main/src/test/java/org/sonar/application/process/StopRequestWatcherImplTest.java b/server/sonar-main/src/test/java/org/sonar/application/process/StopRequestWatcherImplTest.java index 973bb95158a..465b4247a8f 100644 --- a/server/sonar-main/src/test/java/org/sonar/application/process/StopRequestWatcherImplTest.java +++ b/server/sonar-main/src/test/java/org/sonar/application/process/StopRequestWatcherImplTest.java @@ -53,7 +53,7 @@ public class StopRequestWatcherImplTest { private Scheduler scheduler = mock(Scheduler.class); @Test - public void do_not_watch_command_if_disabled() throws IOException { + public void do_not_watch_command_if_disabled() { enableSetting(false); StopRequestWatcherImpl underTest = new StopRequestWatcherImpl(settings, scheduler, commands); diff --git a/server/sonar-process/src/main/java/org/sonar/process/cluster/health/NodeDetails.java b/server/sonar-process/src/main/java/org/sonar/process/cluster/health/NodeDetails.java index 019c3ca7348..dce9738daad 100644 --- a/server/sonar-process/src/main/java/org/sonar/process/cluster/health/NodeDetails.java +++ b/server/sonar-process/src/main/java/org/sonar/process/cluster/health/NodeDetails.java @@ -97,7 +97,7 @@ public class NodeDetails implements Externalizable { } @Override - public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { + public void readExternal(ObjectInput in) throws IOException { this.type = Type.values()[in.readInt()]; this.name = in.readUTF(); this.host = in.readUTF(); diff --git a/server/sonar-process/src/test/java/org/sonar/process/cluster/health/NodeDetailsTest.java b/server/sonar-process/src/test/java/org/sonar/process/cluster/health/NodeDetailsTest.java index 933e3aee8fa..f34ab26d563 100644 --- a/server/sonar-process/src/test/java/org/sonar/process/cluster/health/NodeDetailsTest.java +++ b/server/sonar-process/src/test/java/org/sonar/process/cluster/health/NodeDetailsTest.java @@ -197,7 +197,7 @@ public class NodeDetailsTest { @Test public void NodeDetails_is_Externalizable() throws IOException, ClassNotFoundException { NodeDetails source = testSupport.randomNodeDetails(); - byte[] byteArray = testSupport.serialize(source); + byte[] byteArray = NodeDetailsTestSupport.serialize(source); NodeDetails underTest = (NodeDetails) new ObjectInputStream(new ByteArrayInputStream(byteArray)).readObject(); diff --git a/server/sonar-process/src/test/java/org/sonar/process/cluster/health/NodeHealthTest.java b/server/sonar-process/src/test/java/org/sonar/process/cluster/health/NodeHealthTest.java index cd20a89c7eb..61d78b1b1ae 100644 --- a/server/sonar-process/src/test/java/org/sonar/process/cluster/health/NodeHealthTest.java +++ b/server/sonar-process/src/test/java/org/sonar/process/cluster/health/NodeHealthTest.java @@ -141,7 +141,7 @@ public class NodeHealthTest { @Test public void class_is_serializable_with_causes() throws IOException, ClassNotFoundException { NodeHealth source = testSupport.randomBuilder(1).build(); - byte[] bytes = testSupport.serialize(source); + byte[] bytes = NodeDetailsTestSupport.serialize(source); NodeHealth underTest = (NodeHealth) new ObjectInputStream(new ByteArrayInputStream(bytes)).readObject(); @@ -154,7 +154,7 @@ public class NodeHealthTest { .setStatus(randomStatus) .setDetails(testSupport.randomNodeDetails()); NodeHealth source = builder.build(); - byte[] bytes = testSupport.serialize(source); + byte[] bytes = NodeDetailsTestSupport.serialize(source); NodeHealth underTest = (NodeHealth) new ObjectInputStream(new ByteArrayInputStream(bytes)).readObject(); diff --git a/server/sonar-process/src/test/java/org/sonar/process/cluster/hz/HazelcastMemberImplTest.java b/server/sonar-process/src/test/java/org/sonar/process/cluster/hz/HazelcastMemberImplTest.java index 707beadaf89..ee784627048 100644 --- a/server/sonar-process/src/test/java/org/sonar/process/cluster/hz/HazelcastMemberImplTest.java +++ b/server/sonar-process/src/test/java/org/sonar/process/cluster/hz/HazelcastMemberImplTest.java @@ -55,7 +55,7 @@ public class HazelcastMemberImplTest { private static HazelcastMember member3; @BeforeClass - public static void setUp() throws Exception { + public static void setUp() { int port1 = NetworkUtilsImpl.INSTANCE.getNextAvailablePort(loopback); int port2 = NetworkUtilsImpl.INSTANCE.getNextAvailablePort(loopback); int port3 = NetworkUtilsImpl.INSTANCE.getNextAvailablePort(loopback); @@ -65,7 +65,7 @@ public class HazelcastMemberImplTest { } @AfterClass - public static void tearDown() throws Exception { + public static void tearDown() { member1.close(); member2.close(); member3.close(); diff --git a/server/sonar-process/src/test/java/org/sonar/process/cluster/hz/HazelcastMemberSelectorsTest.java b/server/sonar-process/src/test/java/org/sonar/process/cluster/hz/HazelcastMemberSelectorsTest.java index 02befcd5dbc..c594410f4a5 100644 --- a/server/sonar-process/src/test/java/org/sonar/process/cluster/hz/HazelcastMemberSelectorsTest.java +++ b/server/sonar-process/src/test/java/org/sonar/process/cluster/hz/HazelcastMemberSelectorsTest.java @@ -34,7 +34,7 @@ import static org.sonar.process.cluster.hz.HazelcastMember.Attribute.PROCESS_KEY public class HazelcastMemberSelectorsTest { @Test - public void selecting_ce_nodes() throws Exception { + public void selecting_ce_nodes() { Member member = mock(Member.class); MemberSelector underTest = HazelcastMemberSelectors.selectorForProcessIds(COMPUTE_ENGINE); @@ -49,7 +49,7 @@ public class HazelcastMemberSelectorsTest { } @Test - public void selecting_web_and_app_nodes() throws Exception { + public void selecting_web_and_app_nodes() { Member member = mock(Member.class); MemberSelector underTest = HazelcastMemberSelectors.selectorForProcessIds(WEB_SERVER, APP); @@ -62,4 +62,4 @@ public class HazelcastMemberSelectorsTest { when(member.getStringAttribute(PROCESS_KEY.getKey())).thenReturn(APP.getKey()); assertThat(underTest.select(member)).isTrue(); } -} \ No newline at end of file +} diff --git a/server/sonar-process/src/test/java/org/sonar/process/cluster/hz/SuccessfulDistributedCall.java b/server/sonar-process/src/test/java/org/sonar/process/cluster/hz/SuccessfulDistributedCall.java index 1053586dd94..4937b5601a7 100644 --- a/server/sonar-process/src/test/java/org/sonar/process/cluster/hz/SuccessfulDistributedCall.java +++ b/server/sonar-process/src/test/java/org/sonar/process/cluster/hz/SuccessfulDistributedCall.java @@ -25,7 +25,7 @@ public class SuccessfulDistributedCall implements DistributedCall { static final AtomicLong COUNTER = new AtomicLong(); @Override - public Long call() throws Exception { + public Long call() { return COUNTER.getAndIncrement(); } } diff --git a/server/sonar-process/src/test/java/org/sonar/process/test/HttpProcess.java b/server/sonar-process/src/test/java/org/sonar/process/test/HttpProcess.java index adc64f54169..dd249cfd0fc 100644 --- a/server/sonar-process/src/test/java/org/sonar/process/test/HttpProcess.java +++ b/server/sonar-process/src/test/java/org/sonar/process/test/HttpProcess.java @@ -65,7 +65,7 @@ public class HttpProcess implements Monitored { server.setHandler(context); context.setHandler(new AbstractHandler() { @Override - public void handle(String target, Request request, HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws IOException, ServletException { + public void handle(String target, Request request, HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws IOException { if ("/ping".equals(target)) { request.setHandled(true); httpServletResponse.getWriter().print("ping"); diff --git a/server/sonar-process/src/test/resources/org/sonar/process/PropsTest/sonar.properties b/server/sonar-process/src/test/resources/org/sonar/process/PropsTest/sonar.properties index 5c06e58a32e..d164f8cfcb9 100644 --- a/server/sonar-process/src/test/resources/org/sonar/process/PropsTest/sonar.properties +++ b/server/sonar-process/src/test/resources/org/sonar/process/PropsTest/sonar.properties @@ -1,3 +1,3 @@ -hello: world +hello= world foo=bar java.io.tmpdir=/should/be/overridden diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/InitFilter.java b/server/sonar-server/src/main/java/org/sonar/server/authentication/InitFilter.java index c0ef008a72d..8a699c523c1 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/authentication/InitFilter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/authentication/InitFilter.java @@ -19,10 +19,8 @@ */ package org.sonar.server.authentication; -import java.io.IOException; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; -import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; @@ -64,7 +62,7 @@ public class InitFilter extends AuthenticationFilter { } @Override - public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) { HttpServletRequest httpRequest = (HttpServletRequest) request; HttpServletResponse httpResponse = (HttpServletResponse) response; @@ -119,7 +117,7 @@ public class InitFilter extends AuthenticationFilter { } @Override - public void init(FilterConfig filterConfig) throws ServletException { + public void init(FilterConfig filterConfig) { // Nothing to do } diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/OAuth2CallbackFilter.java b/server/sonar-server/src/main/java/org/sonar/server/authentication/OAuth2CallbackFilter.java index a282312caa4..20f84b3df65 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/authentication/OAuth2CallbackFilter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/authentication/OAuth2CallbackFilter.java @@ -19,11 +19,9 @@ */ package org.sonar.server.authentication; -import java.io.IOException; import javax.annotation.CheckForNull; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; -import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; @@ -61,7 +59,7 @@ public class OAuth2CallbackFilter extends AuthenticationFilter { } @Override - public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) { HttpServletRequest httpRequest = (HttpServletRequest) request; HttpServletResponse httpResponse = (HttpServletResponse) response; @@ -110,7 +108,7 @@ public class OAuth2CallbackFilter extends AuthenticationFilter { } @Override - public void init(FilterConfig filterConfig) throws ServletException { + public void init(FilterConfig filterConfig) { // Nothing to do } diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/ws/LoginAction.java b/server/sonar-server/src/main/java/org/sonar/server/authentication/ws/LoginAction.java index cfe02275010..c64c7a629b3 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/authentication/ws/LoginAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/authentication/ws/LoginAction.java @@ -19,11 +19,9 @@ */ package org.sonar.server.authentication.ws; -import java.io.IOException; import javax.annotation.Nullable; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; -import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; @@ -89,7 +87,7 @@ public class LoginAction extends ServletFilter implements AuthenticationWsAction } @Override - public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain chain) throws IOException, ServletException { + public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain chain) { HttpServletRequest request = (HttpServletRequest) servletRequest; HttpServletResponse response = (HttpServletResponse) servletResponse; @@ -124,7 +122,7 @@ public class LoginAction extends ServletFilter implements AuthenticationWsAction } @Override - public void init(FilterConfig filterConfig) throws ServletException { + public void init(FilterConfig filterConfig) { // Nothing to do } diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/ws/LogoutAction.java b/server/sonar-server/src/main/java/org/sonar/server/authentication/ws/LogoutAction.java index ea8d7f859ee..efcf3a0ffcf 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/authentication/ws/LogoutAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/authentication/ws/LogoutAction.java @@ -19,11 +19,9 @@ */ package org.sonar.server.authentication.ws; -import java.io.IOException; import java.util.Optional; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; -import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; @@ -67,7 +65,7 @@ public class LogoutAction extends ServletFilter implements AuthenticationWsActio } @Override - public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain chain) throws IOException, ServletException { + public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain chain) { HttpServletRequest request = (HttpServletRequest) servletRequest; HttpServletResponse response = (HttpServletResponse) servletResponse; @@ -97,7 +95,7 @@ public class LogoutAction extends ServletFilter implements AuthenticationWsActio } @Override - public void init(FilterConfig filterConfig) throws ServletException { + public void init(FilterConfig filterConfig) { // Nothing to do } diff --git a/server/sonar-server/src/main/java/org/sonar/server/authentication/ws/ValidateAction.java b/server/sonar-server/src/main/java/org/sonar/server/authentication/ws/ValidateAction.java index abf8b130940..af33d4b0bab 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/authentication/ws/ValidateAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/authentication/ws/ValidateAction.java @@ -24,7 +24,6 @@ import java.io.IOException; import java.util.Optional; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; -import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; @@ -73,7 +72,7 @@ public class ValidateAction extends ServletFilter implements AuthenticationWsAct } @Override - public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException { + public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException { HttpServletRequest request = (HttpServletRequest) servletRequest; HttpServletResponse response = (HttpServletResponse) servletResponse; @@ -104,7 +103,7 @@ public class ValidateAction extends ServletFilter implements AuthenticationWsAct } @Override - public void init(FilterConfig filterConfig) throws ServletException { + public void init(FilterConfig filterConfig) { // Nothing to do } diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReaderImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReaderImpl.java index d8cb32505ae..9ef182d94fa 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReaderImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReaderImpl.java @@ -178,7 +178,7 @@ public class BatchReportReaderImpl implements BatchReportReader { } @Override - protected void doClose() throws Exception { + protected void doClose() { lineIterator.close(); } } diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/Component.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/Component.java index 624049c37e6..496a735e2d9 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/Component.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/Component.java @@ -59,7 +59,7 @@ public interface Component { } enum Status { - UNAVAILABLE, SAME, CHANGED, ADDED; + UNAVAILABLE, SAME, CHANGED, ADDED } Type getType(); diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationMeasures.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationMeasures.java index 95e1790c8ff..ccc0fa686d2 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationMeasures.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationMeasures.java @@ -66,7 +66,7 @@ public class DuplicationMeasures { this.measureRepository = measureRepository; // will be null for views this.duplicationRepository = duplicationRepository; - this.formulas = ImmutableList.of(new DuplicationFormula(metricRepository, measureRepository)); + this.formulas = ImmutableList.of(new DuplicationFormula(metricRepository, measureRepository)); } /** diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerBaseInputFactory.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerBaseInputFactory.java index d83cb49953a..c582a49302b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerBaseInputFactory.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerBaseInputFactory.java @@ -37,7 +37,7 @@ import org.sonar.server.computation.task.projectanalysis.filemove.MovedFilesRepo * Factory of {@link Input} of base data for issue tracking. Data are lazy-loaded. */ public class TrackerBaseInputFactory { - private static final LineHashSequence EMPTY_LINE_HASH_SEQUENCE = new LineHashSequence(Collections.emptyList()); + private static final LineHashSequence EMPTY_LINE_HASH_SEQUENCE = new LineHashSequence(Collections.emptyList()); private final ComponentIssuesLoader issuesLoader; private final DbClient dbClient; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerMergeBranchInputFactory.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerMergeBranchInputFactory.java index f832a454cfa..d28a5ea13b0 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerMergeBranchInputFactory.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerMergeBranchInputFactory.java @@ -32,7 +32,7 @@ import org.sonar.server.computation.task.projectanalysis.component.Component; import org.sonar.server.computation.task.projectanalysis.component.MergeBranchComponentUuids; public class TrackerMergeBranchInputFactory { - private static final LineHashSequence EMPTY_LINE_HASH_SEQUENCE = new LineHashSequence(Collections.emptyList()); + private static final LineHashSequence EMPTY_LINE_HASH_SEQUENCE = new LineHashSequence(Collections.emptyList()); private final ComponentIssuesLoader mergeIssuesLoader; private final DbClient dbClient; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/BestValueOptimization.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/BestValueOptimization.java index 67a04f51f47..3d352219c14 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/BestValueOptimization.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/measure/BestValueOptimization.java @@ -73,7 +73,7 @@ public class BestValueOptimization implements Predicate { private static boolean isBestValue(Measure measure, Double bestValue) { switch (measure.getValueType()) { case BOOLEAN: - return bestValue.intValue() == 1 ? measure.getBooleanValue() : !measure.getBooleanValue(); + return (bestValue.intValue() == 1) == measure.getBooleanValue(); case INT: return bestValue.intValue() == measure.getIntValue(); case LONG: diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepositoryImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepositoryImpl.java index 07bfbfb07bf..dcb5cff5e8c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepositoryImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepositoryImpl.java @@ -94,7 +94,7 @@ public class SourceLinesRepositoryImpl implements SourceLinesRepository { } @Override - protected void doClose() throws Exception { + protected void doClose() { delegate.close(); } } diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/CommentMeasuresStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/CommentMeasuresStep.java index 0bf8a224d9a..e2e567c6dc1 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/CommentMeasuresStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/CommentMeasuresStep.java @@ -60,7 +60,7 @@ public class CommentMeasuresStep implements ComputationStep { this.treeRootHolder = treeRootHolder; this.metricRepository = metricRepository; this.measureRepository = measureRepository; - this.formulas = ImmutableList.of( + this.formulas = ImmutableList.of( createIntSumFormula(COMMENTED_OUT_CODE_LINES_KEY), new DocumentationFormula(), new CommentDensityFormula()); diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ComplexityMeasuresStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ComplexityMeasuresStep.java index d4b8b2fa1cc..31fad25f7f4 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ComplexityMeasuresStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/ComplexityMeasuresStep.java @@ -50,7 +50,7 @@ import static org.sonar.server.computation.task.projectanalysis.formula.SumFormu */ public class ComplexityMeasuresStep implements ComputationStep { - private static final ImmutableList FORMULAS = ImmutableList.of( + private static final ImmutableList FORMULAS = ImmutableList.of( createIntSumFormula(COMPLEXITY_KEY), createIntSumFormula(COMPLEXITY_IN_CLASSES_KEY), createIntSumFormula(COMPLEXITY_IN_FUNCTIONS_KEY), diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/CoverageMeasuresStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/CoverageMeasuresStep.java index d665198926b..214455f0996 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/CoverageMeasuresStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/CoverageMeasuresStep.java @@ -45,7 +45,7 @@ import static org.sonar.server.computation.task.projectanalysis.formula.SumFormu * Computes coverage measures on files and then aggregates them on higher components. */ public class CoverageMeasuresStep implements ComputationStep { - private static final ImmutableList COVERAGE_FORMULAS = ImmutableList.of( + private static final ImmutableList COVERAGE_FORMULAS = ImmutableList.of( createIntSumFormula(LINES_TO_COVER_KEY), createIntSumFormula(UNCOVERED_LINES_KEY), createIntSumFormula(CONDITIONS_TO_COVER_KEY), diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LanguageDistributionMeasuresStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LanguageDistributionMeasuresStep.java index 64c62907a44..77478199dca 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LanguageDistributionMeasuresStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/LanguageDistributionMeasuresStep.java @@ -53,7 +53,7 @@ public class LanguageDistributionMeasuresStep implements ComputationStep { private static final String UNKNOWN_LANGUAGE_KEY = ""; - private static final ImmutableList FORMULAS = ImmutableList.of(new LanguageDistributionFormula()); + private static final ImmutableList FORMULAS = ImmutableList.of(new LanguageDistributionFormula()); private static final String[] LANGUAGE_DISTRIBUTION_FORMULA_METRICS = new String[] {NCLOC_LANGUAGE_DISTRIBUTION_KEY}; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/NewCoverageMeasuresStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/NewCoverageMeasuresStep.java index a2f541423dc..e708f4fc232 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/NewCoverageMeasuresStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/NewCoverageMeasuresStep.java @@ -132,7 +132,7 @@ public class NewCoverageMeasuresStep implements ComputationStep { if (scmInfoRepository == null) { return VIEWS_FORMULAS; } - return Collections.>singleton(new NewLinesAndConditionsCoverageFormula(scmInfoRepository)); + return Collections.singleton(new NewLinesAndConditionsCoverageFormula(scmInfoRepository)); } /** diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/UnitTestMeasuresStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/UnitTestMeasuresStep.java index 3d00a35e216..54712d2e572 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/UnitTestMeasuresStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/step/UnitTestMeasuresStep.java @@ -52,7 +52,7 @@ public class UnitTestMeasuresStep implements ComputationStep { private static final String[] METRICS = new String[] {TESTS_KEY, TEST_ERRORS_KEY, TEST_FAILURES_KEY, TEST_SUCCESS_DENSITY_KEY}; - private static final ImmutableList FORMULAS = ImmutableList.of( + private static final ImmutableList FORMULAS = ImmutableList.of( createLongSumFormula(TEST_EXECUTION_TIME_KEY), createIntSumFormula(SKIPPED_TESTS_KEY), new UnitTestsFormula()); diff --git a/server/sonar-server/src/main/java/org/sonar/server/es/textsearch/ComponentTextSearchFeature.java b/server/sonar-server/src/main/java/org/sonar/server/es/textsearch/ComponentTextSearchFeature.java index 177a7b352bf..9c6a1919337 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/es/textsearch/ComponentTextSearchFeature.java +++ b/server/sonar-server/src/main/java/org/sonar/server/es/textsearch/ComponentTextSearchFeature.java @@ -26,7 +26,7 @@ import org.sonar.server.es.textsearch.ComponentTextSearchQueryFactory.ComponentT public interface ComponentTextSearchFeature { enum UseCase { - GENERATE_RESULTS, CHANGE_ORDER_OF_RESULTS; + GENERATE_RESULTS, CHANGE_ORDER_OF_RESULTS } default UseCase getUseCase() { diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java index 9f91f0f5213..7b74faaf2d4 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java @@ -314,7 +314,7 @@ public class SearchAction implements IssuesWsAction { } @Override - public final void handle(Request request, Response response) throws Exception { + public final void handle(Request request, Response response) { SearchWsResponse searchWsResponse = doHandle(toSearchWsRequest(request), request); writeProtobuf(searchWsResponse, request, response); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/metric/CoreCustomMetrics.java b/server/sonar-server/src/main/java/org/sonar/server/metric/CoreCustomMetrics.java index 2f6bd6f8749..5f32c87e785 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/metric/CoreCustomMetrics.java +++ b/server/sonar-server/src/main/java/org/sonar/server/metric/CoreCustomMetrics.java @@ -30,7 +30,7 @@ public final class CoreCustomMetrics implements Metrics { @Override public List getMetrics() { - return ImmutableList.of( + return ImmutableList.of( new Metric.Builder("burned_budget", "Burned budget", Metric.ValueType.FLOAT) .setDirection(Metric.DIRECTION_NONE) .setQualitative(false) diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/web/MasterServletFilter.java b/server/sonar-server/src/main/java/org/sonar/server/platform/web/MasterServletFilter.java index 27e443be844..c8291e4f029 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/web/MasterServletFilter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/web/MasterServletFilter.java @@ -53,18 +53,18 @@ public class MasterServletFilter implements Filter { } @Override - public void init(FilterConfig config) throws ServletException { + public void init(FilterConfig config) { // Filters are already available in picocontainer unless a database migration is required. See // org.sonar.server.startup.RegisterServletFilters. init(config, Platform.getInstance().getContainer().getComponentsByType(ServletFilter.class)); } - void init(FilterConfig config, List filters) throws ServletException { + void init(FilterConfig config, List filters) { this.config = config; initFilters(filters); } - public void initFilters(List filterExtensions) throws ServletException { + public void initFilters(List filterExtensions) { List filterList = Lists.newArrayList(); for (ServletFilter extension : filterExtensions) { try { diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/web/RedirectFilter.java b/server/sonar-server/src/main/java/org/sonar/server/platform/web/RedirectFilter.java index 130bd526c64..c6492e525ff 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/web/RedirectFilter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/web/RedirectFilter.java @@ -83,7 +83,7 @@ public class RedirectFilter implements Filter { } @Override - public void init(FilterConfig filterConfig) throws ServletException { + public void init(FilterConfig filterConfig) { // Nothing } diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/web/RootFilter.java b/server/sonar-server/src/main/java/org/sonar/server/platform/web/RootFilter.java index 1bba6885f33..0e913f5c9b6 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/web/RootFilter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/web/RootFilter.java @@ -49,7 +49,7 @@ public class RootFilter implements Filter { public static final org.sonar.api.utils.log.Logger Logger = Loggers.get("http"); @Override - public void init(FilterConfig filterConfig) throws ServletException { + public void init(FilterConfig filterConfig) { // nothing to do } diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/web/SecurityServletFilter.java b/server/sonar-server/src/main/java/org/sonar/server/platform/web/SecurityServletFilter.java index 36f3e20ce65..f644738ddf2 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/web/SecurityServletFilter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/web/SecurityServletFilter.java @@ -39,7 +39,7 @@ public class SecurityServletFilter implements Filter { private static final Set ALLOWED_HTTP_METHODS = ImmutableSet.of("DELETE", "GET", "HEAD", "POST", "PUT"); @Override - public void init(FilterConfig filterConfig) throws ServletException { + public void init(FilterConfig filterConfig) { // nothing } diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/web/WebPagesFilter.java b/server/sonar-server/src/main/java/org/sonar/server/platform/web/WebPagesFilter.java index 6cd8ed3ecc9..27632c7c8b6 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/web/WebPagesFilter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/web/WebPagesFilter.java @@ -73,7 +73,7 @@ public class WebPagesFilter implements Filter { } @Override - public void init(FilterConfig filterConfig) throws ServletException { + public void init(FilterConfig filterConfig) { String context = filterConfig.getServletContext().getContextPath(); String indexFile = readIndexFile(filterConfig.getServletContext()); this.indexDotHtml = indexFile.replaceAll(CONTEXT_PLACEHOLDER, context); diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/RequestIdFilter.java b/server/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/RequestIdFilter.java index d1810a6cfac..20e63c1bd87 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/RequestIdFilter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/web/requestid/RequestIdFilter.java @@ -46,7 +46,7 @@ public class RequestIdFilter implements Filter { } @Override - public void init(FilterConfig filterConfig) throws ServletException { + public void init(FilterConfig filterConfig) { // nothing to do } diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/StaticResourcesServlet.java b/server/sonar-server/src/main/java/org/sonar/server/plugins/StaticResourcesServlet.java index 3bf70904397..3f2da92f6ae 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/plugins/StaticResourcesServlet.java +++ b/server/sonar-server/src/main/java/org/sonar/server/plugins/StaticResourcesServlet.java @@ -23,7 +23,6 @@ import com.google.common.annotations.VisibleForTesting; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -47,7 +46,7 @@ public class StaticResourcesServlet extends HttpServlet { private static final long serialVersionUID = -2577454614650178426L; @Override - public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + public void doGet(HttpServletRequest request, HttpServletResponse response) { String pluginKey = getPluginKey(request); String resource = getResourcePath(request); InputStream in = null; diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/InstalledAction.java b/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/InstalledAction.java index b774f47b6c3..f65a2f35c15 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/InstalledAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/InstalledAction.java @@ -104,7 +104,7 @@ public class InstalledAction implements PluginsWsAction { jsonWriter.beginObject(); List additionalFields = request.paramAsStrings(WebService.Param.FIELDS); - writePluginInfoList(jsonWriter, pluginInfoList, additionalFields == null ? Collections.emptyList() : additionalFields, pluginDtosByKey); + writePluginInfoList(jsonWriter, pluginInfoList, additionalFields == null ? Collections.emptyList() : additionalFields, pluginDtosByKey); jsonWriter.endObject(); jsonWriter.close(); @@ -116,7 +116,7 @@ public class InstalledAction implements PluginsWsAction { private void writePluginInfoList(JsonWriter jsonWriter, Collection pluginInfoList, List additionalFields, Map pluginDtos) { Map compatiblesPluginsFromUpdateCenter = additionalFields.isEmpty() - ? Collections.emptyMap() + ? Collections.emptyMap() : compatiblePluginsByKey(updateCenterMatrixFactory); pluginWSCommons.writePluginInfoList(jsonWriter, pluginInfoList, compatiblesPluginsFromUpdateCenter, ARRAY_PLUGINS, pluginDtos, compression.getPlugins()); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/PluginWSCommons.java b/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/PluginWSCommons.java index 3a42cd4333d..73787be6e89 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/PluginWSCommons.java +++ b/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/PluginWSCommons.java @@ -313,7 +313,7 @@ public class PluginWSCommons { private static List compatiblePlugins(UpdateCenterMatrixFactory updateCenterMatrixFactory) { Optional updateCenter = updateCenterMatrixFactory.getUpdateCenter(false); - return updateCenter.isPresent() ? updateCenter.get().findAllCompatiblePlugins() : Collections.emptyList(); + return updateCenter.isPresent() ? updateCenter.get().findAllCompatiblePlugins() : Collections.emptyList(); } static ImmutableMap compatiblePluginsByKey(UpdateCenterMatrixFactory updateCenterMatrixFactory) { diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ActiveRule.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ActiveRule.java index da9255f76d7..c3f26fcee79 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ActiveRule.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ActiveRule.java @@ -24,7 +24,7 @@ import org.sonar.db.qualityprofile.ActiveRuleKey; public interface ActiveRule { enum Inheritance { - NONE, OVERRIDES, INHERITED; + NONE, OVERRIDES, INHERITED } long createdAt(); diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/UpdateAction.java b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/UpdateAction.java index 2969fe4487d..b8f2ef6318a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/UpdateAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/UpdateAction.java @@ -289,7 +289,7 @@ public class UpdateAction implements RulesWsAction { .setTemplateRules(templateRules) .setRuleParameters(ruleParameters) .setTotal(1L); - responseBuilder.setRule(mapper.toWsRule(rule.getDefinition(), searchResult, Collections.emptySet(), rule.getMetadata())); + responseBuilder.setRule(mapper.toWsRule(rule.getDefinition(), searchResult, Collections.emptySet(), rule.getMetadata())); return responseBuilder.build(); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/OpeningHtmlTag.java b/server/sonar-server/src/main/java/org/sonar/server/source/OpeningHtmlTag.java index 0efe204229a..2dcac3bdd0e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/source/OpeningHtmlTag.java +++ b/server/sonar-server/src/main/java/org/sonar/server/source/OpeningHtmlTag.java @@ -59,9 +59,6 @@ class OpeningHtmlTag { if (startOffset != otherTag.startOffset) { return false; } - if ((cssClass != null) ? !cssClass.equals(otherTag.cssClass) : (otherTag.cssClass != null)) { - return false; - } - return true; + return (cssClass != null) ? cssClass.equals(otherTag.cssClass) : (otherTag.cssClass == null); } } diff --git a/server/sonar-server/src/main/java/org/sonar/server/test/index/TestDoc.java b/server/sonar-server/src/main/java/org/sonar/server/test/index/TestDoc.java index bbc5eab0af2..e9d7f3a7276 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/test/index/TestDoc.java +++ b/server/sonar-server/src/main/java/org/sonar/server/test/index/TestDoc.java @@ -45,7 +45,7 @@ public class TestDoc extends BaseDoc { @VisibleForTesting public TestDoc() { - super(Maps.newHashMapWithExpectedSize(10)); + super(Maps.newHashMapWithExpectedSize(10)); } @Override diff --git a/server/sonar-server/src/main/java/org/sonar/server/text/MacroInterpreter.java b/server/sonar-server/src/main/java/org/sonar/server/text/MacroInterpreter.java index b1b8471bab7..0a7eee4422e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/text/MacroInterpreter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/text/MacroInterpreter.java @@ -31,7 +31,7 @@ public class MacroInterpreter { private final List macros; public MacroInterpreter(Server server) { - this.macros = ImmutableList.of( + this.macros = ImmutableList.of( new RuleMacro(server.getContextPath()) ); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/UserSessionFilter.java b/server/sonar-server/src/main/java/org/sonar/server/user/UserSessionFilter.java index 4536c45f249..479a451961a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/user/UserSessionFilter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/user/UserSessionFilter.java @@ -94,7 +94,7 @@ public class UserSessionFilter implements Filter { } @Override - public void init(FilterConfig filterConfig) throws ServletException { + public void init(FilterConfig filterConfig) { // nothing to do } diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/UserJsonWriter.java b/server/sonar-server/src/main/java/org/sonar/server/user/ws/UserJsonWriter.java index 6329ab1c938..63e3018b20e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/UserJsonWriter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/user/ws/UserJsonWriter.java @@ -81,7 +81,7 @@ public class UserJsonWriter { if (user == null) { json.beginObject().endObject(); } else { - write(json, user, Collections.emptySet(), CONCISE_FIELDS); + write(json, user, Collections.emptySet(), CONCISE_FIELDS); } } diff --git a/server/sonar-server/src/main/java/org/sonar/server/util/cache/DiskCache.java b/server/sonar-server/src/main/java/org/sonar/server/util/cache/DiskCache.java index 739517fd228..905f460dfce 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/util/cache/DiskCache.java +++ b/server/sonar-server/src/main/java/org/sonar/server/util/cache/DiskCache.java @@ -82,7 +82,7 @@ public class DiskCache { try { this.output = new ObjectOutputStream(new FileOutputStream(file, true)) { @Override - protected void writeStreamHeader() throws IOException { + protected void writeStreamHeader() { // do not write stream headers as it's already done in constructor of DiskCache } }; diff --git a/server/sonar-server/src/main/java/org/sonar/server/view/index/ViewDoc.java b/server/sonar-server/src/main/java/org/sonar/server/view/index/ViewDoc.java index 85243401028..cbceaff0294 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/view/index/ViewDoc.java +++ b/server/sonar-server/src/main/java/org/sonar/server/view/index/ViewDoc.java @@ -31,7 +31,7 @@ public class ViewDoc extends BaseDoc { } public ViewDoc() { - super(Maps.newHashMap()); + super(Maps.newHashMap()); } @Override diff --git a/server/sonar-server/src/main/java/org/sonar/server/ws/DeprecatedPropertiesWsFilter.java b/server/sonar-server/src/main/java/org/sonar/server/ws/DeprecatedPropertiesWsFilter.java index 6e63d46e690..143453d7270 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/ws/DeprecatedPropertiesWsFilter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/ws/DeprecatedPropertiesWsFilter.java @@ -31,7 +31,6 @@ import java.util.Map; import java.util.Optional; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; -import javax.servlet.ServletException; import javax.servlet.ServletInputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -70,7 +69,7 @@ public class DeprecatedPropertiesWsFilter extends ServletFilter { } @Override - public void doFilter(javax.servlet.ServletRequest servletRequest, javax.servlet.ServletResponse servletResponse, FilterChain chain) throws IOException, ServletException { + public void doFilter(javax.servlet.ServletRequest servletRequest, javax.servlet.ServletResponse servletResponse, FilterChain chain) { HttpServletRequest request = (HttpServletRequest) servletRequest; HttpServletResponse response = (HttpServletResponse) servletResponse; RestServletRequest wsRequest = new RestServletRequest(request); @@ -79,7 +78,7 @@ public class DeprecatedPropertiesWsFilter extends ServletFilter { } @Override - public void init(FilterConfig filterConfig) throws ServletException { + public void init(FilterConfig filterConfig) { // Nothing to do } diff --git a/server/sonar-server/src/main/java/org/sonar/server/ws/RemovedWebServiceHandler.java b/server/sonar-server/src/main/java/org/sonar/server/ws/RemovedWebServiceHandler.java index 827421c73b9..8bc2d395323 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/ws/RemovedWebServiceHandler.java +++ b/server/sonar-server/src/main/java/org/sonar/server/ws/RemovedWebServiceHandler.java @@ -36,7 +36,7 @@ public enum RemovedWebServiceHandler implements RequestHandler { INSTANCE; @Override - public void handle(Request request, Response response) throws Exception { + public void handle(Request request, Response response) { throw new ServerException(HTTP_GONE, String.format("The web service '%s' doesn't exist anymore, please read its documentation to use alternatives", request.getPath())); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/ws/WebServiceFilter.java b/server/sonar-server/src/main/java/org/sonar/server/ws/WebServiceFilter.java index f6f351aec91..4691c046295 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/ws/WebServiceFilter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/ws/WebServiceFilter.java @@ -19,13 +19,11 @@ */ package org.sonar.server.ws; -import java.io.IOException; import java.util.Set; import java.util.function.Function; import java.util.stream.Stream; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; -import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.sonar.api.server.ws.WebService; @@ -78,7 +76,7 @@ public class WebServiceFilter extends ServletFilter { } @Override - public void doFilter(javax.servlet.ServletRequest servletRequest, javax.servlet.ServletResponse servletResponse, FilterChain chain) throws IOException, ServletException { + public void doFilter(javax.servlet.ServletRequest servletRequest, javax.servlet.ServletResponse servletResponse, FilterChain chain) { HttpServletRequest request = (HttpServletRequest) servletRequest; HttpServletResponse response = (HttpServletResponse) servletResponse; ServletRequest wsRequest = new ServletRequest(request); @@ -87,7 +85,7 @@ public class WebServiceFilter extends ServletFilter { } @Override - public void init(FilterConfig filterConfig) throws ServletException { + public void init(FilterConfig filterConfig) { // Nothing to do } diff --git a/server/sonar-server/src/main/java/org/sonar/server/ws/WebServiceReroutingFilter.java b/server/sonar-server/src/main/java/org/sonar/server/ws/WebServiceReroutingFilter.java index 3b0b52e563c..1a7c516a4be 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/ws/WebServiceReroutingFilter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/ws/WebServiceReroutingFilter.java @@ -20,12 +20,10 @@ package org.sonar.server.ws; import com.google.common.collect.ImmutableMap; -import java.io.IOException; import java.util.Map; import java.util.Set; import javax.servlet.FilterChain; import javax.servlet.FilterConfig; -import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.sonar.api.web.ServletFilter; @@ -55,7 +53,7 @@ public class WebServiceReroutingFilter extends ServletFilter { } @Override - public void doFilter(javax.servlet.ServletRequest servletRequest, javax.servlet.ServletResponse servletResponse, FilterChain chain) throws IOException, ServletException { + public void doFilter(javax.servlet.ServletRequest servletRequest, javax.servlet.ServletResponse servletResponse, FilterChain chain) { HttpServletRequest httpRequest = (HttpServletRequest) servletRequest; RedirectionRequest wsRequest = new RedirectionRequest(httpRequest); ServletResponse wsResponse = new ServletResponse((HttpServletResponse) servletResponse); @@ -64,7 +62,7 @@ public class WebServiceReroutingFilter extends ServletFilter { } @Override - public void init(FilterConfig filterConfig) throws ServletException { + public void init(FilterConfig filterConfig) { // Nothing to do } diff --git a/server/sonar-server/src/test/java/org/sonar/ce/http/CeHttpClientTest.java b/server/sonar-server/src/test/java/org/sonar/ce/http/CeHttpClientTest.java index ce56c7429b8..00396ca9a64 100644 --- a/server/sonar-server/src/test/java/org/sonar/ce/http/CeHttpClientTest.java +++ b/server/sonar-server/src/test/java/org/sonar/ce/http/CeHttpClientTest.java @@ -61,14 +61,14 @@ public class CeHttpClientTest { } @Test - public void retrieveSystemInfo_returns_absent_if_process_is_down() throws Exception { + public void retrieveSystemInfo_returns_absent_if_process_is_down() { Optional info = underTest.retrieveSystemInfo(); assertThat(info.isPresent()).isFalse(); } @Test - public void retrieveSystemInfo_get_information_if_process_is_up() throws Exception { + public void retrieveSystemInfo_get_information_if_process_is_up() { Buffer response = new Buffer(); response.read(ProtobufSystemInfo.Section.newBuilder().build().toByteArray()); server.enqueue(new MockResponse().setBody(response)); @@ -81,7 +81,7 @@ public class CeHttpClientTest { } @Test - public void retrieveSystemInfo_throws_ISE_if_http_error() throws Exception { + public void retrieveSystemInfo_throws_ISE_if_http_error() { server.enqueue(new MockResponse().setResponseCode(500)); // initialize registration of process diff --git a/server/sonar-server/src/test/java/org/sonar/ce/log/CeLoggingTest.java b/server/sonar-server/src/test/java/org/sonar/ce/log/CeLoggingTest.java index 7f30f16d246..842160a92eb 100644 --- a/server/sonar-server/src/test/java/org/sonar/ce/log/CeLoggingTest.java +++ b/server/sonar-server/src/test/java/org/sonar/ce/log/CeLoggingTest.java @@ -47,7 +47,7 @@ public class CeLoggingTest { } @After - public void cleanMDC() throws Exception { + public void cleanMDC() { MDC.clear(); } diff --git a/server/sonar-server/src/test/java/org/sonar/ce/queue/CeQueueImplTest.java b/server/sonar-server/src/test/java/org/sonar/ce/queue/CeQueueImplTest.java index d16ea963edc..961db97a11c 100644 --- a/server/sonar-server/src/test/java/org/sonar/ce/queue/CeQueueImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/ce/queue/CeQueueImplTest.java @@ -131,7 +131,7 @@ public class CeQueueImplTest { } @Test - public void cancel_pending() throws Exception { + public void cancel_pending() { CeTask task = submit(CeTaskTypes.REPORT, "PROJECT_1"); CeQueueDto queueDto = db.getDbClient().ceQueueDao().selectByUuid(db.getSession(), task.getUuid()).get(); @@ -143,7 +143,7 @@ public class CeQueueImplTest { } @Test - public void fail_to_cancel_if_in_progress() throws Exception { + public void fail_to_cancel_if_in_progress() { submit(CeTaskTypes.REPORT, "PROJECT_1"); CeQueueDto ceQueueDto = db.getDbClient().ceQueueDao().peek(session, WORKER_UUID, MAX_EXECUTION_COUNT).get(); @@ -154,7 +154,7 @@ public class CeQueueImplTest { } @Test - public void cancelAll_pendings_but_not_in_progress() throws Exception { + public void cancelAll_pendings_but_not_in_progress() { CeTask inProgressTask = submit(CeTaskTypes.REPORT, "PROJECT_1"); CeTask pendingTask1 = submit(CeTaskTypes.REPORT, "PROJECT_2"); CeTask pendingTask2 = submit(CeTaskTypes.REPORT, "PROJECT_3"); @@ -173,7 +173,7 @@ public class CeQueueImplTest { } @Test - public void pause_and_resume_submits() throws Exception { + public void pause_and_resume_submits() { assertThat(underTest.isSubmitPaused()).isFalse(); underTest.pauseSubmit(); assertThat(underTest.isSubmitPaused()).isTrue(); diff --git a/server/sonar-server/src/test/java/org/sonar/elasticsearch/test/EsTestCluster.java b/server/sonar-server/src/test/java/org/sonar/elasticsearch/test/EsTestCluster.java index 9000ec8a9a2..a3005a2d327 100644 --- a/server/sonar-server/src/test/java/org/sonar/elasticsearch/test/EsTestCluster.java +++ b/server/sonar-server/src/test/java/org/sonar/elasticsearch/test/EsTestCluster.java @@ -433,7 +433,7 @@ public final class EsTestCluster { return clientWrapper.apply(transportClient); } - void resetClient() throws IOException { + void resetClient() { if (!closed.get()) { Releasables.close(nodeClient, transportClient); nodeClient = null; @@ -501,7 +501,7 @@ public final class EsTestCluster { } } - public synchronized void beforeTest(Random random, double transportClientRatio) throws IOException, InterruptedException { + public synchronized void beforeTest(Random random, double transportClientRatio) throws IOException { assert transportClientRatio >= 0.0 && transportClientRatio <= 1.0; logger.debug("Reset test cluster with transport client ratio: [{}]", transportClientRatio); this.transportClientRatio = transportClientRatio; @@ -781,7 +781,7 @@ public final class EsTestCluster { /** * This method checks all the things that need to be checked after each test */ - public void assertAfterTest() throws IOException { + public void assertAfterTest() { ensureEstimatedStats(); assertRequestsFinished(); for (NodeAndClient nodeAndClient : nodes.values()) { diff --git a/server/sonar-server/src/test/java/org/sonar/server/app/ProcessCommandWrapperImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/app/ProcessCommandWrapperImplTest.java index 568b4fa7df8..cf32a4f5675 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/app/ProcessCommandWrapperImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/app/ProcessCommandWrapperImplTest.java @@ -44,7 +44,7 @@ public class ProcessCommandWrapperImplTest { private MapSettings settings = new MapSettings(); @Test - public void requestSQRestart_throws_IAE_if_process_index_property_not_set() throws Exception { + public void requestSQRestart_throws_IAE_if_process_index_property_not_set() { ProcessCommandWrapperImpl processCommandWrapper = new ProcessCommandWrapperImpl(settings.asConfig()); expectedException.expect(IllegalArgumentException.class); @@ -54,7 +54,7 @@ public class ProcessCommandWrapperImplTest { } @Test - public void requestSQRestart_throws_IAE_if_process_shared_path_property_not_set() throws Exception { + public void requestSQRestart_throws_IAE_if_process_shared_path_property_not_set() { settings.setProperty(PROPERTY_PROCESS_INDEX, 1); ProcessCommandWrapperImpl processCommandWrapper = new ProcessCommandWrapperImpl(settings.asConfig()); @@ -79,7 +79,7 @@ public class ProcessCommandWrapperImplTest { } @Test - public void requestSQStop_throws_IAE_if_process_shared_path_property_not_set() throws Exception { + public void requestSQStop_throws_IAE_if_process_shared_path_property_not_set() { settings.setProperty(PROPERTY_PROCESS_INDEX, 1); ProcessCommandWrapperImpl processCommandWrapper = new ProcessCommandWrapperImpl(settings.asConfig()); @@ -104,7 +104,7 @@ public class ProcessCommandWrapperImplTest { } @Test - public void notifyOperational_throws_IAE_if_process_sharedDir_property_not_set() throws Exception { + public void notifyOperational_throws_IAE_if_process_sharedDir_property_not_set() { settings.setProperty(PROPERTY_PROCESS_INDEX, 1); ProcessCommandWrapperImpl processCommandWrapper = new ProcessCommandWrapperImpl(settings.asConfig()); @@ -115,7 +115,7 @@ public class ProcessCommandWrapperImplTest { } @Test - public void notifyOperational_throws_IAE_if_process_index_property_not_set() throws Exception { + public void notifyOperational_throws_IAE_if_process_index_property_not_set() { ProcessCommandWrapperImpl processCommandWrapper = new ProcessCommandWrapperImpl(settings.asConfig()); expectedException.expect(IllegalArgumentException.class); diff --git a/server/sonar-server/src/test/java/org/sonar/server/app/TomcatConnectorsTest.java b/server/sonar-server/src/test/java/org/sonar/server/app/TomcatConnectorsTest.java index 9171f926729..5ce12ccd3df 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/app/TomcatConnectorsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/app/TomcatConnectorsTest.java @@ -128,7 +128,7 @@ public class TomcatConnectorsTest { } @Test - public void test_max_post_size_for_http_connection() throws Exception { + public void test_max_post_size_for_http_connection() { Properties properties = new Properties(); Props props = new Props(properties); diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/AuthenticatorsImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/authentication/AuthenticatorsImplTest.java index 9a3bf2dc2c1..e1f9879aed8 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/authentication/AuthenticatorsImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/authentication/AuthenticatorsImplTest.java @@ -44,7 +44,7 @@ public class AuthenticatorsImplTest { private Authenticators underTest = new AuthenticatorsImpl(jwtHttpHandler, basicAuthenticator, ssoAuthenticator); @Test - public void authenticate_from_jwt_token() throws Exception { + public void authenticate_from_jwt_token() { when(ssoAuthenticator.authenticate(request, response)).thenReturn(Optional.empty()); when(jwtHttpHandler.validateToken(request, response)).thenReturn(Optional.of(user)); @@ -53,7 +53,7 @@ public class AuthenticatorsImplTest { } @Test - public void authenticate_from_basic_header() throws Exception { + public void authenticate_from_basic_header() { when(basicAuthenticator.authenticate(request)).thenReturn(Optional.of(user)); when(ssoAuthenticator.authenticate(request, response)).thenReturn(Optional.empty()); when(jwtHttpHandler.validateToken(request, response)).thenReturn(Optional.empty()); @@ -66,7 +66,7 @@ public class AuthenticatorsImplTest { } @Test - public void authenticate_from_sso() throws Exception { + public void authenticate_from_sso() { when(ssoAuthenticator.authenticate(request, response)).thenReturn(Optional.of(user)); when(jwtHttpHandler.validateToken(request, response)).thenReturn(Optional.empty()); @@ -78,7 +78,7 @@ public class AuthenticatorsImplTest { } @Test - public void return_empty_if_not_authenticated() throws Exception { + public void return_empty_if_not_authenticated() { when(jwtHttpHandler.validateToken(request, response)).thenReturn(Optional.empty()); when(ssoAuthenticator.authenticate(request, response)).thenReturn(Optional.empty()); when(basicAuthenticator.authenticate(request)).thenReturn(Optional.empty()); diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/BaseContextFactoryTest.java b/server/sonar-server/src/test/java/org/sonar/server/authentication/BaseContextFactoryTest.java index a3aa9ea5e0c..3ec7e10a7f6 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/authentication/BaseContextFactoryTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/authentication/BaseContextFactoryTest.java @@ -88,7 +88,7 @@ public class BaseContextFactoryTest { } @Test - public void create_context() throws Exception { + public void create_context() { BaseIdentityProvider.Context context = underTest.newContext(request, response, identityProvider); assertThat(context.getRequest()).isEqualTo(request); @@ -97,7 +97,7 @@ public class BaseContextFactoryTest { } @Test - public void authenticate() throws Exception { + public void authenticate() { BaseIdentityProvider.Context context = underTest.newContext(request, response, identityProvider); HttpSession session = mock(HttpSession.class); when(request.getSession()).thenReturn(session); diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/BasicAuthenticatorTest.java b/server/sonar-server/src/test/java/org/sonar/server/authentication/BasicAuthenticatorTest.java index 68d387029c2..8d89727aaa3 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/authentication/BasicAuthenticatorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/authentication/BasicAuthenticatorTest.java @@ -78,7 +78,7 @@ public class BasicAuthenticatorTest { private BasicAuthenticator underTest = new BasicAuthenticator(dbClient, credentialsAuthenticator, userTokenAuthenticator, authenticationEvent); @Test - public void authenticate_from_basic_http_header() throws Exception { + public void authenticate_from_basic_http_header() { when(request.getHeader("Authorization")).thenReturn("Basic " + CREDENTIALS_IN_BASE64); when(credentialsAuthenticator.authenticate(LOGIN, PASSWORD, request, BASIC)).thenReturn(USER); @@ -89,7 +89,7 @@ public class BasicAuthenticatorTest { } @Test - public void authenticate_from_basic_http_header_with_password_containing_semi_colon() throws Exception { + public void authenticate_from_basic_http_header_with_password_containing_semi_colon() { String password = "!ascii-only:-)@"; when(request.getHeader("Authorization")).thenReturn("Basic " + toBase64(LOGIN + ":" + password)); when(credentialsAuthenticator.authenticate(LOGIN, password, request, BASIC)).thenReturn(USER); @@ -101,14 +101,14 @@ public class BasicAuthenticatorTest { } @Test - public void does_not_authenticate_when_no_authorization_header() throws Exception { + public void does_not_authenticate_when_no_authorization_header() { underTest.authenticate(request); verifyZeroInteractions(credentialsAuthenticator, authenticationEvent); } @Test - public void does_not_authenticate_when_authorization_header_is_not_BASIC() throws Exception { + public void does_not_authenticate_when_authorization_header_is_not_BASIC() { when(request.getHeader("Authorization")).thenReturn("OTHER " + CREDENTIALS_IN_BASE64); underTest.authenticate(request); @@ -117,7 +117,7 @@ public class BasicAuthenticatorTest { } @Test - public void fail_to_authenticate_when_no_login() throws Exception { + public void fail_to_authenticate_when_no_login() { when(request.getHeader("Authorization")).thenReturn("Basic " + toBase64(":" + PASSWORD)); expectedException.expect(authenticationException().from(Source.local(BASIC)).withoutLogin().andNoPublicMessage()); @@ -129,7 +129,7 @@ public class BasicAuthenticatorTest { } @Test - public void fail_to_authenticate_when_invalid_header() throws Exception { + public void fail_to_authenticate_when_invalid_header() { when(request.getHeader("Authorization")).thenReturn("Basic Invàlid"); expectedException.expect(authenticationException().from(Source.local(BASIC)).withoutLogin().andNoPublicMessage()); @@ -138,7 +138,7 @@ public class BasicAuthenticatorTest { } @Test - public void authenticate_from_user_token() throws Exception { + public void authenticate_from_user_token() { insertUser(UserTesting.newUserDto().setLogin(LOGIN)); when(userTokenAuthenticator.authenticate("token")).thenReturn(Optional.of(LOGIN)); when(request.getHeader("Authorization")).thenReturn("Basic " + toBase64("token:")); @@ -151,7 +151,7 @@ public class BasicAuthenticatorTest { } @Test - public void does_not_authenticate_from_user_token_when_token_is_invalid() throws Exception { + public void does_not_authenticate_from_user_token_when_token_is_invalid() { insertUser(UserTesting.newUserDto().setLogin(LOGIN)); when(userTokenAuthenticator.authenticate("token")).thenReturn(Optional.empty()); when(request.getHeader("Authorization")).thenReturn("Basic " + toBase64("token:")); @@ -165,7 +165,7 @@ public class BasicAuthenticatorTest { } @Test - public void does_not_authenticate_from_user_token_when_token_does_not_match_active_user() throws Exception { + public void does_not_authenticate_from_user_token_when_token_does_not_match_active_user() { insertUser(UserTesting.newUserDto().setLogin(LOGIN)); when(userTokenAuthenticator.authenticate("token")).thenReturn(Optional.of("Unknown user")); when(request.getHeader("Authorization")).thenReturn("Basic " + toBase64("token:")); diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/CookiesTest.java b/server/sonar-server/src/test/java/org/sonar/server/authentication/CookiesTest.java index 6b3ba8a04c6..96337886ba9 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/authentication/CookiesTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/authentication/CookiesTest.java @@ -41,7 +41,7 @@ public class CookiesTest { private HttpServletRequest request = mock(HttpServletRequest.class); @Test - public void create_cookie() throws Exception { + public void create_cookie() { Cookie cookie = newCookieBuilder(request).setName("name").setValue("value").setHttpOnly(true).setExpiry(10).build(); assertThat(cookie.getName()).isEqualTo("name"); assertThat(cookie.getValue()).isEqualTo("value"); @@ -52,14 +52,14 @@ public class CookiesTest { } @Test - public void create_cookie_without_value() throws Exception { + public void create_cookie_without_value() { Cookie cookie = newCookieBuilder(request).setName("name").build(); assertThat(cookie.getName()).isEqualTo("name"); assertThat(cookie.getValue()).isNull(); } @Test - public void create_cookie_when_web_context() throws Exception { + public void create_cookie_when_web_context() { when(request.getContextPath()).thenReturn("/sonarqube"); Cookie cookie = newCookieBuilder(request).setName("name").setValue("value").setHttpOnly(true).setExpiry(10).build(); assertThat(cookie.getName()).isEqualTo("name"); @@ -71,28 +71,28 @@ public class CookiesTest { } @Test - public void create_not_secured_cookie_when_header_is_not_http() throws Exception { + public void create_not_secured_cookie_when_header_is_not_http() { when(request.getHeader(HTTPS_HEADER)).thenReturn("http"); Cookie cookie = newCookieBuilder(request).setName("name").setValue("value").setHttpOnly(true).setExpiry(10).build(); assertThat(cookie.getSecure()).isFalse(); } @Test - public void create_secured_cookie_when_X_Forwarded_Proto_header_is_https() throws Exception { + public void create_secured_cookie_when_X_Forwarded_Proto_header_is_https() { when(request.getHeader(HTTPS_HEADER)).thenReturn("https"); Cookie cookie = newCookieBuilder(request).setName("name").setValue("value").setHttpOnly(true).setExpiry(10).build(); assertThat(cookie.getSecure()).isTrue(); } @Test - public void create_secured_cookie_when_X_Forwarded_Proto_header_is_HTTPS() throws Exception { + public void create_secured_cookie_when_X_Forwarded_Proto_header_is_HTTPS() { when(request.getHeader(HTTPS_HEADER)).thenReturn("HTTPS"); Cookie cookie = newCookieBuilder(request).setName("name").setValue("value").setHttpOnly(true).setExpiry(10).build(); assertThat(cookie.getSecure()).isTrue(); } @Test - public void find_cookie() throws Exception { + public void find_cookie() { Cookie cookie = newCookieBuilder(request).setName("name").setValue("value").build(); when(request.getCookies()).thenReturn(new Cookie[] {cookie}); @@ -102,18 +102,18 @@ public class CookiesTest { } @Test - public void does_not_fail_to_find_cookie_when_no_cookie() throws Exception { + public void does_not_fail_to_find_cookie_when_no_cookie() { assertThat(findCookie("unknown", request)).isEmpty(); } @Test - public void fail_with_NPE_when_cookie_name_is_null() throws Exception { + public void fail_with_NPE_when_cookie_name_is_null() { expectedException.expect(NullPointerException.class); newCookieBuilder(request).setName(null); } @Test - public void fail_with_NPE_when_cookie_has_no_name() throws Exception { + public void fail_with_NPE_when_cookie_has_no_name() { expectedException.expect(NullPointerException.class); newCookieBuilder(request).setName(null); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/CredentialsAuthenticatorTest.java b/server/sonar-server/src/test/java/org/sonar/server/authentication/CredentialsAuthenticatorTest.java index 79302e270bf..9e295339f30 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/authentication/CredentialsAuthenticatorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/authentication/CredentialsAuthenticatorTest.java @@ -66,7 +66,7 @@ public class CredentialsAuthenticatorTest { private CredentialsAuthenticator underTest = new CredentialsAuthenticator(dbClient, externalAuthenticator, authenticationEvent); @Test - public void authenticate_local_user() throws Exception { + public void authenticate_local_user() { insertUser(newUserDto() .setLogin(LOGIN) .setCryptedPassword(CRYPTED_PASSWORD) @@ -79,7 +79,7 @@ public class CredentialsAuthenticatorTest { } @Test - public void fail_to_authenticate_local_user_when_password_is_wrong() throws Exception { + public void fail_to_authenticate_local_user_when_password_is_wrong() { insertUser(newUserDto() .setLogin(LOGIN) .setCryptedPassword("Wrong password") @@ -96,7 +96,7 @@ public class CredentialsAuthenticatorTest { } @Test - public void authenticate_external_user() throws Exception { + public void authenticate_external_user() { when(externalAuthenticator.authenticate(LOGIN, PASSWORD, request, BASIC)).thenReturn(Optional.of(newUserDto())); insertUser(newUserDto() .setLogin(LOGIN) @@ -109,7 +109,7 @@ public class CredentialsAuthenticatorTest { } @Test - public void fail_to_authenticate_authenticate_external_user_when_no_external_authentication() throws Exception { + public void fail_to_authenticate_authenticate_external_user_when_no_external_authentication() { when(externalAuthenticator.authenticate(LOGIN, PASSWORD, request, BASIC_TOKEN)).thenReturn(Optional.empty()); insertUser(newUserDto() .setLogin(LOGIN) @@ -125,7 +125,7 @@ public class CredentialsAuthenticatorTest { } @Test - public void fail_to_authenticate_local_user_that_have_no_password() throws Exception { + public void fail_to_authenticate_local_user_that_have_no_password() { insertUser(newUserDto() .setLogin(LOGIN) .setCryptedPassword(null) @@ -142,7 +142,7 @@ public class CredentialsAuthenticatorTest { } @Test - public void fail_to_authenticate_local_user_that_have_no_salt() throws Exception { + public void fail_to_authenticate_local_user_that_have_no_salt() { insertUser(newUserDto() .setLogin(LOGIN) .setCryptedPassword(CRYPTED_PASSWORD) diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/IdentityProviderRepositoryTest.java b/server/sonar-server/src/test/java/org/sonar/server/authentication/IdentityProviderRepositoryTest.java index f2dec8936d3..fba45a0bdf8 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/authentication/IdentityProviderRepositoryTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/authentication/IdentityProviderRepositoryTest.java @@ -49,7 +49,7 @@ public class IdentityProviderRepositoryTest { .setEnabled(false); @Test - public void return_enabled_provider() throws Exception { + public void return_enabled_provider() { IdentityProviderRepository underTest = new IdentityProviderRepository(asList(GITHUB, BITBUCKET, DISABLED)); assertThat(underTest.getEnabledByKey(GITHUB.getKey())).isEqualTo(GITHUB); @@ -57,7 +57,7 @@ public class IdentityProviderRepositoryTest { } @Test - public void fail_on_disabled_provider() throws Exception { + public void fail_on_disabled_provider() { IdentityProviderRepository underTest = new IdentityProviderRepository(asList(GITHUB, BITBUCKET, DISABLED)); thrown.expect(IllegalArgumentException.class); @@ -66,7 +66,7 @@ public class IdentityProviderRepositoryTest { } @Test - public void return_all_enabled_providers() throws Exception { + public void return_all_enabled_providers() { IdentityProviderRepository underTest = new IdentityProviderRepository(asList(GITHUB, BITBUCKET, DISABLED)); List providers = underTest.getAllEnabledAndSorted(); @@ -74,7 +74,7 @@ public class IdentityProviderRepositoryTest { } @Test - public void return_sorted_enabled_providers() throws Exception { + public void return_sorted_enabled_providers() { IdentityProviderRepository underTest = new IdentityProviderRepository(asList(GITHUB, BITBUCKET)); List providers = underTest.getAllEnabledAndSorted(); @@ -82,7 +82,7 @@ public class IdentityProviderRepositoryTest { } @Test - public void return_nothing_when_no_identity_provider() throws Exception { + public void return_nothing_when_no_identity_provider() { IdentityProviderRepository underTest = new IdentityProviderRepository(); assertThat(underTest.getAllEnabledAndSorted()).isEmpty(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/InitFilterTest.java b/server/sonar-server/src/test/java/org/sonar/server/authentication/InitFilterTest.java index b12d3ab8f61..8af7054d08b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/authentication/InitFilterTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/authentication/InitFilterTest.java @@ -86,7 +86,7 @@ public class InitFilterTest { } @Test - public void do_get_pattern() throws Exception { + public void do_get_pattern() { assertThat(underTest.doGetPattern()).isNotNull(); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/JwtCsrfVerifierTest.java b/server/sonar-server/src/test/java/org/sonar/server/authentication/JwtCsrfVerifierTest.java index 3811a09c300..f557844a631 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/authentication/JwtCsrfVerifierTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/authentication/JwtCsrfVerifierTest.java @@ -59,7 +59,7 @@ public class JwtCsrfVerifierTest { } @Test - public void generate_state() throws Exception { + public void generate_state() { String state = underTest.generateState(request, response, TIMEOUT); assertThat(state).isNotEmpty(); @@ -68,7 +68,7 @@ public class JwtCsrfVerifierTest { } @Test - public void verify_state() throws Exception { + public void verify_state() { mockRequestCsrf(CSRF_STATE); mockPostJavaWsRequest(); @@ -76,7 +76,7 @@ public class JwtCsrfVerifierTest { } @Test - public void fail_with_AuthenticationException_when_state_header_is_not_the_same_as_state_parameter() throws Exception { + public void fail_with_AuthenticationException_when_state_header_is_not_the_same_as_state_parameter() { mockRequestCsrf("other value"); mockPostJavaWsRequest(); @@ -86,7 +86,7 @@ public class JwtCsrfVerifierTest { } @Test - public void fail_with_AuthenticationException_when_state_is_null() throws Exception { + public void fail_with_AuthenticationException_when_state_is_null() { mockRequestCsrf(CSRF_STATE); mockPostJavaWsRequest(); @@ -96,7 +96,7 @@ public class JwtCsrfVerifierTest { } @Test - public void fail_with_AuthenticationException_when_state_parameter_is_empty() throws Exception { + public void fail_with_AuthenticationException_when_state_parameter_is_empty() { mockRequestCsrf(CSRF_STATE); mockPostJavaWsRequest(); @@ -106,7 +106,7 @@ public class JwtCsrfVerifierTest { } @Test - public void verify_POST_request() throws Exception { + public void verify_POST_request() { mockRequestCsrf("other value"); when(request.getRequestURI()).thenReturn(JAVA_WS_URL); when(request.getMethod()).thenReturn("POST"); @@ -117,7 +117,7 @@ public class JwtCsrfVerifierTest { } @Test - public void verify_PUT_request() throws Exception { + public void verify_PUT_request() { mockRequestCsrf("other value"); when(request.getRequestURI()).thenReturn(JAVA_WS_URL); when(request.getMethod()).thenReturn("PUT"); @@ -128,7 +128,7 @@ public class JwtCsrfVerifierTest { } @Test - public void verify_DELETE_request() throws Exception { + public void verify_DELETE_request() { mockRequestCsrf("other value"); when(request.getRequestURI()).thenReturn(JAVA_WS_URL); when(request.getMethod()).thenReturn("DELETE"); @@ -139,7 +139,7 @@ public class JwtCsrfVerifierTest { } @Test - public void ignore_GET_request() throws Exception { + public void ignore_GET_request() { when(request.getRequestURI()).thenReturn(JAVA_WS_URL); when(request.getMethod()).thenReturn("GET"); @@ -147,13 +147,13 @@ public class JwtCsrfVerifierTest { } @Test - public void ignore_not_api_requests() throws Exception { + public void ignore_not_api_requests() { executeVerifyStateDoesNotFailOnRequest("/events", "POST"); executeVerifyStateDoesNotFailOnRequest("/favorites", "POST"); } @Test - public void refresh_state() throws Exception { + public void refresh_state() { underTest.refreshState(request, response, CSRF_STATE, 30); verify(response).addCookie(cookieArgumentCaptor.capture()); @@ -161,7 +161,7 @@ public class JwtCsrfVerifierTest { } @Test - public void remove_state() throws Exception { + public void remove_state() { underTest.removeState(request, response); verify(response).addCookie(cookieArgumentCaptor.capture()); diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/JwtHttpHandlerTest.java b/server/sonar-server/src/test/java/org/sonar/server/authentication/JwtHttpHandlerTest.java index 81d7bb33a29..7fe3af49199 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/authentication/JwtHttpHandlerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/authentication/JwtHttpHandlerTest.java @@ -97,7 +97,7 @@ public class JwtHttpHandlerTest { } @Test - public void create_token() throws Exception { + public void create_token() { underTest.generateToken(userDto, request, response); Optional jwtCookie = findCookie("JWT-SESSION"); @@ -109,7 +109,7 @@ public class JwtHttpHandlerTest { } @Test - public void generate_csrf_state_when_creating_token() throws Exception { + public void generate_csrf_state_when_creating_token() { underTest.generateToken(userDto, request, response); verify(jwtCsrfVerifier).generateState(request, response, 3 * 24 * 60 * 60); @@ -120,7 +120,7 @@ public class JwtHttpHandlerTest { } @Test - public void generate_token_is_using_session_timeout_from_settings() throws Exception { + public void generate_token_is_using_session_timeout_from_settings() { int sessionTimeoutInMinutes = 10; settings.setProperty("sonar.web.sessionTimeoutInMinutes", sessionTimeoutInMinutes); @@ -132,7 +132,7 @@ public class JwtHttpHandlerTest { } @Test - public void session_timeout_property_cannot_be_updated() throws Exception { + public void session_timeout_property_cannot_be_updated() { int firstSessionTimeoutInMinutes = 10; settings.setProperty("sonar.web.sessionTimeoutInMinutes", firstSessionTimeoutInMinutes); @@ -148,7 +148,7 @@ public class JwtHttpHandlerTest { } @Test - public void session_timeout_property_cannot_be_zero() throws Exception { + public void session_timeout_property_cannot_be_zero() { settings.setProperty("sonar.web.sessionTimeoutInMinutes", 0); expectedException.expect(IllegalArgumentException.class); @@ -158,7 +158,7 @@ public class JwtHttpHandlerTest { } @Test - public void session_timeout_property_cannot_be_negative() throws Exception { + public void session_timeout_property_cannot_be_negative() { settings.setProperty("sonar.web.sessionTimeoutInMinutes", -10); expectedException.expect(IllegalArgumentException.class); @@ -168,7 +168,7 @@ public class JwtHttpHandlerTest { } @Test - public void session_timeout_property_cannot_be_greater_than_three_months() throws Exception { + public void session_timeout_property_cannot_be_greater_than_three_months() { settings.setProperty("sonar.web.sessionTimeoutInMinutes", 4 * 30 * 24 * 60); expectedException.expect(IllegalArgumentException.class); @@ -178,7 +178,7 @@ public class JwtHttpHandlerTest { } @Test - public void validate_token() throws Exception { + public void validate_token() { addJwtCookie(); Claims claims = createToken(USER_LOGIN, NOW); @@ -190,7 +190,7 @@ public class JwtHttpHandlerTest { } @Test - public void validate_token_refresh_session_when_refresh_time_is_reached() throws Exception { + public void validate_token_refresh_session_when_refresh_time_is_reached() { addJwtCookie(); // Token was created 10 days ago and refreshed 6 minutes ago @@ -204,7 +204,7 @@ public class JwtHttpHandlerTest { } @Test - public void validate_token_does_not_refresh_session_when_refresh_time_is_not_reached() throws Exception { + public void validate_token_does_not_refresh_session_when_refresh_time_is_not_reached() { addJwtCookie(); // Token was created 10 days ago and refreshed 4 minutes ago @@ -218,7 +218,7 @@ public class JwtHttpHandlerTest { } @Test - public void validate_token_does_not_refresh_session_when_disconnected_timeout_is_reached() throws Exception { + public void validate_token_does_not_refresh_session_when_disconnected_timeout_is_reached() { addJwtCookie(); // Token was created 4 months ago, refreshed 4 minutes ago, and it expired in 5 minutes @@ -231,7 +231,7 @@ public class JwtHttpHandlerTest { } @Test - public void validate_token_does_not_refresh_session_when_user_is_disabled() throws Exception { + public void validate_token_does_not_refresh_session_when_user_is_disabled() { addJwtCookie(); UserDto user = addUser(false); @@ -242,7 +242,7 @@ public class JwtHttpHandlerTest { } @Test - public void validate_token_does_not_refresh_session_when_token_is_no_more_valid() throws Exception { + public void validate_token_does_not_refresh_session_when_token_is_no_more_valid() { addJwtCookie(); when(jwtSerializer.decode(JWT_TOKEN)).thenReturn(Optional.empty()); @@ -251,7 +251,7 @@ public class JwtHttpHandlerTest { } @Test - public void validate_token_does_nothing_when_no_jwt_cookie() throws Exception { + public void validate_token_does_nothing_when_no_jwt_cookie() { underTest.validateToken(request, response); verifyZeroInteractions(httpSession, jwtSerializer); @@ -259,7 +259,7 @@ public class JwtHttpHandlerTest { } @Test - public void validate_token_does_nothing_when_empty_value_in_jwt_cookie() throws Exception { + public void validate_token_does_nothing_when_empty_value_in_jwt_cookie() { when(request.getCookies()).thenReturn(new Cookie[] {new Cookie("JWT-SESSION", "")}); underTest.validateToken(request, response); @@ -269,7 +269,7 @@ public class JwtHttpHandlerTest { } @Test - public void validate_token_verify_csrf_state() throws Exception { + public void validate_token_verify_csrf_state() { addJwtCookie(); Claims claims = createToken(USER_LOGIN, NOW); claims.put("xsrfToken", CSRF_STATE); @@ -281,7 +281,7 @@ public class JwtHttpHandlerTest { } @Test - public void validate_token_refresh_state_when_refreshing_token() throws Exception { + public void validate_token_refresh_state_when_refreshing_token() { addJwtCookie(); // Token was created 10 days ago and refreshed 6 minutes ago @@ -296,7 +296,7 @@ public class JwtHttpHandlerTest { } @Test - public void remove_token() throws Exception { + public void remove_token() { underTest.removeToken(request, response); verifyCookie(findCookie("JWT-SESSION").get(), null, 0); diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/JwtSerializerTest.java b/server/sonar-server/src/test/java/org/sonar/server/authentication/JwtSerializerTest.java index 98a0ce78f59..4521daeab0e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/authentication/JwtSerializerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/authentication/JwtSerializerTest.java @@ -57,7 +57,7 @@ public class JwtSerializerTest { private JwtSerializer underTest = new JwtSerializer(settings.asConfig(), system2, uuidFactory); @Test - public void generate_token() throws Exception { + public void generate_token() { setSecretKey(A_SECRET_KEY); underTest.start(); @@ -67,7 +67,7 @@ public class JwtSerializerTest { } @Test - public void generate_token_with_expiration_date() throws Exception { + public void generate_token_with_expiration_date() { setSecretKey(A_SECRET_KEY); underTest.start(); @@ -82,7 +82,7 @@ public class JwtSerializerTest { } @Test - public void generate_token_with_big_expiration_date() throws Exception { + public void generate_token_with_big_expiration_date() { setSecretKey(A_SECRET_KEY); underTest.start(); Date now = new Date(); @@ -97,7 +97,7 @@ public class JwtSerializerTest { } @Test - public void generate_token_with_property() throws Exception { + public void generate_token_with_property() { setSecretKey(A_SECRET_KEY); underTest.start(); @@ -109,7 +109,7 @@ public class JwtSerializerTest { } @Test - public void decode_token() throws Exception { + public void decode_token() { setSecretKey(A_SECRET_KEY); underTest.start(); Date now = new Date(); @@ -126,7 +126,7 @@ public class JwtSerializerTest { } @Test - public void return_no_token_when_expiration_date_is_reached() throws Exception { + public void return_no_token_when_expiration_date_is_reached() { setSecretKey(A_SECRET_KEY); underTest.start(); @@ -141,7 +141,7 @@ public class JwtSerializerTest { } @Test - public void return_no_token_when_secret_key_has_changed() throws Exception { + public void return_no_token_when_secret_key_has_changed() { setSecretKey(A_SECRET_KEY); underTest.start(); @@ -157,7 +157,7 @@ public class JwtSerializerTest { } @Test - public void fail_to_decode_token_when_no_id() throws Exception { + public void fail_to_decode_token_when_no_id() { setSecretKey(A_SECRET_KEY); underTest.start(); @@ -175,7 +175,7 @@ public class JwtSerializerTest { } @Test - public void fail_to_decode_token_when_no_subject() throws Exception { + public void fail_to_decode_token_when_no_subject() { setSecretKey(A_SECRET_KEY); underTest.start(); @@ -193,7 +193,7 @@ public class JwtSerializerTest { } @Test - public void fail_to_decode_token_when_no_expiration_date() throws Exception { + public void fail_to_decode_token_when_no_expiration_date() { setSecretKey(A_SECRET_KEY); underTest.start(); @@ -211,7 +211,7 @@ public class JwtSerializerTest { } @Test - public void fail_to_decode_token_when_no_creation_date() throws Exception { + public void fail_to_decode_token_when_no_creation_date() { setSecretKey(A_SECRET_KEY); underTest.start(); @@ -228,7 +228,7 @@ public class JwtSerializerTest { } @Test - public void generate_new_secret_key_if_not_set_by_settings() throws Exception { + public void generate_new_secret_key_if_not_set_by_settings() { assertThat(underTest.getSecretKey()).isNull(); underTest.start(); @@ -238,7 +238,7 @@ public class JwtSerializerTest { } @Test - public void load_secret_key_from_settings() throws Exception { + public void load_secret_key_from_settings() { setSecretKey(A_SECRET_KEY); underTest.start(); @@ -247,7 +247,7 @@ public class JwtSerializerTest { } @Test - public void refresh_token() throws Exception { + public void refresh_token() { setSecretKey(A_SECRET_KEY); underTest.start(); @@ -278,7 +278,7 @@ public class JwtSerializerTest { } @Test - public void refresh_token_generate_a_new_hash() throws Exception { + public void refresh_token_generate_a_new_hash() { setSecretKey(A_SECRET_KEY); underTest.start(); String token = underTest.encode(new JwtSession(USER_LOGIN, 30)); @@ -290,7 +290,7 @@ public class JwtSerializerTest { } @Test - public void encode_fail_when_not_started() throws Exception { + public void encode_fail_when_not_started() { expectedException.expect(NullPointerException.class); expectedException.expectMessage("org.sonar.server.authentication.JwtSerializer not started"); @@ -298,7 +298,7 @@ public class JwtSerializerTest { } @Test - public void decode_fail_when_not_started() throws Exception { + public void decode_fail_when_not_started() { expectedException.expect(NullPointerException.class); expectedException.expectMessage("org.sonar.server.authentication.JwtSerializer not started"); @@ -306,7 +306,7 @@ public class JwtSerializerTest { } @Test - public void refresh_fail_when_not_started() throws Exception { + public void refresh_fail_when_not_started() { expectedException.expect(NullPointerException.class); expectedException.expectMessage("org.sonar.server.authentication.JwtSerializer not started"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/LogOAuthWarningTest.java b/server/sonar-server/src/test/java/org/sonar/server/authentication/LogOAuthWarningTest.java index 06e6fe84f49..473d19ffa08 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/authentication/LogOAuthWarningTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/authentication/LogOAuthWarningTest.java @@ -43,7 +43,7 @@ public class LogOAuthWarningTest { private Server server = mock(Server.class); @Test - public void log_warning_at_startup_if_non_secured_base_url_and_oauth_is_installed() throws Exception { + public void log_warning_at_startup_if_non_secured_base_url_and_oauth_is_installed() { when(server.getPublicRootUrl()).thenReturn("http://mydomain.com"); LogOAuthWarning underTest = new LogOAuthWarning(server, new OAuth2IdentityProvider[1]); @@ -56,7 +56,7 @@ public class LogOAuthWarningTest { } @Test - public void do_not_log_warning_at_startup_if_secured_base_url_and_oauth_is_installed() throws Exception { + public void do_not_log_warning_at_startup_if_secured_base_url_and_oauth_is_installed() { when(server.getPublicRootUrl()).thenReturn("https://mydomain.com"); LogOAuthWarning underTest = new LogOAuthWarning(server, new OAuth2IdentityProvider[1]); @@ -69,7 +69,7 @@ public class LogOAuthWarningTest { } @Test - public void do_not_log_warning_at_startup_if_non_secured_base_url_but_oauth_is_not_installed() throws Exception { + public void do_not_log_warning_at_startup_if_non_secured_base_url_but_oauth_is_not_installed() { when(server.getPublicRootUrl()).thenReturn("http://mydomain.com"); LogOAuthWarning underTest = new LogOAuthWarning(server); diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/OAuth2CallbackFilterTest.java b/server/sonar-server/src/test/java/org/sonar/server/authentication/OAuth2CallbackFilterTest.java index 59fa47708df..9c7152bef72 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/authentication/OAuth2CallbackFilterTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/authentication/OAuth2CallbackFilterTest.java @@ -78,7 +78,7 @@ public class OAuth2CallbackFilterTest { } @Test - public void do_get_pattern() throws Exception { + public void do_get_pattern() { assertThat(underTest.doGetPattern()).isNotNull(); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/OAuth2ContextFactoryTest.java b/server/sonar-server/src/test/java/org/sonar/server/authentication/OAuth2ContextFactoryTest.java index 0cfb4b3cf21..263ef365e9d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/authentication/OAuth2ContextFactoryTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/authentication/OAuth2ContextFactoryTest.java @@ -95,7 +95,7 @@ public class OAuth2ContextFactoryTest { } @Test - public void create_context() throws Exception { + public void create_context() { when(server.getPublicRootUrl()).thenReturn(SECURED_PUBLIC_ROOT_URL); OAuth2IdentityProvider.InitContext context = newInitContext(); @@ -106,7 +106,7 @@ public class OAuth2ContextFactoryTest { } @Test - public void generate_csrf_state() throws Exception { + public void generate_csrf_state() { OAuth2IdentityProvider.InitContext context = newInitContext(); context.generateCsrfState(); @@ -124,7 +124,7 @@ public class OAuth2ContextFactoryTest { } @Test - public void create_callback() throws Exception { + public void create_callback() { when(server.getPublicRootUrl()).thenReturn(SECURED_PUBLIC_ROOT_URL); OAuth2IdentityProvider.CallbackContext callback = newCallbackContext(); @@ -135,7 +135,7 @@ public class OAuth2ContextFactoryTest { } @Test - public void authenticate() throws Exception { + public void authenticate() { OAuth2IdentityProvider.CallbackContext callback = newCallbackContext(); callback.authenticate(USER_IDENTITY); @@ -190,7 +190,7 @@ public class OAuth2ContextFactoryTest { } @Test - public void verify_csrf_state() throws Exception { + public void verify_csrf_state() { OAuth2IdentityProvider.CallbackContext callback = newCallbackContext(); callback.verifyCsrfState(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/OAuth2RedirectionTest.java b/server/sonar-server/src/test/java/org/sonar/server/authentication/OAuth2RedirectionTest.java index ca84ddae695..a6536910cf5 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/authentication/OAuth2RedirectionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/authentication/OAuth2RedirectionTest.java @@ -51,7 +51,7 @@ public class OAuth2RedirectionTest { } @Test - public void create_cookie() throws Exception { + public void create_cookie() { when(request.getParameter("return_to")).thenReturn("/settings"); underTest.create(request, response); @@ -85,7 +85,7 @@ public class OAuth2RedirectionTest { } @Test - public void get_and_delete() throws Exception { + public void get_and_delete() { when(request.getCookies()).thenReturn(new Cookie[]{new Cookie("REDIRECT_TO", "/settings")}); Optional redirection = underTest.getAndDelete(request, response); @@ -100,7 +100,7 @@ public class OAuth2RedirectionTest { } @Test - public void get_and_delete_returns_nothing_when_no_cookie() throws Exception { + public void get_and_delete_returns_nothing_when_no_cookie() { when(request.getCookies()).thenReturn(new Cookie[]{}); Optional redirection = underTest.getAndDelete(request, response); @@ -109,7 +109,7 @@ public class OAuth2RedirectionTest { } @Test - public void get_and_delete_returns_nothing_redirect_value_is_null() throws Exception { + public void get_and_delete_returns_nothing_redirect_value_is_null() { when(request.getCookies()).thenReturn(new Cookie[]{new Cookie("REDIRECT_TO", null)}); Optional redirection = underTest.getAndDelete(request, response); @@ -118,7 +118,7 @@ public class OAuth2RedirectionTest { } @Test - public void delete() throws Exception { + public void delete() { when(request.getCookies()).thenReturn(new Cookie[]{new Cookie("REDIRECT_TO", "/settings")}); underTest.delete(request, response); diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/OAuthCsrfVerifierTest.java b/server/sonar-server/src/test/java/org/sonar/server/authentication/OAuthCsrfVerifierTest.java index 0b659d381ce..0ae64700060 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/authentication/OAuthCsrfVerifierTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/authentication/OAuthCsrfVerifierTest.java @@ -61,7 +61,7 @@ public class OAuthCsrfVerifierTest { } @Test - public void generate_state() throws Exception { + public void generate_state() { String state = underTest.generateState(request, response); assertThat(state).isNotEmpty(); @@ -71,7 +71,7 @@ public class OAuthCsrfVerifierTest { } @Test - public void verify_state() throws Exception { + public void verify_state() { String state = "state"; when(request.getCookies()).thenReturn(new Cookie[] {new Cookie("OAUTHSTATE", sha256Hex(state))}); when(request.getParameter("state")).thenReturn(state); @@ -87,7 +87,7 @@ public class OAuthCsrfVerifierTest { } @Test - public void fail_with_AuthenticationException_when_state_cookie_is_not_the_same_as_state_parameter() throws Exception { + public void fail_with_AuthenticationException_when_state_cookie_is_not_the_same_as_state_parameter() { when(request.getCookies()).thenReturn(new Cookie[] {new Cookie("OAUTHSTATE", sha1Hex("state"))}); when(request.getParameter("state")).thenReturn("other value"); @@ -97,7 +97,7 @@ public class OAuthCsrfVerifierTest { } @Test - public void fail_with_AuthenticationException_when_state_cookie_is_null() throws Exception { + public void fail_with_AuthenticationException_when_state_cookie_is_null() { when(request.getCookies()).thenReturn(new Cookie[] {new Cookie("OAUTHSTATE", null)}); when(request.getParameter("state")).thenReturn("state"); @@ -107,7 +107,7 @@ public class OAuthCsrfVerifierTest { } @Test - public void fail_with_AuthenticationException_when_state_parameter_is_empty() throws Exception { + public void fail_with_AuthenticationException_when_state_parameter_is_empty() { when(request.getCookies()).thenReturn(new Cookie[] {new Cookie("OAUTHSTATE", sha1Hex("state"))}); when(request.getParameter("state")).thenReturn(""); @@ -117,7 +117,7 @@ public class OAuthCsrfVerifierTest { } @Test - public void fail_with_AuthenticationException_when_cookie_is_missing() throws Exception { + public void fail_with_AuthenticationException_when_cookie_is_missing() { when(request.getCookies()).thenReturn(new Cookie[] {}); thrown.expect(authenticationException().from(AuthenticationEvent.Source.oauth2(identityProvider)).withoutLogin().andNoPublicMessage()); diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/RealmAuthenticatorTest.java b/server/sonar-server/src/test/java/org/sonar/server/authentication/RealmAuthenticatorTest.java index 6516a1876a2..2ffea6ad157 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/authentication/RealmAuthenticatorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/authentication/RealmAuthenticatorTest.java @@ -89,7 +89,7 @@ public class RealmAuthenticatorTest { } @Test - public void authenticate() throws Exception { + public void authenticate() { executeStartWithoutGroupSync(); when(authenticator.doAuthenticate(any(Authenticator.Context.class))).thenReturn(true); UserDetails userDetails = new UserDetails(); @@ -111,7 +111,7 @@ public class RealmAuthenticatorTest { } @Test - public void authenticate_with_sonarqube_identity_provider() throws Exception { + public void authenticate_with_sonarqube_identity_provider() { executeStartWithoutGroupSync(); when(authenticator.doAuthenticate(any(Authenticator.Context.class))).thenReturn(true); UserDetails userDetails = new UserDetails(); @@ -132,7 +132,7 @@ public class RealmAuthenticatorTest { } @Test - public void login_is_used_when_no_name_provided() throws Exception { + public void login_is_used_when_no_name_provided() { executeStartWithoutGroupSync(); when(authenticator.doAuthenticate(any(Authenticator.Context.class))).thenReturn(true); UserDetails userDetails = new UserDetails(); @@ -148,7 +148,7 @@ public class RealmAuthenticatorTest { } @Test - public void authenticate_with_group_sync() throws Exception { + public void authenticate_with_group_sync() { when(externalGroupsProvider.doGetGroups(any(ExternalGroupsProvider.Context.class))).thenReturn(asList("group1", "group2")); when(userIdentityAuthenticator.authenticate(any(UserIdentity.class), any(IdentityProvider.class), any(Source.class))).thenReturn(USER); executeStartWithGroupSync(); @@ -163,7 +163,7 @@ public class RealmAuthenticatorTest { } @Test - public void use_login_if_user_details_contains_no_name() throws Exception { + public void use_login_if_user_details_contains_no_name() { executeStartWithoutGroupSync(); when(authenticator.doAuthenticate(any(Authenticator.Context.class))).thenReturn(true); UserDetails userDetails = new UserDetails(); @@ -179,7 +179,7 @@ public class RealmAuthenticatorTest { } @Test - public void use_downcase_login() throws Exception { + public void use_downcase_login() { settings.setProperty("sonar.authenticator.downcase", true); when(userIdentityAuthenticator.authenticate(any(UserIdentity.class), any(IdentityProvider.class), any(Source.class))).thenReturn(USER); executeStartWithoutGroupSync(); @@ -193,7 +193,7 @@ public class RealmAuthenticatorTest { } @Test - public void does_not_user_downcase_login() throws Exception { + public void does_not_user_downcase_login() { settings.setProperty("sonar.authenticator.downcase", false); when(userIdentityAuthenticator.authenticate(any(UserIdentity.class), any(IdentityProvider.class), any(Source.class))).thenReturn(USER); executeStartWithoutGroupSync(); @@ -207,7 +207,7 @@ public class RealmAuthenticatorTest { } @Test - public void fail_to_authenticate_when_user_details_are_null() throws Exception { + public void fail_to_authenticate_when_user_details_are_null() { executeStartWithoutGroupSync(); when(authenticator.doAuthenticate(any(Authenticator.Context.class))).thenReturn(true); @@ -223,7 +223,7 @@ public class RealmAuthenticatorTest { } @Test - public void fail_to_authenticate_when_external_authentication_fails() throws Exception { + public void fail_to_authenticate_when_external_authentication_fails() { executeStartWithoutGroupSync(); when(externalUsersProvider.doGetUserDetails(any(ExternalUsersProvider.Context.class))).thenReturn(new UserDetails()); @@ -239,7 +239,7 @@ public class RealmAuthenticatorTest { } @Test - public void fail_to_authenticate_when_any_exception_is_thrown() throws Exception { + public void fail_to_authenticate_when_any_exception_is_thrown() { executeStartWithoutGroupSync(); String expectedMessage = "emulating exception in doAuthenticate"; doThrow(new IllegalArgumentException(expectedMessage)).when(authenticator).doAuthenticate(any(Authenticator.Context.class)); @@ -256,13 +256,13 @@ public class RealmAuthenticatorTest { } @Test - public void return_empty_user_when_no_realm() throws Exception { + public void return_empty_user_when_no_realm() { assertThat(underTest.authenticate(LOGIN, PASSWORD, request, BASIC)).isEmpty(); verifyNoMoreInteractions(authenticationEvent); } @Test - public void fail_to_start_when_no_authenticator() throws Exception { + public void fail_to_start_when_no_authenticator() { when(realm.doGetAuthenticator()).thenReturn(null); when(securityRealmFactory.getRealm()).thenReturn(realm); @@ -272,7 +272,7 @@ public class RealmAuthenticatorTest { } @Test - public void fail_to_start_when_no_user_provider() throws Exception { + public void fail_to_start_when_no_user_provider() { when(realm.doGetAuthenticator()).thenReturn(authenticator); when(realm.getUsersProvider()).thenReturn(null); when(securityRealmFactory.getRealm()).thenReturn(realm); diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/SsoAuthenticatorTest.java b/server/sonar-server/src/test/java/org/sonar/server/authentication/SsoAuthenticatorTest.java index 10454646fef..57f6d7eb5c6 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/authentication/SsoAuthenticatorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/authentication/SsoAuthenticatorTest.java @@ -124,7 +124,7 @@ public class SsoAuthenticatorTest { } @Test - public void create_user_when_authenticating_new_user() throws Exception { + public void create_user_when_authenticating_new_user() { startWithSso(); setNotUserInToken(); HttpServletRequest request = createRequest(DEFAULT_LOGIN, DEFAULT_NAME, DEFAULT_EMAIL, GROUPS); @@ -137,7 +137,7 @@ public class SsoAuthenticatorTest { } @Test - public void use_login_when_name_is_not_provided() throws Exception { + public void use_login_when_name_is_not_provided() { startWithSso(); setNotUserInToken(); @@ -149,7 +149,7 @@ public class SsoAuthenticatorTest { } @Test - public void update_user_when_authenticating_exiting_user() throws Exception { + public void update_user_when_authenticating_exiting_user() { startWithSso(); setNotUserInToken(); insertUser(newUserDto().setLogin(DEFAULT_LOGIN).setName("old name").setEmail("old email"), group1); @@ -164,7 +164,7 @@ public class SsoAuthenticatorTest { } @Test - public void remove_groups_when_group_headers_is_empty() throws Exception { + public void remove_groups_when_group_headers_is_empty() { startWithSso(); setNotUserInToken(); insertUser(DEFAULT_USER, group1); @@ -177,7 +177,7 @@ public class SsoAuthenticatorTest { } @Test - public void remove_groups_when_group_headers_is_null() throws Exception { + public void remove_groups_when_group_headers_is_null() { startWithSso(); setNotUserInToken(); insertUser(DEFAULT_USER, group1); @@ -193,7 +193,7 @@ public class SsoAuthenticatorTest { } @Test - public void does_not_update_groups_when_no_group_headers() throws Exception { + public void does_not_update_groups_when_no_group_headers() { startWithSso(); setNotUserInToken(); insertUser(DEFAULT_USER, group1, sonarUsers); @@ -206,7 +206,7 @@ public class SsoAuthenticatorTest { } @Test - public void does_not_update_user_when_user_is_in_token_and_refresh_time_is_close() throws Exception { + public void does_not_update_user_when_user_is_in_token_and_refresh_time_is_close() { startWithSso(); UserDto user = insertUser(DEFAULT_USER, group1); setUserInToken(user, CLOSE_REFRESH_TIME); @@ -221,7 +221,7 @@ public class SsoAuthenticatorTest { } @Test - public void update_user_when_user_in_token_but_refresh_time_is_old() throws Exception { + public void update_user_when_user_in_token_but_refresh_time_is_old() { startWithSso(); UserDto user = insertUser(DEFAULT_USER, group1); // Refresh time was updated 6 minutes ago => more than 5 minutes @@ -237,7 +237,7 @@ public class SsoAuthenticatorTest { } @Test - public void update_user_when_user_in_token_but_no_refresh_time() throws Exception { + public void update_user_when_user_in_token_but_no_refresh_time() { startWithSso(); UserDto user = insertUser(DEFAULT_USER, group1); setUserInToken(user, null); @@ -252,7 +252,7 @@ public class SsoAuthenticatorTest { } @Test - public void use_refresh_time_from_settings() throws Exception { + public void use_refresh_time_from_settings() { settings.setProperty("sonar.web.sso.refreshIntervalInMinutes", "10"); startWithSso(); UserDto user = insertUser(DEFAULT_USER, group1); @@ -269,7 +269,7 @@ public class SsoAuthenticatorTest { } @Test - public void update_user_when_login_from_token_is_different_than_login_from_request() throws Exception { + public void update_user_when_login_from_token_is_different_than_login_from_request() { startWithSso(); insertUser(DEFAULT_USER, group1); setUserInToken(DEFAULT_USER, CLOSE_REFRESH_TIME); @@ -283,7 +283,7 @@ public class SsoAuthenticatorTest { } @Test - public void use_headers_from_settings() throws Exception { + public void use_headers_from_settings() { settings.setProperty("sonar.web.sso.loginHeader", "head-login"); settings.setProperty("sonar.web.sso.nameHeader", "head-name"); settings.setProperty("sonar.web.sso.emailHeader", "head-email"); @@ -299,7 +299,7 @@ public class SsoAuthenticatorTest { } @Test - public void detect_group_header_even_with_wrong_case() throws Exception { + public void detect_group_header_even_with_wrong_case() { settings.setProperty("sonar.web.sso.loginHeader", "login"); settings.setProperty("sonar.web.sso.nameHeader", "name"); settings.setProperty("sonar.web.sso.emailHeader", "email"); @@ -315,7 +315,7 @@ public class SsoAuthenticatorTest { } @Test - public void trim_groups() throws Exception { + public void trim_groups() { startWithSso(); setNotUserInToken(); HttpServletRequest request = createRequest(DEFAULT_LOGIN, null, null, " dev , admin "); @@ -327,7 +327,7 @@ public class SsoAuthenticatorTest { } @Test - public void does_not_authenticate_when_no_header() throws Exception { + public void does_not_authenticate_when_no_header() { startWithSso(); setNotUserInToken(); @@ -339,7 +339,7 @@ public class SsoAuthenticatorTest { } @Test - public void does_not_authenticate_when_not_enabled() throws Exception { + public void does_not_authenticate_when_not_enabled() { startWithoutSso(); underTest.authenticate(createRequest(DEFAULT_LOGIN, DEFAULT_NAME, DEFAULT_EMAIL, GROUPS), response); @@ -349,7 +349,7 @@ public class SsoAuthenticatorTest { } @Test - public void throw_AuthenticationException_when_BadRequestException_is_generated() throws Exception { + public void throw_AuthenticationException_when_BadRequestException_is_generated() { startWithSso(); setNotUserInToken(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/UserSessionInitializerTest.java b/server/sonar-server/src/test/java/org/sonar/server/authentication/UserSessionInitializerTest.java index 70c70a2516f..816574e8121 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/authentication/UserSessionInitializerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/authentication/UserSessionInitializerTest.java @@ -81,7 +81,7 @@ public class UserSessionInitializerTest { } @Test - public void check_urls() throws Exception { + public void check_urls() { assertPathIsNotIgnored("/"); assertPathIsNotIgnored("/foo"); assertPathIsNotIgnored("/api/server_id/show"); @@ -113,7 +113,7 @@ public class UserSessionInitializerTest { } @Test - public void return_code_401_when_not_authenticated_and_with_force_authentication() throws Exception { + public void return_code_401_when_not_authenticated_and_with_force_authentication() { ArgumentCaptor exceptionArgumentCaptor = ArgumentCaptor.forClass(AuthenticationException.class); when(userSession.isLoggedIn()).thenReturn(false); when(authenticators.authenticate(request, response)).thenReturn(Optional.empty()); @@ -132,7 +132,7 @@ public class UserSessionInitializerTest { } @Test - public void return_401_and_stop_on_ws() throws Exception { + public void return_401_and_stop_on_ws() { when(request.getRequestURI()).thenReturn("/api/issues"); AuthenticationException authenticationException = AuthenticationException.newBuilder().setSource(Source.jwt()).setMessage("Token id hasn't been found").build(); doThrow(authenticationException).when(authenticators).authenticate(request, response); @@ -145,7 +145,7 @@ public class UserSessionInitializerTest { } @Test - public void return_401_and_stop_on_batch_ws() throws Exception { + public void return_401_and_stop_on_batch_ws() { when(request.getRequestURI()).thenReturn("/batch/global"); doThrow(AuthenticationException.newBuilder().setSource(Source.jwt()).setMessage("Token id hasn't been found").build()) .when(authenticators).authenticate(request, response); diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/ws/LoginActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/authentication/ws/LoginActionTest.java index a9c8f2fbe75..54b80364d42 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/authentication/ws/LoginActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/authentication/ws/LoginActionTest.java @@ -85,7 +85,7 @@ public class LoginActionTest { } @Test - public void do_get_pattern() throws Exception { + public void do_get_pattern() { assertThat(underTest.doGetPattern().matches("/api/authentication/login")).isTrue(); assertThat(underTest.doGetPattern().matches("/api/authentication/logout")).isFalse(); assertThat(underTest.doGetPattern().matches("/foo")).isFalse(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/authentication/ws/LogoutActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/authentication/ws/LogoutActionTest.java index 4c18c2cffba..f54d2301a29 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/authentication/ws/LogoutActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/authentication/ws/LogoutActionTest.java @@ -62,7 +62,7 @@ public class LogoutActionTest { private LogoutAction underTest = new LogoutAction(jwtHttpHandler, authenticationEvent); @Test - public void do_get_pattern() throws Exception { + public void do_get_pattern() { assertThat(underTest.doGetPattern().matches("/api/authentication/logout")).isTrue(); assertThat(underTest.doGetPattern().matches("/api/authentication/login")).isFalse(); assertThat(underTest.doGetPattern().matches("/api/authentication/logou")).isFalse(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/batch/FileActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/batch/FileActionTest.java index 2dab52fa3c3..f00af46eb32 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/batch/FileActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/batch/FileActionTest.java @@ -81,14 +81,14 @@ public class FileActionTest { } @Test - public void throw_IAE_when_no_name_parameter() throws Exception { + public void throw_IAE_when_no_name_parameter() { thrown.expect(IllegalArgumentException.class); thrown.expectMessage("The 'name' parameter is missing"); tester.newRequest().execute(); } @Test - public void test_definition() throws Exception { + public void test_definition() { WebService.Action definition = tester.getDef(); assertThat(definition.isInternal()).isTrue(); assertThat(definition.isPost()).isFalse(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/batch/IndexActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/batch/IndexActionTest.java index 2e5042e0a99..be2eadb0247 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/batch/IndexActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/batch/IndexActionTest.java @@ -69,13 +69,13 @@ public class IndexActionTest { } @Test - public void throw_ISE_when_no_file() throws Exception { + public void throw_ISE_when_no_file() { thrown.expect(IllegalStateException.class); tester.newRequest().execute(); } @Test - public void test_definition() throws Exception { + public void test_definition() { WebService.Action definition = tester.getDef(); assertThat(definition.isInternal()).isTrue(); assertThat(definition.isPost()).isFalse(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectActionTest.java index 7d98fb763b9..d35be2ce14a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectActionTest.java @@ -39,7 +39,7 @@ public class ProjectActionTest { private WsActionTester ws = new WsActionTester(new ProjectAction(projectDataLoader)); @Test - public void project_referentials() throws Exception { + public void project_referentials() { String projectKey = "org.codehaus.sonar:sonar"; ProjectRepositories projectReferentials = mock(ProjectRepositories.class); @@ -66,7 +66,7 @@ public class ProjectActionTest { * SONAR-7084 */ @Test - public void do_not_fail_when_a_path_is_null() throws Exception { + public void do_not_fail_when_a_path_is_null() { String projectKey = "org.codehaus.sonar:sonar"; ProjectRepositories projectRepositories = new ProjectRepositories().addFileData("module-1", null, new FileData(null, null)); diff --git a/server/sonar-server/src/test/java/org/sonar/server/branch/ws/BranchesWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/branch/ws/BranchesWsTest.java index d33c688537c..3b7a88f7af5 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/branch/ws/BranchesWsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/branch/ws/BranchesWsTest.java @@ -37,7 +37,7 @@ public class BranchesWsTest { } @Override - public void handle(Request request, Response response) throws Exception { + public void handle(Request request, Response response) { } }); diff --git a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/ActivityActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/ce/ws/ActivityActionTest.java index aaa57dce59a..e3b7bad2c69 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/ActivityActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/ce/ws/ActivityActionTest.java @@ -242,7 +242,7 @@ public class ActivityActionTest { } @Test - public void search_activity_by_component_name() throws IOException { + public void search_activity_by_component_name() { ComponentDto struts = db.components().insertPrivateProject(c -> c.setName("old apache struts")); ComponentDto zookeeper = db.components().insertPrivateProject(c -> c.setName("new apache zookeeper")); ComponentDto eclipse = db.components().insertPrivateProject(c -> c.setName("eclipse")); @@ -284,7 +284,7 @@ public class ActivityActionTest { } @Test - public void search_task_id_in_queue_ignoring_other_parameters() throws IOException { + public void search_task_id_in_queue_ignoring_other_parameters() { logInAsSystemAdministrator(); ComponentDto project = db.components().insertPrivateProject(); insertQueue("T1", project, IN_PROGRESS); diff --git a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/CeWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/ce/ws/CeWsTest.java index aaa8b935af3..4fc3633bc2b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/CeWsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/ce/ws/CeWsTest.java @@ -31,7 +31,7 @@ import static org.mockito.Mockito.mock; public class CeWsTest { @Test - public void define() throws Exception { + public void define() { CeWsAction wsAction = new SubmitAction(mock(ReportSubmitter.class), mock(DefaultOrganizationProvider.class)); CeWs ws = new CeWs(wsAction); diff --git a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/ComponentActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/ce/ws/ComponentActionTest.java index f5552a72eda..44b37b090ca 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/ComponentActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/ce/ws/ComponentActionTest.java @@ -245,7 +245,7 @@ public class ComponentActionTest { } @Test - public void fail_with_404_when_component_does_not_exist() throws Exception { + public void fail_with_404_when_component_does_not_exist() { expectedException.expect(NotFoundException.class); ws.newRequest() .setParam(PARAM_COMPONENT, "UNKNOWN") diff --git a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/TaskActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/ce/ws/TaskActionTest.java index 2a0224aafdb..98438254d3c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/TaskActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/ce/ws/TaskActionTest.java @@ -78,7 +78,7 @@ public class TaskActionTest { } @Test - public void task_is_in_queue() throws Exception { + public void task_is_in_queue() { logInAsRoot(); CeQueueDto queueDto = new CeQueueDto(); @@ -104,7 +104,7 @@ public class TaskActionTest { } @Test - public void task_is_archived() throws Exception { + public void task_is_archived() { logInAsRoot(); CeActivityDto activityDto = createActivityDto(SOME_TASK_UUID); @@ -252,7 +252,7 @@ public class TaskActionTest { } @Test - public void throw_NotFoundException_if_id_does_not_exist() throws Exception { + public void throw_NotFoundException_if_id_does_not_exist() { logInAsRoot(); expectedException.expect(NotFoundException.class); diff --git a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/TaskFormatterTest.java b/server/sonar-server/src/test/java/org/sonar/server/ce/ws/TaskFormatterTest.java index 0672891b910..b88a3dfe702 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/TaskFormatterTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/ce/ws/TaskFormatterTest.java @@ -75,7 +75,7 @@ public class TaskFormatterTest { } @Test - public void formatQueue_with_component_and_other_fields() throws IOException { + public void formatQueue_with_component_and_other_fields() { String uuid = "COMPONENT_UUID"; OrganizationDto organizationDto = db.organizations().insert(); db.components().insertPrivateProject(organizationDto, (t) -> t.setUuid(uuid).setDbKey("COMPONENT_KEY").setName("Component Name")); @@ -106,7 +106,7 @@ public class TaskFormatterTest { } @Test - public void formatQueue_do_not_fail_if_component_not_found() throws Exception { + public void formatQueue_do_not_fail_if_component_not_found() { CeQueueDto dto = new CeQueueDto(); dto.setUuid("UUID"); dto.setTaskType("TYPE"); @@ -139,7 +139,7 @@ public class TaskFormatterTest { } @Test - public void formatQueues() throws Exception { + public void formatQueues() { CeQueueDto dto1 = new CeQueueDto(); dto1.setUuid("UUID1"); dto1.setTaskType("TYPE1"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentCleanerServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ComponentCleanerServiceTest.java index fd7ac59bb00..75f678005e4 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentCleanerServiceTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/ComponentCleanerServiceTest.java @@ -105,7 +105,7 @@ public class ComponentCleanerServiceTest { } @Test - public void fail_with_IAE_if_not_a_project() throws Exception { + public void fail_with_IAE_if_not_a_project() { mockResourceTypeAsValidProject(); ComponentDto project = ComponentTesting.newPrivateProjectDto(db.organizations().insert()); dbClient.componentDao().insert(dbSession, project); @@ -118,7 +118,7 @@ public class ComponentCleanerServiceTest { } @Test - public void fail_to_delete_not_deletable_resource_type() throws Exception { + public void fail_to_delete_not_deletable_resource_type() { ResourceType resourceType = mock(ResourceType.class); when(resourceType.getBooleanProperty("deletable")).thenReturn(false); when(mockResourceTypes.get(anyString())).thenReturn(resourceType); @@ -131,7 +131,7 @@ public class ComponentCleanerServiceTest { } @Test - public void fail_to_delete_null_resource_type() throws Exception { + public void fail_to_delete_null_resource_type() { when(mockResourceTypes.get(anyString())).thenReturn(null); ComponentDto project = ComponentTesting.newPrivateProjectDto(db.organizations().insert()); dbClient.componentDao().insert(dbSession, project); diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentUpdaterTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ComponentUpdaterTest.java index 13506055556..c22505fa0b0 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentUpdaterTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/ComponentUpdaterTest.java @@ -71,7 +71,7 @@ public class ComponentUpdaterTest { projectIndexers); @Test - public void persist_and_index_when_creating_project() throws Exception { + public void persist_and_index_when_creating_project() { NewComponent project = NewComponent.newComponentBuilder() .setKey(DEFAULT_PROJECT_KEY) .setName(DEFAULT_PROJECT_NAME) @@ -108,7 +108,7 @@ public class ComponentUpdaterTest { } @Test - public void persist_private_flag_true_when_creating_project() throws Exception { + public void persist_private_flag_true_when_creating_project() { OrganizationDto organization = db.organizations().insert(); NewComponent project = NewComponent.newComponentBuilder() .setKey(DEFAULT_PROJECT_KEY) @@ -122,7 +122,7 @@ public class ComponentUpdaterTest { } @Test - public void persist_private_flag_false_when_creating_project() throws Exception { + public void persist_private_flag_false_when_creating_project() { OrganizationDto organization = db.organizations().insert(); NewComponent project = NewComponent.newComponentBuilder() .setKey(DEFAULT_PROJECT_KEY) @@ -136,7 +136,7 @@ public class ComponentUpdaterTest { } @Test - public void create_project_with_branch() throws Exception { + public void create_project_with_branch() { ComponentDto project = underTest.create(db.getSession(), NewComponent.newComponentBuilder() .setKey(DEFAULT_PROJECT_KEY) @@ -208,7 +208,7 @@ public class ComponentUpdaterTest { } @Test - public void apply_default_permission_template() throws Exception { + public void apply_default_permission_template() { int userId = 42; NewComponent project = NewComponent.newComponentBuilder() .setKey(DEFAULT_PROJECT_KEY) @@ -221,7 +221,7 @@ public class ComponentUpdaterTest { } @Test - public void add_project_to_user_favorites_if_project_creator_is_defined_in_permission_template() throws Exception { + public void add_project_to_user_favorites_if_project_creator_is_defined_in_permission_template() { UserDto userDto = db.users().insertUser(); NewComponent project = NewComponent.newComponentBuilder() .setKey(DEFAULT_PROJECT_KEY) @@ -239,7 +239,7 @@ public class ComponentUpdaterTest { } @Test - public void does_not_add_project_to_favorite_when_anonymously_created() throws Exception { + public void does_not_add_project_to_favorite_when_anonymously_created() { ComponentDto project = underTest.create(db.getSession(), NewComponent.newComponentBuilder() .setKey(DEFAULT_PROJECT_KEY) @@ -252,7 +252,7 @@ public class ComponentUpdaterTest { } @Test - public void does_not_add_project_to_favorite_when_project_has_no_permission_on_template() throws Exception { + public void does_not_add_project_to_favorite_when_project_has_no_permission_on_template() { ComponentDto project = underTest.create(db.getSession(), NewComponent.newComponentBuilder() .setKey(DEFAULT_PROJECT_KEY) @@ -265,7 +265,7 @@ public class ComponentUpdaterTest { } @Test - public void fail_when_project_key_already_exists() throws Exception { + public void fail_when_project_key_already_exists() { ComponentDto existing = db.components().insertPrivateProject(); expectedException.expect(BadRequestException.class); @@ -281,7 +281,7 @@ public class ComponentUpdaterTest { } @Test - public void fail_when_project_key_already_exists_on_other_organization() throws Exception { + public void fail_when_project_key_already_exists_on_other_organization() { ComponentDto existing = db.components().insertPrivateProject(db.organizations().insert()); expectedException.expect(BadRequestException.class); @@ -297,7 +297,7 @@ public class ComponentUpdaterTest { } @Test - public void fail_when_key_has_bad_format() throws Exception { + public void fail_when_key_has_bad_format() { expectedException.expect(BadRequestException.class); expectedException.expectMessage("Malformed key for Project: 1234"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/index/NewTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/index/NewTest.java index 9e14c617893..4c415ba0e38 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/index/NewTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/index/NewTest.java @@ -31,7 +31,7 @@ public class NewTest { public EsTester es = new EsTester(new ComponentIndexDefinition(new MapSettings().asConfig())); @Test - public void name() throws Exception { + public void name() { IndicesExistsResponse x = es.client().prepareIndicesExist("components").get(); System.out.println(x.isExists()); IndicesExistsResponse x2 = es.client().prepareIndicesExist("components").get(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/AppActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ws/AppActionTest.java index 3ee123e9b1b..3abc3b46b23 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/ws/AppActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/ws/AppActionTest.java @@ -57,7 +57,7 @@ public class AppActionTest { private WsActionTester ws = new WsActionTester(new AppAction(db.getDbClient(), userSession, TestComponentFinder.from(db))); @Test - public void file_info() throws Exception { + public void file_info() { ComponentDto project = db.components().insertPrivateProject(); ComponentDto directory = db.components().insertComponent(newDirectory(project, "src")); ComponentDto file = db.components().insertComponent(newFileDto(project, directory)); @@ -84,7 +84,7 @@ public class AppActionTest { } @Test - public void file_on_module() throws Exception { + public void file_on_module() { ComponentDto project = db.components().insertPrivateProject(); ComponentDto module = db.components().insertComponent(newModuleDto(project)); ComponentDto directory = db.components().insertComponent(newDirectory(module, "src")); @@ -114,7 +114,7 @@ public class AppActionTest { } @Test - public void file_without_measures() throws Exception { + public void file_without_measures() { ComponentDto project = db.components().insertPrivateProject(); ComponentDto file = db.components().insertComponent(newFileDto(project)); userSession.logIn("john").addProjectPermission(USER, project); @@ -130,7 +130,7 @@ public class AppActionTest { } @Test - public void file_with_measures() throws Exception { + public void file_with_measures() { ComponentDto project = db.components().insertPrivateProject(); ComponentDto directory = db.components().insertComponent(newDirectory(project, "src")); ComponentDto file = db.components().insertComponent(newFileDto(project, directory)); @@ -308,7 +308,7 @@ public class AppActionTest { } @Test - public void fail_when_component_not_found() throws Exception { + public void fail_when_component_not_found() { ComponentDto project = db.components().insertPrivateProject(); ComponentDto file = db.components().insertComponent(newFileDto(project)); @@ -320,7 +320,7 @@ public class AppActionTest { } @Test - public void fail_when_branch_not_found() throws Exception { + public void fail_when_branch_not_found() { ComponentDto project = db.components().insertPrivateProject(); ComponentDto branch = db.components().insertProjectBranch(project); ComponentDto file = db.components().insertComponent(newFileDto(branch)); @@ -334,7 +334,7 @@ public class AppActionTest { } @Test - public void fail_when_missing_permission() throws Exception { + public void fail_when_missing_permission() { ComponentDto project = db.components().insertPrivateProject(); ComponentDto file = db.components().insertComponent(newFileDto(project)); diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentsWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentsWsTest.java index 7c3b6bbb0b8..5e150a88a5d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentsWsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentsWsTest.java @@ -34,7 +34,7 @@ public class ComponentsWsTest { private ComponentsWsAction action = new ComponentsWsAction() { @Override - public void handle(Request request, Response response) throws Exception { + public void handle(Request request, Response response) { } @Override diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/FilterParserTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ws/FilterParserTest.java index 8de325ff6f9..f368c443e21 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/ws/FilterParserTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/ws/FilterParserTest.java @@ -42,7 +42,7 @@ public class FilterParserTest { public ExpectedException expectedException = ExpectedException.none(); @Test - public void parse_filter_having_operator_and_value() throws Exception { + public void parse_filter_having_operator_and_value() { List criterion = FilterParser.parse("ncloc > 10 and coverage <= 80"); assertThat(criterion) @@ -53,7 +53,7 @@ public class FilterParserTest { } @Test - public void parse_filter_having_operator_and_value_ignores_white_spaces() throws Exception { + public void parse_filter_having_operator_and_value_ignores_white_spaces() { List criterion = FilterParser.parse(" ncloc > 10 "); assertThat(criterion) @@ -63,7 +63,7 @@ public class FilterParserTest { } @Test - public void parse_filter_having_in_operator() throws Exception { + public void parse_filter_having_in_operator() { List criterion = FilterParser.parse("ncloc in (80,90)"); assertThat(criterion) @@ -73,7 +73,7 @@ public class FilterParserTest { } @Test - public void parse_filter_having_in_operator_ignores_white_spaces() throws Exception { + public void parse_filter_having_in_operator_ignores_white_spaces() { List criterion = FilterParser.parse(" ncloc in ( 80 , 90 ) "); assertThat(criterion) @@ -83,7 +83,7 @@ public class FilterParserTest { } @Test - public void parse_filter_having_only_key() throws Exception { + public void parse_filter_having_only_key() { List criterion = FilterParser.parse("isFavorite"); assertThat(criterion) @@ -93,7 +93,7 @@ public class FilterParserTest { } @Test - public void parse_filter_having_only_key_ignores_white_spaces() throws Exception { + public void parse_filter_having_only_key_ignores_white_spaces() { List criterion = FilterParser.parse(" isFavorite "); assertThat(criterion) @@ -103,7 +103,7 @@ public class FilterParserTest { } @Test - public void parse_filter_having_different_criterion_types() throws Exception { + public void parse_filter_having_different_criterion_types() { List criterion = FilterParser.parse(" ncloc > 10 and coverage <= 80 and isFavorite "); assertThat(criterion) @@ -115,7 +115,7 @@ public class FilterParserTest { } @Test - public void parse_filter_with_key_having_underscore() throws Exception { + public void parse_filter_with_key_having_underscore() { List criterion = FilterParser.parse(" alert_status = OK"); assertThat(criterion) @@ -125,7 +125,7 @@ public class FilterParserTest { } @Test - public void parse_filter_without_any_space_in_criteria() throws Exception { + public void parse_filter_without_any_space_in_criteria() { List criterion = FilterParser.parse("ncloc>10 and coverage<=80 and tags in (java,platform)"); assertThat(criterion) @@ -137,7 +137,7 @@ public class FilterParserTest { } @Test - public void parse_filter_having_all_operators() throws Exception { + public void parse_filter_having_all_operators() { List criterion = FilterParser.parse("ncloc < 10 and coverage <= 80 and debt > 50 and duplication >= 56.5 and security_rating = 1 and language in (java,js)"); assertThat(criterion) @@ -152,7 +152,7 @@ public class FilterParserTest { } @Test - public void parse_filter_starting_and_ending_with_double_quotes() throws Exception { + public void parse_filter_starting_and_ending_with_double_quotes() { assertThat(FilterParser.parse("q = \"Sonar Qube\"")) .extracting(Criterion::getKey, Criterion::getOperator, Criterion::getValue) .containsOnly( @@ -175,14 +175,14 @@ public class FilterParserTest { } @Test - public void accept_empty_query() throws Exception { + public void accept_empty_query() { List criterion = FilterParser.parse(""); assertThat(criterion).isEmpty(); } @Test - public void accept_key_ending_by_in() throws Exception { + public void accept_key_ending_by_in() { List criterion = FilterParser.parse("endingbyin > 10"); assertThat(criterion) @@ -192,7 +192,7 @@ public class FilterParserTest { } @Test - public void search_is_case_insensitive() throws Exception { + public void search_is_case_insensitive() { List criterion = FilterParser.parse("ncloc > 10 AnD coverage <= 80 AND debt = 10 AND issues = 20"); assertThat(criterion).hasSize(4); diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/ProjectMeasuresQueryFactoryTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ws/ProjectMeasuresQueryFactoryTest.java index af30fc8280c..a96461d7531 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/ws/ProjectMeasuresQueryFactoryTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/ws/ProjectMeasuresQueryFactoryTest.java @@ -52,7 +52,7 @@ public class ProjectMeasuresQueryFactoryTest { public UserSessionRule userSession = UserSessionRule.standalone(); @Test - public void create_query() throws Exception { + public void create_query() { List criteria = asList( Criterion.builder().setKey("ncloc").setOperator(GT).setValue("10").build(), Criterion.builder().setKey("coverage").setOperator(LTE).setValue("80").build()); @@ -67,7 +67,7 @@ public class ProjectMeasuresQueryFactoryTest { } @Test - public void fail_when_no_value() throws Exception { + public void fail_when_no_value() { expectedException.expect(IllegalArgumentException.class); expectedException.expectMessage("Value cannot be null for 'ncloc'"); @@ -76,7 +76,7 @@ public class ProjectMeasuresQueryFactoryTest { } @Test - public void fail_when_not_double() throws Exception { + public void fail_when_not_double() { expectedException.expect(IllegalArgumentException.class); expectedException.expectMessage("Value 'ten' is not a number"); @@ -85,7 +85,7 @@ public class ProjectMeasuresQueryFactoryTest { } @Test - public void fail_when_no_operator() throws Exception { + public void fail_when_no_operator() { expectedException.expect(IllegalArgumentException.class); expectedException.expectMessage("Operator cannot be null for 'ncloc'"); @@ -94,7 +94,7 @@ public class ProjectMeasuresQueryFactoryTest { } @Test - public void create_query_on_quality_gate() throws Exception { + public void create_query_on_quality_gate() { ProjectMeasuresQuery query = newProjectMeasuresQuery(singletonList(Criterion.builder().setKey("alert_status").setOperator(EQ).setValue("OK").build()), emptySet()); @@ -102,7 +102,7 @@ public class ProjectMeasuresQueryFactoryTest { } @Test - public void fail_to_create_query_on_quality_gate_when_operator_is_not_equal() throws Exception { + public void fail_to_create_query_on_quality_gate_when_operator_is_not_equal() { expectedException.expect(IllegalArgumentException.class); expectedException.expectMessage("Only equals operator is available for quality gate criteria"); @@ -110,7 +110,7 @@ public class ProjectMeasuresQueryFactoryTest { } @Test - public void fail_to_create_query_on_quality_gate_when_value_is_incorrect() throws Exception { + public void fail_to_create_query_on_quality_gate_when_value_is_incorrect() { expectedException.expect(IllegalArgumentException.class); expectedException.expectMessage("Unknown quality gate status : 'unknown'"); @@ -118,7 +118,7 @@ public class ProjectMeasuresQueryFactoryTest { } @Test - public void create_query_on_language_using_in_operator() throws Exception { + public void create_query_on_language_using_in_operator() { ProjectMeasuresQuery query = newProjectMeasuresQuery( singletonList(Criterion.builder().setKey("languages").setOperator(IN).setValues(asList("java", "js")).build()), emptySet()); @@ -127,7 +127,7 @@ public class ProjectMeasuresQueryFactoryTest { } @Test - public void create_query_on_language_using_equals_operator() throws Exception { + public void create_query_on_language_using_equals_operator() { ProjectMeasuresQuery query = newProjectMeasuresQuery( singletonList(Criterion.builder().setKey("languages").setOperator(EQ).setValue("java").build()), emptySet()); @@ -136,7 +136,7 @@ public class ProjectMeasuresQueryFactoryTest { } @Test - public void fail_to_create_query_on_language_using_in_operator_and_value() throws Exception { + public void fail_to_create_query_on_language_using_in_operator_and_value() { expectedException.expect(IllegalArgumentException.class); expectedException.expectMessage("Languages should be set either by using 'languages = java' or 'languages IN (java, js)"); @@ -144,7 +144,7 @@ public class ProjectMeasuresQueryFactoryTest { } @Test - public void fail_to_create_query_on_language_using_eq_operator_and_values() throws Exception { + public void fail_to_create_query_on_language_using_eq_operator_and_values() { expectedException.expect(IllegalArgumentException.class); expectedException.expectMessage("Languages should be set either by using 'languages = java' or 'languages IN (java, js)"); @@ -152,7 +152,7 @@ public class ProjectMeasuresQueryFactoryTest { } @Test - public void create_query_on_tag_using_in_operator() throws Exception { + public void create_query_on_tag_using_in_operator() { ProjectMeasuresQuery query = newProjectMeasuresQuery( singletonList(Criterion.builder().setKey("tags").setOperator(IN).setValues(asList("java", "js")).build()), emptySet()); @@ -161,7 +161,7 @@ public class ProjectMeasuresQueryFactoryTest { } @Test - public void create_query_on_tag_using_equals_operator() throws Exception { + public void create_query_on_tag_using_equals_operator() { ProjectMeasuresQuery query = newProjectMeasuresQuery( singletonList(Criterion.builder().setKey("tags").setOperator(EQ).setValue("java").build()), emptySet()); @@ -170,7 +170,7 @@ public class ProjectMeasuresQueryFactoryTest { } @Test - public void fail_to_create_query_on_tag_using_in_operator_and_value() throws Exception { + public void fail_to_create_query_on_tag_using_in_operator_and_value() { expectedException.expect(IllegalArgumentException.class); expectedException.expectMessage("Tags should be set either by using 'tags = java' or 'tags IN (finance, platform)"); @@ -178,7 +178,7 @@ public class ProjectMeasuresQueryFactoryTest { } @Test - public void fail_to_create_query_on_tag_using_eq_operator_and_values() throws Exception { + public void fail_to_create_query_on_tag_using_eq_operator_and_values() { expectedException.expect(IllegalArgumentException.class); expectedException.expectMessage("Tags should be set either by using 'tags = java' or 'tags IN (finance, platform)"); @@ -186,7 +186,7 @@ public class ProjectMeasuresQueryFactoryTest { } @Test - public void create_query_having_q() throws Exception { + public void create_query_having_q() { List criteria = singletonList(Criterion.builder().setKey("query").setOperator(EQ).setValue("Sonar Qube").build()); ProjectMeasuresQuery underTest = newProjectMeasuresQuery(criteria, emptySet()); @@ -195,7 +195,7 @@ public class ProjectMeasuresQueryFactoryTest { } @Test - public void create_query_having_q_ignore_case_sensitive() throws Exception { + public void create_query_having_q_ignore_case_sensitive() { List criteria = singletonList(Criterion.builder().setKey("query").setOperator(EQ).setValue("Sonar Qube").build()); ProjectMeasuresQuery underTest = newProjectMeasuresQuery(criteria, emptySet()); @@ -204,7 +204,7 @@ public class ProjectMeasuresQueryFactoryTest { } @Test - public void fail_to_create_query_having_q_with_no_value() throws Exception { + public void fail_to_create_query_having_q_with_no_value() { expectedException.expect(IllegalArgumentException.class); expectedException.expectMessage("Query is invalid"); @@ -213,7 +213,7 @@ public class ProjectMeasuresQueryFactoryTest { } @Test - public void fail_to_create_query_having_q_with_other_operator_than_equals() throws Exception { + public void fail_to_create_query_having_q_with_other_operator_than_equals() { expectedException.expect(IllegalArgumentException.class); expectedException.expectMessage("Query should only be used with equals operator"); @@ -230,7 +230,7 @@ public class ProjectMeasuresQueryFactoryTest { } @Test - public void filter_on_projectUuids_if_projectUuid_is_empty_and_criteria_non_empty() throws Exception { + public void filter_on_projectUuids_if_projectUuid_is_empty_and_criteria_non_empty() { ProjectMeasuresQuery query = newProjectMeasuresQuery(singletonList(Criterion.builder().setKey("ncloc").setOperator(GT).setValue("10").build()), emptySet()); @@ -238,7 +238,7 @@ public class ProjectMeasuresQueryFactoryTest { } @Test - public void filter_on_projectUuids_if_projectUuid_is_non_empty_and_criteria_non_empty() throws Exception { + public void filter_on_projectUuids_if_projectUuid_is_non_empty_and_criteria_non_empty() { ProjectMeasuresQuery query = newProjectMeasuresQuery(singletonList(Criterion.builder().setKey("ncloc").setOperator(GT).setValue("10").build()), Collections.singleton("foo")); @@ -246,21 +246,21 @@ public class ProjectMeasuresQueryFactoryTest { } @Test - public void filter_on_projectUuids_if_projectUuid_is_empty_and_criteria_is_empty() throws Exception { + public void filter_on_projectUuids_if_projectUuid_is_empty_and_criteria_is_empty() { ProjectMeasuresQuery query = newProjectMeasuresQuery(emptyList(), emptySet()); assertThat(query.getProjectUuids()).isPresent(); } @Test - public void filter_on_projectUuids_if_projectUuid_is_non_empty_and_criteria_empty() throws Exception { + public void filter_on_projectUuids_if_projectUuid_is_non_empty_and_criteria_empty() { ProjectMeasuresQuery query = newProjectMeasuresQuery(emptyList(), Collections.singleton("foo")); assertThat(query.getProjectUuids()).isPresent(); } @Test - public void convert_metric_to_lower_case() throws Exception { + public void convert_metric_to_lower_case() { ProjectMeasuresQuery query = newProjectMeasuresQuery(asList( Criterion.builder().setKey("NCLOC").setOperator(GT).setValue("10").build(), Criterion.builder().setKey("coVERage").setOperator(LTE).setValue("80").build()), @@ -274,7 +274,7 @@ public class ProjectMeasuresQueryFactoryTest { } @Test - public void filter_no_data() throws Exception { + public void filter_no_data() { List criteria = singletonList(Criterion.builder().setKey("duplicated_lines_density").setOperator(EQ).setValue("NO_DATA").build()); ProjectMeasuresQuery underTest = newProjectMeasuresQuery(criteria, emptySet()); @@ -285,7 +285,7 @@ public class ProjectMeasuresQueryFactoryTest { } @Test - public void fail_to_use_no_data_with_operator_lower_than() throws Exception { + public void fail_to_use_no_data_with_operator_lower_than() { List criteria = singletonList(Criterion.builder().setKey("duplicated_lines_density").setOperator(LT).setValue("NO_DATA").build()); expectedException.expect(IllegalArgumentException.class); expectedException.expectMessage("NO_DATA can only be used with equals operator"); @@ -294,7 +294,7 @@ public class ProjectMeasuresQueryFactoryTest { } @Test - public void filter_no_data_with_other_case() throws Exception { + public void filter_no_data_with_other_case() { List criteria = singletonList(Criterion.builder().setKey("duplicated_lines_density").setOperator(EQ).setValue("nO_DaTa").build()); ProjectMeasuresQuery underTest = newProjectMeasuresQuery(criteria, emptySet()); @@ -305,7 +305,7 @@ public class ProjectMeasuresQueryFactoryTest { } @Test - public void accept_empty_query() throws Exception { + public void accept_empty_query() { ProjectMeasuresQuery result = newProjectMeasuresQuery(emptyList(), emptySet()); assertThat(result.getMetricCriteria()).isEmpty(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/ProjectMeasuresQueryValidatorTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ws/ProjectMeasuresQueryValidatorTest.java index 69ab3fbb008..607eb537e36 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/ws/ProjectMeasuresQueryValidatorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/ws/ProjectMeasuresQueryValidatorTest.java @@ -33,187 +33,187 @@ public class ProjectMeasuresQueryValidatorTest { public ExpectedException expectedException = ExpectedException.none(); @Test - public void query_with_empty_metrics_is_valid() throws Exception { + public void query_with_empty_metrics_is_valid() { ProjectMeasuresQueryValidator.validate(new ProjectMeasuresQuery()); } @Test - public void filter_by_ncloc_is_valid() throws Exception { + public void filter_by_ncloc_is_valid() { assertValidFilterKey("ncloc"); } @Test - public void filter_by_duplicated_lines_density_is_valid() throws Exception { + public void filter_by_duplicated_lines_density_is_valid() { assertValidFilterKey("duplicated_lines_density"); } @Test - public void filter_by_coverage_is_valid() throws Exception { + public void filter_by_coverage_is_valid() { assertValidFilterKey("coverage"); } @Test - public void filter_by_sqale_rating_is_valid() throws Exception { + public void filter_by_sqale_rating_is_valid() { assertValidFilterKey("sqale_rating"); } @Test - public void filter_by_reliability_rating_is_valid() throws Exception { + public void filter_by_reliability_rating_is_valid() { assertValidFilterKey("reliability_rating"); } @Test - public void filter_by_security_rating_is_valid() throws Exception { + public void filter_by_security_rating_is_valid() { assertValidFilterKey("security_rating"); } @Test - public void filter_by_alert_status_is_valid() throws Exception { + public void filter_by_alert_status_is_valid() { assertValidFilterKey("alert_status"); } @Test - public void filter_by_ncloc_language_distribution_is_valid() throws Exception { + public void filter_by_ncloc_language_distribution_is_valid() { assertValidFilterKey("ncloc_language_distribution"); } @Test - public void filter_by_new_security_rating_is_valid() throws Exception { + public void filter_by_new_security_rating_is_valid() { assertValidFilterKey("new_security_rating"); } @Test - public void filter_by_new_maintainability_rating_is_valid() throws Exception { + public void filter_by_new_maintainability_rating_is_valid() { assertValidFilterKey("new_maintainability_rating"); } @Test - public void filter_by_new_coverage_is_valid() throws Exception { + public void filter_by_new_coverage_is_valid() { assertValidFilterKey("new_coverage"); } @Test - public void filter_by_new_duplicated_lines_density_is_valid() throws Exception { + public void filter_by_new_duplicated_lines_density_is_valid() { assertValidFilterKey("new_duplicated_lines_density"); } @Test - public void filter_by_new_lines_is_valid() throws Exception { + public void filter_by_new_lines_is_valid() { assertValidFilterKey("new_lines"); } @Test - public void filter_by_new_reliability_rating_is_valid() throws Exception { + public void filter_by_new_reliability_rating_is_valid() { assertValidFilterKey("new_reliability_rating"); } @Test - public void filter_by_bla_is_invalid() throws Exception { + public void filter_by_bla_is_invalid() { assertInvalidFilterKey("bla"); } @Test - public void filter_by_bla_and_new_lines_is_invalid() throws Exception { + public void filter_by_bla_and_new_lines_is_invalid() { assertInvalidFilterKeys("Following metrics are not supported: 'bla'", "bla", "new_lines"); } @Test - public void filter_by_new_lines_and_bla_is_invalid() throws Exception { + public void filter_by_new_lines_and_bla_is_invalid() { assertInvalidFilterKeys("Following metrics are not supported: 'bla'", "new_lines", "bla"); } @Test - public void filter_by_NeW_LiNeS_is_invalid() throws Exception { + public void filter_by_NeW_LiNeS_is_invalid() { assertInvalidFilterKey("NeW_LiNeS"); } @Test - public void filter_by_empty_string_is_invalid() throws Exception { + public void filter_by_empty_string_is_invalid() { assertInvalidFilterKey(""); } @Test - public void sort_by_ncloc_is_valid() throws Exception { + public void sort_by_ncloc_is_valid() { assertValidSortKey("ncloc"); } @Test - public void sort_by_duplicated_lines_density_is_valid() throws Exception { + public void sort_by_duplicated_lines_density_is_valid() { assertValidSortKey("duplicated_lines_density"); } @Test - public void sort_by_coverage_is_valid() throws Exception { + public void sort_by_coverage_is_valid() { assertValidSortKey("coverage"); } @Test - public void sort_by_sqale_rating_is_valid() throws Exception { + public void sort_by_sqale_rating_is_valid() { assertValidSortKey("sqale_rating"); } @Test - public void sort_by_reliability_rating_is_valid() throws Exception { + public void sort_by_reliability_rating_is_valid() { assertValidSortKey("reliability_rating"); } @Test - public void sort_by_security_rating_is_valid() throws Exception { + public void sort_by_security_rating_is_valid() { assertValidSortKey("security_rating"); } @Test - public void sort_by_alert_status_is_valid() throws Exception { + public void sort_by_alert_status_is_valid() { assertValidSortKey("alert_status"); } @Test - public void sort_by_ncloc_language_distribution_is_valid() throws Exception { + public void sort_by_ncloc_language_distribution_is_valid() { assertValidSortKey("ncloc_language_distribution"); } @Test - public void sort_by_new_security_rating_is_valid() throws Exception { + public void sort_by_new_security_rating_is_valid() { assertValidSortKey("new_security_rating"); } @Test - public void sort_by_new_maintainability_rating_is_valid() throws Exception { + public void sort_by_new_maintainability_rating_is_valid() { assertValidSortKey("new_maintainability_rating"); } @Test - public void sort_by_new_coverage_is_valid() throws Exception { + public void sort_by_new_coverage_is_valid() { assertValidSortKey("new_coverage"); } @Test - public void sort_by_new_duplicated_lines_density_is_valid() throws Exception { + public void sort_by_new_duplicated_lines_density_is_valid() { assertValidSortKey("new_duplicated_lines_density"); } @Test - public void sort_by_new_lines_is_valid() throws Exception { + public void sort_by_new_lines_is_valid() { assertValidSortKey("new_lines"); } @Test - public void sort_by_new_reliability_rating_is_valid() throws Exception { + public void sort_by_new_reliability_rating_is_valid() { assertValidSortKey("new_reliability_rating"); } @Test - public void sort_by_bla_is_invalid() throws Exception { + public void sort_by_bla_is_invalid() { assertInvalidSortKey("bla"); } @Test - public void sort_by_NeW_lInEs_is_invalid() throws Exception { + public void sort_by_NeW_lInEs_is_invalid() { assertInvalidSortKey("NeW_lInEs"); } @Test - public void sort_by_empty_string_is_invalid() throws Exception { + public void sort_by_empty_string_is_invalid() { assertInvalidSortKey(""); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchActionTest.java index 03e04472a59..72e26463c8c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchActionTest.java @@ -141,7 +141,7 @@ public class SearchActionTest { } @Test - public void search_by_key_query() throws IOException { + public void search_by_key_query() { insertProjectsAuthorizedForUser( ComponentTesting.newPrivateProjectDto(db.getDefaultOrganization()).setDbKey("project-_%-key"), ComponentTesting.newPrivateProjectDto(db.getDefaultOrganization()).setDbKey("project-key-without-escaped-characters")); @@ -152,7 +152,7 @@ public class SearchActionTest { } @Test - public void search_for_files() throws IOException { + public void search_for_files() { ComponentDto project = ComponentTesting.newPrivateProjectDto(db.getDefaultOrganization()); ComponentDto file1 = newFileDto(project).setDbKey("file1"); ComponentDto file2 = newFileDto(project).setDbKey("file2"); @@ -165,7 +165,7 @@ public class SearchActionTest { } @Test - public void search_with_pagination() throws IOException { + public void search_with_pagination() { OrganizationDto organizationDto = db.organizations().insert(); List componentDtoList = new ArrayList<>(); for (int i = 1; i <= 9; i++) { @@ -179,7 +179,7 @@ public class SearchActionTest { } @Test - public void search_with_language() throws IOException { + public void search_with_language() { OrganizationDto organizationDto = db.organizations().insert(); insertProjectsAuthorizedForUser( ComponentTesting.newPrivateProjectDto(organizationDto).setDbKey("java-project").setLanguage("java"), @@ -191,7 +191,7 @@ public class SearchActionTest { } @Test - public void return_only_components_from_projects_on_which_user_has_browse_permission() throws IOException { + public void return_only_components_from_projects_on_which_user_has_browse_permission() { ComponentDto project1 = ComponentTesting.newPrivateProjectDto(db.getDefaultOrganization()); ComponentDto file1 = newFileDto(project1).setDbKey("file1"); ComponentDto file2 = newFileDto(project1).setDbKey("file2"); @@ -208,7 +208,7 @@ public class SearchActionTest { } @Test - public void return_project_key() throws IOException { + public void return_project_key() { ComponentDto project = ComponentTesting.newPublicProjectDto(db.getDefaultOrganization()); ComponentDto module = ComponentTesting.newModuleDto(project); ComponentDto file1 = newFileDto(module).setDbKey("file1"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchProjectsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchProjectsActionTest.java index 3744acb2881..e1774f31f65 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchProjectsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchProjectsActionTest.java @@ -711,7 +711,7 @@ public class SearchProjectsActionTest { @Test @UseDataProvider("rating_metric_keys") - public void return_rating_facet(String ratingMetricKey) throws Exception { + public void return_rating_facet(String ratingMetricKey) { userSession.logIn(); OrganizationDto organization = db.organizations().insert(); MetricDto ratingMetric = db.measures().insertMetric(c -> c.setKey(ratingMetricKey).setValueType(RATING.name())); @@ -737,7 +737,7 @@ public class SearchProjectsActionTest { @Test @UseDataProvider("new_rating_metric_keys") - public void return_new_rating_facet(String newRatingMetricKey) throws Exception { + public void return_new_rating_facet(String newRatingMetricKey) { userSession.logIn(); OrganizationDto organization = db.organizations().insert(); MetricDto newRatingMetric = db.measures().insertMetric(c -> c.setKey(newRatingMetricKey).setValueType(RATING.name())); @@ -914,7 +914,7 @@ public class SearchProjectsActionTest { } @Test - public void default_sort_is_by_ascending_name() throws Exception { + public void default_sort_is_by_ascending_name() { userSession.logIn(); OrganizationDto organization = db.getDefaultOrganization(); insertProject(organization, c -> c.setName("Sonar Java")); @@ -928,7 +928,7 @@ public class SearchProjectsActionTest { } @Test - public void sort_by_name() throws Exception { + public void sort_by_name() { userSession.logIn(); OrganizationDto organization = db.getDefaultOrganization(); insertProject(organization, c -> c.setName("Sonar Java")); @@ -943,7 +943,7 @@ public class SearchProjectsActionTest { } @Test - public void sort_by_coverage_then_by_name() throws Exception { + public void sort_by_coverage_then_by_name() { userSession.logIn(); OrganizationDto organizationDto = db.organizations().insert(); MetricDto coverage = db.measures().insertMetric(c -> c.setKey(COVERAGE).setValueType(INT.name())); @@ -959,7 +959,7 @@ public class SearchProjectsActionTest { } @Test - public void sort_by_quality_gate_then_by_name() throws Exception { + public void sort_by_quality_gate_then_by_name() { userSession.logIn(); OrganizationDto organization = db.organizations().insert(); MetricDto qualityGateStatus = db.measures().insertMetric(c -> c.setKey(QUALITY_GATE_STATUS).setValueType(LEVEL.name())); @@ -975,7 +975,7 @@ public class SearchProjectsActionTest { } @Test - public void sort_by_last_analysis_date() throws Exception { + public void sort_by_last_analysis_date() { userSession.logIn(); OrganizationDto organization = db.organizations().insert(); ComponentDto project1 = db.components().insertPublicProject(organization, p -> p.setDbKey("project1")); diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/ShowActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ws/ShowActionTest.java index 810b33606cb..b7324a8974f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/ws/ShowActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/ws/ShowActionTest.java @@ -68,7 +68,7 @@ public class ShowActionTest { private WsActionTester ws = new WsActionTester(new ShowAction(userSession, db.getDbClient(), TestComponentFinder.from(db))); @Test - public void verify_definition() throws Exception { + public void verify_definition() { WebService.Action action = ws.getDef(); assertThat(action.since()).isEqualTo("5.4"); @@ -105,7 +105,7 @@ public class ShowActionTest { } @Test - public void json_example() throws IOException { + public void json_example() { userSession.logIn().setRoot(); insertJsonExampleComponentsAndSnapshots(); @@ -118,7 +118,7 @@ public class ShowActionTest { } @Test - public void tags_displayed_only_for_project() throws IOException { + public void tags_displayed_only_for_project() { userSession.logIn().setRoot(); insertJsonExampleComponentsAndSnapshots(); @@ -154,7 +154,7 @@ public class ShowActionTest { } @Test - public void show_with_ancestors_when_not_project() throws Exception { + public void show_with_ancestors_when_not_project() { ComponentDto project = db.components().insertPrivateProject(); ComponentDto module = db.components().insertComponent(newModuleDto(project)); ComponentDto directory = db.components().insertComponent(newDirectory(module, "dir")); @@ -168,7 +168,7 @@ public class ShowActionTest { } @Test - public void show_without_ancestors_when_project() throws Exception { + public void show_without_ancestors_when_project() { ComponentDto project = db.components().insertPrivateProject(); db.components().insertComponent(newModuleDto(project)); userSession.addProjectPermission(USER, project); @@ -180,7 +180,7 @@ public class ShowActionTest { } @Test - public void show_with_last_analysis_date() throws Exception { + public void show_with_last_analysis_date() { ComponentDto project = db.components().insertPrivateProject(); db.components().insertSnapshots( newAnalysis(project).setCreatedAt(1_000_000_000L).setLast(false), @@ -194,7 +194,7 @@ public class ShowActionTest { } @Test - public void show_with_leak_period_date() throws Exception { + public void show_with_leak_period_date() { ComponentDto project = db.components().insertPrivateProject(); db.components().insertSnapshots( newAnalysis(project).setPeriodDate(1_000_000_000L).setLast(false), @@ -209,7 +209,7 @@ public class ShowActionTest { } @Test - public void show_with_ancestors_and_analysis_date() throws Exception { + public void show_with_ancestors_and_analysis_date() { ComponentDto project = db.components().insertPrivateProject(); db.components().insertSnapshot(newAnalysis(project).setCreatedAt(3_000_000_000L).setLast(true)); ComponentDto module = db.components().insertComponent(newModuleDto(project)); @@ -225,7 +225,7 @@ public class ShowActionTest { } @Test - public void should_return_visibility_for_private_project() throws Exception { + public void should_return_visibility_for_private_project() { userSession.logIn().setRoot(); ComponentDto privateProject = db.components().insertPrivateProject(); @@ -235,7 +235,7 @@ public class ShowActionTest { } @Test - public void should_return_visibility_for_public_project() throws Exception { + public void should_return_visibility_for_public_project() { userSession.logIn().setRoot(); ComponentDto publicProject = db.components().insertPublicProject(); @@ -245,7 +245,7 @@ public class ShowActionTest { } @Test - public void should_return_visibility_for_view() throws Exception { + public void should_return_visibility_for_view() { userSession.logIn().setRoot(); ComponentDto view = db.components().insertView(); @@ -254,7 +254,7 @@ public class ShowActionTest { } @Test - public void should_not_return_visibility_for_module() throws Exception { + public void should_not_return_visibility_for_module() { userSession.logIn().setRoot(); ComponentDto privateProject = db.components().insertPrivateProject(); ComponentDto module = db.components().insertComponent(newModuleDto(privateProject)); @@ -264,7 +264,7 @@ public class ShowActionTest { } @Test - public void display_version() throws Exception { + public void display_version() { ComponentDto project = db.components().insertPrivateProject(); ComponentDto module = db.components().insertComponent(newModuleDto(project)); ComponentDto directory = db.components().insertComponent(newDirectory(module, "dir")); diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/SuggestionsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ws/SuggestionsActionTest.java index c777a9bf0d9..24b26f4ce15 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/ws/SuggestionsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/ws/SuggestionsActionTest.java @@ -157,7 +157,7 @@ public class SuggestionsActionTest { } @Test - public void suggestions_without_query_should_contain_recently_browsed() throws Exception { + public void suggestions_without_query_should_contain_recently_browsed() { ComponentDto project = db.components().insertComponent(newPrivateProjectDto(organization)); componentIndexer.indexOnStartup(null); @@ -182,7 +182,7 @@ public class SuggestionsActionTest { } @Test - public void suggestions_without_query_should_contain_recently_browsed_public_project() throws Exception { + public void suggestions_without_query_should_contain_recently_browsed_public_project() { ComponentDto project = db.components().insertComponent(newPublicProjectDto(organization)); componentIndexer.indexOnStartup(null); @@ -206,7 +206,7 @@ public class SuggestionsActionTest { } @Test - public void suggestions_without_query_should_not_contain_recently_browsed_without_permission() throws Exception { + public void suggestions_without_query_should_not_contain_recently_browsed_without_permission() { ComponentDto project = db.components().insertComponent(newPrivateProjectDto(organization)); componentIndexer.indexOnStartup(null); @@ -222,7 +222,7 @@ public class SuggestionsActionTest { } @Test - public void suggestions_without_query_should_contain_favorites() throws Exception { + public void suggestions_without_query_should_contain_favorites() { ComponentDto project = db.components().insertComponent(newPrivateProjectDto(organization)); doReturn(singletonList(project)).when(favoriteFinder).list(); @@ -247,7 +247,7 @@ public class SuggestionsActionTest { } @Test - public void suggestions_without_query_should_not_contain_favorites_without_permission() throws Exception { + public void suggestions_without_query_should_not_contain_favorites_without_permission() { ComponentDto project = db.components().insertComponent(newPrivateProjectDto(organization)); doReturn(singletonList(project)).when(favoriteFinder).list(); @@ -263,7 +263,7 @@ public class SuggestionsActionTest { } @Test - public void suggestions_without_query_should_contain_recently_browsed_favorites() throws Exception { + public void suggestions_without_query_should_contain_recently_browsed_favorites() { ComponentDto project = db.components().insertComponent(newPrivateProjectDto(organization)); doReturn(singletonList(project)).when(favoriteFinder).list(); @@ -289,7 +289,7 @@ public class SuggestionsActionTest { } @Test - public void suggestions_without_query_should_not_contain_matches_that_are_neither_favorites_nor_recently_browsed() throws Exception { + public void suggestions_without_query_should_not_contain_matches_that_are_neither_favorites_nor_recently_browsed() { ComponentDto project = db.components().insertComponent(newPrivateProjectDto(organization)); componentIndexer.indexOnStartup(null); @@ -307,7 +307,7 @@ public class SuggestionsActionTest { } @Test - public void suggestions_without_query_should_order_results() throws Exception { + public void suggestions_without_query_should_order_results() { ComponentDto project1 = db.components().insertComponent(newPrivateProjectDto(organization).setName("Alpha")); ComponentDto project2 = db.components().insertComponent(newPrivateProjectDto(organization).setName("Bravo")); ComponentDto project3 = db.components().insertComponent(newPrivateProjectDto(organization).setName("Charlie")); @@ -337,7 +337,7 @@ public class SuggestionsActionTest { } @Test - public void suggestions_without_query_should_return_empty_qualifiers() throws Exception { + public void suggestions_without_query_should_return_empty_qualifiers() { ComponentDto project = db.components().insertComponent(newPrivateProjectDto(organization)); componentIndexer.indexOnAnalysis(project.projectUuid()); userSessionRule.addProjectPermission(USER, project); @@ -370,7 +370,7 @@ public class SuggestionsActionTest { } @Test - public void exact_match_in_one_qualifier() throws Exception { + public void exact_match_in_one_qualifier() { ComponentDto project = db.components().insertComponent(newPrivateProjectDto(organization)); componentIndexer.indexOnStartup(null); @@ -395,7 +395,7 @@ public class SuggestionsActionTest { } @Test - public void must_not_search_if_no_valid_tokens_are_provided() throws Exception { + public void must_not_search_if_no_valid_tokens_are_provided() { ComponentDto project = db.components().insertComponent(newPrivateProjectDto(organization).setName("SonarQube")); componentIndexer.indexOnStartup(null); @@ -411,7 +411,7 @@ public class SuggestionsActionTest { } @Test - public void should_warn_about_short_inputs() throws Exception { + public void should_warn_about_short_inputs() { SuggestionsWsResponse response = ws.newRequest() .setMethod("POST") .setParam(PARAM_QUERY, "validLongToken x") @@ -421,7 +421,7 @@ public class SuggestionsActionTest { } @Test - public void should_warn_about_short_inputs_but_return_results_based_on_other_terms() throws Exception { + public void should_warn_about_short_inputs_but_return_results_based_on_other_terms() { ComponentDto project = db.components().insertComponent(newPrivateProjectDto(organization).setName("SonarQube")); componentIndexer.indexOnStartup(null); @@ -440,7 +440,7 @@ public class SuggestionsActionTest { } @Test - public void should_contain_component_names() throws Exception { + public void should_contain_component_names() { OrganizationDto organization1 = db.organizations().insert(o -> o.setKey("org-1").setName("Organization One")); ComponentDto project1 = db.components().insertComponent(newPrivateProjectDto(organization1).setName("Project1")); @@ -459,7 +459,7 @@ public class SuggestionsActionTest { } @Test - public void should_contain_organization_names() throws Exception { + public void should_contain_organization_names() { OrganizationDto organization1 = db.organizations().insert(o -> o.setKey("org-1").setName("Organization One")); OrganizationDto organization2 = db.organizations().insert(o -> o.setKey("org-2").setName("Organization Two")); @@ -484,7 +484,7 @@ public class SuggestionsActionTest { } @Test - public void should_contain_project_names() throws Exception { + public void should_contain_project_names() { ComponentDto project = db.components().insertComponent(newPrivateProjectDto(organization)); db.components().insertComponent(newModuleDto(project).setName("Module1")); db.components().insertComponent(newModuleDto(project).setName("Module2")); @@ -508,7 +508,7 @@ public class SuggestionsActionTest { } @Test - public void should_mark_recently_browsed_items() throws Exception { + public void should_mark_recently_browsed_items() { ComponentDto project = db.components().insertComponent(newPrivateProjectDto(organization)); ComponentDto module1 = newModuleDto(project).setName("Module1"); db.components().insertComponent(module1); @@ -530,7 +530,7 @@ public class SuggestionsActionTest { } @Test - public void should_mark_favorite_items() throws Exception { + public void should_mark_favorite_items() { ComponentDto project = db.components().insertComponent(newPrivateProjectDto(organization)); ComponentDto favorite = newModuleDto(project).setName("Module1"); db.components().insertComponent(favorite); @@ -553,7 +553,7 @@ public class SuggestionsActionTest { } @Test - public void should_return_empty_qualifiers() throws Exception { + public void should_return_empty_qualifiers() { ComponentDto project = db.components().insertComponent(newPrivateProjectDto(organization)); componentIndexer.indexOnAnalysis(project.projectUuid()); authorizationIndexerTester.allowOnlyAnyone(project); @@ -569,7 +569,7 @@ public class SuggestionsActionTest { } @Test - public void should_only_provide_project_for_certain_qualifiers() throws Exception { + public void should_only_provide_project_for_certain_qualifiers() { String query = randomAlphabetic(10); ComponentDto app = db.components().insertApplication(organization, v -> v.setName(query)); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/queue/ReportSubmitterTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/queue/ReportSubmitterTest.java index d0737a44e72..01b7372f0f1 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/queue/ReportSubmitterTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/queue/ReportSubmitterTest.java @@ -159,7 +159,7 @@ public class ReportSubmitterTest { } @Test - public void provision_project_if_does_not_exist() throws Exception { + public void provision_project_if_does_not_exist() { OrganizationDto organization = db.organizations().insert(); userSession .addPermission(OrganizationPermission.SCAN, organization.getUuid()) diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisImplTest.java index dc2bdc6cacb..ab8414fd728 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisImplTest.java @@ -35,7 +35,7 @@ public class AnalysisImplTest { private static final long CREATED_AT = 123456789L; @Test - public void build_snapshot() throws Exception { + public void build_snapshot() { Analysis analysis = new Analysis.Builder() .setId(ID) .setUuid(UUID) @@ -48,7 +48,7 @@ public class AnalysisImplTest { } @Test - public void fail_with_NPE_when_building_snapshot_without_id() throws Exception { + public void fail_with_NPE_when_building_snapshot_without_id() { thrown.expect(NullPointerException.class); thrown.expectMessage("id cannot be null"); @@ -59,7 +59,7 @@ public class AnalysisImplTest { } @Test - public void fail_with_NPE_when_building_snapshot_without_uuid() throws Exception { + public void fail_with_NPE_when_building_snapshot_without_uuid() { thrown.expect(NullPointerException.class); thrown.expectMessage("uuid cannot be null"); @@ -70,7 +70,7 @@ public class AnalysisImplTest { } @Test - public void fail_with_NPE_when_building_snapshot_without_created_at() throws Exception { + public void fail_with_NPE_when_building_snapshot_without_created_at() { thrown.expect(NullPointerException.class); thrown.expectMessage("createdAt cannot be null"); @@ -81,7 +81,7 @@ public class AnalysisImplTest { } @Test - public void test_toString() throws Exception { + public void test_toString() { assertThat(new Analysis.Builder() .setId(ID) .setUuid(UUID) @@ -91,7 +91,7 @@ public class AnalysisImplTest { } @Test - public void test_equals_and_hascode() throws Exception { + public void test_equals_and_hascode() { Analysis analysis = new Analysis.Builder() .setId(ID) .setUuid(UUID) diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolderImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolderImplTest.java index f458005bc70..cb603a7a98d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolderImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/analysis/AnalysisMetadataHolderImplTest.java @@ -98,7 +98,7 @@ public class AnalysisMetadataHolderImplTest { } @Test - public void getAnalysisDate_returns_date_with_same_time_as_the_one_set_with_setAnalysisDate() throws InterruptedException { + public void getAnalysisDate_returns_date_with_same_time_as_the_one_set_with_setAnalysisDate() { underTest.setAnalysisDate(SOME_DATE); @@ -137,7 +137,7 @@ public class AnalysisMetadataHolderImplTest { } @Test - public void isFirstAnalysis_return_true() throws Exception { + public void isFirstAnalysis_return_true() { AnalysisMetadataHolderImpl underTest = new AnalysisMetadataHolderImpl(); underTest.setBaseAnalysis(null); @@ -145,7 +145,7 @@ public class AnalysisMetadataHolderImplTest { } @Test - public void isFirstAnalysis_return_false() throws Exception { + public void isFirstAnalysis_return_false() { AnalysisMetadataHolderImpl underTest = new AnalysisMetadataHolderImpl(); underTest.setBaseAnalysis(baseProjectAnalysis); @@ -270,7 +270,7 @@ public class AnalysisMetadataHolderImplTest { } @Test - public void getRootComponentRef() throws InterruptedException { + public void getRootComponentRef() { AnalysisMetadataHolderImpl underTest = new AnalysisMetadataHolderImpl(); underTest.setRootComponentRef(10); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/ComponentImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/ComponentImplTest.java index 29cf329dbc3..c7e674c9a2f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/ComponentImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/ComponentImplTest.java @@ -32,7 +32,7 @@ public class ComponentImplTest { public ExpectedException thrown = ExpectedException.none(); @Test - public void create_project() throws Exception { + public void create_project() { ComponentImpl component = new ComponentImpl("Project", Component.Type.PROJECT, null); assertThat(component.getKey()).isEqualTo("Project"); @@ -40,7 +40,7 @@ public class ComponentImplTest { } @Test - public void create_source_file() throws Exception { + public void create_source_file() { ComponentImpl component = new ComponentImpl("File", Component.Type.FILE, new ComponentImpl.FileAttributesImpl("xoo", false)); assertThat(component.getType()).isEqualTo(Component.Type.FILE); @@ -49,7 +49,7 @@ public class ComponentImplTest { } @Test - public void create_test_file() throws Exception { + public void create_test_file() { ComponentImpl component = new ComponentImpl("File", Component.Type.FILE, new ComponentImpl.FileAttributesImpl(null, true)); assertThat(component.getType()).isEqualTo(Component.Type.FILE); @@ -58,7 +58,7 @@ public class ComponentImplTest { } @Test - public void fail_with_ISE_when_calling_get_file_attributes_on_not_file() throws Exception { + public void fail_with_ISE_when_calling_get_file_attributes_on_not_file() { thrown.expect(IllegalStateException.class); thrown.expectMessage("Only component of type FILE have a FileAttributes object"); @@ -67,7 +67,7 @@ public class ComponentImplTest { } @Test - public void fail_with_IAE_when_trying_to_create_a_file_without_file_attributes() throws Exception { + public void fail_with_IAE_when_trying_to_create_a_file_without_file_attributes() { thrown.expect(IllegalArgumentException.class); thrown.expectMessage("omponent of type FILE must have a FileAttributes object"); @@ -75,7 +75,7 @@ public class ComponentImplTest { } @Test - public void fail_with_IAE_when_trying_to_create_not_a_file_with_file_attributes() throws Exception { + public void fail_with_IAE_when_trying_to_create_not_a_file_with_file_attributes() { thrown.expect(IllegalArgumentException.class); thrown.expectMessage("Only component of type FILE have a FileAttributes object"); @@ -83,7 +83,7 @@ public class ComponentImplTest { } @Test - public void fail_with_NPE_when_creating_component_without_key() throws Exception { + public void fail_with_NPE_when_creating_component_without_key() { thrown.expect(NullPointerException.class); thrown.expectMessage("Key cannot be null"); @@ -91,7 +91,7 @@ public class ComponentImplTest { } @Test - public void fail_with_NPE_when_creating_component_without_type() throws Exception { + public void fail_with_NPE_when_creating_component_without_type() { thrown.expect(NullPointerException.class); thrown.expectMessage("Type cannot be null"); @@ -99,7 +99,7 @@ public class ComponentImplTest { } @Test - public void test_equals_and_hashcode() throws Exception { + public void test_equals_and_hashcode() { ComponentImpl component = new ComponentImpl("Project1", Component.Type.PROJECT, null); ComponentImpl sameComponent = new ComponentImpl("Project1", Component.Type.PROJECT, null); ComponentImpl anotherComponent = new ComponentImpl("Project2", Component.Type.PROJECT, null); @@ -115,7 +115,7 @@ public class ComponentImplTest { } @Test - public void test_to_string() throws Exception { + public void test_to_string() { assertThat(new ComponentImpl("File", Component.Type.FILE, new ComponentImpl.FileAttributesImpl("xoo", true)).toString()) .isEqualTo("ComponentImpl{key=File, type='FILE', fileAttributes=FileAttributesImpl{languageKey='xoo', unitTest=true}}"); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerContextImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerContextImplTest.java index 1d5f0309e42..d6f967d3f9e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerContextImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerContextImplTest.java @@ -98,13 +98,13 @@ public class MeasureComputerContextImplTest { ConfigurationRepository settingsRepository = mock(ConfigurationRepository.class); @Test - public void get_component() throws Exception { + public void get_component() { MeasureComputerContextImpl underTest = newContext(FILE_1_REF); assertThat(underTest.getComponent().getType()).isEqualTo(Component.Type.FILE); } @Test - public void get_string_settings() throws Exception { + public void get_string_settings() { MapSettings serverSettings = new MapSettings(); serverSettings.setProperty("prop", "value"); when(settingsRepository.getConfiguration()).thenReturn(serverSettings.asConfig()); @@ -115,7 +115,7 @@ public class MeasureComputerContextImplTest { } @Test - public void get_string_array_settings() throws Exception { + public void get_string_array_settings() { MapSettings serverSettings = new MapSettings(); serverSettings.setProperty("prop", "1,3.4,8,50"); when(settingsRepository.getConfiguration()).thenReturn(serverSettings.asConfig()); @@ -126,7 +126,7 @@ public class MeasureComputerContextImplTest { } @Test - public void get_measure() throws Exception { + public void get_measure() { measureRepository.addRawMeasure(FILE_1_REF, NCLOC_KEY, newMeasureBuilder().create(10)); MeasureComputerContextImpl underTest = newContext(FILE_1_REF, NCLOC_KEY, COMMENT_LINES_KEY); @@ -134,7 +134,7 @@ public class MeasureComputerContextImplTest { } @Test - public void fail_with_IAE_when_get_measure_is_called_on_metric_not_in_input_list() throws Exception { + public void fail_with_IAE_when_get_measure_is_called_on_metric_not_in_input_list() { thrown.expect(IllegalArgumentException.class); thrown.expectMessage("Only metrics in [another metric] can be used to load measures"); @@ -143,7 +143,7 @@ public class MeasureComputerContextImplTest { } @Test - public void get_children_measures() throws Exception { + public void get_children_measures() { measureRepository.addRawMeasure(FILE_1_REF, NCLOC_KEY, newMeasureBuilder().create(10)); measureRepository.addRawMeasure(FILE_2_REF, NCLOC_KEY, newMeasureBuilder().create(12)); @@ -153,7 +153,7 @@ public class MeasureComputerContextImplTest { } @Test - public void get_children_measures_when_one_child_has_no_value() throws Exception { + public void get_children_measures_when_one_child_has_no_value() { measureRepository.addRawMeasure(FILE_1_REF, NCLOC_KEY, newMeasureBuilder().create(10)); // No data on file 2 @@ -162,7 +162,7 @@ public class MeasureComputerContextImplTest { } @Test - public void not_fail_to_get_children_measures_on_output_metric() throws Exception { + public void not_fail_to_get_children_measures_on_output_metric() { measureRepository.addRawMeasure(FILE_1_REF, INT_METRIC_KEY, newMeasureBuilder().create(10)); MeasureComputerContextImpl underTest = newContext(PROJECT_REF, NCLOC_KEY, INT_METRIC_KEY); @@ -171,7 +171,7 @@ public class MeasureComputerContextImplTest { } @Test - public void fail_with_IAE_when_get_children_measures_is_called_on_metric_not_in_input_list() throws Exception { + public void fail_with_IAE_when_get_children_measures_is_called_on_metric_not_in_input_list() { thrown.expect(IllegalArgumentException.class); thrown.expectMessage("Only metrics in [another metric] can be used to load measures"); @@ -180,7 +180,7 @@ public class MeasureComputerContextImplTest { } @Test - public void add_int_measure_create_measure_of_type_int_with_right_value() throws Exception { + public void add_int_measure_create_measure_of_type_int_with_right_value() { MeasureComputerContextImpl underTest = newContext(PROJECT_REF, NCLOC_KEY, INT_METRIC_KEY); underTest.addMeasure(INT_METRIC_KEY, 10); @@ -190,7 +190,7 @@ public class MeasureComputerContextImplTest { } @Test - public void add_double_measure_create_measure_of_type_double_with_right_value() throws Exception { + public void add_double_measure_create_measure_of_type_double_with_right_value() { MeasureComputerContextImpl underTest = newContext(PROJECT_REF, NCLOC_KEY, DOUBLE_METRIC_KEY); underTest.addMeasure(DOUBLE_METRIC_KEY, 10d); @@ -200,7 +200,7 @@ public class MeasureComputerContextImplTest { } @Test - public void add_long_measure_create_measure_of_type_long_with_right_value() throws Exception { + public void add_long_measure_create_measure_of_type_long_with_right_value() { MeasureComputerContextImpl underTest = newContext(PROJECT_REF, NCLOC_KEY, LONG_METRIC_KEY); underTest.addMeasure(LONG_METRIC_KEY, 10L); @@ -210,7 +210,7 @@ public class MeasureComputerContextImplTest { } @Test - public void add_string_measure_create_measure_of_type_string_with_right_value() throws Exception { + public void add_string_measure_create_measure_of_type_string_with_right_value() { MeasureComputerContextImpl underTest = newContext(PROJECT_REF, NCLOC_KEY, STRING_METRIC_KEY); underTest.addMeasure(STRING_METRIC_KEY, "data"); @@ -220,7 +220,7 @@ public class MeasureComputerContextImplTest { } @Test - public void add_boolean_measure_create_measure_of_type_boolean_with_right_value() throws Exception { + public void add_boolean_measure_create_measure_of_type_boolean_with_right_value() { MeasureComputerContextImpl underTest = newContext(PROJECT_REF, NCLOC_KEY, BOOLEAN_METRIC_KEY); underTest.addMeasure(BOOLEAN_METRIC_KEY, true); @@ -230,7 +230,7 @@ public class MeasureComputerContextImplTest { } @Test - public void fail_with_IAE_when_add_measure_is_called_on_metric_not_in_output_list() throws Exception { + public void fail_with_IAE_when_add_measure_is_called_on_metric_not_in_output_list() { thrown.expect(IllegalArgumentException.class); thrown.expectMessage("Only metrics in [int_metric_key] can be used to add measures. Metric 'double_metric_key' is not allowed."); @@ -239,7 +239,7 @@ public class MeasureComputerContextImplTest { } @Test - public void fail_with_unsupported_operation_when_adding_measure_that_already_exists() throws Exception { + public void fail_with_unsupported_operation_when_adding_measure_that_already_exists() { thrown.expect(UnsupportedOperationException.class); thrown.expectMessage("A measure on metric 'int_metric_key' already exists on component 'fileKey'"); @@ -250,7 +250,7 @@ public class MeasureComputerContextImplTest { } @Test - public void get_issues() throws Exception { + public void get_issues() { DefaultIssue issue = new DefaultIssue() .setKey("KEY") .setRuleKey(RuleKey.of("xoo", "S01")) @@ -272,7 +272,7 @@ public class MeasureComputerContextImplTest { } private MeasureComputerContextImpl newContext(int componentRef) { - return newContext(componentRef, NCLOC_KEY, COMMENT_LINES_KEY, Collections.emptyList()); + return newContext(componentRef, NCLOC_KEY, COMMENT_LINES_KEY, Collections.emptyList()); } private MeasureComputerContextImpl newContext(int componentRef, List issues) { @@ -280,14 +280,14 @@ public class MeasureComputerContextImplTest { } private MeasureComputerContextImpl newContext(int componentRef, String inputMetric, String outputMetric) { - return newContext(componentRef, inputMetric, outputMetric, Collections.emptyList()); + return newContext(componentRef, inputMetric, outputMetric, Collections.emptyList()); } private MeasureComputerContextImpl newContext(int componentRef, String inputMetric, String outputMetric, List issues) { componentIssuesRepository.setIssues(componentRef, issues); MeasureComputer.MeasureComputerDefinition definition = new MeasureComputerDefinitionImpl.BuilderImpl() - .setInputMetrics(new String[] {inputMetric}) + .setInputMetrics(inputMetric) .setOutputMetrics(new String[] {outputMetric}) .build(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerDefinitionImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerDefinitionImplTest.java index 189ecd21add..f739874dd26 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerDefinitionImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureComputerDefinitionImplTest.java @@ -32,7 +32,7 @@ public class MeasureComputerDefinitionImplTest { public ExpectedException thrown = ExpectedException.none(); @Test - public void build_measure_computer_definition() throws Exception { + public void build_measure_computer_definition() { String inputMetric = "ncloc"; String outputMetric = "comment_density"; MeasureComputer.MeasureComputerDefinition measureComputer = new MeasureComputerDefinitionImpl.BuilderImpl() @@ -45,7 +45,7 @@ public class MeasureComputerDefinitionImplTest { } @Test - public void build_measure_computer_with_multiple_metrics() throws Exception { + public void build_measure_computer_with_multiple_metrics() { String[] inputMetrics = {"ncloc", "comment"}; String[] outputMetrics = {"comment_density_1", "comment_density_2"}; MeasureComputer.MeasureComputerDefinition measureComputer = new MeasureComputerDefinitionImpl.BuilderImpl() @@ -58,7 +58,7 @@ public class MeasureComputerDefinitionImplTest { } @Test - public void input_metrics_can_be_empty() throws Exception { + public void input_metrics_can_be_empty() { MeasureComputer.MeasureComputerDefinition measureComputer = new MeasureComputerDefinitionImpl.BuilderImpl() .setInputMetrics() .setOutputMetrics("comment_density_1", "comment_density_2") @@ -68,7 +68,7 @@ public class MeasureComputerDefinitionImplTest { } @Test - public void input_metrics_is_empty_when_not_set() throws Exception { + public void input_metrics_is_empty_when_not_set() { MeasureComputer.MeasureComputerDefinition measureComputer = new MeasureComputerDefinitionImpl.BuilderImpl() .setOutputMetrics("comment_density_1", "comment_density_2") .build(); @@ -77,7 +77,7 @@ public class MeasureComputerDefinitionImplTest { } @Test - public void fail_with_NPE_when_null_input_metrics() throws Exception { + public void fail_with_NPE_when_null_input_metrics() { thrown.expect(NullPointerException.class); thrown.expectMessage("Input metrics cannot be null"); @@ -87,7 +87,7 @@ public class MeasureComputerDefinitionImplTest { } @Test - public void fail_with_NPE_when_one_input_metric_is_null() throws Exception { + public void fail_with_NPE_when_one_input_metric_is_null() { thrown.expect(NullPointerException.class); thrown.expectMessage("Null metric is not allowed"); @@ -97,7 +97,7 @@ public class MeasureComputerDefinitionImplTest { } @Test - public void fail_with_NPE_when_no_output_metrics() throws Exception { + public void fail_with_NPE_when_no_output_metrics() { thrown.expect(NullPointerException.class); thrown.expectMessage("Output metrics cannot be null"); @@ -107,7 +107,7 @@ public class MeasureComputerDefinitionImplTest { } @Test - public void fail_with_NPE_when_null_output_metrics() throws Exception { + public void fail_with_NPE_when_null_output_metrics() { thrown.expect(NullPointerException.class); thrown.expectMessage("Output metrics cannot be null"); @@ -117,7 +117,7 @@ public class MeasureComputerDefinitionImplTest { } @Test - public void fail_with_NPE_when_one_output_metric_is_null() throws Exception { + public void fail_with_NPE_when_one_output_metric_is_null() { thrown.expect(NullPointerException.class); thrown.expectMessage("Null metric is not allowed"); @@ -127,7 +127,7 @@ public class MeasureComputerDefinitionImplTest { } @Test - public void fail_with_IAE_with_empty_output_metrics() throws Exception { + public void fail_with_IAE_with_empty_output_metrics() { thrown.expect(IllegalArgumentException.class); thrown.expectMessage("At least one output metric must be defined"); @@ -137,7 +137,7 @@ public class MeasureComputerDefinitionImplTest { } @Test - public void test_equals_and_hashcode() throws Exception { + public void test_equals_and_hashcode() { MeasureComputer.MeasureComputerDefinition computer = new MeasureComputerDefinitionImpl.BuilderImpl() .setInputMetrics("ncloc", "comment") .setOutputMetrics("comment_density_1", "comment_density_2") @@ -164,7 +164,7 @@ public class MeasureComputerDefinitionImplTest { } @Test - public void test_to_string() throws Exception { + public void test_to_string() { assertThat(new MeasureComputerDefinitionImpl.BuilderImpl() .setInputMetrics("ncloc", "comment") .setOutputMetrics("comment_density_1", "comment_density_2") diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureImplTest.java index be8fba7c591..3e52a313c54 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/measurecomputer/MeasureImplTest.java @@ -32,13 +32,13 @@ public class MeasureImplTest { public ExpectedException thrown = ExpectedException.none(); @Test - public void get_int_value() throws Exception { + public void get_int_value() { MeasureImpl measure = new MeasureImpl(Measure.newMeasureBuilder().create(1)); assertThat(measure.getIntValue()).isEqualTo(1); } @Test - public void fail_with_ISE_when_not_int_value() throws Exception { + public void fail_with_ISE_when_not_int_value() { thrown.expect(IllegalStateException.class); thrown.expectMessage("Value can not be converted to int because current value type is a DOUBLE"); @@ -47,13 +47,13 @@ public class MeasureImplTest { } @Test - public void get_double_value() throws Exception { + public void get_double_value() { MeasureImpl measure = new MeasureImpl(Measure.newMeasureBuilder().create(1d, 1)); assertThat(measure.getDoubleValue()).isEqualTo(1d); } @Test - public void fail_with_ISE_when_not_double_value() throws Exception { + public void fail_with_ISE_when_not_double_value() { thrown.expect(IllegalStateException.class); thrown.expectMessage("Value can not be converted to double because current value type is a INT"); @@ -62,13 +62,13 @@ public class MeasureImplTest { } @Test - public void get_long_value() throws Exception { + public void get_long_value() { MeasureImpl measure = new MeasureImpl(Measure.newMeasureBuilder().create(1L)); assertThat(measure.getLongValue()).isEqualTo(1L); } @Test - public void fail_with_ISE_when_not_long_value() throws Exception { + public void fail_with_ISE_when_not_long_value() { thrown.expect(IllegalStateException.class); thrown.expectMessage("Value can not be converted to long because current value type is a STRING"); @@ -77,13 +77,13 @@ public class MeasureImplTest { } @Test - public void get_string_value() throws Exception { + public void get_string_value() { MeasureImpl measure = new MeasureImpl(Measure.newMeasureBuilder().create("value")); assertThat(measure.getStringValue()).isEqualTo("value"); } @Test - public void fail_with_ISE_when_not_string_value() throws Exception { + public void fail_with_ISE_when_not_string_value() { thrown.expect(IllegalStateException.class); thrown.expectMessage("Value can not be converted to string because current value type is a LONG"); @@ -92,13 +92,13 @@ public class MeasureImplTest { } @Test - public void get_boolean_value() throws Exception { + public void get_boolean_value() { MeasureImpl measure = new MeasureImpl(Measure.newMeasureBuilder().create(true)); assertThat(measure.getBooleanValue()).isTrue(); } @Test - public void fail_with_ISE_when_not_boolean_value() throws Exception { + public void fail_with_ISE_when_not_boolean_value() { thrown.expect(IllegalStateException.class); thrown.expectMessage("Value can not be converted to boolean because current value type is a DOUBLE"); @@ -107,7 +107,7 @@ public class MeasureImplTest { } @Test - public void fail_with_ISE_when_creating_measure_with_no_value() throws Exception { + public void fail_with_ISE_when_creating_measure_with_no_value() { thrown.expect(IllegalStateException.class); thrown.expectMessage("Only following types are allowed [BOOLEAN, INT, LONG, DOUBLE, STRING]"); @@ -115,7 +115,7 @@ public class MeasureImplTest { } @Test - public void fail_with_ISE_when_creating_measure_with_not_allowed_value() throws Exception { + public void fail_with_ISE_when_creating_measure_with_not_allowed_value() { thrown.expect(IllegalStateException.class); thrown.expectMessage("Only following types are allowed [BOOLEAN, INT, LONG, DOUBLE, STRING]"); @@ -123,7 +123,7 @@ public class MeasureImplTest { } @Test - public void fail_with_NPE_when_creating_measure_with_null_measure() throws Exception { + public void fail_with_NPE_when_creating_measure_with_null_measure() { thrown.expect(NullPointerException.class); thrown.expectMessage("Measure couldn't be null"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/QualityGateImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/QualityGateImplTest.java index 2593a59fec7..348b00dd558 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/QualityGateImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/api/posttask/QualityGateImplTest.java @@ -47,7 +47,7 @@ public class QualityGateImplTest { expectedException.expect(NullPointerException.class); expectedException.expectMessage("id can not be null"); - new QualityGateImpl(null, SOME_NAME, SOME_STATUS, Collections.emptyList()); + new QualityGateImpl(null, SOME_NAME, SOME_STATUS, Collections.emptyList()); } @Test @@ -55,7 +55,7 @@ public class QualityGateImplTest { expectedException.expect(NullPointerException.class); expectedException.expectMessage("name can not be null"); - new QualityGateImpl(SOME_ID, null, SOME_STATUS, Collections.emptyList()); + new QualityGateImpl(SOME_ID, null, SOME_STATUS, Collections.emptyList()); } @Test @@ -63,7 +63,7 @@ public class QualityGateImplTest { expectedException.expect(NullPointerException.class); expectedException.expectMessage("status can not be null"); - new QualityGateImpl(SOME_ID, SOME_NAME, null, Collections.emptyList()); + new QualityGateImpl(SOME_ID, SOME_NAME, null, Collections.emptyList()); } @Test diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReaderRule.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReaderRule.java index 38d500b6693..caaf43ada0e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReaderRule.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/batch/BatchReportReaderRule.java @@ -204,7 +204,7 @@ public class BatchReportReaderRule implements TestRule, BatchReportReader { } private static CloseableIterator closeableIterator(@Nullable List list) { - return list == null ? CloseableIterator.emptyCloseableIterator() : CloseableIterator.from(list.iterator()); + return list == null ? CloseableIterator.emptyCloseableIterator() : CloseableIterator.from(list.iterator()); } public BatchReportReaderRule putSymbols(int componentRef, List symbols) { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentImplTest.java index 85a066998d3..1754a9e261a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentImplTest.java @@ -40,7 +40,7 @@ public class ComponentImplTest { public ExpectedException thrown = ExpectedException.none(); @Test - public void verify_key_uuid_and_name() throws Exception { + public void verify_key_uuid_and_name() { ComponentImpl component = buildSimpleComponent(FILE, KEY).setUuid(UUID).setName("name").build(); assertThat(component.getKey()).isEqualTo(KEY); @@ -170,7 +170,7 @@ public class ComponentImplTest { } @Test - public void build_with_child() throws Exception { + public void build_with_child() { ComponentImpl child = builder(FILE) .setName("CHILD_NAME") .setKey("CHILD_KEY") diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentTreeBuilderTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentTreeBuilderTest.java index 1b9dd3100c4..8bee0cda795 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentTreeBuilderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ComponentTreeBuilderTest.java @@ -824,7 +824,7 @@ public class ComponentTreeBuilderTest { private final Map components = new HashMap<>(); @Override - protected void before() throws Throwable { + protected void before() { components.clear(); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/FileAttributesTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/FileAttributesTest.java index ab819f133dc..211a7b856ac 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/FileAttributesTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/FileAttributesTest.java @@ -31,7 +31,7 @@ public class FileAttributesTest { public ExpectedException expectedException = ExpectedException.none(); @Test - public void create_production_file() throws Exception { + public void create_production_file() { FileAttributes underTest = new FileAttributes(true, "java", 10); assertThat(underTest.isUnitTest()).isTrue(); @@ -40,7 +40,7 @@ public class FileAttributesTest { } @Test - public void create_unit_test() throws Exception { + public void create_unit_test() { FileAttributes underTest = new FileAttributes(true, "java", 10); assertThat(underTest.isUnitTest()).isTrue(); @@ -49,7 +49,7 @@ public class FileAttributesTest { } @Test - public void create_without_language() throws Exception { + public void create_without_language() { FileAttributes underTest = new FileAttributes(true, null, 10); assertThat(underTest.isUnitTest()).isTrue(); @@ -58,21 +58,21 @@ public class FileAttributesTest { } @Test - public void fail_with_IAE_when_lines_is_0() throws Exception { + public void fail_with_IAE_when_lines_is_0() { expectedException.expect(IllegalArgumentException.class); expectedException.expectMessage("Number of lines must be greater than zero"); new FileAttributes(true, "java", 0); } @Test - public void fail_with_IAE_when_lines_is_less_than_0() throws Exception { + public void fail_with_IAE_when_lines_is_less_than_0() { expectedException.expect(IllegalArgumentException.class); expectedException.expectMessage("Number of lines must be greater than zero"); new FileAttributes(true, "java", -10); } @Test - public void test_toString() throws Exception { + public void test_toString() { assertThat(new FileAttributes(true, "java", 10).toString()).isEqualTo("FileAttributes{languageKey='java', unitTest=true, lines=10}"); assertThat(new FileAttributes(false, null, 1).toString()).isEqualTo("FileAttributes{languageKey='null', unitTest=false, lines=1}"); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/MutableDbIdsRepositoryRule.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/MutableDbIdsRepositoryRule.java index af4397b0434..3b9c6cfa44c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/MutableDbIdsRepositoryRule.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/MutableDbIdsRepositoryRule.java @@ -58,7 +58,7 @@ public class MutableDbIdsRepositoryRule extends ExternalResource implements Muta } @Override - protected void before() throws Throwable { + protected void before() { this.delegate = newDelegate(); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerTest.java index 7a02a796f80..e08355c1d68 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ReportVisitorsCrawlerTest.java @@ -53,7 +53,7 @@ public class ReportVisitorsCrawlerTest { private final TestPathAwareVisitor spyPathAwareVisitor = spy(new TestPathAwareVisitor(CrawlerDepthLimit.FILE, POST_ORDER)); @Test - public void execute_each_visitor_on_each_level() throws Exception { + public void execute_each_visitor_on_each_level() { InOrder inOrder = inOrder(spyPostOrderTypeAwareVisitor, spyPathAwareVisitor); VisitorsCrawler underTest = new VisitorsCrawler(Arrays.asList(spyPostOrderTypeAwareVisitor, spyPathAwareVisitor)); underTest.visit(COMPONENT_TREE); @@ -85,7 +85,7 @@ public class ReportVisitorsCrawlerTest { } @Test - public void execute_pre_visitor_before_post_visitor() throws Exception { + public void execute_pre_visitor_before_post_visitor() { InOrder inOrder = inOrder(spyPreOrderTypeAwareVisitor, spyPostOrderTypeAwareVisitor); VisitorsCrawler underTest = new VisitorsCrawler(Arrays.asList(spyPreOrderTypeAwareVisitor, spyPostOrderTypeAwareVisitor)); underTest.visit(COMPONENT_TREE); @@ -120,7 +120,7 @@ public class ReportVisitorsCrawlerTest { } @Test - public void fail_with_IAE_when_visitor_is_not_path_aware_or_type_aware() throws Exception { + public void fail_with_IAE_when_visitor_is_not_path_aware_or_type_aware() { thrown.expect(IllegalArgumentException.class); thrown.expectMessage("Only TypeAwareVisitor and PathAwareVisitor can be used"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerTest.java index 3480c5799c5..e4150dd3e3a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/ViewsVisitorsCrawlerTest.java @@ -52,7 +52,7 @@ public class ViewsVisitorsCrawlerTest { private final TestPathAwareVisitor spyPathAwareVisitor = spy(new TestPathAwareVisitor(CrawlerDepthLimit.PROJECT_VIEW, POST_ORDER)); @Test - public void execute_each_visitor_on_each_level() throws Exception { + public void execute_each_visitor_on_each_level() { InOrder inOrder = inOrder(spyPostOrderTypeAwareVisitor, spyPathAwareVisitor); VisitorsCrawler underTest = new VisitorsCrawler(Arrays.asList(spyPostOrderTypeAwareVisitor, spyPathAwareVisitor), false); underTest.visit(COMPONENT_TREE); @@ -84,9 +84,9 @@ public class ViewsVisitorsCrawlerTest { } @Test - public void execute_pre_visitor_before_post_visitor() throws Exception { + public void execute_pre_visitor_before_post_visitor() { InOrder inOrder = inOrder(spyPreOrderTypeAwareVisitor, spyPostOrderTypeAwareVisitor); - VisitorsCrawler underTest = new VisitorsCrawler(Arrays.asList(spyPreOrderTypeAwareVisitor, spyPostOrderTypeAwareVisitor), false); + VisitorsCrawler underTest = new VisitorsCrawler(Arrays.asList(spyPreOrderTypeAwareVisitor, spyPostOrderTypeAwareVisitor), false); underTest.visit(COMPONENT_TREE); inOrder.verify(spyPreOrderTypeAwareVisitor).visitView(COMPONENT_TREE); @@ -103,7 +103,7 @@ public class ViewsVisitorsCrawlerTest { } @Test - public void fail_with_IAE_when_visitor_is_not_path_aware_or_type_aware() throws Exception { + public void fail_with_IAE_when_visitor_is_not_path_aware_or_type_aware() { thrown.expect(IllegalArgumentException.class); thrown.expectMessage("Only TypeAwareVisitor and PathAwareVisitor can be used"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolderImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolderImplTest.java index e54f596b801..d75151cb8ad 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolderImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/CrossProjectDuplicationStatusHolderImplTest.java @@ -43,7 +43,7 @@ public class CrossProjectDuplicationStatusHolderImplTest { private CrossProjectDuplicationStatusHolderImpl underTest = new CrossProjectDuplicationStatusHolderImpl(analysisMetadataHolder); @Test - public void cross_project_duplication_is_enabled_when_enabled_in_report_and_no_branch() throws Exception { + public void cross_project_duplication_is_enabled_when_enabled_in_report_and_no_branch() { analysisMetadataHolder .setCrossProjectDuplicationEnabled(true) .setBranch(newBranch(true)); @@ -54,7 +54,7 @@ public class CrossProjectDuplicationStatusHolderImplTest { } @Test - public void cross_project_duplication_is_disabled_when_not_enabled_in_report() throws Exception { + public void cross_project_duplication_is_disabled_when_not_enabled_in_report() { analysisMetadataHolder .setCrossProjectDuplicationEnabled(false) .setBranch(newBranch(true)); @@ -65,7 +65,7 @@ public class CrossProjectDuplicationStatusHolderImplTest { } @Test - public void cross_project_duplication_is_disabled_when_branch_is_used() throws Exception { + public void cross_project_duplication_is_disabled_when_branch_is_used() { analysisMetadataHolder .setCrossProjectDuplicationEnabled(true) .setBranch(newBranch(false)); @@ -76,7 +76,7 @@ public class CrossProjectDuplicationStatusHolderImplTest { } @Test - public void cross_project_duplication_is_disabled_when_not_enabled_in_report_and_when_branch_is_used() throws Exception { + public void cross_project_duplication_is_disabled_when_not_enabled_in_report_and_when_branch_is_used() { analysisMetadataHolder .setCrossProjectDuplicationEnabled(false) .setBranch(newBranch(false)); @@ -87,7 +87,7 @@ public class CrossProjectDuplicationStatusHolderImplTest { } @Test - public void flag_is_build_in_start() throws Exception { + public void flag_is_build_in_start() { analysisMetadataHolder .setCrossProjectDuplicationEnabled(true) .setBranch(newBranch(true)); @@ -100,7 +100,7 @@ public class CrossProjectDuplicationStatusHolderImplTest { } @Test - public void isEnabled_throws_ISE_when_start_have_not_been_called_before() throws Exception { + public void isEnabled_throws_ISE_when_start_have_not_been_called_before() { thrown.expect(IllegalStateException.class); thrown.expectMessage("Flag hasn't been initialized, the start() should have been called before"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepositoryImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepositoryImplTest.java index 62f2884037c..7ef4d529984 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepositoryImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepositoryImplTest.java @@ -132,7 +132,7 @@ public class DuplicationRepositoryImplTest { } private static Duplication createDuplication(int originalLine, int duplicateLine) { - return new Duplication(new TextBlock(originalLine, originalLine), Arrays.asList(new InnerDuplicate(new TextBlock(duplicateLine, duplicateLine)))); + return new Duplication(new TextBlock(originalLine, originalLine), Arrays.asList(new InnerDuplicate(new TextBlock(duplicateLine, duplicateLine)))); } @DataProvider diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepositoryRule.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepositoryRule.java index 13ff0069230..60ea23f0d81 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepositoryRule.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationRepositoryRule.java @@ -61,7 +61,7 @@ public class DuplicationRepositoryRule extends ExternalResource implements Dupli } @Override - protected void before() throws Throwable { + protected void before() { this.delegate = new DuplicationRepositoryImpl(); } @@ -115,7 +115,7 @@ public class DuplicationRepositoryRule extends ExternalResource implements Dupli delegate.add(component, new Duplication( original, - Arrays.asList(new InProjectDuplicate(componentProvider.getByRef(otherFileRef), duplicate)) + Arrays.asList(new InProjectDuplicate(componentProvider.getByRef(otherFileRef), duplicate)) ) ); @@ -131,7 +131,7 @@ public class DuplicationRepositoryRule extends ExternalResource implements Dupli delegate.add(componentProvider.getByRef(fileRef), new Duplication( original, - Arrays.asList(new CrossProjectDuplicate(otherFileKey, duplicate)) + Arrays.asList(new CrossProjectDuplicate(otherFileKey, duplicate)) ) ); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationTest.java index 65acc43d2ec..a42e1162187 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/DuplicationTest.java @@ -51,7 +51,7 @@ public class DuplicationTest { expectedException.expect(NullPointerException.class); expectedException.expectMessage("original TextBlock can not be null"); - new Duplication(null, Collections.emptySet()); + new Duplication(null, Collections.emptySet()); } @Test @@ -67,7 +67,7 @@ public class DuplicationTest { expectedException.expect(IllegalArgumentException.class); expectedException.expectMessage("duplicates can not be empty"); - new Duplication(SOME_ORIGINAL_TEXTBLOCK, Collections.emptySet()); + new Duplication(SOME_ORIGINAL_TEXTBLOCK, Collections.emptySet()); } @Test @@ -91,7 +91,7 @@ public class DuplicationTest { expectedException.expect(IllegalArgumentException.class); expectedException.expectMessage("Unsupported type of Duplicate " + MyDuplicate.class.getName()); - new Duplication(SOME_ORIGINAL_TEXTBLOCK, ImmutableSet.of(new MyDuplicate(), new MyDuplicate())); + new Duplication(SOME_ORIGINAL_TEXTBLOCK, ImmutableSet.of(new MyDuplicate(), new MyDuplicate())); } private static final class MyDuplicate implements Duplicate { @@ -152,28 +152,28 @@ public class DuplicationTest { @Test public void equals_compares_on_original_and_duplicates() { - Duplication duplication = new Duplication(SOME_ORIGINAL_TEXTBLOCK, Arrays.asList(new InnerDuplicate(TEXT_BLOCK_1))); + Duplication duplication = new Duplication(SOME_ORIGINAL_TEXTBLOCK, Arrays.asList(new InnerDuplicate(TEXT_BLOCK_1))); assertThat(duplication).isEqualTo(duplication); - assertThat(duplication).isEqualTo(new Duplication(SOME_ORIGINAL_TEXTBLOCK, Arrays.asList(new InnerDuplicate(TEXT_BLOCK_1)))); - assertThat(duplication).isNotEqualTo(new Duplication(SOME_ORIGINAL_TEXTBLOCK, Arrays.asList(new InnerDuplicate(TEXT_BLOCK_2)))); - assertThat(duplication).isNotEqualTo(new Duplication(TEXT_BLOCK_1, Arrays.asList(new InnerDuplicate(SOME_ORIGINAL_TEXTBLOCK)))); + assertThat(duplication).isEqualTo(new Duplication(SOME_ORIGINAL_TEXTBLOCK, Arrays.asList(new InnerDuplicate(TEXT_BLOCK_1)))); + assertThat(duplication).isNotEqualTo(new Duplication(SOME_ORIGINAL_TEXTBLOCK, Arrays.asList(new InnerDuplicate(TEXT_BLOCK_2)))); + assertThat(duplication).isNotEqualTo(new Duplication(TEXT_BLOCK_1, Arrays.asList(new InnerDuplicate(SOME_ORIGINAL_TEXTBLOCK)))); } @Test public void hashcode_is_based_on_original_only() { - Duplication duplication = new Duplication(SOME_ORIGINAL_TEXTBLOCK, Arrays.asList(new InnerDuplicate(TEXT_BLOCK_1))); + Duplication duplication = new Duplication(SOME_ORIGINAL_TEXTBLOCK, Arrays.asList(new InnerDuplicate(TEXT_BLOCK_1))); - assertThat(duplication.hashCode()).isEqualTo(new Duplication(SOME_ORIGINAL_TEXTBLOCK, Arrays.asList(new InnerDuplicate(TEXT_BLOCK_1))).hashCode()); - assertThat(duplication.hashCode()).isNotEqualTo(new Duplication(SOME_ORIGINAL_TEXTBLOCK, Arrays.asList(new InnerDuplicate(TEXT_BLOCK_2))).hashCode()); - assertThat(duplication.hashCode()).isNotEqualTo(new Duplication(TEXT_BLOCK_1, Arrays.asList(new InnerDuplicate(SOME_ORIGINAL_TEXTBLOCK))).hashCode()); + assertThat(duplication.hashCode()).isEqualTo(new Duplication(SOME_ORIGINAL_TEXTBLOCK, Arrays.asList(new InnerDuplicate(TEXT_BLOCK_1))).hashCode()); + assertThat(duplication.hashCode()).isNotEqualTo(new Duplication(SOME_ORIGINAL_TEXTBLOCK, Arrays.asList(new InnerDuplicate(TEXT_BLOCK_2))).hashCode()); + assertThat(duplication.hashCode()).isNotEqualTo(new Duplication(TEXT_BLOCK_1, Arrays.asList(new InnerDuplicate(SOME_ORIGINAL_TEXTBLOCK))).hashCode()); } @Test public void verify_toString() { Duplication duplication = new Duplication( SOME_ORIGINAL_TEXTBLOCK, - Arrays.asList(new InnerDuplicate(TEXT_BLOCK_1))); + Arrays.asList(new InnerDuplicate(TEXT_BLOCK_1))); assertThat(duplication.toString()) .isEqualTo("Duplication{original=TextBlock{start=1, end=2}, duplicates=[InnerDuplicate{textBlock=TextBlock{start=2, end=2}}]}"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/IntegrateCrossProjectDuplicationsTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/IntegrateCrossProjectDuplicationsTest.java index 04233dfe81a..f0e4dd58f95 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/IntegrateCrossProjectDuplicationsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/IntegrateCrossProjectDuplicationsTest.java @@ -206,7 +206,7 @@ public class IntegrateCrossProjectDuplicationsTest { .setUnit(0, 10) .build()); - underTest.computeCpd(ORIGIN_FILE, originBlocks, Collections.emptyList()); + underTest.computeCpd(ORIGIN_FILE, originBlocks, Collections.emptyList()); assertNoDuplicationAdded(ORIGIN_FILE); } @@ -272,7 +272,7 @@ public class IntegrateCrossProjectDuplicationsTest { } @Test - public void do_not_compute_more_than_one_hundred_duplications_when_too_many_duplicated_references() throws Exception { + public void do_not_compute_more_than_one_hundred_duplications_when_too_many_duplicated_references() { Collection originBlocks = new ArrayList<>(); Collection duplicatedBlocks = new ArrayList<>(); @@ -302,7 +302,7 @@ public class IntegrateCrossProjectDuplicationsTest { } @Test - public void do_not_compute_more_than_one_hundred_duplications_when_too_many_duplications() throws Exception { + public void do_not_compute_more_than_one_hundred_duplications_when_too_many_duplications() { Collection originBlocks = new ArrayList<>(); Collection duplicatedBlocks = new ArrayList<>(); @@ -342,7 +342,7 @@ public class IntegrateCrossProjectDuplicationsTest { } private static Duplication crossProjectDuplication(TextBlock original, String otherFileKey, TextBlock duplicate) { - return new Duplication(original, Arrays.asList(new CrossProjectDuplicate(otherFileKey, duplicate))); + return new Duplication(original, Arrays.asList(new CrossProjectDuplicate(otherFileKey, duplicate))); } private void assertNoDuplicationAdded(Component file) { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/ReportDuplicationMeasuresTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/ReportDuplicationMeasuresTest.java index 773aac70b92..4184890a6d0 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/ReportDuplicationMeasuresTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/ReportDuplicationMeasuresTest.java @@ -267,7 +267,7 @@ public class ReportDuplicationMeasuresTest { } @Test - public void compute_and_aggregate_duplicated_lines_density_using_lines() throws Exception { + public void compute_and_aggregate_duplicated_lines_density_using_lines() { addDuplicatedBlock(FILE_1_REF, 2); addDuplicatedBlock(FILE_2_REF, 3); @@ -292,7 +292,7 @@ public class ReportDuplicationMeasuresTest { } @Test - public void compute_and_aggregate_duplicated_lines_density_using_nclocs_and_comment_lines() throws Exception { + public void compute_and_aggregate_duplicated_lines_density_using_nclocs_and_comment_lines() { addDuplicatedBlock(FILE_1_REF, 2); addDuplicatedBlock(FILE_2_REF, 3); @@ -324,7 +324,7 @@ public class ReportDuplicationMeasuresTest { } @Test - public void compute_duplicated_lines_density_using_only_nclocs() throws Exception { + public void compute_duplicated_lines_density_using_only_nclocs() { addDuplicatedBlock(FILE_1_REF, 2); addDuplicatedBlock(FILE_2_REF, 3); @@ -349,7 +349,7 @@ public class ReportDuplicationMeasuresTest { } @Test - public void compute_zero_percent_duplicated_lines_density_when_there_is_no_duplication() throws Exception { + public void compute_zero_percent_duplicated_lines_density_when_there_is_no_duplication() { addRawMeasure(FILE_1_REF, COMMENT_LINES_KEY, 2); addRawMeasure(FILE_2_REF, COMMENT_LINES_KEY, 10); addRawMeasure(DIRECTORY_REF, COMMENT_LINES_KEY, 12); @@ -378,7 +378,7 @@ public class ReportDuplicationMeasuresTest { } @Test - public void not_compute_duplicated_lines_density_when_lines_is_zero() throws Exception { + public void not_compute_duplicated_lines_density_when_lines_is_zero() { addRawMeasure(FILE_1_REF, LINES_KEY, 0); addRawMeasure(FILE_2_REF, LINES_KEY, 0); addRawMeasure(DIRECTORY_REF, LINES_KEY, 0); @@ -392,7 +392,7 @@ public class ReportDuplicationMeasuresTest { } @Test - public void not_compute_duplicated_lines_density_when_ncloc_and_comment_are_zero() throws Exception { + public void not_compute_duplicated_lines_density_when_ncloc_and_comment_are_zero() { addRawMeasure(FILE_1_REF, COMMENT_LINES_KEY, 0); addRawMeasure(FILE_2_REF, COMMENT_LINES_KEY, 0); addRawMeasure(DIRECTORY_REF, COMMENT_LINES_KEY, 0); @@ -413,7 +413,7 @@ public class ReportDuplicationMeasuresTest { } @Test - public void compute_100_percent_duplicated_lines_density() throws Exception { + public void compute_100_percent_duplicated_lines_density() { addDuplicatedBlock(FILE_1_REF, 2); addDuplicatedBlock(FILE_2_REF, 3); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/ViewsDuplicationMeasuresTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/ViewsDuplicationMeasuresTest.java index c4fd7a5dbb6..ee61bca2fc4 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/ViewsDuplicationMeasuresTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/duplication/ViewsDuplicationMeasuresTest.java @@ -199,7 +199,7 @@ public class ViewsDuplicationMeasuresTest { } @Test - public void compute_and_aggregate_duplicated_lines_density_using_lines() throws Exception { + public void compute_and_aggregate_duplicated_lines_density_using_lines() { addRawMeasure(PROJECT_VIEW_1_REF, DUPLICATED_LINES_KEY, 2); addRawMeasure(PROJECT_VIEW_2_REF, DUPLICATED_LINES_KEY, 3); addRawMeasure(PROJECT_VIEW_3_REF, DUPLICATED_LINES_KEY, 4); @@ -220,7 +220,7 @@ public class ViewsDuplicationMeasuresTest { } @Test - public void compute_and_aggregate_duplicated_lines_density_using_nclocs_and_comment_lines() throws Exception { + public void compute_and_aggregate_duplicated_lines_density_using_nclocs_and_comment_lines() { addRawMeasure(PROJECT_VIEW_1_REF, DUPLICATED_LINES_KEY, 2); addRawMeasure(PROJECT_VIEW_2_REF, DUPLICATED_LINES_KEY, 3); addRawMeasure(PROJECT_VIEW_3_REF, DUPLICATED_LINES_KEY, 4); @@ -248,7 +248,7 @@ public class ViewsDuplicationMeasuresTest { } @Test - public void compute_duplicated_lines_density_using_only_nclocs() throws Exception { + public void compute_duplicated_lines_density_using_only_nclocs() { addRawMeasure(PROJECT_VIEW_1_REF, DUPLICATED_LINES_KEY, 2); addRawMeasure(PROJECT_VIEW_2_REF, DUPLICATED_LINES_KEY, 3); @@ -267,7 +267,7 @@ public class ViewsDuplicationMeasuresTest { } @Test - public void compute_zero_percent_duplicated_lines_density_when_duplicated_lines_are_zero() throws Exception { + public void compute_zero_percent_duplicated_lines_density_when_duplicated_lines_are_zero() { addRawMeasure(PROJECT_VIEW_1_REF, DUPLICATED_LINES_KEY, 0); addRawMeasure(PROJECT_VIEW_2_REF, DUPLICATED_LINES_KEY, 0); // no raw measure for PROJECT_VIEW_3_REF @@ -293,7 +293,7 @@ public class ViewsDuplicationMeasuresTest { } @Test - public void not_compute_duplicated_lines_density_when_lines_is_zero() throws Exception { + public void not_compute_duplicated_lines_density_when_lines_is_zero() { addRawMeasure(PROJECT_VIEW_1_REF, LINES_KEY, 0); addRawMeasure(PROJECT_VIEW_2_REF, LINES_KEY, 0); // no raw measure for PROJECT_VIEW_3_REF @@ -307,7 +307,7 @@ public class ViewsDuplicationMeasuresTest { } @Test - public void not_compute_duplicated_lines_density_when_ncloc_and_comment_are_zero() throws Exception { + public void not_compute_duplicated_lines_density_when_ncloc_and_comment_are_zero() { addRawMeasure(PROJECT_VIEW_1_REF, COMMENT_LINES_KEY, 0); addRawMeasure(PROJECT_VIEW_2_REF, COMMENT_LINES_KEY, 0); // no raw measure for PROJECT_VIEW_3_REF @@ -327,7 +327,7 @@ public class ViewsDuplicationMeasuresTest { } @Test - public void compute_100_percent_duplicated_lines_density() throws Exception { + public void compute_100_percent_duplicated_lines_density() { addRawMeasure(PROJECT_VIEW_1_REF, DUPLICATED_LINES_KEY, 2); addRawMeasure(PROJECT_VIEW_2_REF, DUPLICATED_LINES_KEY, 3); // no raw measure for PROJECT_VIEW_3_REF diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/MutableMovedFilesRepositoryRule.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/MutableMovedFilesRepositoryRule.java index ec36f7ece59..ae7e8a44a44 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/MutableMovedFilesRepositoryRule.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/MutableMovedFilesRepositoryRule.java @@ -32,7 +32,7 @@ public class MutableMovedFilesRepositoryRule extends ExternalResource implements private final Set componentsWithOriginal = new HashSet<>(); @Override - protected void before() throws Throwable { + protected void before() { this.delegate = new MutableMovedFilesRepositoryImpl(); this.componentsWithOriginal.clear(); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/AverageFormulaExecutionTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/AverageFormulaExecutionTest.java index 1dd1bea166f..0733ef3ec90 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/AverageFormulaExecutionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/AverageFormulaExecutionTest.java @@ -64,7 +64,7 @@ public class AverageFormulaExecutionTest { @Before public void setUp() throws Exception { underTest = FormulaExecutorComponentVisitor.newBuilder(metricRepository, measureRepository) - .buildFor(Lists.newArrayList( + .buildFor(Lists.newArrayList( AverageFormula.Builder.newBuilder() .setOutputMetricKey(FUNCTION_COMPLEXITY_KEY) .setMainMetricKey(COMPLEXITY_IN_FUNCTIONS_KEY) diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/AverageFormulaTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/AverageFormulaTest.java index e8b2ecc3aca..87325ad3361 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/AverageFormulaTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/AverageFormulaTest.java @@ -179,7 +179,7 @@ public class AverageFormulaTest { @Test public void no_measure_created_when_counter_has_no_value() { AverageFormula.AverageCounter counter = BASIC_AVERAGE_FORMULA.createNewCounter(); - when(counterInitializationContext.getMeasure(anyString())).thenReturn(Optional.absent()); + when(counterInitializationContext.getMeasure(anyString())).thenReturn(Optional.absent()); counter.initialize(counterInitializationContext); Assertions.assertThat(BASIC_AVERAGE_FORMULA.createMeasure(counter, createMeasureContext)).isAbsent(); @@ -189,7 +189,7 @@ public class AverageFormulaTest { public void not_create_measure_when_only_one_measure() { AverageFormula.AverageCounter counter = BASIC_AVERAGE_FORMULA.createNewCounter(); addMeasure(COMPLEXITY_IN_FUNCTIONS_KEY, 10L); - when(counterInitializationContext.getMeasure(FUNCTIONS_KEY)).thenReturn(Optional.absent()); + when(counterInitializationContext.getMeasure(FUNCTIONS_KEY)).thenReturn(Optional.absent()); counter.initialize(counterInitializationContext); Assertions.assertThat(BASIC_AVERAGE_FORMULA.createMeasure(counter, createMeasureContext)).isAbsent(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/DistributionFormulaExecutionTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/DistributionFormulaExecutionTest.java index 0ef36231100..50556a7ec69 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/DistributionFormulaExecutionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/DistributionFormulaExecutionTest.java @@ -56,7 +56,7 @@ public class DistributionFormulaExecutionTest { @Before public void setUp() throws Exception { underTest = FormulaExecutorComponentVisitor.newBuilder(metricRepository, measureRepository) - .buildFor(Lists.newArrayList(new DistributionFormula(FUNCTION_COMPLEXITY_DISTRIBUTION_KEY))); + .buildFor(Lists.newArrayList(new DistributionFormula(FUNCTION_COMPLEXITY_DISTRIBUTION_KEY))); } @Test diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/DistributionFormulaTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/DistributionFormulaTest.java index 999bf3184c3..102303e13dd 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/DistributionFormulaTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/DistributionFormulaTest.java @@ -90,7 +90,7 @@ public class DistributionFormulaTest { @Test public void create_no_measure_when_no_value() { DistributionFormula.DistributionCounter counter = BASIC_DISTRIBUTION_FORMULA.createNewCounter(); - when(counterInitializationContext.getMeasure(FUNCTION_COMPLEXITY_DISTRIBUTION_KEY)).thenReturn(Optional.absent()); + when(counterInitializationContext.getMeasure(FUNCTION_COMPLEXITY_DISTRIBUTION_KEY)).thenReturn(Optional.absent()); counter.initialize(counterInitializationContext); Assertions.assertThat(BASIC_DISTRIBUTION_FORMULA.createMeasure(counter, projectCreateMeasureContext)).isAbsent(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/IntSumFormulaTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/IntSumFormulaTest.java index c031170d241..a8bfffea3a3 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/IntSumFormulaTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/IntSumFormulaTest.java @@ -166,7 +166,7 @@ public class IntSumFormulaTest { private static CounterInitializationContext createNoMeasureInInitContext() { CounterInitializationContext initContext = mock(CounterInitializationContext.class); - when(initContext.getMeasure(LINES_KEY)).thenReturn(Optional.absent()); + when(initContext.getMeasure(LINES_KEY)).thenReturn(Optional.absent()); return initContext; } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/LongSumFormulaTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/LongSumFormulaTest.java index 5fbea99d39b..28086768eb4 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/LongSumFormulaTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/LongSumFormulaTest.java @@ -165,7 +165,7 @@ public class LongSumFormulaTest { private static CounterInitializationContext createNoMeasureInInitContext() { CounterInitializationContext initContext = mock(CounterInitializationContext.class); - when(initContext.getMeasure(LINES_KEY)).thenReturn(Optional.absent()); + when(initContext.getMeasure(LINES_KEY)).thenReturn(Optional.absent()); return initContext; } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/ReportFormulaExecutorComponentVisitorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/ReportFormulaExecutorComponentVisitorTest.java index 770fd7d7400..2c57de63585 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/ReportFormulaExecutorComponentVisitorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/ReportFormulaExecutorComponentVisitorTest.java @@ -92,7 +92,7 @@ public class ReportFormulaExecutorComponentVisitorTest { public PeriodHolderRule periodsHolder = new PeriodHolderRule().setPeriod(new Period("some mode", null, 95l, "756l")); @Test - public void verify_aggregation_on_value() throws Exception { + public void verify_aggregation_on_value() { treeRootHolder.setRoot(BALANCED_COMPONENT_TREE); measureRepository.addRawMeasure(FILE_1_REF, LINES_KEY, newMeasureBuilder().create(10)); @@ -113,7 +113,7 @@ public class ReportFormulaExecutorComponentVisitorTest { } @Test - public void verify_multi_metric_formula_support_and_aggregation() throws Exception { + public void verify_multi_metric_formula_support_and_aggregation() { treeRootHolder.setRoot(BALANCED_COMPONENT_TREE); measureRepository.addRawMeasure(FILE_1_REF, LINES_KEY, newMeasureBuilder().create(10)); @@ -150,7 +150,7 @@ public class ReportFormulaExecutorComponentVisitorTest { } @Test - public void verify_aggregation_on_variation() throws Exception { + public void verify_aggregation_on_variation() { treeRootHolder.setRoot(BALANCED_COMPONENT_TREE); measureRepository.addRawMeasure(FILE_1_REF, NEW_LINES_TO_COVER_KEY, createMeasureWithVariation(10)); @@ -171,7 +171,7 @@ public class ReportFormulaExecutorComponentVisitorTest { } @Test - public void measures_are_0_when_there_is_no_input_measure() throws Exception { + public void measures_are_0_when_there_is_no_input_measure() { ReportComponent project = ReportComponent.builder(PROJECT, ROOT_REF) .addChildren( ReportComponent.builder(MODULE, MODULE_1_REF) @@ -194,7 +194,7 @@ public class ReportFormulaExecutorComponentVisitorTest { } @Test - public void add_measure_even_when_leaf_is_not_FILE() throws Exception { + public void add_measure_even_when_leaf_is_not_FILE() { ReportComponent project = ReportComponent.builder(PROJECT, ROOT_REF) .addChildren( ReportComponent.builder(MODULE, MODULE_1_REF) diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/SumFormulaExecutionTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/SumFormulaExecutionTest.java index b7c7d572d8a..6689cf03903 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/SumFormulaExecutionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/SumFormulaExecutionTest.java @@ -57,7 +57,7 @@ public class SumFormulaExecutionTest { @Before public void setUp() throws Exception { underTest = FormulaExecutorComponentVisitor.newBuilder(metricRepository, measureRepository) - .buildFor(Lists.newArrayList(createIntSumFormula(LINES_KEY))); + .buildFor(Lists.newArrayList(createIntSumFormula(LINES_KEY))); } @Test diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/ViewsFormulaExecutorComponentVisitorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/ViewsFormulaExecutorComponentVisitorTest.java index e77325f67d3..b12f89e4a62 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/ViewsFormulaExecutorComponentVisitorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/ViewsFormulaExecutorComponentVisitorTest.java @@ -92,7 +92,7 @@ public class ViewsFormulaExecutorComponentVisitorTest { public PeriodHolderRule periodsHolder = new PeriodHolderRule().setPeriod(new Period("some mode", null, 95l, "u1")); @Test - public void verify_aggregation_on_value() throws Exception { + public void verify_aggregation_on_value() { treeRootHolder.setRoot(BALANCED_COMPONENT_TREE); addRawMeasure(PROJECT_VIEW_1_REF, 1, LINES_KEY); addRawMeasure(PROJECT_VIEW_2_REF, 2, LINES_KEY); @@ -114,7 +114,7 @@ public class ViewsFormulaExecutorComponentVisitorTest { } @Test - public void verify_multi_metric_formula_support_and_aggregation() throws Exception { + public void verify_multi_metric_formula_support_and_aggregation() { treeRootHolder.setRoot(BALANCED_COMPONENT_TREE); addRawMeasure(PROJECT_VIEW_1_REF, 1, LINES_KEY); addRawMeasure(PROJECT_VIEW_2_REF, 2, LINES_KEY); @@ -132,7 +132,7 @@ public class ViewsFormulaExecutorComponentVisitorTest { } @Test - public void verify_aggregation_on_variations() throws Exception { + public void verify_aggregation_on_variations() { treeRootHolder.setRoot(BALANCED_COMPONENT_TREE); addRawMeasureWithVariation(PROJECT_VIEW_1_REF, NEW_LINES_TO_COVER_KEY, 10); @@ -164,7 +164,7 @@ public class ViewsFormulaExecutorComponentVisitorTest { } @Test - public void verify_no_measure_added_on_projectView() throws Exception { + public void verify_no_measure_added_on_projectView() { ViewsComponent project = ViewsComponent.builder(VIEW, ROOT_REF) .addChildren( ViewsComponent.builder(SUBVIEW, SUBVIEW_1_REF) @@ -187,7 +187,7 @@ public class ViewsFormulaExecutorComponentVisitorTest { } @Test - public void add_measure_even_if_leaf_is_not_a_PROJECT_VIEW() throws Exception { + public void add_measure_even_if_leaf_is_not_a_PROJECT_VIEW() { ViewsComponent project = ViewsComponent.builder(VIEW, ROOT_REF) .addChildren( ViewsComponent.builder(SUBVIEW, SUBVIEW_1_REF) diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntSumCounterTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntSumCounterTest.java index 85c1d615827..57b797fb8c2 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntSumCounterTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/IntSumCounterTest.java @@ -54,7 +54,7 @@ public class IntSumCounterTest { @Test public void no_value_when_aggregate_from_context_but_no_measure() { - when(counterInitializationContext.getMeasure(anyString())).thenReturn(Optional.absent()); + when(counterInitializationContext.getMeasure(anyString())).thenReturn(Optional.absent()); sumCounter.initialize(counterInitializationContext); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongSumCounterTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongSumCounterTest.java index ef703eafc0e..c348c1463d0 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongSumCounterTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/formula/counter/LongSumCounterTest.java @@ -55,7 +55,7 @@ public class LongSumCounterTest { @Test public void no_value_when_aggregate_from_context_but_no_measure() { - when(counterInitializationContext.getMeasure(anyString())).thenReturn(Optional.absent()); + when(counterInitializationContext.getMeasure(anyString())).thenReturn(Optional.absent()); sumCounter.initialize(counterInitializationContext); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/CloseIssuesOnRemovedComponentsVisitorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/CloseIssuesOnRemovedComponentsVisitorTest.java index 34165f54f82..529f1d89d4e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/CloseIssuesOnRemovedComponentsVisitorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/CloseIssuesOnRemovedComponentsVisitorTest.java @@ -58,11 +58,11 @@ public class CloseIssuesOnRemovedComponentsVisitorTest { public void setUp() throws Exception { issueCache = new IssueCache(temp.newFile(), System2.INSTANCE); underTest = new VisitorsCrawler( - Arrays.asList(new CloseIssuesOnRemovedComponentsVisitor(issuesLoader, componentsWithUnprocessedIssues, issueCache, issueLifecycle))); + Arrays.asList(new CloseIssuesOnRemovedComponentsVisitor(issuesLoader, componentsWithUnprocessedIssues, issueCache, issueLifecycle))); } @Test - public void close_issue() throws Exception { + public void close_issue() { String fileUuid = "FILE1"; String issueUuid = "ABCD"; @@ -83,8 +83,8 @@ public class CloseIssuesOnRemovedComponentsVisitorTest { } @Test - public void nothing_to_do_when_no_uuid_in_queue() throws Exception { - when(componentsWithUnprocessedIssues.getUuids()).thenReturn(Collections.emptySet()); + public void nothing_to_do_when_no_uuid_in_queue() { + when(componentsWithUnprocessedIssues.getUuids()).thenReturn(Collections.emptySet()); underTest.visit(ReportComponent.builder(PROJECT, 1).build()); @@ -94,7 +94,7 @@ public class CloseIssuesOnRemovedComponentsVisitorTest { } @Test - public void do_nothing_on_module() throws Exception { + public void do_nothing_on_module() { underTest.visit(ReportComponent.builder(MODULE, 1).build()); verifyZeroInteractions(issueLifecycle); @@ -103,7 +103,7 @@ public class CloseIssuesOnRemovedComponentsVisitorTest { } @Test - public void do_nothing_on_directory() throws Exception { + public void do_nothing_on_directory() { underTest.visit(ReportComponent.builder(DIRECTORY, 1).build()); verifyZeroInteractions(issueLifecycle); @@ -112,7 +112,7 @@ public class CloseIssuesOnRemovedComponentsVisitorTest { } @Test - public void do_nothing_on_file() throws Exception { + public void do_nothing_on_file() { underTest.visit(ReportComponent.builder(FILE, 1).build()); verifyZeroInteractions(issueLifecycle); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesRepositoryImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesRepositoryImplTest.java index bd82321050f..d43c39f95f9 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesRepositoryImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentIssuesRepositoryImplTest.java @@ -42,21 +42,21 @@ public class ComponentIssuesRepositoryImplTest { ComponentIssuesRepositoryImpl sut = new ComponentIssuesRepositoryImpl(); @Test - public void get_issues() throws Exception { + public void get_issues() { sut.setIssues(FILE_1, Arrays.asList(DUMB_ISSUE)); assertThat(sut.getIssues(FILE_1)).containsOnly(DUMB_ISSUE); } @Test - public void set_empty_issues() throws Exception { - sut.setIssues(FILE_1, Collections.emptyList()); + public void set_empty_issues() { + sut.setIssues(FILE_1, Collections.emptyList()); assertThat(sut.getIssues(FILE_1)).isEmpty(); } @Test - public void fail_with_NPE_when_setting_issues_with_null_component() throws Exception { + public void fail_with_NPE_when_setting_issues_with_null_component() { thrown.expect(NullPointerException.class); thrown.expectMessage("component cannot be null"); @@ -64,7 +64,7 @@ public class ComponentIssuesRepositoryImplTest { } @Test - public void fail_with_NPE_when_setting_issues_with_null_issues() throws Exception { + public void fail_with_NPE_when_setting_issues_with_null_issues() { thrown.expect(NullPointerException.class); thrown.expectMessage("issues cannot be null"); @@ -72,7 +72,7 @@ public class ComponentIssuesRepositoryImplTest { } @Test - public void fail_with_IAE_when_getting_issues_on_different_component() throws Exception { + public void fail_with_IAE_when_getting_issues_on_different_component() { thrown.expect(IllegalArgumentException.class); thrown.expectMessage("Only issues from component '1' are available, but wanted component is '2'."); @@ -81,7 +81,7 @@ public class ComponentIssuesRepositoryImplTest { } @Test - public void fail_with_ISE_when_getting_issues_but_issues_are_null() throws Exception { + public void fail_with_ISE_when_getting_issues_but_issues_are_null() { thrown.expect(IllegalStateException.class); thrown.expectMessage("Issues have not been initialized"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentsWithUnprocessedIssuesTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentsWithUnprocessedIssuesTest.java index 5f47c08644a..66ec5da4ed0 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentsWithUnprocessedIssuesTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ComponentsWithUnprocessedIssuesTest.java @@ -35,14 +35,14 @@ public class ComponentsWithUnprocessedIssuesTest { ComponentsWithUnprocessedIssues sut = new ComponentsWithUnprocessedIssues(); @Test - public void set_uuids() throws Exception { + public void set_uuids() { sut.setUuids(newHashSet("ABCD", "EFGH")); assertThat(sut.getUuids()).containsOnly("ABCD", "EFGH"); } @Test - public void set_uuids_makes_a_copy_of_input_issues() throws Exception { + public void set_uuids_makes_a_copy_of_input_issues() { Set issues = newHashSet("ABCD", "EFGH"); sut.setUuids(issues); @@ -54,7 +54,7 @@ public class ComponentsWithUnprocessedIssuesTest { } @Test - public void fail_with_NPE_when_setting_null_uuids() throws Exception { + public void fail_with_NPE_when_setting_null_uuids() { thrown.expect(NullPointerException.class); thrown.expectMessage("Uuids cannot be null"); @@ -62,7 +62,7 @@ public class ComponentsWithUnprocessedIssuesTest { } @Test - public void fail_with_ISE_when_setting_uuids_twice() throws Exception { + public void fail_with_ISE_when_setting_uuids_twice() { thrown.expect(IllegalStateException.class); thrown.expectMessage("Uuids have already been initialized"); @@ -71,7 +71,7 @@ public class ComponentsWithUnprocessedIssuesTest { } @Test - public void remove_uuid() throws Exception { + public void remove_uuid() { sut.setUuids(newHashSet("ABCD", "EFGH")); sut.remove("ABCD"); @@ -79,7 +79,7 @@ public class ComponentsWithUnprocessedIssuesTest { } @Test - public void fail_with_ISE_when_removing_uuid_and_not_initialized() throws Exception { + public void fail_with_ISE_when_removing_uuid_and_not_initialized() { thrown.expect(IllegalStateException.class); thrown.expectMessage("Uuids have not been initialized yet"); @@ -87,7 +87,7 @@ public class ComponentsWithUnprocessedIssuesTest { } @Test - public void fail_with_ISE_when_getting_uuid_and_not_initialized() throws Exception { + public void fail_with_ISE_when_getting_uuid_and_not_initialized() { thrown.expect(IllegalStateException.class); thrown.expectMessage("Uuids have not been initialized yet"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IntegrateIssuesVisitorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IntegrateIssuesVisitorTest.java index 30e3bd7d4cd..9fa06cfa3b8 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IntegrateIssuesVisitorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IntegrateIssuesVisitorTest.java @@ -139,7 +139,7 @@ public class IntegrateIssuesVisitorTest { IssueVisitors issueVisitors = new IssueVisitors(new IssueVisitor[] {issueVisitor}); defaultIssueCaptor = ArgumentCaptor.forClass(DefaultIssue.class); - when(movedFilesRepository.getOriginalFile(any(Component.class))).thenReturn(Optional.absent()); + when(movedFilesRepository.getOriginalFile(any(Component.class))).thenReturn(Optional.absent()); TrackerRawInputFactory rawInputFactory = new TrackerRawInputFactory(treeRootHolder, reportReader, fileSourceRepository, new CommonRuleEngineImpl(), issueFilter); TrackerBaseInputFactory baseInputFactory = new TrackerBaseInputFactory(issuesLoader, dbTester.getDbClient(), movedFilesRepository); @@ -156,7 +156,7 @@ public class IntegrateIssuesVisitorTest { } @Test - public void process_new_issue() throws Exception { + public void process_new_issue() { when(analysisMetadataHolder.isLongLivingBranch()).thenReturn(true); ScannerReport.Issue reportIssue = ScannerReport.Issue.newBuilder() .setMsg("the message") @@ -181,7 +181,7 @@ public class IntegrateIssuesVisitorTest { } @Test - public void process_existing_issue() throws Exception { + public void process_existing_issue() { RuleKey ruleKey = RuleTesting.XOO_X1; // Issue from db has severity major @@ -214,7 +214,7 @@ public class IntegrateIssuesVisitorTest { } @Test - public void execute_issue_visitors() throws Exception { + public void execute_issue_visitors() { ScannerReport.Issue reportIssue = ScannerReport.Issue.newBuilder() .setMsg("the message") .setRuleRepository("xoo") @@ -233,7 +233,7 @@ public class IntegrateIssuesVisitorTest { } @Test - public void close_unmatched_base_issue() throws Exception { + public void close_unmatched_base_issue() { RuleKey ruleKey = RuleTesting.XOO_X1; addBaseIssue(ruleKey); @@ -257,7 +257,7 @@ public class IntegrateIssuesVisitorTest { } @Test - public void copy_issues_when_creating_new_long_living_branch() throws Exception { + public void copy_issues_when_creating_new_long_living_branch() { when(mergeBranchComponentsUuids.getUuid(FILE_KEY)).thenReturn(FILE_UUID_ON_BRANCH); when(mergeBranchComponentUuids.getMergeBranchName()).thenReturn("master"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueAssignerTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueAssignerTest.java index 3b05ac7e676..67a3613e930 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueAssignerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueAssignerTest.java @@ -58,7 +58,7 @@ public class IssueAssignerTest { IssueAssigner underTest = new IssueAssigner(analysisMetadataHolder, scmInfoRepository, scmAccountToUser, defaultAssignee, new IssueFieldsSetter()); @Test - public void nothing_to_do_if_no_changeset() throws Exception { + public void nothing_to_do_if_no_changeset() { DefaultIssue issue = new DefaultIssue().setLine(1); underTest.onIssue(FILE, issue); @@ -67,7 +67,7 @@ public class IssueAssignerTest { } @Test - public void set_author_to_issue() throws Exception { + public void set_author_to_issue() { setSingleChangeset("john", 123456789L, "rev-1"); DefaultIssue issue = new DefaultIssue().setLine(1); @@ -77,7 +77,7 @@ public class IssueAssignerTest { } @Test - public void does_not_set_author_to_issue_if_already_set() throws Exception { + public void does_not_set_author_to_issue_if_already_set() { setSingleChangeset("john", 123456789L, "rev-1"); DefaultIssue issue = new DefaultIssue() .setLine(1) @@ -89,7 +89,7 @@ public class IssueAssignerTest { } @Test - public void set_assignee_to_issue() throws Exception { + public void set_assignee_to_issue() { addScmUser("john", "John C"); setSingleChangeset("john", 123456789L, "rev-1"); DefaultIssue issue = new DefaultIssue().setLine(1); @@ -100,7 +100,7 @@ public class IssueAssignerTest { } @Test - public void dont_store_author_too_long() throws Exception { + public void dont_store_author_too_long() { String scmAuthor = range(0, 256).mapToObj(i -> "s").collect(joining()); addScmUser(scmAuthor, "John C"); setSingleChangeset(scmAuthor, 123456789L, "rev-1"); @@ -115,7 +115,7 @@ public class IssueAssignerTest { } @Test - public void set_default_assignee_if_author_not_found() throws Exception { + public void set_default_assignee_if_author_not_found() { addScmUser("john", null); setSingleChangeset("john", 123456789L, "rev-1"); when(defaultAssignee.loadDefaultAssigneeLogin()).thenReturn("John C"); @@ -127,7 +127,7 @@ public class IssueAssignerTest { } @Test - public void doest_not_set_assignee_if_no_author() throws Exception { + public void doest_not_set_assignee_if_no_author() { addScmUser("john", "John C"); setSingleChangeset(null, 123456789L, "rev-1"); DefaultIssue issue = new DefaultIssue().setLine(1); @@ -139,7 +139,7 @@ public class IssueAssignerTest { } @Test - public void doest_not_set_assignee_if_author_already_set_and_assignee_null() throws Exception { + public void doest_not_set_assignee_if_author_already_set_and_assignee_null() { addScmUser("john", "John C"); setSingleChangeset("john", 123456789L, "rev-1"); DefaultIssue issue = new DefaultIssue().setLine(1) @@ -153,7 +153,7 @@ public class IssueAssignerTest { } @Test - public void set_last_committer_when_line_is_null() throws Exception { + public void set_last_committer_when_line_is_null() { addScmUser("henry", "Henry V"); Changeset changeset1 = Changeset.newChangesetBuilder() .setAuthor("john") @@ -176,7 +176,7 @@ public class IssueAssignerTest { } @Test - public void when_noscm_data_is_available_defaultAssignee_should_be_used() throws Exception { + public void when_noscm_data_is_available_defaultAssignee_should_be_used() { DefaultIssue issue = new DefaultIssue().setLine(null); when(defaultAssignee.loadDefaultAssigneeLogin()).thenReturn("DefaultAssignee"); @@ -186,7 +186,7 @@ public class IssueAssignerTest { } @Test - public void set_last_committer_when_line_is_bigger_than_changeset_size() throws Exception { + public void set_last_committer_when_line_is_bigger_than_changeset_size() { addScmUser("john", "John C"); Changeset changeset = Changeset.newChangesetBuilder() .setAuthor("john") @@ -202,7 +202,7 @@ public class IssueAssignerTest { } @Test - public void display_warning_when_line_is_above_max_size() throws Exception { + public void display_warning_when_line_is_above_max_size() { setSingleChangeset("john", 123456789L, "rev-1"); DefaultIssue issue = new DefaultIssue().setLine(2).setType(RuleType.VULNERABILITY); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCounterTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCounterTest.java index 090a79a3e49..2a8956c4137 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCounterTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueCounterTest.java @@ -139,7 +139,7 @@ public class IssueCounterTest { @Rule public MeasureRepositoryRule measureRepository = MeasureRepositoryRule.create(treeRootHolder, metricRepository); - private IssueCounter underTest = new IssueCounter(periodsHolder, metricRepository, measureRepository);; + private IssueCounter underTest = new IssueCounter(periodsHolder, metricRepository, measureRepository); @Test public void count_issues_by_status() { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueLifecycleTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueLifecycleTest.java index c21f4a1ec88..2777449f316 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueLifecycleTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssueLifecycleTest.java @@ -70,7 +70,7 @@ public class IssueLifecycleTest { IssueLifecycle underTest = new IssueLifecycle(analysisMetadataHolder, issueChangeContext, workflow, updater, debtCalculator); @Test - public void initNewOpenIssue() throws Exception { + public void initNewOpenIssue() { DefaultIssue issue = new DefaultIssue(); when(debtCalculator.calculate(issue)).thenReturn(DEFAULT_DURATION); @@ -138,7 +138,7 @@ public class IssueLifecycleTest { } @Test - public void copiedIssue() throws Exception { + public void copiedIssue() { DefaultIssue raw = new DefaultIssue() .setNew(true) .setKey("RAW_KEY") @@ -202,7 +202,7 @@ public class IssueLifecycleTest { } @Test - public void doAutomaticTransition() throws Exception { + public void doAutomaticTransition() { DefaultIssue issue = new DefaultIssue(); underTest.doAutomaticTransition(issue); @@ -211,7 +211,7 @@ public class IssueLifecycleTest { } @Test - public void mergeExistingOpenIssue() throws Exception { + public void mergeExistingOpenIssue() { DefaultIssue raw = new DefaultIssue() .setNew(true) .setKey("RAW_KEY") @@ -271,7 +271,7 @@ public class IssueLifecycleTest { } @Test - public void mergeExistingOpenIssue_with_manual_severity() throws Exception { + public void mergeExistingOpenIssue_with_manual_severity() { DefaultIssue raw = new DefaultIssue() .setNew(true) .setKey("RAW_KEY"); @@ -291,7 +291,7 @@ public class IssueLifecycleTest { } @Test - public void mergeExistingOpenIssue_with_attributes() throws Exception { + public void mergeExistingOpenIssue_with_attributes() { DefaultIssue raw = new DefaultIssue() .setNew(true) .setKey("RAW_KEY"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssuesRepositoryVisitorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssuesRepositoryVisitorTest.java index f1e97df9cd8..15244b8f89b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssuesRepositoryVisitorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/IssuesRepositoryVisitorTest.java @@ -62,7 +62,7 @@ public class IssuesRepositoryVisitorTest { } @Test - public void feed_component_issues_repo() throws Exception { + public void feed_component_issues_repo() { DefaultIssue i1 = mock(DefaultIssue.class); DefaultIssue i2 = mock(DefaultIssue.class); @@ -75,7 +75,7 @@ public class IssuesRepositoryVisitorTest { } @Test - public void empty_component_issues_repo_when_no_issue() throws Exception { + public void empty_component_issues_repo_when_no_issue() { DefaultIssue i1 = mock(DefaultIssue.class); DefaultIssue i2 = mock(DefaultIssue.class); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/LoadComponentUuidsHavingOpenIssuesVisitorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/LoadComponentUuidsHavingOpenIssuesVisitorTest.java index f39f497aadc..4510b3bd139 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/LoadComponentUuidsHavingOpenIssuesVisitorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/LoadComponentUuidsHavingOpenIssuesVisitorTest.java @@ -39,10 +39,10 @@ public class LoadComponentUuidsHavingOpenIssuesVisitorTest { BaseIssuesLoader baseIssuesLoader = mock(BaseIssuesLoader.class); ComponentsWithUnprocessedIssues componentsWithUnprocessedIssues = mock(ComponentsWithUnprocessedIssues.class); - VisitorsCrawler underTest = new VisitorsCrawler(Arrays.asList(new LoadComponentUuidsHavingOpenIssuesVisitor(baseIssuesLoader, componentsWithUnprocessedIssues))); + VisitorsCrawler underTest = new VisitorsCrawler(Arrays.asList(new LoadComponentUuidsHavingOpenIssuesVisitor(baseIssuesLoader, componentsWithUnprocessedIssues))); @Test - public void set_issues_when_visiting_project() throws Exception { + public void set_issues_when_visiting_project() { when(baseIssuesLoader.loadUuidsOfComponentsWithOpenIssues()).thenReturn(newHashSet("FILE1", "FILE2")); underTest.visit(ReportComponent.builder(PROJECT, 1).build()); @@ -51,7 +51,7 @@ public class LoadComponentUuidsHavingOpenIssuesVisitorTest { } @Test - public void do_nothing_on_not_project_level() throws Exception { + public void do_nothing_on_not_project_level() { when(baseIssuesLoader.loadUuidsOfComponentsWithOpenIssues()).thenReturn(newHashSet("FILE1", "FILE2")); underTest.visit(ReportComponent.builder(MODULE, 1).build()); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/MovedIssueVisitorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/MovedIssueVisitorTest.java index 59e86ad2662..3fceb6b4b8b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/MovedIssueVisitorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/MovedIssueVisitorTest.java @@ -63,7 +63,7 @@ public class MovedIssueVisitorTest { public void setUp() throws Exception { analysisMetadataHolder.setAnalysisDate(ANALYSIS_DATE); when(movedFilesRepository.getOriginalFile(any(Component.class))) - .thenReturn(Optional.absent()); + .thenReturn(Optional.absent()); } @Test diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleTagsCopierTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleTagsCopierTest.java index 216f914b3ca..e235833b725 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleTagsCopierTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/RuleTagsCopierTest.java @@ -63,7 +63,7 @@ public class RuleTagsCopierTest { @Test public void do_not_copy_tags_if_existing_issue_without_tags() { rule.setTags(Sets.newHashSet("bug", "performance")); - issue.setNew(false).setTags(Collections.emptyList()); + issue.setNew(false).setTags(Collections.emptyList()); underTest.onIssue(mock(Component.class), issue); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUserLoaderTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUserLoaderTest.java index fd4ae413b5d..99523d36d41 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUserLoaderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/ScmAccountToUserLoaderTest.java @@ -43,7 +43,7 @@ public class ScmAccountToUserLoaderTest { public LogTester logTester = new LogTester(); @Test - public void load_login_for_scm_account() throws Exception { + public void load_login_for_scm_account() { UserDoc user = new UserDoc() .setLogin("charlie") .setName("Charlie") @@ -60,7 +60,7 @@ public class ScmAccountToUserLoaderTest { } @Test - public void warn_if_multiple_users_share_the_same_scm_account() throws Exception { + public void warn_if_multiple_users_share_the_same_scm_account() { UserDoc user1 = new UserDoc() .setLogin("charlie") .setName("Charlie") @@ -88,7 +88,7 @@ public class ScmAccountToUserLoaderTest { UserIndex index = new UserIndex(esTester.client(), System2.INSTANCE); ScmAccountToUserLoader underTest = new ScmAccountToUserLoader(index); try { - underTest.loadAll(Collections.emptyList()); + underTest.loadAll(Collections.emptyList()); fail(); } catch (UnsupportedOperationException ignored) { } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerBaseInputFactoryTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerBaseInputFactoryTest.java index e6c56723137..b553419d643 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerBaseInputFactoryTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerBaseInputFactoryTest.java @@ -53,7 +53,7 @@ public class TrackerBaseInputFactoryTest { when(dbClient.openSession(false)).thenReturn(dbSession); when(dbClient.fileSourceDao()).thenReturn(fileSourceDao); when(movedFilesRepository.getOriginalFile(any(Component.class))) - .thenReturn(Optional.absent()); + .thenReturn(Optional.absent()); } @Test diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerRawInputFactoryTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerRawInputFactoryTest.java index b03e3a50875..1af9aab7ca2 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerRawInputFactoryTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/TrackerRawInputFactoryTest.java @@ -70,7 +70,7 @@ public class TrackerRawInputFactoryTest { TrackerRawInputFactory underTest = new TrackerRawInputFactory(treeRootHolder, reportReader, fileSourceRepository, commonRuleEngine, issueFilter); @Test - public void load_source_hash_sequences() throws Exception { + public void load_source_hash_sequences() { fileSourceRepository.addLines(FILE_REF, "line 1;", "line 2;"); Input input = underTest.create(FILE); @@ -83,7 +83,7 @@ public class TrackerRawInputFactoryTest { } @Test - public void load_source_hash_sequences_only_on_files() throws Exception { + public void load_source_hash_sequences_only_on_files() { Input input = underTest.create(PROJECT); assertThat(input.getLineHashSequence()).isNotNull(); @@ -91,7 +91,7 @@ public class TrackerRawInputFactoryTest { } @Test - public void load_issues_from_report() throws Exception { + public void load_issues_from_report() { when(issueFilter.accept(any(DefaultIssue.class), eq(FILE))).thenReturn(true); fileSourceRepository.addLines(FILE_REF, "line 1;", "line 2;"); ScannerReport.Issue reportIssue = ScannerReport.Issue.newBuilder() @@ -124,7 +124,7 @@ public class TrackerRawInputFactoryTest { } @Test - public void ignore_issue_from_report() throws Exception { + public void ignore_issue_from_report() { when(issueFilter.accept(any(DefaultIssue.class), eq(FILE))).thenReturn(false); fileSourceRepository.addLines(FILE_REF, "line 1;", "line 2;"); ScannerReport.Issue reportIssue = ScannerReport.Issue.newBuilder() @@ -143,7 +143,7 @@ public class TrackerRawInputFactoryTest { } @Test - public void ignore_report_issues_on_common_rules() throws Exception { + public void ignore_report_issues_on_common_rules() { fileSourceRepository.addLines(FILE_REF, "line 1;", "line 2;"); ScannerReport.Issue reportIssue = ScannerReport.Issue.newBuilder() .setMsg("the message") @@ -159,7 +159,7 @@ public class TrackerRawInputFactoryTest { } @Test - public void load_issues_of_compute_engine_common_rules() throws Exception { + public void load_issues_of_compute_engine_common_rules() { when(issueFilter.accept(any(DefaultIssue.class), eq(FILE))).thenReturn(true); fileSourceRepository.addLines(FILE_REF, "line 1;", "line 2;"); DefaultIssue ceIssue = new DefaultIssue() @@ -175,7 +175,7 @@ public class TrackerRawInputFactoryTest { } @Test - public void ignore_issue_from_common_rule() throws Exception { + public void ignore_issue_from_common_rule() { when(issueFilter.accept(any(DefaultIssue.class), eq(FILE))).thenReturn(false); fileSourceRepository.addLines(FILE_REF, "line 1;", "line 2;"); DefaultIssue ceIssue = new DefaultIssue() diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleEngineImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleEngineImplTest.java index 4eabbac125b..43586f9a260 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleEngineImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleEngineImplTest.java @@ -39,7 +39,7 @@ public class CommonRuleEngineImplTest { CommonRuleEngineImpl underTest = new CommonRuleEngineImpl(rule1, rule2); @Test - public void process_files_with_known_language() throws Exception { + public void process_files_with_known_language() { ReportComponent file = ReportComponent.builder(Component.Type.FILE, 1) .setKey("FILE_KEY").setUuid("FILE_UUID") .setFileAttributes(new FileAttributes(false, "java", 1)) @@ -53,7 +53,7 @@ public class CommonRuleEngineImplTest { } @Test - public void do_not_process_files_with_unknown_language() throws Exception { + public void do_not_process_files_with_unknown_language() { ReportComponent file = ReportComponent.builder(Component.Type.FILE, 1) .setKey("FILE_KEY").setUuid("FILE_UUID") .setFileAttributes(new FileAttributes(false, null, 1)) @@ -66,7 +66,7 @@ public class CommonRuleEngineImplTest { } @Test - public void do_not_process_non_files() throws Exception { + public void do_not_process_non_files() { Collection issues = underTest.process(DUMB_PROJECT); assertThat(issues).isEmpty(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleTest.java index e7b27d245f5..2444726563f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/CommonRuleTest.java @@ -37,7 +37,7 @@ public class CommonRuleTest { public ExpectedException thrown = ExpectedException.none(); @Test - public void test_getMinDensityParam() throws Exception { + public void test_getMinDensityParam() { ActiveRule activeRule = new ActiveRule(RuleTesting.XOO_X1, Severity.MAJOR, ImmutableMap.of("minDensity", "30.5"), 1_000L, PLUGIN_KEY); double minDensity = CommonRule.getMinDensityParam(activeRule, "minDensity"); @@ -45,16 +45,16 @@ public class CommonRuleTest { } @Test - public void getMinDensityParam_fails_if_param_value_is_absent() throws Exception { + public void getMinDensityParam_fails_if_param_value_is_absent() { thrown.expect(IllegalStateException.class); thrown.expectMessage("Required parameter [minDensity] is missing on rule [xoo:x1]"); - ActiveRule activeRule = new ActiveRule(RuleTesting.XOO_X1, Severity.MAJOR, ImmutableMap.of(), 1_000L, PLUGIN_KEY); + ActiveRule activeRule = new ActiveRule(RuleTesting.XOO_X1, Severity.MAJOR, ImmutableMap.of(), 1_000L, PLUGIN_KEY); CommonRule.getMinDensityParam(activeRule, "minDensity"); } @Test - public void getMinDensityParam_fails_if_param_value_is_negative() throws Exception { + public void getMinDensityParam_fails_if_param_value_is_negative() { thrown.expect(IllegalStateException.class); thrown.expectMessage("Minimum density of rule [xoo:x1] is incorrect. Got [-30.5] but must be between 0 and 100."); @@ -63,7 +63,7 @@ public class CommonRuleTest { } @Test - public void getMinDensityParam_fails_if_param_value_is_greater_than_100() throws Exception { + public void getMinDensityParam_fails_if_param_value_is_greater_than_100() { thrown.expect(IllegalStateException.class); thrown.expectMessage("Minimum density of rule [xoo:x1] is incorrect. Got [305] but must be between 0 and 100."); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/DuplicatedBlockRuleTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/DuplicatedBlockRuleTest.java index e43b98189cd..5edfa184397 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/DuplicatedBlockRuleTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/DuplicatedBlockRuleTest.java @@ -66,8 +66,8 @@ public class DuplicatedBlockRuleTest { DuplicatedBlockRule underTest = new DuplicatedBlockRule(activeRuleHolder, measureRepository, metricRepository); @Test - public void no_issue_if_no_duplicated_blocks() throws Exception { - activeRuleHolder.put(new ActiveRule(RULE_KEY, Severity.CRITICAL, Collections.emptyMap(), 1_000L, PLUGIN_KEY)); + public void no_issue_if_no_duplicated_blocks() { + activeRuleHolder.put(new ActiveRule(RULE_KEY, Severity.CRITICAL, Collections.emptyMap(), 1_000L, PLUGIN_KEY)); measureRepository.addRawMeasure(FILE.getReportAttributes().getRef(), CoreMetrics.DUPLICATED_BLOCKS_KEY, Measure.newMeasureBuilder().create(0)); DefaultIssue issue = underTest.processFile(FILE, "java"); @@ -76,8 +76,8 @@ public class DuplicatedBlockRuleTest { } @Test - public void issue_if_duplicated_blocks() throws Exception { - activeRuleHolder.put(new ActiveRule(RULE_KEY, Severity.CRITICAL, Collections.emptyMap(), 1_000L, PLUGIN_KEY)); + public void issue_if_duplicated_blocks() { + activeRuleHolder.put(new ActiveRule(RULE_KEY, Severity.CRITICAL, Collections.emptyMap(), 1_000L, PLUGIN_KEY)); measureRepository.addRawMeasure(FILE.getReportAttributes().getRef(), CoreMetrics.DUPLICATED_BLOCKS_KEY, Measure.newMeasureBuilder().create(3)); DefaultIssue issue = underTest.processFile(FILE, "java"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/SkippedTestRuleTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/SkippedTestRuleTest.java index e893e9d0c53..29bf5c5df11 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/SkippedTestRuleTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/SkippedTestRuleTest.java @@ -67,8 +67,8 @@ public class SkippedTestRuleTest { CommonRule underTest = new SkippedTestRule(activeRuleHolder, measureRepository, metricRepository); @Test - public void issue_if_skipped_tests() throws Exception { - activeRuleHolder.put(new ActiveRule(RULE_KEY, Severity.CRITICAL, Collections.emptyMap(), 1_000L, PLUGIN_KEY)); + public void issue_if_skipped_tests() { + activeRuleHolder.put(new ActiveRule(RULE_KEY, Severity.CRITICAL, Collections.emptyMap(), 1_000L, PLUGIN_KEY)); measureRepository.addRawMeasure(FILE.getReportAttributes().getRef(), CoreMetrics.SKIPPED_TESTS_KEY, Measure.newMeasureBuilder().create(2)); DefaultIssue issue = underTest.processFile(FILE, "java"); @@ -80,8 +80,8 @@ public class SkippedTestRuleTest { } @Test - public void no_issues_if_zero_skipped_tests() throws Exception { - activeRuleHolder.put(new ActiveRule(RULE_KEY, Severity.CRITICAL, Collections.emptyMap(), 1_000L, PLUGIN_KEY)); + public void no_issues_if_zero_skipped_tests() { + activeRuleHolder.put(new ActiveRule(RULE_KEY, Severity.CRITICAL, Collections.emptyMap(), 1_000L, PLUGIN_KEY)); measureRepository.addRawMeasure(FILE.getReportAttributes().getRef(), CoreMetrics.SKIPPED_TESTS_KEY, Measure.newMeasureBuilder().create(0)); DefaultIssue issue = underTest.processFile(FILE, "java"); @@ -90,8 +90,8 @@ public class SkippedTestRuleTest { } @Test - public void no_issues_if_measure_is_absent() throws Exception { - activeRuleHolder.put(new ActiveRule(RULE_KEY, Severity.CRITICAL, Collections.emptyMap(), 1_000L, PLUGIN_KEY)); + public void no_issues_if_measure_is_absent() { + activeRuleHolder.put(new ActiveRule(RULE_KEY, Severity.CRITICAL, Collections.emptyMap(), 1_000L, PLUGIN_KEY)); DefaultIssue issue = underTest.processFile(FILE, "java"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/TestErrorRuleTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/TestErrorRuleTest.java index 7619ac37076..a6ac2740f33 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/TestErrorRuleTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/commonrule/TestErrorRuleTest.java @@ -68,8 +68,8 @@ public class TestErrorRuleTest { CommonRule underTest = new TestErrorRule(activeRuleHolder, measureRepository, metricRepository); @Test - public void issue_if_errors_or_failures() throws Exception { - activeRuleHolder.put(new ActiveRule(RULE_KEY, Severity.CRITICAL, Collections.emptyMap(), 1_000L, PLUGIN_KEY)); + public void issue_if_errors_or_failures() { + activeRuleHolder.put(new ActiveRule(RULE_KEY, Severity.CRITICAL, Collections.emptyMap(), 1_000L, PLUGIN_KEY)); measureRepository.addRawMeasure(FILE.getReportAttributes().getRef(), CoreMetrics.TEST_ERRORS_KEY, Measure.newMeasureBuilder().create(2)); measureRepository.addRawMeasure(FILE.getReportAttributes().getRef(), CoreMetrics.TEST_FAILURES_KEY, Measure.newMeasureBuilder().create(1)); @@ -82,8 +82,8 @@ public class TestErrorRuleTest { } @Test - public void no_issues_if_zero_errors_and_failures() throws Exception { - activeRuleHolder.put(new ActiveRule(RULE_KEY, Severity.CRITICAL, Collections.emptyMap(), 1_000L, PLUGIN_KEY)); + public void no_issues_if_zero_errors_and_failures() { + activeRuleHolder.put(new ActiveRule(RULE_KEY, Severity.CRITICAL, Collections.emptyMap(), 1_000L, PLUGIN_KEY)); measureRepository.addRawMeasure(FILE.getReportAttributes().getRef(), CoreMetrics.TEST_ERRORS_KEY, Measure.newMeasureBuilder().create(0)); measureRepository.addRawMeasure(FILE.getReportAttributes().getRef(), CoreMetrics.TEST_FAILURES_KEY, Measure.newMeasureBuilder().create(0)); @@ -93,8 +93,8 @@ public class TestErrorRuleTest { } @Test - public void no_issues_if_test_measures_are_absent() throws Exception { - activeRuleHolder.put(new ActiveRule(RULE_KEY, Severity.CRITICAL, Collections.emptyMap(), 1_000L, PLUGIN_KEY)); + public void no_issues_if_test_measures_are_absent() { + activeRuleHolder.put(new ActiveRule(RULE_KEY, Severity.CRITICAL, Collections.emptyMap(), 1_000L, PLUGIN_KEY)); DefaultIssue issue = underTest.processFile(FILE, "java"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/filter/IssueFilterTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/filter/IssueFilterTest.java index 3d98e701417..9881df88b58 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/filter/IssueFilterTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/issue/filter/IssueFilterTest.java @@ -70,7 +70,7 @@ public class IssueFilterTest { ConfigurationRepository settingsRepository = mock(ConfigurationRepository.class); @Test - public void accept_everything_when_no_filter_properties() throws Exception { + public void accept_everything_when_no_filter_properties() { IssueFilter underTest = newIssueFilter(new MapSettings()); assertThat(underTest.accept(ISSUE_1, COMPONENT_1)).isTrue(); @@ -79,7 +79,7 @@ public class IssueFilterTest { } @Test - public void ignore_all() throws Exception { + public void ignore_all() { IssueFilter underTest = newIssueFilter(newSettings(asList("*", "**"), Collections.emptyList())); assertThat(underTest.accept(ISSUE_1, COMPONENT_1)).isFalse(); @@ -88,7 +88,7 @@ public class IssueFilterTest { } @Test - public void ignore_some_rule_and_component() throws Exception { + public void ignore_some_rule_and_component() { IssueFilter underTest = newIssueFilter(newSettings(asList("xoo:x1", "**/xoo/File1*"), Collections.emptyList())); assertThat(underTest.accept(ISSUE_1, COMPONENT_1)).isFalse(); @@ -98,7 +98,7 @@ public class IssueFilterTest { } @Test - public void ignore_many_rules() throws Exception { + public void ignore_many_rules() { IssueFilter underTest = newIssueFilter(newSettings( asList("xoo:x1", "**/xoo/File1*", "xoo:x2", "**/xoo/File1*"), Collections.emptyList())); @@ -110,7 +110,7 @@ public class IssueFilterTest { } @Test - public void include_all() throws Exception { + public void include_all() { IssueFilter underTest = newIssueFilter(newSettings(Collections.emptyList(), asList("*", "**"))); assertThat(underTest.accept(ISSUE_1, COMPONENT_1)).isTrue(); @@ -119,7 +119,7 @@ public class IssueFilterTest { } @Test - public void include_some_rule_and_component() throws Exception { + public void include_some_rule_and_component() { IssueFilter underTest = newIssueFilter(newSettings(Collections.emptyList(), asList("xoo:x1", "**/xoo/File1*"))); assertThat(underTest.accept(ISSUE_1, COMPONENT_1)).isTrue(); @@ -130,7 +130,7 @@ public class IssueFilterTest { } @Test - public void ignore_and_include_same_rule_and_component() throws Exception { + public void ignore_and_include_same_rule_and_component() { IssueFilter underTest = newIssueFilter(newSettings( asList("xoo:x1", "**/xoo/File1*"), asList("xoo:x1", "**/xoo/File1*"))); @@ -143,7 +143,7 @@ public class IssueFilterTest { } @Test - public void include_many_rules() throws Exception { + public void include_many_rules() { IssueFilter underTest = newIssueFilter(newSettings( Collections.emptyList(), asList("xoo:x1", "**/xoo/File1*", "xoo:x2", "**/xoo/File1*"))); @@ -155,7 +155,7 @@ public class IssueFilterTest { } @Test - public void accept_project_issues() throws Exception { + public void accept_project_issues() { IssueFilter underTest = newIssueFilter(newSettings( asList("xoo:x1", "**/xoo/File1*"), asList("xoo:x1", "**/xoo/File1*"))); @@ -165,7 +165,7 @@ public class IssueFilterTest { } @Test - public void fail_when_only_rule_key_parameter() throws Exception { + public void fail_when_only_rule_key_parameter() { expectedException.expect(IllegalArgumentException.class); expectedException.expectMessage("File path pattern cannot be empty. Please check 'sonar.issue.ignore.multicriteria' settings"); @@ -173,7 +173,7 @@ public class IssueFilterTest { } @Test - public void fail_when_only_path_parameter() throws Exception { + public void fail_when_only_path_parameter() { expectedException.expect(IllegalArgumentException.class); expectedException.expectMessage("Rule key pattern cannot be empty. Please check 'sonar.issue.enforce.multicriteria' settings"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolderImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolderImplTest.java index b23d9d86120..cdfa5fa1d7b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolderImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolderImplTest.java @@ -37,7 +37,7 @@ public class MeasureComputersHolderImplTest { private MeasureComputersHolderImpl underTest = new MeasureComputersHolderImpl(); @Test - public void get_measure_computers() throws Exception { + public void get_measure_computers() { MeasureComputerWrapper measureComputer = mock(MeasureComputerWrapper.class); underTest.setMeasureComputers(Collections.singletonList(measureComputer)); @@ -54,7 +54,7 @@ public class MeasureComputersHolderImplTest { @Test public void set_measure_computers_supports_empty_arg_is_empty() { - underTest.setMeasureComputers(ImmutableList.of()); + underTest.setMeasureComputers(ImmutableList.of()); assertThat(underTest.getMeasureComputers()).isEmpty(); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolderRule.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolderRule.java index 1dfa021ef15..26e4dd21faf 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolderRule.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureComputersHolderRule.java @@ -39,7 +39,7 @@ public class MeasureComputersHolderRule extends ExternalResource implements Meas } @After - public void tearDown() throws Exception { + public void tearDown() { measureComputers.clear(); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureKeyTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureKeyTest.java index 8ef28b09d7e..7a7f9b3d3b9 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureKeyTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureKeyTest.java @@ -42,7 +42,7 @@ public class MeasureKeyTest { } @Test - public void test_equals_and_hashcode() throws Exception { + public void test_equals_and_hashcode() { MeasureKey measureKey = new MeasureKey("metricKey", null); MeasureKey measureKey2 = new MeasureKey("metricKey", null); MeasureKey anotherMeasureKey = new MeasureKey("anotherMetricKey", null); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureTest.java index a4e23d83078..4321773f939 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/MeasureTest.java @@ -239,7 +239,7 @@ public class MeasureTest { assertThat(newMeasureBuilder().setQualityGateStatus(someStatus).create(true, null).getQualityGateStatus()).isEqualTo(someStatus); assertThat(newMeasureBuilder().setQualityGateStatus(someStatus).create(false, null).getQualityGateStatus()).isEqualTo(someStatus); - assertThat(newMeasureBuilder().setQualityGateStatus(someStatus).create((int) 1, null).getQualityGateStatus()).isEqualTo(someStatus); + assertThat(newMeasureBuilder().setQualityGateStatus(someStatus).create(1, null).getQualityGateStatus()).isEqualTo(someStatus); assertThat(newMeasureBuilder().setQualityGateStatus(someStatus).create((long) 1, null).getQualityGateStatus()).isEqualTo(someStatus); assertThat(newMeasureBuilder().setQualityGateStatus(someStatus).create((double) 1, 1, null).getQualityGateStatus()).isEqualTo(someStatus); assertThat(newMeasureBuilder().setQualityGateStatus(someStatus).create("str").getQualityGateStatus()).isEqualTo(someStatus); @@ -284,7 +284,7 @@ public class MeasureTest { assertThat(newMeasureBuilder().create(true, someData).getData()).isEqualTo(someData); assertThat(newMeasureBuilder().create(false, someData).getData()).isEqualTo(someData); - assertThat(newMeasureBuilder().create((int) 1, someData).getData()).isEqualTo(someData); + assertThat(newMeasureBuilder().create(1, someData).getData()).isEqualTo(someData); assertThat(newMeasureBuilder().create((long) 1, someData).getData()).isEqualTo(someData); assertThat(newMeasureBuilder().create((double) 1, 1, someData).getData()).isEqualTo(someData); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/ReportMeasureComputersVisitorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/ReportMeasureComputersVisitorTest.java index ed8fd5c7aba..00d819c0f1e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/ReportMeasureComputersVisitorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/ReportMeasureComputersVisitorTest.java @@ -93,7 +93,7 @@ public class ReportMeasureComputersVisitorTest { MeasureComputersHolderImpl measureComputersHolder = new MeasureComputersHolderImpl(); @Test - public void compute_plugin_measure() throws Exception { + public void compute_plugin_measure() { addRawMeasure(FILE_1_REF, NCLOC_KEY, 10); addRawMeasure(FILE_1_REF, COMMENT_LINES_KEY, 2); addRawMeasure(FILE_2_REF, NCLOC_KEY, 40); @@ -129,7 +129,7 @@ public class ReportMeasureComputersVisitorTest { definition ))); - VisitorsCrawler visitorsCrawler = new VisitorsCrawler(Arrays.asList(new MeasureComputersVisitor(metricRepository, measureRepository, null, + VisitorsCrawler visitorsCrawler = new VisitorsCrawler(Arrays.asList(new MeasureComputersVisitor(metricRepository, measureRepository, null, measureComputersHolder, componentIssuesRepository))); visitorsCrawler.visit(ROOT); @@ -141,7 +141,7 @@ public class ReportMeasureComputersVisitorTest { } @Test - public void nothing_to_compute() throws Exception { + public void nothing_to_compute() { addRawMeasure(FILE_1_REF, NCLOC_KEY, 10); addRawMeasure(FILE_1_REF, COMMENT_LINES_KEY, 2); addRawMeasure(FILE_2_REF, NCLOC_KEY, 40); @@ -153,8 +153,8 @@ public class ReportMeasureComputersVisitorTest { addRawMeasure(ROOT_REF, NCLOC_KEY, 50); addRawMeasure(ROOT_REF, COMMENT_LINES_KEY, 7); - measureComputersHolder.setMeasureComputers(Collections.emptyList()); - VisitorsCrawler visitorsCrawler = new VisitorsCrawler(Arrays.asList(new MeasureComputersVisitor(metricRepository, measureRepository, null, + measureComputersHolder.setMeasureComputers(Collections.emptyList()); + VisitorsCrawler visitorsCrawler = new VisitorsCrawler(Arrays.asList(new MeasureComputersVisitor(metricRepository, measureRepository, null, measureComputersHolder, componentIssuesRepository))); visitorsCrawler.visit(ROOT); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/ViewsMeasureComputersVisitorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/ViewsMeasureComputersVisitorTest.java index dfbd3c87258..43365239c12 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/ViewsMeasureComputersVisitorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/ViewsMeasureComputersVisitorTest.java @@ -116,7 +116,7 @@ public class ViewsMeasureComputersVisitorTest { ComponentIssuesRepository componentIssuesRepository = mock(ComponentIssuesRepository.class); @Test - public void compute_plugin_measure() throws Exception { + public void compute_plugin_measure() { treeRootHolder.setRoot(TREE_WITH_SUB_VIEWS); addRawMeasure(PROJECT_VIEW_1_REF, NCLOC_KEY, 10); @@ -132,7 +132,7 @@ public class ViewsMeasureComputersVisitorTest { measureComputersHolder.addMeasureComputer(MEASURE_COMPUTER); - VisitorsCrawler visitorsCrawler = new VisitorsCrawler(Arrays.asList(new MeasureComputersVisitor(metricRepository, measureRepository, null, + VisitorsCrawler visitorsCrawler = new VisitorsCrawler(Arrays.asList(new MeasureComputersVisitor(metricRepository, measureRepository, null, measureComputersHolder, componentIssuesRepository))); visitorsCrawler.visit(treeRootHolder.getRoot()); @@ -143,7 +143,7 @@ public class ViewsMeasureComputersVisitorTest { } @Test - public void compute_plugin_measure_on_views_tree_having_only_one_view_with_a_project_view() throws Exception { + public void compute_plugin_measure_on_views_tree_having_only_one_view_with_a_project_view() { treeRootHolder.setRoot(TREE_WITH_DIRECT_PROJECT_VIEW); addRawMeasure(PROJECT_VIEW_1_REF, NCLOC_KEY, 10); @@ -155,7 +155,7 @@ public class ViewsMeasureComputersVisitorTest { measureComputersHolder.addMeasureComputer(MEASURE_COMPUTER); - VisitorsCrawler visitorsCrawler = new VisitorsCrawler(Arrays.asList(new MeasureComputersVisitor(metricRepository, measureRepository, null, + VisitorsCrawler visitorsCrawler = new VisitorsCrawler(Arrays.asList(new MeasureComputersVisitor(metricRepository, measureRepository, null, measureComputersHolder, componentIssuesRepository))); visitorsCrawler.visit(treeRootHolder.getRoot()); @@ -164,7 +164,7 @@ public class ViewsMeasureComputersVisitorTest { } @Test - public void nothing_to_compute_when_no_project_view() throws Exception { + public void nothing_to_compute_when_no_project_view() { treeRootHolder.setRoot(builder(VIEW, ROOT_REF) .addChildren( builder(SUBVIEW, VIEW_REF) @@ -176,7 +176,7 @@ public class ViewsMeasureComputersVisitorTest { measureComputersHolder.addMeasureComputer(MEASURE_COMPUTER); - VisitorsCrawler visitorsCrawler = new VisitorsCrawler(Arrays.asList(new MeasureComputersVisitor(metricRepository, measureRepository, null, + VisitorsCrawler visitorsCrawler = new VisitorsCrawler(Arrays.asList(new MeasureComputersVisitor(metricRepository, measureRepository, null, measureComputersHolder, componentIssuesRepository))); visitorsCrawler.visit(treeRootHolder.getRoot()); @@ -187,7 +187,7 @@ public class ViewsMeasureComputersVisitorTest { } @Test - public void nothing_to_compute_when_no_measure_computers() throws Exception { + public void nothing_to_compute_when_no_measure_computers() { treeRootHolder.setRoot(TREE_WITH_SUB_VIEWS); addRawMeasure(PROJECT_VIEW_1_REF, NCLOC_KEY, 10); @@ -201,7 +201,7 @@ public class ViewsMeasureComputersVisitorTest { addRawMeasure(ROOT_REF, NCLOC_KEY, 50); addRawMeasure(ROOT_REF, COMMENT_LINES_KEY, 7); - VisitorsCrawler visitorsCrawler = new VisitorsCrawler(Arrays.asList(new MeasureComputersVisitor(metricRepository, measureRepository, null, + VisitorsCrawler visitorsCrawler = new VisitorsCrawler(Arrays.asList(new MeasureComputersVisitor(metricRepository, measureRepository, null, measureComputersHolder, componentIssuesRepository))); visitorsCrawler.visit(treeRootHolder.getRoot()); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/QualityGateDetailsDataTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/QualityGateDetailsDataTest.java index 26776bf5843..520d8f73c3a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/QualityGateDetailsDataTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/measure/qualitygatedetails/QualityGateDetailsDataTest.java @@ -31,7 +31,7 @@ import org.sonar.test.JsonAssert; public class QualityGateDetailsDataTest { @Test(expected = NullPointerException.class) public void constructor_throws_NPE_if_Level_arg_is_null() { - new QualityGateDetailsData(null, Collections.emptyList(), false); + new QualityGateDetailsData(null, Collections.emptyList(), false); } @Test(expected = NullPointerException.class) @@ -41,7 +41,7 @@ public class QualityGateDetailsDataTest { @Test public void verify_json_when_there_is_no_condition() { - String actualJson = new QualityGateDetailsData(Measure.Level.OK, Collections.emptyList(), false).toJson(); + String actualJson = new QualityGateDetailsData(Measure.Level.OK, Collections.emptyList(), false).toJson(); JsonAssert.assertJson(actualJson).isSimilarTo("{" + "\"level\":\"OK\"," + @@ -95,10 +95,10 @@ public class QualityGateDetailsDataTest { @Test public void verify_json_for_small_leak() { - String actualJson = new QualityGateDetailsData(Measure.Level.OK, Collections.emptyList(), false).toJson(); + String actualJson = new QualityGateDetailsData(Measure.Level.OK, Collections.emptyList(), false).toJson(); JsonAssert.assertJson(actualJson).isSimilarTo("{\"ignoredConditions\": false}"); - String actualJson2 = new QualityGateDetailsData(Measure.Level.OK, Collections.emptyList(), true).toJson(); + String actualJson2 = new QualityGateDetailsData(Measure.Level.OK, Collections.emptyList(), true).toJson(); JsonAssert.assertJson(actualJson2).isSimilarTo("{\"ignoredConditions\": true}"); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/ReportMetricValidatorImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/ReportMetricValidatorImplTest.java index 025794adf0f..41b0898291f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/ReportMetricValidatorImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/metric/ReportMetricValidatorImplTest.java @@ -44,8 +44,8 @@ public class ReportMetricValidatorImplTest { ScannerMetrics scannerMetrics = mock(ScannerMetrics.class); @Test - public void validate_metric() throws Exception { - when(scannerMetrics.getMetrics()).thenReturn(ImmutableSet.of(new Builder(METRIC_KEY, "name", ValueType.INT).create())); + public void validate_metric() { + when(scannerMetrics.getMetrics()).thenReturn(ImmutableSet.of(new Builder(METRIC_KEY, "name", ValueType.INT).create())); ReportMetricValidator validator = new ReportMetricValidatorImpl(scannerMetrics); assertThat(validator.validate(METRIC_KEY)).isTrue(); @@ -53,8 +53,8 @@ public class ReportMetricValidatorImplTest { } @Test - public void not_validate_metric() throws Exception { - when(scannerMetrics.getMetrics()).thenReturn(Collections.emptySet()); + public void not_validate_metric() { + when(scannerMetrics.getMetrics()).thenReturn(Collections.emptySet()); ReportMetricValidator validator = new ReportMetricValidatorImpl(scannerMetrics); assertThat(validator.validate(METRIC_KEY)).isFalse(); @@ -62,8 +62,8 @@ public class ReportMetricValidatorImplTest { } @Test - public void not_generate_new_log_when_validating_twice_the_same_metric() throws Exception { - when(scannerMetrics.getMetrics()).thenReturn(Collections.emptySet()); + public void not_generate_new_log_when_validating_twice_the_same_metric() { + when(scannerMetrics.getMetrics()).thenReturn(Collections.emptySet()); ReportMetricValidator validator = new ReportMetricValidatorImpl(scannerMetrics); assertThat(validator.validate(METRIC_KEY)).isFalse(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionEvaluatorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionEvaluatorTest.java index df7828f5d50..307072f82c7 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionEvaluatorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitygate/ConditionEvaluatorTest.java @@ -285,7 +285,7 @@ public class ConditionEvaluatorTest { } @Test - public void test_condition_on_rating() throws Exception { + public void test_condition_on_rating() { Metric metric = createMetric(RATING); Measure measure = newMeasureBuilder().create(4, "D"); @@ -294,7 +294,7 @@ public class ConditionEvaluatorTest { } @Test - public void test_condition_on_rating_on_leak_period() throws Exception { + public void test_condition_on_rating_on_leak_period() { Metric metric = createMetric(RATING); Measure measure = newMeasureBuilder().setVariation(4d).createNoValue(); @@ -303,7 +303,7 @@ public class ConditionEvaluatorTest { } @Test - public void test_condition_on_rating_on_leak_period_when_variation_is_zero() throws Exception { + public void test_condition_on_rating_on_leak_period_when_variation_is_zero() { Metric metric = createMetric(RATING); Measure measure = newMeasureBuilder().setVariation(0d).createNoValue(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/MaintainabilityMeasuresVisitorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/MaintainabilityMeasuresVisitorTest.java index b77f3a0780b..f5ee683bf3b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/MaintainabilityMeasuresVisitorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/MaintainabilityMeasuresVisitorTest.java @@ -218,7 +218,7 @@ public class MaintainabilityMeasuresVisitorTest { } @Test - public void compute_maintainability_debt_ratio_measure() throws Exception { + public void compute_maintainability_debt_ratio_measure() { treeRootHolder.setRoot(ROOT_PROJECT); int file1Ncloc = 10; @@ -250,7 +250,7 @@ public class MaintainabilityMeasuresVisitorTest { } @Test - public void compute_maintainability_rating_measure() throws Exception { + public void compute_maintainability_rating_measure() { treeRootHolder.setRoot(ROOT_PROJECT); addRawMeasure(NCLOC_KEY, FILE_1_REF, 10); @@ -273,7 +273,7 @@ public class MaintainabilityMeasuresVisitorTest { } @Test - public void compute_effort_to_maintainability_rating_A_measure() throws Exception { + public void compute_effort_to_maintainability_rating_A_measure() { treeRootHolder.setRoot(ROOT_PROJECT); int file1Ncloc = 10; @@ -310,7 +310,7 @@ public class MaintainabilityMeasuresVisitorTest { } @Test - public void compute_0_effort_to_maintainability_rating_A_when_effort_is_lower_than_dev_cost() throws Exception { + public void compute_0_effort_to_maintainability_rating_A_when_effort_is_lower_than_dev_cost() { treeRootHolder.setRoot(ROOT_PROJECT); addRawMeasure(NCLOC_KEY, FILE_1_REF, 10); @@ -322,7 +322,7 @@ public class MaintainabilityMeasuresVisitorTest { } @Test - public void effort_to_maintainability_rating_A_is_same_as_effort_when_no_dev_cost() throws Exception { + public void effort_to_maintainability_rating_A_is_same_as_effort_when_no_dev_cost() { treeRootHolder.setRoot(ROOT_PROJECT); addRawMeasure(TECHNICAL_DEBT_KEY, FILE_1_REF, 100L); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/NewReliabilityAndSecurityRatingMeasuresVisitorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/NewReliabilityAndSecurityRatingMeasuresVisitorTest.java index 51393a717e2..34c85fe1e4b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/NewReliabilityAndSecurityRatingMeasuresVisitorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/NewReliabilityAndSecurityRatingMeasuresVisitorTest.java @@ -138,7 +138,7 @@ public class NewReliabilityAndSecurityRatingMeasuresVisitorTest { } @Test - public void compute_new_security_rating() throws Exception { + public void compute_new_security_rating() { treeRootHolder.setRoot(ROOT_PROJECT); fillComponentIssuesVisitorRule.setIssues(FILE_1_REF, newVulnerabilityIssue(10L, MAJOR).setCreationDate(AFTER_LEAK_PERIOD_DATE), @@ -163,7 +163,7 @@ public class NewReliabilityAndSecurityRatingMeasuresVisitorTest { } @Test - public void compute_new_security_rating_to_A_when_no_issue() throws Exception { + public void compute_new_security_rating_to_A_when_no_issue() { treeRootHolder.setRoot(ROOT_PROJECT); fillComponentIssuesVisitorRule.setIssues(FILE_1_REF); @@ -177,7 +177,7 @@ public class NewReliabilityAndSecurityRatingMeasuresVisitorTest { } @Test - public void compute_new_security_rating_to_A_when_no_new_issue() throws Exception { + public void compute_new_security_rating_to_A_when_no_new_issue() { treeRootHolder.setRoot(ROOT_PROJECT); fillComponentIssuesVisitorRule.setIssues(FILE_1_REF, newVulnerabilityIssue(1L, MAJOR).setCreationDate(BEFORE_LEAK_PERIOD_DATE)); @@ -192,7 +192,7 @@ public class NewReliabilityAndSecurityRatingMeasuresVisitorTest { } @Test - public void compute_new_reliability_rating() throws Exception { + public void compute_new_reliability_rating() { treeRootHolder.setRoot(ROOT_PROJECT); fillComponentIssuesVisitorRule.setIssues(FILE_1_REF, newBugIssue(10L, MAJOR).setCreationDate(AFTER_LEAK_PERIOD_DATE), @@ -217,7 +217,7 @@ public class NewReliabilityAndSecurityRatingMeasuresVisitorTest { } @Test - public void compute_new_reliability_rating_to_A_when_no_issue() throws Exception { + public void compute_new_reliability_rating_to_A_when_no_issue() { treeRootHolder.setRoot(ROOT_PROJECT); fillComponentIssuesVisitorRule.setIssues(FILE_1_REF); @@ -231,7 +231,7 @@ public class NewReliabilityAndSecurityRatingMeasuresVisitorTest { } @Test - public void compute_new_reliability_rating_to_A_when_no_new_issue() throws Exception { + public void compute_new_reliability_rating_to_A_when_no_new_issue() { treeRootHolder.setRoot(ROOT_PROJECT); fillComponentIssuesVisitorRule.setIssues(FILE_1_REF, newBugIssue(1L, MAJOR).setCreationDate(BEFORE_LEAK_PERIOD_DATE)); @@ -246,7 +246,7 @@ public class NewReliabilityAndSecurityRatingMeasuresVisitorTest { } @Test - public void compute_E_reliability_and_security_rating_on_blocker_issue() throws Exception { + public void compute_E_reliability_and_security_rating_on_blocker_issue() { treeRootHolder.setRoot(ROOT_PROJECT); fillComponentIssuesVisitorRule.setIssues(FILE_1_REF, newBugIssue(10L, BLOCKER).setCreationDate(AFTER_LEAK_PERIOD_DATE), @@ -261,7 +261,7 @@ public class NewReliabilityAndSecurityRatingMeasuresVisitorTest { } @Test - public void compute_D_reliability_and_security_rating_on_critical_issue() throws Exception { + public void compute_D_reliability_and_security_rating_on_critical_issue() { treeRootHolder.setRoot(ROOT_PROJECT); fillComponentIssuesVisitorRule.setIssues(FILE_1_REF, newBugIssue(10L, CRITICAL).setCreationDate(AFTER_LEAK_PERIOD_DATE), @@ -276,7 +276,7 @@ public class NewReliabilityAndSecurityRatingMeasuresVisitorTest { } @Test - public void compute_C_reliability_and_security_rating_on_major_issue() throws Exception { + public void compute_C_reliability_and_security_rating_on_major_issue() { treeRootHolder.setRoot(ROOT_PROJECT); fillComponentIssuesVisitorRule.setIssues(FILE_1_REF, newBugIssue(10L, MAJOR).setCreationDate(AFTER_LEAK_PERIOD_DATE), @@ -291,7 +291,7 @@ public class NewReliabilityAndSecurityRatingMeasuresVisitorTest { } @Test - public void compute_B_reliability_and_security_rating_on_minor_issue() throws Exception { + public void compute_B_reliability_and_security_rating_on_minor_issue() { treeRootHolder.setRoot(ROOT_PROJECT); fillComponentIssuesVisitorRule.setIssues(FILE_1_REF, newBugIssue(10L, MINOR).setCreationDate(AFTER_LEAK_PERIOD_DATE), @@ -306,7 +306,7 @@ public class NewReliabilityAndSecurityRatingMeasuresVisitorTest { } @Test - public void compute_A_reliability_and_security_rating_on_info_issue() throws Exception { + public void compute_A_reliability_and_security_rating_on_info_issue() { treeRootHolder.setRoot(ROOT_PROJECT); fillComponentIssuesVisitorRule.setIssues(FILE_1_REF, newBugIssue(10L, INFO).setCreationDate(AFTER_LEAK_PERIOD_DATE), diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/ReliabilityAndSecurityRatingMeasuresVisitorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/ReliabilityAndSecurityRatingMeasuresVisitorTest.java index 0d0ac7d8102..9582158a88f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/ReliabilityAndSecurityRatingMeasuresVisitorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualitymodel/ReliabilityAndSecurityRatingMeasuresVisitorTest.java @@ -123,7 +123,7 @@ public class ReliabilityAndSecurityRatingMeasuresVisitorTest { } @Test - public void compute_reliability_rating() throws Exception { + public void compute_reliability_rating() { treeRootHolder.setRoot(ROOT_PROJECT); fillComponentIssuesVisitorRule.setIssues(FILE_1_REF, newBugIssue(10L, MAJOR), newBugIssue(1L, MAJOR), // Should not be taken into account @@ -143,7 +143,7 @@ public class ReliabilityAndSecurityRatingMeasuresVisitorTest { } @Test - public void compute_security_rating() throws Exception { + public void compute_security_rating() { treeRootHolder.setRoot(ROOT_PROJECT); fillComponentIssuesVisitorRule.setIssues(FILE_1_REF, newVulnerabilityIssue(10L, MAJOR), newVulnerabilityIssue(1L, MAJOR), // Should not be taken into account @@ -163,7 +163,7 @@ public class ReliabilityAndSecurityRatingMeasuresVisitorTest { } @Test - public void compute_E_reliability_and_security_rating_on_blocker_issue() throws Exception { + public void compute_E_reliability_and_security_rating_on_blocker_issue() { treeRootHolder.setRoot(ROOT_PROJECT); fillComponentIssuesVisitorRule.setIssues(FILE_1_REF, newBugIssue(10L, BLOCKER), newVulnerabilityIssue(1L, BLOCKER), // Should not be taken into account @@ -176,7 +176,7 @@ public class ReliabilityAndSecurityRatingMeasuresVisitorTest { } @Test - public void compute_D_reliability_and_security_rating_on_critical_issue() throws Exception { + public void compute_D_reliability_and_security_rating_on_critical_issue() { treeRootHolder.setRoot(ROOT_PROJECT); fillComponentIssuesVisitorRule.setIssues(FILE_1_REF, newBugIssue(10L, CRITICAL), newVulnerabilityIssue(15L, CRITICAL), // Should not be taken into account @@ -189,7 +189,7 @@ public class ReliabilityAndSecurityRatingMeasuresVisitorTest { } @Test - public void compute_C_reliability_and_security_rating_on_major_issue() throws Exception { + public void compute_C_reliability_and_security_rating_on_major_issue() { treeRootHolder.setRoot(ROOT_PROJECT); fillComponentIssuesVisitorRule.setIssues(FILE_1_REF, newBugIssue(10L, MAJOR), newVulnerabilityIssue(15L, MAJOR), // Should not be taken into account @@ -202,7 +202,7 @@ public class ReliabilityAndSecurityRatingMeasuresVisitorTest { } @Test - public void compute_B_reliability_and_security_rating_on_minor_issue() throws Exception { + public void compute_B_reliability_and_security_rating_on_minor_issue() { treeRootHolder.setRoot(ROOT_PROJECT); fillComponentIssuesVisitorRule.setIssues(FILE_1_REF, newBugIssue(10L, MINOR), newVulnerabilityIssue(15L, MINOR), // Should not be taken into account @@ -215,7 +215,7 @@ public class ReliabilityAndSecurityRatingMeasuresVisitorTest { } @Test - public void compute_A_reliability_and_security_rating_on_info_issue() throws Exception { + public void compute_A_reliability_and_security_rating_on_info_issue() { treeRootHolder.setRoot(ROOT_PROJECT); fillComponentIssuesVisitorRule.setIssues(FILE_1_REF, newBugIssue(10L, INFO), newVulnerabilityIssue(15L, INFO), // Should not be taken into account diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRulesHolderImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRulesHolderImplTest.java index 091366d3dc3..e115241c826 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRulesHolderImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/qualityprofile/ActiveRulesHolderImplTest.java @@ -44,15 +44,15 @@ public class ActiveRulesHolderImplTest { ActiveRulesHolderImpl underTest = new ActiveRulesHolderImpl(); @Test - public void get_inactive_rule() throws Exception { - underTest.set(Collections.emptyList()); + public void get_inactive_rule() { + underTest.set(Collections.emptyList()); Optional activeRule = underTest.get(RULE_KEY); assertThat(activeRule.isPresent()).isFalse(); } @Test - public void get_active_rule() throws Exception { - underTest.set(asList(new ActiveRule(RULE_KEY, Severity.BLOCKER, Collections.emptyMap(), SOME_DATE, PLUGIN_KEY))); + public void get_active_rule() { + underTest.set(asList(new ActiveRule(RULE_KEY, Severity.BLOCKER, Collections.emptyMap(), SOME_DATE, PLUGIN_KEY))); Optional activeRule = underTest.get(RULE_KEY); assertThat(activeRule.isPresent()).isTrue(); @@ -61,17 +61,17 @@ public class ActiveRulesHolderImplTest { } @Test - public void can_not_set_twice() throws Exception { + public void can_not_set_twice() { thrown.expect(IllegalStateException.class); thrown.expectMessage("Active rules have already been initialized"); - underTest.set(asList(new ActiveRule(RULE_KEY, Severity.BLOCKER, Collections.emptyMap(), 1_000L, PLUGIN_KEY))); - underTest.set(Collections.emptyList()); + underTest.set(asList(new ActiveRule(RULE_KEY, Severity.BLOCKER, Collections.emptyMap(), 1_000L, PLUGIN_KEY))); + underTest.set(Collections.emptyList()); } @Test - public void can_not_get_if_not_initialized() throws Exception { + public void can_not_get_if_not_initialized() { thrown.expect(IllegalStateException.class); thrown.expectMessage("Active rules have not been initialized yet"); @@ -79,12 +79,12 @@ public class ActiveRulesHolderImplTest { } @Test - public void can_not_set_duplicated_rules() throws Exception { + public void can_not_set_duplicated_rules() { thrown.expect(IllegalArgumentException.class); thrown.expectMessage("Active rule must not be declared multiple times: squid:S001"); underTest.set(asList( - new ActiveRule(RULE_KEY, Severity.BLOCKER, Collections.emptyMap(), 1_000L, PLUGIN_KEY), - new ActiveRule(RULE_KEY, Severity.MAJOR, Collections.emptyMap(), 1_000L, PLUGIN_KEY))); + new ActiveRule(RULE_KEY, Severity.BLOCKER, Collections.emptyMap(), 1_000L, PLUGIN_KEY), + new ActiveRule(RULE_KEY, Severity.MAJOR, Collections.emptyMap(), 1_000L, PLUGIN_KEY))); } } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ChangesetTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ChangesetTest.java index 29ea30ffc58..e8ca509370a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ChangesetTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ChangesetTest.java @@ -31,7 +31,7 @@ public class ChangesetTest { public ExpectedException thrown = ExpectedException.none(); @Test - public void create_changeset() throws Exception { + public void create_changeset() { Changeset underTest = Changeset.newChangesetBuilder() .setAuthor("john") .setDate(123456789L) @@ -44,7 +44,7 @@ public class ChangesetTest { } @Test - public void create_changeset_with_minimum_fields() throws Exception { + public void create_changeset_with_minimum_fields() { Changeset underTest = Changeset.newChangesetBuilder() .setDate(123456789L) .setRevision("rev-1") @@ -56,7 +56,7 @@ public class ChangesetTest { } @Test - public void fail_with_NPE_when_setting_null_revision() throws Exception { + public void fail_with_NPE_when_setting_null_revision() { thrown.expect(NullPointerException.class); thrown.expectMessage("Revision cannot be null"); @@ -64,7 +64,7 @@ public class ChangesetTest { } @Test - public void fail_with_NPE_when_building_without_revision() throws Exception { + public void fail_with_NPE_when_building_without_revision() { thrown.expect(NullPointerException.class); thrown.expectMessage("Revision cannot be null"); @@ -75,7 +75,7 @@ public class ChangesetTest { } @Test - public void fail_with_NPE_when_setting_null_date() throws Exception { + public void fail_with_NPE_when_setting_null_date() { thrown.expect(NullPointerException.class); thrown.expectMessage("Date cannot be null"); @@ -83,7 +83,7 @@ public class ChangesetTest { } @Test - public void fail_with_NPE_when_building_without_date() throws Exception { + public void fail_with_NPE_when_building_without_date() { thrown.expect(NullPointerException.class); thrown.expectMessage("Date cannot be null"); @@ -94,7 +94,7 @@ public class ChangesetTest { } @Test - public void test_to_string() throws Exception { + public void test_to_string() { Changeset underTest = Changeset.newChangesetBuilder() .setAuthor("john") .setDate(123456789L) @@ -105,7 +105,7 @@ public class ChangesetTest { } @Test - public void equals_and_hashcode_are_based_on_revision_alone() throws Exception { + public void equals_and_hashcode_are_based_on_revision_alone() { Changeset.Builder changesetBuilder = Changeset.newChangesetBuilder() .setAuthor("john") .setDate(123456789L) diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/DbScmInfoTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/DbScmInfoTest.java index e55247f6dc7..ed8467252f7 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/DbScmInfoTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/DbScmInfoTest.java @@ -46,7 +46,7 @@ public class DbScmInfoTest { } @Test - public void return_changeset_for_a_given_line() throws Exception { + public void return_changeset_for_a_given_line() { DbFileSources.Data.Builder fileDataBuilder = DbFileSources.Data.newBuilder(); addLine(fileDataBuilder, 1, "john", 123456789L, "rev-1"); addLine(fileDataBuilder, 2, "henry", 1234567810L, "rev-2"); @@ -65,7 +65,7 @@ public class DbScmInfoTest { } @Test - public void return_same_changeset_objects_for_lines_with_same_revision() throws Exception { + public void return_same_changeset_objects_for_lines_with_same_revision() { DbFileSources.Data.Builder fileDataBuilder = DbFileSources.Data.newBuilder(); fileDataBuilder.addLinesBuilder().setScmRevision("rev").setScmDate(65L).setLine(1); fileDataBuilder.addLinesBuilder().setScmRevision("rev2").setScmDate(6541L).setLine(2); @@ -80,7 +80,7 @@ public class DbScmInfoTest { } @Test - public void return_latest_changeset() throws Exception { + public void return_latest_changeset() { DbFileSources.Data.Builder fileDataBuilder = DbFileSources.Data.newBuilder(); addLine(fileDataBuilder, 1, "john", 123456789L, "rev-1"); // Older changeset @@ -97,7 +97,7 @@ public class DbScmInfoTest { } @Test - public void return_absent_dsm_info_when_no_changeset() throws Exception { + public void return_absent_dsm_info_when_no_changeset() { DbFileSources.Data.Builder fileDataBuilder = DbFileSources.Data.newBuilder(); fileDataBuilder.addLinesBuilder().setLine(1); @@ -105,7 +105,7 @@ public class DbScmInfoTest { } @Test - public void return_absent_dsm_info_when_changeset_line_has_both_revision_and_date() throws Exception { + public void return_absent_dsm_info_when_changeset_line_has_both_revision_and_date() { DbFileSources.Data.Builder fileDataBuilder = DbFileSources.Data.newBuilder(); fileDataBuilder.addLinesBuilder().setLine(1); fileDataBuilder.addLinesBuilder().setScmDate(6541L).setLine(2); @@ -116,7 +116,7 @@ public class DbScmInfoTest { } @Test - public void fail_with_ISE_when_changeset_has_no_field() throws Exception { + public void fail_with_ISE_when_changeset_has_no_field() { thrown.expect(IllegalStateException.class); thrown.expectMessage("Partial scm information stored in DB for component 'ReportComponent{ref=1, key='FILE_KEY', type=FILE}'. " + "Not all lines have SCM info. Can not proceed"); @@ -130,7 +130,7 @@ public class DbScmInfoTest { } @Test - public void fail_with_ISE_when_changeset_has_only_revision_field() throws Exception { + public void fail_with_ISE_when_changeset_has_only_revision_field() { thrown.expect(IllegalStateException.class); thrown.expectMessage("Partial scm information stored in DB for component 'ReportComponent{ref=1, key='FILE_KEY', type=FILE}'. " + "Not all lines have SCM info. Can not proceed"); @@ -144,7 +144,7 @@ public class DbScmInfoTest { } @Test - public void fail_with_ISE_when_changeset_has_only_author_field() throws Exception { + public void fail_with_ISE_when_changeset_has_only_author_field() { thrown.expect(IllegalStateException.class); thrown.expectMessage("Partial scm information stored in DB for component 'ReportComponent{ref=1, key='FILE_KEY', type=FILE}'. " + "Not all lines have SCM info. Can not proceed"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ReportScmInfoTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ReportScmInfoTest.java index 6f226748495..783b440f995 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ReportScmInfoTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ReportScmInfoTest.java @@ -34,7 +34,7 @@ public class ReportScmInfoTest { static final int FILE_REF = 1; @Test - public void create_scm_info_with_some_changesets() throws Exception { + public void create_scm_info_with_some_changesets() { ScmInfo scmInfo = new ReportScmInfo(ScannerReport.Changesets.newBuilder() .setComponentRef(FILE_REF) .addChangeset(ScannerReport.Changesets.Changeset.newBuilder() @@ -57,7 +57,7 @@ public class ReportScmInfoTest { } @Test - public void return_changeset_for_a_given_line() throws Exception { + public void return_changeset_for_a_given_line() { ScmInfo scmInfo = new ReportScmInfo(ScannerReport.Changesets.newBuilder() .setComponentRef(FILE_REF) .addChangeset(ScannerReport.Changesets.Changeset.newBuilder() @@ -85,7 +85,7 @@ public class ReportScmInfoTest { } @Test - public void return_latest_changeset() throws Exception { + public void return_latest_changeset() { ScmInfo scmInfo = new ReportScmInfo(ScannerReport.Changesets.newBuilder() .setComponentRef(FILE_REF) .addChangeset(ScannerReport.Changesets.Changeset.newBuilder() @@ -111,21 +111,21 @@ public class ReportScmInfoTest { } @Test - public void fail_with_ISE_when_no_changeset() throws Exception { + public void fail_with_ISE_when_no_changeset() { thrown.expect(IllegalStateException.class); new ReportScmInfo(ScannerReport.Changesets.newBuilder().build()); } @Test - public void fail_with_NPE_when_report_is_null() throws Exception { + public void fail_with_NPE_when_report_is_null() { thrown.expect(NullPointerException.class); new ReportScmInfo(null); } @Test - public void fail_with_ISE_when_changeset_has_no_revision() throws Exception { + public void fail_with_ISE_when_changeset_has_no_revision() { thrown.expect(IllegalStateException.class); thrown.expectMessage("Changeset on line 1 must have a revision"); @@ -140,7 +140,7 @@ public class ReportScmInfoTest { } @Test - public void fail_with_ISE_when_changeset_has_no_date() throws Exception { + public void fail_with_ISE_when_changeset_has_no_date() { thrown.expect(IllegalStateException.class); thrown.expectMessage("Changeset on line 1 must have a date"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoDbLoaderTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoDbLoaderTest.java index 6193cc2e1df..71f0f53a0df 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoDbLoaderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoDbLoaderTest.java @@ -77,7 +77,7 @@ public class ScmInfoDbLoaderTest { private ScmInfoDbLoader underTest = new ScmInfoDbLoader(analysisMetadataHolder, dbTester.getDbClient(), sourceHashRepository, mergeBranchComponentUuids); @Test - public void returns_ScmInfo_from_DB_if_hashes_are_the_same() throws Exception { + public void returns_ScmInfo_from_DB_if_hashes_are_the_same() { analysisMetadataHolder.setBaseAnalysis(baseProjectAnalysis); analysisMetadataHolder.setBranch(null); @@ -122,7 +122,7 @@ public class ScmInfoDbLoaderTest { } @Test - public void returns_absent_when__hashes_are_not_the_same() throws Exception { + public void returns_absent_when__hashes_are_not_the_same() { analysisMetadataHolder.setBaseAnalysis(baseProjectAnalysis); analysisMetadataHolder.setBranch(null); @@ -134,7 +134,7 @@ public class ScmInfoDbLoaderTest { } @Test - public void not_read_in_db_on_first_analysis_and_no_merge_branch() throws Exception { + public void not_read_in_db_on_first_analysis_and_no_merge_branch() { Branch branch = mock(Branch.class); when(branch.getMergeBranchUuid()).thenReturn(Optional.empty()); analysisMetadataHolder.setBaseAnalysis(null); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoImplTest.java index c1366c988a5..36ad61303dd 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoImplTest.java @@ -45,21 +45,21 @@ public class ScmInfoImplTest { .build(); @Test - public void get_all_changesets() throws Exception { + public void get_all_changesets() { ScmInfo scmInfo = createScmInfoWithTwoChangestOnFourLines(); assertThat(scmInfo.getAllChangesets()).containsOnly(CHANGESET_1, CHANGESET_2, CHANGESET_1, CHANGESET_1); } @Test - public void get_latest_changeset() throws Exception { + public void get_latest_changeset() { ScmInfo scmInfo = createScmInfoWithTwoChangestOnFourLines(); assertThat(scmInfo.getLatestChangeset()).isEqualTo(CHANGESET_2); } @Test - public void get_changeset_for_given_line() throws Exception { + public void get_changeset_for_given_line() { ScmInfo scmInfo = createScmInfoWithTwoChangestOnFourLines(); assertThat(scmInfo.getChangesetForLine(1)).isEqualTo(CHANGESET_1); @@ -69,7 +69,7 @@ public class ScmInfoImplTest { } @Test - public void exists_for_given_line() throws Exception { + public void exists_for_given_line() { ScmInfo scmInfo = createScmInfoWithTwoChangestOnFourLines(); assertThat(scmInfo.hasChangesetForLine(1)).isTrue(); @@ -77,15 +77,15 @@ public class ScmInfoImplTest { } @Test - public void fail_with_ISE_on_empty_changeset() throws Exception { + public void fail_with_ISE_on_empty_changeset() { thrown.expect(IllegalStateException.class); thrown.expectMessage("A ScmInfo must have at least one Changeset and does not support any null one"); - new ScmInfoImpl(Lists.newArrayList()); + new ScmInfoImpl(Lists.newArrayList()); } @Test - public void fail_with_IAE_when_line_is_smaller_than_one() throws Exception { + public void fail_with_IAE_when_line_is_smaller_than_one() { thrown.expect(IllegalArgumentException.class); thrown.expectMessage("There's no changeset on line 0"); @@ -94,7 +94,7 @@ public class ScmInfoImplTest { } @Test - public void fail_with_IAE_when_line_is_bigger_than_changetset_size() throws Exception { + public void fail_with_IAE_when_line_is_bigger_than_changetset_size() { thrown.expect(IllegalArgumentException.class); thrown.expectMessage("There's no changeset on line 5"); @@ -103,7 +103,7 @@ public class ScmInfoImplTest { } @Test - public void test_to_string() throws Exception { + public void test_to_string() { ScmInfo scmInfo = createScmInfoWithTwoChangestOnFourLines(); assertThat(scmInfo.toString()).isEqualTo("ScmInfoImpl{" + diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepositoryImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepositoryImplTest.java index 751600de6c4..bd7ac6f2e56 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepositoryImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/scm/ScmInfoRepositoryImplTest.java @@ -64,7 +64,7 @@ public class ScmInfoRepositoryImplTest { private ScmInfoRepositoryImpl underTest = new ScmInfoRepositoryImpl(reportReader, dbLoader); @Test - public void read_from_report() throws Exception { + public void read_from_report() { addChangesetInReport("john", DATE_1, "rev-1"); ScmInfo scmInfo = underTest.getScmInfo(FILE).get(); @@ -82,7 +82,7 @@ public class ScmInfoRepositoryImplTest { } @Test - public void read_from_report_even_if_data_in_db_exists() throws Exception { + public void read_from_report_even_if_data_in_db_exists() { addChangesetInReport("john", DATE_2, "rev-2"); ScmInfo scmInfo = underTest.getScmInfo(FILE).get(); @@ -95,7 +95,7 @@ public class ScmInfoRepositoryImplTest { } @Test - public void read_from_db_even_if_data_in_report_exists_when_CopyFromPrevious_is_true() throws Exception { + public void read_from_db_even_if_data_in_report_exists_when_CopyFromPrevious_is_true() { ScmInfo info = mock(ScmInfo.class); when(dbLoader.getScmInfoFromDb(FILE)).thenReturn(info); @@ -107,18 +107,18 @@ public class ScmInfoRepositoryImplTest { } @Test - public void return_nothing_when_no_data_in_report_nor_db() throws Exception { + public void return_nothing_when_no_data_in_report_nor_db() { assertThat(underTest.getScmInfo(FILE)).isAbsent(); } @Test - public void return_nothing_when_nothing_in_report_and_db_has_no_scm() throws Exception { + public void return_nothing_when_nothing_in_report_and_db_has_no_scm() { addFileSourceInReport(1); assertThat(underTest.getScmInfo(FILE)).isAbsent(); } @Test - public void fail_with_NPE_when_component_is_null() throws Exception { + public void fail_with_NPE_when_component_is_null() { thrown.expect(NullPointerException.class); thrown.expectMessage("Component cannot be null"); @@ -152,7 +152,7 @@ public class ScmInfoRepositoryImplTest { } @Test - public void load_scm_info_from_cache_when_already_read() throws Exception { + public void load_scm_info_from_cache_when_already_read() { addChangesetInReport("john", DATE_1, "rev-1"); ScmInfo scmInfo = underTest.getScmInfo(FILE).get(); assertThat(scmInfo.getAllChangesets()).hasSize(1); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/ComputeFileSourceDataTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/ComputeFileSourceDataTest.java index 2c583fec402..a0eb78a925d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/ComputeFileSourceDataTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/ComputeFileSourceDataTest.java @@ -32,7 +32,7 @@ public class ComputeFileSourceDataTest { public void compute_one_line() { ComputeFileSourceData computeFileSourceData = new ComputeFileSourceData( newArrayList("line1").iterator(), - Lists.newArrayList(new MockLineReader()), + Lists.newArrayList(new MockLineReader()), 1); ComputeFileSourceData.Data data = computeFileSourceData.compute(); @@ -46,7 +46,7 @@ public class ComputeFileSourceDataTest { public void compute_two_lines() { ComputeFileSourceData computeFileSourceData = new ComputeFileSourceData( newArrayList("line1", "line2").iterator(), - Lists.newArrayList(new MockLineReader()), + Lists.newArrayList(new MockLineReader()), 2); ComputeFileSourceData.Data data = computeFileSourceData.compute(); @@ -61,12 +61,12 @@ public class ComputeFileSourceDataTest { public void remove_tabs_and_spaces_in_line_hashes() { String refLineHashes = new ComputeFileSourceData( newArrayList("line1").iterator(), - Lists.newArrayList(new MockLineReader()), + Lists.newArrayList(new MockLineReader()), 1).compute().getLineHashes(); assertThat(new ComputeFileSourceData( newArrayList(" line\t \t 1 ").iterator(), - Lists.newArrayList(new MockLineReader()), + Lists.newArrayList(new MockLineReader()), 1).compute().getLineHashes()).isEqualTo(refLineHashes); } @@ -74,7 +74,7 @@ public class ComputeFileSourceDataTest { public void compute_line_hashes_of_empty_lines() { assertThat(new ComputeFileSourceData( newArrayList(" ").iterator(), - Lists.newArrayList(new MockLineReader()), + Lists.newArrayList(new MockLineReader()), 1).compute().getLineHashes()).isEqualTo(""); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/DuplicationLineReaderTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/DuplicationLineReaderTest.java index ef4bd739595..3aa0886c1c1 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/DuplicationLineReaderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/DuplicationLineReaderTest.java @@ -45,7 +45,7 @@ public class DuplicationLineReaderTest { @Test public void read_nothing() { - DuplicationLineReader reader = new DuplicationLineReader(Collections.emptySet()); + DuplicationLineReader reader = new DuplicationLineReader(Collections.emptySet()); reader.read(line1); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/HighlightingLineReaderTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/HighlightingLineReaderTest.java index bc984bdd39e..468938ff555 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/HighlightingLineReaderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/HighlightingLineReaderTest.java @@ -79,7 +79,7 @@ public class HighlightingLineReaderTest { @Test public void nothing_to_read() { - HighlightingLineReader highlightingLineReader = newReader(Collections.emptyMap()); + HighlightingLineReader highlightingLineReader = newReader(Collections.emptyMap()); DbFileSources.Line.Builder lineBuilder = newBuilder().addLinesBuilder().setLine(1); highlightingLineReader.read(lineBuilder); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/LastCommitVisitorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/LastCommitVisitorTest.java index dea2111776c..a78976d0ff2 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/LastCommitVisitorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/LastCommitVisitorTest.java @@ -120,7 +120,7 @@ public class LastCommitVisitorTest { .build(); treeRootHolder.setRoot(project); - VisitorsCrawler underTest = new VisitorsCrawler(Lists.newArrayList(visitor)); + VisitorsCrawler underTest = new VisitorsCrawler(Lists.newArrayList(visitor)); underTest.visit(project); assertDate(DIR_1_REF, FILE_2_DATE); @@ -168,7 +168,7 @@ public class LastCommitVisitorTest { measureRepository.addRawMeasure(PROJECT_2_REF, LAST_COMMIT_DATE_KEY, newMeasureBuilder().create(PROJECT_2_DATE)); measureRepository.addRawMeasure(PROJECT_3_REF, LAST_COMMIT_DATE_KEY, newMeasureBuilder().create(PROJECT_3_DATE)); - VisitorsCrawler underTest = new VisitorsCrawler(Lists.newArrayList(new LastCommitVisitor(metricRepository, measureRepository, scmInfoRepository))); + VisitorsCrawler underTest = new VisitorsCrawler(Lists.newArrayList(new LastCommitVisitor(metricRepository, measureRepository, scmInfoRepository))); underTest.visit(view); // second level of sub-views @@ -183,8 +183,8 @@ public class LastCommitVisitorTest { } @Test - public void compute_date_of_file_from_scm_repo() throws Exception { - VisitorsCrawler underTest = new VisitorsCrawler(Lists.newArrayList(new LastCommitVisitor(metricRepository, measureRepository, scmInfoRepository))); + public void compute_date_of_file_from_scm_repo() { + VisitorsCrawler underTest = new VisitorsCrawler(Lists.newArrayList(new LastCommitVisitor(metricRepository, measureRepository, scmInfoRepository))); scmInfoRepository.setScmInfo(FILE_1_REF, Changeset.newChangesetBuilder() @@ -214,8 +214,8 @@ public class LastCommitVisitorTest { } @Test - public void date_is_not_computed_on_file_if_blame_is_not_in_scm_repo() throws Exception { - VisitorsCrawler underTest = new VisitorsCrawler(Lists.newArrayList(new LastCommitVisitor(metricRepository, measureRepository, scmInfoRepository))); + public void date_is_not_computed_on_file_if_blame_is_not_in_scm_repo() { + VisitorsCrawler underTest = new VisitorsCrawler(Lists.newArrayList(new LastCommitVisitor(metricRepository, measureRepository, scmInfoRepository))); ReportComponent file = createFileComponent(FILE_1_REF); treeRootHolder.setRoot(file); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/ReportIteratorTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/ReportIteratorTest.java index 1a18cdfda61..e18d3f468f3 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/ReportIteratorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/ReportIteratorTest.java @@ -79,7 +79,7 @@ public class ReportIteratorTest { } @Test(expected = NoSuchElementException.class) - public void test_error() throws Exception { + public void test_error() { underTest = new ReportIterator<>(file, ScannerReport.LineCoverage.parser()); underTest.next(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepositoryImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepositoryImplTest.java index fc8c4c80de3..d9c94443eb1 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepositoryImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/source/SourceLinesRepositoryImplTest.java @@ -45,21 +45,21 @@ public class SourceLinesRepositoryImplTest { SourceLinesRepositoryImpl underTest = new SourceLinesRepositoryImpl(reportReader); @Test - public void read_lines_from_report() throws Exception { + public void read_lines_from_report() { reportReader.putFileSourceLines(FILE_REF, "line1", "line2"); assertThat(underTest.readLines(createComponent(2))).containsOnly("line1", "line2"); } @Test - public void read_lines_adds_one_extra_empty_line_when_sourceLine_has_elements_count_equals_to_lineCount_minus_1() throws Exception { + public void read_lines_adds_one_extra_empty_line_when_sourceLine_has_elements_count_equals_to_lineCount_minus_1() { reportReader.putFileSourceLines(FILE_REF, "line1", "line2"); assertThat(underTest.readLines(createComponent(3))).containsOnly("line1", "line2", ""); } @Test - public void read_lines_throws_ISE_when_sourceLine_has_less_elements_then_lineCount_minus_1() throws Exception { + public void read_lines_throws_ISE_when_sourceLine_has_less_elements_then_lineCount_minus_1() { reportReader.putFileSourceLines(FILE_REF, "line1", "line2"); thrown.expect(IllegalStateException.class); @@ -69,7 +69,7 @@ public class SourceLinesRepositoryImplTest { } @Test - public void read_lines_throws_ISE_when_sourceLines_has_more_elements_then_lineCount() throws Exception { + public void read_lines_throws_ISE_when_sourceLines_has_more_elements_then_lineCount() { reportReader.putFileSourceLines(FILE_REF, "line1", "line2", "line3"); thrown.expect(IllegalStateException.class); @@ -79,7 +79,7 @@ public class SourceLinesRepositoryImplTest { } @Test - public void fail_with_ISE_when_file_has_no_source() throws Exception { + public void fail_with_ISE_when_file_has_no_source() { thrown.expect(IllegalStateException.class); thrown.expectMessage("File 'ReportComponent{ref=2, key='FILE_KEY', type=FILE}' has no source code"); @@ -90,7 +90,7 @@ public class SourceLinesRepositoryImplTest { } @Test - public void fail_with_NPE_to_read_lines_on_null_component() throws Exception { + public void fail_with_NPE_to_read_lines_on_null_component() { thrown.expect(NullPointerException.class); thrown.expectMessage("Component should not be bull"); @@ -98,7 +98,7 @@ public class SourceLinesRepositoryImplTest { } @Test - public void fail_with_IAE_to_read_lines_on_not_file_component() throws Exception { + public void fail_with_IAE_to_read_lines_on_not_file_component() { thrown.expect(IllegalArgumentException.class); thrown.expectMessage("Component 'ReportComponent{ref=123, key='NotFile', type=PROJECT}' is not a file"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/BuildComponentTreeStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/BuildComponentTreeStepTest.java index 6c4f1b00255..00446e046e0 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/BuildComponentTreeStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/BuildComponentTreeStepTest.java @@ -330,7 +330,7 @@ public class BuildComponentTreeStepTest { } @Test - public void set_no_base_project_snapshot_when_no_snapshot() throws Exception { + public void set_no_base_project_snapshot_when_no_snapshot() { setAnalysisMetadataHolder(); reportReader.putComponent(componentWithKey(ROOT_REF, PROJECT, REPORT_PROJECT_KEY)); underTest.execute(); @@ -339,7 +339,7 @@ public class BuildComponentTreeStepTest { } @Test - public void set_no_base_project_snapshot_when_no_last_snapshot() throws Exception { + public void set_no_base_project_snapshot_when_no_last_snapshot() { setAnalysisMetadataHolder(); OrganizationDto organizationDto = dbTester.organizations().insert(); ComponentDto project = insertComponent(newPrivateProjectDto(organizationDto, "ABCD").setDbKey(REPORT_PROJECT_KEY)); @@ -352,7 +352,7 @@ public class BuildComponentTreeStepTest { } @Test - public void set_base_project_snapshot_when_last_snapshot_exist() throws Exception { + public void set_base_project_snapshot_when_last_snapshot_exist() { setAnalysisMetadataHolder(); OrganizationDto organizationDto = dbTester.organizations().insert(); ComponentDto project = insertComponent(newPrivateProjectDto(organizationDto, "ABCD").setDbKey(REPORT_PROJECT_KEY)); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ComputeQProfileMeasureStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ComputeQProfileMeasureStepTest.java index e59780796ec..e5b6ca7b888 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ComputeQProfileMeasureStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ComputeQProfileMeasureStepTest.java @@ -109,7 +109,7 @@ public class ComputeQProfileMeasureStepTest { } @Test - public void add_quality_profile_measure_on_project() throws Exception { + public void add_quality_profile_measure_on_project() { treeRootHolder.setRoot(MULTI_MODULE_PROJECT); QualityProfile qpJava = createQProfile(QP_NAME_1, LANGUAGE_KEY_1); QualityProfile qpPhp = createQProfile(QP_NAME_2, LANGUAGE_KEY_2); @@ -122,7 +122,7 @@ public class ComputeQProfileMeasureStepTest { } @Test - public void nothing_to_add_when_no_files() throws Exception { + public void nothing_to_add_when_no_files() { ReportComponent project = ReportComponent.builder(PROJECT, PROJECT_REF).build(); treeRootHolder.setRoot(project); @@ -132,7 +132,7 @@ public class ComputeQProfileMeasureStepTest { } @Test - public void fail_if_report_inconsistant() throws Exception { + public void fail_if_report_inconsistant() { treeRootHolder.setRoot(MULTI_MODULE_PROJECT); QualityProfile qpJava = createQProfile(QP_NAME_1, LANGUAGE_KEY_1); analysisMetadataHolder.setQProfilesByLanguage(ImmutableMap.of(LANGUAGE_KEY_1, qpJava)); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/CustomMeasuresCopyStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/CustomMeasuresCopyStepTest.java index cc5d5a10aff..7a1f6e3c154 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/CustomMeasuresCopyStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/CustomMeasuresCopyStepTest.java @@ -160,42 +160,42 @@ public class CustomMeasuresCopyStepTest { } @Test - public void test_float_metric_type() throws Exception { + public void test_float_metric_type() { CustomMeasureDto dto = new CustomMeasureDto(); dto.setValue(10.0); assertThat(dtoToMeasure(dto, new MetricImpl(1, "m", "M", Metric.MetricType.FLOAT)).getDoubleValue()).isEqualTo(10.0); } @Test - public void test_int_metric_type() throws Exception { + public void test_int_metric_type() { CustomMeasureDto dto = new CustomMeasureDto(); dto.setValue(10.0); assertThat(dtoToMeasure(dto, new MetricImpl(1, "m", "M", Metric.MetricType.INT)).getIntValue()).isEqualTo(10); } @Test - public void test_long_metric_type() throws Exception { + public void test_long_metric_type() { CustomMeasureDto dto = new CustomMeasureDto(); dto.setValue(10.0); assertThat(dtoToMeasure(dto, new MetricImpl(1, "m", "M", Metric.MetricType.WORK_DUR)).getLongValue()).isEqualTo(10); } @Test - public void test_percent_metric_type() throws Exception { + public void test_percent_metric_type() { CustomMeasureDto dto = new CustomMeasureDto(); dto.setValue(10.0); assertThat(dtoToMeasure(dto, new MetricImpl(1, "m", "M", Metric.MetricType.PERCENT)).getDoubleValue()).isEqualTo(10); } @Test - public void test_string_metric_type() throws Exception { + public void test_string_metric_type() { CustomMeasureDto dto = new CustomMeasureDto(); dto.setTextValue("foo"); assertThat(dtoToMeasure(dto, new MetricImpl(1, "m", "M", Metric.MetricType.STRING)).getStringValue()).isEqualTo("foo"); } @Test - public void test_string_metric_type_with_null_value() throws Exception { + public void test_string_metric_type_with_null_value() { CustomMeasureDto dto = new CustomMeasureDto(); dto.setTextValue(null); @@ -204,7 +204,7 @@ public class CustomMeasuresCopyStepTest { } @Test - public void test_data_metric_type_with_null_value() throws Exception { + public void test_data_metric_type_with_null_value() { CustomMeasureDto dto = new CustomMeasureDto(); dto.setTextValue(null); @@ -213,7 +213,7 @@ public class CustomMeasuresCopyStepTest { } @Test - public void test_ditrib_metric_type_with_null_value() throws Exception { + public void test_ditrib_metric_type_with_null_value() { CustomMeasureDto dto = new CustomMeasureDto(); dto.setTextValue(null); @@ -222,14 +222,14 @@ public class CustomMeasuresCopyStepTest { } @Test - public void test_LEVEL_metric_type() throws Exception { + public void test_LEVEL_metric_type() { CustomMeasureDto dto = new CustomMeasureDto(); dto.setTextValue("OK"); assertThat(dtoToMeasure(dto, new MetricImpl(1, "m", "M", Metric.MetricType.LEVEL)).getLevelValue()).isEqualTo(Measure.Level.OK); } @Test - public void test_boolean_metric_type() throws Exception { + public void test_boolean_metric_type() { MetricImpl booleanMetric = new MetricImpl(1, "m", "M", Metric.MetricType.BOOL); CustomMeasureDto dto = new CustomMeasureDto(); assertThat(dtoToMeasure(dto.setValue(1.0), booleanMetric).getBooleanValue()).isTrue(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ExecuteVisitorsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ExecuteVisitorsStepTest.java index 3c977097d8d..2e976e3e9c6 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ExecuteVisitorsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ExecuteVisitorsStepTest.java @@ -87,7 +87,7 @@ public class ExecuteVisitorsStepTest { } @Test - public void execute_with_type_aware_visitor() throws Exception { + public void execute_with_type_aware_visitor() { ExecuteVisitorsStep underStep = new ExecuteVisitorsStep(treeRootHolder, singletonList(new TestTypeAwareVisitor())); measureRepository.addRawMeasure(FILE_1_REF, NCLOC_KEY, newMeasureBuilder().create(1)); @@ -106,7 +106,7 @@ public class ExecuteVisitorsStepTest { } @Test - public void execute_with_path_aware_visitor() throws Exception { + public void execute_with_path_aware_visitor() { ExecuteVisitorsStep underStep = new ExecuteVisitorsStep(treeRootHolder, singletonList(new TestPathAwareVisitor())); measureRepository.addRawMeasure(FILE_1_REF, NCLOC_KEY, newMeasureBuilder().create(1)); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ExtractReportStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ExtractReportStepTest.java index 38a6a5e9d56..30488809ea2 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ExtractReportStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ExtractReportStepTest.java @@ -62,7 +62,7 @@ public class ExtractReportStepTest { private ExtractReportStep underTest = new ExtractReportStep(dbTester.getDbClient(), ceTask, tempFolder, reportDirectoryHolder); @Test - public void fail_if_report_zip_does_not_exist() throws Exception { + public void fail_if_report_zip_does_not_exist() { expectedException.expect(MessageException.class); expectedException.expectMessage("Analysis report 1 is missing in database"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadCrossProjectDuplicationsRepositoryStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadCrossProjectDuplicationsRepositoryStepTest.java index f7f9b0f482a..21c3c384b56 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadCrossProjectDuplicationsRepositoryStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadCrossProjectDuplicationsRepositoryStepTest.java @@ -122,7 +122,7 @@ public class LoadCrossProjectDuplicationsRepositoryStepTest { } @Test - public void call_compute_cpd_on_one_duplication() throws Exception { + public void call_compute_cpd_on_one_duplication() { when(crossProjectDuplicationStatusHolder.isEnabled()).thenReturn(true); analysisMetadataHolder.setBaseAnalysis(baseProjectAnalysis); @@ -172,7 +172,7 @@ public class LoadCrossProjectDuplicationsRepositoryStepTest { } @Test - public void call_compute_cpd_on_many_duplication() throws Exception { + public void call_compute_cpd_on_many_duplication() { when(crossProjectDuplicationStatusHolder.isEnabled()).thenReturn(true); analysisMetadataHolder.setBaseAnalysis(baseProjectAnalysis); @@ -260,7 +260,7 @@ public class LoadCrossProjectDuplicationsRepositoryStepTest { } @Test - public void nothing_to_do_when_cross_project_duplication_is_disabled() throws Exception { + public void nothing_to_do_when_cross_project_duplication_is_disabled() { when(crossProjectDuplicationStatusHolder.isEnabled()).thenReturn(false); analysisMetadataHolder.setBaseAnalysis(baseProjectAnalysis); @@ -295,11 +295,11 @@ public class LoadCrossProjectDuplicationsRepositoryStepTest { } @Test - public void nothing_to_do_when_no_cpd_text_blocks_found() throws Exception { + public void nothing_to_do_when_no_cpd_text_blocks_found() { when(crossProjectDuplicationStatusHolder.isEnabled()).thenReturn(true); analysisMetadataHolder.setBaseAnalysis(baseProjectAnalysis); - batchReportReader.putDuplicationBlocks(FILE_REF, Collections.emptyList()); + batchReportReader.putDuplicationBlocks(FILE_REF, Collections.emptyList()); underTest.execute(); @@ -307,7 +307,7 @@ public class LoadCrossProjectDuplicationsRepositoryStepTest { } @Test - public void nothing_to_do_when_cpd_text_blocks_exists_but_no_duplicated_found() throws Exception { + public void nothing_to_do_when_cpd_text_blocks_exists_but_no_duplicated_found() { when(crossProjectDuplicationStatusHolder.isEnabled()).thenReturn(true); analysisMetadataHolder.setBaseAnalysis(baseProjectAnalysis); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadMeasureComputersStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadMeasureComputersStepTest.java index 793eea9fdaf..74e389bbb57 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadMeasureComputersStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadMeasureComputersStepTest.java @@ -57,7 +57,7 @@ public class LoadMeasureComputersStepTest { MeasureComputersHolderImpl holder = new MeasureComputersHolderImpl(); @Test - public void support_core_metrics_as_input_metrics() throws Exception { + public void support_core_metrics_as_input_metrics() { MeasureComputer[] computers = new MeasureComputer[] {newMeasureComputer(array(NCLOC_KEY), array(NEW_METRIC_1))}; ComputationStep underTest = new LoadMeasureComputersStep(holder, array(new TestMetrics()), computers); underTest.execute(); @@ -66,7 +66,7 @@ public class LoadMeasureComputersStepTest { } @Test - public void support_plugin_metrics_as_input_metrics() throws Exception { + public void support_plugin_metrics_as_input_metrics() { MeasureComputer[] computers = new MeasureComputer[] {newMeasureComputer(array(NEW_METRIC_1), array(NEW_METRIC_2))}; ComputationStep underTest = new LoadMeasureComputersStep(holder, array(new TestMetrics()), computers); underTest.execute(); @@ -75,7 +75,7 @@ public class LoadMeasureComputersStepTest { } @Test - public void sort_computers() throws Exception { + public void sort_computers() { // Should be the last to be executed MeasureComputer measureComputer1 = newMeasureComputer(array(NEW_METRIC_3), array(NEW_METRIC_4)); // Should be the first to be executed @@ -95,7 +95,7 @@ public class LoadMeasureComputersStepTest { } @Test - public void sort_computers_when_one_computer_has_no_input_metric() throws Exception { + public void sort_computers_when_one_computer_has_no_input_metric() { // Should be the last to be executed MeasureComputer measureComputer1 = newMeasureComputer(array(NEW_METRIC_3), array(NEW_METRIC_4)); // Should be the first to be executed @@ -115,7 +115,7 @@ public class LoadMeasureComputersStepTest { } @Test - public void fail_with_ISE_when_input_metric_is_unknown() throws Exception { + public void fail_with_ISE_when_input_metric_is_unknown() { thrown.expect(IllegalStateException.class); thrown.expectMessage("Metric 'unknown' cannot be used as an input metric as it's not a core metric and no plugin declare this metric"); @@ -125,7 +125,7 @@ public class LoadMeasureComputersStepTest { } @Test - public void fail_with_ISE_when_output_metric_is_not_define_by_plugin() throws Exception { + public void fail_with_ISE_when_output_metric_is_not_define_by_plugin() { thrown.expect(IllegalStateException.class); thrown.expectMessage("Metric 'unknown' cannot be used as an output metric because no plugins declare this metric"); @@ -135,7 +135,7 @@ public class LoadMeasureComputersStepTest { } @Test - public void fail_with_ISE_when_output_metric_is_a_core_metric() throws Exception { + public void fail_with_ISE_when_output_metric_is_a_core_metric() { thrown.expect(IllegalStateException.class); thrown.expectMessage("Metric 'ncloc' cannot be used as an output metric because it's a core metric"); @@ -145,7 +145,7 @@ public class LoadMeasureComputersStepTest { } @Test - public void not_fail_if_input_metrics_are_same_as_output_metrics() throws Exception { + public void not_fail_if_input_metrics_are_same_as_output_metrics() { MeasureComputer[] computers = new MeasureComputer[] {newMeasureComputer(array(NEW_METRIC_1), array(NEW_METRIC_1))}; ComputationStep underTest = new LoadMeasureComputersStep(holder, array(new TestMetrics()), computers); underTest.execute(); @@ -154,7 +154,7 @@ public class LoadMeasureComputersStepTest { } @Test - public void return_empty_list_when_no_measure_computers() throws Exception { + public void return_empty_list_when_no_measure_computers() { ComputationStep underTest = new LoadMeasureComputersStep(holder, array(new TestMetrics())); underTest.execute(); @@ -162,7 +162,7 @@ public class LoadMeasureComputersStepTest { } @Test - public void return_empty_list_when_no_metrics_neither_measure_computers() throws Exception { + public void return_empty_list_when_no_metrics_neither_measure_computers() { ComputationStep underTest = new LoadMeasureComputersStep(holder); underTest.execute(); @@ -170,7 +170,7 @@ public class LoadMeasureComputersStepTest { } @Test - public void fail_with_ISE_when_no_metrics_are_defined_by_plugin_but_measure_computer_use_a_new_metric() throws Exception { + public void fail_with_ISE_when_no_metrics_are_defined_by_plugin_but_measure_computer_use_a_new_metric() { thrown.expect(IllegalStateException.class); thrown.expectMessage("Metric 'metric1' cannot be used as an output metric because no plugins declare this metric"); @@ -180,7 +180,7 @@ public class LoadMeasureComputersStepTest { } @Test - public void fail_with_ISE_when_two_measure_computers_generate_the_same_output_metric() throws Exception { + public void fail_with_ISE_when_two_measure_computers_generate_the_same_output_metric() { thrown.expect(IllegalStateException.class); thrown.expectMessage("Output metric 'metric1' is already defined by another measure computer 'TestMeasureComputer'"); @@ -190,7 +190,7 @@ public class LoadMeasureComputersStepTest { } @Test - public void fail_with_IAE_when_creating_measure_computer_definition_without_using_the_builder_and_with_invalid_output_metrics() throws Exception { + public void fail_with_IAE_when_creating_measure_computer_definition_without_using_the_builder_and_with_invalid_output_metrics() { thrown.expect(IllegalArgumentException.class); thrown.expectMessage("At least one output metric must be defined"); @@ -248,7 +248,7 @@ public class LoadMeasureComputersStepTest { private static class TestMetrics implements Metrics { @Override public List getMetrics() { - return Lists.newArrayList( + return Lists.newArrayList( new Metric.Builder(NEW_METRIC_1, "metric1", DATA).create(), new Metric.Builder(NEW_METRIC_2, "metric2", MILLISEC).create(), new Metric.Builder(NEW_METRIC_3, "metric3", INT).create(), diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadQualityProfilesStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadQualityProfilesStepTest.java index 2f078f2a479..62b0df8ce39 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadQualityProfilesStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/LoadQualityProfilesStepTest.java @@ -50,7 +50,7 @@ public class LoadQualityProfilesStepTest { LoadQualityProfilesStep underTest = new LoadQualityProfilesStep(batchReportReader, activeRulesHolder, ruleRepository); @Test - public void feed_active_rules() throws Exception { + public void feed_active_rules() { ruleRepository.add(XOO_X1) .setPluginKey("xoo"); ruleRepository.add(XOO_X2) @@ -81,7 +81,7 @@ public class LoadQualityProfilesStepTest { } @Test - public void ignore_rules_with_status_REMOVED() throws Exception { + public void ignore_rules_with_status_REMOVED() { ruleRepository.add(new DumbRule(XOO_X1).setStatus(RuleStatus.REMOVED)); ScannerReport.ActiveRule.Builder batch1 = ScannerReport.ActiveRule.newBuilder() @@ -95,7 +95,7 @@ public class LoadQualityProfilesStepTest { } @Test - public void ignore_not_found_rules() throws Exception { + public void ignore_not_found_rules() { ScannerReport.ActiveRule.Builder batch1 = ScannerReport.ActiveRule.newBuilder() .setRuleRepository(XOO_X1.repository()).setRuleKey(XOO_X1.rule()) .setSeverity(Constants.Severity.BLOCKER); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistCrossProjectDuplicationIndexStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistCrossProjectDuplicationIndexStepTest.java index 9b79ed819cb..a17e8d090b6 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistCrossProjectDuplicationIndexStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistCrossProjectDuplicationIndexStepTest.java @@ -97,7 +97,7 @@ public class PersistCrossProjectDuplicationIndexStepTest { } @Test - public void persist_cpd_text_block() throws Exception { + public void persist_cpd_text_block() { when(crossProjectDuplicationStatusHolder.isEnabled()).thenReturn(true); reportReader.putDuplicationBlocks(FILE_1_REF, singletonList(CPD_TEXT_BLOCK)); @@ -113,7 +113,7 @@ public class PersistCrossProjectDuplicationIndexStepTest { } @Test - public void persist_many_cpd_text_blocks() throws Exception { + public void persist_many_cpd_text_blocks() { when(crossProjectDuplicationStatusHolder.isEnabled()).thenReturn(true); reportReader.putDuplicationBlocks(FILE_1_REF, Arrays.asList( CPD_TEXT_BLOCK, @@ -135,9 +135,9 @@ public class PersistCrossProjectDuplicationIndexStepTest { } @Test - public void nothing_to_persist_when_no_cpd_text_blocks_in_report() throws Exception { + public void nothing_to_persist_when_no_cpd_text_blocks_in_report() { when(crossProjectDuplicationStatusHolder.isEnabled()).thenReturn(true); - reportReader.putDuplicationBlocks(FILE_1_REF, Collections.emptyList()); + reportReader.putDuplicationBlocks(FILE_1_REF, Collections.emptyList()); underTest.execute(); @@ -145,7 +145,7 @@ public class PersistCrossProjectDuplicationIndexStepTest { } @Test - public void nothing_to_do_when_cross_project_duplication_is_disabled() throws Exception { + public void nothing_to_do_when_cross_project_duplication_is_disabled() { when(crossProjectDuplicationStatusHolder.isEnabled()).thenReturn(false); reportReader.putDuplicationBlocks(FILE_1_REF, singletonList(CPD_TEXT_BLOCK)); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest.java index b3ee95db83f..0eb615c6e3e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistEventsStepTest.java @@ -86,7 +86,7 @@ public class PersistEventsStepTest extends BaseStepTest { when(system2.now()).thenReturn(1225630680000L); analysisMetadataHolder.setAnalysisDate(someDate.getTime()).setUuid(ANALYSIS_UUID); underTest = new PersistEventsStep(dbTester.getDbClient(), system2, treeRootHolder, analysisMetadataHolder, eventRepository, uuidFactory); - when(eventRepository.getEvents(any(Component.class))).thenReturn(Collections.emptyList()); + when(eventRepository.getEvents(any(Component.class))).thenReturn(Collections.emptyList()); } @Override diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistFileSourcesStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistFileSourcesStepTest.java index e59a809a18b..a4500b8f81d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistFileSourcesStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/PersistFileSourcesStepTest.java @@ -240,7 +240,7 @@ public class PersistFileSourcesStepTest extends BaseStepTest { duplicationRepository.add( FILE1_REF, - new Duplication(new TextBlock(1, 2), Arrays.asList(new InnerDuplicate(new TextBlock(3, 4))))); + new Duplication(new TextBlock(1, 2), Arrays.asList(new InnerDuplicate(new TextBlock(3, 4))))); underTest.execute(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateEventsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateEventsStepTest.java index c54e372d0f6..79e011e2d6d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateEventsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateEventsStepTest.java @@ -94,7 +94,7 @@ public class QualityGateEventsStepTest { @Test public void no_event_if_no_raw_ALERT_STATUS_measure() { - when(measureRepository.getRawMeasure(PROJECT_COMPONENT, alertStatusMetric)).thenReturn(Optional.absent()); + when(measureRepository.getRawMeasure(PROJECT_COMPONENT, alertStatusMetric)).thenReturn(Optional.absent()); underTest.execute(); @@ -113,7 +113,7 @@ public class QualityGateEventsStepTest { } private static Optional of(Measure measure) { - return Optional.of((Measure) measure); + return Optional.of(measure); } @Test diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateMeasuresStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateMeasuresStepTest.java index 072c9fec867..e192a6a140b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateMeasuresStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityGateMeasuresStepTest.java @@ -103,7 +103,7 @@ public class QualityGateMeasuresStepTest { // mock response of asText to any argument to return the result of dumbResultTextAnswer method when(resultTextConverter.asText(any(Condition.class), any(EvaluationResult.class))).thenAnswer(new Answer() { @Override - public String answer(InvocationOnMock invocation) throws Throwable { + public String answer(InvocationOnMock invocation) { Condition condition = (Condition) invocation.getArguments()[0]; EvaluationResult evaluationResult = (EvaluationResult) invocation.getArguments()[1]; return dumbResultTextAnswer(condition, evaluationResult.getLevel(), evaluationResult.getValue()); @@ -161,7 +161,7 @@ public class QualityGateMeasuresStepTest { .hasQualityGateLevel(OK) .hasQualityGateText(""); assertThat(getQGDetailsMeasure()) - .hasValue(new QualityGateDetailsData(OK, Collections.emptyList(), false).toJson()); + .hasValue(new QualityGateDetailsData(OK, Collections.emptyList(), false).toJson()); QualityGateStatusHolderAssertions.assertThat(qualityGateStatusHolder) .hasStatus(QualityGateStatus.OK) diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityProfileEventsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityProfileEventsStepTest.java index f90c5cd7f6b..7a256d9f008 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityProfileEventsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/QualityProfileEventsStepTest.java @@ -90,7 +90,7 @@ public class QualityProfileEventsStepTest { @Test public void no_event_if_no_base_measure() { - when(measureRepository.getBaseMeasure(treeRootHolder.getRoot(), qualityProfileMetric)).thenReturn(Optional.absent()); + when(measureRepository.getBaseMeasure(treeRootHolder.getRoot(), qualityProfileMetric)).thenReturn(Optional.absent()); underTest.execute(); @@ -100,7 +100,7 @@ public class QualityProfileEventsStepTest { @Test public void no_event_if_no_raw_measure() { when(measureRepository.getBaseMeasure(treeRootHolder.getRoot(), qualityProfileMetric)).thenReturn(Optional.of(newMeasure())); - when(measureRepository.getRawMeasure(treeRootHolder.getRoot(), qualityProfileMetric)).thenReturn(Optional.absent()); + when(measureRepository.getRawMeasure(treeRootHolder.getRoot(), qualityProfileMetric)).thenReturn(Optional.absent()); underTest.execute(); @@ -206,7 +206,7 @@ public class QualityProfileEventsStepTest { final Set events = new HashSet<>(); doAnswer(new Answer() { @Override - public Object answer(InvocationOnMock invocationOnMock) throws Throwable { + public Object answer(InvocationOnMock invocationOnMock) { events.add((Event) invocationOnMock.getArguments()[1]); return null; } @@ -247,11 +247,11 @@ public class QualityProfileEventsStepTest { } private void mockLanguageNotInRepository(String languageKey) { - when(languageRepository.find(languageKey)).thenReturn(Optional.absent()); + when(languageRepository.find(languageKey)).thenReturn(Optional.absent()); } private void mockNoLanguageInRepository() { - when(languageRepository.find(anyString())).thenReturn(Optional.absent()); + when(languageRepository.find(anyString())).thenReturn(Optional.absent()); } private void mockMeasures(Component component, @Nullable QualityProfile[] previous, @Nullable QualityProfile[] current) { @@ -286,7 +286,7 @@ public class QualityProfileEventsStepTest { } private static String toJson(@Nullable QualityProfile... qps) { - List qualityProfiles = qps == null ? Collections.emptyList() : Arrays.asList(qps); + List qualityProfiles = qps == null ? Collections.emptyList() : Arrays.asList(qps); return QPMeasureData.toJson(new QPMeasureData(qualityProfiles)); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComplexityMeasuresStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComplexityMeasuresStepTest.java index 972d0fe698b..8f9a95b0fad 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComplexityMeasuresStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComplexityMeasuresStepTest.java @@ -113,22 +113,22 @@ public class ReportComplexityMeasuresStepTest { private ComputationStep underTest = new ComplexityMeasuresStep(treeRootHolder, metricRepository, measureRepository); @Test - public void aggregate_complexity() throws Exception { + public void aggregate_complexity() { verify_sum_aggregation(COMPLEXITY_KEY); } @Test - public void aggregate_complexity_in_classes() throws Exception { + public void aggregate_complexity_in_classes() { verify_sum_aggregation(COMPLEXITY_IN_CLASSES_KEY); } @Test - public void aggregate_complexity_in_functions() throws Exception { + public void aggregate_complexity_in_functions() { verify_sum_aggregation(COMPLEXITY_IN_FUNCTIONS_KEY); } @Test - public void aggregate_cognitive_complexity() throws Exception { + public void aggregate_cognitive_complexity() { verify_sum_aggregation(COGNITIVE_COMPLEXITY_KEY); } @@ -149,17 +149,17 @@ public class ReportComplexityMeasuresStepTest { } @Test - public void aggregate_function_complexity_distribution() throws Exception { + public void aggregate_function_complexity_distribution() { verify_distribution_aggregation(FUNCTION_COMPLEXITY_DISTRIBUTION_KEY); } @Test - public void aggregate_file_complexity_distribution() throws Exception { + public void aggregate_file_complexity_distribution() { verify_distribution_aggregation(FILE_COMPLEXITY_DISTRIBUTION_KEY); } @Test - public void aggregate_class_complexity_distribution() throws Exception { + public void aggregate_class_complexity_distribution() { verify_distribution_aggregation(CLASS_COMPLEXITY_DISTRIBUTION_KEY); } @@ -180,17 +180,17 @@ public class ReportComplexityMeasuresStepTest { } @Test - public void compute_and_aggregate_file_complexity() throws Exception { + public void compute_and_aggregate_file_complexity() { verify_average_compute_and_aggregation(FILE_COMPLEXITY_KEY, COMPLEXITY_KEY, FILES_KEY); } @Test - public void compute_and_aggregate_class_complexity() throws Exception { + public void compute_and_aggregate_class_complexity() { verify_average_compute_and_aggregation(CLASS_COMPLEXITY_KEY, COMPLEXITY_IN_CLASSES_KEY, CLASSES_KEY); } @Test - public void compute_and_aggregate_function_complexity() throws Exception { + public void compute_and_aggregate_function_complexity() { verify_average_compute_and_aggregation(FUNCTION_COMPLEXITY_KEY, COMPLEXITY_IN_FUNCTIONS_KEY, FUNCTIONS_KEY); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputationStepsTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputationStepsTest.java index 1461deece8c..8e42d781866 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputationStepsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputationStepsTest.java @@ -35,7 +35,7 @@ public class ReportComputationStepsTest { public ExpectedException expectedException = ExpectedException.none(); @Test - public void instances_throws_ISE_if_container_does_not_have_any_step() throws Exception { + public void instances_throws_ISE_if_container_does_not_have_any_step() { expectedException.expect(IllegalStateException.class); expectedException.expectMessage("Component not found: " + ExtractReportStep.class); @@ -50,7 +50,7 @@ public class ReportComputationStepsTest { } @Test - public void instances_throws_ISE_if_container_does_not_have_second_step() throws Exception { + public void instances_throws_ISE_if_container_does_not_have_second_step() { expectedException.expect(IllegalStateException.class); expectedException.expectMessage("Component not found: class org.sonar.server.computation.task.projectanalysis.step.PersistScannerContextStep"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputeMeasureVariationsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputeMeasureVariationsStepTest.java index 6ef5e5878c4..82d64c9a12e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputeMeasureVariationsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ReportComputeMeasureVariationsStepTest.java @@ -173,7 +173,7 @@ public class ReportComputeMeasureVariationsStepTest { } @Test - public void set_variation_to_raw_value_on_new_component() throws Exception { + public void set_variation_to_raw_value_on_new_component() { // Project SnapshotDto past1ProjectSnapshot = newAnalysis(project).setCreatedAt(1000_000_000L); SnapshotDto currentProjectSnapshot = newAnalysis(project).setCreatedAt(2000_000_000L); @@ -253,7 +253,7 @@ public class ReportComputeMeasureVariationsStepTest { } @Test - public void does_not_update_existing_variation() throws Exception { + public void does_not_update_existing_variation() { SnapshotDto period1ProjectSnapshot = newAnalysis(project); dbClient.snapshotDao().insert(session, period1ProjectSnapshot); dbClient.measureDao().insert(session, newMeasureDto(NEW_DEBT.getId(), PROJECT_UUID, period1ProjectSnapshot.getUuid(), 60d)); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/SendIssueNotificationsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/SendIssueNotificationsStepTest.java index 4016e670807..df5504a054a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/SendIssueNotificationsStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/SendIssueNotificationsStepTest.java @@ -134,7 +134,7 @@ public class SendIssueNotificationsStepTest extends BaseStepTest { } @Test - public void send_global_new_issues_notification() throws Exception { + public void send_global_new_issues_notification() { issueCache.newAppender().append( new DefaultIssue().setType(randomRuleType).setEffort(ISSUE_DURATION) .setCreationDate(new Date(ANALYSE_DATE))) @@ -197,7 +197,7 @@ public class SendIssueNotificationsStepTest extends BaseStepTest { } @Test - public void send_global_new_issues_notification_on_branch() throws Exception { + public void send_global_new_issues_notification_on_branch() { ComponentDto branch = setUpProjectWithBranch(); issueCache.newAppender().append( new DefaultIssue().setType(randomRuleType).setEffort(ISSUE_DURATION).setCreationDate(new Date(ANALYSE_DATE))).close(); @@ -214,7 +214,7 @@ public class SendIssueNotificationsStepTest extends BaseStepTest { } @Test - public void do_not_send_global_new_issues_notification_on_branch_if_issue_has_been_backdated() throws Exception { + public void do_not_send_global_new_issues_notification_on_branch_if_issue_has_been_backdated() { ComponentDto branch = setUpProjectWithBranch(); issueCache.newAppender().append( new DefaultIssue().setType(randomRuleType).setEffort(ISSUE_DURATION).setCreationDate(new Date(ANALYSE_DATE - FIVE_MINUTES_IN_MS))).close(); @@ -227,7 +227,7 @@ public class SendIssueNotificationsStepTest extends BaseStepTest { } @Test - public void send_new_issues_notification_to_user() throws Exception { + public void send_new_issues_notification_to_user() { issueCache.newAppender().append( new DefaultIssue().setType(randomRuleType).setEffort(ISSUE_DURATION).setAssignee(ISSUE_ASSIGNEE) .setCreationDate(new Date(ANALYSE_DATE))) @@ -300,7 +300,7 @@ public class SendIssueNotificationsStepTest extends BaseStepTest { } @Test - public void send_new_issues_notification_to_user_only_for_non_backdated_issues() throws Exception { + public void send_new_issues_notification_to_user_only_for_non_backdated_issues() { Random random = new Random(); Integer[] efforts = IntStream.range(0, 1 + random.nextInt(10)).mapToObj(i -> 10_000 * i).toArray(Integer[]::new); Integer[] backDatedEfforts = IntStream.range(0, 1 + random.nextInt(10)).mapToObj(i -> 10 + random.nextInt(100)).toArray(Integer[]::new); @@ -337,7 +337,7 @@ public class SendIssueNotificationsStepTest extends BaseStepTest { } @Test - public void do_not_send_new_issues_notification_to_user_if_issue_is_backdated() throws Exception { + public void do_not_send_new_issues_notification_to_user_if_issue_is_backdated() { issueCache.newAppender().append( new DefaultIssue().setType(randomRuleType).setEffort(ISSUE_DURATION).setAssignee(ISSUE_ASSIGNEE) .setCreationDate(new Date(ANALYSE_DATE - FIVE_MINUTES_IN_MS))) @@ -350,12 +350,12 @@ public class SendIssueNotificationsStepTest extends BaseStepTest { } @Test - public void send_issues_change_notification() throws Exception { + public void send_issues_change_notification() { sendIssueChangeNotification(ANALYSE_DATE); } @Test - public void send_issues_change_notification_even_if_issue_is_backdated() throws Exception { + public void send_issues_change_notification_even_if_issue_is_backdated() { sendIssueChangeNotification(ANALYSE_DATE - FIVE_MINUTES_IN_MS); } @@ -385,12 +385,12 @@ public class SendIssueNotificationsStepTest extends BaseStepTest { } @Test - public void send_issues_change_notification_on_branch() throws Exception { + public void send_issues_change_notification_on_branch() { sendIssueChangeNotificationOnBranch(ANALYSE_DATE); } @Test - public void send_issues_change_notification_on_branch_even_if_issue_is_backdated() throws Exception { + public void send_issues_change_notification_on_branch_even_if_issue_is_backdated() { sendIssueChangeNotificationOnBranch(ANALYSE_DATE - FIVE_MINUTES_IN_MS); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/SmallChangesetQualityGateSpecialCaseTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/SmallChangesetQualityGateSpecialCaseTest.java index e27cd79e4e1..11be6430833 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/SmallChangesetQualityGateSpecialCaseTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/SmallChangesetQualityGateSpecialCaseTest.java @@ -56,7 +56,7 @@ public class SmallChangesetQualityGateSpecialCaseTest { private final SmallChangesetQualityGateSpecialCase underTest = new SmallChangesetQualityGateSpecialCase(measureRepository, metricRepository); @Test - public void ignore_errors_about_new_coverage_for_small_changesets() throws Exception { + public void ignore_errors_about_new_coverage_for_small_changesets() { QualityGateMeasuresStep.MetricEvaluationResult metricEvaluationResult = generateEvaluationResult(NEW_COVERAGE_KEY, ERROR); Component project = generateNewRootProject(); measureRepository.addRawMeasure(PROJECT_REF, CoreMetrics.NEW_LINES_KEY, newMeasureBuilder().setVariation(19).create(1000)); @@ -67,7 +67,7 @@ public class SmallChangesetQualityGateSpecialCaseTest { } @Test - public void ignore_warnings_about_new_coverage_for_small_changesets() throws Exception { + public void ignore_warnings_about_new_coverage_for_small_changesets() { QualityGateMeasuresStep.MetricEvaluationResult metricEvaluationResult = generateEvaluationResult(NEW_COVERAGE_KEY, WARN); Component project = generateNewRootProject(); measureRepository.addRawMeasure(PROJECT_REF, CoreMetrics.NEW_LINES_KEY, newMeasureBuilder().setVariation(19).create(1000)); @@ -78,7 +78,7 @@ public class SmallChangesetQualityGateSpecialCaseTest { } @Test - public void should_not_change_for_bigger_changesets() throws Exception { + public void should_not_change_for_bigger_changesets() { QualityGateMeasuresStep.MetricEvaluationResult metricEvaluationResult = generateEvaluationResult(NEW_COVERAGE_KEY, ERROR); Component project = generateNewRootProject(); measureRepository.addRawMeasure(PROJECT_REF, CoreMetrics.NEW_LINES_KEY, newMeasureBuilder().setVariation(20).create(1000)); @@ -89,7 +89,7 @@ public class SmallChangesetQualityGateSpecialCaseTest { } @Test - public void should_not_change_issue_related_metrics() throws Exception { + public void should_not_change_issue_related_metrics() { QualityGateMeasuresStep.MetricEvaluationResult metricEvaluationResult = generateEvaluationResult(NEW_BUGS_KEY, ERROR); Component project = generateNewRootProject(); measureRepository.addRawMeasure(PROJECT_REF, CoreMetrics.NEW_LINES_KEY, newMeasureBuilder().setVariation(19).create(1000)); @@ -100,7 +100,7 @@ public class SmallChangesetQualityGateSpecialCaseTest { } @Test - public void should_not_change_green_conditions() throws Exception { + public void should_not_change_green_conditions() { QualityGateMeasuresStep.MetricEvaluationResult metricEvaluationResult = generateEvaluationResult(NEW_BUGS_KEY, OK); Component project = generateNewRootProject(); measureRepository.addRawMeasure(PROJECT_REF, CoreMetrics.NEW_LINES_KEY, newMeasureBuilder().setVariation(19).create(1000)); @@ -111,7 +111,7 @@ public class SmallChangesetQualityGateSpecialCaseTest { } @Test - public void should_not_change_quality_gate_if_new_lines_is_not_defined() throws Exception { + public void should_not_change_quality_gate_if_new_lines_is_not_defined() { QualityGateMeasuresStep.MetricEvaluationResult metricEvaluationResult = generateEvaluationResult(NEW_COVERAGE_KEY, ERROR); Component project = generateNewRootProject(); @@ -121,7 +121,7 @@ public class SmallChangesetQualityGateSpecialCaseTest { } @Test - public void should_silently_ignore_null_values() throws Exception { + public void should_silently_ignore_null_values() { boolean result = underTest.appliesTo(mock(Component.class), null); @@ -129,7 +129,7 @@ public class SmallChangesetQualityGateSpecialCaseTest { } @Test - public void apply() throws Exception { + public void apply() { Comparable value = mock(Comparable.class); Condition condition = mock(Condition.class); QualityGateMeasuresStep.MetricEvaluationResult original = new QualityGateMeasuresStep.MetricEvaluationResult( diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/UpdateQualityProfilesLastUsedDateStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/UpdateQualityProfilesLastUsedDateStepTest.java index b499996d38e..be485d6b703 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/UpdateQualityProfilesLastUsedDateStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/UpdateQualityProfilesLastUsedDateStepTest.java @@ -105,7 +105,7 @@ public class UpdateQualityProfilesLastUsedDateStepTest { } @Test - public void ancestor_profiles_are_updated() throws Exception { + public void ancestor_profiles_are_updated() { // Parent profiles should be updated QProfileDto rootProfile = newQualityProfileDto().setKee("root"); QProfileDto parentProfile = newQualityProfileDto().setKee("parent").setParentKee(rootProfile.getKee()); @@ -126,7 +126,7 @@ public class UpdateQualityProfilesLastUsedDateStepTest { } @Test - public void fail_when_profile_is_linked_to_unknown_parent() throws Exception { + public void fail_when_profile_is_linked_to_unknown_parent() { QProfileDto currentProfile = newQualityProfileDto().setKee("current").setParentKee("unknown"); qualityProfileDb.insert(currentProfile); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsComplexityMeasuresStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsComplexityMeasuresStepTest.java index 3a40b913f43..b4390f0ce04 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsComplexityMeasuresStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/step/ViewsComplexityMeasuresStepTest.java @@ -112,22 +112,22 @@ public class ViewsComplexityMeasuresStepTest { private ComputationStep underTest = new ComplexityMeasuresStep(treeRootHolder, metricRepository, measureRepository); @Test - public void aggregate_complexity() throws Exception { + public void aggregate_complexity() { verify_sum_aggregation(COMPLEXITY_KEY); } @Test - public void aggregate_complexity_in_classes() throws Exception { + public void aggregate_complexity_in_classes() { verify_sum_aggregation(COMPLEXITY_IN_CLASSES_KEY); } @Test - public void aggregate_complexity_in_functions() throws Exception { + public void aggregate_complexity_in_functions() { verify_sum_aggregation(COMPLEXITY_IN_FUNCTIONS_KEY); } @Test - public void aggregate_cognitive_complexity_in_functions() throws Exception { + public void aggregate_cognitive_complexity_in_functions() { verify_sum_aggregation(COGNITIVE_COMPLEXITY_KEY); } @@ -146,17 +146,17 @@ public class ViewsComplexityMeasuresStepTest { } @Test - public void aggregate_function_complexity_distribution() throws Exception { + public void aggregate_function_complexity_distribution() { verify_distribution_aggregation(FUNCTION_COMPLEXITY_DISTRIBUTION_KEY); } @Test - public void aggregate_file_complexity_distribution() throws Exception { + public void aggregate_file_complexity_distribution() { verify_distribution_aggregation(FILE_COMPLEXITY_DISTRIBUTION_KEY); } @Test - public void aggregate_class_complexity_distribution() throws Exception { + public void aggregate_class_complexity_distribution() { verify_distribution_aggregation(CLASS_COMPLEXITY_DISTRIBUTION_KEY); } @@ -175,17 +175,17 @@ public class ViewsComplexityMeasuresStepTest { } @Test - public void compute_and_aggregate_file_complexity() throws Exception { + public void compute_and_aggregate_file_complexity() { verify_average_compute_and_aggregation(FILE_COMPLEXITY_KEY, COMPLEXITY_KEY, FILES_KEY); } @Test - public void compute_and_aggregate_class_complexity() throws Exception { + public void compute_and_aggregate_class_complexity() { verify_average_compute_and_aggregation(CLASS_COMPLEXITY_KEY, COMPLEXITY_IN_CLASSES_KEY, CLASSES_KEY); } @Test - public void compute_and_aggregate_function_complexity() throws Exception { + public void compute_and_aggregate_function_complexity() { verify_average_compute_and_aggregation(FUNCTION_COMPLEXITY_KEY, COMPLEXITY_IN_FUNCTIONS_KEY, FUNCTIONS_KEY); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPostTaskTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPostTaskTest.java index 511e460d07d..a1d76d8df90 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPostTaskTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/webhook/WebhookPostTaskTest.java @@ -72,7 +72,7 @@ public class WebhookPostTaskTest { private WebhookPostTask underTest = new WebhookPostTask(configurationRepository, payloadFactory, webHooks); @Before - public void wireMocks() throws Exception { + public void wireMocks() { when(payloadFactory.create(any(ProjectAnalysis.class))).thenReturn(webhookPayload); when(configurationRepository.getConfiguration()).thenReturn(configuration); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/debt/DebtModelPluginRepositoryTest.java b/server/sonar-server/src/test/java/org/sonar/server/debt/DebtModelPluginRepositoryTest.java index 1901e1858ef..699fdb8e74a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/debt/DebtModelPluginRepositoryTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/debt/DebtModelPluginRepositoryTest.java @@ -50,7 +50,7 @@ public class DebtModelPluginRepositoryTest { DebtModelPluginRepository underTest; @Test - public void test_component_initialization() throws Exception { + public void test_component_initialization() { // we do have the "csharp-model.xml" file in src/test/resources PluginInfo csharpPluginMetadata = new PluginInfo("csharp"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsParserTest.java b/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsParserTest.java index 6563d08b969..3764f6ca825 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsParserTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/DuplicationsParserTest.java @@ -48,7 +48,7 @@ public class DuplicationsParserTest { } @Test - public void duplication_on_same_file() throws Exception { + public void duplication_on_same_file() { ComponentDto project = db.components().insertPrivateProject(); ComponentDto file = db.components().insertComponent(newFileDto(project)); List blocks = parser.parse(db.getSession(), file, null, @@ -76,7 +76,7 @@ public class DuplicationsParserTest { } @Test - public void duplication_on_same_project() throws Exception { + public void duplication_on_same_project() { ComponentDto project = db.components().insertPrivateProject(); ComponentDto file1 = db.components().insertComponent(newFileDto(project)); ComponentDto file2 = db.components().insertComponent(newFileDto(project)); @@ -105,7 +105,7 @@ public class DuplicationsParserTest { } @Test - public void duplications_on_different_project() throws Exception { + public void duplications_on_different_project() { ComponentDto project1 = db.components().insertPrivateProject(); ComponentDto file1 = db.components().insertComponent(newFileDto(project1)); ComponentDto file2 = db.components().insertComponent(newFileDto(project1)); @@ -145,7 +145,7 @@ public class DuplicationsParserTest { } @Test - public void duplications_on_many_blocks() throws Exception { + public void duplications_on_many_blocks() { ComponentDto project1 = db.components().insertPrivateProject(); ComponentDto file1 = db.components().insertComponent(newFileDto(project1) .setDbKey("org.codehaus.sonar:sonar-plugin-api:src/main/java/org/sonar/api/utils/command/CommandExecutor.java") @@ -177,7 +177,7 @@ public class DuplicationsParserTest { } @Test - public void duplication_on_not_existing_file() throws Exception { + public void duplication_on_not_existing_file() { ComponentDto project = db.components().insertPrivateProject(); ComponentDto file = db.components().insertComponent(newFileDto(project)); List blocks = parser.parse(db.getSession(), file, null, @@ -238,7 +238,7 @@ public class DuplicationsParserTest { } @Test - public void duplication_on_branch() throws Exception { + public void duplication_on_branch() { ComponentDto project = db.components().insertMainBranch(); ComponentDto branch = db.components().insertProjectBranch(project); ComponentDto file1 = db.components().insertComponent(newFileDto(branch)); diff --git a/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/ShowActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/ShowActionTest.java index 04dc7100410..df9cb7591f2 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/ShowActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/duplication/ws/ShowActionTest.java @@ -92,7 +92,7 @@ public class ShowActionTest { } @Test - public void return_file_with_missing_duplication_data() throws Exception { + public void return_file_with_missing_duplication_data() { ComponentDto project = db.components().insertPrivateProject(); ComponentDto file = db.components().insertComponent(newFileDto(project).setDbKey("foo.js")); db.components().insertSnapshot(newAnalysis(project)); @@ -108,7 +108,7 @@ public class ShowActionTest { } @Test - public void duplications_by_file_key_and_branch() throws Exception { + public void duplications_by_file_key_and_branch() { ComponentDto project = db.components().insertMainBranch(); userSessionRule.addProjectPermission(UserRole.CODEVIEWER, project); ComponentDto branch = db.components().insertProjectBranch(project); @@ -160,14 +160,14 @@ public class ShowActionTest { } @Test - public void fail_if_file_does_not_exist() throws Exception { + public void fail_if_file_does_not_exist() { expectedException.expect(NotFoundException.class); newBaseRequest().setParam("key", "missing").execute(); } @Test - public void fail_if_user_is_not_allowed_to_access_project() throws Exception { + public void fail_if_user_is_not_allowed_to_access_project() { ComponentDto project = db.components().insertPrivateProject(); ComponentDto file = db.components().insertComponent(newFileDto(project)); @@ -200,7 +200,7 @@ public class ShowActionTest { } @Test - public void fail_when_using_branch_uuid() throws Exception { + public void fail_when_using_branch_uuid() { OrganizationDto organization = db.organizations().insert(); ComponentDto project = db.components().insertMainBranch(organization); userSessionRule.addProjectPermission(UserRole.CODEVIEWER, project); @@ -218,7 +218,7 @@ public class ShowActionTest { return ws.newRequest(); } - private void verifyCallToFileWithDuplications(Function requestFactory) throws Exception { + private void verifyCallToFileWithDuplications(Function requestFactory) { ComponentDto project = db.components().insertPrivateProject(); userSessionRule.addProjectPermission(UserRole.CODEVIEWER, project); ComponentDto file = db.components().insertComponent(newFileDto(project).setDbKey("foo.js")); diff --git a/server/sonar-server/src/test/java/org/sonar/server/edition/ws/FormDataActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/edition/ws/FormDataActionTest.java index f85f64d4e2b..120ea0c39ba 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/edition/ws/FormDataActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/edition/ws/FormDataActionTest.java @@ -100,7 +100,7 @@ public class FormDataActionTest { } @Test - public void verify_example() throws IOException { + public void verify_example() { userSessionRule.logIn().setSystemAdministrator(); when(server.getId()).thenReturn("uuid"); when(stats.getNcloc()).thenReturn(12345L); diff --git a/server/sonar-server/src/test/java/org/sonar/server/email/ws/SendActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/email/ws/SendActionTest.java index babf764af86..1efe1fda216 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/email/ws/SendActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/email/ws/SendActionTest.java @@ -70,7 +70,7 @@ public class SendActionTest { } @Test - public void fail_when_to_param_is_missing() throws Exception { + public void fail_when_to_param_is_missing() { logInAsSystemAdministrator(); expectedException.expect(IllegalArgumentException.class); @@ -79,7 +79,7 @@ public class SendActionTest { } @Test - public void fail_when_message_param_is_missing() throws Exception { + public void fail_when_message_param_is_missing() { logInAsSystemAdministrator(); expectedException.expect(IllegalArgumentException.class); diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/BulkIndexerTest.java b/server/sonar-server/src/test/java/org/sonar/server/es/BulkIndexerTest.java index bec317df99c..c7bcd8148c6 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/es/BulkIndexerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/es/BulkIndexerTest.java @@ -97,7 +97,7 @@ public class BulkIndexerTest { } @Test - public void bulk_delete() throws Exception { + public void bulk_delete() { int max = 500; int removeFrom = 200; FakeDoc[] docs = new FakeDoc[max]; diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/EsClientProviderTest.java b/server/sonar-server/src/test/java/org/sonar/server/es/EsClientProviderTest.java index 8744cd7c116..dde131348c6 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/es/EsClientProviderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/es/EsClientProviderTest.java @@ -60,7 +60,7 @@ public class EsClientProviderTest { } @Test - public void connection_to_local_es_when_cluster_mode_is_disabled() throws Exception { + public void connection_to_local_es_when_cluster_mode_is_disabled() { settings.setProperty(CLUSTER_ENABLED, false); settings.setProperty(ProcessProperties.SEARCH_HOST, localhost); settings.setProperty(ProcessProperties.SEARCH_PORT, 8080); @@ -78,7 +78,7 @@ public class EsClientProviderTest { } @Test - public void connection_to_remote_es_nodes_when_cluster_mode_is_enabled_and_local_es_is_disabled() throws Exception { + public void connection_to_remote_es_nodes_when_cluster_mode_is_enabled_and_local_es_is_disabled() { settings.setProperty(CLUSTER_ENABLED, true); settings.setProperty(CLUSTER_NODE_TYPE, "application"); settings.setProperty(CLUSTER_SEARCH_HOSTS, format("%s:8080,%s:8081", localhost, localhost)); @@ -99,7 +99,7 @@ public class EsClientProviderTest { } @Test - public void es_client_provider_must_throw_ISE_when_incorrect_port_is_used_when_search_disabled() throws Exception { + public void es_client_provider_must_throw_ISE_when_incorrect_port_is_used_when_search_disabled() { settings.setProperty(CLUSTER_ENABLED, true); settings.setProperty(CLUSTER_NODE_TYPE, "application"); settings.setProperty(CLUSTER_SEARCH_HOSTS, format("%s:100000,%s:8081", localhost, localhost)); @@ -111,7 +111,7 @@ public class EsClientProviderTest { } @Test - public void es_client_provider_must_throw_ISE_when_incorrect_port_is_used() throws Exception { + public void es_client_provider_must_throw_ISE_when_incorrect_port_is_used() { settings.setProperty(CLUSTER_ENABLED, true); settings.setProperty(CLUSTER_NODE_TYPE, "search"); settings.setProperty(ProcessProperties.SEARCH_HOST, "localhost"); @@ -124,7 +124,7 @@ public class EsClientProviderTest { } @Test - public void es_client_provider_must_add_default_port_when_not_specified() throws Exception { + public void es_client_provider_must_add_default_port_when_not_specified() { settings.setProperty(CLUSTER_ENABLED, true); settings.setProperty(CLUSTER_NODE_TYPE, "application"); settings.setProperty(CLUSTER_SEARCH_HOSTS, format("%s,%s:8081", localhost, localhost)); diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/EsTester.java b/server/sonar-server/src/test/java/org/sonar/server/es/EsTester.java index 7e66ac36df4..5fb911aa508 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/es/EsTester.java +++ b/server/sonar-server/src/test/java/org/sonar/server/es/EsTester.java @@ -109,7 +109,7 @@ public class EsTester extends ExternalResource { Random random = new Random(); cluster.beforeTest(random, random.nextDouble()); cluster.wipe(NO_TEMPLATES_SURVIVING_WIPE); - } catch (IOException | InterruptedException e) { + } catch (IOException e) { throw new RuntimeException(e); } } @@ -146,7 +146,7 @@ public class EsTester extends ExternalResource { } @Override - public void before() throws Throwable { + public void before() { if (cluster == null) { init(); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/FakeDoc.java b/server/sonar-server/src/test/java/org/sonar/server/es/FakeDoc.java index b30a0435fdb..fe81f08e78d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/es/FakeDoc.java +++ b/server/sonar-server/src/test/java/org/sonar/server/es/FakeDoc.java @@ -45,7 +45,7 @@ public class FakeDoc extends BaseDoc { } public FakeDoc() { - super(Maps.newHashMap()); + super(Maps.newHashMap()); } public int getInt() { diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/IndexCreatorTest.java b/server/sonar-server/src/test/java/org/sonar/server/es/IndexCreatorTest.java index 5c28b09e9d9..0732603b824 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/es/IndexCreatorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/es/IndexCreatorTest.java @@ -76,7 +76,7 @@ public class IndexCreatorTest { } @Test - public void mark_all_non_existing_index_types_as_uninitialized() throws Exception { + public void mark_all_non_existing_index_types_as_uninitialized() { startNewCreator(context -> { NewIndex i = context.create("i", SETTINGS_CONFIGURATION); i.createType("t1"); @@ -111,7 +111,7 @@ public class IndexCreatorTest { } @Test - public void do_not_recreate_index_on_unchanged_definition() throws Exception { + public void do_not_recreate_index_on_unchanged_definition() { // v1 startNewCreator(new FakeIndexDefinition()); IndexType fakeIndexType = new IndexType("fakes", "fake"); @@ -201,12 +201,12 @@ public class IndexCreatorTest { @CheckForNull @SuppressWarnings("unchecked") - private Map field(MappingMetaData mapping, String field) throws IOException { + private Map field(MappingMetaData mapping, String field) { Map props = (Map) mapping.getSourceAsMap().get("properties"); return (Map) props.get(field); } - private int countMappingFields(MappingMetaData mapping) throws IOException { + private int countMappingFields(MappingMetaData mapping) { return ((Map) mapping.getSourceAsMap().get("properties")).size(); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/IndexerStartupTaskTest.java b/server/sonar-server/src/test/java/org/sonar/server/es/IndexerStartupTaskTest.java index 697dd59326a..0483c179da4 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/es/IndexerStartupTaskTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/es/IndexerStartupTaskTest.java @@ -50,7 +50,7 @@ public class IndexerStartupTaskTest { } @Test - public void index_if_not_initialized() throws Exception { + public void index_if_not_initialized() { doReturn(false).when(metadataIndex).getInitialized(INDEX_TYPE_FAKE); underTest.execute(); @@ -60,7 +60,7 @@ public class IndexerStartupTaskTest { } @Test - public void set_initialized_after_indexation() throws Exception { + public void set_initialized_after_indexation() { doReturn(false).when(metadataIndex).getInitialized(INDEX_TYPE_FAKE); underTest.execute(); @@ -69,7 +69,7 @@ public class IndexerStartupTaskTest { } @Test - public void do_not_index_if_already_initialized() throws Exception { + public void do_not_index_if_already_initialized() { doReturn(true).when(metadataIndex).getInitialized(INDEX_TYPE_FAKE); underTest.execute(); @@ -79,7 +79,7 @@ public class IndexerStartupTaskTest { } @Test - public void do_not_index_if_indexes_are_disabled() throws Exception { + public void do_not_index_if_indexes_are_disabled() { settings.setProperty("sonar.internal.es.disableIndexes", "true"); es.putDocuments(INDEX_TYPE_FAKE, new FakeDoc()); diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/NewIndexTest.java b/server/sonar-server/src/test/java/org/sonar/server/es/NewIndexTest.java index 0632afc9d50..d402579d6a7 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/es/NewIndexTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/es/NewIndexTest.java @@ -269,7 +269,7 @@ public class NewIndexTest { } @Test - public void fail_when_replica_customization_cant_be_parsed() throws Exception { + public void fail_when_replica_customization_cant_be_parsed() { settings.setProperty(CLUSTER_ENABLED, "true"); settings.setProperty(ProcessProperties.SEARCH_REPLICAS, "ꝱꝲꝳପ"); NewIndex.SettingsConfiguration settingsConfiguration = newBuilder(settings.asConfig()).setDefaultNbOfShards(5).build(); @@ -281,7 +281,7 @@ public class NewIndexTest { } @Test - public void in_standalone_searchReplicas_is_not_overridable() throws Exception { + public void in_standalone_searchReplicas_is_not_overridable() { settings.setProperty(ProcessProperties.SEARCH_REPLICAS, "5"); NewIndex index = new NewIndex("issues", defaultSettingsConfiguration); diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/RecoveryIndexerTest.java b/server/sonar-server/src/test/java/org/sonar/server/es/RecoveryIndexerTest.java index d7f2e98a611..86a9ee5980e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/es/RecoveryIndexerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/es/RecoveryIndexerTest.java @@ -218,7 +218,7 @@ public class RecoveryIndexerTest { } @Test - public void unsupported_types_are_kept_in_queue_for_manual_fix_operation() throws Exception { + public void unsupported_types_are_kept_in_queue_for_manual_fix_operation() { insertItem(FOO_TYPE, "f1"); ResilientIndexer indexer = new SuccessfulFakeIndexer(new IndexType("bars", "bar")); diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/SortingTest.java b/server/sonar-server/src/test/java/org/sonar/server/es/SortingTest.java index 920a7cc9dcd..97061a3f392 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/es/SortingTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/es/SortingTest.java @@ -31,7 +31,7 @@ import static org.junit.Assert.fail; public class SortingTest { @Test - public void test_definition() throws Exception { + public void test_definition() { Sorting sorting = new Sorting(); sorting.add("fileLine", "file"); sorting.add("fileLine", "line").missingLast().reverse(); @@ -118,7 +118,7 @@ public class SortingTest { } @Test - public void default_sorting() throws Exception { + public void default_sorting() { Sorting sorting = new Sorting(); sorting.addDefault("file"); @@ -126,7 +126,7 @@ public class SortingTest { assertThat(fields).hasSize(1); } - private void expectField(FieldSortBuilder field, String expectedField, String expectedMissing, SortOrder expectedSort) throws IllegalAccessException { + private void expectField(FieldSortBuilder field, String expectedField, String expectedMissing, SortOrder expectedSort) { assertThat(field.getFieldName()).isEqualTo(expectedField); assertThat(field.missing()).isEqualTo(expectedMissing); assertThat(field.order()).isEqualTo(expectedSort); diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/metadata/MetadataIndexTest.java b/server/sonar-server/src/test/java/org/sonar/server/es/metadata/MetadataIndexTest.java index 1c9c9d07b06..7dfd321390f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/es/metadata/MetadataIndexTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/es/metadata/MetadataIndexTest.java @@ -36,25 +36,25 @@ public class MetadataIndexTest { private final String index = randomAlphanumeric(20); @Test - public void type_should_be_not_initialized_by_default() throws Exception { + public void type_should_be_not_initialized_by_default() { IndexType indexType = new IndexType("examples", "example"); assertThat(underTest.getInitialized(indexType)).isFalse(); } @Test - public void type_should_be_initialized_after_explicitly_set_to_initialized() throws Exception { + public void type_should_be_initialized_after_explicitly_set_to_initialized() { IndexType indexType = new IndexType("examples", "example"); underTest.setInitialized(indexType, true); assertThat(underTest.getInitialized(indexType)).isTrue(); } @Test - public void hash_should_be_empty_by_default() throws Exception { + public void hash_should_be_empty_by_default() { assertThat(underTest.getHash(index)).isEmpty(); } @Test - public void hash_should_be_able_to_be_automatically_set() throws Exception { + public void hash_should_be_able_to_be_automatically_set() { String hash = randomAlphanumeric(20); underTest.setHash(index, hash); assertThat(underTest.getHash(index)).hasValue(hash); diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/textsearch/ComponentTextSearchFeatureRule.java b/server/sonar-server/src/test/java/org/sonar/server/es/textsearch/ComponentTextSearchFeatureRule.java index 56d397798ce..102299e0fc5 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/es/textsearch/ComponentTextSearchFeatureRule.java +++ b/server/sonar-server/src/test/java/org/sonar/server/es/textsearch/ComponentTextSearchFeatureRule.java @@ -26,7 +26,7 @@ public class ComponentTextSearchFeatureRule extends ExternalResource { private ComponentTextSearchFeature[] features; @Override - protected void before() throws Throwable { + protected void before() { features = ComponentTextSearchFeatureRepertoire.values(); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/textsearch/ComponentTextSearchQueryFactoryTest.java b/server/sonar-server/src/test/java/org/sonar/server/es/textsearch/ComponentTextSearchQueryFactoryTest.java index 2e5ae7aa3f1..a6f66f4dbcd 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/es/textsearch/ComponentTextSearchQueryFactoryTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/es/textsearch/ComponentTextSearchQueryFactoryTest.java @@ -34,7 +34,7 @@ public class ComponentTextSearchQueryFactoryTest { public ExpectedException expectedException = ExpectedException.none(); @Test - public void create_query() throws Exception { + public void create_query() { QueryBuilder result = createQuery(ComponentTextSearchQuery.builder() .setQueryText("SonarQube").setFieldKey("key").setFieldName("name").build(), ComponentTextSearchFeatureRepertoire.KEY); @@ -58,7 +58,7 @@ public class ComponentTextSearchQueryFactoryTest { } @Test - public void fail_to_create_query_when_no_feature() throws Exception { + public void fail_to_create_query_when_no_feature() { expectedException.expect(IllegalArgumentException.class); expectedException.expectMessage("features cannot be empty"); @@ -67,7 +67,7 @@ public class ComponentTextSearchQueryFactoryTest { } @Test - public void fail_to_create_query_when_no_query_text() throws Exception { + public void fail_to_create_query_when_no_query_text() { expectedException.expect(NullPointerException.class); expectedException.expectMessage("query text cannot be null"); @@ -75,7 +75,7 @@ public class ComponentTextSearchQueryFactoryTest { } @Test - public void fail_to_create_query_when_no_field_key() throws Exception { + public void fail_to_create_query_when_no_field_key() { expectedException.expect(NullPointerException.class); expectedException.expectMessage("field key cannot be null"); @@ -83,7 +83,7 @@ public class ComponentTextSearchQueryFactoryTest { } @Test - public void fail_to_create_query_when_no_field_name() throws Exception { + public void fail_to_create_query_when_no_field_name() { expectedException.expect(NullPointerException.class); expectedException.expectMessage("field name cannot be null"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/exceptions/BadRequestExceptionTest.java b/server/sonar-server/src/test/java/org/sonar/server/exceptions/BadRequestExceptionTest.java index 53b804df4da..20a14e5f440 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/exceptions/BadRequestExceptionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/exceptions/BadRequestExceptionTest.java @@ -39,28 +39,28 @@ public class BadRequestExceptionTest { } @Test - public void create_exception_from_list() throws Exception { + public void create_exception_from_list() { BadRequestException underTest = BadRequestException.create(asList("error1", "error2")); assertThat(underTest.errors()).containsOnly("error1", "error2"); } @Test - public void create_exception_from_var_args() throws Exception { + public void create_exception_from_var_args() { BadRequestException underTest = BadRequestException.create("error1", "error2"); assertThat(underTest.errors()).containsOnly("error1", "error2"); } @Test - public void getMessage_return_first_error() throws Exception { + public void getMessage_return_first_error() { BadRequestException underTest = BadRequestException.create(asList("error1", "error2")); assertThat(underTest.getMessage()).isEqualTo("error1"); } @Test - public void fail_when_creating_exception_with_empty_list() throws Exception { + public void fail_when_creating_exception_with_empty_list() { expectedException.expect(IllegalArgumentException.class); expectedException.expectMessage("At least one error message is required"); @@ -68,7 +68,7 @@ public class BadRequestExceptionTest { } @Test - public void fail_when_creating_exception_with_one_empty_element() throws Exception { + public void fail_when_creating_exception_with_one_empty_element() { expectedException.expect(IllegalArgumentException.class); expectedException.expectMessage("Message cannot be empty"); @@ -76,7 +76,7 @@ public class BadRequestExceptionTest { } @Test - public void fail_when_creating_exception_with_one_null_element() throws Exception { + public void fail_when_creating_exception_with_one_null_element() { expectedException.expect(IllegalArgumentException.class); expectedException.expectMessage("Message cannot be empty"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/exceptions/MessageTest.java b/server/sonar-server/src/test/java/org/sonar/server/exceptions/MessageTest.java index 888f1eaea1a..3727d35324f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/exceptions/MessageTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/exceptions/MessageTest.java @@ -43,21 +43,21 @@ public class MessageTest { } @Test - public void fail_when_message_is_null() throws Exception { + public void fail_when_message_is_null() { expectedException.expect(IllegalArgumentException.class); Message.of(null); } @Test - public void fail_when_message_is_empty() throws Exception { + public void fail_when_message_is_empty() { expectedException.expect(IllegalArgumentException.class); Message.of(""); } @Test - public void test_equals_and_hashcode() throws Exception { + public void test_equals_and_hashcode() { Message message1 = Message.of("key1%s", "param1"); Message message2 = Message.of("key2%s", "param2"); Message message3 = Message.of("key1"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/favorite/FavoriteUpdaterTest.java b/server/sonar-server/src/test/java/org/sonar/server/favorite/FavoriteUpdaterTest.java index 02f09c2c979..d931f3373ea 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/favorite/FavoriteUpdaterTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/favorite/FavoriteUpdaterTest.java @@ -81,14 +81,14 @@ public class FavoriteUpdaterTest { private void assertFavorite() { assertThat(dbClient.propertiesDao().selectByQuery(PropertyQuery.builder() - .setUserId((int) USER_ID) + .setUserId(USER_ID) .setComponentId(COMPONENT_ID) .build(), dbSession)).hasSize(1); } private void assertNoFavorite() { assertThat(dbClient.propertiesDao().selectByQuery(PropertyQuery.builder() - .setUserId((int) USER_ID) + .setUserId(USER_ID) .setComponentId(COMPONENT_ID) .build(), dbSession)).isEmpty(); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/health/DbConnectionNodeCheckTest.java b/server/sonar-server/src/test/java/org/sonar/server/health/DbConnectionNodeCheckTest.java index 93ad90e3d4f..9ac8a3eb25b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/health/DbConnectionNodeCheckTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/health/DbConnectionNodeCheckTest.java @@ -53,7 +53,7 @@ public class DbConnectionNodeCheckTest { } @Test - public void status_is_RED_with_single_cause_if_any_error_occurs_when_checking_DB() throws Exception { + public void status_is_RED_with_single_cause_if_any_error_occurs_when_checking_DB() { when(isAliveMapper.isAlive()).thenThrow(new RuntimeException("simulated runtime exception when querying DB")); Health health = underTest.check(); @@ -66,7 +66,7 @@ public class DbConnectionNodeCheckTest { * protection against change in this contract. */ @Test - public void status_is_RED_with_single_cause_if_isAlive_does_not_return_1() throws Exception { + public void status_is_RED_with_single_cause_if_isAlive_does_not_return_1() { when(isAliveMapper.isAlive()).thenReturn(12); Health health = underTest.check(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/CommentActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/CommentActionTest.java index 5314a36241c..b2ed456b871 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/CommentActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/CommentActionTest.java @@ -68,7 +68,7 @@ public class CommentActionTest { Map properties = newHashMap(); properties.put("unknwown", "unknown value"); try { - action.verify(properties, Lists.newArrayList(), new AnonymousMockUserSession()); + action.verify(properties, Lists.newArrayList(), new AnonymousMockUserSession()); fail(); } catch (Exception e) { assertThat(e).isInstanceOf(IllegalArgumentException.class).hasMessage("Missing parameter : 'comment'"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueDocTesting.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueDocTesting.java index 4c76da50270..2af1ac4b4d6 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueDocTesting.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueDocTesting.java @@ -56,7 +56,7 @@ public class IssueDocTesting { } public static IssueDoc newDoc() { - IssueDoc doc = new IssueDoc(Maps.newHashMap()); + IssueDoc doc = new IssueDoc(Maps.newHashMap()); doc.setKey(Uuids.createFast()); doc.setRuleKey(RuleTesting.XOO_X1.toString()); doc.setType(RuleType.CODE_SMELL); diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueFieldsSetterTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueFieldsSetterTest.java index 6add4742058..d8098ded3cc 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueFieldsSetterTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueFieldsSetterTest.java @@ -67,7 +67,7 @@ public class IssueFieldsSetterTest { @Test public void unassign() { issue.setAssignee("morgan"); - boolean updated = updater.assign(issue, (UserDto) null, context); + boolean updated = updater.assign(issue, null, context); assertThat(updated).isTrue(); assertThat(issue.assignee()).isNull(); assertThat(issue.mustSendNotifications()).isTrue(); @@ -102,7 +102,7 @@ public class IssueFieldsSetterTest { } @Test - public void set_new_assignee() throws Exception { + public void set_new_assignee() { boolean updated = updater.setNewAssignee(issue, "simon", context); assertThat(updated).isTrue(); assertThat(issue.assignee()).isEqualTo("simon"); @@ -113,7 +113,7 @@ public class IssueFieldsSetterTest { } @Test - public void not_set_new_assignee_if_new_assignee_is_null() throws Exception { + public void not_set_new_assignee_if_new_assignee_is_null() { boolean updated = updater.setNewAssignee(issue, null, context); assertThat(updated).isFalse(); assertThat(issue.currentChange()).isNull(); @@ -121,7 +121,7 @@ public class IssueFieldsSetterTest { } @Test - public void fail_with_ISE_when_setting_new_assignee_on_already_assigned_issue() throws Exception { + public void fail_with_ISE_when_setting_new_assignee_on_already_assigned_issue() { issue.setAssignee("simon"); thrown.expect(IllegalStateException.class); @@ -455,7 +455,7 @@ public class IssueFieldsSetterTest { } @Test - public void set_new_author() throws Exception { + public void set_new_author() { boolean updated = updater.setNewAuthor(issue, "simon", context); assertThat(updated).isTrue(); @@ -466,7 +466,7 @@ public class IssueFieldsSetterTest { } @Test - public void not_set_new_author_if_new_author_is_null() throws Exception { + public void not_set_new_author_if_new_author_is_null() { boolean updated = updater.setNewAuthor(issue, null, context); assertThat(updated).isFalse(); assertThat(issue.currentChange()).isNull(); @@ -474,7 +474,7 @@ public class IssueFieldsSetterTest { } @Test - public void fail_with_ISE_when_setting_new_author_on_issue() throws Exception { + public void fail_with_ISE_when_setting_new_author_on_issue() { issue.setAuthorLogin("simon"); thrown.expect(IllegalStateException.class); diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueFinderTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueFinderTest.java index b19ca9463f0..330fd4cfd0c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueFinderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueFinderTest.java @@ -59,7 +59,7 @@ public class IssueFinderTest { private IssueFinder underTest = new IssueFinder(db.getDbClient(), userSession); @Test - public void get_by_issue_key() throws Exception { + public void get_by_issue_key() { IssueDto issueDto = insertIssue(); String permission = USER; addProjectPermission(issueDto, permission); @@ -71,7 +71,7 @@ public class IssueFinderTest { } @Test - public void fail_when_issue_key_does_not_exist() throws Exception { + public void fail_when_issue_key_does_not_exist() { IssueDto issueDto = insertIssue(); addProjectPermission(issueDto, USER); @@ -81,7 +81,7 @@ public class IssueFinderTest { } @Test - public void fail_when_not_enough_permission() throws Exception { + public void fail_when_not_enough_permission() { IssueDto issueDto = insertIssue(); addProjectPermission(issueDto, CODEVIEWER); diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueQueryTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueQueryTest.java index 53290f1c8a2..f03dcc74c76 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueQueryTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/IssueQueryTest.java @@ -142,7 +142,7 @@ public class IssueQueryTest { } @Test - public void test_default_query() throws Exception { + public void test_default_query() { IssueQuery query = IssueQuery.builder().build(); assertThat(query.issueKeys()).isEmpty(); assertThat(query.projectUuids()).isEmpty(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ResultTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ResultTest.java index f4bdb5c88ae..d86938579c8 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/ResultTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ResultTest.java @@ -25,7 +25,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class ResultTest { @Test - public void test_default_result() throws Exception { + public void test_default_result() { Result result = Result.of(); assertThat(result.ok()).isTrue(); assertThat(result.errors()).isEmpty(); @@ -38,7 +38,7 @@ public class ResultTest { } @Test - public void test_error() throws Exception { + public void test_error() { Result result = Result.of(); result.addError("Something goes wrong"); @@ -49,7 +49,7 @@ public class ResultTest { } @Test - public void test_l10n_errors() throws Exception { + public void test_l10n_errors() { Result result = Result.of(); Result.Message message = Result.Message.ofL10n("issue.error.123", "10"); result.addError(message); @@ -65,7 +65,7 @@ public class ResultTest { } @Test - public void test_text_message() throws Exception { + public void test_text_message() { Result.Message txtMessage = Result.Message.of("the error"); Result.Message sameMessage = Result.Message.of("the error"); Result.Message otherMessage = Result.Message.of("other"); @@ -80,7 +80,7 @@ public class ResultTest { } @Test - public void test_l10n_message() throws Exception { + public void test_l10n_message() { Result.Message msg = Result.Message.ofL10n("issue.error.123", "10"); Result.Message sameMsg = Result.Message.ofL10n("issue.error.123", "10"); Result.Message msg2 = Result.Message.ofL10n("issue.error.123", "200"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/RulesAggregation.java b/server/sonar-server/src/test/java/org/sonar/server/issue/RulesAggregation.java index 4d6fbcdb56e..251496a1a66 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/RulesAggregation.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/RulesAggregation.java @@ -75,11 +75,7 @@ public class RulesAggregation { Rule rule = (Rule) o; - if (!ruleKey.equals(rule.ruleKey)) { - return false; - } - - return true; + return ruleKey.equals(rule.ruleKey); } @Override diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/RulesAggregationTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/RulesAggregationTest.java index cba731201aa..a363ac7d015 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/RulesAggregationTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/RulesAggregationTest.java @@ -62,7 +62,7 @@ public class RulesAggregationTest { } @Test - public void test_equals_and_hash_code() throws Exception { + public void test_equals_and_hash_code() { RulesAggregation.Rule rule = new RulesAggregation.Rule(RuleKey.of("xoo", "S001"), "S001"); RulesAggregation.Rule ruleSameRuleKey = new RulesAggregation.Rule(RuleKey.of("xoo", "S001"), "S001"); RulesAggregation.Rule ruleWithDifferentRuleKey = new RulesAggregation.Rule(RuleKey.of("xoo", "S002"), "S002"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/TransitionActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/TransitionActionTest.java index 46ffc5923dd..558684b3fd1 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/TransitionActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/TransitionActionTest.java @@ -94,7 +94,7 @@ public class TransitionActionTest { } @Test - public void test_verify() throws Exception { + public void test_verify() { assertThat(action.verify(ImmutableMap.of("transition", "reopen"), emptyList(), userSession)).isTrue(); assertThat(action.verify(ImmutableMap.of("transition", "close"), emptyList(), userSession)).isTrue(); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/TransitionServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/TransitionServiceTest.java index df57c6ef0d6..63b6c377bd7 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/TransitionServiceTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/TransitionServiceTest.java @@ -60,7 +60,7 @@ public class TransitionServiceTest { } @Test - public void list_transitions() throws Exception { + public void list_transitions() { IssueDto issue = newIssue().setStatus(STATUS_OPEN).setResolution(null); userSession.logIn("john").addProjectPermission(ISSUE_ADMIN, ComponentTesting.newPrivateProjectDto(OrganizationTesting.newOrganizationDto(), issue.getProjectUuid())); @@ -70,7 +70,7 @@ public class TransitionServiceTest { } @Test - public void list_transitions_returns_only_transitions_that_do_not_requires_issue_admin_permission() throws Exception { + public void list_transitions_returns_only_transitions_that_do_not_requires_issue_admin_permission() { userSession.logIn("john"); IssueDto issue = newIssue().setStatus(STATUS_OPEN).setResolution(null); @@ -80,7 +80,7 @@ public class TransitionServiceTest { } @Test - public void list_transitions_returns_nothing_when_not_logged() throws Exception { + public void list_transitions_returns_nothing_when_not_logged() { IssueDto issue = newIssue().setStatus(STATUS_OPEN).setResolution(null); List result = underTest.listTransitions(issue.toDefaultIssue()); diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexProjectStatisticsTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexProjectStatisticsTest.java index 7e3469039e6..4ee8ffa3876 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexProjectStatisticsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueIndexProjectStatisticsTest.java @@ -62,19 +62,19 @@ public class IssueIndexProjectStatisticsTest { private IssueIndex underTest = new IssueIndex(esTester.client(), system2, userSessionRule, new AuthorizationTypeSupport(userSessionRule)); @Test - public void searchProjectStatistics_returns_empty_list_if_no_input() throws Exception { + public void searchProjectStatistics_returns_empty_list_if_no_input() { List result = underTest.searchProjectStatistics(emptyList(), emptyList(), "unknownUser"); assertThat(result).isEmpty(); } @Test - public void searchProjectStatistics_returns_empty_list_if_the_input_does_not_match_anything() throws Exception { + public void searchProjectStatistics_returns_empty_list_if_the_input_does_not_match_anything() { List result = underTest.searchProjectStatistics(singletonList("unknownProjectUuid"), singletonList(1_111_234_567_890L), "unknownUser"); assertThat(result).isEmpty(); } @Test - public void searchProjectStatistics_returns_something() throws Exception { + public void searchProjectStatistics_returns_something() { OrganizationDto org = newOrganizationDto(); ComponentDto project = newPrivateProjectDto(org); String userLogin = randomAlphanumeric(20); @@ -87,7 +87,7 @@ public class IssueIndexProjectStatisticsTest { } @Test - public void searchProjectStatistics_does_not_return_results_if_assignee_does_not_match() throws Exception { + public void searchProjectStatistics_does_not_return_results_if_assignee_does_not_match() { OrganizationDto org1 = newOrganizationDto(); ComponentDto project = newPrivateProjectDto(org1); String userLogin1 = randomAlphanumeric(20); @@ -101,7 +101,7 @@ public class IssueIndexProjectStatisticsTest { } @Test - public void searchProjectStatistics_returns_results_if_assignee_matches() throws Exception { + public void searchProjectStatistics_returns_results_if_assignee_matches() { OrganizationDto org1 = newOrganizationDto(); ComponentDto project = newPrivateProjectDto(org1); String userLogin1 = randomAlphanumeric(20); @@ -114,7 +114,7 @@ public class IssueIndexProjectStatisticsTest { } @Test - public void searchProjectStatistics_returns_results_if_functional_date_is_strictly_after_from_date() throws Exception { + public void searchProjectStatistics_returns_results_if_functional_date_is_strictly_after_from_date() { OrganizationDto org1 = newOrganizationDto(); ComponentDto project = newPrivateProjectDto(org1); String userLogin1 = randomAlphanumeric(20); @@ -127,7 +127,7 @@ public class IssueIndexProjectStatisticsTest { } @Test - public void searchProjectStatistics_does_not_return_results_if_functional_date_is_same_as_from_date() throws Exception { + public void searchProjectStatistics_does_not_return_results_if_functional_date_is_same_as_from_date() { OrganizationDto org1 = newOrganizationDto(); ComponentDto project = newPrivateProjectDto(org1); String userLogin1 = randomAlphanumeric(20); @@ -140,7 +140,7 @@ public class IssueIndexProjectStatisticsTest { } @Test - public void searchProjectStatistics_does_not_return_resolved_issues() throws Exception { + public void searchProjectStatistics_does_not_return_resolved_issues() { OrganizationDto org1 = newOrganizationDto(); ComponentDto project = newPrivateProjectDto(org1); String userLogin1 = randomAlphanumeric(20); @@ -157,7 +157,7 @@ public class IssueIndexProjectStatisticsTest { } @Test - public void searchProjectStatistics_does_not_return_results_if_functional_date_is_before_from_date() throws Exception { + public void searchProjectStatistics_does_not_return_results_if_functional_date_is_before_from_date() { OrganizationDto org1 = newOrganizationDto(); ComponentDto project = newPrivateProjectDto(org1); String userLogin1 = randomAlphanumeric(20); @@ -170,7 +170,7 @@ public class IssueIndexProjectStatisticsTest { } @Test - public void searchProjectStatistics_returns_issue_count() throws Exception { + public void searchProjectStatistics_returns_issue_count() { OrganizationDto org1 = newOrganizationDto(); ComponentDto project = newPrivateProjectDto(org1); String userLogin1 = randomAlphanumeric(20); @@ -186,7 +186,7 @@ public class IssueIndexProjectStatisticsTest { } @Test - public void searchProjectStatistics_returns_issue_count_for_multiple_projects() throws Exception { + public void searchProjectStatistics_returns_issue_count_for_multiple_projects() { OrganizationDto org1 = newOrganizationDto(); ComponentDto project1 = newPrivateProjectDto(org1); ComponentDto project2 = newPrivateProjectDto(org1); @@ -214,7 +214,7 @@ public class IssueIndexProjectStatisticsTest { } @Test - public void searchProjectStatistics_returns_max_date_for_multiple_projects() throws Exception { + public void searchProjectStatistics_returns_max_date_for_multiple_projects() { OrganizationDto org1 = newOrganizationDto(); ComponentDto project1 = newPrivateProjectDto(org1); ComponentDto project2 = newPrivateProjectDto(org1); @@ -242,7 +242,7 @@ public class IssueIndexProjectStatisticsTest { } @Test - public void searchProjectStatistics_return_branch_issues() throws Exception { + public void searchProjectStatistics_return_branch_issues() { OrganizationDto organization = newOrganizationDto(); ComponentDto project = newPrivateProjectDto(organization); ComponentDto branch = newProjectBranch(project, newBranchDto(project).setKey("branch")); diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/notification/ChangesOnMyIssueNotificationDispatcherTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/notification/ChangesOnMyIssueNotificationDispatcherTest.java index 89ebe6cd2d4..c06ff4cc0e1 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/notification/ChangesOnMyIssueNotificationDispatcherTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/notification/ChangesOnMyIssueNotificationDispatcherTest.java @@ -63,7 +63,7 @@ public class ChangesOnMyIssueNotificationDispatcherTest { } @Test - public void test_metadata() throws Exception { + public void test_metadata() { NotificationDispatcherMetadata metadata = ChangesOnMyIssueNotificationDispatcher.newMetadata(); assertThat(metadata.getDispatcherKey()).isEqualTo(dispatcher.getKey()); assertThat(metadata.getProperty(NotificationDispatcherMetadata.GLOBAL_NOTIFICATION)).isEqualTo("true"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/notification/DoNotFixNotificationDispatcherTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/notification/DoNotFixNotificationDispatcherTest.java index 7e2a1e619ca..3a8cebb60f2 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/notification/DoNotFixNotificationDispatcherTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/notification/DoNotFixNotificationDispatcherTest.java @@ -44,10 +44,10 @@ public class DoNotFixNotificationDispatcherTest { NotificationDispatcher.Context context = mock(NotificationDispatcher.Context.class); NotificationChannel emailChannel = mock(NotificationChannel.class); NotificationChannel twitterChannel = mock(NotificationChannel.class); - DoNotFixNotificationDispatcher underTest = new DoNotFixNotificationDispatcher(notifications);; + DoNotFixNotificationDispatcher underTest = new DoNotFixNotificationDispatcher(notifications); @Test - public void test_metadata() throws Exception { + public void test_metadata() { NotificationDispatcherMetadata metadata = DoNotFixNotificationDispatcher.newMetadata(); assertThat(metadata.getDispatcherKey()).isEqualTo(underTest.getKey()); assertThat(metadata.getProperty(NotificationDispatcherMetadata.GLOBAL_NOTIFICATION)).isEqualTo("true"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/notification/MyNewIssuesEmailTemplateTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/notification/MyNewIssuesEmailTemplateTest.java index d2fee251381..9168195bc95 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/notification/MyNewIssuesEmailTemplateTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/notification/MyNewIssuesEmailTemplateTest.java @@ -78,7 +78,7 @@ public class MyNewIssuesEmailTemplateTest { } @Test - public void format_email_with_all_fields_filled() throws Exception { + public void format_email_with_all_fields_filled() { Notification notification = newNotification(32); addTags(notification); addRules(notification); @@ -139,7 +139,7 @@ public class MyNewIssuesEmailTemplateTest { } @Test - public void format_email_with_no_assignees_tags_nor_components() throws Exception { + public void format_email_with_no_assignees_tags_nor_components() { Notification notification = newNotification(32) .setFieldValue("projectVersion", "52.0"); @@ -159,7 +159,7 @@ public class MyNewIssuesEmailTemplateTest { } @Test - public void format_email_with_issue_on_branch() throws Exception { + public void format_email_with_issue_on_branch() { Notification notification = newNotification(32) .setFieldValue("projectVersion", "52.0") .setFieldValue("branch", "feature1"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/notification/NewIssuesEmailTemplateTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/notification/NewIssuesEmailTemplateTest.java index 82dc04e6846..5405f904ae4 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/notification/NewIssuesEmailTemplateTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/notification/NewIssuesEmailTemplateTest.java @@ -94,7 +94,7 @@ public class NewIssuesEmailTemplateTest { } @Test - public void subject_on_branch() throws Exception { + public void subject_on_branch() { Notification notification = newNotification(32) .setFieldValue("branch", "feature1"); @@ -104,7 +104,7 @@ public class NewIssuesEmailTemplateTest { } @Test - public void format_email_with_all_fields_filled() throws Exception { + public void format_email_with_all_fields_filled() { Notification notification = newNotification(32) .setFieldValue("projectVersion", "42.1.1"); addAssignees(notification); @@ -144,7 +144,7 @@ public class NewIssuesEmailTemplateTest { } @Test - public void format_email_with_no_assignees_tags_nor_components_nor_version() throws Exception { + public void format_email_with_no_assignees_tags_nor_components_nor_version() { Notification notification = newNotification(32); EmailMessage message = template.format(notification); @@ -174,7 +174,7 @@ public class NewIssuesEmailTemplateTest { } @Test - public void format_email_with_issue_on_branch() throws Exception { + public void format_email_with_issue_on_branch() { Notification notification = newNotification(32) .setFieldValue("branch", "feature1"); @@ -194,7 +194,7 @@ public class NewIssuesEmailTemplateTest { } @Test - public void format_email_with_issue_on_branch_with_version() throws Exception { + public void format_email_with_issue_on_branch_with_version() { Notification notification = newNotification(32) .setFieldValue("branch", "feature1") .setFieldValue("projectVersion", "42.1.1"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/TransitionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/TransitionTest.java index 62ada13498a..ede5b240413 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/TransitionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/workflow/TransitionTest.java @@ -37,7 +37,7 @@ public class TransitionTest { Function function2 = mock(Function.class); @Test - public void test_builder() throws Exception { + public void test_builder() { Transition transition = Transition.builder("close") .from("OPEN").to("CLOSED") .conditions(condition1, condition2) @@ -54,7 +54,7 @@ public class TransitionTest { } @Test - public void test_simplest_transition() throws Exception { + public void test_simplest_transition() { Transition transition = Transition.builder("close") .from("OPEN").to("CLOSED") .build(); @@ -124,7 +124,7 @@ public class TransitionTest { } @Test - public void test_equals_and_hashCode() throws Exception { + public void test_equals_and_hashCode() { Transition t1 = Transition.create("resolve", "OPEN", "RESOLVED"); Transition t2 = Transition.create("resolve", "REOPENED", "RESOLVED"); Transition t3 = Transition.create("confirm", "OPEN", "CONFIRMED"); @@ -137,13 +137,13 @@ public class TransitionTest { } @Test - public void test_toString() throws Exception { + public void test_toString() { Transition t1 = Transition.create("resolve", "OPEN", "RESOLVED"); assertThat(t1.toString()).isEqualTo("OPEN->resolve->RESOLVED"); } @Test - public void test_automatic_transition() throws Exception { + public void test_automatic_transition() { Transition transition = Transition.builder("close") .from("OPEN").to("CLOSED") .automatic() diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/AvatarResolverImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/AvatarResolverImplTest.java index 2f48852147f..b8172d4b363 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/AvatarResolverImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/AvatarResolverImplTest.java @@ -34,19 +34,19 @@ public class AvatarResolverImplTest { private AvatarResolverImpl underTest = new AvatarResolverImpl(); @Test - public void create() throws Exception { + public void create() { String avatar = underTest.create(newUserDto("john", "John", "john@doo.com")); assertThat(avatar).isEqualTo("9297bfb538f650da6143b604e82a355d"); } @Test - public void create_is_case_insensitive() throws Exception { + public void create_is_case_insensitive() { assertThat(underTest.create(newUserDto("john", "John", "john@doo.com"))).isEqualTo(underTest.create(newUserDto("john", "John", "John@Doo.com"))); } @Test - public void fail_with_NP_when_user_is_null() throws Exception { + public void fail_with_NP_when_user_is_null() { expectedException.expect(NullPointerException.class); expectedException.expectMessage("User cannot be null"); @@ -54,7 +54,7 @@ public class AvatarResolverImplTest { } @Test - public void fail_with_NP_when_email_is_null() throws Exception { + public void fail_with_NP_when_email_is_null() { expectedException.expect(NullPointerException.class); expectedException.expectMessage("Email cannot be null"); @@ -62,7 +62,7 @@ public class AvatarResolverImplTest { } @Test - public void fail_when_email_is_empty() throws Exception { + public void fail_when_email_is_empty() { expectedException.expect(NullPointerException.class); expectedException.expectMessage("Email cannot be null"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/ChangelogActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/ChangelogActionTest.java index 944ab51a82d..fba14ca2723 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/ChangelogActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/ChangelogActionTest.java @@ -76,7 +76,7 @@ public class ChangelogActionTest { } @Test - public void return_changelog() throws Exception { + public void return_changelog() { UserDto user = insertUser(); IssueDto issueDto = db.issues().insertIssue(newIssue()); userSession.logIn("john").addProjectPermission(USER, project, file); @@ -93,7 +93,7 @@ public class ChangelogActionTest { } @Test - public void changelog_of_file_move_contains_file_names() throws Exception { + public void changelog_of_file_move_contains_file_names() { RuleDto rule = db.rules().insertRule(newRuleDto()); ComponentDto project = db.components().insertPrivateProject(db.organizations().insert()); ComponentDto file1 = db.components().insertComponent(newFileDto(project)); @@ -112,7 +112,7 @@ public class ChangelogActionTest { } @Test - public void changelog_of_file_move_is_empty_when_files_does_not_exists() throws Exception { + public void changelog_of_file_move_is_empty_when_files_does_not_exists() { IssueDto issueDto = db.issues().insertIssue(newIssue()); userSession.logIn("john").addProjectPermission(USER, project, file); db.issues().insertFieldDiffs(issueDto, new FieldDiffs().setDiff("file", "UNKNOWN_1", "UNKNOWN_2").setCreationDate(new Date())); @@ -125,7 +125,7 @@ public class ChangelogActionTest { } @Test - public void return_changelog_on_user_without_email() throws Exception { + public void return_changelog_on_user_without_email() { UserDto user = db.users().insertUser(UserTesting.newUserDto("john", "John", null)); IssueDto issueDto = db.issues().insertIssue(newIssue()); userSession.logIn("john").addProjectPermission(USER, project, file); @@ -140,7 +140,7 @@ public class ChangelogActionTest { } @Test - public void return_changelog_not_having_user() throws Exception { + public void return_changelog_not_having_user() { IssueDto issueDto = db.issues().insertIssue(newIssue()); userSession.logIn("john").addProjectPermission(USER, project, file); db.issues().insertFieldDiffs(issueDto, new FieldDiffs().setUserLogin(null).setDiff("severity", "MAJOR", "BLOCKER").setCreationDate(new Date())); @@ -155,7 +155,7 @@ public class ChangelogActionTest { } @Test - public void return_changelog_on_none_existing_user() throws Exception { + public void return_changelog_on_none_existing_user() { IssueDto issueDto = db.issues().insertIssue(newIssue()); userSession.logIn("john").addProjectPermission(USER, project, file); db.issues().insertFieldDiffs(issueDto, new FieldDiffs().setUserLogin("UNKNOWN").setDiff("severity", "MAJOR", "BLOCKER").setCreationDate(new Date())); @@ -170,7 +170,7 @@ public class ChangelogActionTest { } @Test - public void return_multiple_diffs() throws Exception { + public void return_multiple_diffs() { UserDto user = insertUser(); IssueDto issueDto = db.issues().insertIssue(newIssue()); userSession.logIn("john").addProjectPermission(USER, project, file); @@ -186,7 +186,7 @@ public class ChangelogActionTest { } @Test - public void return_changelog_when_no_old_value() throws Exception { + public void return_changelog_when_no_old_value() { UserDto user = insertUser(); IssueDto issueDto = db.issues().insertIssue(newIssue()); userSession.logIn("john").addProjectPermission(USER, project, file); @@ -199,7 +199,7 @@ public class ChangelogActionTest { } @Test - public void return_changelog_when_no_new_value() throws Exception { + public void return_changelog_when_no_new_value() { UserDto user = insertUser(); IssueDto issueDto = db.issues().insertIssue(newIssue()); userSession.logIn("john").addProjectPermission(USER, project, file); @@ -212,7 +212,7 @@ public class ChangelogActionTest { } @Test - public void return_many_changelog() throws Exception { + public void return_many_changelog() { UserDto user = insertUser(); IssueDto issueDto = db.issues().insertIssue(newIssue()); userSession.logIn("john").addProjectPermission(USER, project, file); @@ -226,7 +226,7 @@ public class ChangelogActionTest { } @Test - public void replace_technical_debt_key_by_effort() throws Exception { + public void replace_technical_debt_key_by_effort() { UserDto user = insertUser(); IssueDto issueDto = db.issues().insertIssue(newIssue()); userSession.logIn("john").addProjectPermission(USER, project, file); @@ -258,7 +258,7 @@ public class ChangelogActionTest { } @Test - public void test_example() throws Exception { + public void test_example() { UserDto user = db.users().insertUser(newUserDto("john.smith", "John Smith", "john@smith.com")); IssueDto issueDto = db.issues().insertIssue(newIssue()); userSession.logIn("john").addProjectPermission(USER, project, file); diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/ComponentTagsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/ComponentTagsActionTest.java index 265963f7917..3196d3eef4c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/ComponentTagsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/ComponentTagsActionTest.java @@ -73,7 +73,7 @@ public class ComponentTagsActionTest { } @Test - public void should_return_empty_list() throws Exception { + public void should_return_empty_list() { TestResponse response = tester.newRequest() .setParam("componentUuid", "polop") .execute(); @@ -81,7 +81,7 @@ public class ComponentTagsActionTest { } @Test - public void should_return_tag_list() throws Exception { + public void should_return_tag_list() { Map tags = ImmutableMap.builder() .put("convention", 2771L) .put("brain-overload", 998L) @@ -105,7 +105,7 @@ public class ComponentTagsActionTest { } @Test - public void should_return_tag_list_with_created_after() throws Exception { + public void should_return_tag_list_with_created_after() { Map tags = ImmutableMap.builder() .put("convention", 2771L) .put("brain-overload", 998L) diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/DeleteCommentActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/DeleteCommentActionTest.java index 26e4a4676e3..ed0c10cc941 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/DeleteCommentActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/DeleteCommentActionTest.java @@ -68,7 +68,7 @@ public class DeleteCommentActionTest { new DeleteCommentAction(userSession, dbClient, new IssueFinder(dbClient, userSession), responseWriter)); @Test - public void delete_comment() throws Exception { + public void delete_comment() { IssueDto issueDto = issueDbTester.insertIssue(); IssueChangeDto commentDto = issueDbTester.insertComment(issueDto, "john", "please fix it"); loginAndAddProjectPermission("john", issueDto, USER); @@ -81,7 +81,7 @@ public class DeleteCommentActionTest { } @Test - public void delete_comment_using_deprecated_key_parameter() throws Exception { + public void delete_comment_using_deprecated_key_parameter() { IssueDto issueDto = issueDbTester.insertIssue(); IssueChangeDto commentDto = issueDbTester.insertComment(issueDto, "john", "please fix it"); loginAndAddProjectPermission("john", issueDto, USER); @@ -94,7 +94,7 @@ public class DeleteCommentActionTest { } @Test - public void fail_when_comment_does_not_belong_to_current_user() throws Exception { + public void fail_when_comment_does_not_belong_to_current_user() { IssueDto issueDto = issueDbTester.insertIssue(); IssueChangeDto commentDto = issueDbTester.insertComment(issueDto, "john", "please fix it"); loginAndAddProjectPermission("another", issueDto, USER); @@ -105,7 +105,7 @@ public class DeleteCommentActionTest { } @Test - public void fail_when_comment_has_not_user() throws Exception { + public void fail_when_comment_has_not_user() { IssueDto issueDto = issueDbTester.insertIssue(); IssueChangeDto commentDto = issueDbTester.insertComment(issueDto, null, "please fix it"); loginAndAddProjectPermission("john", issueDto, USER); @@ -116,7 +116,7 @@ public class DeleteCommentActionTest { } @Test - public void fail_when_missing_comment_key() throws Exception { + public void fail_when_missing_comment_key() { userSession.logIn("john"); expectedException.expect(IllegalArgumentException.class); @@ -124,7 +124,7 @@ public class DeleteCommentActionTest { } @Test - public void fail_when_comment_does_not_exist() throws Exception { + public void fail_when_comment_does_not_exist() { userSession.logIn("john"); expectedException.expect(NotFoundException.class); @@ -132,13 +132,13 @@ public class DeleteCommentActionTest { } @Test - public void fail_when_not_authenticated() throws Exception { + public void fail_when_not_authenticated() { expectedException.expect(UnauthorizedException.class); call("ABCD"); } @Test - public void fail_when_not_enough_permission() throws Exception { + public void fail_when_not_enough_permission() { IssueDto issueDto = issueDbTester.insertIssue(); IssueChangeDto commentDto = issueDbTester.insertComment(issueDto, "john", "please fix it"); loginAndAddProjectPermission("john", issueDto, CODEVIEWER); diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/EditCommentActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/EditCommentActionTest.java index 527dfcbe4d8..fa6dc0a9f75 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/EditCommentActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/EditCommentActionTest.java @@ -79,7 +79,7 @@ public class EditCommentActionTest { } @Test - public void edit_comment() throws Exception { + public void edit_comment() { IssueDto issueDto = issueDbTester.insertIssue(); IssueChangeDto commentDto = issueDbTester.insertComment(issueDto, "john", "please fix it"); loginWithBrowsePermission("john", USER, issueDto); @@ -95,7 +95,7 @@ public class EditCommentActionTest { } @Test - public void edit_comment_using_deprecated_key_parameter() throws Exception { + public void edit_comment_using_deprecated_key_parameter() { IssueDto issueDto = issueDbTester.insertIssue(); IssueChangeDto commentDto = issueDbTester.insertComment(issueDto, "john", "please fix it"); loginWithBrowsePermission("john", USER, issueDto); @@ -111,7 +111,7 @@ public class EditCommentActionTest { } @Test - public void fail_when_comment_does_not_belong_to_current_user() throws Exception { + public void fail_when_comment_does_not_belong_to_current_user() { IssueDto issueDto = issueDbTester.insertIssue(); IssueChangeDto commentDto = issueDbTester.insertComment(issueDto, "john", "please fix it"); loginWithBrowsePermission("another", USER, issueDto); @@ -122,7 +122,7 @@ public class EditCommentActionTest { } @Test - public void fail_when_comment_has_not_user() throws Exception { + public void fail_when_comment_has_not_user() { IssueDto issueDto = issueDbTester.insertIssue(); IssueChangeDto commentDto = issueDbTester.insertComment(issueDto, null, "please fix it"); loginWithBrowsePermission("john", USER, issueDto); @@ -133,7 +133,7 @@ public class EditCommentActionTest { } @Test - public void fail_when_missing_comment_key() throws Exception { + public void fail_when_missing_comment_key() { userSession.logIn("john"); expectedException.expect(IllegalArgumentException.class); @@ -141,7 +141,7 @@ public class EditCommentActionTest { } @Test - public void fail_when_comment_does_not_exist() throws Exception { + public void fail_when_comment_does_not_exist() { userSession.logIn("john"); expectedException.expect(NotFoundException.class); @@ -149,7 +149,7 @@ public class EditCommentActionTest { } @Test - public void fail_when_missing_comment_text() throws Exception { + public void fail_when_missing_comment_text() { userSession.logIn("john"); expectedException.expect(IllegalArgumentException.class); @@ -157,7 +157,7 @@ public class EditCommentActionTest { } @Test - public void fail_when_empty_comment_text() throws Exception { + public void fail_when_empty_comment_text() { IssueDto issueDto = issueDbTester.insertIssue(); IssueChangeDto commentDto = issueDbTester.insertComment(issueDto, "john", "please fix it"); loginWithBrowsePermission("john", USER, issueDto); @@ -167,13 +167,13 @@ public class EditCommentActionTest { } @Test - public void fail_when_not_authenticated() throws Exception { + public void fail_when_not_authenticated() { expectedException.expect(UnauthorizedException.class); call("ABCD", "please fix it"); } @Test - public void fail_when_not_enough_permission() throws Exception { + public void fail_when_not_enough_permission() { IssueDto issueDto = issueDbTester.insertIssue(); IssueChangeDto commentDto = issueDbTester.insertComment(issueDto, "john", "please fix it"); loginWithBrowsePermission("john", CODEVIEWER, issueDto); diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionComponentsTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionComponentsTest.java index bd3c839d202..1a64aa3a1ce 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionComponentsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionComponentsTest.java @@ -122,7 +122,7 @@ public class SearchActionComponentsTest { } @Test - public void issues_on_different_projects() throws Exception { + public void issues_on_different_projects() { RuleDefinitionDto rule = db.rules().insert(r -> r.setRuleKey(RuleKey.of("xoo", "x1"))); OrganizationDto organization1 = db.organizations().insert(); ComponentDto project = db.components().insertPublicProject(organization1); @@ -148,7 +148,7 @@ public class SearchActionComponentsTest { } @Test - public void do_not_return_module_key_on_single_module_projects() throws IOException { + public void do_not_return_module_key_on_single_module_projects() { ComponentDto project = db.components().insertPublicProject(p -> p.setDbKey("PK1")); ComponentDto module = db.components().insertComponent(newModuleDto("M1", project).setDbKey("MK1")); ComponentDto file = db.components().insertComponent(newFileDto(module, null, "F1").setDbKey("FK1")); @@ -664,7 +664,7 @@ public class SearchActionComponentsTest { } @Test - public void search_by_application_key() throws Exception { + public void search_by_application_key() { ComponentDto project1 = db.components().insertPublicProject(); ComponentDto project2 = db.components().insertPublicProject(); ComponentDto application = db.components().insertApplication(db.getDefaultOrganization()); @@ -718,7 +718,7 @@ public class SearchActionComponentsTest { } @Test - public void search_by_application_and_by_leak() throws Exception { + public void search_by_application_and_by_leak() { Date now = new Date(); RuleDefinitionDto rule = db.rules().insert(); ComponentDto application = db.components().insertApplication(db.getDefaultOrganization()); @@ -749,7 +749,7 @@ public class SearchActionComponentsTest { } @Test - public void search_by_application_and_project() throws Exception { + public void search_by_application_and_project() { ComponentDto project1 = db.components().insertPublicProject(); ComponentDto project2 = db.components().insertPublicProject(); ComponentDto application = db.components().insertApplication(db.getDefaultOrganization()); @@ -772,7 +772,7 @@ public class SearchActionComponentsTest { } @Test - public void search_by_application_and_project_and_leak() throws Exception { + public void search_by_application_and_project_and_leak() { Date now = new Date(); RuleDefinitionDto rule = db.rules().insert(); ComponentDto application = db.components().insertApplication(db.getDefaultOrganization()); @@ -804,7 +804,7 @@ public class SearchActionComponentsTest { } @Test - public void search_by_application_and_by_leak_when_one_project_has_no_leak() throws Exception { + public void search_by_application_and_by_leak_when_one_project_has_no_leak() { Date now = new Date(); RuleDefinitionDto rule = db.rules().insert(); ComponentDto application = db.components().insertApplication(db.getDefaultOrganization()); diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionTest.java index 323d8efa3dc..65abaa4ba0a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SearchActionTest.java @@ -703,7 +703,7 @@ public class SearchActionTest { } @Test - public void fail_when_invalid_format() throws Exception { + public void fail_when_invalid_format() { expectedException.expect(IllegalArgumentException.class); expectedException.expectMessage("Date 'wrong-date-input' cannot be parsed as either a date or date+time"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SetTagsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SetTagsActionTest.java index 22e9634f98d..30657d664fa 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SetTagsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/SetTagsActionTest.java @@ -166,7 +166,7 @@ public class SetTagsActionTest { } @Test - public void insert_entry_in_changelog_when_setting_tags() throws Exception { + public void insert_entry_in_changelog_when_setting_tags() { IssueDto issueDto = db.issues().insertIssue(newIssue().setTags(singletonList("old-tag"))); logIn(issueDto); @@ -191,14 +191,14 @@ public class SetTagsActionTest { } @Test - public void fail_when_not_authenticated() throws Exception { + public void fail_when_not_authenticated() { expectedException.expect(UnauthorizedException.class); call("ABCD", "bug"); } @Test - public void fail_when_missing_browse_permission() throws Exception { + public void fail_when_missing_browse_permission() { IssueDto issueDto = db.issues().insertIssue(); logInAndAddProjectPermission(issueDto, ISSUE_ADMIN); diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/TagsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/TagsActionTest.java index 15162360d91..fd21fba8a9e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/TagsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/TagsActionTest.java @@ -78,7 +78,7 @@ public class TagsActionTest { } @Test - public void return_tags_from_issues() throws Exception { + public void return_tags_from_issues() { userSession.logIn(); insertIssueWithBrowsePermission(insertRuleWithoutTags(), "tag1", "tag2"); insertIssueWithBrowsePermission(insertRuleWithoutTags(), "tag3", "tag4", "tag5"); @@ -90,7 +90,7 @@ public class TagsActionTest { } @Test - public void return_tags_from_rules() throws Exception { + public void return_tags_from_rules() { userSession.logIn(); RuleDefinitionDto r = dbTester.rules().insert(setSystemTags("tag1")); ruleIndexer.commitAndIndex(dbTester.getSession(), r.getKey()); @@ -109,7 +109,7 @@ public class TagsActionTest { } @Test - public void return_tags_from_issue_and_rule_tags() throws Exception { + public void return_tags_from_issue_and_rule_tags() { userSession.logIn(); insertIssueWithBrowsePermission(insertRuleWithoutTags(), "tag1", "tag2"); insertIssueWithBrowsePermission(insertRuleWithoutTags(), "tag3", "tag4", "tag5"); @@ -126,7 +126,7 @@ public class TagsActionTest { } @Test - public void return_limited_size() throws Exception { + public void return_limited_size() { userSession.logIn(); insertIssueWithBrowsePermission(insertRuleWithoutTags(), "tag1", "tag2"); insertIssueWithBrowsePermission(insertRuleWithoutTags(), "tag3", "tag4", "tag5"); @@ -139,7 +139,7 @@ public class TagsActionTest { } @Test - public void return_tags_matching_query() throws Exception { + public void return_tags_matching_query() { userSession.logIn(); insertIssueWithBrowsePermission(insertRuleWithoutTags(), "tag1", "tag2"); insertIssueWithBrowsePermission(insertRuleWithoutTags(), "tag12", "tag4", "tag5"); @@ -152,7 +152,7 @@ public class TagsActionTest { } @Test - public void do_not_return_issues_without_permission() throws Exception { + public void do_not_return_issues_without_permission() { userSession.logIn(); insertIssueWithBrowsePermission(insertRuleWithoutTags(), "tag1", "tag2"); insertIssueWithoutBrowsePermission(insertRuleWithoutTags(), "tag3", "tag4"); @@ -165,7 +165,7 @@ public class TagsActionTest { } @Test - public void empty_list() throws Exception { + public void empty_list() { userSession.logIn(); String result = ws.newRequest().execute().getInput(); assertJson(result).isSimilarTo("{\"tags\":[]}"); @@ -185,7 +185,7 @@ public class TagsActionTest { } @Test - public void json_example() throws Exception { + public void json_example() { userSession.logIn(); insertIssueWithBrowsePermission(insertRuleWithoutTags(), "convention"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/index/ProjectMeasuresIndexTest.java b/server/sonar-server/src/test/java/org/sonar/server/measure/index/ProjectMeasuresIndexTest.java index 599c7af4e67..1236648d543 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/measure/index/ProjectMeasuresIndexTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/measure/index/ProjectMeasuresIndexTest.java @@ -413,7 +413,7 @@ public class ProjectMeasuresIndexTest { } @Test - public void return_only_projects_authorized_for_user() throws Exception { + public void return_only_projects_authorized_for_user() { indexForUser(USER1, newDoc(PROJECT1), newDoc(PROJECT2)); indexForUser(USER2, newDoc(PROJECT3)); @@ -422,7 +422,7 @@ public class ProjectMeasuresIndexTest { } @Test - public void return_only_projects_authorized_for_user_groups() throws Exception { + public void return_only_projects_authorized_for_user_groups() { indexForGroup(GROUP1, newDoc(PROJECT1), newDoc(PROJECT2)); indexForGroup(GROUP2, newDoc(PROJECT3)); @@ -431,7 +431,7 @@ public class ProjectMeasuresIndexTest { } @Test - public void return_only_projects_authorized_for_user_and_groups() throws Exception { + public void return_only_projects_authorized_for_user_and_groups() { indexForUser(USER1, newDoc(PROJECT1), newDoc(PROJECT2)); indexForGroup(GROUP1, newDoc(PROJECT3)); @@ -440,7 +440,7 @@ public class ProjectMeasuresIndexTest { } @Test - public void anonymous_user_can_only_access_projects_authorized_for_anyone() throws Exception { + public void anonymous_user_can_only_access_projects_authorized_for_anyone() { index(newDoc(PROJECT1)); indexForUser(USER1, newDoc(PROJECT2)); @@ -458,7 +458,7 @@ public class ProjectMeasuresIndexTest { } @Test - public void does_not_return_facet_when_no_facets_in_options() throws Exception { + public void does_not_return_facet_when_no_facets_in_options() { index( newDoc(PROJECT1, NCLOC, 10d, COVERAGE_KEY, 30d, MAINTAINABILITY_RATING, 3d) .setQualityGateStatus(OK.name())); @@ -544,7 +544,7 @@ public class ProjectMeasuresIndexTest { } @Test - public void facet_ncloc_contains_only_projects_authorized_for_user() throws Exception { + public void facet_ncloc_contains_only_projects_authorized_for_user() { // User can see these projects indexForUser(USER1, // docs with ncloc<1K @@ -693,7 +693,7 @@ public class ProjectMeasuresIndexTest { } @Test - public void facet_coverage_contains_only_projects_authorized_for_user() throws Exception { + public void facet_coverage_contains_only_projects_authorized_for_user() { // User can see these projects indexForUser(USER1, // 1 doc with no coverage @@ -847,7 +847,7 @@ public class ProjectMeasuresIndexTest { } @Test - public void facet_duplicated_lines_density_contains_only_projects_authorized_for_user() throws Exception { + public void facet_duplicated_lines_density_contains_only_projects_authorized_for_user() { // User can see these projects indexForUser(USER1, // docs with no duplication @@ -1005,7 +1005,7 @@ public class ProjectMeasuresIndexTest { @Test @UseDataProvider("rating_metric_keys") - public void facet_on_rating_contains_only_projects_authorized_for_user(String metricKey) throws Exception { + public void facet_on_rating_contains_only_projects_authorized_for_user(String metricKey) { // User can see these projects indexForUser(USER1, // 3 docs with rating A @@ -1096,7 +1096,7 @@ public class ProjectMeasuresIndexTest { } @Test - public void facet_quality_gate_contains_only_projects_authorized_for_user() throws Exception { + public void facet_quality_gate_contains_only_projects_authorized_for_user() { // User can see these projects indexForUser(USER1, // 2 docs with QG OK @@ -1209,7 +1209,7 @@ public class ProjectMeasuresIndexTest { } @Test - public void facet_languages_contains_only_projects_authorized_for_user() throws Exception { + public void facet_languages_contains_only_projects_authorized_for_user() { // User can see these projects indexForUser(USER1, newDoc().setLanguages(singletonList("java")), diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/index/ProjectMeasuresQueryTest.java b/server/sonar-server/src/test/java/org/sonar/server/measure/index/ProjectMeasuresQueryTest.java index ac56703737d..4d3b5e6d882 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/measure/index/ProjectMeasuresQueryTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/measure/index/ProjectMeasuresQueryTest.java @@ -38,14 +38,14 @@ public class ProjectMeasuresQueryTest { private ProjectMeasuresQuery underTest = new ProjectMeasuresQuery(); @Test - public void empty_query() throws Exception { + public void empty_query() { assertThat(underTest.getMetricCriteria()).isEmpty(); assertThat(underTest.getQualityGateStatus()).isEmpty(); assertThat(underTest.getOrganizationUuid()).isEmpty(); } @Test - public void add_metric_criterion() throws Exception { + public void add_metric_criterion() { underTest.addMetricCriterion(MetricCriterion.create("coverage", EQ, 10d)); assertThat(underTest.getMetricCriteria()) @@ -54,7 +54,7 @@ public class ProjectMeasuresQueryTest { } @Test - public void isNoData_returns_true_when_no_data() throws Exception { + public void isNoData_returns_true_when_no_data() { underTest.addMetricCriterion(MetricCriterion.createNoData("coverage")); assertThat(underTest.getMetricCriteria()) @@ -63,7 +63,7 @@ public class ProjectMeasuresQueryTest { } @Test - public void isNoData_returns_false_when_data_exists() throws Exception { + public void isNoData_returns_false_when_data_exists() { underTest.addMetricCriterion(MetricCriterion.create("coverage", EQ, 10d)); assertThat(underTest.getMetricCriteria()) @@ -72,19 +72,19 @@ public class ProjectMeasuresQueryTest { } @Test - public void set_quality_gate_status() throws Exception { + public void set_quality_gate_status() { underTest.setQualityGateStatus(OK); assertThat(underTest.getQualityGateStatus().get()).isEqualTo(Level.OK); } @Test - public void default_sort_is_by_name() throws Exception { + public void default_sort_is_by_name() { assertThat(underTest.getSort()).isEqualTo("name"); } @Test - public void fail_to_set_null_sort() throws Exception { + public void fail_to_set_null_sort() { expectedException.expect(NullPointerException.class); expectedException.expectMessage("Sort cannot be null"); @@ -92,7 +92,7 @@ public class ProjectMeasuresQueryTest { } @Test - public void fail_to_get_value_when_no_data() throws Exception { + public void fail_to_get_value_when_no_data() { expectedException.expect(IllegalStateException.class); expectedException.expectMessage("The criterion for metric coverage has no data"); @@ -100,7 +100,7 @@ public class ProjectMeasuresQueryTest { } @Test - public void fail_to_get_operator_when_no_data() throws Exception { + public void fail_to_get_operator_when_no_data() { expectedException.expect(IllegalStateException.class); expectedException.expectMessage("The criterion for metric coverage has no data"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/ws/ComponentActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/measure/ws/ComponentActionTest.java index 48a53379c5e..3b1542d0b7d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/measure/ws/ComponentActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/measure/ws/ComponentActionTest.java @@ -378,7 +378,7 @@ public class ComponentActionTest { } @Test - public void fail_when_using_branch_uuid() throws Exception { + public void fail_when_using_branch_uuid() { OrganizationDto organization = db.organizations().insert(); ComponentDto project = db.components().insertMainBranch(organization); userSession.logIn().addProjectPermission(UserRole.USER, project); diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/ws/ComponentTreeActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/measure/ws/ComponentTreeActionTest.java index 8284ccf3979..36e71bc488d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/measure/ws/ComponentTreeActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/measure/ws/ComponentTreeActionTest.java @@ -833,7 +833,7 @@ public class ComponentTreeActionTest { } @Test - public void fail_when_using_branch_uuid() throws Exception { + public void fail_when_using_branch_uuid() { OrganizationDto organization = db.organizations().insert(); ComponentDto project = db.components().insertMainBranch(organization); userSession.logIn().addProjectPermission(UserRole.USER, project); diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/ws/SearchActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/measure/ws/SearchActionTest.java index 1d19311f10c..46f0cdd01ec 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/measure/ws/SearchActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/measure/ws/SearchActionTest.java @@ -111,7 +111,7 @@ public class SearchActionTest { } @Test - public void return_measures() throws Exception { + public void return_measures() { ComponentDto project = db.components().insertPrivateProject(db.getDefaultOrganization()); userSession.addProjectPermission(UserRole.USER, project); MetricDto coverage = db.measures().insertMetric(m -> m.setValueType(FLOAT.name())); @@ -127,7 +127,7 @@ public class SearchActionTest { } @Test - public void return_measures_on_leak_period() throws Exception { + public void return_measures_on_leak_period() { OrganizationDto organization = db.organizations().insert(); ComponentDto project = db.components().insertPrivateProject(organization); userSession.addProjectPermission(UserRole.USER, project); @@ -147,7 +147,7 @@ public class SearchActionTest { } @Test - public void sort_by_metric_key_then_project_name() throws Exception { + public void sort_by_metric_key_then_project_name() { MetricDto coverage = db.measures().insertMetric(m -> m.setKey("coverage").setValueType(FLOAT.name())); MetricDto complexity = db.measures().insertMetric(m -> m.setKey("complexity").setValueType(INT.name())); OrganizationDto organization = db.organizations().insert(); @@ -173,7 +173,7 @@ public class SearchActionTest { } @Test - public void return_measures_on_view() throws Exception { + public void return_measures_on_view() { OrganizationDto organization = db.organizations().insert(); ComponentDto view = db.components().insertPrivatePortfolio(organization); userSession.addProjectPermission(UserRole.USER, view); @@ -191,7 +191,7 @@ public class SearchActionTest { @Test - public void return_measures_on_application() throws Exception { + public void return_measures_on_application() { OrganizationDto organization = db.organizations().insert(); ComponentDto application = db.components().insertPrivateApplication(organization); userSession.addProjectPermission(UserRole.USER, application); @@ -208,7 +208,7 @@ public class SearchActionTest { } @Test - public void return_measures_on_sub_view() throws Exception { + public void return_measures_on_sub_view() { OrganizationDto organization = db.organizations().insert(); ComponentDto view = db.components().insertPrivatePortfolio(organization); ComponentDto subView = db.components().insertComponent(newSubView(view)); diff --git a/server/sonar-server/src/test/java/org/sonar/server/notification/ws/NotificationsWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/notification/ws/NotificationsWsTest.java index a8d866a4b9a..9eb2fbd2419 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/notification/ws/NotificationsWsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/notification/ws/NotificationsWsTest.java @@ -48,7 +48,7 @@ public class NotificationsWsTest { } @Override - public void handle(Request request, Response response) throws Exception { + public void handle(Request request, Response response) { // do nothing } } diff --git a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/AddMemberActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/organization/ws/AddMemberActionTest.java index cf69359db82..7f30d03a723 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/AddMemberActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/organization/ws/AddMemberActionTest.java @@ -168,7 +168,7 @@ public class AddMemberActionTest { } @Test - public void fail_when_organization_has_no_default_group() throws Exception { + public void fail_when_organization_has_no_default_group() { OrganizationDto organization = db.organizations().insert(); UserDto user = db.users().insertUser(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/CreateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/organization/ws/CreateActionTest.java index 4af826f7aa0..4dc84d03add 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/CreateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/organization/ws/CreateActionTest.java @@ -152,7 +152,7 @@ public class CreateActionTest { } @Test - public void verify_response_example() throws URISyntaxException, IOException { + public void verify_response_example() { logInAsSystemAdministrator(); mockForSuccessfulInsert(Uuids.UUID_EXAMPLE_01, SOME_DATE); dbTester.qualityGates().insertBuiltInQualityGate(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/DeleteActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/organization/ws/DeleteActionTest.java index 4d3fa72cefe..bca1f7ceecd 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/DeleteActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/organization/ws/DeleteActionTest.java @@ -114,7 +114,7 @@ public class DeleteActionTest { } @Test - public void organization_deletion_also_ensure_that_homepage_on_this_organization_if_it_exists_is_cleared() throws Exception { + public void organization_deletion_also_ensure_that_homepage_on_this_organization_if_it_exists_is_cleared() { OrganizationDto organization = db.organizations().insert(); UserDto user = dbClient.userDao().insert(session, newUserDto().setHomepageType("ORGANIZATION").setHomepageParameter(organization.getUuid())); session.commit(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/EnableSupportActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/organization/ws/EnableSupportActionTest.java index cc14816568f..f034b7ad14d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/EnableSupportActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/organization/ws/EnableSupportActionTest.java @@ -98,7 +98,7 @@ public class EnableSupportActionTest { } @Test - public void enabling_support_creates_default_members_group_and_associate_org_members() throws Exception { + public void enabling_support_creates_default_members_group_and_associate_org_members() { OrganizationDto defaultOrganization = dbTester.getDefaultOrganization(); OrganizationDto anotherOrganization = dbTester.organizations().insert(); UserDto user1 = dbTester.users().insertUser(); @@ -123,7 +123,7 @@ public class EnableSupportActionTest { } @Test - public void enabling_support_copy_sonar_users_permissions_to_members_group() throws Exception { + public void enabling_support_copy_sonar_users_permissions_to_members_group() { OrganizationDto defaultOrganization = dbTester.getDefaultOrganization(); UserDto user = dbTester.users().insertUser(); GroupDto sonarUsersGroup = dbTester.users().insertDefaultGroup(defaultOrganization, "sonar-users"); @@ -147,7 +147,7 @@ public class EnableSupportActionTest { } @Test - public void enabling_support_copy_sonar_users_permission_templates_to_members_group() throws Exception { + public void enabling_support_copy_sonar_users_permission_templates_to_members_group() { OrganizationDto defaultOrganization = dbTester.getDefaultOrganization(); UserDto user = dbTester.users().insertUser(); GroupDto sonarUsersGroup = dbTester.users().insertDefaultGroup(defaultOrganization, "sonar-users"); @@ -201,7 +201,7 @@ public class EnableSupportActionTest { } @Test - public void throw_IAE_when_members_group_already_exists() throws Exception { + public void throw_IAE_when_members_group_already_exists() { UserDto user = dbTester.users().insertUser(); dbTester.users().insertDefaultGroup(dbTester.getDefaultOrganization(), "sonar-users"); dbTester.users().insertGroup(dbTester.getDefaultOrganization(), "Members"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/RemoveMemberActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/organization/ws/RemoveMemberActionTest.java index 41eda9b706d..ee930985834 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/organization/ws/RemoveMemberActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/organization/ws/RemoveMemberActionTest.java @@ -331,7 +331,7 @@ public class RemoveMemberActionTest { } @Test - public void remove_org_admin_is_allowed_when_another_org_admin_exists() throws Exception { + public void remove_org_admin_is_allowed_when_another_org_admin_exists() { OrganizationDto anotherOrganization = db.organizations().insert(); UserDto admin1 = db.users().insertAdminByUserPermission(anotherOrganization); db.organizations().addMember(anotherOrganization, admin1); @@ -389,8 +389,8 @@ public class RemoveMemberActionTest { private void insertProperty(String key, @Nullable String value, @Nullable Long resourceId, @Nullable Integer userId) { PropertyDto dto = new PropertyDto().setKey(key) - .setResourceId(resourceId == null ? null : resourceId) - .setUserId(userId == null ? null : userId) + .setResourceId(resourceId) + .setUserId(userId) .setValue(value); db.properties().insertProperty(dto); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ApplyPermissionTemplateQueryTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/ApplyPermissionTemplateQueryTest.java index adbd7c53dd7..80cd40f9d84 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/permission/ApplyPermissionTemplateQueryTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/permission/ApplyPermissionTemplateQueryTest.java @@ -55,6 +55,6 @@ public class ApplyPermissionTemplateQueryTest { expectedException.expect(BadRequestException.class); expectedException.expectMessage("No project provided. Please provide at least one project."); - ApplyPermissionTemplateQuery.create("my_template_key", Collections.emptyList()); + ApplyPermissionTemplateQuery.create("my_template_key", Collections.emptyList()); } } diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/index/PermissionIndexerDaoTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/index/PermissionIndexerDaoTest.java index f42bb6885ad..75eb48e6e53 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/permission/index/PermissionIndexerDaoTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/permission/index/PermissionIndexerDaoTest.java @@ -164,7 +164,7 @@ public class PermissionIndexerDaoTest { } @Test - public void select_by_projects_with_high_number_of_projects() throws Exception { + public void select_by_projects_with_high_number_of_projects() { List projectUuids = new ArrayList<>(); for (int i = 0; i < 350; i++) { ComponentDto project = ComponentTesting.newPrivateProjectDto(organization, Integer.toString(i)); diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/AddGroupActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/AddGroupActionTest.java index befb6d1df88..26858d89fa9 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/AddGroupActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/AddGroupActionTest.java @@ -64,7 +64,7 @@ public class AddGroupActionTest extends BasePermissionWsTest { } @Test - public void add_permission_to_group_referenced_by_its_name() throws Exception { + public void add_permission_to_group_referenced_by_its_name() { GroupDto group = db.users().insertGroup(db.getDefaultOrganization(), "sonar-administrators"); loginAsAdmin(db.getDefaultOrganization()); @@ -77,7 +77,7 @@ public class AddGroupActionTest extends BasePermissionWsTest { } @Test - public void reference_group_by_its_name_in_organization() throws Exception { + public void reference_group_by_its_name_in_organization() { OrganizationDto org = db.organizations().insert(); GroupDto group = db.users().insertGroup(org, "the-group"); loginAsAdmin(org); @@ -92,7 +92,7 @@ public class AddGroupActionTest extends BasePermissionWsTest { } @Test - public void add_permission_to_group_referenced_by_its_id() throws Exception { + public void add_permission_to_group_referenced_by_its_id() { GroupDto group = db.users().insertGroup(db.getDefaultOrganization(), "sonar-administrators"); loginAsAdmin(db.getDefaultOrganization()); @@ -105,7 +105,7 @@ public class AddGroupActionTest extends BasePermissionWsTest { } @Test - public void add_permission_to_project_referenced_by_its_id() throws Exception { + public void add_permission_to_project_referenced_by_its_id() { GroupDto group = db.users().insertGroup(db.getDefaultOrganization(), "sonar-administrators"); ComponentDto project = db.components().insertComponent(newPrivateProjectDto(db.getDefaultOrganization(), A_PROJECT_UUID).setDbKey(A_PROJECT_KEY)); loginAsAdmin(db.getDefaultOrganization()); @@ -121,7 +121,7 @@ public class AddGroupActionTest extends BasePermissionWsTest { } @Test - public void add_permission_to_project_referenced_by_its_key() throws Exception { + public void add_permission_to_project_referenced_by_its_key() { GroupDto group = db.users().insertGroup(db.getDefaultOrganization(), "sonar-administrators"); ComponentDto project = db.components().insertComponent(newPrivateProjectDto(db.getDefaultOrganization(), A_PROJECT_UUID).setDbKey(A_PROJECT_KEY)); loginAsAdmin(db.getDefaultOrganization()); @@ -137,7 +137,7 @@ public class AddGroupActionTest extends BasePermissionWsTest { } @Test - public void add_with_view_uuid() throws Exception { + public void add_with_view_uuid() { OrganizationDto organizationDto = db.getDefaultOrganization(); GroupDto group = db.users().insertGroup(db.getDefaultOrganization(), "sonar-administrators"); ComponentDto view = db.components().insertComponent(newView(organizationDto, "view-uuid").setDbKey("view-key")); @@ -154,7 +154,7 @@ public class AddGroupActionTest extends BasePermissionWsTest { } @Test - public void fail_if_project_uuid_is_not_found() throws Exception { + public void fail_if_project_uuid_is_not_found() { GroupDto group = db.users().insertGroup(db.getDefaultOrganization(), "sonar-administrators"); loginAsAdmin(db.getDefaultOrganization()); @@ -167,28 +167,28 @@ public class AddGroupActionTest extends BasePermissionWsTest { } @Test - public void fail_when_component_is_a_module() throws Exception { + public void fail_when_component_is_a_module() { ComponentDto module = db.components().insertComponent(newModuleDto(ComponentTesting.newPrivateProjectDto(db.organizations().insert()))); failIfComponentIsNotAProjectOrView(module); } @Test - public void fail_when_component_is_a_directory() throws Exception { + public void fail_when_component_is_a_directory() { ComponentDto file = db.components().insertComponent(newDirectory(ComponentTesting.newPrivateProjectDto(db.organizations().insert()), "A/B")); failIfComponentIsNotAProjectOrView(file); } @Test - public void fail_when_component_is_a_file() throws Exception { + public void fail_when_component_is_a_file() { ComponentDto file = db.components().insertComponent(newFileDto(ComponentTesting.newPrivateProjectDto(db.organizations().insert()), null, "file-uuid")); failIfComponentIsNotAProjectOrView(file); } @Test - public void fail_when_component_is_a_subview() throws Exception { + public void fail_when_component_is_a_subview() { ComponentDto file = db.components().insertComponent(newSubView(ComponentTesting.newView(db.organizations().insert()))); failIfComponentIsNotAProjectOrView(file); @@ -219,7 +219,7 @@ public class AddGroupActionTest extends BasePermissionWsTest { } @Test - public void adding_a_project_permission_fails_if_component_is_not_a_project() throws Exception { + public void adding_a_project_permission_fails_if_component_is_not_a_project() { OrganizationDto organizationDto = db.getDefaultOrganization(); GroupDto group = db.users().insertGroup(organizationDto, "sonar-administrators"); ComponentDto project = db.components().insertComponent(newPrivateProjectDto(organizationDto, A_PROJECT_UUID).setDbKey(A_PROJECT_KEY)); @@ -236,7 +236,7 @@ public class AddGroupActionTest extends BasePermissionWsTest { } @Test - public void fail_when_get_request() throws Exception { + public void fail_when_get_request() { loginAsAdmin(db.getDefaultOrganization()); expectedException.expect(ServerException.class); @@ -249,7 +249,7 @@ public class AddGroupActionTest extends BasePermissionWsTest { } @Test - public void fail_when_group_name_and_group_id_are_missing() throws Exception { + public void fail_when_group_name_and_group_id_are_missing() { loginAsAdmin(db.getDefaultOrganization()); expectedException.expect(BadRequestException.class); @@ -261,7 +261,7 @@ public class AddGroupActionTest extends BasePermissionWsTest { } @Test - public void fail_when_permission_is_missing() throws Exception { + public void fail_when_permission_is_missing() { GroupDto group = db.users().insertGroup(db.getDefaultOrganization(), "sonar-administrators"); loginAsAdmin(db.getDefaultOrganization()); @@ -273,7 +273,7 @@ public class AddGroupActionTest extends BasePermissionWsTest { } @Test - public void fail_if_not_administrator_of_organization() throws Exception { + public void fail_if_not_administrator_of_organization() { GroupDto group = db.users().insertGroup(); loginAsAdmin(db.getDefaultOrganization()); @@ -285,7 +285,7 @@ public class AddGroupActionTest extends BasePermissionWsTest { } @Test - public void fail_if_administrator_of_other_organization_only() throws Exception { + public void fail_if_administrator_of_other_organization_only() { OrganizationDto org1 = db.organizations().insert(); OrganizationDto org2 = db.organizations().insert(); GroupDto group = db.users().insertGroup(org1, "the-group"); @@ -300,7 +300,7 @@ public class AddGroupActionTest extends BasePermissionWsTest { } @Test - public void fail_when_project_uuid_and_project_key_are_provided() throws Exception { + public void fail_when_project_uuid_and_project_key_are_provided() { GroupDto group = db.users().insertGroup(); ComponentDto project = db.components().insertComponent(ComponentTesting.newPrivateProjectDto(db.organizations().insert())); loginAsAdmin(db.getDefaultOrganization()); @@ -317,7 +317,7 @@ public class AddGroupActionTest extends BasePermissionWsTest { } @Test - public void adding_global_permission_fails_if_not_administrator_of_organization() throws Exception { + public void adding_global_permission_fails_if_not_administrator_of_organization() { GroupDto group = db.users().insertGroup(db.getDefaultOrganization(), "sonar-administrators"); // user is administrator of another organization userSession.logIn().addPermission(ADMINISTER, "anotherOrg"); @@ -331,7 +331,7 @@ public class AddGroupActionTest extends BasePermissionWsTest { } @Test - public void adding_project_permission_fails_if_not_administrator_of_project() throws Exception { + public void adding_project_permission_fails_if_not_administrator_of_project() { GroupDto group = db.users().insertGroup(db.getDefaultOrganization(), "sonar-administrators"); ComponentDto project = db.components().insertPrivateProject(); userSession.logIn(); @@ -349,7 +349,7 @@ public class AddGroupActionTest extends BasePermissionWsTest { * User is project administrator but not system administrator */ @Test - public void adding_project_permission_is_allowed_to_project_administrators() throws Exception { + public void adding_project_permission_is_allowed_to_project_administrators() { GroupDto group = db.users().insertGroup(db.getDefaultOrganization(), "sonar-administrators"); ComponentDto project = db.components().insertPrivateProject(); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); @@ -467,7 +467,7 @@ public class AddGroupActionTest extends BasePermissionWsTest { } @Test - public void fail_when_using_branch_uuid() throws Exception { + public void fail_when_using_branch_uuid() { OrganizationDto organization = db.organizations().insert(); GroupDto group = db.users().insertGroup(organization); ComponentDto project = db.components().insertMainBranch(organization); @@ -485,7 +485,7 @@ public class AddGroupActionTest extends BasePermissionWsTest { .execute(); } - private void executeRequest(GroupDto groupDto, String permission) throws Exception { + private void executeRequest(GroupDto groupDto, String permission) { newRequest() .setParam(PARAM_GROUP_NAME, groupDto.getName()) .setParam(PARAM_PERMISSION, permission) diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/AddUserActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/AddUserActionTest.java index 1698e234c63..7545c0d22ba 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/AddUserActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/AddUserActionTest.java @@ -66,7 +66,7 @@ public class AddUserActionTest extends BasePermissionWsTest { } @Test - public void add_permission_to_user_on_default_organization_if_organization_is_not_specified() throws Exception { + public void add_permission_to_user_on_default_organization_if_organization_is_not_specified() { loginAsAdmin(db.getDefaultOrganization()); newRequest() @@ -78,7 +78,7 @@ public class AddUserActionTest extends BasePermissionWsTest { } @Test - public void add_permission_to_user_on_specified_organization() throws Exception { + public void add_permission_to_user_on_specified_organization() { OrganizationDto organization = db.organizations().insert(); addUserAsMemberOfOrganization(organization); loginAsAdmin(organization); @@ -93,7 +93,7 @@ public class AddUserActionTest extends BasePermissionWsTest { } @Test - public void add_permission_to_project_referenced_by_its_id() throws Exception { + public void add_permission_to_project_referenced_by_its_id() { OrganizationDto organization = db.organizations().insert(); addUserAsMemberOfOrganization(organization); ComponentDto project = db.components().insertPrivateProject(organization); @@ -110,7 +110,7 @@ public class AddUserActionTest extends BasePermissionWsTest { } @Test - public void add_permission_to_project_referenced_by_its_key() throws Exception { + public void add_permission_to_project_referenced_by_its_key() { ComponentDto project = db.components().insertPrivateProject(); loginAsAdmin(db.getDefaultOrganization()); @@ -125,7 +125,7 @@ public class AddUserActionTest extends BasePermissionWsTest { } @Test - public void add_permission_to_view() throws Exception { + public void add_permission_to_view() { ComponentDto view = db.components().insertComponent(newView(db.getDefaultOrganization(), "view-uuid").setDbKey("view-key")); loginAsAdmin(db.getDefaultOrganization()); @@ -140,7 +140,7 @@ public class AddUserActionTest extends BasePermissionWsTest { } @Test - public void fail_when_project_uuid_is_unknown() throws Exception { + public void fail_when_project_uuid_is_unknown() { loginAsAdmin(db.getDefaultOrganization()); expectedException.expect(NotFoundException.class); @@ -153,28 +153,28 @@ public class AddUserActionTest extends BasePermissionWsTest { } @Test - public void fail_when_component_is_a_module() throws Exception { + public void fail_when_component_is_a_module() { ComponentDto module = db.components().insertComponent(newModuleDto(ComponentTesting.newPrivateProjectDto(db.organizations().insert()))); failIfComponentIsNotAProjectOrView(module); } @Test - public void fail_when_component_is_a_directory() throws Exception { + public void fail_when_component_is_a_directory() { ComponentDto file = db.components().insertComponent(newDirectory(ComponentTesting.newPrivateProjectDto(db.organizations().insert()), "A/B")); failIfComponentIsNotAProjectOrView(file); } @Test - public void fail_when_component_is_a_file() throws Exception { + public void fail_when_component_is_a_file() { ComponentDto file = db.components().insertComponent(newFileDto(ComponentTesting.newPrivateProjectDto(db.organizations().insert()), null, "file-uuid")); failIfComponentIsNotAProjectOrView(file); } @Test - public void fail_when_component_is_a_subview() throws Exception { + public void fail_when_component_is_a_subview() { ComponentDto file = db.components().insertComponent(newSubView(ComponentTesting.newView(db.organizations().insert()))); failIfComponentIsNotAProjectOrView(file); @@ -194,7 +194,7 @@ public class AddUserActionTest extends BasePermissionWsTest { } @Test - public void fail_when_project_permission_without_project() throws Exception { + public void fail_when_project_permission_without_project() { loginAsAdmin(db.getDefaultOrganization()); expectedException.expect(BadRequestException.class); @@ -206,7 +206,7 @@ public class AddUserActionTest extends BasePermissionWsTest { } @Test - public void fail_when_component_is_not_a_project() throws Exception { + public void fail_when_component_is_not_a_project() { db.components().insertComponent(newFileDto(newPrivateProjectDto(db.organizations().insert(), "project-uuid"), null, "file-uuid")); loginAsAdmin(db.getDefaultOrganization()); @@ -220,7 +220,7 @@ public class AddUserActionTest extends BasePermissionWsTest { } @Test - public void fail_when_get_request() throws Exception { + public void fail_when_get_request() { loginAsAdmin(db.getDefaultOrganization()); expectedException.expect(ServerException.class); @@ -233,7 +233,7 @@ public class AddUserActionTest extends BasePermissionWsTest { } @Test - public void fail_when_user_login_is_missing() throws Exception { + public void fail_when_user_login_is_missing() { loginAsAdmin(db.getDefaultOrganization()); expectedException.expect(IllegalArgumentException.class); @@ -244,7 +244,7 @@ public class AddUserActionTest extends BasePermissionWsTest { } @Test - public void fail_when_permission_is_missing() throws Exception { + public void fail_when_permission_is_missing() { loginAsAdmin(db.getDefaultOrganization()); expectedException.expect(NotFoundException.class); @@ -255,7 +255,7 @@ public class AddUserActionTest extends BasePermissionWsTest { } @Test - public void fail_when_project_uuid_and_project_key_are_provided() throws Exception { + public void fail_when_project_uuid_and_project_key_are_provided() { db.components().insertPrivateProject(); loginAsAdmin(db.getDefaultOrganization()); @@ -271,7 +271,7 @@ public class AddUserActionTest extends BasePermissionWsTest { } @Test - public void adding_global_permission_fails_if_not_administrator_of_organization() throws Exception { + public void adding_global_permission_fails_if_not_administrator_of_organization() { userSession.logIn(); expectedException.expect(ForbiddenException.class); @@ -283,7 +283,7 @@ public class AddUserActionTest extends BasePermissionWsTest { } @Test - public void adding_project_permission_fails_if_not_administrator_of_project() throws Exception { + public void adding_project_permission_fails_if_not_administrator_of_project() { ComponentDto project = db.components().insertPrivateProject(); userSession.logIn(); @@ -300,7 +300,7 @@ public class AddUserActionTest extends BasePermissionWsTest { * User is project administrator but not system administrator */ @Test - public void adding_project_permission_is_allowed_to_project_administrators() throws Exception { + public void adding_project_permission_is_allowed_to_project_administrators() { ComponentDto project = db.components().insertPrivateProject(); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); @@ -331,7 +331,7 @@ public class AddUserActionTest extends BasePermissionWsTest { } @Test - public void fail_to_add_permission_when_user_is_not_member_of_given_organization() throws Exception { + public void fail_to_add_permission_when_user_is_not_member_of_given_organization() { // User is not member of given organization OrganizationDto otherOrganization = db.organizations().insert(); addUserAsMemberOfOrganization(otherOrganization); @@ -400,7 +400,7 @@ public class AddUserActionTest extends BasePermissionWsTest { } @Test - public void fail_when_using_branch_uuid() throws Exception { + public void fail_when_using_branch_uuid() { OrganizationDto organization = db.organizations().insert(); addUserAsMemberOfOrganization(organization); ComponentDto project = db.components().insertMainBranch(organization); diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/GroupsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/GroupsActionTest.java index 061edfc70bf..7d77b094dd2 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/GroupsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/GroupsActionTest.java @@ -76,7 +76,7 @@ public class GroupsActionTest extends BasePermissionWsTest { } @Test - public void search_for_groups_with_one_permission() throws Exception { + public void search_for_groups_with_one_permission() { loginAsAdmin(db.getDefaultOrganization()); String json = newRequest() @@ -115,7 +115,7 @@ public class GroupsActionTest extends BasePermissionWsTest { } @Test - public void search_with_selection() throws Exception { + public void search_with_selection() { loginAsAdmin(db.getDefaultOrganization()); String result = newRequest() .setParam(PARAM_PERMISSION, SCAN.getKey()) @@ -126,7 +126,7 @@ public class GroupsActionTest extends BasePermissionWsTest { } @Test - public void search_groups_with_pagination() throws Exception { + public void search_groups_with_pagination() { loginAsAdmin(db.getDefaultOrganization()); String result = newRequest() .setParam(PARAM_PERMISSION, SCAN.getKey()) @@ -141,7 +141,7 @@ public class GroupsActionTest extends BasePermissionWsTest { } @Test - public void search_groups_with_query() throws Exception { + public void search_groups_with_query() { loginAsAdmin(db.getDefaultOrganization()); String result = newRequest() .setParam(PARAM_PERMISSION, SCAN.getKey()) @@ -155,7 +155,7 @@ public class GroupsActionTest extends BasePermissionWsTest { } @Test - public void search_groups_with_project_permissions() throws Exception { + public void search_groups_with_project_permissions() { OrganizationDto organizationDto = db.getDefaultOrganization(); ComponentDto project = db.components().insertComponent(newPrivateProjectDto(organizationDto, "project-uuid")); GroupDto group = db.users().insertGroup(organizationDto, "project-group-name"); @@ -180,7 +180,7 @@ public class GroupsActionTest extends BasePermissionWsTest { } @Test - public void return_also_groups_without_permission_when_search_query() throws Exception { + public void return_also_groups_without_permission_when_search_query() { OrganizationDto organizationDto = db.getDefaultOrganization(); ComponentDto project = db.components().insertComponent(newPrivateProjectDto(organizationDto, "project-uuid")); GroupDto group = db.users().insertGroup(organizationDto, "group-with-permission"); @@ -203,7 +203,7 @@ public class GroupsActionTest extends BasePermissionWsTest { } @Test - public void return_only_groups_with_permission_when_no_search_query() throws Exception { + public void return_only_groups_with_permission_when_no_search_query() { ComponentDto project = db.components().insertComponent(newPrivateProjectDto(db.getDefaultOrganization(), "project-uuid")); GroupDto group = db.users().insertGroup(db.getDefaultOrganization(), "project-group-name"); db.users().insertProjectPermissionOnGroup(group, ISSUE_ADMIN, project); @@ -222,7 +222,7 @@ public class GroupsActionTest extends BasePermissionWsTest { } @Test - public void return_anyone_group_when_search_query_and_no_param_permission() throws Exception { + public void return_anyone_group_when_search_query_and_no_param_permission() { OrganizationDto organizationDto = db.organizations().insert(); ComponentDto project = db.components().insertComponent(newPrivateProjectDto(organizationDto, "project-uuid")); GroupDto group = db.users().insertGroup(organizationDto, "group-with-permission"); @@ -239,7 +239,7 @@ public class GroupsActionTest extends BasePermissionWsTest { } @Test - public void search_groups_on_views() throws Exception { + public void search_groups_on_views() { ComponentDto view = db.components().insertComponent(newView(db.getDefaultOrganization(), "view-uuid").setDbKey("view-key")); GroupDto group = db.users().insertGroup(db.getDefaultOrganization(), "project-group-name"); db.users().insertProjectPermissionOnGroup(group, ISSUE_ADMIN, view); @@ -258,7 +258,7 @@ public class GroupsActionTest extends BasePermissionWsTest { } @Test - public void fail_if_not_logged_in() throws Exception { + public void fail_if_not_logged_in() { expectedException.expect(UnauthorizedException.class); userSession.anonymous(); @@ -268,7 +268,7 @@ public class GroupsActionTest extends BasePermissionWsTest { } @Test - public void fail_if_insufficient_privileges() throws Exception { + public void fail_if_insufficient_privileges() { expectedException.expect(ForbiddenException.class); userSession.logIn("login"); @@ -278,7 +278,7 @@ public class GroupsActionTest extends BasePermissionWsTest { } @Test - public void fail_if_project_uuid_and_project_key_are_provided() throws Exception { + public void fail_if_project_uuid_and_project_key_are_provided() { db.components().insertComponent(newPrivateProjectDto(db.organizations().insert(), "project-uuid").setDbKey("project-key")); expectedException.expect(BadRequestException.class); diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/RemoveGroupActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/RemoveGroupActionTest.java index 6722353aae3..69631be07d9 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/RemoveGroupActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/RemoveGroupActionTest.java @@ -68,7 +68,7 @@ public class RemoveGroupActionTest extends BasePermissionWsTest } @Test - public void remove_permission_from_user() throws Exception { + public void remove_permission_from_user() { db.users().insertPermissionOnUser(user, PROVISION_PROJECTS); db.users().insertPermissionOnUser(user, ADMINISTER_QUALITY_GATES); loginAsAdmin(db.getDefaultOrganization()); @@ -88,7 +88,7 @@ public class RemoveUserActionTest extends BasePermissionWsTest } @Test - public void fail_to_remove_admin_permission_if_last_admin() throws Exception { + public void fail_to_remove_admin_permission_if_last_admin() { db.users().insertPermissionOnUser(user, ADMINISTER); loginAsAdmin(db.getDefaultOrganization()); @@ -102,7 +102,7 @@ public class RemoveUserActionTest extends BasePermissionWsTest } @Test - public void remove_permission_from_project() throws Exception { + public void remove_permission_from_project() { ComponentDto project = db.components().insertComponent(newPrivateProjectDto(db.organizations().insert(), A_PROJECT_UUID).setDbKey(A_PROJECT_KEY)); db.users().insertProjectPermissionOnUser(user, CODEVIEWER, project); db.users().insertProjectPermissionOnUser(user, ISSUE_ADMIN, project); @@ -118,7 +118,7 @@ public class RemoveUserActionTest extends BasePermissionWsTest } @Test - public void remove_with_project_key() throws Exception { + public void remove_with_project_key() { ComponentDto project = db.components().insertComponent(newPrivateProjectDto(db.organizations().insert(), A_PROJECT_UUID).setDbKey(A_PROJECT_KEY)); db.users().insertProjectPermissionOnUser(user, ISSUE_ADMIN, project); db.users().insertProjectPermissionOnUser(user, CODEVIEWER, project); @@ -134,7 +134,7 @@ public class RemoveUserActionTest extends BasePermissionWsTest } @Test - public void remove_with_view_uuid() throws Exception { + public void remove_with_view_uuid() { ComponentDto view = db.components().insertComponent(newView(db.organizations().insert(), "view-uuid").setDbKey("view-key")); db.users().insertProjectPermissionOnUser(user, ISSUE_ADMIN, view); db.users().insertProjectPermissionOnUser(user, ADMIN, view); @@ -150,7 +150,7 @@ public class RemoveUserActionTest extends BasePermissionWsTest } @Test - public void fail_when_project_does_not_exist() throws Exception { + public void fail_when_project_does_not_exist() { loginAsAdmin(db.getDefaultOrganization()); expectedException.expect(NotFoundException.class); @@ -163,7 +163,7 @@ public class RemoveUserActionTest extends BasePermissionWsTest } @Test - public void fail_when_project_permission_without_permission() throws Exception { + public void fail_when_project_permission_without_permission() { loginAsAdmin(db.getDefaultOrganization()); expectedException.expect(BadRequestException.class); @@ -175,28 +175,28 @@ public class RemoveUserActionTest extends BasePermissionWsTest } @Test - public void fail_when_component_is_a_module() throws Exception { + public void fail_when_component_is_a_module() { ComponentDto module = db.components().insertComponent(newModuleDto(ComponentTesting.newPrivateProjectDto(db.organizations().insert()))); failIfComponentIsNotAProjectOrView(module); } @Test - public void fail_when_component_is_a_directory() throws Exception { + public void fail_when_component_is_a_directory() { ComponentDto file = db.components().insertComponent(newDirectory(ComponentTesting.newPrivateProjectDto(db.organizations().insert()), "A/B")); failIfComponentIsNotAProjectOrView(file); } @Test - public void fail_when_component_is_a_file() throws Exception { + public void fail_when_component_is_a_file() { ComponentDto file = db.components().insertComponent(newFileDto(ComponentTesting.newPrivateProjectDto(db.organizations().insert()), null, "file-uuid")); failIfComponentIsNotAProjectOrView(file); } @Test - public void fail_when_component_is_a_subview() throws Exception { + public void fail_when_component_is_a_subview() { ComponentDto file = db.components().insertComponent(newSubView(ComponentTesting.newView(db.organizations().insert()))); failIfComponentIsNotAProjectOrView(file); @@ -216,7 +216,7 @@ public class RemoveUserActionTest extends BasePermissionWsTest } @Test - public void fail_when_get_request() throws Exception { + public void fail_when_get_request() { loginAsAdmin(db.getDefaultOrganization()); expectedException.expect(ServerException.class); @@ -229,7 +229,7 @@ public class RemoveUserActionTest extends BasePermissionWsTest } @Test - public void fail_when_user_login_is_missing() throws Exception { + public void fail_when_user_login_is_missing() { loginAsAdmin(db.getDefaultOrganization()); expectedException.expect(IllegalArgumentException.class); @@ -240,7 +240,7 @@ public class RemoveUserActionTest extends BasePermissionWsTest } @Test - public void fail_when_permission_is_missing() throws Exception { + public void fail_when_permission_is_missing() { loginAsAdmin(db.getDefaultOrganization()); expectedException.expect(IllegalArgumentException.class); @@ -251,7 +251,7 @@ public class RemoveUserActionTest extends BasePermissionWsTest } @Test - public void fail_when_project_uuid_and_project_key_are_provided() throws Exception { + public void fail_when_project_uuid_and_project_key_are_provided() { ComponentDto project = db.components().insertComponent(newPrivateProjectDto(db.organizations().insert(), A_PROJECT_UUID).setDbKey(A_PROJECT_KEY)); loginAsAdmin(db.getDefaultOrganization()); @@ -267,7 +267,7 @@ public class RemoveUserActionTest extends BasePermissionWsTest } @Test - public void removing_global_permission_fails_if_not_administrator_of_organization() throws Exception { + public void removing_global_permission_fails_if_not_administrator_of_organization() { userSession.logIn(); expectedException.expect(ForbiddenException.class); @@ -279,7 +279,7 @@ public class RemoveUserActionTest extends BasePermissionWsTest } @Test - public void removing_project_permission_fails_if_not_administrator_of_project() throws Exception { + public void removing_project_permission_fails_if_not_administrator_of_project() { ComponentDto project = db.components().insertPrivateProject(); userSession.logIn(); @@ -296,7 +296,7 @@ public class RemoveUserActionTest extends BasePermissionWsTest * User is project administrator but not system administrator */ @Test - public void removing_project_permission_is_allowed_to_project_administrators() throws Exception { + public void removing_project_permission_is_allowed_to_project_administrators() { ComponentDto project = db.components().insertPrivateProject(); db.users().insertProjectPermissionOnUser(user, CODEVIEWER, project); db.users().insertProjectPermissionOnUser(user, ISSUE_ADMIN, project); @@ -362,7 +362,7 @@ public class RemoveUserActionTest extends BasePermissionWsTest } @Test - public void fail_when_using_branch_uuid() throws Exception { + public void fail_when_using_branch_uuid() { OrganizationDto organization = db.organizations().insert(); ComponentDto project = db.components().insertMainBranch(organization); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/SearchGlobalPermissionsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/SearchGlobalPermissionsActionTest.java index 0a34362096a..7dedad6d4d6 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/SearchGlobalPermissionsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/SearchGlobalPermissionsActionTest.java @@ -58,7 +58,7 @@ public class SearchGlobalPermissionsActionTest extends BasePermissionWsTest= 1; i--) { db.components().insertComponent(ComponentTesting.newPrivateProjectDto(organizationDto) @@ -200,7 +200,7 @@ public class SearchProjectPermissionsActionTest extends BasePermissionWsTest { } @Test - public void search_for_users_with_response_example() throws Exception { + public void search_for_users_with_response_example() { UserDto user1 = db.users().insertUser(newUserDto().setLogin("admin").setName("Administrator").setEmail("admin@admin.com")); db.organizations().addMember(db.getDefaultOrganization(), user1); UserDto user2 = db.users().insertUser(newUserDto().setLogin("george.orwell").setName("George Orwell").setEmail("george.orwell@1984.net")); @@ -80,7 +80,7 @@ public class UsersActionTest extends BasePermissionWsTest { } @Test - public void search_for_users_with_one_permission() throws Exception { + public void search_for_users_with_one_permission() { insertUsersHavingGlobalPermissions(); loginAsAdmin(db.getDefaultOrganization()); @@ -90,7 +90,7 @@ public class UsersActionTest extends BasePermissionWsTest { } @Test - public void search_for_users_with_permission_on_project() throws Exception { + public void search_for_users_with_permission_on_project() { // User has permission on project ComponentDto project = db.components().insertComponent(ComponentTesting.newPrivateProjectDto(db.getDefaultOrganization())); UserDto user = db.users().insertUser(newUserDto()); @@ -120,7 +120,7 @@ public class UsersActionTest extends BasePermissionWsTest { } @Test - public void search_only_for_users_with_permission_when_no_search_query() throws Exception { + public void search_only_for_users_with_permission_when_no_search_query() { // User have permission on project ComponentDto project = db.components().insertPrivateProject(); UserDto user = db.users().insertUser(); @@ -143,7 +143,7 @@ public class UsersActionTest extends BasePermissionWsTest { } @Test - public void search_also_for_users_without_permission_when_filtering_name() throws Exception { + public void search_also_for_users_without_permission_when_filtering_name() { // User with permission on project ComponentDto project = db.components().insertComponent(ComponentTesting.newPrivateProjectDto(db.organizations().insert())); UserDto user = db.users().insertUser(newUserDto("with-permission-login", "with-permission-name", "with-permission-email")); @@ -167,7 +167,7 @@ public class UsersActionTest extends BasePermissionWsTest { } @Test - public void search_also_for_users_without_permission_when_filtering_email() throws Exception { + public void search_also_for_users_without_permission_when_filtering_email() { // User with permission on project ComponentDto project = db.components().insertComponent(ComponentTesting.newPrivateProjectDto(db.organizations().insert())); UserDto user = db.users().insertUser(newUserDto("with-permission-login", "with-permission-name", "with-permission-email")); @@ -187,7 +187,7 @@ public class UsersActionTest extends BasePermissionWsTest { } @Test - public void search_also_for_users_without_permission_when_filtering_login() throws Exception { + public void search_also_for_users_without_permission_when_filtering_login() { // User with permission on project ComponentDto project = db.components().insertComponent(ComponentTesting.newPrivateProjectDto(db.organizations().insert())); UserDto user = db.users().insertUser(newUserDto("with-permission-login", "with-permission-name", "with-permission-email")); @@ -207,7 +207,7 @@ public class UsersActionTest extends BasePermissionWsTest { } @Test - public void search_for_users_with_query_as_a_parameter() throws Exception { + public void search_for_users_with_query_as_a_parameter() { insertUsersHavingGlobalPermissions(); loginAsAdmin(db.getDefaultOrganization()); @@ -223,7 +223,7 @@ public class UsersActionTest extends BasePermissionWsTest { } @Test - public void search_for_users_with_select_as_a_parameter() throws Exception { + public void search_for_users_with_select_as_a_parameter() { insertUsersHavingGlobalPermissions(); loginAsAdmin(db.getDefaultOrganization()); @@ -235,7 +235,7 @@ public class UsersActionTest extends BasePermissionWsTest { } @Test - public void search_for_users_is_paginated() throws Exception { + public void search_for_users_is_paginated() { for (int i = 9; i >= 0; i--) { UserDto user = db.users().insertUser(newUserDto().setName("user-" + i)); db.organizations().addMember(db.getDefaultOrganization(), user); @@ -295,7 +295,7 @@ public class UsersActionTest extends BasePermissionWsTest { } @Test - public void fail_if_project_permission_without_project() throws Exception { + public void fail_if_project_permission_without_project() { loginAsAdmin(db.getDefaultOrganization()); expectedException.expect(BadRequestException.class); @@ -307,7 +307,7 @@ public class UsersActionTest extends BasePermissionWsTest { } @Test - public void fail_if_insufficient_privileges() throws Exception { + public void fail_if_insufficient_privileges() { userSession.logIn("login"); expectedException.expect(ForbiddenException.class); @@ -318,7 +318,7 @@ public class UsersActionTest extends BasePermissionWsTest { } @Test - public void fail_if_not_logged_in() throws Exception { + public void fail_if_not_logged_in() { userSession.anonymous(); expectedException.expect(UnauthorizedException.class); @@ -329,7 +329,7 @@ public class UsersActionTest extends BasePermissionWsTest { } @Test - public void fail_if_project_uuid_and_project_key_are_provided() throws Exception { + public void fail_if_project_uuid_and_project_key_are_provided() { db.components().insertComponent(newPrivateProjectDto(db.organizations().insert(), "project-uuid").setDbKey("project-key")); loginAsAdmin(db.getDefaultOrganization()); @@ -344,7 +344,7 @@ public class UsersActionTest extends BasePermissionWsTest { } @Test - public void fail_if_search_query_is_too_short() throws Exception { + public void fail_if_search_query_is_too_short() { loginAsAdmin(db.getDefaultOrganization()); expectedException.expect(IllegalArgumentException.class); @@ -374,7 +374,7 @@ public class UsersActionTest extends BasePermissionWsTest { } @Test - public void fail_when_using_branch_uuid() throws Exception { + public void fail_when_using_branch_uuid() { OrganizationDto organization = db.organizations().insert(); UserDto user = db.users().insertUser(newUserDto()); ComponentDto project = db.components().insertMainBranch(organization); diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/AddGroupToTemplateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/AddGroupToTemplateActionTest.java index 3f3182d618e..cdb9cccf868 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/AddGroupToTemplateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/permission/ws/template/AddGroupToTemplateActionTest.java @@ -71,7 +71,7 @@ public class AddGroupToTemplateActionTest extends BasePermissionWsTest List> invokeAll(Collection> tasks) throws InterruptedException { + public List> invokeAll(Collection> tasks) { throw new UnsupportedOperationException(); } @Override - public List> invokeAll(Collection> tasks, long timeout, TimeUnit unit) throws InterruptedException { + public List> invokeAll(Collection> tasks, long timeout, TimeUnit unit) { throw new UnsupportedOperationException(); } @Override - public T invokeAny(Collection> tasks) throws InterruptedException, ExecutionException { + public T invokeAny(Collection> tasks) { throw new UnsupportedOperationException(); } @Override - public T invokeAny(Collection> tasks, long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException { + public T invokeAny(Collection> tasks, long timeout, TimeUnit unit) { throw new UnsupportedOperationException(); } } diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/db/migration/DatabaseMigrationImplAsynchronousTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/db/migration/DatabaseMigrationImplAsynchronousTest.java index 07d75cc041b..747db0c1736 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/platform/db/migration/DatabaseMigrationImplAsynchronousTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/platform/db/migration/DatabaseMigrationImplAsynchronousTest.java @@ -45,7 +45,7 @@ public class DatabaseMigrationImplAsynchronousTest { private DatabaseMigrationImpl underTest = new DatabaseMigrationImpl(executorService, migrationState, migrationEngine, platform); @Test - public void testName() throws Exception { + public void testName() { underTest.startIt(); assertThat(taskSuppliedForAsyncProcess).isTrue(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/StandaloneSystemSectionTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/StandaloneSystemSectionTest.java index 2916e1e03a3..2573836712f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/StandaloneSystemSectionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/StandaloneSystemSectionTest.java @@ -72,7 +72,7 @@ public class StandaloneSystemSectionTest { } @Test - public void official_distribution() throws Exception { + public void official_distribution() { when(officialDistribution.check()).thenReturn(true); ProtobufSystemInfo.Section protobuf = underTest.toProtobuf(); @@ -80,7 +80,7 @@ public class StandaloneSystemSectionTest { } @Test - public void not_an_official_distribution() throws Exception { + public void not_an_official_distribution() { when(officialDistribution.check()).thenReturn(false); ProtobufSystemInfo.Section protobuf = underTest.toProtobuf(); @@ -88,7 +88,7 @@ public class StandaloneSystemSectionTest { } @Test - public void get_realm() throws Exception { + public void get_realm() { SecurityRealm realm = mock(SecurityRealm.class); when(realm.getName()).thenReturn("LDAP"); when(securityRealmFactory.getRealm()).thenReturn(realm); @@ -98,7 +98,7 @@ public class StandaloneSystemSectionTest { } @Test - public void no_realm() throws Exception { + public void no_realm() { when(securityRealmFactory.getRealm()).thenReturn(null); ProtobufSystemInfo.Section protobuf = underTest.toProtobuf(); @@ -106,7 +106,7 @@ public class StandaloneSystemSectionTest { } @Test - public void get_enabled_identity_providers() throws Exception { + public void get_enabled_identity_providers() { identityProviderRepository.addIdentityProvider(new TestIdentityProvider() .setKey("github") .setName("GitHub") @@ -125,7 +125,7 @@ public class StandaloneSystemSectionTest { } @Test - public void get_enabled_identity_providers_allowing_users_to_signup() throws Exception { + public void get_enabled_identity_providers_allowing_users_to_signup() { identityProviderRepository.addIdentityProvider(new TestIdentityProvider() .setKey("github") .setName("GitHub") diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/cluster/GlobalSystemSectionTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/cluster/GlobalSystemSectionTest.java index 500dbbccb17..840d7474541 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/cluster/GlobalSystemSectionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/platform/monitoring/cluster/GlobalSystemSectionTest.java @@ -53,7 +53,7 @@ public class GlobalSystemSectionTest { } @Test - public void get_realm() throws Exception { + public void get_realm() { SecurityRealm realm = mock(SecurityRealm.class); when(realm.getName()).thenReturn("LDAP"); when(securityRealmFactory.getRealm()).thenReturn(realm); @@ -63,7 +63,7 @@ public class GlobalSystemSectionTest { } @Test - public void no_realm() throws Exception { + public void no_realm() { when(securityRealmFactory.getRealm()).thenReturn(null); ProtobufSystemInfo.Section protobuf = underTest.toProtobuf(); @@ -71,7 +71,7 @@ public class GlobalSystemSectionTest { } @Test - public void get_enabled_identity_providers() throws Exception { + public void get_enabled_identity_providers() { identityProviderRepository.addIdentityProvider(new TestIdentityProvider() .setKey("github") .setName("GitHub") @@ -90,7 +90,7 @@ public class GlobalSystemSectionTest { } @Test - public void get_enabled_identity_providers_allowing_users_to_signup() throws Exception { + public void get_enabled_identity_providers_allowing_users_to_signup() { identityProviderRepository.addIdentityProvider(new TestIdentityProvider() .setKey("github") .setName("GitHub") diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/web/MasterServletFilterTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/web/MasterServletFilterTest.java index ca19bba1b39..cdedf01c172 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/platform/web/MasterServletFilterTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/platform/web/MasterServletFilterTest.java @@ -150,7 +150,7 @@ public class MasterServletFilterTest { private int count = 0; @Override - public void init(FilterConfig filterConfig) throws ServletException { + public void init(FilterConfig filterConfig) { } @Override @@ -179,12 +179,12 @@ public class MasterServletFilterTest { } @Override - public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException { + public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) { // Nothing to do } @Override - public void init(FilterConfig filterConfig) throws ServletException { + public void init(FilterConfig filterConfig) { // Nothing to do } diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/web/WebPagesFilterTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/web/WebPagesFilterTest.java index 359ac10108f..9c24ac1fc7a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/platform/web/WebPagesFilterTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/platform/web/WebPagesFilterTest.java @@ -122,7 +122,7 @@ public class WebPagesFilterTest { when(servletContext.getResource("/index.html")).thenReturn(getClass().getResource("WebPagesFilterTest/index.html")); } - private void mockPath(String path, String context) throws MalformedURLException { + private void mockPath(String path, String context) { when(request.getRequestURI()).thenReturn(path); when(request.getContextPath()).thenReturn(context); when(servletContext.getContextPath()).thenReturn(context); @@ -167,15 +167,15 @@ public class WebPagesFilterTest { } - public void write(byte[] b) throws IOException { + public void write(byte[] b) { this.buf.append(new String(b)); } - public void write(byte[] b, int off, int len) throws IOException { + public void write(byte[] b, int off, int len) { this.buf.append(new String(b, off, len)); } - public void write(int b) throws IOException { + public void write(int b) { byte[] bytes = new byte[] {(byte) b}; this.buf.append(new String(bytes)); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/IndexActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/ws/IndexActionTest.java index e2023955913..4d3751ebe1b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/IndexActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/platform/ws/IndexActionTest.java @@ -60,7 +60,7 @@ public class IndexActionTest { private WsActionTester ws = new WsActionTester(underTest); @Test - public void allow_client_to_cache_messages() throws Exception { + public void allow_client_to_cache_messages() { Date now = new Date(); Date aBitLater = new Date(now.getTime() + 1000); when(server.getStartedAt()).thenReturn(now); @@ -73,7 +73,7 @@ public class IndexActionTest { } @Test - public void return_all_l10n_messages_using_accept_header_with_cache_expired() throws Exception { + public void return_all_l10n_messages_using_accept_header_with_cache_expired() { Date now = new Date(); Date aBitEarlier = new Date(now.getTime() - 1000); when(server.getStartedAt()).thenReturn(now); @@ -93,7 +93,7 @@ public class IndexActionTest { } @Test - public void default_locale_is_english() throws Exception { + public void default_locale_is_english() { String key1 = "key1"; String key2 = "key2"; String key3 = "key3"; @@ -113,7 +113,7 @@ public class IndexActionTest { } @Test - public void support_BCP47_formatted_language_tags() throws Exception { + public void support_BCP47_formatted_language_tags() { String key1 = "key1"; when(i18n.getPropertyKeys()).thenReturn(ImmutableSet.of(key1)); when(i18n.message(UK, key1, key1)).thenReturn(key1); @@ -127,7 +127,7 @@ public class IndexActionTest { } @Test - public void fail_when_java_formatted_language_tags() throws Exception { + public void fail_when_java_formatted_language_tags() { String key1 = "key1"; when(i18n.getPropertyKeys()).thenReturn(ImmutableSet.of(key1)); when(i18n.message(UK, key1, key1)).thenReturn(key1); diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/RestartActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/ws/RestartActionTest.java index b03875bfc13..975beca92bd 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/RestartActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/platform/ws/RestartActionTest.java @@ -82,7 +82,7 @@ public class RestartActionTest { } @Test - public void calls_ProcessCommandWrapper_requestForSQRestart_in_production_mode() throws Exception { + public void calls_ProcessCommandWrapper_requestForSQRestart_in_production_mode() { when(webServer.isStandalone()).thenReturn(true); userSessionRule.logIn().setSystemAdministrator(); @@ -93,7 +93,7 @@ public class RestartActionTest { } @Test - public void logs_login_of_authenticated_user_requesting_the_restart_in_production_mode() throws Exception { + public void logs_login_of_authenticated_user_requesting_the_restart_in_production_mode() { when(webServer.isStandalone()).thenReturn(true); String login = "BigBother"; userSessionRule.logIn(login).setSystemAdministrator(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/ServerWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/ws/ServerWsTest.java index 691d4d7a836..6cef4f98868 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/ServerWsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/platform/ws/ServerWsTest.java @@ -52,7 +52,7 @@ public class ServerWsTest { } @Test - public void test_example_of_version() throws Exception { + public void test_example_of_version() { WebService.Action versionAction = tester.action("api/server", "version"); assertThat(versionAction.responseExampleAsString()).isEqualTo("6.3.0.1234"); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/StatusActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/ws/StatusActionTest.java index f4372bb8ca3..c40c8ecd7c0 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/StatusActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/platform/ws/StatusActionTest.java @@ -72,7 +72,7 @@ public class StatusActionTest { } @Test - public void verify_example() throws Exception { + public void verify_example() { when(platform.status()).thenReturn(Platform.Status.UP); restartFlagHolder.unset(); @@ -152,7 +152,7 @@ public class StatusActionTest { } @Test - public void safety_test_for_new_databaseMigration_status_when_platform_is_SAFEMODE() throws Exception { + public void safety_test_for_new_databaseMigration_status_when_platform_is_SAFEMODE() { for (DatabaseMigrationState.Status databaseMigrationStatus : filter(asList(DatabaseMigrationState.Status.values()), not(in(SUPPORTED_DATABASE_MIGRATION_STATUSES)))) { when(platform.status()).thenReturn(Platform.Status.SAFEMODE); when(migrationState.getStatus()).thenReturn(databaseMigrationStatus); @@ -161,7 +161,7 @@ public class StatusActionTest { } } - private void verifyStatus(Platform.Status platformStatus, DatabaseMigrationState.Status databaseMigrationStatus, String expectedStatus) throws Exception { + private void verifyStatus(Platform.Status platformStatus, DatabaseMigrationState.Status databaseMigrationStatus, String expectedStatus) { when(platform.status()).thenReturn(platformStatus); when(migrationState.getStatus()).thenReturn(databaseMigrationStatus); diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/PluginDownloaderTest.java b/server/sonar-server/src/test/java/org/sonar/server/plugins/PluginDownloaderTest.java index d9bbcf9c5cd..6640fa2917f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/plugins/PluginDownloaderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/plugins/PluginDownloaderTest.java @@ -129,7 +129,7 @@ public class PluginDownloaderTest { @Test public void download_when_update_center_is_unavailable_with_no_exception_thrown() { - when(updateCenterMatrixFactory.getUpdateCenter(anyBoolean())).thenReturn(Optional.absent()); + when(updateCenterMatrixFactory.getUpdateCenter(anyBoolean())).thenReturn(Optional.absent()); Plugin test = Plugin.factory("test"); Release test10 = new Release(test, "1.0").setDownloadUrl("http://server/test-1.0.jar"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/PluginUninstallerTest.java b/server/sonar-server/src/test/java/org/sonar/server/plugins/PluginUninstallerTest.java index 2ac4d807295..736b262317a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/plugins/PluginUninstallerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/plugins/PluginUninstallerTest.java @@ -58,7 +58,7 @@ public class PluginUninstallerTest { } @Test - public void uninstall() throws Exception { + public void uninstall() { when(serverPluginRepository.hasPlugin("plugin")).thenReturn(true); underTest.uninstall("plugin"); verify(serverPluginRepository).uninstall("plugin", uninstallDir); diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/UpdateCenterServlet.java b/server/sonar-server/src/test/java/org/sonar/server/plugins/UpdateCenterServlet.java index e1d14a97124..bed489d2ae6 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/plugins/UpdateCenterServlet.java +++ b/server/sonar-server/src/test/java/org/sonar/server/plugins/UpdateCenterServlet.java @@ -32,7 +32,7 @@ public class UpdateCenterServlet extends GenericServlet { int count = 0; @Override - public void service(ServletRequest request, ServletResponse response) throws ServletException, IOException { + public void service(ServletRequest request, ServletResponse response) throws IOException { count++; Properties props = new Properties(); props.setProperty("count", String.valueOf(count)); diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/edition/EditionPluginDownloaderTest.java b/server/sonar-server/src/test/java/org/sonar/server/plugins/edition/EditionPluginDownloaderTest.java index a6fd484c23e..aa725052a85 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/plugins/edition/EditionPluginDownloaderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/plugins/edition/EditionPluginDownloaderTest.java @@ -69,7 +69,7 @@ public class EditionPluginDownloaderTest { } @Test - public void download_plugin_to_tmp() throws IOException, URISyntaxException { + public void download_plugin_to_tmp() throws URISyntaxException { List releases = ImmutableList.of(createRelease("plugin1", "1.0", "http://host/plugin1.jar"), createRelease("plugin2", "1.0", "http://host/plugin2.jar")); @@ -85,7 +85,7 @@ public class EditionPluginDownloaderTest { } @Test - public void download_plugin_to_tmp_with_file_uri() throws IOException, URISyntaxException { + public void download_plugin_to_tmp_with_file_uri() throws IOException { File plugin1 = temp.newFile("plugin1.jar"); File plugin2 = temp.newFile("plugin2.jar"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/AvailableActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/AvailableActionTest.java index 16c70143472..8579c928b63 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/AvailableActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/AvailableActionTest.java @@ -147,7 +147,7 @@ public class AvailableActionTest extends AbstractUpdateCenterBasedPluginsWsActio @Test public void empty_array_is_returned_when_update_center_is_not_accessible() throws Exception { logInAsSystemAdministrator(); - when(updateCenterFactory.getUpdateCenter(anyBoolean())).thenReturn(Optional.absent()); + when(updateCenterFactory.getUpdateCenter(anyBoolean())).thenReturn(Optional.absent()); underTest.handle(request, response); diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/InstallActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/InstallActionTest.java index 007b2a193e8..4842bd3dc14 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/InstallActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/InstallActionTest.java @@ -164,7 +164,7 @@ public class InstallActionTest { @Test public void IAE_is_raised_when_update_center_is_unavailable() throws Exception { logInAsSystemAdministrator(); - when(updateCenterFactory.getUpdateCenter(anyBoolean())).thenReturn(Optional.absent()); + when(updateCenterFactory.getUpdateCenter(anyBoolean())).thenReturn(Optional.absent()); expectedException.expect(IllegalArgumentException.class); expectedException.expectMessage("No plugin with key 'pluginKey'"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/InstalledActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/InstalledActionTest.java index bd669ed348f..9a9adfd1fad 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/InstalledActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/InstalledActionTest.java @@ -82,15 +82,15 @@ public class InstalledActionTest { } @Test - public void empty_array_is_returned_when_there_is_not_plugin_installed() throws Exception { + public void empty_array_is_returned_when_there_is_not_plugin_installed() { String response = tester.newRequest().execute().getInput(); assertJson(response).withStrictArrayOrder().isSimilarTo(JSON_EMPTY_PLUGIN_LIST); } @Test - public void empty_array_when_update_center_is_unavailable() throws Exception { - when(updateCenterMatrixFactory.getUpdateCenter(false)).thenReturn(Optional.absent()); + public void empty_array_when_update_center_is_unavailable() { + when(updateCenterMatrixFactory.getUpdateCenter(false)).thenReturn(Optional.absent()); String response = tester.newRequest().execute().getInput(); @@ -98,7 +98,7 @@ public class InstalledActionTest { } @Test - public void empty_fields_are_not_serialized_to_json() throws Exception { + public void empty_fields_are_not_serialized_to_json() { when(pluginRepository.getPluginInfos()).thenReturn( of(new PluginInfo("").setName("").setJarFile(new File("")))); db.pluginDbTester().insertPlugin( @@ -268,7 +268,7 @@ public class InstalledActionTest { } @Test - public void plugins_are_sorted_by_name_then_key_and_only_one_plugin_can_have_a_specific_name() throws Exception { + public void plugins_are_sorted_by_name_then_key_and_only_one_plugin_can_have_a_specific_name() { when(pluginRepository.getPluginInfos()).thenReturn( of( plugin("A", "name2"), @@ -369,7 +369,7 @@ public class InstalledActionTest { } @Test - public void only_one_plugin_can_have_a_specific_name_and_key() throws Exception { + public void only_one_plugin_can_have_a_specific_name_and_key() { when(pluginRepository.getPluginInfos()).thenReturn( of( plugin("A", "name2"), diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PendingActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PendingActionTest.java index 13ec7756e8e..b24e624793a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PendingActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PendingActionTest.java @@ -114,7 +114,7 @@ public class PendingActionTest { @Test public void empty_arrays_are_returned_when_update_center_is_unavailable() throws Exception { logInAsSystemAdministrator(); - when(updateCenterMatrixFactory.getUpdateCenter(false)).thenReturn(Optional.absent()); + when(updateCenterMatrixFactory.getUpdateCenter(false)).thenReturn(Optional.absent()); underTest.handle(request, response); diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PluginUpdateAggregatorTest.java b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PluginUpdateAggregatorTest.java index df055d6ad11..08e0b8d0490 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PluginUpdateAggregatorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PluginUpdateAggregatorTest.java @@ -43,7 +43,7 @@ public class PluginUpdateAggregatorTest { @Test public void aggregates_returns_an_empty_collection_when_plugin_collection_is_empty() { - assertThat(underTest.aggregate(Collections.emptyList())).isEmpty(); + assertThat(underTest.aggregate(Collections.emptyList())).isEmpty(); } @Test diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PluginsWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PluginsWsTest.java index f01ec86a00a..5955e393add 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PluginsWsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PluginsWsTest.java @@ -52,7 +52,7 @@ public class PluginsWsTest { } @Override - public void handle(Request request, Response response) throws Exception { + public void handle(Request request, Response response) { // not relevant to test } } diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/UpdateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/UpdateActionTest.java index b8a56d05d77..00264a86070 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/UpdateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/UpdateActionTest.java @@ -138,7 +138,7 @@ public class UpdateActionTest { @Test public void IAE_is_raised_when_update_center_is_unavailable() throws Exception { logInAsSystemAdministrator(); - when(updateCenterFactory.getUpdateCenter(anyBoolean())).thenReturn(Optional.absent()); + when(updateCenterFactory.getUpdateCenter(anyBoolean())).thenReturn(Optional.absent()); expectedException.expect(IllegalArgumentException.class); expectedException.expectMessage("No plugin with key 'pluginKey'"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/project/ws/BulkDeleteActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/project/ws/BulkDeleteActionTest.java index 5d03a967ecb..1709788a7c9 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/project/ws/BulkDeleteActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/project/ws/BulkDeleteActionTest.java @@ -86,7 +86,7 @@ public class BulkDeleteActionTest { } @Test - public void delete_projects_in_default_organization_if_no_org_provided() throws Exception { + public void delete_projects_in_default_organization_if_no_org_provided() { userSession.logIn().setRoot(); OrganizationDto defaultOrganization = db.getDefaultOrganization(); ComponentDto toDeleteInOrg1 = db.components().insertPrivateProject(org1); @@ -103,7 +103,7 @@ public class BulkDeleteActionTest { } @Test - public void delete_projects_by_keys() throws Exception { + public void delete_projects_by_keys() { userSession.logIn().setRoot(); ComponentDto toDeleteInOrg1 = db.components().insertPrivateProject(org1); ComponentDto toDeleteInOrg2 = db.components().insertPrivateProject(org1); @@ -118,7 +118,7 @@ public class BulkDeleteActionTest { } @Test - public void projects_that_dont_exist_are_ignored_and_dont_break_bulk_deletion() throws Exception { + public void projects_that_dont_exist_are_ignored_and_dont_break_bulk_deletion() { userSession.logIn().setRoot(); ComponentDto toDelete1 = db.components().insertPrivateProject(org1); ComponentDto toDelete2 = db.components().insertPrivateProject(org1); @@ -172,7 +172,7 @@ public class BulkDeleteActionTest { } @Test - public void projects_and_views() throws IOException { + public void projects_and_views() { userSession.logIn().addPermission(ADMINISTER, db.getDefaultOrganization()); ComponentDto project = db.components().insertPrivateProject(); ComponentDto view = db.components().insertView(); @@ -183,7 +183,7 @@ public class BulkDeleteActionTest { } @Test - public void delete_by_key_query_with_partial_match_case_insensitive() throws IOException { + public void delete_by_key_query_with_partial_match_case_insensitive() { userSession.logIn().addPermission(ADMINISTER, db.getDefaultOrganization()); ComponentDto matchKeyProject = db.components().insertPrivateProject(p -> p.setDbKey("project-_%-key")); ComponentDto matchUppercaseKeyProject = db.components().insertPrivateProject(p -> p.setDbKey("PROJECT-_%-KEY")); @@ -195,7 +195,7 @@ public class BulkDeleteActionTest { } @Test - public void throw_ForbiddenException_if_organization_administrator_does_not_set_organization_parameter() throws Exception { + public void throw_ForbiddenException_if_organization_administrator_does_not_set_organization_parameter() { userSession.logIn().addPermission(ADMINISTER, org1); ComponentDto project = db.components().insertPrivateProject(org1); @@ -210,7 +210,7 @@ public class BulkDeleteActionTest { } @Test - public void organization_administrator_deletes_projects_by_keys_in_his_organization() throws Exception { + public void organization_administrator_deletes_projects_by_keys_in_his_organization() { userSession.logIn().addPermission(ADMINISTER, org1); ComponentDto toDelete = db.components().insertPrivateProject(org1); ComponentDto cantBeDeleted = db.components().insertPrivateProject(org2); @@ -224,7 +224,7 @@ public class BulkDeleteActionTest { } @Test - public void throw_UnauthorizedException_if_not_logged_in() throws Exception { + public void throw_UnauthorizedException_if_not_logged_in() { expectedException.expect(UnauthorizedException.class); expectedException.expectMessage("Authentication is required"); @@ -235,7 +235,7 @@ public class BulkDeleteActionTest { } @Test - public void throw_ForbiddenException_if_param_organization_is_not_set_and_not_system_administrator() throws Exception { + public void throw_ForbiddenException_if_param_organization_is_not_set_and_not_system_administrator() { userSession.logIn().setNonSystemAdministrator(); expectedException.expect(ForbiddenException.class); @@ -248,7 +248,7 @@ public class BulkDeleteActionTest { } @Test - public void throw_ForbiddenException_if_param_organization_is_set_but_not_organization_administrator() throws Exception { + public void throw_ForbiddenException_if_param_organization_is_set_but_not_organization_administrator() { userSession.logIn(); expectedException.expect(ForbiddenException.class); diff --git a/server/sonar-server/src/test/java/org/sonar/server/project/ws/BulkUpdateKeyActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/project/ws/BulkUpdateKeyActionTest.java index d9bee1edea5..2aa531c1f75 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/project/ws/BulkUpdateKeyActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/project/ws/BulkUpdateKeyActionTest.java @@ -259,7 +259,7 @@ public class BulkUpdateKeyActionTest { } @Test - public void fail_when_using_branch_uuid() throws Exception { + public void fail_when_using_branch_uuid() { ComponentDto project = db.components().insertMainBranch(); userSession.logIn().addProjectPermission(UserRole.USER, project); ComponentDto branch = db.components().insertProjectBranch(project); diff --git a/server/sonar-server/src/test/java/org/sonar/server/project/ws/CreateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/project/ws/CreateActionTest.java index 6f55a2c1211..7b507f94a4f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/project/ws/CreateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/project/ws/CreateActionTest.java @@ -90,7 +90,7 @@ public class CreateActionTest { projectIndexers))); @Test - public void create_project() throws Exception { + public void create_project() { userSession.addPermission(PROVISION_PROJECTS, db.getDefaultOrganization()); CreateWsResponse response = call(CreateRequest.builder() @@ -107,7 +107,7 @@ public class CreateActionTest { } @Test - public void create_project_with_branch() throws Exception { + public void create_project_with_branch() { userSession.addPermission(PROVISION_PROJECTS, db.getDefaultOrganization()); CreateWsResponse response = call(CreateRequest.builder() @@ -122,7 +122,7 @@ public class CreateActionTest { } @Test - public void create_project_with_deprecated_parameter() throws Exception { + public void create_project_with_deprecated_parameter() { OrganizationDto organization = db.organizations().insert(); userSession.addPermission(PROVISION_PROJECTS, organization); @@ -234,7 +234,7 @@ public class CreateActionTest { } @Test - public void fail_when_project_already_exists() throws Exception { + public void fail_when_project_already_exists() { OrganizationDto organization = db.organizations().insert(); db.components().insertPublicProject(project -> project.setDbKey(DEFAULT_PROJECT_KEY)); userSession.addPermission(PROVISION_PROJECTS, organization); @@ -262,7 +262,7 @@ public class CreateActionTest { } @Test - public void fail_when_missing_project_parameter() throws Exception { + public void fail_when_missing_project_parameter() { userSession.addPermission(PROVISION_PROJECTS, db.getDefaultOrganization()); expectedException.expect(IllegalArgumentException.class); @@ -272,7 +272,7 @@ public class CreateActionTest { } @Test - public void fail_when_missing_name_parameter() throws Exception { + public void fail_when_missing_name_parameter() { userSession.addPermission(PROVISION_PROJECTS, db.getDefaultOrganization()); expectedException.expect(IllegalArgumentException.class); @@ -282,7 +282,7 @@ public class CreateActionTest { } @Test - public void fail_when_missing_create_project_permission() throws Exception { + public void fail_when_missing_create_project_permission() { expectedException.expect(ForbiddenException.class); call(CreateRequest.builder().setKey(DEFAULT_PROJECT_KEY).setName(DEFAULT_PROJECT_NAME).build()); diff --git a/server/sonar-server/src/test/java/org/sonar/server/project/ws/GhostsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/project/ws/GhostsActionTest.java index cb5c0848596..7a2ba4fbbca 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/project/ws/GhostsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/project/ws/GhostsActionTest.java @@ -83,7 +83,7 @@ public class GhostsActionTest { } @Test - public void ghost_projects_without_analyzed_projects() throws Exception { + public void ghost_projects_without_analyzed_projects() { OrganizationDto organization = db.organizations().insert(); ComponentDto ghost1 = insertGhostProject(organization); ComponentDto ghost2 = insertGhostProject(organization); @@ -115,7 +115,7 @@ public class GhostsActionTest { } @Test - public void ghost_projects_with_correct_pagination() throws Exception { + public void ghost_projects_with_correct_pagination() { OrganizationDto organization = db.organizations().insert(); for (int i = 1; i <= 10; i++) { int count = i; @@ -139,7 +139,7 @@ public class GhostsActionTest { } @Test - public void ghost_projects_with_chosen_fields() throws Exception { + public void ghost_projects_with_chosen_fields() { OrganizationDto organization = db.organizations().insert(); insertGhostProject(organization); userSessionRule.logIn().addPermission(ADMINISTER, organization); @@ -156,7 +156,7 @@ public class GhostsActionTest { } @Test - public void ghost_projects_with_partial_query_on_name() throws Exception { + public void ghost_projects_with_partial_query_on_name() { OrganizationDto organization = db.organizations().insert(); insertGhostProject(organization, dto -> dto.setName("ghost-name-10")); insertGhostProject(organization, dto -> dto.setName("ghost-name-11")); @@ -175,7 +175,7 @@ public class GhostsActionTest { } @Test - public void ghost_projects_with_partial_query_on_key() throws Exception { + public void ghost_projects_with_partial_query_on_key() { OrganizationDto organization = db.organizations().insert(); insertGhostProject(organization, dto -> dto.setDbKey("ghost-key-1")); @@ -215,7 +215,7 @@ public class GhostsActionTest { } @Test - public void ghost_projects_base_on_json_example() throws Exception { + public void ghost_projects_base_on_json_example() { OrganizationDto organization = db.organizations().insert(); ComponentDto hBaseProject = ComponentTesting.newPrivateProjectDto(organization, "ce4c03d6-430f-40a9-b777-ad877c00aa4d") .setDbKey("org.apache.hbas:hbase") @@ -243,7 +243,7 @@ public class GhostsActionTest { } @Test - public void throws_ForbiddenException_if_not_administrator_of_organization() throws Exception { + public void throws_ForbiddenException_if_not_administrator_of_organization() { userSessionRule.logIn(); expectedException.expect(ForbiddenException.class); diff --git a/server/sonar-server/src/test/java/org/sonar/server/project/ws/IndexActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/project/ws/IndexActionTest.java index 20e95e2ce0a..af3ef55f580 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/project/ws/IndexActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/project/ws/IndexActionTest.java @@ -66,7 +66,7 @@ public class IndexActionTest { } @Test - public void search_all_projects() throws Exception { + public void search_all_projects() { insertProjectsAuthorizedForUser( ComponentTesting.newPrivateProjectDto(db.getDefaultOrganization()).setDbKey("org.jenkins-ci.plugins:sonar").setName("Jenkins Sonar Plugin"), ComponentTesting.newPrivateProjectDto(db.getDefaultOrganization()).setDbKey("org.codehaus.sonar-plugins:sonar-ant-task").setName("Sonar Ant Task"), @@ -78,7 +78,7 @@ public class IndexActionTest { } @Test - public void search_projects_with_modules() throws Exception { + public void search_projects_with_modules() { ComponentDto project1 = ComponentTesting.newPrivateProjectDto(db.getDefaultOrganization()).setDbKey("org.jenkins-ci.plugins:sonar").setName("Jenkins Sonar Plugin"); ComponentDto project2 = ComponentTesting.newPrivateProjectDto(db.getDefaultOrganization()).setDbKey("org.codehaus.sonar-plugins:sonar-ant-task").setName("Sonar Ant Task"); insertProjectsAuthorizedForUser(project1, project2); @@ -92,7 +92,7 @@ public class IndexActionTest { } @Test - public void search_project_by_key() throws Exception { + public void search_project_by_key() { insertProjectsAuthorizedForUser( ComponentTesting.newPrivateProjectDto(db.getDefaultOrganization()).setDbKey("org.jenkins-ci.plugins:sonar").setName("Jenkins Sonar Plugin"), ComponentTesting.newPrivateProjectDto(db.getDefaultOrganization()).setDbKey("org.codehaus.sonar-plugins:sonar-ant-task").setName("Sonar Ant Task"), @@ -104,7 +104,7 @@ public class IndexActionTest { } @Test - public void search_project_by_id() throws Exception { + public void search_project_by_id() { ComponentDto project = ComponentTesting.newPrivateProjectDto(db.getDefaultOrganization()).setDbKey("org.jenkins-ci.plugins:sonar").setName("Jenkins Sonar Plugin"); insertProjectsAuthorizedForUser( project, @@ -117,7 +117,7 @@ public class IndexActionTest { } @Test - public void search_projects_by_name() throws Exception { + public void search_projects_by_name() { insertProjectsAuthorizedForUser( ComponentTesting.newPrivateProjectDto(db.getDefaultOrganization()).setDbKey("org.jenkins-ci.plugins:sonar").setName("Jenkins Sonar Plugin"), ComponentTesting.newPrivateProjectDto(db.getDefaultOrganization()).setDbKey("org.codehaus.sonar-plugins:sonar-ant-task").setName("Sonar Ant Task"), @@ -129,7 +129,7 @@ public class IndexActionTest { } @Test - public void search_projects_with_modules_by_name() throws Exception { + public void search_projects_with_modules_by_name() { ComponentDto project1 = ComponentTesting.newPrivateProjectDto(db.getDefaultOrganization()).setDbKey("org.jenkins-ci.plugins:sonar").setName("Jenkins Sonar Plugin"); ComponentDto project2 = ComponentTesting.newPrivateProjectDto(db.getDefaultOrganization()).setDbKey("org.codehaus.sonar-plugins:sonar-ant-task").setName("Sonar Ant Task"); insertProjectsAuthorizedForUser(project1, project2); @@ -144,7 +144,7 @@ public class IndexActionTest { } @Test - public void return_empty_list_when_no_project_match_search() throws Exception { + public void return_empty_list_when_no_project_match_search() { insertProjectsAuthorizedForUser( ComponentTesting.newPrivateProjectDto(db.getDefaultOrganization()).setDbKey("org.jenkins-ci.plugins:sonar").setName("Jenkins Sonar Plugin"), ComponentTesting.newPrivateProjectDto(db.getDefaultOrganization()).setDbKey("org.codehaus.sonar-plugins:sonar-ant-task").setName("Sonar Ant Task"), @@ -156,7 +156,7 @@ public class IndexActionTest { } @Test - public void return_only_projects_authorized_for_user() throws Exception { + public void return_only_projects_authorized_for_user() { insertProjectsAuthorizedForUser( ComponentTesting.newPrivateProjectDto(db.getDefaultOrganization()).setDbKey("org.jenkins-ci.plugins:sonar").setName("Jenkins Sonar Plugin"), ComponentTesting.newPrivateProjectDto(db.getDefaultOrganization()).setDbKey("org.codehaus.sonar-plugins:sonar-ant-task").setName("Sonar Ant Task")); @@ -169,7 +169,7 @@ public class IndexActionTest { } @Test - public void do_not_verify_permissions_if_user_is_root() throws Exception { + public void do_not_verify_permissions_if_user_is_root() { ComponentDto project = db.components().insertPrivateProject(p -> p.setDbKey("P1").setName("POne")); String result = call(null, null, null); diff --git a/server/sonar-server/src/test/java/org/sonar/server/project/ws/ProvisionedActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/project/ws/ProvisionedActionTest.java index 64c1f37edf2..9484c69fceb 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/project/ws/ProvisionedActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/project/ws/ProvisionedActionTest.java @@ -90,7 +90,7 @@ public class ProvisionedActionTest { } @Test - public void all_provisioned_projects_without_analyzed_projects() throws Exception { + public void all_provisioned_projects_without_analyzed_projects() { OrganizationDto org = db.organizations().insert(); ComponentDto analyzedProject = ComponentTesting.newPrivateProjectDto(org, "analyzed-uuid-1"); db.components().insertComponents(newProvisionedProject(org, "1"), newProvisionedProject(org, "2"), analyzedProject); @@ -123,7 +123,7 @@ public class ProvisionedActionTest { } @Test - public void provisioned_projects_with_correct_pagination() throws Exception { + public void provisioned_projects_with_correct_pagination() { OrganizationDto org = db.organizations().insert(); for (int i = 1; i <= 10; i++) { db.components().insertComponent(newProvisionedProject(org, String.valueOf(i))); @@ -141,7 +141,7 @@ public class ProvisionedActionTest { } @Test - public void provisioned_projects_with_desired_fields() throws Exception { + public void provisioned_projects_with_desired_fields() { OrganizationDto organization = db.organizations().insert(); db.components().insertComponent(newProvisionedProject(organization, "1")); userSessionRule.logIn().addPermission(PROVISION_PROJECTS, organization); @@ -157,7 +157,7 @@ public class ProvisionedActionTest { } @Test - public void provisioned_projects_with_query() throws Exception { + public void provisioned_projects_with_query() { OrganizationDto org = db.organizations().insert(); db.components().insertComponents(newProvisionedProject(org, "1"), newProvisionedProject(org, "2")); userSessionRule.logIn().addPermission(PROVISION_PROJECTS, org); @@ -173,7 +173,7 @@ public class ProvisionedActionTest { } @Test - public void provisioned_projects_as_defined_in_the_example() throws Exception { + public void provisioned_projects_as_defined_in_the_example() { OrganizationDto org = db.organizations().insert(); ComponentDto hBaseProject = ComponentTesting.newPrivateProjectDto(org, "ce4c03d6-430f-40a9-b777-ad877c00aa4d") .setDbKey("org.apache.hbas:hbase") @@ -195,7 +195,7 @@ public class ProvisionedActionTest { } @Test - public void fail_when_not_enough_privileges() throws Exception { + public void fail_when_not_enough_privileges() { OrganizationDto organization = db.organizations().insert(); db.components().insertComponent(newProvisionedProject(organization, "1")); userSessionRule.logIn().addPermission(SCAN, organization); diff --git a/server/sonar-server/src/test/java/org/sonar/server/project/ws/SearchActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/project/ws/SearchActionTest.java index aa83a3d9a74..e071564fe3f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/project/ws/SearchActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/project/ws/SearchActionTest.java @@ -96,7 +96,7 @@ public class SearchActionTest { new SearchAction(db.getDbClient(), userSession, new ProjectsWsSupport(db.getDbClient(), defaultOrganizationProvider, mock(BillingValidationsProxy.class)))); @Test - public void search_by_key_query_with_partial_match_case_insensitive() throws IOException { + public void search_by_key_query_with_partial_match_case_insensitive() { userSession.addPermission(ADMINISTER, db.getDefaultOrganization()); db.components().insertComponents( ComponentTesting.newPrivateProjectDto(db.getDefaultOrganization()).setDbKey("project-_%-key"), @@ -133,7 +133,7 @@ public class SearchActionTest { } @Test - public void search_projects_when_no_qualifier_set() throws IOException { + public void search_projects_when_no_qualifier_set() { userSession.addPermission(ADMINISTER, db.getDefaultOrganization()); db.components().insertComponents( ComponentTesting.newPrivateProjectDto(db.getDefaultOrganization()).setDbKey(PROJECT_KEY_1), @@ -145,7 +145,7 @@ public class SearchActionTest { } @Test - public void search_projects() throws IOException { + public void search_projects() { userSession.addPermission(ADMINISTER, db.getDefaultOrganization()); ComponentDto project = ComponentTesting.newPrivateProjectDto(db.getDefaultOrganization()).setDbKey(PROJECT_KEY_1); ComponentDto module = newModuleDto(project); @@ -162,7 +162,7 @@ public class SearchActionTest { } @Test - public void search_views() throws IOException { + public void search_views() { userSession.addPermission(ADMINISTER, db.getDefaultOrganization()); db.components().insertComponents( ComponentTesting.newPrivateProjectDto(db.getDefaultOrganization()).setDbKey(PROJECT_KEY_1), @@ -174,7 +174,7 @@ public class SearchActionTest { } @Test - public void search_projects_and_views() throws IOException { + public void search_projects_and_views() { userSession.addPermission(ADMINISTER, db.getDefaultOrganization()); db.components().insertComponents( ComponentTesting.newPrivateProjectDto(db.getDefaultOrganization()).setDbKey(PROJECT_KEY_1), @@ -186,7 +186,7 @@ public class SearchActionTest { } @Test - public void search_on_default_organization_when_no_organization_set() throws IOException { + public void search_on_default_organization_when_no_organization_set() { userSession.addPermission(ADMINISTER, db.getDefaultOrganization()); OrganizationDto otherOrganization = db.organizations().insert(); db.components().insertComponents( @@ -200,7 +200,7 @@ public class SearchActionTest { } @Test - public void search_for_projects_on_given_organization() throws IOException { + public void search_for_projects_on_given_organization() { OrganizationDto organization1 = db.organizations().insert(); OrganizationDto organization2 = db.organizations().insert(); userSession.addPermission(ADMINISTER, organization1); @@ -244,7 +244,7 @@ public class SearchActionTest { } @Test - public void result_is_paginated() throws IOException { + public void result_is_paginated() { userSession.addPermission(ADMINISTER, db.getDefaultOrganization()); List componentDtoList = new ArrayList<>(); for (int i = 1; i <= 9; i++) { @@ -304,7 +304,7 @@ public class SearchActionTest { } @Test - public void fail_when_not_system_admin() throws Exception { + public void fail_when_not_system_admin() { userSession.addPermission(ADMINISTER_QUALITY_PROFILES, db.getDefaultOrganization()); expectedException.expect(ForbiddenException.class); @@ -312,14 +312,14 @@ public class SearchActionTest { } @Test - public void fail_on_unknown_organization() throws Exception { + public void fail_on_unknown_organization() { expectedException.expect(NotFoundException.class); call(SearchRequest.builder().setOrganization("unknown").build()); } @Test - public void fail_on_invalid_qualifier() throws Exception { + public void fail_on_invalid_qualifier() { userSession.addPermission(ADMINISTER_QUALITY_PROFILES, db.getDefaultOrganization()); expectedException.expect(IllegalArgumentException.class); expectedException.expectMessage("Value of parameter 'qualifiers' (BRC) must be one of: [TRK, VW, APP]"); @@ -386,7 +386,7 @@ public class SearchActionTest { } @Test - public void json_example() throws URISyntaxException, IOException { + public void json_example() { OrganizationDto organization = db.organizations().insertForKey("my-org-1"); userSession.addPermission(ADMINISTER, organization); ComponentDto publicProject = newPrivateProjectDto(organization, "project-uuid-1").setName("Project Name 1").setDbKey("project-key-1").setPrivate(false); diff --git a/server/sonar-server/src/test/java/org/sonar/server/project/ws/UpdateKeyActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/project/ws/UpdateKeyActionTest.java index 70792e6ea91..3caccbacd16 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/project/ws/UpdateKeyActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/project/ws/UpdateKeyActionTest.java @@ -124,7 +124,7 @@ public class UpdateKeyActionTest { } @Test - public void fail_when_using_branch_uuid() throws Exception { + public void fail_when_using_branch_uuid() { ComponentDto project = db.components().insertMainBranch(); ComponentDto branch = db.components().insertProjectBranch(project); diff --git a/server/sonar-server/src/test/java/org/sonar/server/projectlink/ws/CreateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/projectlink/ws/CreateActionTest.java index 2a8d21351f7..c97eaedbb19 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/projectlink/ws/CreateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/projectlink/ws/CreateActionTest.java @@ -249,7 +249,7 @@ public class CreateActionTest { } @Test - public void fail_when_using_branch_db_uuid() throws Exception { + public void fail_when_using_branch_db_uuid() { OrganizationDto organization = db.organizations().insert(); ComponentDto project = db.components().insertMainBranch(organization); userSession.logIn().addProjectPermission(UserRole.USER, project); @@ -289,7 +289,7 @@ public class CreateActionTest { ComponentTesting.newPrivateProjectDto(org, PROJECT_UUID).setDbKey(PROJECT_KEY)); } - private void createAndTest(ComponentDto project, String name, String url, String type) throws IOException { + private void createAndTest(ComponentDto project, String name, String url, String type) { ProjectLinks.CreateWsResponse response = ws.newRequest() .setMethod("POST") .setParam(PARAM_PROJECT_KEY, project.getDbKey()) diff --git a/server/sonar-server/src/test/java/org/sonar/server/projectlink/ws/SearchActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/projectlink/ws/SearchActionTest.java index 04234d7d239..6d288e3b487 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/projectlink/ws/SearchActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/projectlink/ws/SearchActionTest.java @@ -283,7 +283,7 @@ public class SearchActionTest { } @Test - public void fail_when_using_branch_db_uuid() throws Exception { + public void fail_when_using_branch_db_uuid() { OrganizationDto organization = db.organizations().insert(); ComponentDto project = db.components().insertMainBranch(organization); userSession.logIn().addProjectPermission(UserRole.USER, project); @@ -330,13 +330,13 @@ public class SearchActionTest { return link; } - private SearchWsResponse callByKey(String projectKey) throws IOException { + private SearchWsResponse callByKey(String projectKey) { return ws.newRequest() .setParam(PARAM_PROJECT_KEY, projectKey) .executeProtobuf(SearchWsResponse.class); } - private SearchWsResponse callByUuid(String projectUuid) throws IOException { + private SearchWsResponse callByUuid(String projectUuid) { return ws.newRequest() .setParam(PARAM_PROJECT_ID, projectUuid) .executeProtobuf(SearchWsResponse.class); diff --git a/server/sonar-server/src/test/java/org/sonar/server/projecttag/ws/ProjectTagsWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/projecttag/ws/ProjectTagsWsTest.java index 0d0a0e1f943..6c1f9643c86 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/projecttag/ws/ProjectTagsWsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/projecttag/ws/ProjectTagsWsTest.java @@ -48,7 +48,7 @@ public class ProjectTagsWsTest { } @Override - public void handle(Request request, Response response) throws Exception { + public void handle(Request request, Response response) { // do nothing } } diff --git a/server/sonar-server/src/test/java/org/sonar/server/projecttag/ws/SearchActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/projecttag/ws/SearchActionTest.java index aaefd006cee..f2f2d1c68d8 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/projecttag/ws/SearchActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/projecttag/ws/SearchActionTest.java @@ -70,7 +70,7 @@ public class SearchActionTest { private WsActionTester ws = new WsActionTester(new SearchAction(index)); @Test - public void json_example() throws IOException { + public void json_example() { index(newDoc().setTags(newArrayList("official", "offshore", "playoff"))); String result = ws.newRequest().execute().getInput(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/property/ws/IndexActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/property/ws/IndexActionTest.java index a9e31fd6db0..fff21777ef4 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/property/ws/IndexActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/property/ws/IndexActionTest.java @@ -80,7 +80,7 @@ public class IndexActionTest { } @Test - public void return_simple_value() throws Exception { + public void return_simple_value() { logIn(); definitions.addComponent(PropertyDefinition.builder("foo").build()); propertyDb.insertProperties(newGlobalPropertyDto().setKey("foo").setValue("one")); @@ -89,7 +89,7 @@ public class IndexActionTest { } @Test - public void return_multi_values() throws Exception { + public void return_multi_values() { logIn(); // Property never defined, default value is returned definitions.addComponent(PropertyDefinition.builder("default") @@ -106,7 +106,7 @@ public class IndexActionTest { } @Test - public void return_multi_value_with_coma() throws Exception { + public void return_multi_value_with_coma() { logIn(); definitions.addComponent(PropertyDefinition.builder("global").multiValues(true).build()); propertyDb.insertProperties(newGlobalPropertyDto().setKey("global").setValue("three,four%2Cfive")); @@ -115,7 +115,7 @@ public class IndexActionTest { } @Test - public void return_property_set() throws Exception { + public void return_property_set() { logIn(); definitions.addComponent(PropertyDefinition .builder("foo") @@ -130,7 +130,7 @@ public class IndexActionTest { } @Test - public void return_default_values() throws Exception { + public void return_default_values() { logIn(); definitions.addComponent(PropertyDefinition.builder("foo").defaultValue("default").build()); @@ -138,7 +138,7 @@ public class IndexActionTest { } @Test - public void return_global_values() throws Exception { + public void return_global_values() { logIn(); definitions.addComponent(PropertyDefinition.builder("property").defaultValue("default").build()); propertyDb.insertProperties( @@ -149,7 +149,7 @@ public class IndexActionTest { } @Test - public void return_project_values() throws Exception { + public void return_project_values() { logInAsProjectUser(); definitions.addComponent(PropertyDefinition.builder("property").defaultValue("default").build()); propertyDb.insertProperties( @@ -161,7 +161,7 @@ public class IndexActionTest { } @Test - public void return_global_values_when_project_does_not_exist() throws Exception { + public void return_global_values_when_project_does_not_exist() { logIn(); definitions.addComponent(PropertyDefinition.builder("property").defaultValue("default").build()); propertyDb.insertProperties( @@ -171,7 +171,7 @@ public class IndexActionTest { } @Test - public void return_values_even_if_no_property_definition() throws Exception { + public void return_values_even_if_no_property_definition() { logIn(); propertyDb.insertProperties(newGlobalPropertyDto().setKey("globalPropertyWithoutDefinition").setValue("value")); @@ -179,7 +179,7 @@ public class IndexActionTest { } @Test - public void return_empty_when_property_def_exists_but_no_value() throws Exception { + public void return_empty_when_property_def_exists_but_no_value() { logIn(); definitions.addComponent(PropertyDefinition.builder("foo").build()); @@ -187,7 +187,7 @@ public class IndexActionTest { } @Test - public void return_nothing_when_unknown_key() throws Exception { + public void return_nothing_when_unknown_key() { logIn(); definitions.addComponent(PropertyDefinition.builder("foo").defaultValue("default").build()); propertyDb.insertProperties(newGlobalPropertyDto().setKey("bar").setValue("")); @@ -196,7 +196,7 @@ public class IndexActionTest { } @Test - public void return_module_values() throws Exception { + public void return_module_values() { logInAsProjectUser(); ComponentDto module = componentDb.insertComponent(newModuleDto(project)); definitions.addComponent(PropertyDefinition.builder("property").defaultValue("default").build()); @@ -209,7 +209,7 @@ public class IndexActionTest { } @Test - public void return_inherited_values_on_module() throws Exception { + public void return_inherited_values_on_module() { logInAsProjectUser(); ComponentDto module = componentDb.insertComponent(newModuleDto(project)); definitions.addComponents(asList( @@ -226,7 +226,7 @@ public class IndexActionTest { } @Test - public void return_inherited_values_on_global_setting() throws Exception { + public void return_inherited_values_on_global_setting() { logIn(); definitions.addComponents(asList( PropertyDefinition.builder("defaultProperty").defaultValue("default").build(), @@ -238,7 +238,7 @@ public class IndexActionTest { } @Test - public void does_not_return_value_of_deprecated_key() throws Exception { + public void does_not_return_value_of_deprecated_key() { logIn(); definitions.addComponent(PropertyDefinition.builder("foo").deprecatedKey("deprecated").build()); propertyDb.insertProperties(newGlobalPropertyDto().setKey("foo").setValue("one")); @@ -247,7 +247,7 @@ public class IndexActionTest { } @Test - public void does_not_returned_secured_and_license_settings_when_not_authenticated() throws Exception { + public void does_not_returned_secured_and_license_settings_when_not_authenticated() { definitions.addComponents(asList( PropertyDefinition.builder("foo").build(), PropertyDefinition.builder("secret.secured").build(), @@ -261,7 +261,7 @@ public class IndexActionTest { } @Test - public void does_not_returned_secured_and_license_settings_in_property_set_when_not_authenticated() throws Exception { + public void does_not_returned_secured_and_license_settings_in_property_set_when_not_authenticated() { definitions.addComponent(PropertyDefinition .builder("foo") .type(PropertyType.PROPERTY_SET) @@ -277,7 +277,7 @@ public class IndexActionTest { } @Test - public void return_license_with_hash_settings_when_authenticated_but_not_admin() throws Exception { + public void return_license_with_hash_settings_when_authenticated_but_not_admin() { logInAsProjectUser(); definitions.addComponents(asList( PropertyDefinition.builder("foo").build(), @@ -295,7 +295,7 @@ public class IndexActionTest { } @Test - public void return_secured_and_license_settings_when_system_admin() throws Exception { + public void return_secured_and_license_settings_when_system_admin() { logInAsSystemAdministrator(); definitions.addComponents(asList( PropertyDefinition.builder("foo").build(), @@ -311,7 +311,7 @@ public class IndexActionTest { } @Test - public void return_secured_and_license_settings_when_project_admin() throws Exception { + public void return_secured_and_license_settings_when_project_admin() { logInAsProjectAdmin(); definitions.addComponents(asList( PropertyDefinition.builder("foo").build(), @@ -327,7 +327,7 @@ public class IndexActionTest { } @Test - public void return_secured_and_license_settings_in_property_set_when_system_admin() throws Exception { + public void return_secured_and_license_settings_in_property_set_when_system_admin() { logInAsSystemAdministrator(); definitions.addComponent(PropertyDefinition .builder("foo") @@ -344,7 +344,7 @@ public class IndexActionTest { } @Test - public void return_all_settings_when_no_component_and_no_key() throws Exception { + public void return_all_settings_when_no_component_and_no_key() { logInAsSystemAdministrator(); definitions.addComponents(asList( PropertyDefinition.builder("foo").build(), @@ -360,7 +360,7 @@ public class IndexActionTest { } @Test - public void return_all_project_settings_when_component_and_no_key() throws Exception { + public void return_all_project_settings_when_component_and_no_key() { logInAsProjectAdmin(); definitions.addComponents(asList( PropertyDefinition.builder("foo").build(), @@ -377,7 +377,7 @@ public class IndexActionTest { } @Test - public void return_only_one_setting_when_key_is_provided() throws Exception { + public void return_only_one_setting_when_key_is_provided() { definitions.addComponents(asList( PropertyDefinition.builder("foo").build(), PropertyDefinition.builder("bar").build())); @@ -390,7 +390,7 @@ public class IndexActionTest { } @Test - public void does_not_fail_when_user_has_not_project_browse_permission() throws Exception { + public void does_not_fail_when_user_has_not_project_browse_permission() { userSession.logIn("project-admin").addProjectPermission(CODEVIEWER, project); definitions.addComponent(PropertyDefinition.builder("foo").build()); propertyDb.insertProperties(newComponentPropertyDto(project).setKey("foo").setValue("one")); @@ -399,7 +399,7 @@ public class IndexActionTest { } @Test - public void does_not_fail_when_format_is_set_to_json() throws Exception { + public void does_not_fail_when_format_is_set_to_json() { logIn(); definitions.addComponent(PropertyDefinition.builder("foo").defaultValue("default").build()); @@ -407,7 +407,7 @@ public class IndexActionTest { } @Test - public void fail_when_format_is_set_to_xml() throws Exception { + public void fail_when_format_is_set_to_xml() { logIn(); definitions.addComponent(PropertyDefinition.builder("foo").defaultValue("default").build()); diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateConditionsUpdaterTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateConditionsUpdaterTest.java index bda550ba814..74c4583f7a9 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateConditionsUpdaterTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateConditionsUpdaterTest.java @@ -104,7 +104,7 @@ public class QualityGateConditionsUpdaterTest { } @Test - public void fail_to_create_condition_when_condition_on_same_metric_already_exist() throws Exception { + public void fail_to_create_condition_when_condition_on_same_metric_already_exist() { dbClient.gateConditionDao().insert(new QualityGateConditionDto() .setQualityGateId(qualityGateDto.getId()) .setMetricId(coverageMetricDto.getId()) @@ -117,7 +117,7 @@ public class QualityGateConditionsUpdaterTest { } @Test - public void fail_to_create_condition_when_condition_on_same_metric_and_on_leak_period_already_exist() throws Exception { + public void fail_to_create_condition_when_condition_on_same_metric_and_on_leak_period_already_exist() { dbClient.gateConditionDao().insert(new QualityGateConditionDto() .setQualityGateId(qualityGateDto.getId()) .setMetricId(coverageMetricDto.getId()) @@ -277,7 +277,7 @@ public class QualityGateConditionsUpdaterTest { } @Test - public void fail_to_update_condition_when_condition_on_same_metric_already_exist() throws Exception { + public void fail_to_update_condition_when_condition_on_same_metric_already_exist() { QualityGateConditionDto conditionNotOnLeakPeriod = insertCondition(coverageMetricDto.getId(), "GT", "80", null, null); QualityGateConditionDto conditionOnLeakPeriod = insertCondition(coverageMetricDto.getId(), "GT", "80", null, 1); diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/CreateConditionActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/CreateConditionActionTest.java index 38127061570..f4f885a070a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/CreateConditionActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/CreateConditionActionTest.java @@ -74,7 +74,7 @@ public class CreateConditionActionTest { private WsActionTester ws = new WsActionTester(underTest); @Test - public void create_warning_condition() throws Exception { + public void create_warning_condition() { OrganizationDto organization = db.organizations().insert(); logInAsQualityGateAdmin(organization); QGateWithOrgDto qualityGate = db.qualityGates().insertQualityGate(organization); @@ -92,7 +92,7 @@ public class CreateConditionActionTest { } @Test - public void create_error_condition() throws Exception { + public void create_error_condition() { OrganizationDto organization = db.organizations().insert(); logInAsQualityGateAdmin(organization); QGateWithOrgDto qualityGate = db.qualityGates().insertQualityGate(organization); @@ -110,7 +110,7 @@ public class CreateConditionActionTest { } @Test - public void create_condition_over_leak_period() throws Exception { + public void create_condition_over_leak_period() { OrganizationDto organization = db.organizations().insert(); logInAsQualityGateAdmin(organization); QGateWithOrgDto qualityGate = db.qualityGates().insertQualityGate(organization); @@ -129,7 +129,7 @@ public class CreateConditionActionTest { } @Test - public void default_organization_is_used_when_no_organization_parameter() throws Exception { + public void default_organization_is_used_when_no_organization_parameter() { logInAsQualityGateAdmin(db.getDefaultOrganization()); QGateWithOrgDto qualityGate = db.qualityGates().insertQualityGate(db.getDefaultOrganization()); OrganizationDto otherOrganization = db.organizations().insert(); @@ -167,7 +167,7 @@ public class CreateConditionActionTest { } @Test - public void test_response() throws Exception { + public void test_response() { OrganizationDto organization = db.organizations().insert(); logInAsQualityGateAdmin(organization); QGateWithOrgDto qualityGate = db.qualityGates().insertQualityGate(organization); @@ -193,7 +193,7 @@ public class CreateConditionActionTest { } @Test - public void throw_ForbiddenException_if_not_gate_administrator() throws Exception { + public void throw_ForbiddenException_if_not_gate_administrator() { OrganizationDto organization = db.organizations().insert(); QGateWithOrgDto qualityGate = db.qualityGates().insertQualityGate(organization); MetricDto metric = insertMetric(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/SearchActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/SearchActionTest.java index 38b2aada228..d4310413a0b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/SearchActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/SearchActionTest.java @@ -242,7 +242,7 @@ public class SearchActionTest { } @Test - public void test_paging() throws Exception { + public void test_paging() { OrganizationDto organization = db.organizations().insert(); QualityGateDto qualityGate = db.qualityGates().insertQualityGate(organization); ComponentDto project1 = db.components().insertPublicProject(organization, p -> p.setName("Project 1")); diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileRepositoryRule.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileRepositoryRule.java index 2ecb2c0bd27..34474b42adf 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileRepositoryRule.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQProfileRepositoryRule.java @@ -34,7 +34,7 @@ public class BuiltInQProfileRepositoryRule extends ExternalResource implements B private List profiles = new ArrayList<>(); @Override - protected void before() throws Throwable { + protected void before() { this.initializeCalled = false; this.profiles.clear(); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesUpdateListenerTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesUpdateListenerTest.java index d39190859ac..966158b4029 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesUpdateListenerTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/BuiltInQualityProfilesUpdateListenerTest.java @@ -52,7 +52,7 @@ public class BuiltInQualityProfilesUpdateListenerTest { private MapSettings settings = new MapSettings(); @Test - public void add_profile_to_notification_for_added_rules() throws Exception { + public void add_profile_to_notification_for_added_rules() { enableNotificationInGlobalSettings(); Multimap profiles = ArrayListMultimap.create(); Languages languages = new Languages(); @@ -70,7 +70,7 @@ public class BuiltInQualityProfilesUpdateListenerTest { } @Test - public void add_profile_to_notification_for_updated_rules() throws Exception { + public void add_profile_to_notification_for_updated_rules() { enableNotificationInGlobalSettings(); Multimap profiles = ArrayListMultimap.create(); Languages languages = new Languages(); @@ -88,7 +88,7 @@ public class BuiltInQualityProfilesUpdateListenerTest { } @Test - public void add_profile_to_notification_for_removed_rules() throws Exception { + public void add_profile_to_notification_for_removed_rules() { enableNotificationInGlobalSettings(); Multimap profiles = ArrayListMultimap.create(); Languages languages = new Languages(); @@ -106,7 +106,7 @@ public class BuiltInQualityProfilesUpdateListenerTest { } @Test - public void add_multiple_profiles_to_notification() throws Exception { + public void add_multiple_profiles_to_notification() { enableNotificationInGlobalSettings(); Multimap profiles = ArrayListMultimap.create(); Languages languages = new Languages(); @@ -125,7 +125,7 @@ public class BuiltInQualityProfilesUpdateListenerTest { } @Test - public void add_start_and_end_dates_to_notification() throws Exception { + public void add_start_and_end_dates_to_notification() { enableNotificationInGlobalSettings(); Multimap profiles = ArrayListMultimap.create(); Languages languages = new Languages(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileBackuperImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileBackuperImplTest.java index 4aa6007ac7c..7da0368869d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileBackuperImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileBackuperImplTest.java @@ -182,7 +182,7 @@ public class QProfileBackuperImplTest { } @Test - public void fail_to_restore_if_not_xml_backup() throws Exception { + public void fail_to_restore_if_not_xml_backup() { OrganizationDto organization = db.organizations().insert(); try { underTest.restore(db.getSession(), new StringReader("foo"), organization, null); @@ -195,7 +195,7 @@ public class QProfileBackuperImplTest { } @Test - public void fail_to_restore_if_bad_xml_format() throws Exception { + public void fail_to_restore_if_bad_xml_format() { OrganizationDto organization = db.organizations().insert(); try { underTest.restore(db.getSession(), new StringReader(""), organization, null); diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/AddProjectActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/AddProjectActionTest.java index 9e7e7874b08..c1d9b4df6a6 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/AddProjectActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/AddProjectActionTest.java @@ -158,7 +158,7 @@ public class AddProjectActionTest { } @Test - public void change_association_in_default_organization() throws Exception { + public void change_association_in_default_organization() { logInAsProfileAdmin(db.getDefaultOrganization()); ComponentDto project = db.components().insertPrivateProject(db.getDefaultOrganization()); @@ -174,7 +174,7 @@ public class AddProjectActionTest { } @Test - public void changing_association_does_not_change_other_language_associations() throws Exception { + public void changing_association_does_not_change_other_language_associations() { logInAsProfileAdmin(db.getDefaultOrganization()); ComponentDto project = db.components().insertPrivateProject(db.getDefaultOrganization()); QProfileDto profile1Language1 = db.qualityProfiles().insert(db.getDefaultOrganization(), p -> p.setLanguage(LANGUAGE_1)); @@ -189,7 +189,7 @@ public class AddProjectActionTest { } @Test - public void project_administrator_can_change_profile() throws Exception { + public void project_administrator_can_change_profile() { ComponentDto project = db.components().insertPrivateProject(db.getDefaultOrganization()); QProfileDto profile = db.qualityProfiles().insert(db.getDefaultOrganization()); userSession.logIn(db.users().insertUser()).addProjectPermission(UserRole.ADMIN, project); @@ -269,7 +269,7 @@ public class AddProjectActionTest { } @Test - public void fail_when_using_branch_uuid() throws Exception { + public void fail_when_using_branch_uuid() { OrganizationDto organization = db.organizations().insert(); ComponentDto project = db.components().insertMainBranch(organization); userSession.logIn(db.users().insertUser()).addProjectPermission(UserRole.ADMIN, project); diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/BackupActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/BackupActionTest.java index 03ab7fa30ff..df13491fd41 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/BackupActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/BackupActionTest.java @@ -81,7 +81,7 @@ public class BackupActionTest { } @Test - public void returns_backup_of_profile_with_specified_key() throws Exception { + public void returns_backup_of_profile_with_specified_key() { QProfileDto profile = db.qualityProfiles().insert(db.getDefaultOrganization()); TestResponse response = tester.newRequest().setParam(PARAM_KEY, profile.getKee()).execute(); @@ -91,7 +91,7 @@ public class BackupActionTest { } @Test - public void returns_backup_of_profile_with_specified_name_on_default_organization() throws Exception { + public void returns_backup_of_profile_with_specified_name_on_default_organization() { QProfileDto profile = db.qualityProfiles().insert(db.getDefaultOrganization(), p -> p.setLanguage(A_LANGUAGE)); TestResponse response = tester.newRequest() @@ -102,7 +102,7 @@ public class BackupActionTest { } @Test - public void returns_backup_of_profile_with_specified_name_and_organization() throws Exception { + public void returns_backup_of_profile_with_specified_name_and_organization() { OrganizationDto org = db.organizations().insert(); QProfileDto profile = db.qualityProfiles().insert(org, p -> p.setLanguage(A_LANGUAGE)); @@ -115,7 +115,7 @@ public class BackupActionTest { } @Test - public void throws_NotFoundException_if_profile_with_specified_key_does_not_exist() throws Exception { + public void throws_NotFoundException_if_profile_with_specified_key_does_not_exist() { expectedException.expect(NotFoundException.class); expectedException.expectMessage("Quality Profile with key 'missing' does not exist"); @@ -123,7 +123,7 @@ public class BackupActionTest { } @Test - public void throws_NotFoundException_if_specified_organization_does_not_exist() throws Exception { + public void throws_NotFoundException_if_specified_organization_does_not_exist() { expectedException.expect(NotFoundException.class); expectedException.expectMessage("No organization with key 'the-missing-org'"); @@ -135,7 +135,7 @@ public class BackupActionTest { } @Test - public void throws_NotFoundException_if_profile_name_exists_but_in_another_organization() throws Exception { + public void throws_NotFoundException_if_profile_name_exists_but_in_another_organization() { OrganizationDto org1 = db.organizations().insert(); QProfileDto profileInOrg1 = db.qualityProfiles().insert(org1, p -> p.setLanguage(A_LANGUAGE)); OrganizationDto org2 = db.organizations().insert(); @@ -152,7 +152,7 @@ public class BackupActionTest { } @Test - public void throws_IAE_if_profile_reference_is_not_set() throws Exception { + public void throws_IAE_if_profile_reference_is_not_set() { expectedException.expect(IllegalArgumentException.class); tester.newRequest().execute(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangeParentActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangeParentActionTest.java index 66d40d39fc9..ac27660c0ac 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangeParentActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangeParentActionTest.java @@ -148,7 +148,7 @@ public class ChangeParentActionTest { } @Test - public void change_parent_with_no_parent_before() throws Exception { + public void change_parent_with_no_parent_before() { QProfileDto parent1 = createProfile(); QProfileDto child = createProfile(); @@ -175,7 +175,7 @@ public class ChangeParentActionTest { } @Test - public void replace_existing_parent() throws Exception { + public void replace_existing_parent() { QProfileDto parent1 = createProfile(); QProfileDto parent2 = createProfile(); QProfileDto child = createProfile(); @@ -206,7 +206,7 @@ public class ChangeParentActionTest { } @Test - public void remove_parent() throws Exception { + public void remove_parent() { QProfileDto parent = createProfile(); QProfileDto child = createProfile(); @@ -231,7 +231,7 @@ public class ChangeParentActionTest { } @Test - public void change_parent_with_names() throws Exception { + public void change_parent_with_names() { QProfileDto parent1 = createProfile(); QProfileDto parent2 = createProfile(); QProfileDto child = createProfile(); @@ -293,7 +293,7 @@ public class ChangeParentActionTest { } @Test - public void remove_parent_with_empty_key() throws Exception { + public void remove_parent_with_empty_key() { QProfileDto parent = createProfile(); QProfileDto child = createProfile(); @@ -320,7 +320,7 @@ public class ChangeParentActionTest { } @Test - public void as_qprofile_editor() throws Exception { + public void as_qprofile_editor() { QProfileDto parent1 = createProfile(); QProfileDto parent2 = createProfile(); QProfileDto child = createProfile(); @@ -370,7 +370,7 @@ public class ChangeParentActionTest { } @Test - public void fail_if_parent_key_and_name_both_set() throws Exception { + public void fail_if_parent_key_and_name_both_set() { QProfileDto child = createProfile(); assertThat(dbClient.activeRuleDao().selectByProfileUuid(dbSession, child.getKee())).isEmpty(); @@ -387,7 +387,7 @@ public class ChangeParentActionTest { } @Test - public void fail_if_profile_key_and_name_both_set() throws Exception { + public void fail_if_profile_key_and_name_both_set() { QProfileDto child = createProfile(); assertThat(dbClient.activeRuleDao().selectByProfileUuid(dbSession, child.getKee())).isEmpty(); @@ -405,7 +405,7 @@ public class ChangeParentActionTest { } @Test - public void fail_if_missing_permission() throws Exception { + public void fail_if_missing_permission() { userSession.logIn(db.users().insertUser()); QProfileDto child = createProfile(); @@ -420,7 +420,7 @@ public class ChangeParentActionTest { } @Test - public void fail_if_missing_permission_for_this_organization() throws Exception { + public void fail_if_missing_permission_for_this_organization() { OrganizationDto organization2 = db.organizations().insert(); userSession.logIn(db.users().insertUser()).addPermission(ADMINISTER_QUALITY_PROFILES, organization2.getUuid()); diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangelogActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangelogActionTest.java index 31b3f8df982..a478da55ad9 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangelogActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangelogActionTest.java @@ -140,7 +140,7 @@ public class ChangelogActionTest { } @Test - public void find_changelog_by_profile_key() throws Exception { + public void find_changelog_by_profile_key() { QProfileDto profile = dbTester.qualityProfiles().insert(organization); String response = ws.newRequest() @@ -153,7 +153,7 @@ public class ChangelogActionTest { } @Test - public void find_changelog_by_language_and_name() throws Exception { + public void find_changelog_by_language_and_name() { QProfileDto qualityProfile = dbTester.qualityProfiles().insert(dbTester.getDefaultOrganization()); String response = ws.newRequest() @@ -167,7 +167,7 @@ public class ChangelogActionTest { } @Test - public void find_changelog_by_organization_and_language_and_name() throws Exception { + public void find_changelog_by_organization_and_language_and_name() { QProfileDto qualityProfile = dbTester.qualityProfiles().insert(organization); String response = ws.newRequest() @@ -182,7 +182,7 @@ public class ChangelogActionTest { } @Test - public void do_not_find_changelog_by_wrong_organization_and_language_and_name() throws Exception { + public void do_not_find_changelog_by_wrong_organization_and_language_and_name() { OrganizationDto organization1 = dbTester.organizations().insert(); OrganizationDto organization2 = dbTester.organizations().insert(); @@ -200,7 +200,7 @@ public class ChangelogActionTest { } @Test - public void changelog_empty() throws Exception { + public void changelog_empty() { QProfileDto qualityProfile = dbTester.qualityProfiles().insert(organization); String response = ws.newRequest() @@ -214,7 +214,7 @@ public class ChangelogActionTest { } @Test - public void changelog_not_empty() throws Exception { + public void changelog_not_empty() { QProfileDto qualityProfile = dbTester.qualityProfiles().insert(organization); QProfileChangeDto change = QualityProfileTesting.newQProfileChangeDto() .setUuid(null) @@ -234,7 +234,7 @@ public class ChangelogActionTest { } @Test - public void changelog_filter_by_since() throws Exception { + public void changelog_filter_by_since() { QProfileDto qualityProfile = dbTester.qualityProfiles().insert(organization); system2.setNow(DateUtils.parseDateTime("2011-04-25T01:15:42+0100").getTime()); QProfileChangeDto change = QualityProfileTesting.newQProfileChangeDto() diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CompareActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CompareActionTest.java index 3e0c001121f..f6fcf657708 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CompareActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CompareActionTest.java @@ -160,21 +160,21 @@ public class CompareActionTest { } @Test(expected = IllegalArgumentException.class) - public void fail_on_missing_left_param() throws Exception { + public void fail_on_missing_left_param() { wsTester.newRequest() .setParam("rightKey", "polop") .execute(); } @Test(expected = IllegalArgumentException.class) - public void fail_on_missing_right_param() throws Exception { + public void fail_on_missing_right_param() { wsTester.newRequest() .setParam("leftKey", "polop") .execute(); } @Test(expected = IllegalArgumentException.class) - public void fail_on_left_profile_not_found() throws Exception { + public void fail_on_left_profile_not_found() { createProfile("xoo", "Right", "xoo-right-12345"); wsTester.newRequest() .setParam("leftKey", "polop") @@ -183,7 +183,7 @@ public class CompareActionTest { } @Test(expected = IllegalArgumentException.class) - public void fail_on_right_profile_not_found() throws Exception { + public void fail_on_right_profile_not_found() { createProfile("xoo", "Left", "xoo-left-12345"); wsTester.newRequest() .setParam("leftKey", "xoo-left-12345") diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CopyActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CopyActionTest.java index 6b216652908..20252a2c868 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CopyActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CopyActionTest.java @@ -114,7 +114,7 @@ public class CopyActionTest { } @Test - public void create_profile_with_specified_name_and_copy_rules_from_source_profile() throws Exception { + public void create_profile_with_specified_name_and_copy_rules_from_source_profile() { OrganizationDto organization = db.organizations().insert(); logInAsQProfileAdministrator(organization); @@ -147,7 +147,7 @@ public class CopyActionTest { } @Test - public void copy_rules_on_existing_profile_in_default_organization() throws Exception { + public void copy_rules_on_existing_profile_in_default_organization() { OrganizationDto organization = db.organizations().insert(); logInAsQProfileAdministrator(organization); QProfileDto sourceProfile = db.qualityProfiles().insert(organization, p -> p.setLanguage(A_LANGUAGE)); @@ -175,7 +175,7 @@ public class CopyActionTest { } @Test - public void create_profile_with_same_parent_as_source_profile() throws Exception { + public void create_profile_with_same_parent_as_source_profile() { OrganizationDto organization = db.organizations().insert(); logInAsQProfileAdministrator(organization); @@ -256,7 +256,7 @@ public class CopyActionTest { } @Test - public void fail_if_parameter_fromKey_is_missing() throws Exception { + public void fail_if_parameter_fromKey_is_missing() { OrganizationDto organization = db.organizations().insert(); logInAsQProfileAdministrator(organization); @@ -269,7 +269,7 @@ public class CopyActionTest { } @Test - public void fail_if_parameter_toName_is_missing() throws Exception { + public void fail_if_parameter_toName_is_missing() { OrganizationDto organization = db.organizations().insert(); logInAsQProfileAdministrator(organization); diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CreateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CreateActionTest.java index 1f930f6f852..48d0dac7458 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CreateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CreateActionTest.java @@ -234,7 +234,7 @@ public class CreateActionTest { } @Test - public void test_json() throws Exception { + public void test_json() { logInAsQProfileAdministrator(db.getDefaultOrganization()); TestResponse response = ws.newRequest() diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/DeleteActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/DeleteActionTest.java index 8c70384c6ec..29c71e69045 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/DeleteActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/DeleteActionTest.java @@ -97,7 +97,7 @@ public class DeleteActionTest { } @Test - public void delete_profile_by_language_and_name_in_default_organization() throws Exception { + public void delete_profile_by_language_and_name_in_default_organization() { OrganizationDto organization = db.getDefaultOrganization(); ComponentDto project = db.components().insertPrivateProject(organization); QProfileDto profile1 = createProfile(organization); @@ -228,7 +228,7 @@ public class DeleteActionTest { } @Test - public void fail_if_missing_name_parameter() throws Exception { + public void fail_if_missing_name_parameter() { OrganizationDto organization = db.organizations().insert(); QProfileDto profile = createProfile(organization); logInAsQProfileAdministrator(organization); diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ExportActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ExportActionTest.java index ad37cc5aed8..ccb587493f7 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ExportActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ExportActionTest.java @@ -191,7 +191,7 @@ public class ExportActionTest { } @Test - public void export_default_profile() throws Exception { + public void export_default_profile() { QProfileDto nonDefaultProfile = createProfile(db.getDefaultOrganization(), false); QProfileDto defaultProfile = createProfile(db.getDefaultOrganization(), true); @@ -206,7 +206,7 @@ public class ExportActionTest { } @Test - public void throw_NotFoundException_if_profile_with_specified_name_does_not_exist_in_default_organization() throws Exception { + public void throw_NotFoundException_if_profile_with_specified_name_does_not_exist_in_default_organization() { expectedException.expect(NotFoundException.class); newWsActionTester().newRequest() @@ -215,7 +215,7 @@ public class ExportActionTest { } @Test - public void throw_IAE_if_export_with_specified_key_does_not_exist() throws Exception { + public void throw_IAE_if_export_with_specified_key_does_not_exist() { QProfileDto profile = createProfile(db.getDefaultOrganization(), true); expectedException.expect(IllegalArgumentException.class); @@ -227,7 +227,7 @@ public class ExportActionTest { } @Test - public void return_backup_when_exporter_is_not_specified() throws Exception { + public void return_backup_when_exporter_is_not_specified() { OrganizationDto organization = db.getDefaultOrganization(); QProfileDto profile = createProfile(organization, false); diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ExportersActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ExportersActionTest.java index 8a399448913..1b500eb42e1 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ExportersActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ExportersActionTest.java @@ -31,7 +31,7 @@ public class ExportersActionTest { private WsActionTester ws = new WsActionTester(new ExportersAction(createExporters())); @Test - public void importers_nominal() throws Exception { + public void importers_nominal() { String result = ws.newRequest().execute().getInput(); assertJson(result).isSimilarTo(ws.getDef().responseExampleAsString()); diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ImportersActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ImportersActionTest.java index 258f1c8287b..d5c65a4bf0e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ImportersActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ImportersActionTest.java @@ -33,7 +33,7 @@ public class ImportersActionTest { private WsActionTester ws = new WsActionTester(new ImportersAction(createImporters())); @Test - public void json_example() throws Exception { + public void json_example() { String result = ws.newRequest().execute().getInput(); assertJson(result).isSimilarTo(ws.getDef().responseExampleAsString()); diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/InheritanceActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/InheritanceActionTest.java index 7cce05984b7..2b54197918d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/InheritanceActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/InheritanceActionTest.java @@ -110,7 +110,7 @@ public class InheritanceActionTest { } @Test - public void inheritance_nominal() throws Exception { + public void inheritance_nominal() { RuleDefinitionDto rule1 = createRule("xoo", "rule1"); RuleDefinitionDto rule2 = createRule("xoo", "rule2"); RuleDefinitionDto rule3 = createRule("xoo", "rule3"); @@ -209,7 +209,7 @@ public class InheritanceActionTest { } @Test - public void inheritance_no_family() throws Exception { + public void inheritance_no_family() { // Simple profile, no parent, no child QProfileDto remi = createProfile("xoo", "Nobodys Boy", "xoo-nobody-s-boy-01234"); @@ -223,7 +223,7 @@ public class InheritanceActionTest { } @Test(expected = NotFoundException.class) - public void fail_if_not_found() throws Exception { + public void fail_if_not_found() { ws.newRequest() .setMethod("GET").setParam(PARAM_KEY, "polop").execute(); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest.java index 37814b5deb8..89d2392a006 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsMediumTest.java @@ -107,7 +107,7 @@ public class QProfilesWsMediumTest { } @Test - public void deactivate_rule() throws Exception { + public void deactivate_rule() { QProfileDto profile = createProfile("java"); RuleDefinitionDto rule = createRule(profile.getLanguage(), "toto"); createActiveRule(rule, profile); @@ -129,7 +129,7 @@ public class QProfilesWsMediumTest { } @Test - public void bulk_deactivate_rule() throws Exception { + public void bulk_deactivate_rule() { QProfileDto profile = createProfile("java"); RuleDefinitionDto rule0 = createRule(profile.getLanguage(), "toto1"); RuleDefinitionDto rule1 = createRule(profile.getLanguage(), "toto2"); @@ -156,7 +156,7 @@ public class QProfilesWsMediumTest { } @Test - public void bulk_deactivate_rule_not_all() throws Exception { + public void bulk_deactivate_rule_not_all() { QProfileDto profile = createProfile("java"); QProfileDto php = createProfile("php"); RuleDefinitionDto rule0 = createRule(profile.getLanguage(), "toto1"); @@ -183,7 +183,7 @@ public class QProfilesWsMediumTest { } @Test - public void bulk_deactivate_rule_by_profile() throws Exception { + public void bulk_deactivate_rule_by_profile() { QProfileDto profile = createProfile("java"); RuleDefinitionDto rule0 = createRule(profile.getLanguage(), "hello"); RuleDefinitionDto rule1 = createRule(profile.getLanguage(), "world"); @@ -207,7 +207,7 @@ public class QProfilesWsMediumTest { } @Test - public void activate_rule() throws Exception { + public void activate_rule() { QProfileDto profile = createProfile("java"); RuleDefinitionDto rule = createRule(profile.getLanguage(), "toto"); ruleIndexer.commitAndIndex(dbSession, rule.getKey()); @@ -227,7 +227,7 @@ public class QProfilesWsMediumTest { } @Test - public void activate_rule_diff_languages() throws Exception { + public void activate_rule_diff_languages() { QProfileDto profile = createProfile("java"); RuleDefinitionDto rule = createRule("php", "toto"); ruleIndexer.commitAndIndex(dbSession, rule.getKey()); @@ -249,7 +249,7 @@ public class QProfilesWsMediumTest { } @Test - public void activate_rule_override_severity() throws Exception { + public void activate_rule_override_severity() { QProfileDto profile = createProfile("java"); RuleDefinitionDto rule = createRule(profile.getLanguage(), "toto"); ruleIndexer.commitAndIndex(dbSession, rule.getKey()); @@ -323,7 +323,7 @@ public class QProfilesWsMediumTest { } @Test - public void bulk_activate_rule_by_query() throws Exception { + public void bulk_activate_rule_by_query() { QProfileDto profile = createProfile("java"); createRule(profile.getLanguage(), "toto"); createRule(profile.getLanguage(), "tata"); @@ -356,7 +356,7 @@ public class QProfilesWsMediumTest { } @Test - public void bulk_activate_rule_by_query_with_severity() throws Exception { + public void bulk_activate_rule_by_query_with_severity() { QProfileDto profile = createProfile("java"); RuleDefinitionDto rule0 = createRule(profile.getLanguage(), "toto"); RuleDefinitionDto rule1 = createRule(profile.getLanguage(), "tata"); @@ -410,7 +410,7 @@ public class QProfilesWsMediumTest { } @Test - public void reset() throws Exception { + public void reset() { QProfileDto profile = QProfileTesting.newXooP1(organization); QProfileDto subProfile = QProfileTesting.newXooP2(organization).setParentKee(QProfileTesting.XOO_P1_KEY); dbClient.qualityProfileDao().insert(dbSession, profile, subProfile); diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RemoveProjectActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RemoveProjectActionTest.java index a6115fc2546..8c79006e3c2 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RemoveProjectActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RemoveProjectActionTest.java @@ -125,7 +125,7 @@ public class RemoveProjectActionTest { } @Test - public void project_administrator_can_remove_profile() throws Exception { + public void project_administrator_can_remove_profile() { ComponentDto project = db.components().insertPrivateProject(db.getDefaultOrganization()); QProfileDto profile = db.qualityProfiles().insert(db.getDefaultOrganization()); db.qualityProfiles().associateWithProject(project, profile); @@ -221,7 +221,7 @@ public class RemoveProjectActionTest { } @Test - public void fail_when_using_branch_uuid() throws Exception { + public void fail_when_using_branch_uuid() { OrganizationDto organization = db.organizations().insert(); ComponentDto project = db.components().insertMainBranch(organization); userSession.logIn().addProjectPermission(UserRole.ADMIN, project); diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RenameActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RenameActionTest.java index f6841603eca..2e58aab4b04 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RenameActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RenameActionTest.java @@ -150,7 +150,7 @@ public class RenameActionTest { } @Test - public void fail_if_parameter_profile_is_missing() throws Exception { + public void fail_if_parameter_profile_is_missing() { logInAsQProfileAdministrator(); expectedException.expect(IllegalArgumentException.class); @@ -160,7 +160,7 @@ public class RenameActionTest { } @Test - public void fail_if_parameter_name_is_missing() throws Exception { + public void fail_if_parameter_name_is_missing() { logInAsQProfileAdministrator(); expectedException.expect(IllegalArgumentException.class); @@ -170,7 +170,7 @@ public class RenameActionTest { } @Test - public void fail_if_not_profile_administrator() throws Exception { + public void fail_if_not_profile_administrator() { OrganizationDto organizationX = db.organizations().insert(); OrganizationDto organizationY = db.organizations().insert(); userSession.logIn(db.users().insertUser()) @@ -188,7 +188,7 @@ public class RenameActionTest { } @Test - public void fail_if_not_logged_in() throws Exception { + public void fail_if_not_logged_in() { expectedException.expect(UnauthorizedException.class); expectedException.expectMessage("Authentication is required"); @@ -196,7 +196,7 @@ public class RenameActionTest { } @Test - public void fail_if_profile_does_not_exist() throws Exception { + public void fail_if_profile_does_not_exist() { logInAsQProfileAdministrator(); expectedException.expect(NotFoundException.class); diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RestoreActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RestoreActionTest.java index 70d016e17ad..59568bdfe18 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RestoreActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RestoreActionTest.java @@ -88,7 +88,7 @@ public class RestoreActionTest { } @Test - public void profile_is_restored_on_default_organization_with_the_name_provided_in_backup() throws Exception { + public void profile_is_restored_on_default_organization_with_the_name_provided_in_backup() { logInAsQProfileAdministrator(db.getDefaultOrganization()); TestResponse response = restore("", null); @@ -109,7 +109,7 @@ public class RestoreActionTest { } @Test - public void profile_is_restored_on_specified_organization_with_the_name_provided_in_backup() throws Exception { + public void profile_is_restored_on_specified_organization_with_the_name_provided_in_backup() { OrganizationDto org = db.organizations().insert(); logInAsQProfileAdministrator(org); TestResponse response = restore("", org.getKey()); @@ -132,7 +132,7 @@ public class RestoreActionTest { } @Test - public void throw_IAE_if_backup_is_missing() throws Exception { + public void throw_IAE_if_backup_is_missing() { logInAsQProfileAdministrator(db.getDefaultOrganization()); expectedException.expect(IllegalArgumentException.class); @@ -144,7 +144,7 @@ public class RestoreActionTest { } @Test - public void throw_ForbiddenException_if_not_profile_administrator_of_default_organization() throws Exception { + public void throw_ForbiddenException_if_not_profile_administrator_of_default_organization() { userSession.logIn(); expectedException.expect(ForbiddenException.class); @@ -154,7 +154,7 @@ public class RestoreActionTest { } @Test - public void throw_ForbiddenException_if_not_profile_administrator_of_specified_organization() throws Exception { + public void throw_ForbiddenException_if_not_profile_administrator_of_specified_organization() { OrganizationDto org = db.organizations().insert(); logInAsQProfileAdministrator(db.getDefaultOrganization()); @@ -165,7 +165,7 @@ public class RestoreActionTest { } @Test - public void throw_NotFoundException_if_specified_organization_does_not_exist() throws Exception { + public void throw_NotFoundException_if_specified_organization_does_not_exist() { userSession.logIn(); expectedException.expect(NotFoundException.class); @@ -175,7 +175,7 @@ public class RestoreActionTest { } @Test - public void throw_UnauthorizedException_if_not_logged_in() throws Exception { + public void throw_UnauthorizedException_if_not_logged_in() { userSession.anonymous(); expectedException.expect(UnauthorizedException.class); diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SetDefaultActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SetDefaultActionTest.java index ca2ae43f3e9..913e54d5cd3 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SetDefaultActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SetDefaultActionTest.java @@ -115,7 +115,7 @@ public class SetDefaultActionTest { } @Test - public void set_default_profile_using_key() throws Exception { + public void set_default_profile_using_key() { logInAsQProfileAdministrator(); checkDefaultProfile(organization, XOO_1_KEY, xoo1Profile.getKee()); @@ -141,7 +141,7 @@ public class SetDefaultActionTest { } @Test - public void set_default_profile_using_language_and_name() throws Exception { + public void set_default_profile_using_language_and_name() { logInAsQProfileAdministrator(); checkDefaultProfile(organization, XOO_1_KEY, xoo1Profile.getKee()); @@ -160,7 +160,7 @@ public class SetDefaultActionTest { } @Test - public void should_not_change_other_organizations() throws Exception { + public void should_not_change_other_organizations() { OrganizationDto organization1 = db.organizations().insert(); OrganizationDto organization2 = db.organizations().insert(); @@ -197,7 +197,7 @@ public class SetDefaultActionTest { } @Test - public void fail_to_set_default_profile_using_invalid_key() throws Exception { + public void fail_to_set_default_profile_using_invalid_key() { logInAsQProfileAdministrator(); expectedException.expect(NotFoundException.class); @@ -212,7 +212,7 @@ public class SetDefaultActionTest { } @Test - public void fail_to_set_default_profile_using_language_and_invalid_name() throws Exception { + public void fail_to_set_default_profile_using_language_and_invalid_name() { logInAsQProfileAdministrator(); try { @@ -229,7 +229,7 @@ public class SetDefaultActionTest { } @Test - public void fail_if_parameter_profile_key_is_combined_with_parameter_organization() throws Exception { + public void fail_if_parameter_profile_key_is_combined_with_parameter_organization() { userSessionRule.logIn(); expectedException.expect(IllegalArgumentException.class); @@ -242,7 +242,7 @@ public class SetDefaultActionTest { } @Test - public void throw_ForbiddenException_if_not_profile_administrator() throws Exception { + public void throw_ForbiddenException_if_not_profile_administrator() { userSessionRule.logIn(); expectedException.expect(ForbiddenException.class); @@ -254,7 +254,7 @@ public class SetDefaultActionTest { } @Test - public void throw_UnauthorizedException_if_not_logged_in() throws Exception { + public void throw_UnauthorizedException_if_not_logged_in() { expectedException.expect(UnauthorizedException.class); expectedException.expectMessage("Authentication is required"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/root/ws/RootsWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/root/ws/RootsWsTest.java index 13437036921..0a8fef6517a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/root/ws/RootsWsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/root/ws/RootsWsTest.java @@ -46,7 +46,7 @@ public class RootsWsTest { } @Override - public void handle(Request request, Response response) throws Exception { + public void handle(Request request, Response response) { } } diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/CommonRuleKeysTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/CommonRuleKeysTest.java index 8f7cc54c694..45ab75f9e49 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/CommonRuleKeysTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/CommonRuleKeysTest.java @@ -27,12 +27,12 @@ import static org.assertj.core.api.Assertions.assertThat; public class CommonRuleKeysTest { @Test - public void wonderful_test_for_commonRepositoryForLang() throws Exception { + public void wonderful_test_for_commonRepositoryForLang() { assertThat(CommonRuleKeys.commonRepositoryForLang("java")).isEqualTo("common-java"); } @Test - public void wonderful_test_to_verify_that_this_class_is_an_helper_class() throws Exception { + public void wonderful_test_to_verify_that_this_class_is_an_helper_class() { assertThat(TestUtils.hasOnlyPrivateConstructors(CommonRuleKeys.class)).isTrue(); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesTest.java index 0906f576e65..227359fccc2 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesTest.java @@ -328,7 +328,7 @@ public class RegisterRulesTest { } @Test - public void update_only_rule_name() throws Exception { + public void update_only_rule_name() { when(system.now()).thenReturn(DATE1.getTime()); execute(new RulesDefinition() { @Override @@ -363,7 +363,7 @@ public class RegisterRulesTest { } @Test - public void update_only_rule_description() throws Exception { + public void update_only_rule_description() { when(system.now()).thenReturn(DATE1.getTime()); execute(new RulesDefinition() { @Override @@ -398,7 +398,7 @@ public class RegisterRulesTest { } @Test - public void disable_then_enable_rule() throws Exception { + public void disable_then_enable_rule() { // Install rule when(system.now()).thenReturn(DATE1.getTime()); execute(new FakeRepositoryV1()); diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/RuleCreatorTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/RuleCreatorTest.java index 5af8bfc7688..2bcefe974c5 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/RuleCreatorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/RuleCreatorTest.java @@ -445,7 +445,7 @@ public class RuleCreatorTest { } @Test - public void fail_to_create_custom_rule_when_unknown_template() throws Exception { + public void fail_to_create_custom_rule_when_unknown_template() { expectedException.expect(IllegalArgumentException.class); expectedException.expectMessage("The template key doesn't exist: java:S001"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/RuleDefinitionsLoaderTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/RuleDefinitionsLoaderTest.java index 0015f03aae5..33629ded98c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/RuleDefinitionsLoaderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/RuleDefinitionsLoaderTest.java @@ -50,7 +50,7 @@ public class RuleDefinitionsLoaderTest { } @Test - public void define_common_rules() throws Exception { + public void define_common_rules() { CommonRuleDefinitions commonRulesDefinitions = new FakeCommonRuleDefinitions(); RulesDefinition.Context context = new RuleDefinitionsLoader(mock(DeprecatedRulesDefinitionLoader.class), commonRulesDefinitions, mock(ServerPluginRepository.class), new RulesDefinition[] { @@ -66,7 +66,7 @@ public class RuleDefinitionsLoaderTest { * is taken into account. Others are ignored. */ @Test - public void plugin_common_rules_are_overridden() throws Exception { + public void plugin_common_rules_are_overridden() { CommonRuleDefinitions commonRulesDefinitions = new FakeCommonRuleDefinitions(); RulesDefinition.Context context = new RuleDefinitionsLoader(mock(DeprecatedRulesDefinitionLoader.class), commonRulesDefinitions, mock(ServerPluginRepository.class), new RulesDefinition[] { diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/RuleTagHelperTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/RuleTagHelperTest.java index 92841bf99c7..d628f00e6dd 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/RuleTagHelperTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/RuleTagHelperTest.java @@ -41,7 +41,7 @@ public class RuleTagHelperTest { @Test public void applyTags_remove_all_existing_tags() { RuleDto rule = new RuleDto().setTags(Sets.newHashSet("performance")); - boolean changed = RuleTagHelper.applyTags(rule, Collections.emptySet()); + boolean changed = RuleTagHelper.applyTags(rule, Collections.emptySet()); assertThat(rule.getTags()).isEmpty(); assertThat(changed).isTrue(); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexDefinitionTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexDefinitionTest.java index 5e3e26872cc..4dd78a7c880 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexDefinitionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/index/RuleIndexDefinitionTest.java @@ -73,7 +73,7 @@ public class RuleIndexDefinitionTest { } @Test - public void support_long_html_description() throws Exception { + public void support_long_html_description() { String longText = StringUtils.repeat("The quick brown fox jumps over the lazy dog ", 700); List tokens = analyzeIndexedTokens(longText); diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/CreateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/CreateActionTest.java index e214f952f16..28f34459613 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/CreateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/CreateActionTest.java @@ -205,7 +205,7 @@ public class CreateActionTest { } @Test - public void throw_ForbiddenException_if_not_profile_administrator() throws Exception { + public void throw_ForbiddenException_if_not_profile_administrator() { userSession.logIn(); expectedException.expect(ForbiddenException.class); @@ -214,7 +214,7 @@ public class CreateActionTest { } @Test - public void throw_UnauthorizedException_if_not_logged_in() throws Exception { + public void throw_UnauthorizedException_if_not_logged_in() { expectedException.expect(UnauthorizedException.class); ws.newRequest().execute(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/DeleteActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/DeleteActionTest.java index 6161f40e043..a321e46ce3c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/DeleteActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/DeleteActionTest.java @@ -70,7 +70,7 @@ public class DeleteActionTest { private WsActionTester tester = new WsActionTester(underTest); @Test - public void delete_custom_rule() throws Exception { + public void delete_custom_rule() { logInAsQProfileAdministrator(); RuleDefinitionDto templateRule = dbTester.rules().insert( @@ -97,7 +97,7 @@ public class DeleteActionTest { } @Test - public void throw_ForbiddenException_if_not_profile_administrator() throws Exception { + public void throw_ForbiddenException_if_not_profile_administrator() { userSession.logIn(); thrown.expect(ForbiddenException.class); @@ -109,7 +109,7 @@ public class DeleteActionTest { } @Test - public void throw_UnauthorizedException_if_not_logged_in() throws Exception { + public void throw_UnauthorizedException_if_not_logged_in() { thrown.expect(UnauthorizedException.class); tester.newRequest() diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/ListActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/ListActionTest.java index bf2746834b7..3ff2c7213d5 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/ListActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/ListActionTest.java @@ -41,13 +41,13 @@ public class ListActionTest { WsActionTester tester = new WsActionTester(underTest); @Test - public void define() throws Exception { + public void define() { WebService.Action def = tester.getDef(); assertThat(def.params()).isEmpty(); } @Test - public void return_rules_in_protobuf() throws Exception { + public void return_rules_in_protobuf() { dbTester.rules().insert(RuleTesting.newRule(RuleKey.of("java", "S001")).setConfigKey(null).setName(null)); dbTester.rules().insert(RuleTesting.newRule(RuleKey.of("java", "S002")).setConfigKey("I002").setName("Rule Two")); dbTester.getSession().commit(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/RuleQueryFactoryTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/RuleQueryFactoryTest.java index 411bd651510..ea3c0761a6f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/RuleQueryFactoryTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/RuleQueryFactoryTest.java @@ -89,7 +89,7 @@ public class RuleQueryFactoryTest { } @Test - public void create_empty_query() throws Exception { + public void create_empty_query() { RuleQuery result = execute(); assertThat(result.getKey()).isNull(); @@ -115,7 +115,7 @@ public class RuleQueryFactoryTest { } @Test - public void create_query() throws Exception { + public void create_query() { QProfileDto qualityProfile = dbTester.qualityProfiles().insert(organization); QProfileDto compareToQualityProfile = dbTester.qualityProfiles().insert(organization); @@ -167,7 +167,7 @@ public class RuleQueryFactoryTest { } @Test - public void use_quality_profiles_language_if_available() throws Exception { + public void use_quality_profiles_language_if_available() { QProfileDto qualityProfile = dbTester.qualityProfiles().insert(organization); String qualityProfileKey = qualityProfile.getKee(); @@ -180,7 +180,7 @@ public class RuleQueryFactoryTest { } @Test - public void use_specified_languages_if_no_quality_profile_available() throws Exception { + public void use_specified_languages_if_no_quality_profile_available() { RuleQuery result = execute( PARAM_LANGUAGES, "specifiedLanguage"); @@ -188,7 +188,7 @@ public class RuleQueryFactoryTest { } @Test - public void create_query_add_language_from_profile() throws Exception { + public void create_query_add_language_from_profile() { QProfileDto profile = dbTester.qualityProfiles().insert(organization, p -> p.setName("Sonar way").setLanguage("xoo").setKee("sonar-way")); RuleQuery result = execute( @@ -200,7 +200,7 @@ public class RuleQueryFactoryTest { } @Test - public void filter_on_quality_profiles_organization_if_searching_for_actives_with_no_organization_specified() throws Exception { + public void filter_on_quality_profiles_organization_if_searching_for_actives_with_no_organization_specified() { QProfileDto profile = dbTester.qualityProfiles().insert(organization, p -> p.setName("Sonar way").setLanguage("xoo").setKee("sonar-way")); RuleQuery result = execute( @@ -222,7 +222,7 @@ public class RuleQueryFactoryTest { } @Test - public void fail_if_organization_and_quality_profile_are_contradictory() throws Exception { + public void fail_if_organization_and_quality_profile_are_contradictory() { OrganizationDto organization1 = dbTester.organizations().insert(); OrganizationDto organization2 = dbTester.organizations().insert(); @@ -239,7 +239,7 @@ public class RuleQueryFactoryTest { } @Test - public void fail_if_organization_and_compare_to_quality_profile_are_contradictory() throws Exception { + public void fail_if_organization_and_compare_to_quality_profile_are_contradictory() { OrganizationDto organization = dbTester.organizations().insert(); QProfileDto qualityProfile = dbTester.qualityProfiles().insert(organization); @@ -312,7 +312,7 @@ public class RuleQueryFactoryTest { } @Override - public void handle(Request request, Response response) throws Exception { + public void handle(Request request, Response response) { ruleQuery = ruleQueryFactory.createRuleQuery(dbTester.getSession(), request); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/SearchActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/SearchActionTest.java index cb85b9e2bb6..3a500e1bd5e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/SearchActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/SearchActionTest.java @@ -200,7 +200,7 @@ public class SearchActionTest { RuleDefinitionDto rule2 = db.rules().insert(r1 -> r1.setName("Some other stuff")); indexRules(); - verify(r -> r.setParam("q", "Best other"), new RuleDefinitionDto[0]); + verify(r -> r.setParam("q", "Best other")); verify(r -> r.setParam("q", "Best rule"), rule1); verify(r -> r.setParam("q", "rule ever"), rule1); } @@ -222,7 +222,7 @@ public class SearchActionTest { indexRules(); verify(r -> r.setParam("q", "Best "), rule1); - verify(r -> r.setParam("q", "bold"), new RuleDefinitionDto[0]); + verify(r -> r.setParam("q", "bold")); verify(r -> r.setParam("q", "now&forever"), rule1); } @@ -233,7 +233,7 @@ public class SearchActionTest { indexRules(); verify(r -> r.setParam("q", "Best good"), rule1); - verify(r -> r.setParam("q", "Best Another"), new RuleDefinitionDto[0]); + verify(r -> r.setParam("q", "Best Another")); } @Test @@ -284,7 +284,7 @@ public class SearchActionTest { } @Test - public void should_filter_on_organization_specific_tags() throws IOException { + public void should_filter_on_organization_specific_tags() { OrganizationDto organization = db.organizations().insert(); RuleDefinitionDto rule1 = createJavaRule(); RuleMetadataDto metadata1 = insertMetadata(organization, rule1, setTags("tag1", "tag2")); @@ -300,7 +300,7 @@ public class SearchActionTest { } @Test - public void when_searching_for_several_tags_combine_them_with_OR() throws IOException { + public void when_searching_for_several_tags_combine_them_with_OR() { OrganizationDto organization = db.organizations().insert(); RuleDefinitionDto bothTagsRule = createJavaRule(); insertMetadata(organization, bothTagsRule, setTags("tag1", "tag2")); @@ -320,7 +320,7 @@ public class SearchActionTest { } @Test - public void should_list_tags_in_tags_facet() throws IOException { + public void should_list_tags_in_tags_facet() { OrganizationDto organization = db.organizations().insert(); RuleDefinitionDto rule = db.rules().insert(setSystemTags("tag1", "tag3", "tag5", "tag7", "tag9", "x")); RuleMetadataDto metadata = insertMetadata(organization, rule, setTags("tag2", "tag4", "tag6", "tag8", "tagA")); @@ -336,7 +336,7 @@ public class SearchActionTest { } @Test - public void should_list_tags_ordered_by_count_then_by_name_in_tags_facet() throws IOException { + public void should_list_tags_ordered_by_count_then_by_name_in_tags_facet() { OrganizationDto organization = db.organizations().insert(); RuleDefinitionDto rule = db.rules().insert(setSystemTags("tag7", "tag5", "tag3", "tag1", "tag9", "x")); RuleMetadataDto metadata = insertMetadata(organization, rule, setTags("tag2", "tag4", "tag6", "tag8", "tagA")); @@ -353,7 +353,7 @@ public class SearchActionTest { } @Test - public void should_include_selected_matching_tag_in_facet() throws IOException { + public void should_include_selected_matching_tag_in_facet() { RuleDefinitionDto rule = db.rules().insert(setSystemTags("tag1", "tag2", "tag3", "tag4", "tag5", "tag6", "tag7", "tag8", "tag9", "tagA", "x")); indexRules(); @@ -365,7 +365,7 @@ public class SearchActionTest { } @Test - public void should_included_selected_non_matching_tag_in_facet() throws IOException { + public void should_included_selected_non_matching_tag_in_facet() { RuleDefinitionDto rule = db.rules().insert(setSystemTags("tag1", "tag2", "tag3", "tag4", "tag5", "tag6", "tag7", "tag8", "tag9", "tagA")); indexRules(); @@ -377,7 +377,7 @@ public class SearchActionTest { } @Test - public void should_return_organization_specific_tags() throws IOException { + public void should_return_organization_specific_tags() { OrganizationDto organization = db.organizations().insert(); RuleDefinitionDto rule = createJavaRule(); RuleMetadataDto metadata = insertMetadata(organization, rule, setTags("tag1", "tag2")); @@ -394,7 +394,7 @@ public class SearchActionTest { } @Test - public void should_not_return_tags_of_foreign_organization() throws IOException { + public void should_not_return_tags_of_foreign_organization() { OrganizationDto organizationWithSpecificTags = db.organizations().insert(); OrganizationDto myOrganization = db.organizations().insert(); RuleDefinitionDto rule = db.rules().insert(setSystemTags("system1", "system2")); @@ -437,7 +437,7 @@ public class SearchActionTest { } @Test - public void return_lang_key_field_when_language_name_is_not_available() throws Exception { + public void return_lang_key_field_when_language_name_is_not_available() { OrganizationDto organization = db.organizations().insert(); String unknownLanguage = "unknown_" + randomAlphanumeric(5); RuleDefinitionDto rule = db.rules().insert(r -> r.setLanguage(unknownLanguage)); @@ -457,7 +457,7 @@ public class SearchActionTest { } @Test - public void search_debt_rules_with_default_and_overridden_debt_values() throws Exception { + public void search_debt_rules_with_default_and_overridden_debt_values() { RuleDefinitionDto rule = db.rules().insert(r -> r.setLanguage("java") .setDefRemediationFunction(DebtRemediationFunction.Type.LINEAR_OFFSET.name()) @@ -492,7 +492,7 @@ public class SearchActionTest { } @Test - public void search_debt_rules_with_default_linear_offset_and_overridden_constant_debt() throws Exception { + public void search_debt_rules_with_default_linear_offset_and_overridden_constant_debt() { RuleDefinitionDto rule = db.rules().insert(r -> r.setLanguage("java") .setDefRemediationFunction(DebtRemediationFunction.Type.LINEAR_OFFSET.name()) @@ -522,13 +522,12 @@ public class SearchActionTest { assertThat(searchedRule.getDefaultRemFnType()).isEqualTo(DebtRemediationFunction.Type.LINEAR_OFFSET.name()); assertThat(searchedRule.getDebtOverloaded()).isTrue(); assertThat(searchedRule.getDebtRemFnCoeff()).isEmpty(); - ; assertThat(searchedRule.getDebtRemFnOffset()).isEqualTo("5min"); assertThat(searchedRule.getDebtRemFnType()).isEqualTo(DebtRemediationFunction.Type.CONSTANT_ISSUE.name()); } @Test - public void search_debt_rules_with_default_linear_offset_and_overridden_linear_debt() throws Exception { + public void search_debt_rules_with_default_linear_offset_and_overridden_linear_debt() { RuleDefinitionDto rule = db.rules().insert(r -> r.setLanguage("java") .setDefRemediationFunction(DebtRemediationFunction.Type.LINEAR_OFFSET.name()) @@ -563,7 +562,7 @@ public class SearchActionTest { } @Test - public void search_template_rules() throws Exception { + public void search_template_rules() { RuleDefinitionDto templateRule = db.rules().insert(r -> r.setLanguage("java") .setIsTemplate(true)); @@ -587,7 +586,7 @@ public class SearchActionTest { } @Test - public void search_custom_rules_from_template_key() throws Exception { + public void search_custom_rules_from_template_key() { RuleDefinitionDto templateRule = db.rules().insert(r -> r.setLanguage("java") .setIsTemplate(true)); @@ -611,7 +610,7 @@ public class SearchActionTest { } @Test - public void search_all_active_rules() throws Exception { + public void search_all_active_rules() { OrganizationDto organization = db.organizations().insert(); QProfileDto profile = db.qualityProfiles().insert(organization, p -> p.setLanguage("java")); RuleDefinitionDto rule = createJavaRule(); @@ -636,7 +635,7 @@ public class SearchActionTest { } @Test - public void search_profile_active_rules() throws Exception { + public void search_profile_active_rules() { OrganizationDto organization = db.organizations().insert(); QProfileDto profile = db.qualityProfiles().insert(organization, p -> p.setLanguage("java")); QProfileDto waterproofProfile = db.qualityProfiles().insert(organization, p -> p.setLanguage("java")); @@ -863,7 +862,7 @@ public class SearchActionTest { } @Test - public void statuses_facet_should_be_sticky() throws Exception { + public void statuses_facet_should_be_sticky() { RuleDefinitionDto rule1 = db.rules().insert(r -> r.setLanguage("java")); RuleDefinitionDto rule2 = db.rules().insert(r -> r.setLanguage("java").setStatus(RuleStatus.BETA)); RuleDefinitionDto rule3 = db.rules().insert(r -> r.setLanguage("java").setStatus(RuleStatus.DEPRECATED)); @@ -884,7 +883,7 @@ public class SearchActionTest { } @Test - public void compare_to_another_profile() throws Exception { + public void compare_to_another_profile() { OrganizationDto organization = db.organizations().insert(); QProfileDto profile = db.qualityProfiles().insert(organization, p -> p.setLanguage(JAVA)); QProfileDto anotherProfile = db.qualityProfiles().insert(organization, p -> p.setLanguage(JAVA)); @@ -917,7 +916,7 @@ public class SearchActionTest { } @SafeVarargs - private final void checkField(RuleDefinitionDto rule, String fieldName, Extractor responseExtractor, T... expected) throws IOException { + private final void checkField(RuleDefinitionDto rule, String fieldName, Extractor responseExtractor, T... expected) { SearchResponse result = ws.newRequest() .setParam("f", fieldName) .executeProtobuf(SearchResponse.class); diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/ShowActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/ShowActionTest.java index b9bfd69f8e0..5b3eccdd29a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/ShowActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/ShowActionTest.java @@ -115,7 +115,7 @@ public class ShowActionTest { } @Test - public void should_show_rule_key() throws IOException { + public void should_show_rule_key() { RuleDefinitionDto rule = insertRule(); Rules.ShowResponse result = actionTester.newRequest() @@ -125,7 +125,7 @@ public class ShowActionTest { } @Test - public void should_show_rule_tags_in_default_organization() throws IOException { + public void should_show_rule_tags_in_default_organization() { RuleDefinitionDto rule = insertRule(); RuleMetadataDto metadata = insertMetadata(dbTester.getDefaultOrganization(), rule, setTags("tag1", "tag2")); @@ -137,7 +137,7 @@ public class ShowActionTest { } @Test - public void should_show_rule_tags_in_specific_organization() throws IOException { + public void should_show_rule_tags_in_specific_organization() { RuleDefinitionDto rule = insertRule(); OrganizationDto organization = dbTester.organizations().insert(); RuleMetadataDto metadata = insertMetadata(organization, rule, setTags("tag1", "tag2")); @@ -151,7 +151,7 @@ public class ShowActionTest { } @Test - public void show_rule_with_activation() throws Exception { + public void show_rule_with_activation() { OrganizationDto organization = dbTester.organizations().insert(); QProfileDto profile = QProfileTesting.newXooP1(organization); @@ -194,7 +194,7 @@ public class ShowActionTest { } @Test - public void show_rule_without_activation() throws Exception { + public void show_rule_without_activation() { OrganizationDto organization = dbTester.organizations().insert(); QProfileDto profile = QProfileTesting.newXooP1(organization); @@ -223,7 +223,7 @@ public class ShowActionTest { } @Test - public void throw_NotFoundException_if_organization_cannot_be_found() throws Exception { + public void throw_NotFoundException_if_organization_cannot_be_found() { RuleDefinitionDto rule = dbTester.rules().insert(); thrown.expect(NotFoundException.class); @@ -369,7 +369,7 @@ public class ShowActionTest { } @Test - public void encode_html_description_of_custom_rule() throws Exception { + public void encode_html_description_of_custom_rule() { // Template rule RuleDto templateRule = RuleTesting.newTemplateRule(RuleKey.of("java", "S001")); RuleDao ruleDao = dbClient.ruleDao(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/TagsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/TagsActionTest.java index 12964955b3a..8087bd2a600 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/TagsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/TagsActionTest.java @@ -98,7 +98,7 @@ public class TagsActionTest { } @Test - public void system_tag() throws Exception { + public void system_tag() { RuleDefinitionDto r = db.rules().insert(setSystemTags("tag")); ruleIndexer.commitAndIndex(db.getSession(), r.getKey()); @@ -107,7 +107,7 @@ public class TagsActionTest { } @Test - public void tag() throws Exception { + public void tag() { RuleDefinitionDto r = db.rules().insert(setSystemTags()); ruleIndexer.commitAndIndex(db.getSession(), r.getKey()); db.rules().insertOrUpdateMetadata(r, organization, setTags("tag")); diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/UpdateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/UpdateActionTest.java index d3d9e998245..b9a98e16b2d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/rule/ws/UpdateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/rule/ws/UpdateActionTest.java @@ -102,7 +102,7 @@ public class UpdateActionTest { private WsActionTester ws = new WsActionTester(underTest); @Test - public void update_custom_rule() throws Exception { + public void update_custom_rule() { logInAsQProfileAdministrator(); RuleDefinitionDto templateRule = db.rules().insert( r -> r.setRuleKey(RuleKey.of("java", "S001")), @@ -153,7 +153,7 @@ public class UpdateActionTest { } @Test - public void update_tags_for_default_organization() throws IOException { + public void update_tags_for_default_organization() { logInAsQProfileAdministrator(); RuleDefinitionDto rule = db.rules().insert(setSystemTags("stag1", "stag2")); @@ -173,7 +173,7 @@ public class UpdateActionTest { } @Test - public void update_tags_for_specific_organization() throws IOException { + public void update_tags_for_specific_organization() { OrganizationDto organization = db.organizations().insert(); logInAsQProfileAdministrator(organization.getUuid()); @@ -201,7 +201,7 @@ public class UpdateActionTest { } @Test - public void update_rule_remediation_function() throws IOException { + public void update_rule_remediation_function() { OrganizationDto organization = db.organizations().insert(); logInAsQProfileAdministrator(organization.getUuid()); @@ -244,7 +244,7 @@ public class UpdateActionTest { } @Test - public void update_custom_rule_with_deprecated_remediation_function_parameters() throws Exception { + public void update_custom_rule_with_deprecated_remediation_function_parameters() { logInAsQProfileAdministrator(); RuleDefinitionDto rule = RuleTesting.newRule() @@ -310,7 +310,7 @@ public class UpdateActionTest { } @Test - public void throw_IllegalArgumentException_if_trying_to_update_builtin_rule_description() throws Exception { + public void throw_IllegalArgumentException_if_trying_to_update_builtin_rule_description() { logInAsQProfileAdministrator(); RuleDefinitionDto rule = db.rules().insert(); @@ -326,7 +326,7 @@ public class UpdateActionTest { } @Test - public void throw_ForbiddenException_if_not_profile_administrator() throws Exception { + public void throw_ForbiddenException_if_not_profile_administrator() { userSession.logIn(); expectedException.expect(ForbiddenException.class); @@ -335,14 +335,14 @@ public class UpdateActionTest { } @Test - public void throw_UnauthorizedException_if_not_logged_in() throws Exception { + public void throw_UnauthorizedException_if_not_logged_in() { expectedException.expect(UnauthorizedException.class); ws.newRequest().setMethod("POST").execute(); } @Test - public void throw_NotFoundException_if_organization_cannot_be_found() throws Exception { + public void throw_NotFoundException_if_organization_cannot_be_found() { logInAsQProfileAdministrator(); RuleDefinitionDto rule = db.rules().insert(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/setting/ws/EncryptActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/setting/ws/EncryptActionTest.java index d840e5d3a7f..1879f886afd 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/setting/ws/EncryptActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/setting/ws/EncryptActionTest.java @@ -94,7 +94,7 @@ public class EncryptActionTest { } @Test - public void throw_ForbiddenException_if_not_system_administrator() throws Exception { + public void throw_ForbiddenException_if_not_system_administrator() { userSession.logIn().setNonSystemAdministrator(); expectedException.expect(ForbiddenException.class); diff --git a/server/sonar-server/src/test/java/org/sonar/server/setting/ws/ListDefinitionsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/setting/ws/ListDefinitionsActionTest.java index 9b152365d85..b297d9612ff 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/setting/ws/ListDefinitionsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/setting/ws/ListDefinitionsActionTest.java @@ -167,7 +167,7 @@ public class ListDefinitionsActionTest { } @Test - public void return_default_category() throws Exception { + public void return_default_category() { logIn(); propertyDefinitions.addComponent(PropertyDefinition.builder("foo").build(), "default"); propertyDefinitions.addComponent(PropertyDefinition.builder("foo").category("").build(), "default"); @@ -180,7 +180,7 @@ public class ListDefinitionsActionTest { } @Test - public void return_single_select_list_property() throws Exception { + public void return_single_select_list_property() { logIn(); propertyDefinitions.addComponent(PropertyDefinition .builder("foo") @@ -197,7 +197,7 @@ public class ListDefinitionsActionTest { } @Test - public void return_property_set() throws Exception { + public void return_property_set() { logIn(); propertyDefinitions.addComponent(PropertyDefinition .builder("foo") @@ -228,7 +228,7 @@ public class ListDefinitionsActionTest { } @Test - public void return_license_type_in_property_set() throws Exception { + public void return_license_type_in_property_set() { logIn(); propertyDefinitions.addComponent(PropertyDefinition .builder("foo") @@ -280,7 +280,7 @@ public class ListDefinitionsActionTest { } @Test - public void return_only_global_properties_when_no_component_parameter() throws Exception { + public void return_only_global_properties_when_no_component_parameter() { logInAsProjectUser(); propertyDefinitions.addComponents(asList( PropertyDefinition.builder("global").build(), @@ -294,7 +294,7 @@ public class ListDefinitionsActionTest { } @Test - public void return_only_properties_available_for_component_qualifier() throws Exception { + public void return_only_properties_available_for_component_qualifier() { logInAsProjectUser(); propertyDefinitions.addComponents(asList( PropertyDefinition.builder("global").build(), @@ -308,7 +308,7 @@ public class ListDefinitionsActionTest { } @Test - public void does_not_return_hidden_properties() throws Exception { + public void does_not_return_hidden_properties() { logInAsAdmin(db.getDefaultOrganization()); propertyDefinitions.addComponent(PropertyDefinition.builder("foo").hidden().build()); @@ -318,7 +318,7 @@ public class ListDefinitionsActionTest { } @Test - public void return_license_type() throws Exception { + public void return_license_type() { logInAsAdmin(db.getDefaultOrganization()); propertyDefinitions.addComponents(asList( PropertyDefinition.builder("plugin.license.secured").type(PropertyType.LICENSE).build(), @@ -331,7 +331,7 @@ public class ListDefinitionsActionTest { } @Test - public void does_not_returned_secured_and_license_settings_when_not_authenticated() throws Exception { + public void does_not_returned_secured_and_license_settings_when_not_authenticated() { propertyDefinitions.addComponents(asList( PropertyDefinition.builder("foo").build(), PropertyDefinition.builder("secret.secured").build(), @@ -344,7 +344,7 @@ public class ListDefinitionsActionTest { } @Test - public void return_license_settings_when_authenticated_but_not_admin() throws Exception { + public void return_license_settings_when_authenticated_but_not_admin() { logInAsProjectUser(); propertyDefinitions.addComponents(asList( PropertyDefinition.builder("foo").build(), @@ -358,7 +358,7 @@ public class ListDefinitionsActionTest { } @Test - public void return_secured_settings_when_not_authenticated_but_with_scan_permission() throws Exception { + public void return_secured_settings_when_not_authenticated_but_with_scan_permission() { userSession.anonymous().addPermission(SCAN, db.getDefaultOrganization()); propertyDefinitions.addComponents(asList( PropertyDefinition.builder("foo").build(), @@ -372,7 +372,7 @@ public class ListDefinitionsActionTest { } @Test - public void return_secured_and_license_settings_when_system_admin() throws Exception { + public void return_secured_and_license_settings_when_system_admin() { logInAsAdmin(db.getDefaultOrganization()); propertyDefinitions.addComponents(asList( PropertyDefinition.builder("foo").build(), @@ -385,7 +385,7 @@ public class ListDefinitionsActionTest { } @Test - public void return_secured_and_license_settings_when_project_admin() throws Exception { + public void return_secured_and_license_settings_when_project_admin() { logInAsProjectAdmin(); propertyDefinitions.addComponents(asList( PropertyDefinition.builder("foo").onQualifiers(PROJECT).build(), @@ -398,7 +398,7 @@ public class ListDefinitionsActionTest { } @Test - public void definitions_on_branch() throws Exception { + public void definitions_on_branch() { ComponentDto project = db.components().insertMainBranch(); userSession.logIn().addProjectPermission(USER, project); ComponentDto branch = db.components().insertProjectBranch(project); @@ -415,7 +415,7 @@ public class ListDefinitionsActionTest { } @Test - public void fail_when_user_has_not_project_browse_permission() throws Exception { + public void fail_when_user_has_not_project_browse_permission() { userSession.logIn("project-admin").addProjectPermission(CODEVIEWER, project); propertyDefinitions.addComponent(PropertyDefinition.builder("foo").build()); diff --git a/server/sonar-server/src/test/java/org/sonar/server/setting/ws/ResetActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/setting/ws/ResetActionTest.java index 75b4d70fbd4..301b2a11e54 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/setting/ws/ResetActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/setting/ws/ResetActionTest.java @@ -93,7 +93,7 @@ public class ResetActionTest { } @Test - public void remove_global_setting() throws Exception { + public void remove_global_setting() { logInAsSystemAdministrator(); definitions.addComponent(PropertyDefinition.builder("foo").build()); propertyDb.insertProperties(newGlobalPropertyDto().setKey("foo").setValue("one")); @@ -103,7 +103,7 @@ public class ResetActionTest { } @Test - public void remove_global_setting_even_if_not_defined() throws Exception { + public void remove_global_setting_even_if_not_defined() { logInAsSystemAdministrator(); propertyDb.insertProperties(newGlobalPropertyDto().setKey("foo").setValue("one")); @@ -112,7 +112,7 @@ public class ResetActionTest { } @Test - public void remove_component_setting() throws Exception { + public void remove_component_setting() { logInAsProjectAdmin(); definitions.addComponent(PropertyDefinition.builder("foo").onQualifiers(PROJECT).build()); propertyDb.insertProperties(newComponentPropertyDto(project).setKey("foo").setValue("value")); @@ -122,7 +122,7 @@ public class ResetActionTest { } @Test - public void remove_component_setting_even_if_not_defined() throws Exception { + public void remove_component_setting_even_if_not_defined() { logInAsProjectAdmin(); propertyDb.insertProperties(newComponentPropertyDto(project).setKey("foo").setValue("value")); @@ -131,7 +131,7 @@ public class ResetActionTest { } @Test - public void remove_hidden_setting() throws Exception { + public void remove_hidden_setting() { logInAsSystemAdministrator(); definitions.addComponent(PropertyDefinition.builder("foo").hidden().build()); propertyDb.insertProperties(newGlobalPropertyDto().setKey("foo").setValue("one")); @@ -141,7 +141,7 @@ public class ResetActionTest { } @Test - public void ignore_project_setting_when_removing_global_setting() throws Exception { + public void ignore_project_setting_when_removing_global_setting() { logInAsSystemAdministrator(); propertyDb.insertProperties(newGlobalPropertyDto().setKey("foo").setValue("one")); propertyDb.insertProperties(newComponentPropertyDto(project).setKey("foo").setValue("value")); @@ -153,7 +153,7 @@ public class ResetActionTest { } @Test - public void ignore_global_setting_when_removing_project_setting() throws Exception { + public void ignore_global_setting_when_removing_project_setting() { logInAsProjectAdmin(); propertyDb.insertProperties(newGlobalPropertyDto().setKey("foo").setValue("one")); propertyDb.insertProperties(newComponentPropertyDto(project).setKey("foo").setValue("value")); @@ -165,7 +165,7 @@ public class ResetActionTest { } @Test - public void ignore_user_setting_when_removing_global_setting() throws Exception { + public void ignore_user_setting_when_removing_global_setting() { logInAsSystemAdministrator(); UserDto user = dbClient.userDao().insert(dbSession, UserTesting.newUserDto()); propertyDb.insertProperties(newUserPropertyDto("foo", "one", user)); @@ -175,7 +175,7 @@ public class ResetActionTest { } @Test - public void ignore_user_setting_when_removing_project_setting() throws Exception { + public void ignore_user_setting_when_removing_project_setting() { logInAsProjectAdmin(); UserDto user = dbClient.userDao().insert(dbSession, UserTesting.newUserDto()); propertyDb.insertProperties(newUserPropertyDto("foo", "one", user)); @@ -185,14 +185,14 @@ public class ResetActionTest { } @Test - public void ignore_unknown_setting_key() throws Exception { + public void ignore_unknown_setting_key() { logInAsSystemAdministrator(); executeRequestOnGlobalSetting("unknown"); } @Test - public void remove_setting_by_deprecated_key() throws Exception { + public void remove_setting_by_deprecated_key() { logInAsSystemAdministrator(); definitions.addComponent(PropertyDefinition.builder("foo").deprecatedKey("old").build()); propertyDb.insertProperties(newGlobalPropertyDto().setKey("foo").setValue("one")); @@ -202,7 +202,7 @@ public class ResetActionTest { } @Test - public void remove_setting_on_branch() throws Exception { + public void remove_setting_on_branch() { ComponentDto project = db.components().insertMainBranch(); ComponentDto branch = db.components().insertProjectBranch(project); definitions.addComponent(PropertyDefinition.builder("foo").onQualifiers(PROJECT).build()); @@ -241,7 +241,7 @@ public class ResetActionTest { } @Test - public void throw_ForbiddenException_if_global_setting_and_not_system_administrator() throws Exception { + public void throw_ForbiddenException_if_global_setting_and_not_system_administrator() { userSession.logIn().setNonSystemAdministrator(); definitions.addComponent(PropertyDefinition.builder("foo").build()); @@ -252,7 +252,7 @@ public class ResetActionTest { } @Test - public void throw_ForbiddenException_if_project_setting_and_not_project_administrator() throws Exception { + public void throw_ForbiddenException_if_project_setting_and_not_project_administrator() { userSession.logIn().addProjectPermission(USER, project); definitions.addComponent(PropertyDefinition.builder("foo").build()); @@ -263,7 +263,7 @@ public class ResetActionTest { } @Test - public void throw_ForbiddenException_if_project_setting_and_system_administrator() throws Exception { + public void throw_ForbiddenException_if_project_setting_and_system_administrator() { logInAsSystemAdministrator(); definitions.addComponent(PropertyDefinition.builder("foo").build()); diff --git a/server/sonar-server/src/test/java/org/sonar/server/setting/ws/SettingsFinderTest.java b/server/sonar-server/src/test/java/org/sonar/server/setting/ws/SettingsFinderTest.java index c38b1fd0823..ea871668d0b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/setting/ws/SettingsFinderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/setting/ws/SettingsFinderTest.java @@ -62,7 +62,7 @@ public class SettingsFinderTest { private SettingsFinder underTest = new SettingsFinder(dbClient, propertyDefinitions); @Test - public void return_global_settings() throws Exception { + public void return_global_settings() { PropertyDefinition definition = PropertyDefinition.builder("foo").build(); addDefinitions(definition); insertProperties(newGlobalPropertyDto().setKey("foo").setValue("one")); @@ -75,7 +75,7 @@ public class SettingsFinderTest { } @Test - public void return_global_setting_even_if_no_definition() throws Exception { + public void return_global_setting_even_if_no_definition() { insertProperties(newGlobalPropertyDto().setKey("foo").setValue("one")); List settings = underTest.loadGlobalSettings(dbSession, newHashSet("foo")); @@ -84,7 +84,7 @@ public class SettingsFinderTest { } @Test - public void return_global_settings_with_property_set() throws Exception { + public void return_global_settings_with_property_set() { addDefinitions(PropertyDefinition.builder("set1") .type(PROPERTY_SET) .fields(asList( @@ -109,7 +109,7 @@ public class SettingsFinderTest { } @Test - public void return_component_settings() throws Exception { + public void return_component_settings() { ComponentDto project = componentDb.insertComponent(ComponentTesting.newPrivateProjectDto(db.getDefaultOrganization())); addDefinitions(PropertyDefinition.builder("property").defaultValue("default").build()); insertProperties(newComponentPropertyDto(project).setKey("property").setValue("one")); @@ -124,7 +124,7 @@ public class SettingsFinderTest { } @Test - public void return_component_setting_even_if_no_definition() throws Exception { + public void return_component_setting_even_if_no_definition() { ComponentDto project = componentDb.insertComponent(ComponentTesting.newPrivateProjectDto(db.getDefaultOrganization())); insertProperties(newComponentPropertyDto(project).setKey("property").setValue("one")); @@ -134,7 +134,7 @@ public class SettingsFinderTest { } @Test - public void return_component_settings_with_property_set() throws Exception { + public void return_component_settings_with_property_set() { ComponentDto project = componentDb.insertComponent(ComponentTesting.newPrivateProjectDto(db.getDefaultOrganization())); addDefinitions(PropertyDefinition.builder("set1") .type(PROPERTY_SET) @@ -160,7 +160,7 @@ public class SettingsFinderTest { } @Test - public void return_module_settings() throws Exception { + public void return_module_settings() { ComponentDto project = componentDb.insertComponent(ComponentTesting.newPrivateProjectDto(db.getDefaultOrganization())); ComponentDto module = componentDb.insertComponent(newModuleDto(project)); ComponentDto subModule = componentDb.insertComponent(newModuleDto(module)); diff --git a/server/sonar-server/src/test/java/org/sonar/server/setting/ws/SettingsUpdaterTest.java b/server/sonar-server/src/test/java/org/sonar/server/setting/ws/SettingsUpdaterTest.java index 8d01b1c2725..5c37c026574 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/setting/ws/SettingsUpdaterTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/setting/ws/SettingsUpdaterTest.java @@ -70,7 +70,7 @@ public class SettingsUpdaterTest { } @Test - public void delete_global_settings() throws Exception { + public void delete_global_settings() { definitions.addComponent(PropertyDefinition.builder("foo").build()); propertyDb.insertProperties(newComponentPropertyDto(project).setKey("foo").setValue("value")); propertyDb.insertProperties(newGlobalPropertyDto().setKey("foo").setValue("one")); @@ -84,7 +84,7 @@ public class SettingsUpdaterTest { } @Test - public void delete_component_settings() throws Exception { + public void delete_component_settings() { definitions.addComponent(PropertyDefinition.builder("foo").build()); propertyDb.insertProperties(newGlobalPropertyDto().setKey("foo").setValue("value")); propertyDb.insertProperties(newComponentPropertyDto(project).setKey("foo").setValue("one")); @@ -98,7 +98,7 @@ public class SettingsUpdaterTest { } @Test - public void does_not_fail_when_deleting_unknown_setting() throws Exception { + public void does_not_fail_when_deleting_unknown_setting() { propertyDb.insertProperties(newGlobalPropertyDto().setKey("foo").setValue("one")); underTest.deleteGlobalSettings(dbSession, "unknown"); @@ -107,7 +107,7 @@ public class SettingsUpdaterTest { } @Test - public void does_not_delete_user_settings() throws Exception { + public void does_not_delete_user_settings() { UserDto user = dbClient.userDao().insert(dbSession, UserTesting.newUserDto()); propertyDb.insertProperties(newUserPropertyDto("foo", "one", user)); propertyDb.insertProperties(newGlobalPropertyDto().setKey("foo").setValue("one")); @@ -118,7 +118,7 @@ public class SettingsUpdaterTest { } @Test - public void delete_global_property_set() throws Exception { + public void delete_global_property_set() { definitions.addComponent(PropertyDefinition .builder("foo") .type(PropertyType.PROPERTY_SET) @@ -141,7 +141,7 @@ public class SettingsUpdaterTest { } @Test - public void delete_component_property_set() throws Exception { + public void delete_component_property_set() { definitions.addComponent(PropertyDefinition .builder("foo") .type(PropertyType.PROPERTY_SET) @@ -164,7 +164,7 @@ public class SettingsUpdaterTest { } @Test - public void does_not_fail_when_deleting_unknown_property_set() throws Exception { + public void does_not_fail_when_deleting_unknown_property_set() { definitions.addComponent(PropertyDefinition .builder("foo") .type(PropertyType.PROPERTY_SET) @@ -182,7 +182,7 @@ public class SettingsUpdaterTest { } @Test - public void fail_to_delete_global_setting_when_no_setting_key() throws Exception { + public void fail_to_delete_global_setting_when_no_setting_key() { expectedException.expect(IllegalArgumentException.class); expectedException.expectMessage("At least one setting key is required"); @@ -190,7 +190,7 @@ public class SettingsUpdaterTest { } @Test - public void fail_to_delete_component_setting_when_no_setting_key() throws Exception { + public void fail_to_delete_component_setting_when_no_setting_key() { expectedException.expect(IllegalArgumentException.class); expectedException.expectMessage("At least one setting key is required"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/setting/ws/ValuesActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/setting/ws/ValuesActionTest.java index 5be5426e1ce..08a82e5d5e1 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/setting/ws/ValuesActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/setting/ws/ValuesActionTest.java @@ -102,7 +102,7 @@ public class ValuesActionTest { } @Test - public void return_simple_value() throws Exception { + public void return_simple_value() { logIn(); definitions.addComponent(PropertyDefinition .builder("foo") @@ -119,7 +119,7 @@ public class ValuesActionTest { } @Test - public void return_multi_values() throws Exception { + public void return_multi_values() { logIn(); // Property never defined, default value is returned definitions.addComponent(PropertyDefinition.builder("default") @@ -145,7 +145,7 @@ public class ValuesActionTest { } @Test - public void return_multi_value_with_coma() throws Exception { + public void return_multi_value_with_coma() { logIn(); definitions.addComponent(PropertyDefinition.builder("global").multiValues(true).build()); propertyDb.insertProperties(newGlobalPropertyDto().setKey("global").setValue("three,four%2Cfive")); @@ -159,7 +159,7 @@ public class ValuesActionTest { } @Test - public void return_property_set() throws Exception { + public void return_property_set() { logIn(); definitions.addComponent(PropertyDefinition .builder("foo") @@ -179,7 +179,7 @@ public class ValuesActionTest { } @Test - public void return_property_set_for_component() throws Exception { + public void return_property_set_for_component() { logInAsProjectUser(); definitions.addComponent(PropertyDefinition .builder("foo") @@ -200,7 +200,7 @@ public class ValuesActionTest { } @Test - public void return_default_values() throws Exception { + public void return_default_values() { logIn(); definitions.addComponent(PropertyDefinition .builder("foo") @@ -214,7 +214,7 @@ public class ValuesActionTest { } @Test - public void return_global_values() throws Exception { + public void return_global_values() { logIn(); definitions.addComponent(PropertyDefinition.builder("property").defaultValue("default").build()); propertyDb.insertProperties( @@ -228,7 +228,7 @@ public class ValuesActionTest { } @Test - public void return_project_values() throws Exception { + public void return_project_values() { logInAsProjectUser(); definitions.addComponent( PropertyDefinition.builder("property").defaultValue("default").onQualifiers(PROJECT).build()); @@ -244,7 +244,7 @@ public class ValuesActionTest { } @Test - public void return_settings_defined_only_at_global_level_when_loading_project_settings() throws Exception { + public void return_settings_defined_only_at_global_level_when_loading_project_settings() { logInAsProjectUser(); definitions.addComponents(asList( PropertyDefinition.builder("global").build(), @@ -261,7 +261,7 @@ public class ValuesActionTest { } @Test - public void return_is_inherited_to_true_when_property_is_defined_only_at_global_level() throws Exception { + public void return_is_inherited_to_true_when_property_is_defined_only_at_global_level() { logInAsProjectUser(); definitions.addComponent(PropertyDefinition.builder("property").defaultValue("default").onQualifiers(PROJECT).build()); // The property is not defined on project @@ -274,7 +274,7 @@ public class ValuesActionTest { } @Test - public void return_values_even_if_no_property_definition() throws Exception { + public void return_values_even_if_no_property_definition() { logIn(); propertyDb.insertProperties(newGlobalPropertyDto().setKey("globalPropertyWithoutDefinition").setValue("value")); @@ -287,7 +287,7 @@ public class ValuesActionTest { } @Test - public void return_empty_when_property_def_exists_but_no_value() throws Exception { + public void return_empty_when_property_def_exists_but_no_value() { logIn(); definitions.addComponent(PropertyDefinition .builder("foo") @@ -299,7 +299,7 @@ public class ValuesActionTest { } @Test - public void return_nothing_when_unknown_keys() throws Exception { + public void return_nothing_when_unknown_keys() { logIn(); definitions.addComponent(PropertyDefinition .builder("foo") @@ -313,7 +313,7 @@ public class ValuesActionTest { } @Test - public void return_module_values() throws Exception { + public void return_module_values() { logInAsProjectUser(); ComponentDto module = componentDb.insertComponent(newModuleDto(project)); definitions.addComponent(PropertyDefinition.builder("property").defaultValue("default").onQualifiers(PROJECT, MODULE).build()); @@ -329,7 +329,7 @@ public class ValuesActionTest { } @Test - public void return_inherited_values_on_module() throws Exception { + public void return_inherited_values_on_module() { logInAsProjectUser(); ComponentDto module = componentDb.insertComponent(newModuleDto(project)); definitions.addComponents(asList( @@ -352,7 +352,7 @@ public class ValuesActionTest { } @Test - public void return_inherited_values_on_global_setting() throws Exception { + public void return_inherited_values_on_global_setting() { logIn(); definitions.addComponents(asList( PropertyDefinition.builder("defaultProperty").defaultValue("default").build(), @@ -368,7 +368,7 @@ public class ValuesActionTest { } @Test - public void return_parent_value() throws Exception { + public void return_parent_value() { logInAsProjectUser(); ComponentDto module = componentDb.insertComponent(newModuleDto(project)); ComponentDto subModule = componentDb.insertComponent(newModuleDto(module)); @@ -386,7 +386,7 @@ public class ValuesActionTest { } @Test - public void return_parent_values() throws Exception { + public void return_parent_values() { logInAsProjectUser(); ComponentDto module = componentDb.insertComponent(newModuleDto(project)); ComponentDto subModule = componentDb.insertComponent(newModuleDto(module)); @@ -404,7 +404,7 @@ public class ValuesActionTest { } @Test - public void return_parent_field_values() throws Exception { + public void return_parent_field_values() { logInAsProjectUser(); ComponentDto module = componentDb.insertComponent(newModuleDto(project)); ComponentDto subModule = componentDb.insertComponent(newModuleDto(module)); @@ -427,7 +427,7 @@ public class ValuesActionTest { } @Test - public void return_no_parent_value() throws Exception { + public void return_no_parent_value() { logInAsProjectUser(); ComponentDto module = componentDb.insertComponent(newModuleDto(project)); ComponentDto subModule = componentDb.insertComponent(newModuleDto(module)); @@ -452,7 +452,7 @@ public class ValuesActionTest { } @Test - public void return_parent_value_when_no_definition() throws Exception { + public void return_parent_value_when_no_definition() { logInAsProjectUser(); ComponentDto module = componentDb.insertComponent(newModuleDto(project)); propertyDb.insertProperties( @@ -465,7 +465,7 @@ public class ValuesActionTest { } @Test - public void return_value_of_deprecated_key() throws Exception { + public void return_value_of_deprecated_key() { logIn(); definitions.addComponent(PropertyDefinition .builder("foo") @@ -482,7 +482,7 @@ public class ValuesActionTest { } @Test - public void does_not_returned_secured_and_license_settings_when_not_authenticated() throws Exception { + public void does_not_returned_secured_and_license_settings_when_not_authenticated() { definitions.addComponents(asList( PropertyDefinition.builder("foo").build(), PropertyDefinition.builder("secret.secured").build(), @@ -500,7 +500,7 @@ public class ValuesActionTest { } @Test - public void does_not_returned_secured_and_license_settings_in_property_set_when_not_authenticated() throws Exception { + public void does_not_returned_secured_and_license_settings_in_property_set_when_not_authenticated() { definitions.addComponent(PropertyDefinition .builder("foo") .type(PropertyType.PROPERTY_SET) @@ -517,7 +517,7 @@ public class ValuesActionTest { } @Test - public void return_license_settings_when_authenticated_but_not_admin() throws Exception { + public void return_license_settings_when_authenticated_but_not_admin() { logIn(); definitions.addComponents(asList( PropertyDefinition.builder("foo").build(), @@ -536,7 +536,7 @@ public class ValuesActionTest { } @Test - public void return_global_secured_settings_when_not_authenticated_but_with_scan_permission() throws Exception { + public void return_global_secured_settings_when_not_authenticated_but_with_scan_permission() { userSession.anonymous().addPermission(SCAN, db.getDefaultOrganization()); definitions.addComponents(asList( PropertyDefinition.builder("foo").build(), @@ -555,7 +555,7 @@ public class ValuesActionTest { } @Test - public void return_component_secured_settings_when_not_authenticated_but_with_scan_permission() throws Exception { + public void return_component_secured_settings_when_not_authenticated_but_with_scan_permission() { userSession .addProjectPermission(USER, project) .addProjectPermission(SCAN_EXECUTION, project); @@ -579,7 +579,7 @@ public class ValuesActionTest { } @Test - public void return_component_secured_settings_even_if_not_defined_when_not_authenticated_but_with_scan_permission() throws Exception { + public void return_component_secured_settings_even_if_not_defined_when_not_authenticated_but_with_scan_permission() { userSession .addProjectPermission(USER, project) .addProjectPermission(SCAN_EXECUTION, project); @@ -591,7 +591,7 @@ public class ValuesActionTest { } @Test - public void return_secured_and_license_settings_when_system_admin() throws Exception { + public void return_secured_and_license_settings_when_system_admin() { logInAsAdmin(); definitions.addComponents(asList( PropertyDefinition.builder("foo").build(), @@ -608,7 +608,7 @@ public class ValuesActionTest { } @Test - public void return_secured_and_license_settings_when_project_admin() throws Exception { + public void return_secured_and_license_settings_when_project_admin() { logInAsProjectAdmin(); definitions.addComponents(asList( PropertyDefinition.builder("foo").onQualifiers(PROJECT).build(), @@ -627,7 +627,7 @@ public class ValuesActionTest { } @Test - public void return_secured_and_license_settings_even_if_not_defined_when_project_admin() throws Exception { + public void return_secured_and_license_settings_even_if_not_defined_when_project_admin() { logInAsProjectAdmin(); propertyDb.insertProperties(newComponentPropertyDto(project).setKey("not-defined.secured").setValue("123")); @@ -637,7 +637,7 @@ public class ValuesActionTest { } @Test - public void return_secured_and_license_settings_in_property_set_when_system_admin() throws Exception { + public void return_secured_and_license_settings_in_property_set_when_system_admin() { logInAsAdmin(); definitions.addComponent(PropertyDefinition .builder("foo") @@ -655,7 +655,7 @@ public class ValuesActionTest { } @Test - public void return_global_settings_from_definitions_when_no_component_and_no_keys() throws Exception { + public void return_global_settings_from_definitions_when_no_component_and_no_keys() { logInAsAdmin(); definitions.addComponents(asList( PropertyDefinition.builder("foo").build(), @@ -672,7 +672,7 @@ public class ValuesActionTest { } @Test - public void return_project_settings_from_definitions_when_component_and_no_keys() throws Exception { + public void return_project_settings_from_definitions_when_component_and_no_keys() { logInAsProjectAdmin(); definitions.addComponents(asList( PropertyDefinition.builder("foo").onQualifiers(PROJECT).build(), @@ -689,7 +689,7 @@ public class ValuesActionTest { } @Test - public void return_additional_settings_specific_for_scanner_when_no_keys() throws Exception { + public void return_additional_settings_specific_for_scanner_when_no_keys() { logInAsAdmin(); definitions.addComponent(PropertyDefinition.builder("plugin.license.secured").type(LICENSE).build()); propertyDb.insertProperties( @@ -702,7 +702,7 @@ public class ValuesActionTest { } @Test - public void return_simple_value_with_non_ascii_characters() throws Exception { + public void return_simple_value_with_non_ascii_characters() { logIn(); definitions.addComponent(PropertyDefinition .builder("foo") @@ -715,7 +715,7 @@ public class ValuesActionTest { } @Test - public void branch_values() throws Exception { + public void branch_values() { ComponentDto project = db.components().insertMainBranch(); userSession.logIn().addProjectPermission(USER, project); ComponentDto branch = db.components().insertProjectBranch(project); @@ -733,7 +733,7 @@ public class ValuesActionTest { } @Test - public void branch_values_inherit_from_project() throws Exception { + public void branch_values_inherit_from_project() { ComponentDto project = db.components().insertMainBranch(); userSession.logIn().addProjectPermission(USER, project); ComponentDto branch = db.components().insertProjectBranch(project); @@ -751,7 +751,7 @@ public class ValuesActionTest { } @Test - public void fail_when_user_has_not_project_browse_permission() throws Exception { + public void fail_when_user_has_not_project_browse_permission() { userSession.logIn("project-admin").addProjectPermission(CODEVIEWER, project); definitions.addComponent(PropertyDefinition.builder("foo").build()); @@ -761,7 +761,7 @@ public class ValuesActionTest { } @Test - public void fail_when_deprecated_key_and_new_key_are_used() throws Exception { + public void fail_when_deprecated_key_and_new_key_are_used() { logIn(); definitions.addComponent(PropertyDefinition .builder("foo") diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/HtmlSourceDecoratorTest.java b/server/sonar-server/src/test/java/org/sonar/server/source/HtmlSourceDecoratorTest.java index 0a1ce0faa9d..27f784ad016 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/source/HtmlSourceDecoratorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/source/HtmlSourceDecoratorTest.java @@ -53,13 +53,13 @@ public class HtmlSourceDecoratorTest { @Test public void should_ignore_missing_highlighting() { String sourceLine = " if (toto < 42) {"; - assertThat(sourceDecorator.getDecoratedSourceAsHtml(sourceLine, (String) null, (String) null)).isEqualTo(" if (toto < 42) {"); - assertThat(sourceDecorator.getDecoratedSourceAsHtml(sourceLine, "", (String) null)).isEqualTo(" if (toto < 42) {"); + assertThat(sourceDecorator.getDecoratedSourceAsHtml(sourceLine, null, null)).isEqualTo(" if (toto < 42) {"); + assertThat(sourceDecorator.getDecoratedSourceAsHtml(sourceLine, "", null)).isEqualTo(" if (toto < 42) {"); } @Test public void should_ignore_null_source() { - assertThat(sourceDecorator.getDecoratedSourceAsHtml(null, (String) null, (String) null)).isNull(); + assertThat(sourceDecorator.getDecoratedSourceAsHtml(null, null, null)).isNull(); } @Test diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/OpeningHtmlTagTest.java b/server/sonar-server/src/test/java/org/sonar/server/source/OpeningHtmlTagTest.java index 005909b7e0a..8fb7f0c4d9b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/source/OpeningHtmlTagTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/source/OpeningHtmlTagTest.java @@ -26,14 +26,14 @@ import static org.assertj.core.api.Assertions.assertThat; public class OpeningHtmlTagTest { @Test - public void test_getters() throws Exception { + public void test_getters() { OpeningHtmlTag openingHtmlTag = new OpeningHtmlTag(3, "tag"); assertThat(openingHtmlTag.getStartOffset()).isEqualTo(3); assertThat(openingHtmlTag.getCssClass()).isEqualTo("tag"); } @Test - public void test_equals() throws Exception { + public void test_equals() { OpeningHtmlTag openingHtmlTag = new OpeningHtmlTag(3, "tag"); OpeningHtmlTag openingHtmlTagWithSameValues = new OpeningHtmlTag(3, "tag"); OpeningHtmlTag openingHtmlTagWithDifferentValues = new OpeningHtmlTag(5, "tag2"); @@ -47,7 +47,7 @@ public class OpeningHtmlTagTest { } @Test - public void test_hashcode() throws Exception { + public void test_hashcode() { OpeningHtmlTag openingHtmlTag = new OpeningHtmlTag(3, "tag"); OpeningHtmlTag openingHtmlTagWithSameValues = new OpeningHtmlTag(3, "tag"); OpeningHtmlTag openingHtmlTagWithDifferentValue = new OpeningHtmlTag(5, "tag2"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/SourceServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/source/SourceServiceTest.java index 1939f2b9fc8..7946d0061cc 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/source/SourceServiceTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/source/SourceServiceTest.java @@ -61,7 +61,7 @@ public class SourceServiceTest { } @Test - public void get_range_of_lines() throws Exception { + public void get_range_of_lines() { Optional> linesOpt = underTest.getLines(dbTester.getSession(), FILE_UUID, 5, 7); assertThat(linesOpt.isPresent()).isTrue(); List lines = Lists.newArrayList(linesOpt.get()); @@ -72,7 +72,7 @@ public class SourceServiceTest { } @Test - public void get_range_of_lines_as_raw_text() throws Exception { + public void get_range_of_lines_as_raw_text() { Optional> linesOpt = underTest.getLinesAsRawText(dbTester.getSession(), FILE_UUID, 5, 7); assertThat(linesOpt.isPresent()).isTrue(); List lines = Lists.newArrayList(linesOpt.get()); @@ -80,7 +80,7 @@ public class SourceServiceTest { } @Test - public void get_range_of_lines_as_html() throws Exception { + public void get_range_of_lines_as_html() { when(htmlDecorator.getDecoratedSourceAsHtml("SOURCE_5", "HIGHLIGHTING_5", "SYMBOLS_5")).thenReturn("HTML_5"); when(htmlDecorator.getDecoratedSourceAsHtml("SOURCE_6", "HIGHLIGHTING_6", "SYMBOLS_6")).thenReturn("HTML_6"); when(htmlDecorator.getDecoratedSourceAsHtml("SOURCE_7", "HIGHLIGHTING_7", "SYMBOLS_7")).thenReturn("HTML_7"); @@ -108,14 +108,14 @@ public class SourceServiceTest { } @Test - public void getLines_returns_empty_iterable_if_range_is_out_of_scope() throws Exception { + public void getLines_returns_empty_iterable_if_range_is_out_of_scope() { Optional> lines = underTest.getLines(dbTester.getSession(), FILE_UUID, 500, 510); assertThat(lines.isPresent()).isTrue(); assertThat(lines.get()).isEmpty(); } @Test - public void getLines_file_does_not_exist() throws Exception { + public void getLines_file_does_not_exist() { Optional> lines = underTest.getLines(dbTester.getSession(), "FILE_DOES_NOT_EXIST", 1, 10); assertThat(lines.isPresent()).isFalse(); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/index/FileSourceTesting.java b/server/sonar-server/src/test/java/org/sonar/server/source/index/FileSourceTesting.java index 2adf3bb6770..dec0a8956ad 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/source/index/FileSourceTesting.java +++ b/server/sonar-server/src/test/java/org/sonar/server/source/index/FileSourceTesting.java @@ -50,7 +50,7 @@ public class FileSourceTesting { /** * Generate predefined fake data. Result is mutable. */ - public static DbFileSources.Data.Builder newFakeData(int numberOfLines) throws IOException { + public static DbFileSources.Data.Builder newFakeData(int numberOfLines) { DbFileSources.Data.Builder dataBuilder = DbFileSources.Data.newBuilder(); for (int i = 1; i <= numberOfLines; i++) { dataBuilder.addLinesBuilder() @@ -73,7 +73,7 @@ public class FileSourceTesting { /** * Generate random data. Result is mutable. */ - public static DbFileSources.Data.Builder newRandomData(int numberOfLines) throws IOException { + public static DbFileSources.Data.Builder newRandomData(int numberOfLines) { DbFileSources.Data.Builder dataBuilder = DbFileSources.Data.newBuilder(); for (int i = 1; i <= numberOfLines; i++) { dataBuilder.addLinesBuilder() diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/ws/IndexActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/source/ws/IndexActionTest.java index 3bba26e2ff5..1d455b471ca 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/source/ws/IndexActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/source/ws/IndexActionTest.java @@ -96,7 +96,7 @@ public class IndexActionTest { } @Test - public void fail_when_missing_code_viewer_permission() throws Exception { + public void fail_when_missing_code_viewer_permission() { ComponentDto project = db.components().insertPrivateProject(); userSession.addProjectPermission(USER, project); ComponentDto file = db.components().insertComponent(newFileDto(project)); @@ -131,7 +131,7 @@ public class IndexActionTest { .execute(); } - private static DbFileSources.Data newData(String... lines) throws IOException { + private static DbFileSources.Data newData(String... lines) { DbFileSources.Data.Builder dataBuilder = DbFileSources.Data.newBuilder(); for (int i = 1; i <= lines.length; i++) { dataBuilder.addLinesBuilder() @@ -142,7 +142,7 @@ public class IndexActionTest { return dataBuilder.build(); } - private void insertFileWithData(ComponentDto file, DbFileSources.Data fileData) throws IOException { + private void insertFileWithData(ComponentDto file, DbFileSources.Data fileData) { db.getDbClient().fileSourceDao().insert(db.getSession(), new FileSourceDto() .setProjectUuid(file.projectUuid()) .setFileUuid(file.uuid()) diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/ws/LinesActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/source/ws/LinesActionTest.java index 7ddd9ac278d..16ed1ab33f1 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/source/ws/LinesActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/source/ws/LinesActionTest.java @@ -78,7 +78,7 @@ public class LinesActionTest { htmlSourceDecorator = mock(HtmlSourceDecorator.class); when(htmlSourceDecorator.getDecoratedSourceAsHtml(anyString(), anyString(), anyString())).then(new Answer() { @Override - public String answer(InvocationOnMock invocationOnMock) throws Throwable { + public String answer(InvocationOnMock invocationOnMock) { return "

" + invocationOnMock.getArguments()[0] + "

"; } }); @@ -334,7 +334,7 @@ public class LinesActionTest { userSession.logIn("login").addProjectPermission(UserRole.CODEVIEWER, project, file); } - private void insertFile() throws IOException { + private void insertFile() { componentDao.insert(db.getSession(), project, file); db.getSession().commit(); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/ws/RawActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/source/ws/RawActionTest.java index 56c6c59d0a3..aeac2a2265e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/source/ws/RawActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/source/ws/RawActionTest.java @@ -57,7 +57,7 @@ public class RawActionTest { new ComponentFinder(db.getDbClient(), resourceTypes))); @Test - public void raw_from_file() throws Exception { + public void raw_from_file() { ComponentDto project = db.components().insertPrivateProject(); userSession.addProjectPermission(UserRole.CODEVIEWER, project); ComponentDto file = db.components().insertComponent(newFileDto(project)); @@ -75,7 +75,7 @@ public class RawActionTest { } @Test - public void raw_from_branch_file() throws Exception { + public void raw_from_branch_file() { ComponentDto project = db.components().insertMainBranch(); userSession.addProjectPermission(UserRole.CODEVIEWER, project); ComponentDto branch = db.components().insertProjectBranch(project); @@ -95,7 +95,7 @@ public class RawActionTest { } @Test - public void fail_on_unknown_file() throws Exception { + public void fail_on_unknown_file() { expectedException.expect(NotFoundException.class); expectedException.expectMessage("Component key 'unknown' not found"); @@ -105,7 +105,7 @@ public class RawActionTest { } @Test - public void fail_on_unknown_branch() throws Exception { + public void fail_on_unknown_branch() { ComponentDto project = db.components().insertMainBranch(); userSession.addProjectPermission(UserRole.CODEVIEWER, project); ComponentDto branch = db.components().insertProjectBranch(project); @@ -138,7 +138,7 @@ public class RawActionTest { } @Test - public void fail_when_wrong_permission() throws Exception { + public void fail_when_wrong_permission() { ComponentDto project = db.components().insertPrivateProject(); userSession.addProjectPermission(UserRole.ISSUE_ADMIN, project); ComponentDto file = db.components().insertComponent(newFileDto(project)); diff --git a/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterMetricsTest.java b/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterMetricsTest.java index 3913e4e1c71..0d59c866813 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterMetricsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/startup/RegisterMetricsTest.java @@ -96,7 +96,7 @@ public class RegisterMetricsTest { dbTester.prepareDbUnit(getClass(), "disable_undefined_metrics.xml"); RegisterMetrics register = new RegisterMetrics(dbClient); - register.register(Collections.emptyList()); + register.register(Collections.emptyList()); dbTester.assertDbUnit(getClass(), "disable_undefined_metrics-result.xml", "metrics"); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/telemetry/TelemetryDaemonTest.java b/server/sonar-server/src/test/java/org/sonar/server/telemetry/TelemetryDaemonTest.java index d2d8fd28a78..1e8b1720f84 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/telemetry/TelemetryDaemonTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/telemetry/TelemetryDaemonTest.java @@ -101,7 +101,7 @@ public class TelemetryDaemonTest { new ProjectMeasuresIndex(es.client(), null, system2)), client, settings.asConfig(), internalProperties, system2); @After - public void tearDown() throws Exception { + public void tearDown() { underTest.stop(); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/test/db/TestTesting.java b/server/sonar-server/src/test/java/org/sonar/server/test/db/TestTesting.java index d54fc272553..9835a7dd58a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/test/db/TestTesting.java +++ b/server/sonar-server/src/test/java/org/sonar/server/test/db/TestTesting.java @@ -58,7 +58,7 @@ public class TestTesting { /** * Generate random data. */ - public static List newRandomTests(int numberOfTests) throws IOException { + public static List newRandomTests(int numberOfTests) { List tests = new ArrayList<>(); for (int i = 1; i <= numberOfTests; i++) { DbFileSources.Test.Builder test = DbFileSources.Test.newBuilder() diff --git a/server/sonar-server/src/test/java/org/sonar/server/test/index/TestResultSetIteratorTest.java b/server/sonar-server/src/test/java/org/sonar/server/test/index/TestResultSetIteratorTest.java index 6a997b1acf6..059c4a8e31b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/test/index/TestResultSetIteratorTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/test/index/TestResultSetIteratorTest.java @@ -138,7 +138,6 @@ public class TestResultSetIteratorTest { entry(FIELD_FILE_UUID, "F1"), entry(FIELD_TEST_UUID, "U1"), entry(FIELD_NAME, "N1")); - ; // null values assertThat(doc).containsKeys( FIELD_DURATION_IN_MS, diff --git a/server/sonar-server/src/test/java/org/sonar/server/test/ws/ListActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/test/ws/ListActionTest.java index 54521c66d40..59491622a70 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/test/ws/ListActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/test/ws/ListActionTest.java @@ -113,7 +113,7 @@ public class ListActionTest { } @Test - public void list_tests() throws Exception { + public void list_tests() { userSessionRule.addProjectPermission(CODEVIEWER, project); DbFileSources.Test test = newTest(mainFile, 10, 11, 12, 20, 21, 25).setStatus(OK).build(); insertTests(testFile, test); @@ -135,7 +135,7 @@ public class ListActionTest { } @Test - public void list_tests_by_test_uuid() throws Exception { + public void list_tests_by_test_uuid() { userSessionRule.addProjectPermission(CODEVIEWER, project); DbFileSources.Test test1 = newTest(mainFile, 10).build(); DbFileSources.Test test2 = newTest(mainFile, 11).build(); @@ -150,7 +150,7 @@ public class ListActionTest { } @Test - public void list_tests_by_test_file_uuid() throws Exception { + public void list_tests_by_test_file_uuid() { userSessionRule.addProjectPermission(CODEVIEWER, project); ComponentDto anotherTestFile = db.components().insertComponent(newFileDto(project)); DbFileSources.Test test1 = newTest(mainFile, 10).build(); @@ -168,7 +168,7 @@ public class ListActionTest { } @Test - public void list_tests_by_test_file_key() throws Exception { + public void list_tests_by_test_file_key() { userSessionRule.addProjectPermission(CODEVIEWER, project); ComponentDto anotherTestFile = db.components().insertComponent(newFileDto(project)); DbFileSources.Test test1 = newTest(mainFile, 10).build(); @@ -186,7 +186,7 @@ public class ListActionTest { } @Test - public void list_tests_by_test_file_key_and_branch() throws Exception { + public void list_tests_by_test_file_key_and_branch() { ComponentDto project = db.components().insertMainBranch(); userSessionRule.addProjectPermission(CODEVIEWER, project); ComponentDto branch = db.components().insertProjectBranch(project); @@ -209,7 +209,7 @@ public class ListActionTest { } @Test - public void list_tests_by_source_file_uuid_and_line_number() throws Exception { + public void list_tests_by_source_file_uuid_and_line_number() { userSessionRule.addProjectPermission(CODEVIEWER, project); ComponentDto anotherMainFile = db.components().insertComponent(newFileDto(project)); DbFileSources.Test test1 = newTest(mainFile, 10, 11, 12).build(); @@ -226,7 +226,7 @@ public class ListActionTest { } @Test - public void list_tests_by_source_file_key_and_line_number() throws Exception { + public void list_tests_by_source_file_key_and_line_number() { userSessionRule.addProjectPermission(CODEVIEWER, project); ComponentDto anotherMainFile = db.components().insertComponent(newFileDto(project)); DbFileSources.Test test1 = newTest(mainFile, 10, 11, 12).build(); @@ -245,7 +245,7 @@ public class ListActionTest { } @Test - public void list_tests_by_source_file_key_and_branch_and_line_number() throws Exception { + public void list_tests_by_source_file_key_and_branch_and_line_number() { ComponentDto project = db.components().insertMainBranch(); userSessionRule.addProjectPermission(CODEVIEWER, project); ComponentDto branch = db.components().insertProjectBranch(project); @@ -269,7 +269,7 @@ public class ListActionTest { } @Test - public void tests_are_paginated() throws Exception { + public void tests_are_paginated() { userSessionRule.addProjectPermission(CODEVIEWER, project); insertTests(testFile, newTest(mainFile, 10).build(), newTest(mainFile, 11).build(), newTest(mainFile, 12).build()); @@ -281,7 +281,7 @@ public class ListActionTest { } @Test - public void fail_when_no_argument() throws Exception { + public void fail_when_no_argument() { userSessionRule.addProjectPermission(CODEVIEWER, project); expectedException.expect(IllegalArgumentException.class); @@ -289,7 +289,7 @@ public class ListActionTest { } @Test - public void fail_when_source_file_uuid_without_line_number() throws Exception { + public void fail_when_source_file_uuid_without_line_number() { userSessionRule.addProjectPermission(CODEVIEWER, project); expectedException.expect(IllegalArgumentException.class); @@ -297,7 +297,7 @@ public class ListActionTest { } @Test - public void fail_when_not_enough_privilege_on_test_uuid() throws Exception { + public void fail_when_not_enough_privilege_on_test_uuid() { userSessionRule.addProjectPermission(USER, project); DbFileSources.Test test = newTest(mainFile, 10).build(); insertTests(testFile, test); @@ -307,7 +307,7 @@ public class ListActionTest { } @Test - public void fail_when_no_enough_privilege_on_test_file_id() throws Exception { + public void fail_when_no_enough_privilege_on_test_file_id() { userSessionRule.addProjectPermission(USER, project); insertTests(testFile, newTest(mainFile, 10).build()); @@ -316,7 +316,7 @@ public class ListActionTest { } @Test - public void fail_when_not_enough_privilege_on_test_file_key() throws Exception { + public void fail_when_not_enough_privilege_on_test_file_key() { userSessionRule.addProjectPermission(USER, project); insertTests(testFile, newTest(mainFile, 10).build()); @@ -325,7 +325,7 @@ public class ListActionTest { } @Test - public void fail_when_not_enough_privilege_on_main_file_uuid() throws Exception { + public void fail_when_not_enough_privilege_on_main_file_uuid() { userSessionRule.addProjectPermission(USER, project); insertTests(testFile, newTest(mainFile, 10).build()); @@ -334,25 +334,25 @@ public class ListActionTest { } @Test - public void fail_when_test_uuid_is_unknown() throws Exception { + public void fail_when_test_uuid_is_unknown() { expectedException.expect(NotFoundException.class); call(ws.newRequest().setParam(TEST_ID, "unknown")); } @Test - public void fail_when_test_file_id_is_unknown() throws Exception { + public void fail_when_test_file_id_is_unknown() { expectedException.expect(NotFoundException.class); call(ws.newRequest().setParam(TEST_FILE_ID, "unknown")); } @Test - public void fail_when_test_file_key_is_unknown() throws Exception { + public void fail_when_test_file_key_is_unknown() { expectedException.expect(NotFoundException.class); call(ws.newRequest().setParam(TEST_FILE_KEY, "unknown")); } @Test - public void fail_when_test_branch_is_unknown() throws Exception { + public void fail_when_test_branch_is_unknown() { ComponentDto project = db.components().insertMainBranch(); userSessionRule.addProjectPermission(CODEVIEWER, project); ComponentDto branch = db.components().insertProjectBranch(project); @@ -367,19 +367,19 @@ public class ListActionTest { } @Test - public void fail_when_source_file_id_is_unknown() throws Exception { + public void fail_when_source_file_id_is_unknown() { expectedException.expect(NotFoundException.class); call(ws.newRequest().setParam(SOURCE_FILE_ID, "unknown").setParam(SOURCE_FILE_LINE_NUMBER, "10")); } @Test - public void fail_when_source_file_key_is_unknown() throws Exception { + public void fail_when_source_file_key_is_unknown() { expectedException.expect(NotFoundException.class); call(ws.newRequest().setParam(SOURCE_FILE_KEY, "unknown").setParam(SOURCE_FILE_LINE_NUMBER, "10")); } @Test - public void fail_when_source_branch_is_unknown() throws Exception { + public void fail_when_source_branch_is_unknown() { ComponentDto project = db.components().insertMainBranch(); userSessionRule.addProjectPermission(CODEVIEWER, project); ComponentDto branch = db.components().insertProjectBranch(project); diff --git a/server/sonar-server/src/test/java/org/sonar/server/tester/AttributeHolderServletContext.java b/server/sonar-server/src/test/java/org/sonar/server/tester/AttributeHolderServletContext.java index 4d01794ed6f..70539f3b58b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/tester/AttributeHolderServletContext.java +++ b/server/sonar-server/src/test/java/org/sonar/server/tester/AttributeHolderServletContext.java @@ -85,7 +85,7 @@ class AttributeHolderServletContext implements ServletContext { } @Override - public URL getResource(String s) throws MalformedURLException { + public URL getResource(String s) { throw new UnsupportedOperationException(); } @@ -105,7 +105,7 @@ class AttributeHolderServletContext implements ServletContext { } @Override - public Servlet getServlet(String s) throws ServletException { + public Servlet getServlet(String s) { throw new UnsupportedOperationException(); } @@ -202,7 +202,7 @@ class AttributeHolderServletContext implements ServletContext { } @Override - public T createServlet(Class aClass) throws ServletException { + public T createServlet(Class aClass) { throw new UnsupportedOperationException(); } @@ -232,7 +232,7 @@ class AttributeHolderServletContext implements ServletContext { } @Override - public T createFilter(Class aClass) throws ServletException { + public T createFilter(Class aClass) { throw new UnsupportedOperationException(); } @@ -282,7 +282,7 @@ class AttributeHolderServletContext implements ServletContext { } @Override - public T createListener(Class aClass) throws ServletException { + public T createListener(Class aClass) { throw new UnsupportedOperationException(); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/tester/AttributeHolderServletContextTest.java b/server/sonar-server/src/test/java/org/sonar/server/tester/AttributeHolderServletContextTest.java index 1fe2e959a70..2b70a49c7f7 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/tester/AttributeHolderServletContextTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/tester/AttributeHolderServletContextTest.java @@ -217,7 +217,7 @@ public class AttributeHolderServletContextTest { public void addServlet_by_instance_is_not_supported() { servletContext.addServlet(SOME_STRING, new Servlet() { @Override - public void init(ServletConfig servletConfig) throws ServletException { + public void init(ServletConfig servletConfig) { } @@ -227,7 +227,7 @@ public class AttributeHolderServletContextTest { } @Override - public void service(ServletRequest servletRequest, ServletResponse servletResponse) throws ServletException, IOException { + public void service(ServletRequest servletRequest, ServletResponse servletResponse) { } @@ -274,12 +274,12 @@ public class AttributeHolderServletContextTest { public void addFilter_by_instance_is_not_supported() { servletContext.addFilter(SOME_STRING, new Filter() { @Override - public void init(FilterConfig filterConfig) throws ServletException { + public void init(FilterConfig filterConfig) { } @Override - public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException { + public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) { } diff --git a/server/sonar-server/src/test/java/org/sonar/server/tester/UserSessionRule.java b/server/sonar-server/src/test/java/org/sonar/server/tester/UserSessionRule.java index 108fab75ec5..97f81daf831 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/tester/UserSessionRule.java +++ b/server/sonar-server/src/test/java/org/sonar/server/tester/UserSessionRule.java @@ -158,7 +158,7 @@ public class UserSessionRule implements TestRule, UserSession { }; } - protected void before() throws Throwable { + protected void before() { setCurrentUserSession(currentUserSession); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/ui/ws/GlobalActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/ui/ws/GlobalActionTest.java index c27ddd4e646..b9446fb51f5 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/ui/ws/GlobalActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/ui/ws/GlobalActionTest.java @@ -66,7 +66,7 @@ public class GlobalActionTest { private WsActionTester ws; @Test - public void empty_call() throws Exception { + public void empty_call() { init(); assertJson(call()).isSimilarTo("{" + @@ -77,7 +77,7 @@ public class GlobalActionTest { } @Test - public void return_qualifiers() throws Exception { + public void return_qualifiers() { init(new Page[] {}, new ResourceTypeTree[] { ResourceTypeTree.builder() .addType(ResourceType.builder("POL").build()) @@ -97,7 +97,7 @@ public class GlobalActionTest { } @Test - public void return_settings() throws Exception { + public void return_settings() { init(); settings.setProperty("sonar.lf.logoUrl", "http://example.com/my-custom-logo.png"); settings.setProperty("sonar.lf.logoWidthPx", 135); @@ -125,7 +125,7 @@ public class GlobalActionTest { } @Test - public void return_deprecated_logo_settings() throws Exception { + public void return_deprecated_logo_settings() { init(); settings.setProperty("sonar.lf.logoUrl", "http://example.com/my-custom-logo.png"); settings.setProperty("sonar.lf.logoWidthPx", 135); @@ -141,7 +141,7 @@ public class GlobalActionTest { } @Test - public void the_returned_global_pages_do_not_include_administration_pages() throws Exception { + public void the_returned_global_pages_do_not_include_administration_pages() { init(createPages(), new ResourceTypeTree[] {}); assertJson(call()).isSimilarTo("{" + @@ -159,7 +159,7 @@ public class GlobalActionTest { } @Test - public void return_sonarqube_version() throws Exception { + public void return_sonarqube_version() { init(); when(server.getVersion()).thenReturn("6.2"); @@ -169,7 +169,7 @@ public class GlobalActionTest { } @Test - public void functional_version_when_4_digits() throws Exception { + public void functional_version_when_4_digits() { init(); when(server.getVersion()).thenReturn("6.3.1.1234"); @@ -179,7 +179,7 @@ public class GlobalActionTest { } @Test - public void functional_version_when_third_digit_is_0() throws Exception { + public void functional_version_when_third_digit_is_0() { init(); when(server.getVersion()).thenReturn("6.3.0.1234"); @@ -189,7 +189,7 @@ public class GlobalActionTest { } @Test - public void return_if_production_database_or_not() throws Exception { + public void return_if_production_database_or_not() { init(); when(dbClient.getDatabase().getDialect()).thenReturn(new MySql()); @@ -199,7 +199,7 @@ public class GlobalActionTest { } @Test - public void organization_support() throws Exception { + public void organization_support() { init(); organizationFlags.setEnabled(true); @@ -210,7 +210,7 @@ public class GlobalActionTest { } @Test - public void branch_support() throws Exception { + public void branch_support() { init(); branchFeature.setEnabled(true); assertJson(call()).isSimilarTo("{\"branchesEnabled\":true}"); @@ -248,7 +248,7 @@ public class GlobalActionTest { } @Test - public void test_example_response() throws Exception { + public void test_example_response() { init(createPages(), new ResourceTypeTree[] { ResourceTypeTree.builder() .addType(ResourceType.builder("POL").build()) diff --git a/server/sonar-server/src/test/java/org/sonar/server/updatecenter/ws/InstalledPluginsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/updatecenter/ws/InstalledPluginsActionTest.java index d373f832d83..f8684ab4514 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/updatecenter/ws/InstalledPluginsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/updatecenter/ws/InstalledPluginsActionTest.java @@ -40,7 +40,7 @@ public class InstalledPluginsActionTest { private WsActionTester ws = new WsActionTester(new InstalledPluginsAction(pluginRepository)); @Test - public void return_plugins() throws Exception { + public void return_plugins() { when(pluginRepository.getPluginInfos()).thenReturn(asList( new PluginInfo("java").setName("Java").setVersion(Version.create("3.14")), new PluginInfo("xoo").setName("Xoo").setVersion(Version.create("1.0")))); @@ -62,7 +62,7 @@ public class InstalledPluginsActionTest { } @Test - public void return_plugins_with_plugin_having_no_version() throws Exception { + public void return_plugins_with_plugin_having_no_version() { when(pluginRepository.getPluginInfos()).thenReturn(singletonList( new PluginInfo("java").setName("Java"))); diff --git a/server/sonar-server/src/test/java/org/sonar/server/updatecenter/ws/UpdateCenterWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/updatecenter/ws/UpdateCenterWsTest.java index 1136125a10a..82ac6358d30 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/updatecenter/ws/UpdateCenterWsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/updatecenter/ws/UpdateCenterWsTest.java @@ -47,7 +47,7 @@ public class UpdateCenterWsTest { } @Test - public void define_upload_action() throws Exception { + public void define_upload_action() { WebService.Controller controller = tester.controller("api/updatecenter"); WebService.Action action = controller.action("upload"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/updatecenter/ws/UploadActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/updatecenter/ws/UploadActionTest.java index dd1670f17c6..3b03141f3a7 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/updatecenter/ws/UploadActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/updatecenter/ws/UploadActionTest.java @@ -99,7 +99,7 @@ public class UploadActionTest { } @Test - public void fail_when_no_files_param() throws Exception { + public void fail_when_no_files_param() { logInAsSystemAdministrator(); expectedException.expect(IllegalArgumentException.class); diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/DefaultUserTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/DefaultUserTest.java index 38e234464c3..f6430fb7f56 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/DefaultUserTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/DefaultUserTest.java @@ -26,7 +26,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class DefaultUserTest { @Test - public void test_object_methods() throws Exception { + public void test_object_methods() { DefaultUser john = new DefaultUser().setLogin("john").setName("John"); DefaultUser eric = new DefaultUser().setLogin("eric").setName("Eric"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ExternalIdentityTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ExternalIdentityTest.java index 001792cf82d..4c71fe74c63 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/ExternalIdentityTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/ExternalIdentityTest.java @@ -31,14 +31,14 @@ public class ExternalIdentityTest { public ExpectedException thrown = ExpectedException.none(); @Test - public void create_external_identity() throws Exception { + public void create_external_identity() { ExternalIdentity externalIdentity = new ExternalIdentity("github", "login"); assertThat(externalIdentity.getId()).isEqualTo("login"); assertThat(externalIdentity.getProvider()).isEqualTo("github"); } @Test - public void fail_with_NPE_when_identity_provider_is_null() throws Exception { + public void fail_with_NPE_when_identity_provider_is_null() { thrown.expect(NullPointerException.class); thrown.expectMessage("Identity provider cannot be null"); @@ -46,7 +46,7 @@ public class ExternalIdentityTest { } @Test - public void fail_with_NPE_when_identity_id_is_null() throws Exception { + public void fail_with_NPE_when_identity_id_is_null() { thrown.expect(NullPointerException.class); thrown.expectMessage("Identity id cannot be null"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/NewUserTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/NewUserTest.java index 11f0a1dec0e..8667d312b7d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/NewUserTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/NewUserTest.java @@ -32,7 +32,7 @@ public class NewUserTest { public ExpectedException expectedException = ExpectedException.none(); @Test - public void create_new_user() throws Exception { + public void create_new_user() { NewUser newUser = NewUser.builder() .setLogin("login") .setName("name") @@ -50,7 +50,7 @@ public class NewUserTest { } @Test - public void create_new_user_with_minimal_fields() throws Exception { + public void create_new_user_with_minimal_fields() { NewUser newUser = NewUser.builder().build(); assertThat(newUser.login()).isNull(); @@ -61,7 +61,7 @@ public class NewUserTest { } @Test - public void create_new_user_with_authority() throws Exception { + public void create_new_user_with_authority() { NewUser newUser = NewUser.builder() .setLogin("login") .setName("name") @@ -74,7 +74,7 @@ public class NewUserTest { } @Test - public void fail_to_set_password_when_external_identity_is_set() throws Exception { + public void fail_to_set_password_when_external_identity_is_set() { expectedException.expect(IllegalStateException.class); expectedException.expectMessage("Password should not be set with an external identity"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ServerUserSessionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ServerUserSessionTest.java index a66b1406bf2..56e470ef569 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/ServerUserSessionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/ServerUserSessionTest.java @@ -92,7 +92,7 @@ public class ServerUserSessionTest { } @Test - public void anonymous_is_not_logged_in_and_does_not_have_login() throws Exception { + public void anonymous_is_not_logged_in_and_does_not_have_login() { UserSession session = newAnonymousSession(); assertThat(session.getLogin()).isNull(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/UserUpdaterCreateTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/UserUpdaterCreateTest.java index ce90b5d0101..6883fc6e2b5 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/UserUpdaterCreateTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/UserUpdaterCreateTest.java @@ -146,7 +146,7 @@ public class UserUpdaterCreateTest { } @Test - public void create_user_with_sq_authority_when_no_authority_set() throws Exception { + public void create_user_with_sq_authority_when_no_authority_set() { createDefaultGroup(); underTest.createAndCommit(db.getSession(), NewUser.builder() @@ -163,7 +163,7 @@ public class UserUpdaterCreateTest { } @Test - public void create_user_with_identity_provider() throws Exception { + public void create_user_with_identity_provider() { createDefaultGroup(); underTest.createAndCommit(db.getSession(), NewUser.builder() @@ -182,7 +182,7 @@ public class UserUpdaterCreateTest { } @Test - public void create_user_with_sonarqube_external_identity() throws Exception { + public void create_user_with_sonarqube_external_identity() { createDefaultGroup(); underTest.createAndCommit(db.getSession(), NewUser.builder() diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/CreateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ws/CreateActionTest.java index 17cf771699d..cd5fa7a6fb3 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/CreateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/ws/CreateActionTest.java @@ -95,7 +95,7 @@ public class CreateActionTest { } @Test - public void create_user() throws Exception { + public void create_user() { logInAsSystemAdministrator(); CreateWsResponse response = call(CreateRequest.builder() @@ -126,21 +126,21 @@ public class CreateActionTest { } @Test - public void create_user_calls_create_personal_organization_if_personal_organizations_are_enabled() throws Exception { + public void create_user_calls_create_personal_organization_if_personal_organizations_are_enabled() { logInAsSystemAdministrator(); enableCreatePersonalOrg(true); assertACallToOrganizationCreationWhenUserIsCreated(); } @Test - public void create_user_calls_create_personal_organization_if_personal_organizations_are_disabled() throws Exception { + public void create_user_calls_create_personal_organization_if_personal_organizations_are_disabled() { logInAsSystemAdministrator(); enableCreatePersonalOrg(false); assertACallToOrganizationCreationWhenUserIsCreated(); } @Test - public void create_user_associates_him_to_default_organization() throws Exception { + public void create_user_associates_him_to_default_organization() { logInAsSystemAdministrator(); enableCreatePersonalOrg(true); @@ -156,7 +156,7 @@ public class CreateActionTest { } @Test - public void create_local_user() throws Exception { + public void create_local_user() { logInAsSystemAdministrator(); call(CreateRequest.builder() @@ -172,7 +172,7 @@ public class CreateActionTest { } @Test - public void create_none_local_user() throws Exception { + public void create_none_local_user() { logInAsSystemAdministrator(); call(CreateRequest.builder() @@ -187,7 +187,7 @@ public class CreateActionTest { } @Test - public void create_user_with_comma_in_scm_account() throws Exception { + public void create_user_with_comma_in_scm_account() { logInAsSystemAdministrator(); CreateWsResponse response = call(CreateRequest.builder() @@ -202,7 +202,7 @@ public class CreateActionTest { } @Test - public void create_user_with_empty_email() throws Exception { + public void create_user_with_empty_email() { logInAsSystemAdministrator(); call(CreateRequest.builder() @@ -218,7 +218,7 @@ public class CreateActionTest { } @Test - public void create_user_with_deprecated_scmAccounts_parameter() throws Exception { + public void create_user_with_deprecated_scmAccounts_parameter() { logInAsSystemAdministrator(); tester.newRequest() @@ -232,7 +232,7 @@ public class CreateActionTest { } @Test - public void create_user_with_deprecated_scm_accounts_parameter() throws Exception { + public void create_user_with_deprecated_scm_accounts_parameter() { logInAsSystemAdministrator(); tester.newRequest() @@ -246,7 +246,7 @@ public class CreateActionTest { } @Test - public void reactivate_user() throws Exception { + public void reactivate_user() { logInAsSystemAdministrator(); db.users().insertUser(newUserDto("john", "John", "john@email.com").setActive(false)); @@ -264,7 +264,7 @@ public class CreateActionTest { } @Test - public void fail_when_missing_login() throws Exception { + public void fail_when_missing_login() { logInAsSystemAdministrator(); expectedException.expect(IllegalArgumentException.class); @@ -277,7 +277,7 @@ public class CreateActionTest { } @Test - public void fail_when_missing_name() throws Exception { + public void fail_when_missing_name() { logInAsSystemAdministrator(); expectedException.expect(IllegalArgumentException.class); @@ -290,7 +290,7 @@ public class CreateActionTest { } @Test - public void fail_when_missing_password() throws Exception { + public void fail_when_missing_password() { logInAsSystemAdministrator(); expectedException.expect(IllegalArgumentException.class); @@ -303,7 +303,7 @@ public class CreateActionTest { } @Test - public void fail_when_password_is_set_on_none_local_user() throws Exception { + public void fail_when_password_is_set_on_none_local_user() { logInAsSystemAdministrator(); expectedException.expect(IllegalArgumentException.class); @@ -317,7 +317,7 @@ public class CreateActionTest { } @Test - public void fail_when_email_is_invalid() throws Exception { + public void fail_when_email_is_invalid() { logInAsSystemAdministrator(); expectedException.expect(IllegalArgumentException.class); @@ -346,7 +346,7 @@ public class CreateActionTest { settings.setProperty("sonar.defaultGroup", adminGroup.getName()); } - private CreateWsResponse executeRequest(String login) throws Exception { + private CreateWsResponse executeRequest(String login) { return call(CreateRequest.builder() .setLogin(login) .setName("name of " + login) diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/DeactivateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ws/DeactivateActionTest.java index b14d958e9d2..e238420e118 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/DeactivateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/ws/DeactivateActionTest.java @@ -328,7 +328,7 @@ public class DeactivateActionTest { } @Test - public void test_example() throws Exception { + public void test_example() { UserDto user = insertUser(newUserDto() .setLogin("ada.lovelace") .setEmail("ada.lovelace@noteg.com") diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/GroupsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ws/GroupsActionTest.java index 7c6025eec17..763fd2e212b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/GroupsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/ws/GroupsActionTest.java @@ -69,7 +69,7 @@ public class GroupsActionTest { private WsActionTester ws = new WsActionTester(new GroupsAction(db.getDbClient(), userSession, defaultOrganizationProvider, new DefaultGroupFinder(db.getDbClient()))); @Test - public void empty_groups() throws Exception { + public void empty_groups() { insertUser(); insertDefaultGroup("sonar-users", "Sonar Users"); @@ -79,7 +79,7 @@ public class GroupsActionTest { } @Test - public void return_selected_groups_selected_param_is_set_to_all() throws Exception { + public void return_selected_groups_selected_param_is_set_to_all() { UserDto user = insertUser(); GroupDto usersGroup = insertDefaultGroup("sonar-users", "Sonar Users"); GroupDto adminGroup = insertGroup("sonar-admins", "Sonar Admins"); @@ -95,7 +95,7 @@ public class GroupsActionTest { } @Test - public void return_selected_groups_selected_param_is_set_to_selected() throws Exception { + public void return_selected_groups_selected_param_is_set_to_selected() { UserDto user = insertUser(); GroupDto usersGroup = insertDefaultGroup("sonar-users", "Sonar Users"); insertGroup("sonar-admins", "Sonar Admins"); @@ -109,7 +109,7 @@ public class GroupsActionTest { } @Test - public void return_selected_groups_selected_param_is_not_set() throws Exception { + public void return_selected_groups_selected_param_is_not_set() { UserDto user = insertUser(); GroupDto usersGroup = insertDefaultGroup("sonar-users", "Sonar Users"); insertGroup("sonar-admins", "Sonar Admins"); @@ -123,7 +123,7 @@ public class GroupsActionTest { } @Test - public void return_not_selected_groups_selected_param_is_set_to_deselected() throws Exception { + public void return_not_selected_groups_selected_param_is_set_to_deselected() { UserDto user = insertUser(); GroupDto usersGroup = insertDefaultGroup("sonar-users", "Sonar Users"); GroupDto adminGroup = insertGroup("sonar-admins", "Sonar Admins"); @@ -137,7 +137,7 @@ public class GroupsActionTest { } @Test - public void return_group_not_having_description() throws Exception { + public void return_group_not_having_description() { UserDto user = insertUser(); GroupDto group = insertDefaultGroup("sonar-users", null); addUserToGroup(user, group); @@ -148,7 +148,7 @@ public class GroupsActionTest { } @Test - public void search_with_pagination() throws IOException { + public void search_with_pagination() { UserDto user = insertUser(); insertDefaultGroup("sonar-users", "Sonar Users"); for (int i = 1; i <= 9; i++) { @@ -168,7 +168,7 @@ public class GroupsActionTest { } @Test - public void search_by_text_query() throws Exception { + public void search_by_text_query() { UserDto user = insertUser(); GroupDto usersGroup = insertDefaultGroup("sonar-users", "Sonar Users"); GroupDto adminGroup = insertGroup("sonar-admins", "Sonar Admins"); @@ -181,7 +181,7 @@ public class GroupsActionTest { } @Test - public void return_default_group_information() throws Exception { + public void return_default_group_information() { UserDto user = insertUser(); GroupDto usersGroup = insertDefaultGroup("sonar-users", "Sonar Users"); GroupDto adminGroup = insertGroup("sonar-admins", "Sonar Admins"); @@ -197,7 +197,7 @@ public class GroupsActionTest { } @Test - public void return_groups_from_given_organization() throws Exception { + public void return_groups_from_given_organization() { UserDto user = insertUser(); OrganizationDto organizationDto = db.organizations().insert(); OrganizationDto otherOrganizationDto = db.organizations().insert(); @@ -218,7 +218,7 @@ public class GroupsActionTest { } @Test - public void fail_when_organization_has_no_default_group() throws Exception { + public void fail_when_organization_has_no_default_group() { UserDto user = insertUser(); OrganizationDto organizationDto = db.organizations().insert(organization -> organization.setKey("OrgKey")); GroupDto group = db.users().insertGroup(organizationDto, "group1"); @@ -231,7 +231,7 @@ public class GroupsActionTest { } @Test - public void fail_on_unknown_user() throws Exception { + public void fail_on_unknown_user() { insertDefaultGroup("sonar-users", "Sonar Users"); expectedException.expect(NotFoundException.class); @@ -241,7 +241,7 @@ public class GroupsActionTest { } @Test - public void fail_on_disabled_user() throws Exception { + public void fail_on_disabled_user() { UserDto userDto = db.users().insertUser(user -> user.setLogin("disabled").setActive(false)); insertDefaultGroup("sonar-users", "Sonar Users"); @@ -252,7 +252,7 @@ public class GroupsActionTest { } @Test - public void fail_on_unknown_organization() throws Exception { + public void fail_on_unknown_organization() { insertUser(); expectedException.expect(NotFoundException.class); @@ -262,7 +262,7 @@ public class GroupsActionTest { } @Test - public void fail_when_page_size_is_greater_than_500() throws Exception { + public void fail_when_page_size_is_greater_than_500() { UserDto user = insertUser(); insertDefaultGroup("sonar-users", "Sonar Users"); @@ -275,7 +275,7 @@ public class GroupsActionTest { } @Test - public void fail_on_missing_permission() throws Exception { + public void fail_on_missing_permission() { OrganizationDto organizationDto = db.organizations().insert(); userSession.logIn().addPermission(ADMINISTER, organizationDto); @@ -285,7 +285,7 @@ public class GroupsActionTest { } @Test - public void fail_when_no_permission() throws Exception { + public void fail_when_no_permission() { userSession.logIn("not-admin"); expectedException.expect(ForbiddenException.class); diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/IdentityProvidersActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ws/IdentityProvidersActionTest.java index e848ecc173f..df6854267cf 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/IdentityProvidersActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/ws/IdentityProvidersActionTest.java @@ -62,7 +62,7 @@ public class IdentityProvidersActionTest { WsActionTester ws = new WsActionTester(new IdentityProvidersAction(identityProviderRepository)); @Test - public void json_example() throws IOException { + public void json_example() { String response = ws.newRequest().execute().getInput(); assertJson(response).isSimilarTo(getClass().getResource("identity_providers-example.json")); diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/SearchActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ws/SearchActionTest.java index 97ba78cc6b0..14a6031986e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/SearchActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/ws/SearchActionTest.java @@ -280,7 +280,7 @@ public class SearchActionTest { "}"); } - private List injectUsers(int numberOfUsers) throws Exception { + private List injectUsers(int numberOfUsers) { List userDtos = new ArrayList<>(); GroupDto group1 = db.users().insertGroup(newGroupDto().setName("sonar-users")); GroupDto group2 = db.users().insertGroup(newGroupDto().setName("sonar-admins")); diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/UpdateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ws/UpdateActionTest.java index 946aacc1549..2c8b07f0099 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/UpdateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/ws/UpdateActionTest.java @@ -68,7 +68,7 @@ public class UpdateActionTest { private DbClient dbClient = db.getDbClient(); private DbSession dbSession = db.getSession(); - private UserIndexer userIndexer = new UserIndexer(dbClient, es.client());; + private UserIndexer userIndexer = new UserIndexer(dbClient, es.client()); private DefaultOrganizationProvider defaultOrganizationProvider = TestDefaultOrganizationProvider.from(db); private TestOrganizationFlags organizationFlags = TestOrganizationFlags.standalone(); @@ -131,7 +131,7 @@ public class UpdateActionTest { } @Test - public void remove_scm_accounts() throws Exception { + public void remove_scm_accounts() { createUser(); ws.newRequest() @@ -158,7 +158,7 @@ public class UpdateActionTest { } @Test - public void update_scm_account_having_coma() throws Exception { + public void update_scm_account_having_coma() { createUser(); ws.newRequest() @@ -171,7 +171,7 @@ public class UpdateActionTest { } @Test - public void update_scm_account_ignores_duplicates() throws Exception { + public void update_scm_account_ignores_duplicates() { createUser(); ws.newRequest() @@ -184,7 +184,7 @@ public class UpdateActionTest { } @Test - public void update_scm_account_ordered_case_insensitive() throws Exception { + public void update_scm_account_ordered_case_insensitive() { createUser(); ws.newRequest() @@ -225,7 +225,7 @@ public class UpdateActionTest { } @Test - public void fail_on_missing_permission() throws Exception { + public void fail_on_missing_permission() { createUser(); userSession.logIn("polop"); @@ -237,7 +237,7 @@ public class UpdateActionTest { } @Test - public void fail_on_unknown_user() throws Exception { + public void fail_on_unknown_user() { expectedException.expect(NotFoundException.class); ws.newRequest() @@ -246,7 +246,7 @@ public class UpdateActionTest { } @Test - public void fail_on_invalid_email() throws Exception { + public void fail_on_invalid_email() { createUser(); expectedException.expect(IllegalArgumentException.class); diff --git a/server/sonar-server/src/test/java/org/sonar/server/usergroups/DefaultGroupCreatorImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/usergroups/DefaultGroupCreatorImplTest.java index 3ee0eb573a1..3cd39952779 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/usergroups/DefaultGroupCreatorImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/usergroups/DefaultGroupCreatorImplTest.java @@ -41,7 +41,7 @@ public class DefaultGroupCreatorImplTest { private DefaultGroupCreator underTest = new DefaultGroupCreatorImpl(db.getDbClient()); @Test - public void create_default_group() throws Exception { + public void create_default_group() { OrganizationDto organizationDto = db.organizations().insert(); underTest.create(db.getSession(), organizationDto.getUuid()); @@ -54,7 +54,7 @@ public class DefaultGroupCreatorImplTest { } @Test - public void fail_with_IAE_when_default_group_already_exist() throws Exception { + public void fail_with_IAE_when_default_group_already_exist() { OrganizationDto organizationDto = db.organizations().insert(); PermissionTemplateDto permissionTemplate = db.permissionTemplates().insertTemplate(); db.organizations().setDefaultTemplates(organizationDto, permissionTemplate.getUuid(), null); diff --git a/server/sonar-server/src/test/java/org/sonar/server/usergroups/DefaultGroupFinderTest.java b/server/sonar-server/src/test/java/org/sonar/server/usergroups/DefaultGroupFinderTest.java index b79995ed5f4..d6544d6f0a3 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/usergroups/DefaultGroupFinderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/usergroups/DefaultGroupFinderTest.java @@ -40,7 +40,7 @@ public class DefaultGroupFinderTest { private DefaultGroupFinder underTest = new DefaultGroupFinder(db.getDbClient()); @Test - public void find_default_group() throws Exception { + public void find_default_group() { OrganizationDto organization = db.organizations().insert(); GroupDto defaultGroup = db.users().insertDefaultGroup(organization, "default"); @@ -51,7 +51,7 @@ public class DefaultGroupFinderTest { } @Test - public void fail_with_ISE_when_no_default_group_on_org() throws Exception { + public void fail_with_ISE_when_no_default_group_on_org() { OrganizationDto organization = db.organizations().insert(); db.users().insertGroup(organization); @@ -62,7 +62,7 @@ public class DefaultGroupFinderTest { } @Test - public void fail_with_NPE_when_default_group_does_not_exist() throws Exception { + public void fail_with_NPE_when_default_group_does_not_exist() { OrganizationDto organization = db.organizations().insert(); GroupDto defaultGroup = db.users().insertDefaultGroup(organization, "default"); db.getDbClient().groupDao().deleteById(db.getSession(), defaultGroup.getId()); diff --git a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/AddUserActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/AddUserActionTest.java index e6fbfca91eb..3ee27704ebf 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/AddUserActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/AddUserActionTest.java @@ -58,7 +58,7 @@ public class AddUserActionTest { private WsActionTester ws = new WsActionTester(new AddUserAction(db.getDbClient(), userSession, newGroupWsSupport())); @Test - public void add_user_to_group_referenced_by_its_id() throws Exception { + public void add_user_to_group_referenced_by_its_id() { insertDefaultGroupOnDefaultOrganization(); GroupDto group = db.users().insertGroup(); UserDto user = db.users().insertUser(); @@ -74,7 +74,7 @@ public class AddUserActionTest { } @Test - public void add_user_to_group_referenced_by_its_name() throws Exception { + public void add_user_to_group_referenced_by_its_name() { insertDefaultGroupOnDefaultOrganization(); GroupDto group = db.users().insertGroup(); UserDto user = db.users().insertUser(); @@ -90,7 +90,7 @@ public class AddUserActionTest { } @Test - public void add_user_to_group_referenced_by_its_name_and_organization() throws Exception { + public void add_user_to_group_referenced_by_its_name_and_organization() { OrganizationDto org = db.organizations().insert(); db.users().insertDefaultGroup(org); GroupDto group = db.users().insertGroup(org, "a-group"); @@ -108,7 +108,7 @@ public class AddUserActionTest { } @Test - public void add_user_to_another_group() throws Exception { + public void add_user_to_another_group() { insertDefaultGroupOnDefaultOrganization(); OrganizationDto defaultOrg = db.getDefaultOrganization(); GroupDto admins = db.users().insertGroup(defaultOrg, "admins"); @@ -127,7 +127,7 @@ public class AddUserActionTest { } @Test - public void do_not_fail_if_user_is_already_member_of_group() throws Exception { + public void do_not_fail_if_user_is_already_member_of_group() { insertDefaultGroupOnDefaultOrganization(); GroupDto users = db.users().insertGroup(); UserDto user = db.users().insertUser(); @@ -145,7 +145,7 @@ public class AddUserActionTest { } @Test - public void group_has_multiple_members() throws Exception { + public void group_has_multiple_members() { insertDefaultGroupOnDefaultOrganization(); GroupDto users = db.users().insertGroup(); UserDto user1 = db.users().insertUser(); @@ -165,7 +165,7 @@ public class AddUserActionTest { } @Test - public void response_status_is_no_content() throws Exception { + public void response_status_is_no_content() { db.users().insertDefaultGroup(db.getDefaultOrganization()); GroupDto group = db.users().insertGroup(); UserDto user = db.users().insertUser(); @@ -181,7 +181,7 @@ public class AddUserActionTest { } @Test - public void fail_if_group_does_not_exist() throws Exception { + public void fail_if_group_does_not_exist() { UserDto user = db.users().insertUser(); db.organizations().addMember(db.getDefaultOrganization(), user); loginAsAdminOnDefaultOrganization(); @@ -196,7 +196,7 @@ public class AddUserActionTest { } @Test - public void fail_if_user_does_not_exist() throws Exception { + public void fail_if_user_does_not_exist() { GroupDto group = db.users().insertGroup(db.getDefaultOrganization(), "admins"); loginAsAdminOnDefaultOrganization(); @@ -221,7 +221,7 @@ public class AddUserActionTest { } @Test - public void fail_if_administrator_of_another_organization() throws Exception { + public void fail_if_administrator_of_another_organization() { OrganizationDto org1 = db.organizations().insert(); GroupDto group = db.users().insertGroup(org1, "a-group"); UserDto user = db.users().insertUser("user_login"); @@ -239,7 +239,7 @@ public class AddUserActionTest { } @Test - public void fail_to_add_user_to_group_when_user_is_not_member_of_given_organization() throws Exception { + public void fail_to_add_user_to_group_when_user_is_not_member_of_given_organization() { OrganizationDto org = db.organizations().insert(organizationDto -> organizationDto.setKey("Organization key")); GroupDto group = db.users().insertGroup(org, "a-group"); UserDto user = db.users().insertUser("user_login"); @@ -258,7 +258,7 @@ public class AddUserActionTest { } @Test - public void fail_to_add_user_to_anyone() throws Exception { + public void fail_to_add_user_to_anyone() { OrganizationDto organization = db.organizations().insert(org -> org.setKey("org")); UserDto user = db.users().insertUser(); db.organizations().addMember(organization, user); @@ -275,7 +275,7 @@ public class AddUserActionTest { } @Test - public void fail_to_add_user_to_default_group() throws Exception { + public void fail_to_add_user_to_default_group() { UserDto user = db.users().insertUser(); db.organizations().addMember(db.getDefaultOrganization(), user); GroupDto defaultGroup = db.users().insertDefaultGroup(db.getDefaultOrganization(), "default"); @@ -291,7 +291,7 @@ public class AddUserActionTest { } @Test - public void fail_when_no_default_group() throws Exception { + public void fail_when_no_default_group() { OrganizationDto organization = db.organizations().insert(); GroupDto group = db.users().insertGroup(organization); UserDto user = db.users().insertUser(); @@ -308,7 +308,7 @@ public class AddUserActionTest { .execute(); } - private void executeRequest(GroupDto groupDto, UserDto userDto) throws Exception { + private void executeRequest(GroupDto groupDto, UserDto userDto) { newRequest() .setParam("id", groupDto.getId().toString()) .setParam("login", userDto.getLogin()) diff --git a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/DeleteActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/DeleteActionTest.java index 952f4ca529a..435dedd82d2 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/DeleteActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/DeleteActionTest.java @@ -63,7 +63,7 @@ public class DeleteActionTest { private WsActionTester ws = new WsActionTester(new DeleteAction(db.getDbClient(), userSession, newGroupWsSupport())); @Test - public void response_has_no_content() throws Exception { + public void response_has_no_content() { addAdmin(db.getDefaultOrganization()); insertDefaultGroupOnDefaultOrganization(); GroupDto group = db.users().insertGroup(); @@ -77,7 +77,7 @@ public class DeleteActionTest { } @Test - public void delete_by_id() throws Exception { + public void delete_by_id() { addAdmin(db.getDefaultOrganization()); insertDefaultGroupOnDefaultOrganization(); GroupDto group = db.users().insertGroup(); @@ -91,7 +91,7 @@ public class DeleteActionTest { } @Test - public void delete_by_name_on_default_organization() throws Exception { + public void delete_by_name_on_default_organization() { addAdminToDefaultOrganization(); insertDefaultGroupOnDefaultOrganization(); GroupDto group = db.users().insertGroup(); @@ -105,7 +105,7 @@ public class DeleteActionTest { } @Test - public void delete_by_name_and_organization() throws Exception { + public void delete_by_name_and_organization() { OrganizationDto org = db.organizations().insert(); db.users().insertDefaultGroup(org); addAdmin(org); @@ -121,7 +121,7 @@ public class DeleteActionTest { } @Test - public void delete_by_name_fails_if_organization_is_not_correct() throws Exception { + public void delete_by_name_fails_if_organization_is_not_correct() { OrganizationDto org = db.organizations().insert(); db.users().insertDefaultGroup(org); loginAsAdmin(org); @@ -136,7 +136,7 @@ public class DeleteActionTest { } @Test - public void delete_members() throws Exception { + public void delete_members() { addAdminToDefaultOrganization(); insertDefaultGroupOnDefaultOrganization(); GroupDto group = db.users().insertGroup(); @@ -152,7 +152,7 @@ public class DeleteActionTest { } @Test - public void delete_permissions() throws Exception { + public void delete_permissions() { addAdminToDefaultOrganization(); insertDefaultGroupOnDefaultOrganization(); GroupDto group = db.users().insertGroup(); @@ -168,7 +168,7 @@ public class DeleteActionTest { } @Test - public void delete_group_from_permission_templates() throws Exception { + public void delete_group_from_permission_templates() { addAdminToDefaultOrganization(); insertDefaultGroupOnDefaultOrganization(); GroupDto group = db.users().insertGroup(); @@ -186,7 +186,7 @@ public class DeleteActionTest { } @Test - public void delete_qprofile_permissions() throws Exception { + public void delete_qprofile_permissions() { addAdminToDefaultOrganization(); insertDefaultGroupOnDefaultOrganization(); GroupDto group = db.users().insertGroup(); @@ -202,7 +202,7 @@ public class DeleteActionTest { } @Test - public void fail_if_id_does_not_exist() throws Exception { + public void fail_if_id_does_not_exist() { addAdminToDefaultOrganization(); loginAsAdminOnDefaultOrganization(); int groupId = 123; @@ -216,7 +216,7 @@ public class DeleteActionTest { } @Test - public void fail_to_delete_default_group_of_default_organization() throws Exception { + public void fail_to_delete_default_group_of_default_organization() { loginAsAdminOnDefaultOrganization(); GroupDto defaultGroup = db.users().insertDefaultGroup(db.getDefaultOrganization(), "default"); @@ -229,7 +229,7 @@ public class DeleteActionTest { } @Test - public void fail_to_delete_group_of_a_none_default_organization() throws Exception { + public void fail_to_delete_group_of_a_none_default_organization() { OrganizationDto org = db.organizations().insert(); GroupDto defaultGroup = db.users().insertDefaultGroup(org, "default"); addAdmin(org); @@ -244,7 +244,7 @@ public class DeleteActionTest { } @Test - public void cannot_delete_last_system_admin_group() throws Exception { + public void cannot_delete_last_system_admin_group() { insertDefaultGroupOnDefaultOrganization(); GroupDto group = db.users().insertGroup(); db.users().insertPermissionOnGroup(group, SYSTEM_ADMIN); @@ -292,7 +292,7 @@ public class DeleteActionTest { assertThat(db.users().selectGroupPermissions(adminGroup2, null)).hasSize(1); } - private void executeDeleteGroupRequest(GroupDto adminGroup1) throws Exception { + private void executeDeleteGroupRequest(GroupDto adminGroup1) { newRequest() .setParam(PARAM_GROUP_ID, adminGroup1.getId().toString()) .execute(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/RemoveUserActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/RemoveUserActionTest.java index ac98090e5c4..6156e75075f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/RemoveUserActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/RemoveUserActionTest.java @@ -59,7 +59,7 @@ public class RemoveUserActionTest { new RemoveUserAction(db.getDbClient(), userSession, new GroupWsSupport(db.getDbClient(), defaultOrganizationProvider, new DefaultGroupFinder(db.getDbClient())))); @Test - public void does_nothing_if_user_is_not_in_group() throws Exception { + public void does_nothing_if_user_is_not_in_group() { // keep an administrator insertAnAdministratorInDefaultOrganization(); insertDefaultGroupOnDefaultOrganization(); @@ -77,7 +77,7 @@ public class RemoveUserActionTest { } @Test - public void remove_user_by_group_id() throws Exception { + public void remove_user_by_group_id() { // keep an administrator insertAnAdministratorInDefaultOrganization(); insertDefaultGroupOnDefaultOrganization(); @@ -95,7 +95,7 @@ public class RemoveUserActionTest { } @Test - public void remove_user_by_group_name_in_default_organization() throws Exception { + public void remove_user_by_group_name_in_default_organization() { insertAnAdministratorInDefaultOrganization(); insertDefaultGroupOnDefaultOrganization(); GroupDto group = db.users().insertGroup(db.getDefaultOrganization(), "a_group"); @@ -112,7 +112,7 @@ public class RemoveUserActionTest { } @Test - public void remove_user_by_group_name_in_specific_organization() throws Exception { + public void remove_user_by_group_name_in_specific_organization() { OrganizationDto org = db.organizations().insert(); db.users().insertDefaultGroup(org); GroupDto group = db.users().insertGroup(org, "a_group"); @@ -133,7 +133,7 @@ public class RemoveUserActionTest { } @Test - public void remove_user_only_from_one_group() throws Exception { + public void remove_user_only_from_one_group() { // keep an administrator insertAnAdministratorInDefaultOrganization(); insertDefaultGroupOnDefaultOrganization(); @@ -155,7 +155,7 @@ public class RemoveUserActionTest { } @Test - public void response_status_is_no_content() throws Exception { + public void response_status_is_no_content() { // keep an administrator insertAnAdministratorInDefaultOrganization(); insertDefaultGroupOnDefaultOrganization(); @@ -173,7 +173,7 @@ public class RemoveUserActionTest { } @Test - public void fail_if_unknown_group() throws Exception { + public void fail_if_unknown_group() { UserDto user = db.users().insertUser("my-admin"); expectedException.expect(NotFoundException.class); @@ -186,7 +186,7 @@ public class RemoveUserActionTest { } @Test - public void fail_if_unknown_user() throws Exception { + public void fail_if_unknown_user() { insertDefaultGroupOnDefaultOrganization(); GroupDto group = db.users().insertGroup(db.getDefaultOrganization(), "admins"); @@ -200,7 +200,7 @@ public class RemoveUserActionTest { } @Test - public void throw_ForbiddenException_if_not_administrator_of_organization() throws Exception { + public void throw_ForbiddenException_if_not_administrator_of_organization() { OrganizationDto org = db.organizations().insert(); GroupDto group = db.users().insertGroup(org, "a-group"); UserDto user = db.users().insertUser(); @@ -217,7 +217,7 @@ public class RemoveUserActionTest { } @Test - public void fail_to_remove_the_last_administrator() throws Exception { + public void fail_to_remove_the_last_administrator() { OrganizationDto org = db.organizations().insert(); db.users().insertDefaultGroup(org); GroupDto adminGroup = db.users().insertGroup(org, "sonar-admins"); @@ -236,7 +236,7 @@ public class RemoveUserActionTest { } @Test - public void fail_to_remove_user_from_default_group() throws Exception { + public void fail_to_remove_user_from_default_group() { OrganizationDto organization = db.organizations().insert(); UserDto user = db.users().insertUser(); GroupDto defaultGroup = db.users().insertDefaultGroup(organization, "default"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/SearchActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/SearchActionTest.java index 36c08891516..51fe67ec086 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/SearchActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/SearchActionTest.java @@ -65,7 +65,7 @@ public class SearchActionTest { private WsActionTester ws = new WsActionTester(new SearchAction(db.getDbClient(), userSession, newGroupWsSupport(), new DefaultGroupFinder(db.getDbClient()))); @Test - public void search_without_parameters() throws Exception { + public void search_without_parameters() { insertDefaultGroup(db.getDefaultOrganization(), "users", 0); insertGroup(db.getDefaultOrganization(), "admins", 0); insertGroup(db.getDefaultOrganization(), "customer1", 0); @@ -84,7 +84,7 @@ public class SearchActionTest { } @Test - public void search_with_members() throws Exception { + public void search_with_members() { insertDefaultGroup(db.getDefaultOrganization(), "users", 5); insertGroup(db.getDefaultOrganization(), "admins", 1); insertGroup(db.getDefaultOrganization(), "customer1", 0); @@ -103,7 +103,7 @@ public class SearchActionTest { } @Test - public void search_with_query() throws Exception { + public void search_with_query() { insertDefaultGroup(db.getDefaultOrganization(), "users", 0); insertGroup(db.getDefaultOrganization(), "admins", 0); insertGroup(db.getDefaultOrganization(), "customer%_%/1", 0); @@ -120,7 +120,7 @@ public class SearchActionTest { } @Test - public void search_with_paging() throws Exception { + public void search_with_paging() { insertDefaultGroup(db.getDefaultOrganization(), "users", 0); insertGroup(db.getDefaultOrganization(), "admins", 0); insertGroup(db.getDefaultOrganization(), "customer1", 0); @@ -147,7 +147,7 @@ public class SearchActionTest { } @Test - public void search_with_fields() throws Exception { + public void search_with_fields() { insertDefaultGroup(db.getDefaultOrganization(), "sonar-users", 0); loginAsDefaultOrgAdmin(); @@ -164,7 +164,7 @@ public class SearchActionTest { } @Test - public void search_in_organization() throws Exception { + public void search_in_organization() { OrganizationDto org = db.organizations().insert(); GroupDto group = db.users().insertDefaultGroup(org, "users"); // the group in default org is not returned @@ -178,7 +178,7 @@ public class SearchActionTest { } @Test - public void return_default_group() throws Exception { + public void return_default_group() { db.users().insertDefaultGroup(db.getDefaultOrganization(), "default"); loginAsDefaultOrgAdmin(); @@ -188,7 +188,7 @@ public class SearchActionTest { } @Test - public void fail_when_no_default_group() throws Exception { + public void fail_when_no_default_group() { db.users().insertGroup(db.getDefaultOrganization(), "users"); loginAsDefaultOrgAdmin(); @@ -199,7 +199,7 @@ public class SearchActionTest { } @Test - public void fail_when_not_logged_in() throws Exception { + public void fail_when_not_logged_in() { userSession.anonymous(); expectedException.expect(UnauthorizedException.class); diff --git a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UpdateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UpdateActionTest.java index a8f88a59530..cca2839eeb8 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UpdateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UpdateActionTest.java @@ -53,7 +53,7 @@ public class UpdateActionTest { new UpdateAction(db.getDbClient(), userSession, new GroupWsSupport(db.getDbClient(), defaultOrganizationProvider, new DefaultGroupFinder(db.getDbClient())))); @Test - public void update_both_name_and_description() throws Exception { + public void update_both_name_and_description() { insertDefaultGroupOnDefaultOrganization(); GroupDto group = db.users().insertGroup(); UserDto user = db.users().insertUser(); @@ -77,7 +77,7 @@ public class UpdateActionTest { } @Test - public void update_only_name() throws Exception { + public void update_only_name() { insertDefaultGroupOnDefaultOrganization(); GroupDto group = db.users().insertGroup(); loginAsAdminOnDefaultOrganization(); @@ -97,7 +97,7 @@ public class UpdateActionTest { } @Test - public void update_only_description() throws Exception { + public void update_only_description() { insertDefaultGroupOnDefaultOrganization(); GroupDto group = db.users().insertGroup(); loginAsAdminOnDefaultOrganization(); @@ -117,7 +117,7 @@ public class UpdateActionTest { } @Test - public void return_default_field() throws Exception { + public void return_default_field() { insertDefaultGroupOnDefaultOrganization(); GroupDto group = db.users().insertGroup(); loginAsAdminOnDefaultOrganization(); @@ -138,7 +138,7 @@ public class UpdateActionTest { } @Test - public void require_admin_permission_on_organization() throws Exception { + public void require_admin_permission_on_organization() { insertDefaultGroupOnDefaultOrganization(); GroupDto group = db.users().insertGroup(); userSession.logIn("not-admin"); @@ -153,7 +153,7 @@ public class UpdateActionTest { } @Test - public void fails_if_admin_of_another_organization_only() throws Exception { + public void fails_if_admin_of_another_organization_only() { OrganizationDto org1 = db.organizations().insert(); OrganizationDto org2 = db.organizations().insert(); GroupDto group = db.users().insertGroup(org1, "group1"); @@ -171,7 +171,7 @@ public class UpdateActionTest { } @Test - public void fail_if_name_is_too_short() throws Exception { + public void fail_if_name_is_too_short() { insertDefaultGroupOnDefaultOrganization(); GroupDto group = db.users().insertGroup(); loginAsAdminOnDefaultOrganization(); @@ -186,7 +186,7 @@ public class UpdateActionTest { } @Test - public void fail_if_new_name_is_anyone() throws Exception { + public void fail_if_new_name_is_anyone() { insertDefaultGroupOnDefaultOrganization(); GroupDto group = db.users().insertGroup(); loginAsAdminOnDefaultOrganization(); @@ -201,7 +201,7 @@ public class UpdateActionTest { } @Test - public void fail_to_update_if_name_already_exists() throws Exception { + public void fail_to_update_if_name_already_exists() { insertDefaultGroupOnDefaultOrganization(); OrganizationDto defaultOrg = db.getDefaultOrganization(); GroupDto groupToBeRenamed = db.users().insertGroup(defaultOrg, "a name"); @@ -219,7 +219,7 @@ public class UpdateActionTest { } @Test - public void fail_if_unknown_group_id() throws Exception { + public void fail_if_unknown_group_id() { loginAsAdminOnDefaultOrganization(); expectedException.expect(NotFoundException.class); @@ -231,7 +231,7 @@ public class UpdateActionTest { } @Test - public void fail_to_update_default_group_name() throws Exception { + public void fail_to_update_default_group_name() { GroupDto group = db.users().insertDefaultGroup(db.getDefaultOrganization(), "default"); loginAsAdminOnDefaultOrganization(); @@ -245,7 +245,7 @@ public class UpdateActionTest { } @Test - public void fail_to_update_default_group_description() throws Exception { + public void fail_to_update_default_group_description() { GroupDto group = db.users().insertDefaultGroup(db.getDefaultOrganization(), "default"); loginAsAdminOnDefaultOrganization(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UsersActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UsersActionTest.java index cf7ebb83c64..31e4a6b6908 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UsersActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/usergroups/ws/UsersActionTest.java @@ -56,7 +56,7 @@ public class UsersActionTest { new UsersAction(db.getDbClient(), userSession, new GroupWsSupport(db.getDbClient(), defaultOrganizationProvider, new DefaultGroupFinder(db.getDbClient())))); @Test - public void fail_if_unknown_group_id() throws Exception { + public void fail_if_unknown_group_id() { loginAsAdminOnDefaultOrganization(); expectedException.expect(NotFoundException.class); @@ -68,7 +68,7 @@ public class UsersActionTest { } @Test - public void fail_if_not_admin_of_organization() throws Exception { + public void fail_if_not_admin_of_organization() { GroupDto group = db.users().insertGroup(); userSession.logIn("not-admin"); @@ -80,7 +80,7 @@ public class UsersActionTest { } @Test - public void fail_if_admin_of_other_organization_only() throws Exception { + public void fail_if_admin_of_other_organization_only() { OrganizationDto org1 = db.organizations().insert(); OrganizationDto org2 = db.organizations().insert(); GroupDto group = db.users().insertGroup(org1, "the-group"); @@ -94,7 +94,7 @@ public class UsersActionTest { } @Test - public void group_has_no_users() throws Exception { + public void group_has_no_users() { GroupDto group = db.users().insertGroup(); loginAsAdminOnDefaultOrganization(); @@ -112,7 +112,7 @@ public class UsersActionTest { } @Test - public void return_members_by_group_id() throws Exception { + public void return_members_by_group_id() { GroupDto group = db.users().insertGroup(); UserDto lovelace = db.users().insertUser(newUserDto().setLogin("ada.login").setName("Ada Lovelace")); db.organizations().addMember(db.getDefaultOrganization(), lovelace); @@ -136,7 +136,7 @@ public class UsersActionTest { } @Test - public void references_group_by_its_name() throws Exception { + public void references_group_by_its_name() { OrganizationDto org = db.organizations().insert(); GroupDto group = db.users().insertGroup(org, "the-group"); UserDto lovelace = db.users().insertUser(newUserDto().setLogin("ada.login").setName("Ada Lovelace")); @@ -162,7 +162,7 @@ public class UsersActionTest { } @Test - public void references_group_in_default_organization_by_its_name() throws Exception { + public void references_group_in_default_organization_by_its_name() { GroupDto group = db.users().insertGroup(); UserDto lovelace = db.users().insertUser(newUserDto().setLogin("ada.login").setName("Ada Lovelace")); db.organizations().addMember(db.getDefaultOrganization(), lovelace); @@ -186,7 +186,7 @@ public class UsersActionTest { } @Test - public void filter_members_by_name() throws Exception { + public void filter_members_by_name() { GroupDto group = db.users().insertGroup(db.getDefaultOrganization(), "a group"); UserDto adaLovelace = db.users().insertUser(newUserDto().setLogin("ada").setName("Ada Lovelace")); db.organizations().addMember(db.getDefaultOrganization(), adaLovelace); @@ -202,7 +202,7 @@ public class UsersActionTest { } @Test - public void selected_users() throws Exception { + public void selected_users() { GroupDto group = db.users().insertGroup(db.getDefaultOrganization(), "a group"); UserDto lovelace = db.users().insertUser(newUserDto().setLogin("ada").setName("Ada Lovelace")); db.organizations().addMember(db.getDefaultOrganization(), lovelace); @@ -232,7 +232,7 @@ public class UsersActionTest { } @Test - public void deselected_users() throws Exception { + public void deselected_users() { GroupDto group = db.users().insertGroup(); UserDto lovelace = db.users().insertUser(newUserDto().setLogin("ada").setName("Ada Lovelace")); db.organizations().addMember(db.getDefaultOrganization(), lovelace); @@ -255,7 +255,7 @@ public class UsersActionTest { } @Test - public void paging() throws Exception { + public void paging() { GroupDto group = db.users().insertGroup(); UserDto lovelace = db.users().insertUser(newUserDto().setLogin("ada").setName("Ada Lovelace")); db.organizations().addMember(db.getDefaultOrganization(), lovelace); @@ -295,7 +295,7 @@ public class UsersActionTest { } @Test - public void filtering_by_name_email_and_login() throws Exception { + public void filtering_by_name_email_and_login() { GroupDto group = db.users().insertGroup(); UserDto lovelace = db.users().insertUser(newUserDto().setLogin("ada.login").setName("Ada Lovelace").setEmail("ada@email.com")); db.organizations().addMember(db.getDefaultOrganization(), lovelace); diff --git a/server/sonar-server/src/test/java/org/sonar/server/util/AbstractStoppableExecutorServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/util/AbstractStoppableExecutorServiceTest.java index 033dca78738..6fa78b273eb 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/util/AbstractStoppableExecutorServiceTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/util/AbstractStoppableExecutorServiceTest.java @@ -37,7 +37,7 @@ import static org.mockito.Mockito.when; public class AbstractStoppableExecutorServiceTest { private static final Callable SOME_CALLABLE = new Callable() { @Override - public String call() throws Exception { + public String call() { return null; } }; diff --git a/server/sonar-server/src/test/java/org/sonar/server/view/index/ViewIndexTest.java b/server/sonar-server/src/test/java/org/sonar/server/view/index/ViewIndexTest.java index 4f7d138411c..2f6224d7414 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/view/index/ViewIndexTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/view/index/ViewIndexTest.java @@ -38,7 +38,7 @@ public class ViewIndexTest { ViewIndex index = new ViewIndex(esTester.client()); @Test - public void find_all_view_uuids() throws Exception { + public void find_all_view_uuids() { ViewDoc view1 = new ViewDoc().setUuid("UUID1").setProjects(asList("P1")); ViewDoc view2 = new ViewDoc().setUuid("UUID2").setProjects(asList("P2")); esTester.putDocuments(INDEX_TYPE_VIEW, view1); diff --git a/server/sonar-server/src/test/java/org/sonar/server/webhook/WebhookCallerImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/webhook/WebhookCallerImplTest.java index 563467afe9d..6a5e5270be4 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/webhook/WebhookCallerImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/webhook/WebhookCallerImplTest.java @@ -97,7 +97,7 @@ public class WebhookCallerImplTest { } @Test - public void silently_catch_error_when_url_is_incorrect() throws Exception { + public void silently_catch_error_when_url_is_incorrect() { Webhook webhook = new Webhook(PROJECT_UUID, CE_TASK_UUID, RandomStringUtils.randomAlphanumeric(40),"my-webhook", "this_is_not_an_url"); WebhookDelivery delivery = newSender().call(webhook, PAYLOAD); @@ -156,7 +156,7 @@ public class WebhookCallerImplTest { } @Test - public void redirects_throws_ISE_if_header_Location_is_missing() throws Exception { + public void redirects_throws_ISE_if_header_Location_is_missing() { HttpUrl url = server.url("/redirect"); Webhook webhook = new Webhook(PROJECT_UUID, CE_TASK_UUID, RandomStringUtils.randomAlphanumeric(40),"my-webhook", url.toString()); @@ -171,7 +171,7 @@ public class WebhookCallerImplTest { } @Test - public void redirects_throws_ISE_if_header_Location_does_not_relate_to_a_supported_protocol() throws Exception { + public void redirects_throws_ISE_if_header_Location_does_not_relate_to_a_supported_protocol() { HttpUrl url = server.url("/redirect"); Webhook webhook = new Webhook(PROJECT_UUID, CE_TASK_UUID, RandomStringUtils.randomAlphanumeric(40),"my-webhook", url.toString()); diff --git a/server/sonar-server/src/test/java/org/sonar/server/ws/DeprecatedPropertiesWsFilterTest.java b/server/sonar-server/src/test/java/org/sonar/server/ws/DeprecatedPropertiesWsFilterTest.java index bd9d6dff67b..9f5c6c3b322 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/ws/DeprecatedPropertiesWsFilterTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/ws/DeprecatedPropertiesWsFilterTest.java @@ -60,7 +60,7 @@ public class DeprecatedPropertiesWsFilterTest { } @Test - public void do_get_pattern() throws Exception { + public void do_get_pattern() { assertThat(underTest.doGetPattern().matches("/api/properties")).isTrue(); assertThat(underTest.doGetPattern().matches("/api/properties/")).isTrue(); assertThat(underTest.doGetPattern().matches("/api/properties/my.property")).isTrue(); @@ -305,7 +305,7 @@ public class DeprecatedPropertiesWsFilterTest { } @Override - public int read() throws IOException { + public int read() { return byteArrayInputStream.read(); } } diff --git a/server/sonar-server/src/test/java/org/sonar/server/ws/ServletRequestTest.java b/server/sonar-server/src/test/java/org/sonar/server/ws/ServletRequestTest.java index f587c508e06..bb12e50137d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/ws/ServletRequestTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/ws/ServletRequestTest.java @@ -53,7 +53,7 @@ public class ServletRequestTest { } @Test - public void getMediaType() throws Exception { + public void getMediaType() { when(source.getHeader(HttpHeaders.ACCEPT)).thenReturn(MediaTypes.JSON); when(source.getRequestURI()).thenReturn("/path/to/resource/search"); @@ -61,14 +61,14 @@ public class ServletRequestTest { } @Test - public void default_media_type_is_octet_stream() throws Exception { + public void default_media_type_is_octet_stream() { when(source.getRequestURI()).thenReturn("/path/to/resource/search"); assertThat(underTest.getMediaType()).isEqualTo(MediaTypes.DEFAULT); } @Test - public void media_type_taken_in_url_first() throws Exception { + public void media_type_taken_in_url_first() { when(source.getHeader(HttpHeaders.ACCEPT)).thenReturn(MediaTypes.JSON); when(source.getRequestURI()).thenReturn("/path/to/resource/search.protobuf"); @@ -142,14 +142,14 @@ public class ServletRequestTest { } @Test - public void return_no_input_stream_when_content_type_is_not_multipart() throws Exception { + public void return_no_input_stream_when_content_type_is_not_multipart() { when(source.getContentType()).thenReturn("multipart/form-data"); assertThat(underTest.readInputStreamParam("param1")).isNull(); } @Test - public void return_no_input_stream_when_content_type_is_null() throws Exception { + public void return_no_input_stream_when_content_type_is_null() { when(source.getContentType()).thenReturn(null); assertThat(underTest.readInputStreamParam("param1")).isNull(); @@ -168,7 +168,7 @@ public class ServletRequestTest { } @Test - public void getPath() throws Exception { + public void getPath() { when(source.getRequestURI()).thenReturn("/sonar/path/to/resource/search"); when(source.getContextPath()).thenReturn("/sonar"); diff --git a/server/sonar-server/src/test/java/org/sonar/server/ws/ServletResponseTest.java b/server/sonar-server/src/test/java/org/sonar/server/ws/ServletResponseTest.java index 067814efcf7..475c8ce773c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/ws/ServletResponseTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/ws/ServletResponseTest.java @@ -50,51 +50,51 @@ public class ServletResponseTest { } @Test - public void test_default_header() throws Exception { + public void test_default_header() { verify(response).setHeader("Cache-Control", "no-cache, no-store, must-revalidate"); } @Test - public void set_header() throws Exception { + public void set_header() { underTest.setHeader("header", "value"); verify(response).setHeader("header", "value"); } @Test - public void get_header() throws Exception { + public void get_header() { underTest.getHeader("header"); verify(response).getHeader("header"); } @Test - public void get_header_names() throws Exception { + public void get_header_names() { underTest.getHeaderNames(); verify(response).getHeaderNames(); } @Test - public void test_default_status() throws Exception { + public void test_default_status() { verify(response).setStatus(200); } @Test - public void set_status() throws Exception { + public void set_status() { underTest.stream().setStatus(404); verify(response).setStatus(404); } @Test - public void test_output() throws Exception { + public void test_output() { assertThat(underTest.stream().output()).isEqualTo(output); } @Test - public void test_reset() throws Exception { + public void test_reset() { underTest.stream().reset(); verify(response).reset(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/ws/TestResponse.java b/server/sonar-server/src/test/java/org/sonar/server/ws/TestResponse.java index 66f9772d680..8f833d763a6 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/ws/TestResponse.java +++ b/server/sonar-server/src/test/java/org/sonar/server/ws/TestResponse.java @@ -68,7 +68,7 @@ public class TestResponse { return dumbResponse.getHeader(headerKey); } - public void assertJson(String expectedJson) throws Exception { + public void assertJson(String expectedJson) { JsonAssert.assertJson(getInput()).isSimilarTo(expectedJson); } @@ -80,7 +80,7 @@ public class TestResponse { * @param clazz the test class * @param expectedJsonFilename name of the file containing the expected JSON */ - public void assertJson(Class clazz, String expectedJsonFilename) throws Exception { + public void assertJson(Class clazz, String expectedJsonFilename) { String path = clazz.getSimpleName() + "/" + expectedJsonFilename; URL url = clazz.getResource(path); if (url == null) { diff --git a/server/sonar-server/src/test/java/org/sonar/server/ws/WebServiceFilterTest.java b/server/sonar-server/src/test/java/org/sonar/server/ws/WebServiceFilterTest.java index 4bce6c255b3..64fc78b9095 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/ws/WebServiceFilterTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/ws/WebServiceFilterTest.java @@ -62,7 +62,7 @@ public class WebServiceFilterTest { } @Test - public void match_declared_web_services() throws Exception { + public void match_declared_web_services() { initWebServiceEngine( newWsUrl("api/issues", "search"), newWsUrl("batch", "index")); @@ -75,7 +75,7 @@ public class WebServiceFilterTest { } @Test - public void match_undeclared_web_services_starting_with_api() throws Exception { + public void match_undeclared_web_services_starting_with_api() { initWebServiceEngine(newWsUrl("api/issues", "search")); assertThat(underTest.doGetPattern().matches("/api/resources/index")).isTrue(); @@ -83,14 +83,14 @@ public class WebServiceFilterTest { } @Test - public void does_not_match_web_services_using_servlet_filter() throws Exception { + public void does_not_match_web_services_using_servlet_filter() { initWebServiceEngine(newWsUrl("api/authentication", "login").setHandler(ServletFilterHandler.INSTANCE)); assertThat(underTest.doGetPattern().matches("/api/authentication/login")).isFalse(); } @Test - public void does_not_match_api_properties_ws() throws Exception { + public void does_not_match_api_properties_ws() { initWebServiceEngine(newWsUrl("api/properties", "index")); assertThat(underTest.doGetPattern().matches("/api/properties")).isFalse(); @@ -165,7 +165,7 @@ public class WebServiceFilterTest { INSTANCE; @Override - public void handle(Request request, Response response) throws Exception { + public void handle(Request request, Response response) { // Nothing to do } } diff --git a/server/sonar-server/src/test/java/org/sonar/server/ws/WebServiceReroutingFilterTest.java b/server/sonar-server/src/test/java/org/sonar/server/ws/WebServiceReroutingFilterTest.java index 2575ced863b..4c9e8d6db9b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/ws/WebServiceReroutingFilterTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/ws/WebServiceReroutingFilterTest.java @@ -55,7 +55,7 @@ public class WebServiceReroutingFilterTest { } @Test - public void do_get_pattern() throws Exception { + public void do_get_pattern() { assertThat(underTest.doGetPattern().matches("/api/components/update_key")).isTrue(); assertThat(underTest.doGetPattern().matches("/api/components/bulk_update_key")).isTrue(); assertThat(underTest.doGetPattern().matches("/api/projects/update_key")).isFalse(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/ws/WsTester.java b/server/sonar-server/src/test/java/org/sonar/server/ws/WsTester.java index 30640c14339..90433abb0f2 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/ws/WsTester.java +++ b/server/sonar-server/src/test/java/org/sonar/server/ws/WsTester.java @@ -263,7 +263,7 @@ public class WsTester { return response.output.toByteArray(); } - public Result assertJson(String expectedJson) throws Exception { + public Result assertJson(String expectedJson) { String json = outputAsString(); JsonAssert.assertJson(json).isSimilarTo(expectedJson); return this; @@ -277,7 +277,7 @@ public class WsTester { * @param clazz the test class * @param expectedJsonFilename name of the file containing the expected JSON */ - public Result assertJson(Class clazz, String expectedJsonFilename) throws Exception { + public Result assertJson(Class clazz, String expectedJsonFilename) { String path = clazz.getSimpleName() + "/" + expectedJsonFilename; URL url = clazz.getResource(path); if (url == null) { diff --git a/server/sonar-server/src/test/java/org/sonar/server/ws/WsUtilsTest.java b/server/sonar-server/src/test/java/org/sonar/server/ws/WsUtilsTest.java index bd279a14919..6aedc3e47a3 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/ws/WsUtilsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/ws/WsUtilsTest.java @@ -41,7 +41,7 @@ public class WsUtilsTest { public LogTester logger = new LogTester(); @Test - public void write_json_by_default() throws Exception { + public void write_json_by_default() { TestRequest request = new TestRequest(); DumbResponse response = new DumbResponse(); @@ -69,7 +69,7 @@ public class WsUtilsTest { } @Test - public void rethrow_error_as_ISE_when_error_writing_message() throws IOException { + public void rethrow_error_as_ISE_when_error_writing_message() { TestRequest request = new TestRequest(); request.setMediaType(MediaTypes.PROTOBUF); diff --git a/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssue.java b/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssue.java index b4cee97eb91..3192a5304bc 100644 --- a/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssue.java +++ b/sonar-core/src/main/java/org/sonar/core/issue/DefaultIssue.java @@ -482,7 +482,7 @@ public class DefaultIssue implements Issue, Trackable, org.sonar.api.ce.measure. @Override public Map attributes() { - return attributes == null ? Collections.emptyMap() : ImmutableMap.copyOf(attributes); + return attributes == null ? Collections.emptyMap() : ImmutableMap.copyOf(attributes); } public DefaultIssue setAttributes(@Nullable Map map) { diff --git a/sonar-core/src/main/java/org/sonar/core/util/CloseableIterator.java b/sonar-core/src/main/java/org/sonar/core/util/CloseableIterator.java index 539e66f575a..2bf436033ed 100644 --- a/sonar-core/src/main/java/org/sonar/core/util/CloseableIterator.java +++ b/sonar-core/src/main/java/org/sonar/core/util/CloseableIterator.java @@ -46,7 +46,7 @@ public abstract class CloseableIterator implements Iterator, AutoCloseable } @Override - protected void doClose() throws Exception { + protected void doClose() { // do nothing } }; @@ -173,7 +173,7 @@ public abstract class CloseableIterator implements Iterator, AutoCloseable } @Override - protected void doClose() throws Exception { + protected void doClose() { // do nothing } } diff --git a/sonar-core/src/main/java/org/sonar/core/util/logs/DefaultProfiler.java b/sonar-core/src/main/java/org/sonar/core/util/logs/DefaultProfiler.java index 99664224b35..be8d33be3ae 100644 --- a/sonar-core/src/main/java/org/sonar/core/util/logs/DefaultProfiler.java +++ b/sonar-core/src/main/java/org/sonar/core/util/logs/DefaultProfiler.java @@ -283,10 +283,7 @@ class DefaultProfiler extends Profiler { if (level == LoggerLevel.TRACE && !logger.isTraceEnabled()) { return false; } - if (level == LoggerLevel.DEBUG && !logger.isDebugEnabled()) { - return false; - } - return true; + return level != LoggerLevel.DEBUG || logger.isDebugEnabled(); } @Override diff --git a/sonar-core/src/test/java/org/sonar/core/i18n/I18nClassloaderTest.java b/sonar-core/src/test/java/org/sonar/core/i18n/I18nClassloaderTest.java index 8e6a0c94367..60046991b57 100644 --- a/sonar-core/src/test/java/org/sonar/core/i18n/I18nClassloaderTest.java +++ b/sonar-core/src/test/java/org/sonar/core/i18n/I18nClassloaderTest.java @@ -46,7 +46,7 @@ public class I18nClassloaderTest { public void aggregate_plugin_classloaders() { URLClassLoader checkstyle = newCheckstyleClassloader(); - I18nClassloader i18nClassloader = new I18nClassloader(Lists.newArrayList(checkstyle)); + I18nClassloader i18nClassloader = new I18nClassloader(Lists.newArrayList(checkstyle)); assertThat(i18nClassloader.getResource("org/sonar/l10n/checkstyle.properties")).isNotNull(); assertThat(i18nClassloader.getResource("org/sonar/l10n/checkstyle.properties").getFile()).endsWith("checkstyle.properties"); } diff --git a/sonar-core/src/test/java/org/sonar/core/util/CloseableIteratorTest.java b/sonar-core/src/test/java/org/sonar/core/util/CloseableIteratorTest.java index d36d07131a4..507339e1ed5 100644 --- a/sonar-core/src/test/java/org/sonar/core/util/CloseableIteratorTest.java +++ b/sonar-core/src/test/java/org/sonar/core/util/CloseableIteratorTest.java @@ -160,13 +160,13 @@ public class CloseableIteratorTest { } @Test(expected = IllegalArgumentException.class) - public void wrap_fails_if_iterator_declared_in_other_closeables() throws Exception { + public void wrap_fails_if_iterator_declared_in_other_closeables() { CloseableIterator iterator = new SimpleCloseableIterator(); CloseableIterator.wrap(iterator, iterator); } @Test(expected = NullPointerException.class) - public void wrap_fails_if_null_closeable() throws Exception { + public void wrap_fails_if_null_closeable() { CloseableIterator.wrap(new SimpleCloseableIterator(), null); } @@ -189,7 +189,7 @@ public class CloseableIteratorTest { } @Override - public void close() throws IOException { + public void close() { // no need to implement it for real } } diff --git a/sonar-core/src/test/java/org/sonar/core/util/ContextExceptionTest.java b/sonar-core/src/test/java/org/sonar/core/util/ContextExceptionTest.java index 470a99b93ff..33d5de76398 100644 --- a/sonar-core/src/test/java/org/sonar/core/util/ContextExceptionTest.java +++ b/sonar-core/src/test/java/org/sonar/core/util/ContextExceptionTest.java @@ -28,7 +28,7 @@ public class ContextExceptionTest { public static final String LABEL = "something wrong"; @Test - public void only_label() throws Exception { + public void only_label() { ContextException e = ContextException.of(LABEL); assertThat(e.getMessage()).isEqualTo(LABEL); assertThat(e.getRawMessage()).isEqualTo(LABEL); @@ -36,7 +36,7 @@ public class ContextExceptionTest { } @Test - public void only_cause() throws Exception { + public void only_cause() { Exception cause = new Exception("cause"); ContextException e = ContextException.of(cause); assertThat(e.getMessage()).isEqualTo("java.lang.Exception: cause"); @@ -45,7 +45,7 @@ public class ContextExceptionTest { } @Test - public void cause_and_message() throws Exception { + public void cause_and_message() { Exception cause = new Exception("cause"); ContextException e = ContextException.of(LABEL, cause); assertThat(e.getMessage()).isEqualTo(LABEL); @@ -54,7 +54,7 @@ public class ContextExceptionTest { } @Test - public void addContext() throws Exception { + public void addContext() { ContextException e = ContextException.of(LABEL) .addContext("K1", "V1") .addContext("K2", "V2"); @@ -62,7 +62,7 @@ public class ContextExceptionTest { } @Test - public void setContext() throws Exception { + public void setContext() { ContextException e = ContextException.of(LABEL) .addContext("K1", "V1") .setContext("K1", "V2"); @@ -70,7 +70,7 @@ public class ContextExceptionTest { } @Test - public void multiple_context_values() throws Exception { + public void multiple_context_values() { ContextException e = ContextException.of(LABEL) .addContext("K1", "V1") .addContext("K1", "V2"); @@ -78,7 +78,7 @@ public class ContextExceptionTest { } @Test - public void merge_ContextException() throws Exception { + public void merge_ContextException() { ContextException cause = ContextException.of("cause").addContext("K1", "V1"); ContextException e = ContextException.of(cause) .addContext("K1", "V11") @@ -89,7 +89,7 @@ public class ContextExceptionTest { } @Test - public void merge_ContextException_with_new_message() throws Exception { + public void merge_ContextException_with_new_message() { ContextException cause = ContextException.of("cause").addContext("K1", "V1"); ContextException e = ContextException.of(LABEL, cause).addContext("K2", "V2"); assertThat(e.getContext("K1")).containsOnly("V1"); diff --git a/sonar-core/src/test/java/org/sonar/core/util/HttpsTrustTest.java b/sonar-core/src/test/java/org/sonar/core/util/HttpsTrustTest.java index d8b1021dbb8..7f2809dd10b 100644 --- a/sonar-core/src/test/java/org/sonar/core/util/HttpsTrustTest.java +++ b/sonar-core/src/test/java/org/sonar/core/util/HttpsTrustTest.java @@ -72,7 +72,7 @@ public class HttpsTrustTest { } @Test - public void testAlwaysTrustManager() throws Exception { + public void testAlwaysTrustManager() { HttpsTrust.AlwaysTrustManager manager = new HttpsTrust.AlwaysTrustManager(); assertThat(manager.getAcceptedIssuers()).isEmpty(); // does nothing diff --git a/sonar-core/src/test/java/org/sonar/core/util/MacAddressProviderTest.java b/sonar-core/src/test/java/org/sonar/core/util/MacAddressProviderTest.java index 0824488d1d1..e92bc22aa42 100644 --- a/sonar-core/src/test/java/org/sonar/core/util/MacAddressProviderTest.java +++ b/sonar-core/src/test/java/org/sonar/core/util/MacAddressProviderTest.java @@ -26,7 +26,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class MacAddressProviderTest { @Test - public void getSecureMungedAddress() throws Exception { + public void getSecureMungedAddress() { byte[] address = MacAddressProvider.getSecureMungedAddress(); assertThat(address).isNotEmpty(); assertThat(address).hasSize(6); diff --git a/sonar-core/src/test/java/org/sonar/core/util/ProgressLoggerTest.java b/sonar-core/src/test/java/org/sonar/core/util/ProgressLoggerTest.java index 4e358d962d9..8b67d094115 100644 --- a/sonar-core/src/test/java/org/sonar/core/util/ProgressLoggerTest.java +++ b/sonar-core/src/test/java/org/sonar/core/util/ProgressLoggerTest.java @@ -36,7 +36,7 @@ public class ProgressLoggerTest { public LogTester logTester = new LogTester(); @Test(timeout = 5_000L) - public void log_at_fixed_intervals() throws Exception { + public void log_at_fixed_intervals() { AtomicLong counter = new AtomicLong(42L); ProgressLogger progress = new ProgressLogger("ProgressLoggerTest", counter, Loggers.get(getClass())); progress.setPeriodMs(1L); diff --git a/sonar-core/src/test/java/org/sonar/core/util/ProtobufJsonFormatTest.java b/sonar-core/src/test/java/org/sonar/core/util/ProtobufJsonFormatTest.java index 55f6e585b8f..0b0b7e80cd5 100644 --- a/sonar-core/src/test/java/org/sonar/core/util/ProtobufJsonFormatTest.java +++ b/sonar-core/src/test/java/org/sonar/core/util/ProtobufJsonFormatTest.java @@ -211,7 +211,7 @@ public class ProtobufJsonFormatTest { } @Test - public void constructor_is_private() throws Exception { + public void constructor_is_private() { assertThat(TestUtils.hasOnlyPrivateConstructors(ProtobufJsonFormat.class)).isTrue(); } } diff --git a/sonar-core/src/test/java/org/sonar/core/util/UuidFactoryFastTest.java b/sonar-core/src/test/java/org/sonar/core/util/UuidFactoryFastTest.java index 49ee0d07c0e..12f796a2d74 100644 --- a/sonar-core/src/test/java/org/sonar/core/util/UuidFactoryFastTest.java +++ b/sonar-core/src/test/java/org/sonar/core/util/UuidFactoryFastTest.java @@ -34,7 +34,7 @@ public class UuidFactoryFastTest { } @Test - public void test_format_of_uuid() throws Exception { + public void test_format_of_uuid() { String uuid = underTest.create(); assertThat(uuid.length()).isGreaterThan(10).isLessThan(40); diff --git a/sonar-core/src/test/java/org/sonar/core/util/UuidFactoryImplTest.java b/sonar-core/src/test/java/org/sonar/core/util/UuidFactoryImplTest.java index fb3ef42658a..cd6ae3b8bfa 100644 --- a/sonar-core/src/test/java/org/sonar/core/util/UuidFactoryImplTest.java +++ b/sonar-core/src/test/java/org/sonar/core/util/UuidFactoryImplTest.java @@ -35,7 +35,7 @@ public class UuidFactoryImplTest { } @Test - public void test_format_of_uuid() throws Exception { + public void test_format_of_uuid() { String uuid = underTest.create(); assertThat(uuid.length()).isGreaterThan(10).isLessThan(40); diff --git a/sonar-core/src/test/java/org/sonar/core/util/logs/DefaultProfilerTest.java b/sonar-core/src/test/java/org/sonar/core/util/logs/DefaultProfilerTest.java index 79ccc84f851..1d176f3d8e6 100644 --- a/sonar-core/src/test/java/org/sonar/core/util/logs/DefaultProfilerTest.java +++ b/sonar-core/src/test/java/org/sonar/core/util/logs/DefaultProfilerTest.java @@ -50,7 +50,7 @@ public class DefaultProfilerTest { } @Test - public void test_levels() throws Exception { + public void test_levels() { // info by default assertThat(underTest.isDebugEnabled()).isFalse(); assertThat(underTest.isTraceEnabled()).isFalse(); diff --git a/tests/plugins/fake-governance-plugin/src/main/java/ce/ws/BombActivatorAction.java b/tests/plugins/fake-governance-plugin/src/main/java/ce/ws/BombActivatorAction.java index 207661f5ada..31be2ce3bc1 100644 --- a/tests/plugins/fake-governance-plugin/src/main/java/ce/ws/BombActivatorAction.java +++ b/tests/plugins/fake-governance-plugin/src/main/java/ce/ws/BombActivatorAction.java @@ -48,7 +48,7 @@ public class BombActivatorAction implements FakeGoVWsAction { } @Override - public void handle(Request request, Response response) throws Exception { + public void handle(Request request, Response response) { BombType bombType = BombType.valueOf(request.mandatoryParam(PARAM_BOMB_TYPE)); bombConfig.reset(); diff --git a/tests/plugins/fake-governance-plugin/src/main/java/ce/ws/SubmitAction.java b/tests/plugins/fake-governance-plugin/src/main/java/ce/ws/SubmitAction.java index 35744e5ef5b..fb47686044e 100644 --- a/tests/plugins/fake-governance-plugin/src/main/java/ce/ws/SubmitAction.java +++ b/tests/plugins/fake-governance-plugin/src/main/java/ce/ws/SubmitAction.java @@ -46,7 +46,7 @@ public class SubmitAction implements FakeGoVWsAction { } @Override - public void handle(Request request, Response response) throws Exception { + public void handle(Request request, Response response) { String type = request.mandatoryParam(PARAM_TYPE); CeTaskSubmit.Builder submit = ceQueue.prepareSubmit(); diff --git a/tests/plugins/fake-governance-plugin/src/main/java/systemPasscode/SystemPasscodeWebService.java b/tests/plugins/fake-governance-plugin/src/main/java/systemPasscode/SystemPasscodeWebService.java index ee87f516af1..b1682ae6656 100644 --- a/tests/plugins/fake-governance-plugin/src/main/java/systemPasscode/SystemPasscodeWebService.java +++ b/tests/plugins/fake-governance-plugin/src/main/java/systemPasscode/SystemPasscodeWebService.java @@ -41,7 +41,7 @@ public class SystemPasscodeWebService implements WebService, RequestHandler { } @Override - public void handle(Request request, Response response) throws Exception { + public void handle(Request request, Response response) { if (!passcode.isValid(request)) { response.stream().setStatus(HttpURLConnection.HTTP_UNAUTHORIZED); } diff --git a/tests/plugins/fake-governance-plugin/src/main/java/workerCount/RefreshWorkerCountAction.java b/tests/plugins/fake-governance-plugin/src/main/java/workerCount/RefreshWorkerCountAction.java index 61ad50dcc9b..df37590a2ab 100644 --- a/tests/plugins/fake-governance-plugin/src/main/java/workerCount/RefreshWorkerCountAction.java +++ b/tests/plugins/fake-governance-plugin/src/main/java/workerCount/RefreshWorkerCountAction.java @@ -54,7 +54,7 @@ public class RefreshWorkerCountAction implements CeWsAction { } @Override - public void handle(Request request, Response response) throws Exception { + public void handle(Request request, Response response) { String count = request.getParam(PARAM_COUNT).getValue(); try (DbSession dbSession = dbClient.openSession(false)) { dbClient.propertiesDao().saveProperty(new PropertyDto() diff --git a/tests/plugins/ws-plugin/src/main/java/LocalCallWebService.java b/tests/plugins/ws-plugin/src/main/java/LocalCallWebService.java index dd579ad552a..dfd39e39876 100644 --- a/tests/plugins/ws-plugin/src/main/java/LocalCallWebService.java +++ b/tests/plugins/ws-plugin/src/main/java/LocalCallWebService.java @@ -47,7 +47,7 @@ public final class LocalCallWebService implements WebService { private class ProtobufHandler implements RequestHandler { @Override - public void handle(Request request, Response response) throws Exception { + public void handle(Request request, Response response) { WsClient client = wsClientFactory.newClient(request.localConnector()); Ce.TaskTypesWsResponse ceTaskTypes = client.ce().taskTypes(); @@ -57,7 +57,7 @@ public final class LocalCallWebService implements WebService { private class JsonHandler implements RequestHandler { @Override - public void handle(Request request, Response response) throws Exception { + public void handle(Request request, Response response) { WsClient client = wsClientFactory.newClient(request.localConnector()); WsResponse jsonResponse = client.wsConnector().call(new GetRequest("api/issues/search")); @@ -70,7 +70,7 @@ public final class LocalCallWebService implements WebService { private class RequirePermissionHandler implements RequestHandler { @Override - public void handle(Request request, Response response) throws Exception { + public void handle(Request request, Response response) { WsClient client = wsClientFactory.newClient(request.localConnector()); WsResponse jsonResponse = client.wsConnector().call(new GetRequest("api/system/info")); diff --git a/tests/src/test/java/org/sonarqube/tests/analysis/IssueJsonReportTest.java b/tests/src/test/java/org/sonarqube/tests/analysis/IssueJsonReportTest.java index 9fb93047d78..0e4b7ea4311 100644 --- a/tests/src/test/java/org/sonarqube/tests/analysis/IssueJsonReportTest.java +++ b/tests/src/test/java/org/sonarqube/tests/analysis/IssueJsonReportTest.java @@ -64,7 +64,7 @@ public class IssueJsonReportTest { public Tester tester = new Tester(orchestrator).disableOrganizations(); @Test - public void issue_line() throws IOException { + public void issue_line() { ItUtils.restoreProfile(orchestrator, getClass().getResource(RESOURCE_PATH + "one-issue-per-line.xml")); orchestrator.getServer().provisionProject("sample", "xoo-sample"); orchestrator.getServer().associateProjectToQualityProfile("sample", "xoo", "one-issue-per-line"); @@ -98,7 +98,7 @@ public class IssueJsonReportTest { } @Test - public void precise_issue_location() throws IOException { + public void precise_issue_location() { ItUtils.restoreProfile(orchestrator, getClass().getResource(RESOURCE_PATH + "multiline.xml")); orchestrator.getServer().provisionProject("sample-multiline", "xoo-sample"); orchestrator.getServer().associateProjectToQualityProfile("sample-multiline", "xoo", "multiline"); @@ -299,7 +299,7 @@ public class IssueJsonReportTest { return ItUtils.sanitizeTimezones(s); } - private InputStream getResourceInputStream(String resource) throws FileNotFoundException { + private InputStream getResourceInputStream(String resource) { ResourceLocation res = getResource(resource); return getClass().getResourceAsStream(res.getPath()); } diff --git a/tests/src/test/java/org/sonarqube/tests/analysis/PermissionTest.java b/tests/src/test/java/org/sonarqube/tests/analysis/PermissionTest.java index d94a2ede2d0..c12a62753eb 100644 --- a/tests/src/test/java/org/sonarqube/tests/analysis/PermissionTest.java +++ b/tests/src/test/java/org/sonarqube/tests/analysis/PermissionTest.java @@ -69,7 +69,7 @@ public class PermissionTest { } @After - public void tearDown() throws Exception { + public void tearDown() { resetSettings(orchestrator, null, "sonar.forceAuthentication"); userRule.resetUsers(); } @@ -136,7 +136,7 @@ public class PermissionTest { } @Test - public void run_scanner_with_user_having_scan_permission_only_on_project() throws Exception { + public void run_scanner_with_user_having_scan_permission_only_on_project() { userRule.createUser(A_LOGIN, A_PASSWORD); orchestrator.getServer().provisionProject("sample", "sample"); addUserPermission(A_LOGIN, "scan", "sample"); diff --git a/tests/src/test/java/org/sonarqube/tests/analysis/ReportDumpTest.java b/tests/src/test/java/org/sonarqube/tests/analysis/ReportDumpTest.java index 72612cd369e..fec08c0d410 100644 --- a/tests/src/test/java/org/sonarqube/tests/analysis/ReportDumpTest.java +++ b/tests/src/test/java/org/sonarqube/tests/analysis/ReportDumpTest.java @@ -64,7 +64,7 @@ public class ReportDumpTest { verifyUrl(props.getProperty("ceTaskUrl")); } - private void verifyUrl(String url) throws IOException { + private void verifyUrl(String url) { HttpResponse response = orchestrator.getServer().newHttpCall(url).execute(); assertThat(response.isSuccessful()).as(url).isTrue(); assertThat(response.getBodyAsString()).as(url).isNotEmpty(); diff --git a/tests/src/test/java/org/sonarqube/tests/analysis/ScannerTest.java b/tests/src/test/java/org/sonarqube/tests/analysis/ScannerTest.java index b4174c117c3..0fa0f7093e7 100644 --- a/tests/src/test/java/org/sonarqube/tests/analysis/ScannerTest.java +++ b/tests/src/test/java/org/sonarqube/tests/analysis/ScannerTest.java @@ -277,7 +277,7 @@ public class ScannerTest { * SONAR-4239 */ @Test - public void should_display_project_url_after_analysis() throws IOException { + public void should_display_project_url_after_analysis() { orchestrator.getServer().provisionProject("com.sonarsource.it.samples:multi-modules-sample", "Sonar :: Integration Tests :: Multi-modules Sample"); orchestrator.getServer().associateProjectToQualityProfile("com.sonarsource.it.samples:multi-modules-sample", "xoo", "one-issue-per-line"); @@ -341,7 +341,7 @@ public class ScannerTest { * SONAR-4547 */ @Test - public void display_MessageException_without_stacktrace() throws Exception { + public void display_MessageException_without_stacktrace() { orchestrator.getServer().provisionProject("sample", "xoo-sample"); orchestrator.getServer().associateProjectToQualityProfile("sample", "xoo", "one-issue-per-line"); BuildResult result = scanQuietly("shared/xoo-sample", "raiseMessageException", "true"); @@ -358,7 +358,7 @@ public class ScannerTest { * SONAR-4751 */ @Test - public void file_extensions_are_case_insensitive() throws Exception { + public void file_extensions_are_case_insensitive() { orchestrator.getServer().provisionProject("case-sensitive-file-extensions", "Case Sensitive"); orchestrator.getServer().associateProjectToQualityProfile("case-sensitive-file-extensions", "xoo", "one-issue-per-line"); scan("analysis/case-sensitive-file-extensions"); diff --git a/tests/src/test/java/org/sonarqube/tests/analysis/SettingsEncryptionTest.java b/tests/src/test/java/org/sonarqube/tests/analysis/SettingsEncryptionTest.java index 5135bcb5ab2..ee8005fab35 100644 --- a/tests/src/test/java/org/sonarqube/tests/analysis/SettingsEncryptionTest.java +++ b/tests/src/test/java/org/sonarqube/tests/analysis/SettingsEncryptionTest.java @@ -69,7 +69,7 @@ public class SettingsEncryptionTest { * SONAR-2084 */ @Test(expected = BuildFailureException.class) - public void failIfEncryptedPropertyButNoSecretKey() throws Exception { + public void failIfEncryptedPropertyButNoSecretKey() { // path to secret key is missing SonarScanner build = SonarScanner.create(ItUtils.projectDir("shared/xoo-sample")) .setProperty("encryptedProperty", "{aes}9mx5Zq4JVyjeChTcVjEide4kWCwusFl7P2dSVXtg9IY="); diff --git a/tests/src/test/java/org/sonarqube/tests/authorization/ExecuteAnalysisPermissionTest.java b/tests/src/test/java/org/sonarqube/tests/authorization/ExecuteAnalysisPermissionTest.java index 0283c51b7c9..1ac1788f026 100644 --- a/tests/src/test/java/org/sonarqube/tests/authorization/ExecuteAnalysisPermissionTest.java +++ b/tests/src/test/java/org/sonarqube/tests/authorization/ExecuteAnalysisPermissionTest.java @@ -65,7 +65,7 @@ public class ExecuteAnalysisPermissionTest { } @Test - public void should_fail_if_logged_but_no_scan_permission() throws Exception { + public void should_fail_if_logged_but_no_scan_permission() { executeLoggedAnalysis(); removeGlobalPermission("anyone", "scan"); @@ -90,7 +90,7 @@ public class ExecuteAnalysisPermissionTest { } @Test - public void no_need_for_browse_permission_to_scan() throws Exception { + public void no_need_for_browse_permission_to_scan() { // Do a first analysis, no error executeAnonymousAnalysis(); @@ -102,7 +102,7 @@ public class ExecuteAnalysisPermissionTest { } @Test - public void execute_analysis_with_scan_permission_only_on_project() throws Exception { + public void execute_analysis_with_scan_permission_only_on_project() { removeGlobalPermission("anyone", "scan"); addProjectPermission("anyone", PROJECT_KEY, "scan"); diff --git a/tests/src/test/java/org/sonarqube/tests/authorization/ProvisioningPermissionTest.java b/tests/src/test/java/org/sonarqube/tests/authorization/ProvisioningPermissionTest.java index 565d0f8f6ce..fdd652018e4 100644 --- a/tests/src/test/java/org/sonarqube/tests/authorization/ProvisioningPermissionTest.java +++ b/tests/src/test/java/org/sonarqube/tests/authorization/ProvisioningPermissionTest.java @@ -76,7 +76,7 @@ public class ProvisioningPermissionTest { } @AfterClass - public static void restoreData() throws Exception { + public static void restoreData() { tester.wsClient().permissions().addGroup(new AddGroupRequest().setGroupName("anyone").setPermission("provisioning")); } diff --git a/tests/src/test/java/org/sonarqube/tests/ce/BackgroundTasksTest.java b/tests/src/test/java/org/sonarqube/tests/ce/BackgroundTasksTest.java index c6e38d7331c..05b297bee45 100644 --- a/tests/src/test/java/org/sonarqube/tests/ce/BackgroundTasksTest.java +++ b/tests/src/test/java/org/sonarqube/tests/ce/BackgroundTasksTest.java @@ -66,7 +66,7 @@ public class BackgroundTasksTest { } @Test - public void should_not_display_failing_and_search_and_filter_elements_on_project_level_page() throws Exception { + public void should_not_display_failing_and_search_and_filter_elements_on_project_level_page() { runSelenese(ORCHESTRATOR, "/projectAdministration/BackgroundTasksTest/should_not_display_failing_and_search_and_filter_elements_on_project_level_page.html"); } diff --git a/tests/src/test/java/org/sonarqube/tests/ce/CeShutdownTest.java b/tests/src/test/java/org/sonarqube/tests/ce/CeShutdownTest.java index 9fd1c285409..1193f9e1008 100644 --- a/tests/src/test/java/org/sonarqube/tests/ce/CeShutdownTest.java +++ b/tests/src/test/java/org/sonarqube/tests/ce/CeShutdownTest.java @@ -133,7 +133,7 @@ public class CeShutdownTest { return logsTailer; } - void triggerTask() throws InterruptedException { + void triggerTask() { orchestrator.executeBuild(SonarScanner.create(new File("projects/shared/xoo-sample"), "sonar.projectKey", "foo"), false); } @@ -145,11 +145,11 @@ public class CeShutdownTest { return adminWsClient.ce().activityStatus(new ActivityStatusRequest()).getInProgress(); } - boolean hasTaskFinishedSuccessfully() throws Exception { + boolean hasTaskFinishedSuccessfully() { return content.hasLineMatching(Pattern.compile(".* INFO .*Executed task \\| project=foo \\| type=REPORT.*")); } - boolean hasErrorLogs() throws IOException { + boolean hasErrorLogs() { return content.hasText(" ERROR "); } @@ -163,7 +163,7 @@ public class CeShutdownTest { } @Override - public void close() throws Exception { + public void close() { if (stopper != null) { stopper.interrupt(); } diff --git a/tests/src/test/java/org/sonarqube/tests/ce/CeWorkersTest.java b/tests/src/test/java/org/sonarqube/tests/ce/CeWorkersTest.java index 5a170e84bae..82453df03d6 100644 --- a/tests/src/test/java/org/sonarqube/tests/ce/CeWorkersTest.java +++ b/tests/src/test/java/org/sonarqube/tests/ce/CeWorkersTest.java @@ -174,7 +174,7 @@ public class CeWorkersTest { } @Test - public void ce_worker_is_resilient_to_OOM_and_RuntimeException_when_starting_or_stopping_analysis_report_container() throws IOException { + public void ce_worker_is_resilient_to_OOM_and_RuntimeException_when_starting_or_stopping_analysis_report_container() { int initSuccessReportTaskCount = adminWsClient.ce().activity(new ActivityRequest() .setType("REPORT") .setStatus(ImmutableList.of("SUCCESS"))) diff --git a/tests/src/test/java/org/sonarqube/tests/ce/ReportFailureNotificationTest.java b/tests/src/test/java/org/sonarqube/tests/ce/ReportFailureNotificationTest.java index 8063f386bed..d28a0ff8273 100644 --- a/tests/src/test/java/org/sonarqube/tests/ce/ReportFailureNotificationTest.java +++ b/tests/src/test/java/org/sonarqube/tests/ce/ReportFailureNotificationTest.java @@ -67,7 +67,7 @@ public class ReportFailureNotificationTest { private static Wiser smtpServer; @BeforeClass - public static void before() throws Exception { + public static void before() { smtpServer = new Wiser(0); smtpServer.start(); System.out.println("SMTP Server port: " + smtpServer.getServer().getPort()); @@ -81,7 +81,7 @@ public class ReportFailureNotificationTest { } @Before - public void prepare() throws Exception { + public void prepare() { tester.settings().setGlobalSettings( "email.smtp_host.secured", smtpServer.getServer().getHostName(), "email.smtp_port.secured", valueOf(smtpServer.getServer().getPort())); diff --git a/tests/src/test/java/org/sonarqube/tests/duplication/CrossModuleDuplicationsTest.java b/tests/src/test/java/org/sonarqube/tests/duplication/CrossModuleDuplicationsTest.java index 21e708c4f75..eb3ede64201 100644 --- a/tests/src/test/java/org/sonarqube/tests/duplication/CrossModuleDuplicationsTest.java +++ b/tests/src/test/java/org/sonarqube/tests/duplication/CrossModuleDuplicationsTest.java @@ -60,7 +60,7 @@ public class CrossModuleDuplicationsTest { } @Test - public void testDuplications() throws IOException { + public void testDuplications() { analyzeProject(projectDir, PROJECT_KEY, true); verifyDuplicationMeasures(PROJECT_KEY, 2, 54, 2, 56.3); @@ -94,7 +94,7 @@ public class CrossModuleDuplicationsTest { @Test // SONAR-6184 - public void testDuplicationFix() throws IOException { + public void testDuplicationFix() { analyzeProject(projectDir, PROJECT_KEY, true); verifyDuplicationMeasures(PROJECT_KEY + ":module1", 1, 27, 1, 45); diff --git a/tests/src/test/java/org/sonarqube/tests/duplication/CrossProjectDuplicationsTest.java b/tests/src/test/java/org/sonarqube/tests/duplication/CrossProjectDuplicationsTest.java index a6c3670fe59..3b6e1947ee4 100644 --- a/tests/src/test/java/org/sonarqube/tests/duplication/CrossProjectDuplicationsTest.java +++ b/tests/src/test/java/org/sonarqube/tests/duplication/CrossProjectDuplicationsTest.java @@ -79,12 +79,12 @@ public class CrossProjectDuplicationsTest { } @Test - public void origin_project_has_no_duplication_as_it_has_not_been_analyzed_twice() throws Exception { + public void origin_project_has_no_duplication_as_it_has_not_been_analyzed_twice() { assertProjectHasNoDuplication(ORIGIN_PROJECT); } @Test - public void duplicate_project_has_duplication_as_it_has_been_analyzed_twice() throws Exception { + public void duplicate_project_has_duplication_as_it_has_been_analyzed_twice() { Map measures = getMeasuresAsDoubleByMetricKey(orchestrator, DUPLICATE_PROJECT, "duplicated_lines", "duplicated_blocks", "duplicated_files", "duplicated_lines_density"); assertThat(measures.get("duplicated_lines").intValue()).isEqualTo(27); assertThat(measures.get("duplicated_blocks").intValue()).isEqualTo(1); @@ -93,7 +93,7 @@ public class CrossProjectDuplicationsTest { } @Test - public void issue_on_duplicated_blocks_is_generated_on_file() throws Exception { + public void issue_on_duplicated_blocks_is_generated_on_file() { assertThat(issueRule.search(new SearchRequest().setComponentKeys(singletonList(DUPLICATE_FILE)).setRules(singletonList("common-xoo:DuplicatedBlocks"))).getIssuesList()) .hasSize(1); } @@ -109,17 +109,17 @@ public class CrossProjectDuplicationsTest { } @Test - public void project_with_branch_has_no_duplication() throws Exception { + public void project_with_branch_has_no_duplication() { assertProjectHasNoDuplication(DUPLICATE_PROJECT + ":" + BRANCH); } @Test - public void project_with_exclusion_has_no_duplication() throws Exception { + public void project_with_exclusion_has_no_duplication() { assertProjectHasNoDuplication(PROJECT_WITH_EXCLUSION); } @Test - public void project_without_enough_tokens_has_duplication() throws Exception { + public void project_without_enough_tokens_has_duplication() { assertProjectHasNoDuplication(PROJECT_WITHOUT_ENOUGH_TOKENS); } diff --git a/tests/src/test/java/org/sonarqube/tests/duplication/DuplicationsTest.java b/tests/src/test/java/org/sonarqube/tests/duplication/DuplicationsTest.java index 951f72e8d84..30394a1e29b 100644 --- a/tests/src/test/java/org/sonarqube/tests/duplication/DuplicationsTest.java +++ b/tests/src/test/java/org/sonarqube/tests/duplication/DuplicationsTest.java @@ -152,7 +152,7 @@ public class DuplicationsTest { } @Test - public void issues_on_duplicated_blocks_are_generated_on_each_file() throws Exception { + public void issues_on_duplicated_blocks_are_generated_on_each_file() { assertThat(issueRule.search(new SearchRequest().setRules(singletonList("common-xoo:DuplicatedBlocks"))).getIssuesList()).hasSize(13); } diff --git a/tests/src/test/java/org/sonarqube/tests/duplication/NewDuplicationsTest.java b/tests/src/test/java/org/sonarqube/tests/duplication/NewDuplicationsTest.java index 4517db89523..1fe1967a100 100644 --- a/tests/src/test/java/org/sonarqube/tests/duplication/NewDuplicationsTest.java +++ b/tests/src/test/java/org/sonarqube/tests/duplication/NewDuplicationsTest.java @@ -56,7 +56,7 @@ public class NewDuplicationsTest { } @Test - public void new_duplications_on_project() throws Exception { + public void new_duplications_on_project() { Map measures = getMeasures("new-duplications"); assertThat(parseDouble(measures.get("new_lines").getPeriods().getPeriodsValue(0).getValue())).isEqualTo(83d, DEFAULT_OFFSET); assertThat(parseDouble(measures.get("new_duplicated_lines").getPeriods().getPeriodsValue(0).getValue())).isEqualTo(71d, DEFAULT_OFFSET); @@ -65,7 +65,7 @@ public class NewDuplicationsTest { } @Test - public void new_duplications_on_directory() throws Exception { + public void new_duplications_on_directory() { Map measures = getMeasures("new-duplications:src/main/xoo/duplicated_lines_with_other_dir1"); assertThat(parseDouble(measures.get("new_lines").getPeriods().getPeriodsValue(0).getValue())).isEqualTo(24d, DEFAULT_OFFSET); assertThat(parseDouble(measures.get("new_duplicated_lines").getPeriods().getPeriodsValue(0).getValue())).isEqualTo(24d, DEFAULT_OFFSET); @@ -74,7 +74,7 @@ public class NewDuplicationsTest { } @Test - public void new_duplications_on_file() throws Exception { + public void new_duplications_on_file() { Map measures = getMeasures("new-duplications:src/main/xoo/duplicated_lines_within_same_file/DuplicatedLinesInSameFile.xoo"); assertThat(parseDouble(measures.get("new_lines").getPeriods().getPeriodsValue(0).getValue())).isEqualTo(41d, DEFAULT_OFFSET); assertThat(parseDouble(measures.get("new_duplicated_lines").getPeriods().getPeriodsValue(0).getValue())).isEqualTo(29d, DEFAULT_OFFSET); diff --git a/tests/src/test/java/org/sonarqube/tests/issue/AutoAssignTest.java b/tests/src/test/java/org/sonarqube/tests/issue/AutoAssignTest.java index 53a9cf063c7..258ef9b92f3 100644 --- a/tests/src/test/java/org/sonarqube/tests/issue/AutoAssignTest.java +++ b/tests/src/test/java/org/sonarqube/tests/issue/AutoAssignTest.java @@ -60,7 +60,7 @@ public class AutoAssignTest extends AbstractIssueTest { } @After - public void resetData() throws Exception { + public void resetData() { newAdminWsClient(ORCHESTRATOR).wsConnector().call(new PostRequest("api/projects/delete").setParam("project", "AutoAssignTest")); deleteAllUsers(); @@ -69,7 +69,7 @@ public class AutoAssignTest extends AbstractIssueTest { } @Test - public void auto_assign_issues_to_user() throws Exception { + public void auto_assign_issues_to_user() { // verify that login matches, case-sensitive createUser("user1", "User 1", "user1@email.com"); createUser("USER2", "User 2", "user2@email.com"); @@ -109,7 +109,7 @@ public class AutoAssignTest extends AbstractIssueTest { } @Test - public void auto_assign_issues_to_default_assignee() throws Exception { + public void auto_assign_issues_to_default_assignee() { createUser("user1", "User 1", "user1@email.com"); createUser("user2", "User 2", "user2@email.com"); setServerProperty(ORCHESTRATOR, "sonar.issues.defaultAssigneeLogin", "user2"); diff --git a/tests/src/test/java/org/sonarqube/tests/issue/CustomRulesTest.java b/tests/src/test/java/org/sonarqube/tests/issue/CustomRulesTest.java index 0d9c2ea1d0d..470768aa2b4 100644 --- a/tests/src/test/java/org/sonarqube/tests/issue/CustomRulesTest.java +++ b/tests/src/test/java/org/sonarqube/tests/issue/CustomRulesTest.java @@ -45,7 +45,7 @@ public class CustomRulesTest extends AbstractIssueTest { } @Test - public void analyzeProjectWithCustomRules() throws Exception { + public void analyzeProjectWithCustomRules() { ORCHESTRATOR.getServer().adminWsClient().post("api/rules/create", "template_key", "xoo:TemplateRule", "custom_key", "MyCustomRule", diff --git a/tests/src/test/java/org/sonarqube/tests/issue/IssueActionTest.java b/tests/src/test/java/org/sonarqube/tests/issue/IssueActionTest.java index 5f24cf0a48f..4fbbb0f10ad 100644 --- a/tests/src/test/java/org/sonarqube/tests/issue/IssueActionTest.java +++ b/tests/src/test/java/org/sonarqube/tests/issue/IssueActionTest.java @@ -66,12 +66,12 @@ public class IssueActionTest extends AbstractIssueTest { } @Test - public void no_comments_by_default() throws Exception { + public void no_comments_by_default() { assertThat(randomIssue.getComments().getCommentsList()).isEmpty(); } @Test - public void add_comment() throws Exception { + public void add_comment() { Issues.Comment comment = issuesService.addComment(new AddCommentRequest().setIssue(randomIssue.getKey()).setText("this is my *comment*")).getIssue().getComments().getComments(0); assertThat(comment.getKey()).isNotNull(); assertThat(comment.getHtmlText()).isEqualTo("this is my comment"); @@ -90,7 +90,7 @@ public class IssueActionTest extends AbstractIssueTest { * SONAR-4450 */ @Test - public void should_reject_blank_comment() throws Exception { + public void should_reject_blank_comment() { try { issuesService.addComment(new AddCommentRequest().setIssue(randomIssue.getKey()).setText(" ")); fail(); diff --git a/tests/src/test/java/org/sonarqube/tests/issue/IssueBulkChangeTest.java b/tests/src/test/java/org/sonarqube/tests/issue/IssueBulkChangeTest.java index 73c468504b0..6d412a237a2 100644 --- a/tests/src/test/java/org/sonarqube/tests/issue/IssueBulkChangeTest.java +++ b/tests/src/test/java/org/sonarqube/tests/issue/IssueBulkChangeTest.java @@ -68,7 +68,7 @@ public class IssueBulkChangeTest extends AbstractIssueTest { private ProjectAnalysis xooSampleLittleIssuesAnalysis; @Before - public void setUp() throws Exception { + public void setUp() { String qualityProfileKey = projectAnalysisRule.registerProfile("/issue/IssueBulkChangeTest/one-issue-per-line-profile.xml"); String projectKey = projectAnalysisRule.registerProject("shared/xoo-sample"); this.xooSampleLittleIssuesAnalysis = projectAnalysisRule.newProjectAnalysis(projectKey) diff --git a/tests/src/test/java/org/sonarqube/tests/issue/IssueChangelogTest.java b/tests/src/test/java/org/sonarqube/tests/issue/IssueChangelogTest.java index 70c868604c1..42321b9eeb1 100644 --- a/tests/src/test/java/org/sonarqube/tests/issue/IssueChangelogTest.java +++ b/tests/src/test/java/org/sonarqube/tests/issue/IssueChangelogTest.java @@ -48,7 +48,7 @@ public class IssueChangelogTest extends AbstractIssueTest { } @Test - public void update_changelog_when_assigning_issue_by_user() throws Exception { + public void update_changelog_when_assigning_issue_by_user() { runProjectAnalysis(ORCHESTRATOR, "shared/xoo-sample"); Issue issue = searchRandomIssue(); assertIssueHasNoChange(issue.key()); @@ -66,7 +66,7 @@ public class IssueChangelogTest extends AbstractIssueTest { } @Test - public void update_changelog_when_reopening_unresolved_issue_by_scan() throws Exception { + public void update_changelog_when_reopening_unresolved_issue_by_scan() { runProjectAnalysis(ORCHESTRATOR, "shared/xoo-sample"); Issue issue = searchRandomIssue(); assertIssueHasNoChange(issue.key()); diff --git a/tests/src/test/java/org/sonarqube/tests/issue/IssueCreationDatePluginChangedTest.java b/tests/src/test/java/org/sonarqube/tests/issue/IssueCreationDatePluginChangedTest.java index 02b550b2dc4..6ad7158a0f6 100644 --- a/tests/src/test/java/org/sonarqube/tests/issue/IssueCreationDatePluginChangedTest.java +++ b/tests/src/test/java/org/sonarqube/tests/issue/IssueCreationDatePluginChangedTest.java @@ -81,13 +81,13 @@ public class IssueCreationDatePluginChangedTest { private static Wiser smtpServer; @BeforeClass - public static void setUp() throws Exception { + public static void setUp() { smtpServer = new Wiser(0); smtpServer.start(); } @Before - public void before() throws InterruptedException, MessagingException, IOException { + public void before() { ORCHESTRATOR.resetData(); // Configure Sonar @@ -117,7 +117,7 @@ public class IssueCreationDatePluginChangedTest { } @Test - public void should_use_scm_date_for_new_issues_if_plugin_updated() throws InterruptedException, MessagingException, IOException { + public void should_use_scm_date_for_new_issues_if_plugin_updated() throws InterruptedException { ItUtils.restoreProfile(ORCHESTRATOR, getClass().getResource("/issue/IssueCreationDatePluginChangedTest/profile.xml")); ORCHESTRATOR.getServer().provisionProject(SAMPLE_PROJECT_KEY, SAMPLE_PROJECT_NAME); diff --git a/tests/src/test/java/org/sonarqube/tests/issue/IssueCreationDateQPChangedTest.java b/tests/src/test/java/org/sonarqube/tests/issue/IssueCreationDateQPChangedTest.java index 3412d51ecec..30c3e101ce3 100644 --- a/tests/src/test/java/org/sonarqube/tests/issue/IssueCreationDateQPChangedTest.java +++ b/tests/src/test/java/org/sonarqube/tests/issue/IssueCreationDateQPChangedTest.java @@ -243,7 +243,7 @@ public class IssueCreationDateQPChangedTest extends AbstractIssueTest { private final String path; - private SourceCode(String path) { + SourceCode(String path) { this.path = path; } } @@ -256,7 +256,7 @@ public class IssueCreationDateQPChangedTest extends AbstractIssueTest { ; private final String key; - private Component(String key) { + Component(String key) { this.key = key; } @@ -275,7 +275,7 @@ public class IssueCreationDateQPChangedTest extends AbstractIssueTest { private final String path; - private QProfile(String path) { + QProfile(String path) { this.path = path; } } @@ -343,11 +343,11 @@ public class IssueCreationDateQPChangedTest extends AbstractIssueTest { private final Date date; - private IssueCreationDate() { + IssueCreationDate() { this.date = null; } - private IssueCreationDate(Date date) { + IssueCreationDate(Date date) { this.date = date; } diff --git a/tests/src/test/java/org/sonarqube/tests/issue/IssueCreationTest.java b/tests/src/test/java/org/sonarqube/tests/issue/IssueCreationTest.java index f38ae5843e5..e369330a291 100644 --- a/tests/src/test/java/org/sonarqube/tests/issue/IssueCreationTest.java +++ b/tests/src/test/java/org/sonarqube/tests/issue/IssueCreationTest.java @@ -61,7 +61,7 @@ public class IssueCreationTest extends AbstractIssueTest { } @Test - public void plugin_can_override_profile_severity() throws Exception { + public void plugin_can_override_profile_severity() { ORCHESTRATOR.getServer().provisionProject(SAMPLE_PROJECT_KEY, SAMPLE_PROJECT_KEY); // The rule "OneBlockerIssuePerFile" is enabled with severity "INFO" diff --git a/tests/src/test/java/org/sonarqube/tests/issue/IssueFilterExtensionTest.java b/tests/src/test/java/org/sonarqube/tests/issue/IssueFilterExtensionTest.java index 877a3a69666..357ee749083 100644 --- a/tests/src/test/java/org/sonarqube/tests/issue/IssueFilterExtensionTest.java +++ b/tests/src/test/java/org/sonarqube/tests/issue/IssueFilterExtensionTest.java @@ -49,7 +49,7 @@ public class IssueFilterExtensionTest extends AbstractIssueTest { .withQualityProfile(manyRuleProfileKey); @Test - public void should_filter_files() throws Exception { + public void should_filter_files() { analysis.withProperties("sonar.exclusions", "**/HelloA1.xoo").run(); List issues = searchIssues(); diff --git a/tests/src/test/java/org/sonarqube/tests/issue/IssueNotificationsTest.java b/tests/src/test/java/org/sonarqube/tests/issue/IssueNotificationsTest.java index f99f5cd83a9..cf98015fc8d 100644 --- a/tests/src/test/java/org/sonarqube/tests/issue/IssueNotificationsTest.java +++ b/tests/src/test/java/org/sonarqube/tests/issue/IssueNotificationsTest.java @@ -118,7 +118,7 @@ public class IssueNotificationsTest { } @After - public void after() throws Exception { + public void after() { clearSmtpMessages(); } diff --git a/tests/src/test/java/org/sonarqube/tests/issue/IssueSearchTest.java b/tests/src/test/java/org/sonarqube/tests/issue/IssueSearchTest.java index 0f2d03d7aac..1063e708c74 100644 --- a/tests/src/test/java/org/sonarqube/tests/issue/IssueSearchTest.java +++ b/tests/src/test/java/org/sonarqube/tests/issue/IssueSearchTest.java @@ -80,7 +80,7 @@ public class IssueSearchTest extends AbstractIssueTest { } @Before - public void resetProperties() throws Exception { + public void resetProperties() { setServerProperty(ORCHESTRATOR, "sonar.forceAuthentication", "false"); } @@ -241,7 +241,7 @@ public class IssueSearchTest extends AbstractIssueTest { } @Test - public void return_issue_type() throws Exception { + public void return_issue_type() { SearchWsResponse issues = searchResponse(r -> r.setRules(singletonList("xoo:OneBugIssuePerLine"))); assertThat(issues.getIssuesList()).isNotEmpty(); org.sonarqube.ws.Issues.Issue issue = issues.getIssues(0); @@ -259,7 +259,7 @@ public class IssueSearchTest extends AbstractIssueTest { } @Test - public void search_issues_by_types() throws IOException { + public void search_issues_by_types() { assertThat(searchResponse(r -> r.setTypes(singletonList("CODE_SMELL"))).getPaging().getTotal()).isEqualTo(142); assertThat(searchResponse(r -> r.setTypes(singletonList("BUG"))).getPaging().getTotal()).isEqualTo(106); assertThat(searchResponse(r -> r.setTypes(singletonList("VULNERABILITY"))).getPaging().getTotal()).isEqualTo(8); diff --git a/tests/src/test/java/org/sonarqube/tests/issue/IssueTrackingTest.java b/tests/src/test/java/org/sonarqube/tests/issue/IssueTrackingTest.java index a6583fab886..b2d6c76c155 100644 --- a/tests/src/test/java/org/sonarqube/tests/issue/IssueTrackingTest.java +++ b/tests/src/test/java/org/sonarqube/tests/issue/IssueTrackingTest.java @@ -56,7 +56,7 @@ public class IssueTrackingTest extends AbstractIssueTest { } @Test - public void close_issues_on_removed_components() throws Exception { + public void close_issues_on_removed_components() { ORCHESTRATOR.getServer().associateProjectToQualityProfile(SAMPLE_PROJECT_KEY, "xoo", "issue-on-tag-foobar"); // version 1 @@ -81,7 +81,7 @@ public class IssueTrackingTest extends AbstractIssueTest { * SONAR-3072 */ @Test - public void track_issues_based_on_blocks_recognition() throws Exception { + public void track_issues_based_on_blocks_recognition() { ORCHESTRATOR.getServer().associateProjectToQualityProfile(SAMPLE_PROJECT_KEY, "xoo", "issue-on-tag-foobar"); // version 1 @@ -112,7 +112,7 @@ public class IssueTrackingTest extends AbstractIssueTest { * SONAR-4310 */ @Test - public void track_existing_unchanged_issues_on_module() throws Exception { + public void track_existing_unchanged_issues_on_module() { // The custom rule on module is enabled ORCHESTRATOR.getServer().associateProjectToQualityProfile(SAMPLE_PROJECT_KEY, "xoo", "one-issue-per-module"); @@ -139,7 +139,7 @@ public class IssueTrackingTest extends AbstractIssueTest { * SONAR-4310 */ @Test - public void track_existing_unchanged_issues_on_multi_modules() throws Exception { + public void track_existing_unchanged_issues_on_multi_modules() { // The custom rule on module is enabled ORCHESTRATOR.getServer().provisionProject("com.sonarsource.it.samples:multi-modules-sample", "com.sonarsource.it.samples:multi-modules-sample"); ORCHESTRATOR.getServer().associateProjectToQualityProfile("com.sonarsource.it.samples:multi-modules-sample", "xoo", "one-issue-per-module"); diff --git a/tests/src/test/java/org/sonarqube/tests/issue/IssueWorkflowTest.java b/tests/src/test/java/org/sonarqube/tests/issue/IssueWorkflowTest.java index 5c620a9608c..0a96279adc2 100644 --- a/tests/src/test/java/org/sonarqube/tests/issue/IssueWorkflowTest.java +++ b/tests/src/test/java/org/sonarqube/tests/issue/IssueWorkflowTest.java @@ -72,7 +72,7 @@ public class IssueWorkflowTest extends AbstractIssueTest { * be CLOSED with resolution REMOVED */ @Test - public void issue_is_closed_as_removed_when_rule_is_disabled() throws Exception { + public void issue_is_closed_as_removed_when_rule_is_disabled() { SearchRequest ruleSearchRequest = new SearchRequest().setRules(singletonList("xoo:OneIssuePerLine")); List issues = issueRule.search(ruleSearchRequest).getIssuesList(); assertThat(issues).isNotEmpty(); diff --git a/tests/src/test/java/org/sonarqube/tests/issue/OrganizationIssueAssignTest.java b/tests/src/test/java/org/sonarqube/tests/issue/OrganizationIssueAssignTest.java index 5154ce9133b..4e76ba14180 100644 --- a/tests/src/test/java/org/sonarqube/tests/issue/OrganizationIssueAssignTest.java +++ b/tests/src/test/java/org/sonarqube/tests/issue/OrganizationIssueAssignTest.java @@ -65,7 +65,7 @@ public class OrganizationIssueAssignTest { private User user; @Before - public void setUp() throws Exception { + public void setUp() { org1 = tester.organizations().generate(); org2 = tester.organizations().generate(); user = tester.users().generate(); diff --git a/tests/src/test/java/org/sonarqube/tests/issue/OrganizationIssuesPageTest.java b/tests/src/test/java/org/sonarqube/tests/issue/OrganizationIssuesPageTest.java index a5f51dcd2b1..64a162edc7e 100644 --- a/tests/src/test/java/org/sonarqube/tests/issue/OrganizationIssuesPageTest.java +++ b/tests/src/test/java/org/sonarqube/tests/issue/OrganizationIssuesPageTest.java @@ -51,7 +51,7 @@ public class OrganizationIssuesPageTest { private Users.CreateWsResponse.User user2; @Before - public void setUp() throws Exception { + public void setUp() { org1 = tester.organizations().generate(); org2 = tester.organizations().generate(); user1 = tester.users().generate(); diff --git a/tests/src/test/java/org/sonarqube/tests/marketplace/UpdateCenterTest.java b/tests/src/test/java/org/sonarqube/tests/marketplace/UpdateCenterTest.java index 64e0006edf4..e1c851aaae1 100644 --- a/tests/src/test/java/org/sonarqube/tests/marketplace/UpdateCenterTest.java +++ b/tests/src/test/java/org/sonarqube/tests/marketplace/UpdateCenterTest.java @@ -47,7 +47,7 @@ public class UpdateCenterTest { private Navigation nav = Navigation.create(orchestrator); @After - public void tearDown() throws Exception { + public void tearDown() { userRule.resetUsers(); } diff --git a/tests/src/test/java/org/sonarqube/tests/measure/DifferentialPeriodsTest.java b/tests/src/test/java/org/sonarqube/tests/measure/DifferentialPeriodsTest.java index f6f605cb863..65aa3e7c804 100644 --- a/tests/src/test/java/org/sonarqube/tests/measure/DifferentialPeriodsTest.java +++ b/tests/src/test/java/org/sonarqube/tests/measure/DifferentialPeriodsTest.java @@ -49,7 +49,7 @@ public class DifferentialPeriodsTest { * SONAR-7093 */ @Test - public void ensure_leak_period_defined_at_project_level_is_taken_into_account() throws Exception { + public void ensure_leak_period_defined_at_project_level_is_taken_into_account() { orchestrator.getServer().provisionProject(PROJECT_KEY, PROJECT_KEY); // Set a global property and a project property to ensure project property is used @@ -81,7 +81,7 @@ public class DifferentialPeriodsTest { * SONAR-7237 */ @Test - public void ensure_differential_measures_are_computed_when_adding_new_component_after_period() throws Exception { + public void ensure_differential_measures_are_computed_when_adding_new_component_after_period() { orchestrator.getServer().provisionProject(MULTI_MODULE_PROJECT_KEY, MULTI_MODULE_PROJECT_KEY); tester.settings().setProjectSetting(MULTI_MODULE_PROJECT_KEY, "sonar.leak.period", "30"); @@ -103,7 +103,7 @@ public class DifferentialPeriodsTest { } @Test - public void compute_no_new_lines_measures_when_changes_but_no_scm() throws Exception { + public void compute_no_new_lines_measures_when_changes_but_no_scm() { orchestrator.getServer().provisionProject(MULTI_MODULE_PROJECT_KEY, MULTI_MODULE_PROJECT_KEY); tester.settings().setProjectSetting(MULTI_MODULE_PROJECT_KEY, "sonar.leak.period", "previous_version"); @@ -125,7 +125,7 @@ public class DifferentialPeriodsTest { } @Test - public void compute_zero_new_lines_measures_when_no_changes_and_scm_available() throws Exception { + public void compute_zero_new_lines_measures_when_no_changes_and_scm_available() { String projectKey = "sample-scm"; orchestrator.getServer().provisionProject(projectKey, projectKey); tester.settings().setProjectSetting(projectKey, "sonar.leak.period", "previous_version"); diff --git a/tests/src/test/java/org/sonarqube/tests/measure/ProjectDashboardTest.java b/tests/src/test/java/org/sonarqube/tests/measure/ProjectDashboardTest.java index d687efeeb35..72c95312c0f 100644 --- a/tests/src/test/java/org/sonarqube/tests/measure/ProjectDashboardTest.java +++ b/tests/src/test/java/org/sonarqube/tests/measure/ProjectDashboardTest.java @@ -47,12 +47,12 @@ public class ProjectDashboardTest { private String adminUser; @Before - public void setUp() throws Exception { + public void setUp() { adminUser = tester.users().generateAdministratorOnDefaultOrganization().getLogin(); } @Test - public void after_first_analysis() throws Exception { + public void after_first_analysis() { executeBuild("shared/xoo-sample", "project-for-overview", "Project For Overview"); runSelenese(orchestrator, "/measure/ProjectDashboardTest/test_project_overview_after_first_analysis.html"); diff --git a/tests/src/test/java/org/sonarqube/tests/measure/SincePreviousVersionHistoryTest.java b/tests/src/test/java/org/sonarqube/tests/measure/SincePreviousVersionHistoryTest.java index 3d369bf5195..871e4df67e6 100644 --- a/tests/src/test/java/org/sonarqube/tests/measure/SincePreviousVersionHistoryTest.java +++ b/tests/src/test/java/org/sonarqube/tests/measure/SincePreviousVersionHistoryTest.java @@ -50,7 +50,7 @@ public class SincePreviousVersionHistoryTest { public Tester tester = new Tester(orchestrator); @Before - public void setUp() throws Exception { + public void setUp() { tester.settings().setGlobalSettings("sonar.leak.period", "previous_version"); } diff --git a/tests/src/test/java/org/sonarqube/tests/measure/SinceXDaysHistoryTest.java b/tests/src/test/java/org/sonarqube/tests/measure/SinceXDaysHistoryTest.java index deb2f936ef3..cbf9b9a381c 100644 --- a/tests/src/test/java/org/sonarqube/tests/measure/SinceXDaysHistoryTest.java +++ b/tests/src/test/java/org/sonarqube/tests/measure/SinceXDaysHistoryTest.java @@ -72,17 +72,17 @@ public class SinceXDaysHistoryTest { } @Test - public void check_files_variation() throws Exception { + public void check_files_variation() { checkMeasure("files", 3); } @Test - public void check_issues_variation() throws Exception { + public void check_issues_variation() { checkMeasure("violations", 45); } @Test - public void check_new_issues_measures() throws Exception { + public void check_new_issues_measures() { checkMeasure("new_violations", 45); } diff --git a/tests/src/test/java/org/sonarqube/tests/organization/OrganizationTest.java b/tests/src/test/java/org/sonarqube/tests/organization/OrganizationTest.java index 16e8ec6d252..85492174721 100644 --- a/tests/src/test/java/org/sonarqube/tests/organization/OrganizationTest.java +++ b/tests/src/test/java/org/sonarqube/tests/organization/OrganizationTest.java @@ -254,7 +254,7 @@ public class OrganizationTest { } @Test - public void return_groups_belonging_to_a_user_on_an_organization() throws Exception { + public void return_groups_belonging_to_a_user_on_an_organization() { Organization organization = tester.organizations().generate(); User user = tester.users().generate(); tester.organizations().service().addMember(new AddMemberRequest().setOrganization(organization.getKey()).setLogin(user.getLogin())); diff --git a/tests/src/test/java/org/sonarqube/tests/organization/RootUserTest.java b/tests/src/test/java/org/sonarqube/tests/organization/RootUserTest.java index f12eb6d565a..2622d2f1963 100644 --- a/tests/src/test/java/org/sonarqube/tests/organization/RootUserTest.java +++ b/tests/src/test/java/org/sonarqube/tests/organization/RootUserTest.java @@ -62,7 +62,7 @@ public class RootUserTest { } @Test - public void last_root_can_not_be_unset_root() throws SQLException { + public void last_root_can_not_be_unset_root() { expectBadRequestError(() -> tester.wsClient().roots().unsetRoot(new UnsetRootRequest().setLogin(UserRule.ADMIN_LOGIN))); } diff --git a/tests/src/test/java/org/sonarqube/tests/performance/MavenLogsTest.java b/tests/src/test/java/org/sonarqube/tests/performance/MavenLogsTest.java index d6eeb2a6670..f53247192ab 100644 --- a/tests/src/test/java/org/sonarqube/tests/performance/MavenLogsTest.java +++ b/tests/src/test/java/org/sonarqube/tests/performance/MavenLogsTest.java @@ -25,18 +25,18 @@ import static org.assertj.core.api.Assertions.assertThat; public class MavenLogsTest { @Test - public void testExtractTotalTime() throws Exception { + public void testExtractTotalTime() { assertThat(MavenLogs.extractTotalTime(" \n Total time: 6.015s \n ")).isEqualTo(6015); assertThat(MavenLogs.extractTotalTime(" \n Total time: 3:14.025s\n ")).isEqualTo(194025); } @Test - public void testMaxMemory() throws Exception { + public void testMaxMemory() { assertThat(MavenLogs.extractMaxMemory(" Final Memory: 68M/190M ")).isEqualTo(190); } @Test - public void testEndMemory() throws Exception { + public void testEndMemory() { assertThat(MavenLogs.extractEndMemory(" Final Memory: 68M/190M ")).isEqualTo(68); } } diff --git a/tests/src/test/java/org/sonarqube/tests/performance/ServerLogsTest.java b/tests/src/test/java/org/sonarqube/tests/performance/ServerLogsTest.java index 8a9317d5de4..89dba2dd051 100644 --- a/tests/src/test/java/org/sonarqube/tests/performance/ServerLogsTest.java +++ b/tests/src/test/java/org/sonarqube/tests/performance/ServerLogsTest.java @@ -26,7 +26,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class ServerLogsTest { @Test - public void logs_with_different_computations_take_the_last_one() throws Exception { + public void logs_with_different_computations_take_the_last_one() { assertThat(ServerLogs.extractComputationTotalTime(Lists.newArrayList( "2015.09.29 16:57:45 INFO web[][o.s.s.c.q.CeWorkerRunnableImpl] Executed task | project=com.github.kevinsawicki:http-request-parent | id=AVAZm9oHIXrp54OmOeQe | time=2283ms", "2015.09.29 16:57:45 INFO web[][o.s.s.c.q.CeWorkerRunnableImpl] Executed task | project=com.github.kevinsawicki:http-request-parent | id=AVAZm9oHIXrp54OmOeQe | time=1234ms"))) diff --git a/tests/src/test/java/org/sonarqube/tests/performance/scanner/BootstrappingTest.java b/tests/src/test/java/org/sonarqube/tests/performance/scanner/BootstrappingTest.java index 120942b51ef..511f09d79ae 100644 --- a/tests/src/test/java/org/sonarqube/tests/performance/scanner/BootstrappingTest.java +++ b/tests/src/test/java/org/sonarqube/tests/performance/scanner/BootstrappingTest.java @@ -63,7 +63,7 @@ public class BootstrappingTest extends AbstractPerfTest { } @Test - public void analyzeProjectWith100FlatModules() throws IOException { + public void analyzeProjectWith100FlatModules() { SonarScanner scanner = SonarScanner.create() .setProperties( @@ -107,7 +107,7 @@ public class BootstrappingTest extends AbstractPerfTest { } @Test - public void analyzeProjectWith50NestedModules() throws IOException { + public void analyzeProjectWith50NestedModules() { SonarScanner scanner = SonarScanner.create() .setProperties( "sonar.projectKey", "many-nested-modules", diff --git a/tests/src/test/java/org/sonarqube/tests/performance/scanner/DuplicationTest.java b/tests/src/test/java/org/sonarqube/tests/performance/scanner/DuplicationTest.java index 8a0978781ce..dc88ed9e7e1 100644 --- a/tests/src/test/java/org/sonarqube/tests/performance/scanner/DuplicationTest.java +++ b/tests/src/test/java/org/sonarqube/tests/performance/scanner/DuplicationTest.java @@ -55,7 +55,7 @@ public class DuplicationTest extends AbstractPerfTest { public static final Orchestrator orchestrator = ScannerPerformanceSuite.ORCHESTRATOR; @BeforeClass - public static void setUp() throws IOException { + public static void setUp() { // Execute a first analysis to prevent any side effects with cache of plugin JAR files orchestrator.executeBuild(newScanner("-Xmx512m -server", "sonar.profile", "one-xoo-issue-per-line")); } diff --git a/tests/src/test/java/org/sonarqube/tests/performance/scanner/HighlightingTest.java b/tests/src/test/java/org/sonarqube/tests/performance/scanner/HighlightingTest.java index 43ef77bdd59..040e68669ec 100644 --- a/tests/src/test/java/org/sonarqube/tests/performance/scanner/HighlightingTest.java +++ b/tests/src/test/java/org/sonarqube/tests/performance/scanner/HighlightingTest.java @@ -54,7 +54,7 @@ public class HighlightingTest extends AbstractPerfTest { public static Orchestrator orchestrator = ScannerPerformanceSuite.ORCHESTRATOR; @BeforeClass - public static void setUp() throws IOException { + public static void setUp() { // Execute a first analysis to prevent any side effects with cache of plugin JAR files orchestrator.executeBuild(newScanner("-Xmx512m -server", "sonar.profile", "one-xoo-issue-per-line")); } diff --git a/tests/src/test/java/org/sonarqube/tests/performance/scanner/ScannerPerformanceSuite.java b/tests/src/test/java/org/sonarqube/tests/performance/scanner/ScannerPerformanceSuite.java index a37a6b63b40..1b789600e24 100644 --- a/tests/src/test/java/org/sonarqube/tests/performance/scanner/ScannerPerformanceSuite.java +++ b/tests/src/test/java/org/sonarqube/tests/performance/scanner/ScannerPerformanceSuite.java @@ -52,7 +52,7 @@ public class ScannerPerformanceSuite { .build(); @BeforeClass - public static void setUp() throws IOException { + public static void setUp() { // Execute a first analysis to prevent any side effects with cache of plugin JAR files ORCHESTRATOR.executeBuild(AbstractPerfTest.newScanner("-Xmx512m -server", "sonar.profile", "one-xoo-issue-per-line")); } diff --git a/tests/src/test/java/org/sonarqube/tests/performance/server/ComputeEnginePerfTest.java b/tests/src/test/java/org/sonarqube/tests/performance/server/ComputeEnginePerfTest.java index dc91ca74a05..7ee7fa84624 100644 --- a/tests/src/test/java/org/sonarqube/tests/performance/server/ComputeEnginePerfTest.java +++ b/tests/src/test/java/org/sonarqube/tests/performance/server/ComputeEnginePerfTest.java @@ -58,7 +58,7 @@ public class ComputeEnginePerfTest extends AbstractPerfTest { } @Before - public void before() throws Exception { + public void before() { orchestrator.resetData(); } diff --git a/tests/src/test/java/org/sonarqube/tests/performance/server/ServerPerfTest.java b/tests/src/test/java/org/sonarqube/tests/performance/server/ServerPerfTest.java index be26a4d06f3..3de0d05c8cc 100644 --- a/tests/src/test/java/org/sonarqube/tests/performance/server/ServerPerfTest.java +++ b/tests/src/test/java/org/sonarqube/tests/performance/server/ServerPerfTest.java @@ -102,7 +102,7 @@ public class ServerPerfTest extends AbstractPerfTest { return end; } - private static long extractStopDate(List lines) throws IOException { + private static long extractStopDate(List lines) { Collections.reverse(lines); Date end = ServerLogs.extractFirstDate(lines); return end.getTime(); diff --git a/tests/src/test/java/org/sonarqube/tests/plugins/CompressPluginsTest.java b/tests/src/test/java/org/sonarqube/tests/plugins/CompressPluginsTest.java index 879b3a16fe3..ca57e9fc7e4 100644 --- a/tests/src/test/java/org/sonarqube/tests/plugins/CompressPluginsTest.java +++ b/tests/src/test/java/org/sonarqube/tests/plugins/CompressPluginsTest.java @@ -62,7 +62,7 @@ public class CompressPluginsTest { } @Test - public void plugins_installed_ws_should_expose_compressed_plugin() throws JSONException { + public void plugins_installed_ws_should_expose_compressed_plugin() { WsResponse response = tester.wsClient().wsConnector().call(new GetRequest("api/plugins/installed")); String content = response.content(); JsonParser parser = new JsonParser(); diff --git a/tests/src/test/java/org/sonarqube/tests/plugins/PluginsTest.java b/tests/src/test/java/org/sonarqube/tests/plugins/PluginsTest.java index 49716644959..eb32eebbc6c 100644 --- a/tests/src/test/java/org/sonarqube/tests/plugins/PluginsTest.java +++ b/tests/src/test/java/org/sonarqube/tests/plugins/PluginsTest.java @@ -82,7 +82,7 @@ public class PluginsTest { private static Orchestrator ORCHESTRATOR; @BeforeClass - public static void startServer() throws MalformedURLException { + public static void startServer() { OrchestratorBuilder builder = Orchestrator.builderEnv() .setZipFile(byWildcardMavenFilename(new File("../sonar-application/target"), "sonar*.zip").getFile()); diff --git a/tests/src/test/java/org/sonarqube/tests/plugins/VersionPluginTest.java b/tests/src/test/java/org/sonarqube/tests/plugins/VersionPluginTest.java index 6c7797be8c6..a29c92e78a4 100644 --- a/tests/src/test/java/org/sonarqube/tests/plugins/VersionPluginTest.java +++ b/tests/src/test/java/org/sonarqube/tests/plugins/VersionPluginTest.java @@ -44,7 +44,7 @@ public class VersionPluginTest { } @Before - public void deleteData() throws IOException { + public void deleteData() { orchestrator.resetData(); } diff --git a/tests/src/test/java/org/sonarqube/tests/project/ProjectBulkDeletionPageTest.java b/tests/src/test/java/org/sonarqube/tests/project/ProjectBulkDeletionPageTest.java index 49b04db2773..65d64c732d8 100644 --- a/tests/src/test/java/org/sonarqube/tests/project/ProjectBulkDeletionPageTest.java +++ b/tests/src/test/java/org/sonarqube/tests/project/ProjectBulkDeletionPageTest.java @@ -52,7 +52,7 @@ public class ProjectBulkDeletionPageTest { * SONAR-2614, SONAR-3805 */ @Test - public void bulk_deletion_on_selected_projects() throws Exception { + public void bulk_deletion_on_selected_projects() { Project project1 = tester.projects().provision(p -> p.setName("Foo")); Project project2 = tester.projects().provision(p -> p.setName("Bar")); Project project3 = tester.projects().provision(p -> p.setName("FooQux")); diff --git a/tests/src/test/java/org/sonarqube/tests/project/ProjectFilterTest.java b/tests/src/test/java/org/sonarqube/tests/project/ProjectFilterTest.java index 6a58e909b0b..0828af7a7ff 100644 --- a/tests/src/test/java/org/sonarqube/tests/project/ProjectFilterTest.java +++ b/tests/src/test/java/org/sonarqube/tests/project/ProjectFilterTest.java @@ -142,7 +142,6 @@ public class ProjectFilterTest { assertThat(searchProjects(new SearchProjectsRequest().setFilter("query = \"nd\" AND ncloc > 50")).getComponentsList()) .extracting(Component::getKey).containsExactly("project3", "project4"); assertThat(searchProjects(new SearchProjectsRequest().setFilter("query = \"unknown\" AND ncloc > 50")).getComponentsList()).isEmpty(); - ; // Check facets assertThat(searchProjects(new SearchProjectsRequest().setFilter("query = \"apache\"").setFacets(singletonList("ncloc"))).getFacets().getFacets(0).getValuesList()) @@ -290,7 +289,7 @@ public class ProjectFilterTest { return searchProjects(new SearchProjectsRequest().setOrganization(organization.getKey()).setFilter(filter)); } - private SearchProjectsWsResponse searchProjects(SearchProjectsRequest request) throws IOException { + private SearchProjectsWsResponse searchProjects(SearchProjectsRequest request) { return tester.wsClient().components().searchProjects(request); } diff --git a/tests/src/test/java/org/sonarqube/tests/project/ProjectKeyUpdatePageTest.java b/tests/src/test/java/org/sonarqube/tests/project/ProjectKeyUpdatePageTest.java index c6183fd07f0..40d7abf27ed 100644 --- a/tests/src/test/java/org/sonarqube/tests/project/ProjectKeyUpdatePageTest.java +++ b/tests/src/test/java/org/sonarqube/tests/project/ProjectKeyUpdatePageTest.java @@ -45,7 +45,7 @@ public class ProjectKeyUpdatePageTest { public Tester tester = new Tester(orchestrator); @Before - public void setUp() throws Exception { + public void setUp() { tester.wsClient().users().skipOnboardingTutorial(); } diff --git a/tests/src/test/java/org/sonarqube/tests/project/ProjectListTest.java b/tests/src/test/java/org/sonarqube/tests/project/ProjectListTest.java index 21dd94c3821..1c26c05f410 100644 --- a/tests/src/test/java/org/sonarqube/tests/project/ProjectListTest.java +++ b/tests/src/test/java/org/sonarqube/tests/project/ProjectListTest.java @@ -43,7 +43,7 @@ public class ProjectListTest { * SONAR-3105 */ @Test - public void test_projects_index_ws() throws IOException { + public void test_projects_index_ws() { SonarScanner build = SonarScanner.create(projectDir("shared/xoo-sample")); orchestrator.executeBuild(build); diff --git a/tests/src/test/java/org/sonarqube/tests/project/ProjectSettingsTest.java b/tests/src/test/java/org/sonarqube/tests/project/ProjectSettingsTest.java index fa496360576..029cf8a8b5c 100644 --- a/tests/src/test/java/org/sonarqube/tests/project/ProjectSettingsTest.java +++ b/tests/src/test/java/org/sonarqube/tests/project/ProjectSettingsTest.java @@ -101,7 +101,7 @@ public class ProjectSettingsTest { } @Test - public void display_module_settings() throws UnsupportedEncodingException { + public void display_module_settings() { orchestrator.executeBuild(SonarScanner.create(projectDir("shared/xoo-multi-modules-sample"))); tester.openBrowser().logIn().submitCredentials(adminUser) diff --git a/tests/src/test/java/org/sonarqube/tests/project/ProjectVisibilityPageTest.java b/tests/src/test/java/org/sonarqube/tests/project/ProjectVisibilityPageTest.java index 1629de298de..64db22b012d 100644 --- a/tests/src/test/java/org/sonarqube/tests/project/ProjectVisibilityPageTest.java +++ b/tests/src/test/java/org/sonarqube/tests/project/ProjectVisibilityPageTest.java @@ -51,7 +51,7 @@ public class ProjectVisibilityPageTest { } @Test - public void return_all_projects_even_when_no_permission() throws Exception { + public void return_all_projects_even_when_no_permission() { orchestrator.executeBuild(SonarScanner.create(projectDir("shared/xoo-sample")).setProperties("sonar.projectKey", "sample1")); orchestrator.executeBuild(SonarScanner.create(projectDir("shared/xoo-sample")).setProperties("sonar.projectKey", "sample2")); tester.wsClient().projects().updateVisibility(new UpdateVisibilityRequest().setProject("sample2").setVisibility("private")); diff --git a/tests/src/test/java/org/sonarqube/tests/projectAdministration/ProjectPermissionsTest.java b/tests/src/test/java/org/sonarqube/tests/projectAdministration/ProjectPermissionsTest.java index 88b42fd681f..b674f11ef1a 100644 --- a/tests/src/test/java/org/sonarqube/tests/projectAdministration/ProjectPermissionsTest.java +++ b/tests/src/test/java/org/sonarqube/tests/projectAdministration/ProjectPermissionsTest.java @@ -57,7 +57,7 @@ public class ProjectPermissionsTest { } @Test - public void test_project_permissions_page_shows_only_single_project() throws Exception { + public void test_project_permissions_page_shows_only_single_project() { runSelenese(orchestrator, "/projectAdministration/ProjectPermissionsTest/test_project_permissions_page_shows_only_single_project.html"); } diff --git a/tests/src/test/java/org/sonarqube/tests/qualityGate/OrganizationQualityGateTest.java b/tests/src/test/java/org/sonarqube/tests/qualityGate/OrganizationQualityGateTest.java index 355b276eafd..9b6223cf7e2 100644 --- a/tests/src/test/java/org/sonarqube/tests/qualityGate/OrganizationQualityGateTest.java +++ b/tests/src/test/java/org/sonarqube/tests/qualityGate/OrganizationQualityGateTest.java @@ -104,7 +104,7 @@ public class OrganizationQualityGateTest { } @Test - public void search_projects_only_return_projects_from_quality_gate_organization() throws Exception { + public void search_projects_only_return_projects_from_quality_gate_organization() { Organization organization = tester.organizations().generate(); Project project = tester.projects().provision(organization); Organization otherOrganization = tester.organizations().generate(); @@ -124,7 +124,7 @@ public class OrganizationQualityGateTest { } @Test - public void list_quality_gates_from_organization() throws Exception { + public void list_quality_gates_from_organization() { Organization organization = tester.organizations().generate(); Organization otherOrganization = tester.organizations().generate(); Qualitygates.CreateResponse qualityGate = tester.qGates().generate(organization); diff --git a/tests/src/test/java/org/sonarqube/tests/qualityGate/QualityGateNotificationTest.java b/tests/src/test/java/org/sonarqube/tests/qualityGate/QualityGateNotificationTest.java index 5ce6b954ea2..683e9436750 100644 --- a/tests/src/test/java/org/sonarqube/tests/qualityGate/QualityGateNotificationTest.java +++ b/tests/src/test/java/org/sonarqube/tests/qualityGate/QualityGateNotificationTest.java @@ -54,13 +54,13 @@ public class QualityGateNotificationTest { private static Wiser smtpServer; @BeforeClass - public static void startSmtpServer() throws Exception { + public static void startSmtpServer() { smtpServer = new Wiser(0); smtpServer.start(); } @AfterClass - public static void stopSmtpServer() throws Exception { + public static void stopSmtpServer() { if (smtpServer != null) { smtpServer.stop(); } diff --git a/tests/src/test/java/org/sonarqube/tests/qualityGate/QualityGateOnRatingMeasuresTest.java b/tests/src/test/java/org/sonarqube/tests/qualityGate/QualityGateOnRatingMeasuresTest.java index eb8f487c2a9..84c6f0f1be0 100644 --- a/tests/src/test/java/org/sonarqube/tests/qualityGate/QualityGateOnRatingMeasuresTest.java +++ b/tests/src/test/java/org/sonarqube/tests/qualityGate/QualityGateOnRatingMeasuresTest.java @@ -45,7 +45,7 @@ public class QualityGateOnRatingMeasuresTest { .disableOrganizations(); @Test - public void generate_warning_qgate_on_rating_metric() throws Exception { + public void generate_warning_qgate_on_rating_metric() { Project project = tester.projects().provision(); Qualitygates.CreateResponse qualityGate = tester.qGates().generate(); tester.qGates().associateProject(qualityGate, project); @@ -63,7 +63,7 @@ public class QualityGateOnRatingMeasuresTest { } @Test - public void generate_error_qgate_on_rating_metric_on_leak_period() throws Exception { + public void generate_error_qgate_on_rating_metric_on_leak_period() { Project project = tester.projects().provision(); Qualitygates.CreateResponse qualityGate = tester.qGates().generate(); tester.qGates().associateProject(qualityGate, project); diff --git a/tests/src/test/java/org/sonarqube/tests/qualityModel/MaintainabilityRatingMeasureTest.java b/tests/src/test/java/org/sonarqube/tests/qualityModel/MaintainabilityRatingMeasureTest.java index 7af7eb2a280..4f8e28f25cd 100644 --- a/tests/src/test/java/org/sonarqube/tests/qualityModel/MaintainabilityRatingMeasureTest.java +++ b/tests/src/test/java/org/sonarqube/tests/qualityModel/MaintainabilityRatingMeasureTest.java @@ -86,7 +86,7 @@ public class MaintainabilityRatingMeasureTest { } @Test - public void use_development_cost_parameter() throws Exception { + public void use_development_cost_parameter() { ItUtils.restoreProfile(orchestrator, getClass().getResource("/qualityModel/one-issue-per-line.xml")); orchestrator.getServer().provisionProject("sample", "sample"); orchestrator.getServer().associateProjectToQualityProfile("sample", "xoo", "one-issue-per-line"); @@ -102,7 +102,7 @@ public class MaintainabilityRatingMeasureTest { } @Test - public void use_language_specific_parameters() throws Exception { + public void use_language_specific_parameters() { ItUtils.restoreProfile(orchestrator, getClass().getResource("/qualityModel/one-issue-per-line.xml")); orchestrator.getServer().provisionProject(PROJECT, PROJECT); orchestrator.getServer().associateProjectToQualityProfile(PROJECT, "xoo", "one-issue-per-line"); @@ -120,7 +120,7 @@ public class MaintainabilityRatingMeasureTest { } @Test - public void use_rating_grid_parameter() throws Exception { + public void use_rating_grid_parameter() { ItUtils.restoreProfile(orchestrator, getClass().getResource("/qualityModel/one-issue-per-line.xml")); orchestrator.getServer().provisionProject("sample", "sample"); orchestrator.getServer().associateProjectToQualityProfile("sample", "xoo", "one-issue-per-line"); diff --git a/tests/src/test/java/org/sonarqube/tests/qualityModel/NewDebtRatioMeasureTest.java b/tests/src/test/java/org/sonarqube/tests/qualityModel/NewDebtRatioMeasureTest.java index 2fe7d65a7ae..43009ce4bea 100644 --- a/tests/src/test/java/org/sonarqube/tests/qualityModel/NewDebtRatioMeasureTest.java +++ b/tests/src/test/java/org/sonarqube/tests/qualityModel/NewDebtRatioMeasureTest.java @@ -52,7 +52,7 @@ public class NewDebtRatioMeasureTest { public Tester tester = new Tester(orchestrator); @Test - public void new_debt_ratio_is_computed_from_new_debt_and_new_ncloc_count_per_file() throws Exception { + public void new_debt_ratio_is_computed_from_new_debt_and_new_ncloc_count_per_file() { tester.settings().setGlobalSettings("sonar.leak.period", "previous_version"); // run analysis on the day of after the first commit, with 'one-issue-per-line' profile @@ -76,7 +76,7 @@ public class NewDebtRatioMeasureTest { } @Test - public void compute_new_debt_ratio_using_number_days_in_leak_period() throws Exception { + public void compute_new_debt_ratio_using_number_days_in_leak_period() { tester.settings().setGlobalSettings("sonar.leak.period", "30"); // run analysis on the day of after the first commit, with 'one-issue-per-line' profile diff --git a/tests/src/test/java/org/sonarqube/tests/qualityModel/TechnicalDebtAndIssueNewMeasuresTest.java b/tests/src/test/java/org/sonarqube/tests/qualityModel/TechnicalDebtAndIssueNewMeasuresTest.java index 055c4fe86ef..842778d6496 100644 --- a/tests/src/test/java/org/sonarqube/tests/qualityModel/TechnicalDebtAndIssueNewMeasuresTest.java +++ b/tests/src/test/java/org/sonarqube/tests/qualityModel/TechnicalDebtAndIssueNewMeasuresTest.java @@ -45,7 +45,7 @@ public class TechnicalDebtAndIssueNewMeasuresTest { public Tester tester = new Tester(orchestrator); @Test - public void since_30_days_with_constant_effort() throws Exception { + public void since_30_days_with_constant_effort() { tester.settings().setGlobalSettings("sonar.leak.period", "30"); restoreQualityProfile("one-issue-per-line"); provisionSampleProject(); @@ -83,7 +83,7 @@ public class TechnicalDebtAndIssueNewMeasuresTest { } @Test - public void since_30_days_with_effort_change() throws Exception { + public void since_30_days_with_effort_change() { tester.settings().setGlobalSettings("sonar.leak.period", "30"); restoreQualityProfile("one-issue-per-line"); provisionSampleProject(); @@ -121,7 +121,7 @@ public class TechnicalDebtAndIssueNewMeasuresTest { } @Test - public void since_previous_version_with_constant_effort() throws Exception { + public void since_previous_version_with_constant_effort() { tester.settings().setGlobalSettings("sonar.leak.period", "previous_version"); restoreQualityProfile("one-issue-per-line"); provisionSampleProject(); @@ -159,7 +159,7 @@ public class TechnicalDebtAndIssueNewMeasuresTest { } @Test - public void since_previous_version_with_effort_change() throws Exception { + public void since_previous_version_with_effort_change() { tester.settings().setGlobalSettings( "sonar.leak.period", "previous_version"); restoreQualityProfile("one-issue-per-line"); provisionSampleProject(); diff --git a/tests/src/test/java/org/sonarqube/tests/qualityModel/TechnicalDebtInIssueChangelogTest.java b/tests/src/test/java/org/sonarqube/tests/qualityModel/TechnicalDebtInIssueChangelogTest.java index a9b9f5eb397..f7593032ffc 100644 --- a/tests/src/test/java/org/sonarqube/tests/qualityModel/TechnicalDebtInIssueChangelogTest.java +++ b/tests/src/test/java/org/sonarqube/tests/qualityModel/TechnicalDebtInIssueChangelogTest.java @@ -47,7 +47,7 @@ public class TechnicalDebtInIssueChangelogTest { public Tester tester = new Tester(orchestrator); @Test - public void display_debt_in_issue_changelog() throws Exception { + public void display_debt_in_issue_changelog() { ItUtils.restoreProfile(orchestrator, getClass().getResource("/qualityModel/one-issue-per-file.xml")); orchestrator.getServer().provisionProject("sample", "sample"); orchestrator.getServer().associateProjectToQualityProfile("sample", "xoo", "one-issue-per-file"); diff --git a/tests/src/test/java/org/sonarqube/tests/qualityModel/TechnicalDebtTest.java b/tests/src/test/java/org/sonarqube/tests/qualityModel/TechnicalDebtTest.java index dfb10d8e889..8ee437a49c3 100644 --- a/tests/src/test/java/org/sonarqube/tests/qualityModel/TechnicalDebtTest.java +++ b/tests/src/test/java/org/sonarqube/tests/qualityModel/TechnicalDebtTest.java @@ -45,7 +45,7 @@ public class TechnicalDebtTest { * SONAR-4716 */ @Test - public void technical_debt_on_issue() throws Exception { + public void technical_debt_on_issue() { ItUtils.restoreProfile(orchestrator, getClass().getResource("/qualityModel/one-issue-per-line.xml")); orchestrator.getServer().provisionProject("sample", "sample"); orchestrator.getServer().associateProjectToQualityProfile("sample", "xoo", "one-issue-per-line"); diff --git a/tests/src/test/java/org/sonarqube/tests/qualityProfile/BuiltInQualityProfilesNotificationTest.java b/tests/src/test/java/org/sonarqube/tests/qualityProfile/BuiltInQualityProfilesNotificationTest.java index 6eb16bf0571..fb973a82a5c 100644 --- a/tests/src/test/java/org/sonarqube/tests/qualityProfile/BuiltInQualityProfilesNotificationTest.java +++ b/tests/src/test/java/org/sonarqube/tests/qualityProfile/BuiltInQualityProfilesNotificationTest.java @@ -50,13 +50,13 @@ public class BuiltInQualityProfilesNotificationTest { private static UserRule userRule; @Before - public void init() throws Exception { + public void init() { smtpServer = new Wiser(0); smtpServer.start(); } @After - public void tearDown() throws Exception { + public void tearDown() { if (orchestrator != null) { orchestrator.stop(); } diff --git a/tests/src/test/java/org/sonarqube/tests/qualityProfile/QualityProfilesUiTest.java b/tests/src/test/java/org/sonarqube/tests/qualityProfile/QualityProfilesUiTest.java index 436d4e93302..6be533734cc 100644 --- a/tests/src/test/java/org/sonarqube/tests/qualityProfile/QualityProfilesUiTest.java +++ b/tests/src/test/java/org/sonarqube/tests/qualityProfile/QualityProfilesUiTest.java @@ -54,7 +54,7 @@ public class QualityProfilesUiTest { public Tester tester = new Tester(orchestrator).disableOrganizations(); @Before - public void initAdminUser() throws Exception { + public void initAdminUser() { userRule.createAdminUser(ADMIN_USER_LOGIN, ADMIN_USER_LOGIN); } diff --git a/tests/src/test/java/org/sonarqube/tests/serverSystem/HttpHeadersTest.java b/tests/src/test/java/org/sonarqube/tests/serverSystem/HttpHeadersTest.java index df8225abfd3..5b8688a4201 100644 --- a/tests/src/test/java/org/sonarqube/tests/serverSystem/HttpHeadersTest.java +++ b/tests/src/test/java/org/sonarqube/tests/serverSystem/HttpHeadersTest.java @@ -47,7 +47,7 @@ public class HttpHeadersTest { } @Test - public void verify_headers_of_base_url() throws Exception { + public void verify_headers_of_base_url() { Response response = call(orchestrator.getServer().getUrl() + "/"); verifySecurityHeaders(response); @@ -58,7 +58,7 @@ public class HttpHeadersTest { } @Test - public void verify_headers_of_ws() throws Exception { + public void verify_headers_of_ws() { Response response = call(orchestrator.getServer().getUrl() + "/api/issues/search"); verifySecurityHeaders(response); @@ -67,7 +67,7 @@ public class HttpHeadersTest { } @Test - public void verify_headers_of_images() throws Exception { + public void verify_headers_of_images() { Response response = call(orchestrator.getServer().getUrl() + "/images/logo.svg"); verifySecurityHeaders(response); @@ -76,7 +76,7 @@ public class HttpHeadersTest { } @Test - public void verify_headers_of_css() throws Exception { + public void verify_headers_of_css() { Response response = call(orchestrator.getServer().getUrl() + "/css/sonar." + JS_HASH + ".css"); verifySecurityHeaders(response); @@ -85,7 +85,7 @@ public class HttpHeadersTest { } @Test - public void verify_headers_of_js() throws Exception { + public void verify_headers_of_js() { Response response = call(orchestrator.getServer().getUrl() + "/js/app." + JS_HASH + ".js"); verifySecurityHeaders(response); @@ -93,7 +93,7 @@ public class HttpHeadersTest { } @Test - public void verify_headers_of_images_provided_by_plugins() throws Exception { + public void verify_headers_of_images_provided_by_plugins() { Response response = call(orchestrator.getServer().getUrl() + "/static/uiextensionsplugin/cute.jpg"); verifySecurityHeaders(response); @@ -101,7 +101,7 @@ public class HttpHeadersTest { } @Test - public void verify_headers_of_js_provided_by_plugins() throws Exception { + public void verify_headers_of_js_provided_by_plugins() { Response response = call(orchestrator.getServer().getUrl() + "/static/uiextensionsplugin/extension.js"); verifySecurityHeaders(response); @@ -109,7 +109,7 @@ public class HttpHeadersTest { } @Test - public void verify_headers_of_html_provided_by_plugins() throws Exception { + public void verify_headers_of_html_provided_by_plugins() { Response response = call(orchestrator.getServer().getUrl() + "/static/uiextensionsplugin/file.html"); verifySecurityHeaders(response); diff --git a/tests/src/test/java/org/sonarqube/tests/serverSystem/PingTest.java b/tests/src/test/java/org/sonarqube/tests/serverSystem/PingTest.java index 73fb865e83c..a56ed9deee0 100644 --- a/tests/src/test/java/org/sonarqube/tests/serverSystem/PingTest.java +++ b/tests/src/test/java/org/sonarqube/tests/serverSystem/PingTest.java @@ -33,7 +33,7 @@ public class PingTest { public static final Orchestrator orchestrator = Category4Suite.ORCHESTRATOR; @Test - public void ping_answers_pong() throws Exception { + public void ping_answers_pong() { HttpResponse response = orchestrator.getServer().newHttpCall("/api/system/ping").execute(); assertThat(response.getBodyAsString()).isEqualTo("pong"); diff --git a/tests/src/test/java/org/sonarqube/tests/serverSystem/ServerSystemTest.java b/tests/src/test/java/org/sonarqube/tests/serverSystem/ServerSystemTest.java index 09f5b7c1395..1fa47c91352 100644 --- a/tests/src/test/java/org/sonarqube/tests/serverSystem/ServerSystemTest.java +++ b/tests/src/test/java/org/sonarqube/tests/serverSystem/ServerSystemTest.java @@ -86,7 +86,7 @@ public class ServerSystemTest { } @Test - public void http_response_should_be_gzipped() throws IOException { + public void http_response_should_be_gzipped() { String url = orchestrator.getServer().getUrl() + "/api/rules/search"; Response metricsResponse = call(url); assertThat(metricsResponse.isSuccessful()).as("Response code is %s", metricsResponse.code()).isTrue(); diff --git a/tests/src/test/java/org/sonarqube/tests/settings/DeprecatedPropertiesWsTest.java b/tests/src/test/java/org/sonarqube/tests/settings/DeprecatedPropertiesWsTest.java index 5775c366a00..2f26e1113d8 100644 --- a/tests/src/test/java/org/sonarqube/tests/settings/DeprecatedPropertiesWsTest.java +++ b/tests/src/test/java/org/sonarqube/tests/settings/DeprecatedPropertiesWsTest.java @@ -82,7 +82,7 @@ public class DeprecatedPropertiesWsTest { static SettingsService adminSettingsService; @BeforeClass - public static void init() throws Exception { + public static void init() { orchestrator.resetData(); userRule.createUser(USER_LOGIN, "password"); adminWsClient = newAdminWsClient(orchestrator); @@ -93,13 +93,13 @@ public class DeprecatedPropertiesWsTest { } @AfterClass - public static void resetAfterClass() throws Exception { + public static void resetAfterClass() { doResetSettings(); userRule.deactivateUsers(USER_LOGIN); } @Before - public void resetBefore() throws Exception { + public void resetBefore() { doResetSettings(); } @@ -159,7 +159,7 @@ public class DeprecatedPropertiesWsTest { } @Test - public void secured_setting_not_returned_to_not_admin() throws Exception { + public void secured_setting_not_returned_to_not_admin() { setProperty("setting.secured", "value", null); // Admin can see the secured setting @@ -171,7 +171,7 @@ public class DeprecatedPropertiesWsTest { } @Test - public void license_setting_not_returned_to_not_logged() throws Exception { + public void license_setting_not_returned_to_not_logged() { setProperty("setting.license.secured", "value", null); // Admin and user can see the license setting @@ -183,7 +183,7 @@ public class DeprecatedPropertiesWsTest { } @Test - public void get_all_global_settings() throws Exception { + public void get_all_global_settings() { List properties = getProperties(null); assertThat(properties).isNotEmpty(); assertThat(properties).extracting("key") @@ -223,7 +223,7 @@ public class DeprecatedPropertiesWsTest { } @Test - public void get_all_component_settings() throws Exception { + public void get_all_component_settings() { List properties = getProperties(PROJECT_KEY); assertThat(properties).isNotEmpty(); assertThat(properties).extracting("key") diff --git a/tests/src/test/java/org/sonarqube/tests/settings/EmailsTest.java b/tests/src/test/java/org/sonarqube/tests/settings/EmailsTest.java index 78dbf4f299d..835c7494eba 100644 --- a/tests/src/test/java/org/sonarqube/tests/settings/EmailsTest.java +++ b/tests/src/test/java/org/sonarqube/tests/settings/EmailsTest.java @@ -58,7 +58,7 @@ public class EmailsTest { private static Wiser SMTP_SERVER; @BeforeClass - public static void before() throws Exception { + public static void before() { SMTP_SERVER = new Wiser(0); SMTP_SERVER.start(); System.out.println("SMTP Server port: " + SMTP_SERVER.getServer().getPort()); @@ -77,7 +77,7 @@ public class EmailsTest { } @Test - public void update_email_settings() throws Exception { + public void update_email_settings() { updateEmailSettings("localhost", "42", "noreply@email.com", "The Devil", "[EMAIL]", "ssl", "john", "123456"); Settings.ValuesWsResponse response = tester.settings().service().values(new ValuesRequest() diff --git a/tests/src/test/java/org/sonarqube/tests/settings/PropertySetsTest.java b/tests/src/test/java/org/sonarqube/tests/settings/PropertySetsTest.java index f8f14710469..9d9e50c0c17 100644 --- a/tests/src/test/java/org/sonarqube/tests/settings/PropertySetsTest.java +++ b/tests/src/test/java/org/sonarqube/tests/settings/PropertySetsTest.java @@ -58,7 +58,7 @@ public class PropertySetsTest { private String adminUser; @BeforeClass - public static void initSettingsService() throws Exception { + public static void initSettingsService() { SETTINGS = newAdminWsClient(orchestrator).settings(); } @@ -68,12 +68,12 @@ public class PropertySetsTest { } @After - public void reset_settings() throws Exception { + public void reset_settings() { resetSettings(orchestrator, null, "sonar.demo", "sonar.autogenerated", "sonar.test.jira.servers"); } @Test - public void support_property_sets() throws UnsupportedEncodingException { + public void support_property_sets() { SettingsPage page = nav.logIn().submitCredentials(adminUser).openSettings(null).openCategory("DEV") .assertSettingDisplayed("sonar.test.jira.servers"); @@ -90,7 +90,7 @@ public class PropertySetsTest { } @Test - public void support_property_sets_with_auto_generated_keys() throws UnsupportedEncodingException { + public void support_property_sets_with_auto_generated_keys() { SettingsPage page = nav.logIn().submitCredentials(adminUser).openSettings(null).openCategory("DEV") .assertSettingDisplayed("sonar.autogenerated"); @@ -120,7 +120,7 @@ public class PropertySetsTest { } @Test - public void delete_property_set() throws Exception { + public void delete_property_set() { SETTINGS.set(new SetRequest() .setKey("sonar.test.jira.servers") .setFieldValues(asList("{\"url\":\"http://jira1\"}", "{\"port\":\"12345\"}"))); diff --git a/tests/src/test/java/org/sonarqube/tests/settings/SettingsTest.java b/tests/src/test/java/org/sonarqube/tests/settings/SettingsTest.java index 3876af117c5..04c4f0ad670 100644 --- a/tests/src/test/java/org/sonarqube/tests/settings/SettingsTest.java +++ b/tests/src/test/java/org/sonarqube/tests/settings/SettingsTest.java @@ -76,7 +76,7 @@ public class SettingsTest { private static SettingsService adminSettingsService; @BeforeClass - public static void initSettingsService() throws Exception { + public static void initSettingsService() { userRule.createUser("setting-user", "setting-user"); userRule.createUser("scanner-user", "scanner-user"); adminWsClient = newAdminWsClient(orchestrator); @@ -98,14 +98,14 @@ public class SettingsTest { } @AfterClass - public static void tearDown() throws Exception { + public static void tearDown() { userRule.deactivateUsers("setting-user", "scanner-user"); // Restore 'Execute Analysis' permission to anyone adminWsClient.permissions().addGroup(new AddGroupRequest().setGroupName("anyone").setPermission("scan")); } @After - public void reset_settings() throws Exception { + public void reset_settings() { resetSettings(orchestrator, null, PLUGIN_SETTING_KEY, "globalPropertyChange.received", "hidden", "setting.secured", "setting.license.secured"); } @@ -169,13 +169,13 @@ public class SettingsTest { } @Test - public void multi_values_setting() throws Exception { + public void multi_values_setting() { adminSettingsService.set(new SetRequest().setKey("multi").setValues(asList("value1", "value2", "value3"))); assertThat(getSetting("multi", anonymousSettingsService).getValues().getValuesList()).containsOnly("value1", "value2", "value3"); } @Test - public void property_set_setting() throws Exception { + public void property_set_setting() { adminSettingsService.set(new SetRequest().setKey("sonar.jira").setFieldValues(asList( "{\"key\":\"jira1\", \"url\":\"http://jira1\", \"port\":\"12345\", \"type\":\"A\"}", "{\"key\":\"jira2\", \"url\":\"http://jira2\", \"port\":\"54321\"}"))); @@ -186,7 +186,7 @@ public class SettingsTest { } @Test - public void return_defined_settings_when_no_key_provided() throws Exception { + public void return_defined_settings_when_no_key_provided() { adminSettingsService.set(new SetRequest().setKey(PLUGIN_SETTING_KEY).setValue("some value")); adminSettingsService.set(new SetRequest().setKey("hidden").setValue("test")); diff --git a/tests/src/test/java/org/sonarqube/tests/settings/SettingsTestRestartingOrchestrator.java b/tests/src/test/java/org/sonarqube/tests/settings/SettingsTestRestartingOrchestrator.java index 977de004eeb..8aee5ebb876 100644 --- a/tests/src/test/java/org/sonarqube/tests/settings/SettingsTestRestartingOrchestrator.java +++ b/tests/src/test/java/org/sonarqube/tests/settings/SettingsTestRestartingOrchestrator.java @@ -58,7 +58,7 @@ public class SettingsTestRestartingOrchestrator { } @Test - public void test_settings() throws UnsupportedEncodingException { + public void test_settings() { URL secretKeyUrl = getClass().getResource("/settings/SettingsTest/sonar-secret.txt"); orchestrator = Orchestrator.builderEnv() .addPlugin(pluginArtifact("settings-plugin")) @@ -85,7 +85,7 @@ public class SettingsTestRestartingOrchestrator { } @Test - public void property_relocation() throws UnsupportedEncodingException { + public void property_relocation() { orchestrator = Orchestrator.builderEnv() .addPlugin(pluginArtifact("property-relocation-plugin")) .addPlugin(xooPlugin()) diff --git a/tests/src/test/java/org/sonarqube/tests/startup/StartupIndexationTest.java b/tests/src/test/java/org/sonarqube/tests/startup/StartupIndexationTest.java index 1040d20e50a..643a0ff12d5 100644 --- a/tests/src/test/java/org/sonarqube/tests/startup/StartupIndexationTest.java +++ b/tests/src/test/java/org/sonarqube/tests/startup/StartupIndexationTest.java @@ -118,7 +118,7 @@ public class StartupIndexationTest { } @Override - public void close() throws Exception { + public void close() { if (tester != null) { try { tester.after(); diff --git a/tests/src/test/java/org/sonarqube/tests/test/NewCoverageTest.java b/tests/src/test/java/org/sonarqube/tests/test/NewCoverageTest.java index 2096b482f69..69ecf0226de 100644 --- a/tests/src/test/java/org/sonarqube/tests/test/NewCoverageTest.java +++ b/tests/src/test/java/org/sonarqube/tests/test/NewCoverageTest.java @@ -47,7 +47,7 @@ public class NewCoverageTest { public Tester tester = new Tester(orchestrator); @Test - public void new_coverage() throws Exception { + public void new_coverage() { orchestrator.executeBuilds(SonarScanner.create(projectDir("testing/xoo-sample-new-coverage-v1")) .setProperty("sonar.projectDate", "2015-02-01") .setProperty("sonar.scm.disabled", "false")); diff --git a/tests/src/test/java/org/sonarqube/tests/test/TestExecutionTest.java b/tests/src/test/java/org/sonarqube/tests/test/TestExecutionTest.java index 31f92c87402..c573dc92f79 100644 --- a/tests/src/test/java/org/sonarqube/tests/test/TestExecutionTest.java +++ b/tests/src/test/java/org/sonarqube/tests/test/TestExecutionTest.java @@ -62,7 +62,7 @@ public class TestExecutionTest { } @Test - public void test_execution_measures() throws Exception { + public void test_execution_measures() { orchestrator.executeBuilds(SonarScanner.create(projectDir("testing/xoo-sample-with-tests-execution-measures"))); Map measures = getMeasuresAsDoubleByMetricKey(orchestrator, "sample-with-tests", diff --git a/tests/src/test/java/org/sonarqube/tests/user/BaseIdentityProviderTest.java b/tests/src/test/java/org/sonarqube/tests/user/BaseIdentityProviderTest.java index 6f3bff5e86a..e445488536d 100644 --- a/tests/src/test/java/org/sonarqube/tests/user/BaseIdentityProviderTest.java +++ b/tests/src/test/java/org/sonarqube/tests/user/BaseIdentityProviderTest.java @@ -82,7 +82,7 @@ public class BaseIdentityProviderTest { @Before @After - public void resetData() throws Exception { + public void resetData() { userRule.resetUsers(); userRule.removeGroups(GROUP1, GROUP2, GROUP3); resetSettings(ORCHESTRATOR, null, @@ -95,7 +95,7 @@ public class BaseIdentityProviderTest { } @Test - public void create_new_user_when_authenticate() throws Exception { + public void create_new_user_when_authenticate() { enablePlugin(); setUserCreatedByAuthPlugin(USER_LOGIN, USER_PROVIDER_ID, USER_NAME, USER_EMAIL); @@ -108,7 +108,7 @@ public class BaseIdentityProviderTest { } @Test - public void authenticate_user_through_ui() throws Exception { + public void authenticate_user_through_ui() { enablePlugin(); setUserCreatedByAuthPlugin(USER_LOGIN, USER_PROVIDER_ID, USER_NAME, USER_EMAIL); @@ -118,7 +118,7 @@ public class BaseIdentityProviderTest { } @Test - public void display_unauthorized_page_when_authentication_failed() throws Exception { + public void display_unauthorized_page_when_authentication_failed() { enablePlugin(); // As this property is null, the plugin will throw an exception setServerProperty(ORCHESTRATOR, "sonar.auth.fake-base-id-provider.user", null); @@ -142,7 +142,7 @@ public class BaseIdentityProviderTest { } @Test - public void fail_to_authenticate_when_not_allowed_to_sign_up() throws Exception { + public void fail_to_authenticate_when_not_allowed_to_sign_up() { enablePlugin(); setUserCreatedByAuthPlugin(USER_LOGIN, USER_PROVIDER_ID, USER_NAME, USER_EMAIL); setServerProperty(ORCHESTRATOR, "sonar.auth.fake-base-id-provider.allowsUsersToSignUp", "false"); @@ -153,7 +153,7 @@ public class BaseIdentityProviderTest { } @Test - public void update_existing_user_when_authenticate() throws Exception { + public void update_existing_user_when_authenticate() { enablePlugin(); setUserCreatedByAuthPlugin(USER_LOGIN, USER_PROVIDER_ID, USER_NAME, USER_EMAIL); @@ -169,7 +169,7 @@ public class BaseIdentityProviderTest { } @Test - public void reactivate_disabled_user() throws Exception { + public void reactivate_disabled_user() { enablePlugin(); setUserCreatedByAuthPlugin(USER_LOGIN, USER_PROVIDER_ID, USER_NAME, USER_EMAIL); @@ -190,7 +190,7 @@ public class BaseIdentityProviderTest { } @Test - public void not_authenticate_when_plugin_is_disabled() throws Exception { + public void not_authenticate_when_plugin_is_disabled() { setServerProperty(ORCHESTRATOR, "sonar.auth.fake-base-id-provider.enabled", "false"); setUserCreatedByAuthPlugin(USER_LOGIN, USER_PROVIDER_ID, USER_NAME, USER_EMAIL); @@ -219,7 +219,7 @@ public class BaseIdentityProviderTest { } @Test - public void synchronize_groups_for_new_user() throws Exception { + public void synchronize_groups_for_new_user() { enablePlugin(); userRule.createGroup(GROUP1); userRule.createGroup(GROUP2); @@ -233,7 +233,7 @@ public class BaseIdentityProviderTest { } @Test - public void synchronize_groups_for_existing_user() throws Exception { + public void synchronize_groups_for_existing_user() { enablePlugin(); userRule.createGroup(GROUP1); userRule.createGroup(GROUP2); @@ -250,7 +250,7 @@ public class BaseIdentityProviderTest { } @Test - public void remove_user_groups_when_groups_provided_by_plugin_are_empty() throws Exception { + public void remove_user_groups_when_groups_provided_by_plugin_are_empty() { enablePlugin(); userRule.createGroup(GROUP1); userRule.createUser(USER_LOGIN, "password"); @@ -266,7 +266,7 @@ public class BaseIdentityProviderTest { } @Test - public void allow_user_login_with_2_characters() throws Exception { + public void allow_user_login_with_2_characters() { enablePlugin(); String login = "jo"; setUserCreatedByAuthPlugin(login, USER_PROVIDER_ID, USER_NAME, USER_EMAIL); diff --git a/tests/src/test/java/org/sonarqube/tests/user/LocalAuthenticationTest.java b/tests/src/test/java/org/sonarqube/tests/user/LocalAuthenticationTest.java index 53ea4427ccf..fc3707f322e 100644 --- a/tests/src/test/java/org/sonarqube/tests/user/LocalAuthenticationTest.java +++ b/tests/src/test/java/org/sonarqube/tests/user/LocalAuthenticationTest.java @@ -62,7 +62,7 @@ public class LocalAuthenticationTest { public Tester tester = new Tester(orchestrator).disableOrganizations(); @After - public void resetProperties() throws Exception { + public void resetProperties() { resetSettings(orchestrator, null, "sonar.forceAuthentication"); } @@ -154,7 +154,7 @@ public class LocalAuthenticationTest { } @Test - public void allow_user_login_with_2_characters() throws Exception { + public void allow_user_login_with_2_characters() { tester.users().generate(u -> u.setLogin("jo").setPassword("password")); assertThat(checkAuthenticationWithAuthenticateWebService("jo", "password")).isTrue(); @@ -215,7 +215,7 @@ public class LocalAuthenticationTest { * SONAR-7640 */ @Test - public void authentication_with_any_ws() throws Exception { + public void authentication_with_any_ws() { tester.users().generate(u -> u.setLogin("test").setPassword("password")); assertThat(checkAuthenticationWithAnyWS("test", "password").code()).isEqualTo(200); diff --git a/tests/src/test/java/org/sonarqube/tests/user/MyAccountPageTest.java b/tests/src/test/java/org/sonarqube/tests/user/MyAccountPageTest.java index a90a916d0df..226082b75b1 100644 --- a/tests/src/test/java/org/sonarqube/tests/user/MyAccountPageTest.java +++ b/tests/src/test/java/org/sonarqube/tests/user/MyAccountPageTest.java @@ -54,7 +54,7 @@ public class MyAccountPageTest { } @Test - public void should_display_user_details() throws Exception { + public void should_display_user_details() { Navigation nav = tester.openBrowser(); nav.openLogin().submitCredentials("account-user", "password").shouldBeLoggedIn(); nav.open("/account"); @@ -67,7 +67,7 @@ public class MyAccountPageTest { } @Test - public void should_change_password() throws Exception { + public void should_change_password() { Navigation nav = tester.openBrowser(); nav.openLogin().submitCredentials("account-user", "password").shouldBeLoggedIn(); nav.open("/account/security"); @@ -80,7 +80,7 @@ public class MyAccountPageTest { } @Test - public void should_display_projects() throws Exception { + public void should_display_projects() { // first, try on empty instance runSelenese(orchestrator, "/user/MyAccountPageTest/should_display_no_projects.html"); diff --git a/tests/src/test/java/org/sonarqube/tests/user/OAuth2IdentityProviderTest.java b/tests/src/test/java/org/sonarqube/tests/user/OAuth2IdentityProviderTest.java index a33f438b9f2..0c7b1744d15 100644 --- a/tests/src/test/java/org/sonarqube/tests/user/OAuth2IdentityProviderTest.java +++ b/tests/src/test/java/org/sonarqube/tests/user/OAuth2IdentityProviderTest.java @@ -109,7 +109,7 @@ public class OAuth2IdentityProviderTest { } @Test - public void authenticate_user_through_ui() throws Exception { + public void authenticate_user_through_ui() { simulateRedirectionToCallback(); enablePlugin(); @@ -120,7 +120,7 @@ public class OAuth2IdentityProviderTest { } @Test - public void redirect_to_requested_page() throws UnsupportedEncodingException { + public void redirect_to_requested_page() { simulateRedirectionToCallback(); enablePlugin(); tester.users().generate(u -> u.setLogin(USER_LOGIN)); @@ -140,7 +140,7 @@ public class OAuth2IdentityProviderTest { } @Test - public void display_unauthorized_page_when_authentication_failed_in_callback() throws Exception { + public void display_unauthorized_page_when_authentication_failed_in_callback() { simulateRedirectionToCallback(); enablePlugin(); @@ -153,7 +153,7 @@ public class OAuth2IdentityProviderTest { } @Test - public void fail_to_authenticate_when_not_allowed_to_sign_up() throws Exception { + public void fail_to_authenticate_when_not_allowed_to_sign_up() { simulateRedirectionToCallback(); enablePlugin(); tester.settings().setGlobalSettings("sonar.auth.fake-oauth2-id-provider.allowsUsersToSignUp", "false"); diff --git a/tests/src/test/java/org/sonarqube/tests/user/RealmAuthenticationTest.java b/tests/src/test/java/org/sonarqube/tests/user/RealmAuthenticationTest.java index 68ec5cbb687..36ad102dd95 100644 --- a/tests/src/test/java/org/sonarqube/tests/user/RealmAuthenticationTest.java +++ b/tests/src/test/java/org/sonarqube/tests/user/RealmAuthenticationTest.java @@ -89,12 +89,12 @@ public class RealmAuthenticationTest { @Before @After - public void resetData() throws Exception { + public void resetData() { resetSettings(orchestrator, null, USERS_PROPERTY, "sonar.security.updateUserAttributes"); } @Before - public void initAdminUser() throws Exception { + public void initAdminUser() { userRule.createAdminUser(ADMIN_USER_LOGIN, ADMIN_USER_LOGIN); } @@ -232,7 +232,7 @@ public class RealmAuthenticationTest { // SONAR-3258 @Test - public void shouldAutomaticallyReactivateDeletedUser() throws Exception { + public void shouldAutomaticallyReactivateDeletedUser() { // Given clean Sonar installation and no users in external system // Let's create and delete the user "tester" in Sonar DB @@ -262,7 +262,7 @@ public class RealmAuthenticationTest { * SONAR-7036 */ @Test - public void update_password_of_technical_user() throws Exception { + public void update_password_of_technical_user() { // Create user in external authentication updateUsersInExtAuth(ImmutableMap.of(USER_LOGIN + ".password", USER_LOGIN)); verifyAuthenticationIsOk(USER_LOGIN, USER_LOGIN); @@ -288,7 +288,7 @@ public class RealmAuthenticationTest { * SONAR-7640 */ @Test - public void authentication_with_ws() throws Exception { + public void authentication_with_ws() { // Given clean Sonar installation and no users in external system String login = USER_LOGIN; String password = "1234567"; diff --git a/tests/src/test/java/org/sonarqube/tests/user/SsoAuthenticationTest.java b/tests/src/test/java/org/sonarqube/tests/user/SsoAuthenticationTest.java index 716a6a0dd17..07159881842 100644 --- a/tests/src/test/java/org/sonarqube/tests/user/SsoAuthenticationTest.java +++ b/tests/src/test/java/org/sonarqube/tests/user/SsoAuthenticationTest.java @@ -70,7 +70,7 @@ public class SsoAuthenticationTest { public static RuleChain ruleChain = RuleChain.outerRule(orchestrator).around(userRule); @Before - public void resetData() throws Exception { + public void resetData() { userRule.resetUsers(); } @@ -82,7 +82,7 @@ public class SsoAuthenticationTest { } @Test - public void authenticate_with_only_login() throws Exception { + public void authenticate_with_only_login() { doCall(USER_LOGIN, null, null, null); userRule.verifyUserExists(USER_LOGIN, USER_LOGIN, null); @@ -106,7 +106,7 @@ public class SsoAuthenticationTest { } @Test - public void synchronize_groups_when_authenticating_existing_user() throws Exception { + public void synchronize_groups_when_authenticating_existing_user() { userRule.createGroup(GROUP_1); userRule.createGroup(GROUP_2); userRule.createGroup(GROUP_3); @@ -119,7 +119,7 @@ public class SsoAuthenticationTest { } @Test - public void authentication_with_local_user_is_possible_when_no_header() throws Exception { + public void authentication_with_local_user_is_possible_when_no_header() { userRule.createUser(USER_LOGIN, "password"); checkLocalAuthentication(USER_LOGIN, "password"); diff --git a/tests/src/test/java/org/sonarqube/tests/user/UsersPageTest.java b/tests/src/test/java/org/sonarqube/tests/user/UsersPageTest.java index f736e9cfb62..a71f4305511 100644 --- a/tests/src/test/java/org/sonarqube/tests/user/UsersPageTest.java +++ b/tests/src/test/java/org/sonarqube/tests/user/UsersPageTest.java @@ -51,7 +51,7 @@ public class UsersPageTest { public Tester tester = new Tester(orchestrator).disableOrganizations(); @Before - public void initUsers() throws Exception { + public void initUsers() { adminUser = tester.users().generateAdministrator(u -> u.setLogin("admin-user").setPassword("admin-user")); tester.users().generate(u -> u.setLogin("random-user").setPassword("random-user")); } diff --git a/tests/src/test/java/org/sonarqube/tests/webhook/ExternalServer.java b/tests/src/test/java/org/sonarqube/tests/webhook/ExternalServer.java index 2edb48afc44..220dc1f59e5 100644 --- a/tests/src/test/java/org/sonarqube/tests/webhook/ExternalServer.java +++ b/tests/src/test/java/org/sonarqube/tests/webhook/ExternalServer.java @@ -48,7 +48,7 @@ class ExternalServer extends ExternalResource { jetty.setHandler(new AbstractHandler() { @Override public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) - throws IOException, ServletException { + throws IOException { if ("POST".equalsIgnoreCase(request.getMethod())) { String json = request.getReader().lines().collect(Collectors.joining(System.lineSeparator())); diff --git a/tests/src/test/java/util/ProjectAnalysisRule.java b/tests/src/test/java/util/ProjectAnalysisRule.java index 15f560fdf79..a60bbe5530a 100644 --- a/tests/src/test/java/util/ProjectAnalysisRule.java +++ b/tests/src/test/java/util/ProjectAnalysisRule.java @@ -98,7 +98,7 @@ public class ProjectAnalysisRule extends ExternalResource { } @Override - protected void before() throws Throwable { + protected void before() { orchestrator.resetData(); } -- 2.39.5