Method renaming

diff --git a/sonar-batch/src/test/java/org/sonar/batch/index/MeasurePersisterTest.java b/sonar-batch/src/test/java/org/sonar/batch/index/MeasurePersisterTest.java
index e3e5407f0c526712ae54adb73e032fe8c5dcaa3e..82b7abe50c3ab74d52fceeee3ebf64634e49e3ba 100644 (file)
--- a/sonar-batch/src/test/java/org/sonar/batch/index/MeasurePersisterTest.java
+++ b/sonar-batch/src/test/java/org/sonar/batch/index/MeasurePersisterTest.java
@@ -261,6 +261,9 @@ public class MeasurePersisterTest extends AbstractDaoTestCase {
   @Test
   public void should_not_save_measures_without_data() {
     assertThat(MeasurePersister.shouldPersistMeasure(aFile, new Measure(CoreMetrics.LINES))).isFalse();
+
+    Measure duplicatedLines = new Measure(CoreMetrics.DUPLICATED_LINES_DENSITY);
+    assertThat(MeasurePersister.shouldPersistMeasure(aFile, duplicatedLines)).isFalse();
   }
 
   private static Snapshot snapshot(int id) {

diff --git a/sonar-core/src/main/java/org/sonar/core/permission/PermissionFacade.java b/sonar-core/src/main/java/org/sonar/core/permission/PermissionFacade.java
index 21d4d93c1fd03c7ee8aec72179f471c0ef3375ee..dff20b42263a3753c8a0e294ff657aaf218df7d2 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/permission/PermissionFacade.java
+++ b/sonar-core/src/main/java/org/sonar/core/permission/PermissionFacade.java
@@ -174,7 +174,7 @@ public class PermissionFacade implements TaskComponent, ServerComponent {
     }
   }
 
-  public int countComponentsPermissions(Long resourceId) {
+  public int countComponentPermissions(Long resourceId) {
     return roleDao.countResourceGroupRoles(resourceId) + roleDao.countResourceUserRoles(resourceId);
   }
 

diff --git a/sonar-core/src/main/java/org/sonar/core/resource/DefaultResourcePermissions.java b/sonar-core/src/main/java/org/sonar/core/resource/DefaultResourcePermissions.java
index 67624c41e6dc4893c5ec9670026525267b844db2..ffe91a333d4241a015c42b4c02d7f98aa2a0618e 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/resource/DefaultResourcePermissions.java
+++ b/sonar-core/src/main/java/org/sonar/core/resource/DefaultResourcePermissions.java
@@ -55,7 +55,7 @@ public class DefaultResourcePermissions implements ResourcePermissions {
   public boolean hasRoles(Resource resource) {
     if (resource.getId() != null) {
       Long resourceId = Long.valueOf(resource.getId());
-      return permissionFacade.countComponentsPermissions(resourceId) > 0;
+      return permissionFacade.countComponentPermissions(resourceId) > 0;
     }
     return false;
   }

diff --git a/sonar-core/src/test/java/org/sonar/core/permission/PermissionFacadeTest.java b/sonar-core/src/test/java/org/sonar/core/permission/PermissionFacadeTest.java
index 4fbdc3b435a5f9dc8127207c622261b2af037007..6f342949151ee47442f667e3c326fb67fe06dfdc 100644 (file)
--- a/sonar-core/src/test/java/org/sonar/core/permission/PermissionFacadeTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/permission/PermissionFacadeTest.java
@@ -65,7 +65,7 @@ public class PermissionFacadeTest extends AbstractDaoTestCase {
   public void should_count_component_permissions() throws Exception {
     setupData("should_count_component_permissions");
 
-    assertThat(permissionFacade.countComponentsPermissions(123L)).isEqualTo(2);
+    assertThat(permissionFacade.countComponentPermissions(123L)).isEqualTo(2);
   }
 
   @Test

diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/measures/MeasureTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/measures/MeasureTest.java
index 3be80238d8e4618d61869962e2d4a81d35b87f9a..694519d0db049dc6f951743b3cdc4dd3e713ac87 100644 (file)
--- a/sonar-plugin-api/src/test/java/org/sonar/api/measures/MeasureTest.java
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/measures/MeasureTest.java
@@ -197,12 +197,12 @@ public class MeasureTest {
 
   @Test
   public void null_value_and_null_variations_should_be_considered_as_best_value() {
-    assertThat(new Measure(CoreMetrics.NEW_VIOLATIONS).setVariation1(0.0).isBestValue()).isTrue();
-    assertThat(new Measure(CoreMetrics.NEW_VIOLATIONS).setVariation1(1.0).isBestValue()).isFalse();
-    assertThat(new Measure(CoreMetrics.NEW_VIOLATIONS).setVariation2(1.0).isBestValue()).isFalse();
-    assertThat(new Measure(CoreMetrics.NEW_VIOLATIONS).setVariation3(1.0).isBestValue()).isFalse();
-    assertThat(new Measure(CoreMetrics.NEW_VIOLATIONS).setVariation4(1.0).isBestValue()).isFalse();
-    assertThat(new Measure(CoreMetrics.NEW_VIOLATIONS).setVariation5(1.0).isBestValue()).isFalse();
+    assertThat(new Measure(CoreMetrics.VIOLATIONS).setVariation1(0.0).isBestValue()).isTrue();
+    assertThat(new Measure(CoreMetrics.VIOLATIONS).setVariation1(1.0).isBestValue()).isFalse();
+    assertThat(new Measure(CoreMetrics.VIOLATIONS).setVariation2(1.0).isBestValue()).isFalse();
+    assertThat(new Measure(CoreMetrics.VIOLATIONS).setVariation3(1.0).isBestValue()).isFalse();
+    assertThat(new Measure(CoreMetrics.VIOLATIONS).setVariation4(1.0).isBestValue()).isFalse();
+    assertThat(new Measure(CoreMetrics.VIOLATIONS).setVariation5(1.0).isBestValue()).isFalse();
   }
 
 }