From af6eaf61cf8d38c1f59fbe9dc8f72c33b780f814 Mon Sep 17 00:00:00 2001
From: Teryk Bellahsene <teryk.bellahsene@sonarsource.com>
Date: Fri, 29 May 2015 15:08:34 +0200
Subject: [PATCH] refactoring more precise method in MetricTesting class to
 enable easy static import

---
 .../java/org/sonar/server/metric/ws/DeleteActionTest.java   | 3 ++-
 .../java/org/sonar/server/metric/ws/DomainsActionTest.java  | 6 ++++--
 .../java/org/sonar/server/metric/ws/ListActionTest.java     | 5 +++--
 .../test/java/org/sonar/server/metric/ws/MetricTesting.java | 2 +-
 4 files changed, 10 insertions(+), 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
index a663ac83922..ddbc0fb5287 100644
--- 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 2a83576fecd..b00bf454e35 100644
--- 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 66ad2d8bd8e..ec30e61e418 100644
--- 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 c991e27318e..42bfff34dc9 100644
--- 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())
-- 
2.39.5