refactoring more precise method in MetricTesting class to enable easy static import

diff --git a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/DeleteActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/DeleteActionTest.java
index a663ac83922813a226cd112bc1553cc57c083c65..ddbc0fb528707fee92575769b9a8f5b7ccd41d4d 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/DeleteActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/DeleteActionTest.java
@@ -44,6 +44,7 @@ import org.sonar.server.ws.WsTester;
 import org.sonar.test.DbTests;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.sonar.server.metric.ws.MetricTesting.newMetricDto;
 
 @Category(DbTests.class)
 public class DeleteActionTest {
@@ -146,7 +147,7 @@ public class DeleteActionTest {
   }
 
   private MetricDto newCustomEnabledMetric(int id) {
-    return MetricTesting.newDto().setEnabled(true).setUserManaged(true).setKey("key-" + id);
+    return newMetricDto().setEnabled(true).setUserManaged(true).setKey("key-" + id);
   }
 
   private void insertCustomEnabledMetrics(int... ids) {

diff --git a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/DomainsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/DomainsActionTest.java
index 2a83576fecd5ed9a075aaabdd56ee4e835f83598..b00bf454e3555f5f3eebffc08437cfd7e6cdf19c 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/DomainsActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/DomainsActionTest.java
@@ -34,6 +34,8 @@ import org.sonar.server.ws.WsTester;
 import org.sonar.test.DbTests;
 import org.sonar.test.JsonAssert;
 
+import static org.sonar.server.metric.ws.MetricTesting.newMetricDto;
+
 @Category(DbTests.class)
 public class DomainsActionTest {
 
@@ -64,7 +66,7 @@ public class DomainsActionTest {
     insertNewMetricDto(newEnabledMetric("Documentation"));
     insertNewMetricDto(newEnabledMetric(null));
     insertNewMetricDto(newEnabledMetric(""));
-    insertNewMetricDto(MetricTesting.newDto().setDomain("Domain of Deactivated Metric").setEnabled(false));
+    insertNewMetricDto(newMetricDto().setDomain("Domain of Deactivated Metric").setEnabled(false));
 
     WsTester.Result result = ws.newGetRequest(MetricsWs.ENDPOINT, "domains").execute();
 
@@ -77,6 +79,6 @@ public class DomainsActionTest {
   }
 
   private MetricDto newEnabledMetric(String domain) {
-    return MetricTesting.newDto().setDomain(domain).setEnabled(true);
+    return newMetricDto().setDomain(domain).setEnabled(true);
   }
 }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/ListActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/ListActionTest.java
index 66ad2d8bd8e8e1db79adfa40e5676d308a05ff52..ec30e61e41814e2f9e8415705f37f2616f5417a3 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/ListActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/ListActionTest.java
@@ -35,6 +35,7 @@ import org.sonar.server.ws.WsTester;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.sonar.server.metric.ws.ListAction.PARAM_IS_CUSTOM;
+import static org.sonar.server.metric.ws.MetricTesting.newMetricDto;
 
 public class ListActionTest {
 
@@ -130,7 +131,7 @@ public class ListActionTest {
 
   private void insertNewNonCustomMetric(String... ids) {
     for (String id : ids) {
-      dbClient.metricDao().insert(dbSession, MetricTesting.newDto()
+      dbClient.metricDao().insert(dbSession, newMetricDto()
         .setKey("non-custom-key-" + id)
         .setEnabled(true)
         .setUserManaged(false));
@@ -146,7 +147,7 @@ public class ListActionTest {
   }
 
   private MetricDto newCustomMetric(String id) {
-    return MetricTesting.newDto()
+    return newMetricDto()
       .setKey("custom-key-" + id)
       .setShortName("custom-name-" + id)
       .setDomain("custom-domain-" + id)

diff --git a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/MetricTesting.java b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/MetricTesting.java
index c991e27318eaabd25a40e73bcd3f04571af92c04..42bfff34dc909b948ecc068fb7766518b881d863 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/MetricTesting.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/MetricTesting.java
@@ -30,7 +30,7 @@ public class MetricTesting {
     // static stuff only
   }
 
-  public static MetricDto newDto() {
+  public static MetricDto newMetricDto() {
     Metric.ValueType[] metricTypes = Metric.ValueType.values();
     return new MetricDto()
       .setId(RandomUtils.nextInt())