Move integration tests to directory tests/

13 files changed, 33 insertions, 34 deletions

diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/measure/MeasureQueryTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/measure/MeasureQueryTest.java
index 5fe083e92f6..3e083c415bb 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/measure/MeasureQueryTest.java
+++ b/server/sonar-db-dao/src/test/java/org/sonar/db/measure/MeasureQueryTest.java
@@ -19,13 +19,12 @@
  */
 package org.sonar.db.measure;
 
-import java.util.Collections;
-import org.assertj.core.api.Java6Assertions;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
 import static java.util.Arrays.asList;
+import static java.util.Collections.emptyList;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class MeasureQueryTest {
@@ -34,7 +33,7 @@ public class MeasureQueryTest {
   public ExpectedException expectedException = ExpectedException.none();
 
   @Test
-  public void create_query_from_projects() throws Exception {
+  public void create_query_from_projects() {
     MeasureQuery query = MeasureQuery.builder().setProjectUuids(asList("PROJECT_1", "PROJECT_2")).build();
 
     assertThat(query.getProjectUuids()).containsOnly("PROJECT_1", "PROJECT_2");
@@ -44,7 +43,7 @@ public class MeasureQueryTest {
   }
 
   @Test
-  public void create_query_from_project_and_components() throws Exception {
+  public void create_query_from_project_and_components() {
     MeasureQuery query = MeasureQuery.builder().setComponentUuids("PROJECT_1", asList("FILE_1", "FILE_2")).build();
 
     assertThat(query.getProjectUuids()).containsOnly("PROJECT_1");
@@ -56,7 +55,7 @@ public class MeasureQueryTest {
   }
 
   @Test
-  public void create_query_from_single_component_uuid() throws Exception {
+  public void create_query_from_single_component_uuid() {
     MeasureQuery query = MeasureQuery.builder().setComponentUuid("FILE_1").build();
 
     assertThat(query.getComponentUuids()).containsOnly("FILE_1");
@@ -67,7 +66,7 @@ public class MeasureQueryTest {
   }
 
   @Test
-  public void create_query_from_metric_ids() throws Exception {
+  public void create_query_from_metric_ids() {
     MeasureQuery query = MeasureQuery.builder().setProjectUuids(asList("PROJECT_1", "PROJECT_2")).setMetricIds(asList(10, 11)).build();
 
     assertThat(query.getMetricIds()).containsOnly(10, 11);
@@ -75,7 +74,7 @@ public class MeasureQueryTest {
   }
 
   @Test
-  public void create_query_from_metric_keys() throws Exception {
+  public void create_query_from_metric_keys() {
     MeasureQuery query = MeasureQuery.builder().setProjectUuids(asList("PROJECT_1", "PROJECT_2")).setMetricKeys(asList("M1", "M2")).build();
 
     assertThat(query.getMetricKeys()).containsOnly("M1", "M2");
@@ -83,54 +82,54 @@ public class MeasureQueryTest {
   }
 
   @Test
-  public void create_query_from_person_id() throws Exception {
+  public void create_query_from_person_id() {
     MeasureQuery query = MeasureQuery.builder().setProjectUuids(asList("PROJECT_1", "PROJECT_2")).setPersonId(100L).build();
 
     assertThat(query.getPersonId()).isEqualTo(100L);
   }
 
   @Test
-  public void return_empty_when_metrics_are_empty() throws Exception {
-    Java6Assertions.assertThat(MeasureQuery.builder()
+  public void return_empty_when_metrics_are_empty() {
+    assertThat(MeasureQuery.builder()
       .setProjectUuids(asList("PROJECT_1", "PROJECT_2"))
-      .setMetricKeys(Collections.emptyList())
+      .setMetricKeys(emptyList())
       .build().returnsEmpty()).isTrue();
 
-    Java6Assertions.assertThat(MeasureQuery.builder()
+    assertThat(MeasureQuery.builder()
       .setProjectUuids(asList("PROJECT_1", "PROJECT_2"))
-      .setMetricIds(Collections.emptyList())
+      .setMetricIds(emptyList())
       .build().returnsEmpty()).isTrue();
   }
 
   @Test
-  public void return_empty_when_projects_are_empty() throws Exception {
-    Java6Assertions.assertThat(MeasureQuery.builder()
-      .setProjectUuids(Collections.emptyList())
+  public void return_empty_when_projects_are_empty() {
+    assertThat(MeasureQuery.builder()
+      .setProjectUuids(emptyList())
       .build().returnsEmpty()).isTrue();
   }
 
   @Test
-  public void return_empty_when_components_are_empty() throws Exception {
-    Java6Assertions.assertThat(MeasureQuery.builder()
-      .setComponentUuids("PROJECT", Collections.emptyList())
+  public void return_empty_when_components_are_empty() {
+    assertThat(MeasureQuery.builder()
+      .setComponentUuids("PROJECT", emptyList())
       .build().returnsEmpty()).isTrue();
   }
 
   @Test
-  public void fail_when_no_component_uuid_filter() throws Exception {
+  public void fail_when_no_component_uuid_filter() {
     expectedException.expect(IllegalArgumentException.class);
     expectedException.expectMessage("At least one filter on component UUID is expected");
     MeasureQuery.builder().build();
   }
 
   @Test
-  public void fail_when_component_uuids_without_project_uuid() throws Exception {
+  public void fail_when_component_uuids_without_project_uuid() {
     expectedException.expect(NullPointerException.class);
     MeasureQuery.builder().setComponentUuids(null, asList("FILE_1", "FILE_2")).build();
   }
 
   @Test
-  public void fail_when_using_metric_ids_and_metric_keys() throws Exception {
+  public void fail_when_using_metric_ids_and_metric_keys() {
     expectedException.expect(IllegalArgumentException.class);
     expectedException.expectMessage("Metric IDs and keys must not be set both");
     MeasureQuery.builder().setMetricIds(asList(10, 11)).setMetricKeys(asList("M1", "M2")).setProjectUuids(asList("PROJECT_1", "PROJECT_2")).build();
diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/permission/PermissionQueryTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/permission/PermissionQueryTest.java
index 1645cc80a57..7097df8680d 100644
--- a/server/sonar-db-dao/src/test/java/org/sonar/db/permission/PermissionQueryTest.java
+++ b/server/sonar-db-dao/src/test/java/org/sonar/db/permission/PermissionQueryTest.java
@@ -23,7 +23,7 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
-import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class PermissionQueryTest {
 
diff --git a/server/sonar-process-monitor/src/test/java/org/sonar/application/process/JavaProcessLauncherImplTest.java b/server/sonar-process-monitor/src/test/java/org/sonar/application/process/JavaProcessLauncherImplTest.java
index 988d1b56e19..2d00d230b26 100644
--- a/server/sonar-process-monitor/src/test/java/org/sonar/application/process/JavaProcessLauncherImplTest.java
+++ b/server/sonar-process-monitor/src/test/java/org/sonar/application/process/JavaProcessLauncherImplTest.java
@@ -33,7 +33,7 @@ import org.junit.rules.TemporaryFolder;
 import org.sonar.process.AllProcessesCommands;
 import org.sonar.process.ProcessId;
 
-import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.data.MapEntry.entry;
 import static org.mockito.Mockito.RETURNS_MOCKS;
 import static org.mockito.Mockito.mock;
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 b5a83947d1b..079ff5ec5d6 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
@@ -35,7 +35,7 @@ import org.sonar.server.authentication.event.AuthenticationEvent;
 import org.sonar.server.usertoken.UserTokenAuthenticator;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.rules.ExpectedException.none;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
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 574832e5805..ddd673119d4 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
@@ -50,7 +50,7 @@ import org.sonar.server.user.index.UserIndexer;
 import org.sonar.server.usergroups.DefaultGroupFinder;
 
 import static java.util.Arrays.stream;
-import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.rules.ExpectedException.none;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyMap;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/NewComponentTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/NewComponentTest.java
index 1ba6b0abe11..238125c3188 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/component/NewComponentTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/component/NewComponentTest.java
@@ -24,7 +24,7 @@ import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
 import static com.google.common.base.Strings.repeat;
-import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.sonar.api.resources.Qualifiers.PROJECT;
 import static org.sonar.server.component.NewComponent.newComponentBuilder;
 
diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest.java
index 68af5bc8837..451edc64090 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/filemove/FileMoveDetectionStepTest.java
@@ -52,7 +52,7 @@ import org.sonar.server.computation.task.projectanalysis.source.SourceLinesRepos
 import static com.google.common.base.Joiner.on;
 import static java.util.Arrays.stream;
 import static java.util.stream.Collectors.toList;
-import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
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 6575221895d..05124b164a5 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
@@ -32,7 +32,7 @@ import org.sonar.server.tester.UserSessionRule;
 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.junit.Assert.fail;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.doThrow;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/license/ws/ListActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/license/ws/ListActionTest.java
index 53256165c48..b609172e9b7 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/license/ws/ListActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/license/ws/ListActionTest.java
@@ -43,7 +43,7 @@ import org.sonarqube.ws.Licenses;
 import org.sonarqube.ws.Licenses.ListWsResponse;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Java6Assertions.entry;
+import static org.assertj.core.api.Assertions.entry;
 import static org.sonar.api.CoreProperties.PERMANENT_SERVER_ID;
 import static org.sonar.api.PropertyType.LICENSE;
 import static org.sonar.db.property.PropertyTesting.newGlobalPropertyDto;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/web/RootFilterTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/web/RootFilterTest.java
index 4fcb8ed519b..c7ccd7d44ba 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/platform/web/RootFilterTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/platform/web/RootFilterTest.java
@@ -32,7 +32,7 @@ import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.mockito.ArgumentCaptor;
 
-import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateUpdaterTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateUpdaterTest.java
index 98ec8206615..4b9e66207f7 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateUpdaterTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateUpdaterTest.java
@@ -29,7 +29,7 @@ import org.sonar.db.DbTester;
 import org.sonar.db.qualitygate.QualityGateDto;
 import org.sonar.server.exceptions.BadRequestException;
 
-import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class QualityGateUpdaterTest {
 
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 3f9a127fcdb..45ad8ed38ef 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
@@ -45,7 +45,7 @@ import org.sonar.server.ws.WsActionTester;
 import org.sonarqube.ws.MediaTypes;
 import org.sonarqube.ws.WsQualityGates.CreateConditionWsResponse;
 
-import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.sonar.db.metric.MetricTesting.newMetricDto;
 import static org.sonar.db.permission.OrganizationPermission.ADMINISTER_QUALITY_GATES;
 import static org.sonar.server.computation.task.projectanalysis.metric.Metric.MetricType.PERCENT;
diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/UpdateConditionActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/UpdateConditionActionTest.java
index 208d770fc5b..9f223c46fda 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/UpdateConditionActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/UpdateConditionActionTest.java
@@ -45,7 +45,7 @@ import org.sonar.server.ws.WsActionTester;
 import org.sonarqube.ws.MediaTypes;
 import org.sonarqube.ws.WsQualityGates.CreateConditionWsResponse;
 
-import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.sonar.db.metric.MetricTesting.newMetricDto;
 import static org.sonar.db.permission.OrganizationPermission.ADMINISTER_QUALITY_GATES;
 import static org.sonar.server.computation.task.projectanalysis.metric.Metric.MetricType.PERCENT;