From: Stephane Gamard <stephane.gamard@searchbox.com>
Date: Mon, 28 Apr 2014 11:34:46 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/SonarSource/sonarqube
X-Git-Tag: 4.4-RC1~1378
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9837210b8a7286a842407fe94848460ea5ac56cf;p=sonarqube.git

Merge branch 'master' of https://github.com/SonarSource/sonarqube

# By Julien Lancelot (2) and Stas Vilchik (1)
# Via Stas Vilchik
* 'master' of https://github.com/SonarSource/sonarqube:
  Component Viewer: duplications
  Ignore some failing tests
  Fix licence headers

Conflicts:
	sonar-core/src/main/java/org/sonar/core/cluster/LocalNonBlockingWorkQueue.java
	sonar-server/src/main/java/org/sonar/server/rule2/RuleConstants.java
	sonar-server/src/main/java/org/sonar/server/rule2/RuleDao.java
	sonar-server/src/main/java/org/sonar/server/rule2/RuleIndex.java
	sonar-server/src/test/java/org/sonar/server/rule2/RuleIndexTest.java
---

9837210b8a7286a842407fe94848460ea5ac56cf
diff --cc sonar-batch/src/test/java/org/sonar/batch/rule/RulesProviderTest.java
index 42ab22fed38,42ab22fed38..da1ad682f1a
--- a/sonar-batch/src/test/java/org/sonar/batch/rule/RulesProviderTest.java
+++ b/sonar-batch/src/test/java/org/sonar/batch/rule/RulesProviderTest.java
@@@ -36,11 -36,11 +36,13 @@@ import org.sonar.api.rule.RuleKey
  import org.sonar.api.rule.Severity;
  import org.sonar.api.utils.Duration;
  import org.sonar.api.utils.Durations;
++import org.sonar.core.cluster.WorkQueue;
  import org.sonar.core.persistence.AbstractDaoTestCase;
  import org.sonar.core.rule.RuleDao;
  
  import static org.fest.assertions.Assertions.assertThat;
  import static org.fest.assertions.Fail.fail;
++import static org.mockito.Mockito.mock;
  
  @RunWith(MockitoJUnitRunner.class)
  public class RulesProviderTest extends AbstractDaoTestCase {
@@@ -80,7 -80,7 +82,8 @@@
          .setParentId(102));
  
      durations = new Durations(new Settings().setProperty("sonar.technicalDebt.hoursInDay", 8), null);
--    ruleDao = new RuleDao(getMyBatis());
++    WorkQueue queue = mock(WorkQueue.class);
++    ruleDao = new RuleDao(getMyBatis(),queue);
  
      provider = new RulesProvider();
    }
diff --cc sonar-core/src/test/java/org/sonar/core/rule/RuleDaoTest.java
index 8b6aaf45095,6386962c054..152447530c9
--- a/sonar-core/src/test/java/org/sonar/core/rule/RuleDaoTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/rule/RuleDaoTest.java
@@@ -32,14 -30,12 +30,14 @@@ import org.sonar.api.rule.Severity
  import org.sonar.api.rules.Rule;
  import org.sonar.api.utils.DateUtils;
  import org.sonar.check.Cardinality;
++import org.sonar.core.cluster.WorkQueue;
  import org.sonar.core.persistence.AbstractDaoTestCase;
  
  import java.util.List;
  
- import static org.mockito.Mockito.mock;
- 
  import static com.google.common.collect.Lists.newArrayList;
  import static org.fest.assertions.Assertions.assertThat;
++import static org.mockito.Mockito.mock;
  
  public class RuleDaoTest extends AbstractDaoTestCase {
  
diff --cc sonar-server/src/main/java/org/sonar/server/rule2/RuleIndex.java
index e30f7e29ec1,1867a4e572e..53ca1b54cc8
--- a/sonar-server/src/main/java/org/sonar/server/rule2/RuleIndex.java
+++ b/sonar-server/src/main/java/org/sonar/server/rule2/RuleIndex.java
@@@ -27,11 -27,8 +27,10 @@@ import org.elasticsearch.index.query.Qu
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  import org.sonar.api.rule.RuleKey;
 +import org.sonar.core.cluster.WorkQueue;
  import org.sonar.core.profiling.Profiling;
 -import org.sonar.server.cluster.WorkQueue;
 +import org.sonar.core.rule.RuleConstants;
 +import org.sonar.core.rule.RuleDao;
- import org.sonar.core.db.Dao;
  import org.sonar.server.search.BaseIndex;
  
  import java.io.IOException;
diff --cc sonar-server/src/test/java/org/sonar/server/search/BaseIndexTest.java
index 46232717b59,02db86fd287..ced123ba714
--- a/sonar-server/src/test/java/org/sonar/server/search/BaseIndexTest.java
+++ b/sonar-server/src/test/java/org/sonar/server/search/BaseIndexTest.java
@@@ -30,8 -31,8 +31,9 @@@ import org.junit.Ignore
  import org.junit.Test;
  import org.junit.runner.RunWith;
  import org.sonar.api.config.Settings;
 +import org.sonar.core.cluster.LocalNonBlockingWorkQueue;
  import org.sonar.core.profiling.Profiling;
+ import org.sonar.server.cluster.LocalNonBlockingWorkQueue;
  
  import java.io.Serializable;
  import java.util.Collection;