From c21f9382b1020ffd8328995f5081dae05df4ed5f Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Sun, 19 Feb 2017 13:14:01 +0100 Subject: [PATCH] Fix bad import of org.assertj.core.api.Java6Assertions.assertThat --- .../src/test/java/it/projectSearch/SearchProjectsTest.java | 2 +- .../java/org/sonar/server/qualityprofile/QProfilesTest.java | 2 +- .../sonar/server/qualityprofile/ws/AddProjectActionTest.java | 2 +- .../server/qualityprofile/ws/RestoreBuiltInActionTest.java | 2 +- .../test/java/org/sonar/server/serverid/ws/ShowActionTest.java | 2 +- .../test/java/org/sonar/server/setting/ws/ValuesActionTest.java | 2 +- .../java/org/sonar/server/updatecenter/ws/UploadActionTest.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/it/it-tests/src/test/java/it/projectSearch/SearchProjectsTest.java b/it/it-tests/src/test/java/it/projectSearch/SearchProjectsTest.java index d7815e15a3e7..16fd31cdb871 100644 --- a/it/it-tests/src/test/java/it/projectSearch/SearchProjectsTest.java +++ b/it/it-tests/src/test/java/it/projectSearch/SearchProjectsTest.java @@ -30,7 +30,7 @@ import org.sonarqube.ws.WsComponents.SearchProjectsWsResponse; import org.sonarqube.ws.client.component.SearchProjectsRequest; -import static org.assertj.core.api.Java6Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static util.ItUtils.newAdminWsClient; import static util.ItUtils.projectDir; diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfilesTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfilesTest.java index c621905defde..11f2c81a2a03 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfilesTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfilesTest.java @@ -29,7 +29,7 @@ import org.sonar.db.qualityprofile.QualityProfileDto; import org.sonar.db.qualityprofile.QualityProfileTesting; -import static org.assertj.core.api.Java6Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; 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 afe8b3c28d1c..ab22b08a54ae 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 @@ -40,7 +40,7 @@ import org.sonar.server.ws.TestRequest; import org.sonar.server.ws.WsActionTester; -import static org.assertj.core.api.Java6Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.sonar.core.permission.GlobalPermissions.QUALITY_PROFILE_ADMIN; import static org.sonar.server.qualityprofile.QProfileTesting.newQProfileDto; diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RestoreBuiltInActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RestoreBuiltInActionTest.java index 006d9366da71..52a7ada60c17 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RestoreBuiltInActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RestoreBuiltInActionTest.java @@ -34,7 +34,7 @@ import org.sonar.server.ws.TestResponse; import org.sonar.server.ws.WsActionTester; -import static org.assertj.core.api.Java6Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/server/sonar-server/src/test/java/org/sonar/server/serverid/ws/ShowActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/serverid/ws/ShowActionTest.java index c3ba64096576..fa194e19e040 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/serverid/ws/ShowActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/serverid/ws/ShowActionTest.java @@ -41,7 +41,7 @@ import org.sonarqube.ws.MediaTypes; import org.sonarqube.ws.ServerId.ShowWsResponse; -import static org.assertj.core.api.Java6Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.sonar.db.property.PropertyTesting.newGlobalPropertyDto; 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 02c71e588333..23aea49481c0 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 @@ -56,7 +56,7 @@ 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.Assertions.assertThat; import static org.assertj.core.groups.Tuple.tuple; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; 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 e27fd8b147d6..cf923ac83c96 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 @@ -34,7 +34,7 @@ import org.sonar.server.ws.WsActionTester; import static java.nio.file.Files.newInputStream; -import static org.assertj.core.api.Java6Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.sonar.test.ExceptionCauseMatcher.hasType;