Fix bad imports of Java6Assertions

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 b1bbc3f7a53ed3933874da13e09f771b77163fb5..04518e1f6ac8241d84f43d96cc2f914a1b82914d 100644 (file)
--- 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 44b37b090ca2b358ada4ada467cc43fbfda00520..d1b8d61af243c542c13e270c6bb0812ec0076e8f 100644 (file)
--- 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 966158b40294bf121d50f513d63754a2a8ec3fd1..ca0130adb98eb69ad386f78badab594988c92cc1 100644 (file)
--- 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 cd92be4cd4c85e1b97d948fccda509f3204de524..306f871d6ca8b449c09145f95aa1e7d04b761db5 100644 (file)
--- 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 270d4393604c7cf706ee8af09780bf2060cfff0a..4f65f2305b28b04763e6901c1dfe1e0f537095e6 100644 (file)
--- 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 78e2a7223568f25a648d50ad2575281dbc6b6a05..e1e5dab62c3273d14f162dcd3337d89f132779e7 100644 (file)
--- 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 {