add unit tests to quality models

2 files changed, 47 insertions, 4 deletions

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/qualitymodel/Model.java b/sonar-plugin-api/src/main/java/org/sonar/api/qualitymodel/Model.java
index 20bb2a46a57..ef515f96bbf 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/qualitymodel/Model.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/qualitymodel/Model.java
@@ -25,9 +25,8 @@ import org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.commons.lang.builder.ToStringStyle;
 import org.sonar.api.rules.Rule;
 
-import java.util.ArrayList;
-import java.util.List;
 import javax.persistence.*;
+import java.util.List;
 
 /**
  * @since 2.3
@@ -100,7 +99,7 @@ public final class Model implements Comparable<Model> {
 
   private Characteristic addCharacteristic(Characteristic c) {
     c.setModel(this);
-    c.setOrder(characteristics.size()+1);
+    c.setOrder(characteristics.size() + 1);
     characteristics.add(c);
     return c;
   }
@@ -143,7 +142,7 @@ public final class Model implements Comparable<Model> {
   public List<Characteristic> getCharacteristicsByDepth(int depth) {
     List<Characteristic> result = Lists.newArrayList();
     for (Characteristic c : characteristics) {
-      if (c.getEnabled() && c.getDepth()==depth) {
+      if (c.getEnabled() && c.getDepth() == depth) {
         result.add(c);
       }
     }
diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/qualitymodel/ModelTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/qualitymodel/ModelTest.java
new file mode 100644
index 00000000000..20b6a402f2d
--- /dev/null
+++ b/sonar-plugin-api/src/test/java/org/sonar/api/qualitymodel/ModelTest.java
@@ -0,0 +1,44 @@
+/*
+ * Sonar, open source software quality management tool.
+ * Copyright (C) 2009 SonarSource SA
+ * mailto:contact AT sonarsource DOT com
+ *
+ * Sonar is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * Sonar is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Sonar; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
+ */
+package org.sonar.api.qualitymodel;
+
+import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+
+public class ModelTest {
+  @Test
+  public void searchEnabledCharacteristics() {
+    Model model = Model.create();
+    model.createCharacteristicByKey("foo", "enabled foo");
+    model.createCharacteristicByKey("foo", "disabled foo").setEnabled(false);
+
+    assertThat(model.getCharacteristicByKey("foo").getName(), is("enabled foo"));
+    assertThat(model.getCharacteristicByKey("foo").getEnabled(), is(true));
+
+    assertThat(model.getCharacteristicByName("enabled foo").getName(), is("enabled foo"));
+    assertThat(model.getCharacteristicByName("disabled foo"), nullValue());
+
+    assertThat(model.getCharacteristics().size(), is(1));
+    assertThat(model.getCharacteristics(false).size(), is(2));
+  }
+}