From bc735cf09cb0017ab5a8acce87d36240cc0acb28 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Fri, 26 Jan 2018 22:50:28 +0100 Subject: [PATCH] Fix bad imports of Java6Assertions --- .../test/java/org/sonar/server/ce/ws/CancelActionTest.java | 4 ++-- .../java/org/sonar/server/ce/ws/ComponentActionTest.java | 2 +- .../BuiltInQualityProfilesUpdateListenerTest.java | 4 ++-- .../sonar/server/qualityprofile/QProfileResetImplTest.java | 6 +++--- .../java/org/sonar/server/settings/ChildSettingsTest.java | 2 +- .../test/java/org/sonarqube/tests/component/BranchTest.java | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/CancelActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/ce/ws/CancelActionTest.java index b1bbc3f7a53..04518e1f6ac 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/ce/ws/CancelActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/ce/ws/CancelActionTest.java @@ -19,8 +19,6 @@ */ package org.sonar.server.ce.ws; -import static org.assertj.core.api.Java6Assertions.assertThat; - import javax.annotation.Nullable; import org.junit.Rule; @@ -43,6 +41,8 @@ import org.sonar.server.organization.TestDefaultOrganizationProvider; import org.sonar.server.tester.UserSessionRule; import org.sonar.server.ws.WsActionTester; +import static org.assertj.core.api.Assertions.assertThat; + public class CancelActionTest { @Rule 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 44b37b090ca..d1b8d61af24 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 @@ -45,7 +45,7 @@ import org.sonarqube.ws.Common; import org.sonarqube.ws.MediaTypes; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Java6Assertions.tuple; +import static org.assertj.core.api.Assertions.tuple; import static org.sonar.db.ce.CeActivityDto.Status.SUCCESS; import static org.sonar.db.ce.CeQueueDto.Status.IN_PROGRESS; import static org.sonar.db.ce.CeQueueDto.Status.PENDING; 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 966158b4029..ca0130adb98 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 @@ -34,8 +34,8 @@ import org.sonar.server.qualityprofile.BuiltInQualityProfilesNotification.Profil import static java.util.Arrays.asList; import static org.apache.commons.lang.RandomStringUtils.randomAlphanumeric; -import static org.assertj.core.api.Java6Assertions.assertThat; -import static org.assertj.core.api.Java6Assertions.tuple; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.tuple; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileResetImplTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileResetImplTest.java index cd92be4cd4c..306f871d6ca 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileResetImplTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileResetImplTest.java @@ -38,8 +38,8 @@ import org.sonar.server.util.TypeValidations; import static java.util.Arrays.asList; import static java.util.Collections.singletonList; -import static org.assertj.core.api.Java6Assertions.assertThat; -import static org.assertj.core.api.Java6Assertions.tuple; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.tuple; import static org.mockito.Mockito.mock; import static org.sonar.server.qualityprofile.ActiveRuleChange.Type.ACTIVATED; @@ -113,7 +113,7 @@ public class QProfileResetImplTest { RuleDefinitionDto defaultRule = db.rules().insert(r -> r.setLanguage(LANGUAGE)); expectedException.expect(NullPointerException.class); - expectedException.expectMessage(String.format("Quality profile must be persisted")); + expectedException.expectMessage("Quality profile must be persisted"); underTest.reset(db.getSession(), profile, singletonList(RuleActivation.create(defaultRule.getKey()))); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/settings/ChildSettingsTest.java b/server/sonar-server/src/test/java/org/sonar/server/settings/ChildSettingsTest.java index 270d4393604..4f65f2305b2 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/settings/ChildSettingsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/settings/ChildSettingsTest.java @@ -31,7 +31,7 @@ import org.sonar.api.config.PropertyDefinitions; import org.sonar.api.config.internal.MapSettings; import static org.apache.commons.lang.RandomStringUtils.randomAlphanumeric; -import static org.assertj.core.api.Java6Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class ChildSettingsTest { private static final Random RANDOM = new Random(); diff --git a/tests/src/test/java/org/sonarqube/tests/component/BranchTest.java b/tests/src/test/java/org/sonarqube/tests/component/BranchTest.java index 78e2a722356..e1e5dab62c3 100644 --- a/tests/src/test/java/org/sonarqube/tests/component/BranchTest.java +++ b/tests/src/test/java/org/sonarqube/tests/component/BranchTest.java @@ -33,7 +33,7 @@ import org.sonarqube.ws.client.WsResponse; import org.sonarqube.ws.client.projectbranches.ListRequest; import util.ItUtils; -import static org.assertj.core.api.Java6Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static util.ItUtils.runProjectAnalysis; public class BranchTest { -- 2.39.5