From 23c569a7b1b504d3035ade819bdc2b9787be958e Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Tue, 10 May 2016 14:56:46 +0200 Subject: SONAR-7150 Number of directories should not include test directories --- .../server/computation/step/SizeMeasuresStep.java | 10 ++++++---- .../computation/step/ReportSizeMeasuresStepTest.java | 18 +++++++++--------- 2 files changed, 15 insertions(+), 13 deletions(-) (limited to 'server') diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/SizeMeasuresStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/SizeMeasuresStep.java index 8fd191a5479..afcf7eef084 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/SizeMeasuresStep.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/SizeMeasuresStep.java @@ -114,10 +114,12 @@ public class SizeMeasuresStep implements ComputationStep { @Override public void visitDirectory(Component directory, Path path) { - createMeasures(directory, 1, path.current().files); - - path.parent().directories += 1; - path.parent().files += path.current().files; + int fileCount = path.current().files; + if (fileCount > 0) { + createMeasures(directory, 1, fileCount); + path.parent().directories += 1; + path.parent().files += fileCount; + } } private void createMeasures(Component directory, int dirCount, int fileCount) { diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportSizeMeasuresStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportSizeMeasuresStepTest.java index d668f2a99dd..92e97d8105a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportSizeMeasuresStepTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ReportSizeMeasuresStepTest.java @@ -121,9 +121,9 @@ public class ReportSizeMeasuresStepTest { verifyMeasuresOnOtherComponent(DIRECTORY_1_REF, 2, 1); verifyMeasuresOnOtherComponent(DIRECTORY_2_REF, 1, 1); verifyMeasuresOnOtherComponent(DIRECTORY_3_REF, NO_METRIC, NO_METRIC); - verifyMeasuresOnOtherComponent(SUB_MODULE_REF, 3, 3); - verifyMeasuresOnOtherComponent(MODULE_REF, 3, 3); - verifyMeasuresOnOtherComponent(ROOT_REF, 3, 3); + verifyMeasuresOnOtherComponent(SUB_MODULE_REF, 3, 2); + verifyMeasuresOnOtherComponent(MODULE_REF, 3, 2); + verifyMeasuresOnOtherComponent(ROOT_REF, 3, 2); } @Test @@ -156,9 +156,9 @@ public class ReportSizeMeasuresStepTest { entryOf(metric2Key, newMeasureBuilder().create(100)) }; verifyMeasuresOnOtherComponent(DIRECTORY_3_REF, NO_METRIC, NO_METRIC); - verifyMeasuresOnOtherComponent(SUB_MODULE_REF, 3, 3, subModuleAndAboveEntries); - verifyMeasuresOnOtherComponent(MODULE_REF, 3, 3, subModuleAndAboveEntries); - verifyMeasuresOnOtherComponent(ROOT_REF, 3, 3, subModuleAndAboveEntries); + verifyMeasuresOnOtherComponent(SUB_MODULE_REF, 3, 2, subModuleAndAboveEntries); + verifyMeasuresOnOtherComponent(MODULE_REF, 3, 2, subModuleAndAboveEntries); + verifyMeasuresOnOtherComponent(ROOT_REF, 3, 2, subModuleAndAboveEntries); } @Test @@ -181,9 +181,9 @@ public class ReportSizeMeasuresStepTest { verifyMeasuresOnOtherComponent(DIRECTORY_1_REF, 2, 1, entryOf(metricKey, newMeasureBuilder().create(16))); verifyMeasuresOnOtherComponent(DIRECTORY_2_REF, 1, 1, entryOf(metricKey, newMeasureBuilder().create(3))); verifyMeasuresOnOtherComponent(DIRECTORY_3_REF, NO_METRIC, NO_METRIC); - verifyMeasuresOnOtherComponent(SUB_MODULE_REF, 3, 3, entryOf(metricKey, newMeasureBuilder().create(19))); - verifyMeasuresOnOtherComponent(MODULE_REF, 3, 3, entryOf(metricKey, newMeasureBuilder().create(19))); - verifyMeasuresOnOtherComponent(ROOT_REF, 3, 3, entryOf(metricKey, newMeasureBuilder().create(19))); + verifyMeasuresOnOtherComponent(SUB_MODULE_REF, 3, 2, entryOf(metricKey, newMeasureBuilder().create(19))); + verifyMeasuresOnOtherComponent(MODULE_REF, 3, 2, entryOf(metricKey, newMeasureBuilder().create(19))); + verifyMeasuresOnOtherComponent(ROOT_REF, 3, 2, entryOf(metricKey, newMeasureBuilder().create(19))); } @Test -- cgit v1.2.3