refactoring more precise method in MetricTesting class to enable easy…

… static import
SonarSource · May 29, 2015 · af6eaf6 · af6eaf6
1 parent ff83bd8
commit af6eaf6
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
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
@@ -44,6 +44,7 @@
 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 void fail_when_insufficient_privileges() throws Exception {
   }
 
   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
@@ -34,6 +34,8 @@
 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 void json_example_validated() throws Exception {
     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 @@ private void insertNewMetricDto(MetricDto metric) {
   }
 
   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
@@ -35,6 +35,7 @@
 
 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 void list_metric_with_chosen_fields() throws Exception {
 
   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 @@ private void insertNewCustomMetric(String... ids) {
   }
 
   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
@@ -30,7 +30,7 @@ private MetricTesting() {
     // static stuff only
   }
 
-  public static MetricDto newDto() {
+  public static MetricDto newMetricDto() {
     Metric.ValueType[] metricTypes = Metric.ValueType.values();
     return new MetricDto()
       .setId(RandomUtils.nextInt())