SONAR-1634: Provide meaningful error message, when plugin tries to define metric...

diff --git a/sonar-server/src/test/java/org/sonar/server/startup/RegisterMetricsTest.java b/sonar-server/src/test/java/org/sonar/server/startup/RegisterMetricsTest.java
index adfa7485c3a2f0c4052f0b724560eb4ddfe8b852..2f2244e938a39fe6fde1dd02f0d9159da4f05d44 100644 (file)
--- a/sonar-server/src/test/java/org/sonar/server/startup/RegisterMetricsTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/startup/RegisterMetricsTest.java
@@ -19,20 +19,20 @@
  */\r
 package org.sonar.server.startup;\r
 \r
+import static org.junit.Assert.assertFalse;\r
+import static org.junit.Assert.assertTrue;\r
+\r
 import org.junit.Test;\r
-import org.sonar.jpa.dao.MeasuresDao;\r
-import org.sonar.jpa.test.AbstractDbUnitTestCase;\r
 import org.sonar.api.measures.CoreMetrics;\r
 import org.sonar.api.measures.Metric;\r
+import org.sonar.jpa.dao.MeasuresDao;\r
+import org.sonar.jpa.test.AbstractDbUnitTestCase;\r
 \r
 import java.sql.SQLException;\r
 import java.util.ArrayList;\r
 import java.util.Arrays;\r
 import java.util.List;\r
 \r
-import static org.junit.Assert.assertFalse;\r
-import static org.junit.Assert.assertTrue;\r
-\r
 public class RegisterMetricsTest extends AbstractDbUnitTestCase {\r
 \r
   @Test\r
@@ -41,7 +41,7 @@ public class RegisterMetricsTest extends AbstractDbUnitTestCase {
 \r
     Metric metric1 = new Metric("new1", "short1", "desc1", Metric.ValueType.FLOAT, 1, true, "domain1", false);\r
     Metric metric2 = new Metric("new2", "short2", "desc2", Metric.ValueType.FLOAT, 1, true, "domain2", false);\r
-    RegisterMetrics synchronizer = new RegisterMetrics(getSession(), new MeasuresDao(getSession()), null);\r
+    RegisterMetrics synchronizer = new RegisterMetrics(getSession(), new MeasuresDao(getSession()), null, null);\r
     synchronizer.register(Arrays.asList(metric1, metric2));\r
     checkTables("shouldSaveIfNew", "metrics");\r
   }\r
@@ -52,7 +52,7 @@ public class RegisterMetricsTest extends AbstractDbUnitTestCase {
 \r
     final List<Metric> metrics = new ArrayList<Metric>();\r
     metrics.add(new Metric("key", "new short name", "new description", Metric.ValueType.FLOAT, -1, true, "new domain", false));\r
-    RegisterMetrics synchronizer = new RegisterMetrics(getSession(), new MeasuresDao(getSession()), null);\r
+    RegisterMetrics synchronizer = new RegisterMetrics(getSession(), new MeasuresDao(getSession()), null, null);\r
     synchronizer.register(metrics);\r
 \r
     checkTables("shouldUpdateIfAlreadyExists", "metrics");\r
@@ -62,7 +62,7 @@ public class RegisterMetricsTest extends AbstractDbUnitTestCase {
   public void enableOnlyLoadedMetrics() throws SQLException {\r
     setupData("enableOnlyLoadedMetrics");\r
 \r
-    RegisterMetrics loader = new RegisterMetrics(getSession(), new MeasuresDao(getSession()), null);\r
+    RegisterMetrics loader = new RegisterMetrics(getSession(), new MeasuresDao(getSession()), null, null);\r
     loader.start();\r
 \r
     assertFalse(getDao().getMeasuresDao().getMetric("deprecated").getEnabled());\r
@@ -73,7 +73,7 @@ public class RegisterMetricsTest extends AbstractDbUnitTestCase {
   public void cleanAlerts() throws SQLException {\r
     setupData("cleanAlerts");\r
 \r
-    RegisterMetrics loader = new RegisterMetrics(getSession(), new MeasuresDao(getSession()), null);\r
+    RegisterMetrics loader = new RegisterMetrics(getSession(), new MeasuresDao(getSession()), null, null);\r
     loader.cleanAlerts();\r
 \r
     checkTables("cleanAlerts", "metrics", "alerts");\r