Add missing UT

SonarSource · Mar 23, 2016 · 8e04802 · 8e04802
1 parent d9bfbf8
commit 8e04802
Show file tree

Hide file tree

Showing 3 changed files with 344 additions and 60 deletions.
diff --git a/sonar-db/src/main/java/org/sonar/db/qualityprofile/ActiveRuleDao.java b/sonar-db/src/main/java/org/sonar/db/qualityprofile/ActiveRuleDao.java
@@ -116,15 +116,6 @@ public List<ActiveRuleParamDto> selectParamsByActiveRuleIds(final DbSession dbSe
     return DatabaseUtils.executeLargeInputs(activeRuleIds, new ParamIdToDto(mapper(dbSession)));
   }
 
-  /**
-   * Warning ! This method is executing 2 queries : one to get the active rule from the key, and another one to get parameters
-   */
-  private List<ActiveRuleParamDto> selectParamsByActiveRuleKey(DbSession session, ActiveRuleKey key) {
-    Preconditions.checkNotNull(key, ACTIVE_RULE_KEY_CANNOT_BE_NULL);
-    ActiveRuleDto activeRule = selectOrFailByKey(session, key);
-    return mapper(session).selectParamsByActiveRuleId(activeRule.getId());
-  }
-
   @CheckForNull
   public ActiveRuleParamDto selectParamByKeyAndName(ActiveRuleKey key, String name, DbSession session) {
     Preconditions.checkNotNull(key, ACTIVE_RULE_KEY_CANNOT_BE_NULL);
@@ -150,17 +141,6 @@ public ActiveRuleParamDto insertParam(DbSession session, ActiveRuleDto activeRul
     return activeRuleParam;
   }
 
-  public void deleteParamByKeyAndName(DbSession session, ActiveRuleKey key, String param) {
-    // TODO SQL rewrite to delete by key
-    Optional<ActiveRuleDto> activeRule = selectByKey(session, key);
-    if (activeRule.isPresent()) {
-      ActiveRuleParamDto activeRuleParam = mapper(session).selectParamByActiveRuleAndKey(activeRule.get().getId(), param);
-      if (activeRuleParam != null) {
-        mapper(session).deleteParameter(activeRuleParam.getId());
-      }
-    }
-  }
-
   public void updateParam(DbSession session, ActiveRuleDto activeRule, ActiveRuleParamDto activeRuleParam) {
     Preconditions.checkNotNull(activeRule.getId(), ACTIVE_RULE_IS_NOT_PERSISTED);
     Preconditions.checkNotNull(activeRuleParam.getId(), ACTIVE_RULE_PARAM_IS_NOT_PERSISTED);
@@ -173,10 +153,21 @@ public void deleteParam(DbSession session, ActiveRuleDto activeRule, ActiveRuleP
     mapper(session).deleteParameter(activeRuleParam.getId());
   }
 
+  public void deleteParamByKeyAndName(DbSession session, ActiveRuleKey key, String param) {
+    // TODO SQL rewrite to delete by key
+    Optional<ActiveRuleDto> activeRule = selectByKey(session, key);
+    if (activeRule.isPresent()) {
+      ActiveRuleParamDto activeRuleParam = mapper(session).selectParamByActiveRuleAndKey(activeRule.get().getId(), param);
+      if (activeRuleParam != null) {
+        mapper(session).deleteParameter(activeRuleParam.getId());
+      }
+    }
+  }
+
   public void deleteParamsByRuleParam(DbSession dbSession, RuleDto rule, String paramKey) {
     List<ActiveRuleDto> activeRules = selectByRule(dbSession, rule);
     for (ActiveRuleDto activeRule : activeRules) {
-      for (ActiveRuleParamDto activeParam : selectParamsByActiveRuleKey(dbSession, activeRule.getKey())) {
+      for (ActiveRuleParamDto activeParam : selectParamsByActiveRuleId(dbSession, activeRule.getId())) {
         if (activeParam.getKey().equals(paramKey)) {
           deleteParam(dbSession, activeRule, activeParam);
         }

diff --git a/sonar-db/src/main/resources/org/sonar/db/qualityprofile/ActiveRuleMapper.xml b/sonar-db/src/main/resources/org/sonar/db/qualityprofile/ActiveRuleMapper.xml
@@ -28,8 +28,6 @@
 
   <update id="update" parameterType="ActiveRule">
     UPDATE active_rules SET
-    profile_id=#{profileId},
-    rule_id=#{ruleId},
     failure_level=#{severity},
     inheritance=#{inheritance},
     updated_at=#{updatedAt}
@@ -118,9 +116,6 @@
 
   <update id="updateParameter" parameterType="ActiveRuleParam">
     UPDATE active_rule_parameters SET
-    active_rule_id=#{activeRuleId},
-    rules_parameter_id=#{rulesParameterId},
-    rules_parameter_key=#{key},
     value=#{value}
     WHERE id=#{id}
   </update>