SONAR-5407 - Added all fields for SQALE

diff --git a/sonar-server/src/main/java/org/sonar/server/rule/index/RuleNormalizer.java b/sonar-server/src/main/java/org/sonar/server/rule/index/RuleNormalizer.java
index 39a8b4a89a9bf3a81dbbf97993294f59be1f390a..502bd901832fb175c2259a3e6f574cd4b709221a 100644 (file)
--- a/sonar-server/src/main/java/org/sonar/server/rule/index/RuleNormalizer.java
+++ b/sonar-server/src/main/java/org/sonar/server/rule/index/RuleNormalizer.java
@@ -207,28 +207,31 @@ public class RuleNormalizer extends BaseNormalizer<RuleDto, RuleKey> {
       update.put(RuleField.DEFAULT_CHARACTERISTIC.field(), null);
       update.put(RuleField.DEFAULT_SUB_CHARACTERISTIC.field(), null);
 
+      update.put(RuleField.DEFAULT_CHARACTERISTIC.field(), null);
+      update.put(RuleField.DEFAULT_SUB_CHARACTERISTIC.field(), null);
       if (rule.getDefaultSubCharacteristicId() != null) {
         CharacteristicDto characteristic = null;
         CharacteristicDto subCharacteristic = null;
         subCharacteristic = db.debtCharacteristicDao().selectById(rule.getDefaultSubCharacteristicId(), session);
-        characteristic = db.debtCharacteristicDao().selectById(subCharacteristic.getParentId());
-        update.put(RuleField.DEFAULT_CHARACTERISTIC.field(), characteristic.getKey());
-        update.put(RuleField.DEFAULT_SUB_CHARACTERISTIC.field(), subCharacteristic.getKey());
-      } else {
-        update.put(RuleField.DEFAULT_CHARACTERISTIC.field(), null);
-        update.put(RuleField.DEFAULT_SUB_CHARACTERISTIC.field(), null);
+        if (subCharacteristic != null) {
+          characteristic = db.debtCharacteristicDao().selectById(subCharacteristic.getParentId());
+          update.put(RuleField.DEFAULT_CHARACTERISTIC.field(), characteristic.getKey());
+          update.put(RuleField.DEFAULT_SUB_CHARACTERISTIC.field(), subCharacteristic.getKey());
+        }
       }
 
-      if (rule.getSubCharacteristicId() == -1) {
-        update.put(RuleField.CHARACTERISTIC.field(), "");
-        update.put(RuleField.SUB_CHARACTERISTIC.field(), "");
-      } else if (rule.getSubCharacteristicId() != null) {
-        CharacteristicDto characteristic = null;
-        CharacteristicDto subCharacteristic = null;
-        subCharacteristic = db.debtCharacteristicDao().selectById(rule.getSubCharacteristicId(), session);
-        characteristic = db.debtCharacteristicDao().selectById(subCharacteristic.getParentId());
-        update.put(RuleField.CHARACTERISTIC.field(), characteristic.getKey());
-        update.put(RuleField.SUB_CHARACTERISTIC.field(), subCharacteristic.getKey());
+      if (rule.getSubCharacteristicId() != null) {
+        if (rule.getSubCharacteristicId() == -1) {
+          update.put(RuleField.CHARACTERISTIC.field(), "");
+          update.put(RuleField.SUB_CHARACTERISTIC.field(), "");
+        } else {
+          CharacteristicDto characteristic = null;
+          CharacteristicDto subCharacteristic = null;
+          subCharacteristic = db.debtCharacteristicDao().selectById(rule.getSubCharacteristicId(), session);
+          characteristic = db.debtCharacteristicDao().selectById(subCharacteristic.getParentId());
+          update.put(RuleField.CHARACTERISTIC.field(), characteristic.getKey());
+          update.put(RuleField.SUB_CHARACTERISTIC.field(), subCharacteristic.getKey());
+        }
       } else {
         update.put(RuleField.CHARACTERISTIC.field(), null);
         update.put(RuleField.SUB_CHARACTERISTIC.field(), null);

diff --git a/sonar-server/src/test/java/org/sonar/server/rule/ws/RuleMappingTest.java b/sonar-server/src/test/java/org/sonar/server/rule/ws/RuleMappingTest.java
index 647109edc3ce01318a14980fa6a9143e543bfad2..c3871de001cdfd8d90cca8ff5f295ff2390e4478 100644 (file)
--- a/sonar-server/src/test/java/org/sonar/server/rule/ws/RuleMappingTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/rule/ws/RuleMappingTest.java
@@ -85,7 +85,10 @@ public class RuleMappingTest {
     assertThat(queryOptions.getFieldsToReturn()).containsOnly(
       RuleNormalizer.RuleField.DEBT_FUNCTION_COEFFICIENT.field(),
       RuleNormalizer.RuleField.DEBT_FUNCTION_OFFSET.field(),
-      RuleNormalizer.RuleField.DEBT_FUNCTION_TYPE.field());
+      RuleNormalizer.RuleField.DEBT_FUNCTION_TYPE.field(),
+      RuleNormalizer.RuleField.DEFAULT_DEBT_FUNCTION_COEFFICIENT.field(),
+      RuleNormalizer.RuleField.DEFAULT_DEBT_FUNCTION_OFFSET.field(),
+      RuleNormalizer.RuleField.DEFAULT_DEBT_FUNCTION_TYPE.field());
   }
 
   @Test

diff --git a/sonar-server/src/test/java/org/sonar/server/rule/ws/ShowActionMediumTest.java b/sonar-server/src/test/java/org/sonar/server/rule/ws/ShowActionMediumTest.java
index 3c8229b9b468f53b9b7d370ac19cc0eb4490ce0e..ef98f07e9b4a83c8e342c7779aeaaba9dd1f0af4 100644 (file)
--- a/sonar-server/src/test/java/org/sonar/server/rule/ws/ShowActionMediumTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/rule/ws/ShowActionMediumTest.java
@@ -20,7 +20,10 @@
 
 package org.sonar.server.rule.ws;
 
-import org.junit.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Test;
 import org.sonar.api.rule.RuleKey;
 import org.sonar.api.rule.RuleStatus;
 import org.sonar.api.rule.Severity;
@@ -130,7 +133,10 @@ public class ShowActionMediumTest {
 
     WsTester.TestRequest request = wsTester.newGetRequest("api/rules", "show")
       .setParam("key", ruleDto.getKey().toString());
-    request.execute().assertJson(getClass(), "show_rule_with_default_debt_infos.json", false);
+    WsTester.Result response = request.execute();
+
+    System.out.println("response = " + response.outputAsString());
+    response.assertJson(getClass(), "show_rule_with_default_debt_infos.json", false);
   }
 
   @Test

diff --git a/sonar-server/src/test/java/org/sonar/server/search/BaseIndexTest.java b/sonar-server/src/test/java/org/sonar/server/search/BaseIndexTest.java
index e7514864e1498f07d79fcc8724ff525cbc1807d4..4db7d12f277f364544e2eb5254e86dfffdea77c3 100644 (file)
--- a/sonar-server/src/test/java/org/sonar/server/search/BaseIndexTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/search/BaseIndexTest.java
@@ -24,7 +24,6 @@ import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsRespon
 import org.elasticsearch.common.settings.ImmutableSettings;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
@@ -43,7 +42,6 @@ import static org.fest.assertions.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-@Ignore
 public class BaseIndexTest {
 
   @Rule

diff --git a/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_default_debt_infos.json b/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_default_debt_infos.json
index 84a0cc89f5e8ade003f829f16723681cf17389d5..61629ca0a111e534fcd146dd4244c2fe9e8b9966 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_default_debt_infos.json
+++ b/sonar-server/src/test/resources/org/sonar/server/rule/ws/ShowActionMediumTest/show_rule_with_default_debt_infos.json
@@ -1,27 +1,37 @@
 {
   "rule": {
-    "key": "java:S001",
-    "repo": "java",
-    "name": "Rule S001",
-    "htmlDesc": "Rule S001 <b>description</b>",
-    "severity": "MINOR",
-    "status": "BETA",
-    "isTemplate": false,
-    "tags": ["tag1", "tag2"],
-    "sysTags": ["systag1", "systag2"],
-    "debtChar": "API",
-    "debtSubChar": "API_ABUSE",
-    "debtRemFnType": "LINEAR_OFFSET",
     "debtRemFnCoeff": "5d",
     "debtRemFnOffset": "10h",
+    "debtRemFnType": "LINEAR_OFFSET",
+    "defaultDebtChar": "API",
+    "defaultDebtRemFnCoeff": "5d",
+    "defaultDebtRemFnOffset": "10h",
+    "defaultDebtRemFnType": "LINEAR_OFFSET",
+    "defaultDebtSubChar": "API_ABUSE",
+    "effortToFixDescription": "java.S001.effortToFix",
+    "htmlDesc": "Rule S001 <b>description</b>",
+    "internalKey": "InternalKeyS001",
+    "isTemplate": false,
+    "key": "java:S001",
     "lang": "xoo",
+    "name": "Rule S001",
     "params": [
       {
-        "key": "regex",
+        "defaultValue": ".*",
         "desc": "Reg ex",
-        "defaultValue": ".*"
+        "key": "regex"
       }
+    ],
+    "repo": "java",
+    "severity": "MINOR",
+    "status": "BETA",
+    "sysTags": [
+      "systag1",
+      "systag2"
+    ],
+    "tags": [
+      "tag1",
+      "tag2"
     ]
   }
 }
-