Add comment lines and lines of code metrics (#49)

2 files changed, 19 insertions, 1 deletions

diff --git a/its/plugin/src/test/java/org/sonar/css/its/MetricsTest.java b/its/plugin/src/test/java/org/sonar/css/its/MetricsTest.java
index ea631c9..9af016d 100644
--- a/its/plugin/src/test/java/org/sonar/css/its/MetricsTest.java
+++ b/its/plugin/src/test/java/org/sonar/css/its/MetricsTest.java
@@ -25,6 +25,7 @@ import org.junit.ClassRule;
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.sonar.css.its.Tests.getMeasure;
 import static org.sonar.css.its.Tests.getProjectMeasureAsDouble;
 
 public class MetricsTest {
@@ -42,6 +43,23 @@ public class MetricsTest {
   @Test
   public void test() {
     assertThat(getProjectMeasureAsDouble("lines", PROJECT_KEY)).isEqualTo(33);
+    assertThat(getProjectMeasureAsDouble("ncloc", PROJECT_KEY)).isEqualTo(23);
+    assertThat(getProjectMeasureAsDouble("comment_lines", PROJECT_KEY)).isEqualTo(5);
+
+    assertThat(getMeasure("ncloc_data", PROJECT_KEY + ":src/file1.css").getValue())
+        .contains("1=1;", "2=1;", "3=1;", "4=1;", "5=1;", "6=1;", "7=1;", "8=1");
+    assertThat(getMeasure("comment_lines_data", PROJECT_KEY + ":src/file1.css").getValue())
+        .contains("5=1;", "10=1");
+
+    assertThat(getMeasure("ncloc_data", PROJECT_KEY + ":src/file2.less").getValue())
+        .contains("1=1;", "2=1;", "3=1;", "4=1;", "5=1;", "6=1;", "7=1;", "8=1;", "9=1");
+    assertThat(getMeasure("comment_lines_data", PROJECT_KEY + ":src/file2.less").getValue())
+        .contains("11=1");
+
+    assertThat(getMeasure("ncloc_data", PROJECT_KEY + ":src/file3.scss").getValue())
+        .contains("1=1;", "3=1;", "5=1;", "6=1;", "7=1;", "8=1");
+    assertThat(getMeasure("comment_lines_data", PROJECT_KEY + ":src/file3.scss").getValue())
+        .contains("10=1;", "12=1");
   }
 
 }
diff --git a/its/plugin/src/test/java/org/sonar/css/its/Tests.java b/its/plugin/src/test/java/org/sonar/css/its/Tests.java
index 335bf6a..eb6a01e 100644
--- a/its/plugin/src/test/java/org/sonar/css/its/Tests.java
+++ b/its/plugin/src/test/java/org/sonar/css/its/Tests.java
@@ -67,7 +67,7 @@ public class Tests {
     return (measure == null) ? null : Double.parseDouble(measure.getValue());
   }
 
-  private static Measure getMeasure(String metricKey, String projectKey) {
+  public static Measure getMeasure(String metricKey, String projectKey) {
     ComponentWsResponse response = newWsClient().measures().component(new ComponentRequest()
       .setComponent(projectKey)
       .setMetricKeys(Collections.singletonList(metricKey)));