9 files changed, 11 insertions, 10 deletions
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/test/ce/measure/ComponentImpl.java b/sonar-plugin-api/src/main/java/org/sonar/api/ce/measure/test/ComponentImpl.java
index b8fef1332bc..866b30f09bb 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/test/ce/measure/ComponentImpl.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/ce/measure/test/ComponentImpl.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.api.test.ce.measure;
+package org.sonar.api.ce.measure.test;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/test/ce/measure/IssueImpl.java b/sonar-plugin-api/src/main/java/org/sonar/api/ce/measure/test/IssueImpl.java
index 0f47f4ff133..a2dfaccc03e 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/test/ce/measure/IssueImpl.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/ce/measure/test/IssueImpl.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.api.test.ce.measure;
+package org.sonar.api.ce.measure.test;
 
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/test/ce/measure/MeasureComputerImpl.java b/sonar-plugin-api/src/main/java/org/sonar/api/ce/measure/test/MeasureComputerImpl.java
index b661247a517..09d5a7ad34e 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/test/ce/measure/MeasureComputerImpl.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/ce/measure/test/MeasureComputerImpl.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.api.test.ce.measure;
+package org.sonar.api.ce.measure.test;
 
 import com.google.common.collect.ImmutableSet;
 import java.util.Set;
@@ -103,7 +103,8 @@ public class MeasureComputerImpl implements MeasureComputer {
     }
 
     private static String[] validateOutputMetricKeys(@Nullable String[] outputMetrics) {
-      checkArgument(outputMetrics != null && outputMetrics.length > 0, "At least one output metric must be defined");
+      requireNonNull(outputMetrics, "Output metrics cannot be null");
+      checkArgument(outputMetrics.length > 0, "At least one output metric must be defined");
       checkNotNull(outputMetrics);
       return outputMetrics;
     }
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/test/ce/measure/MeasureComputerImplementationContext.java b/sonar-plugin-api/src/main/java/org/sonar/api/ce/measure/test/MeasureComputerImplementationContext.java
index 2176a7ee8e8..d50cc662c2d 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/test/ce/measure/MeasureComputerImplementationContext.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/ce/measure/test/MeasureComputerImplementationContext.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.api.test.ce.measure;
+package org.sonar.api.ce.measure.test;
 
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/test/ce/measure/MeasureComputerProviderContext.java b/sonar-plugin-api/src/main/java/org/sonar/api/ce/measure/test/MeasureComputerProviderContext.java
index 66318c0a967..a3cdc01ea2c 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/test/ce/measure/MeasureComputerProviderContext.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/ce/measure/test/MeasureComputerProviderContext.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.api.test.ce.measure;
+package org.sonar.api.ce.measure.test;
 
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/test/ce/measure/MeasureComputerTester.java b/sonar-plugin-api/src/main/java/org/sonar/api/ce/measure/test/MeasureComputerTester.java
index f9d62ca11f5..84063b35799 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/test/ce/measure/MeasureComputerTester.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/ce/measure/test/MeasureComputerTester.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.api.test.ce.measure;
+package org.sonar.api.ce.measure.test;
 
 import com.google.common.base.Optional;
 import com.google.common.base.Predicate;
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/test/ce/measure/MeasureImpl.java b/sonar-plugin-api/src/main/java/org/sonar/api/ce/measure/test/MeasureImpl.java
index 43dc4bdb36a..a7bd1c887e9 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/test/ce/measure/MeasureImpl.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/ce/measure/test/MeasureImpl.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.api.test.ce.measure;
+package org.sonar.api.ce.measure.test;
 
 import javax.annotation.concurrent.Immutable;
 import org.sonar.api.ce.measure.Measure;
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/test/ce/measure/SettingsImpl.java b/sonar-plugin-api/src/main/java/org/sonar/api/ce/measure/test/SettingsImpl.java
index e713dc39c24..80b2d457c1f 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/test/ce/measure/SettingsImpl.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/ce/measure/test/SettingsImpl.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.api.test.ce.measure;
+package org.sonar.api.ce.measure.test;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/test/ce/measure/package-info.java b/sonar-plugin-api/src/main/java/org/sonar/api/ce/measure/test/package-info.java
index aaa0831b888..14a41a5cc4a 100644
--- a/sonar-plugin-api/src/test/java/org/sonar/api/test/ce/measure/package-info.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/ce/measure/test/package-info.java
@@ -19,6 +19,6 @@
  */
 
 @ParametersAreNonnullByDefault
-package org.sonar.api.test.ce.measure;
+package org.sonar.api.ce.measure.test;
 
 import javax.annotation.ParametersAreNonnullByDefault;