From 61f369c008de87495d833aea8be36eb065fb8d31 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Sat, 1 Feb 2014 17:05:41 +0100 Subject: [PATCH] Move all QProfile related classes to org.sonar.server.qualityprofile --- .../org/sonar/server/platform/Platform.java | 2 +- .../ProfilesBackup.java | 9 +- .../ProfilesManager.java | 3 +- .../QProfileActiveRuleOperations.java | 1 - .../qualityprofile/QProfileOperations.java | 1 - .../sonar/server/rule/RuleRegistration.java | 2 +- .../java/org/sonar/server/ui/JRubyFacade.java | 2 +- .../InheritedProfilesTest.java | 5 +- .../ProfilesBackupTest.java | 4 +- .../ProfilesManagerTest.java | 3 +- .../QProfileActiveRuleOperationsTest.java | 1 - .../QProfileOperationsTest.java | 1 - .../RuleChangeTest.java | 3 +- .../server/rule/RuleRegistrationTest.java | 2 +- .../configuration/BackupTest/backup-empty.xml | 5 - .../BackupTest/backup-restore-valid.xml | 110 ----------------- .../backup-restore-without-inheritance.xml | 25 ---- .../configuration/BackupTest/backup-valid.xml | 112 ------------------ .../BackupTest/backup-with-cdata.xml | 12 -- .../BackupTest/backup-with-id-for-metrics.xml | 18 --- .../BackupTest/backup-with-splitted-cdata.xml | 22 ---- .../BackupTest/backup-with-utf8-char.xml | 12 -- .../shouldImportOneDotFiveFormat.xml | 28 ----- .../checkExistentFile.properties | 1 - .../shouldReadEnvironmentVariables.properties | 2 - .../backup-with-multiline-property.xml | 19 --- .../shouldExportAnArrayProperty.xml | 3 - .../shouldExportProperties.xml | 10 -- .../shouldImportMultilineProperties.xml | 6 - .../shouldImportProperties-result.xml | 27 ----- .../shouldImportProperties.xml | 20 ---- ...ldNotExportPropertiesLinkedToResources.xml | 6 - ...uldNotImportSonarCoreIdProperty-result.xml | 8 -- .../shouldNotImportSonarCoreIdProperty.xml | 11 -- .../shouldActivateInChildren-result.xml | 0 .../shouldActivateInChildren.xml | 0 .../shouldChangeParent-result.xml | 0 .../shouldChangeParent.xml | 0 .../shouldCheckCycles.xml | 0 .../shouldDeactivateInChildren-result.xml | 0 .../shouldDeactivateInChildren.xml | 0 ...NotDeactivateOverridingChildren-result.xml | 0 .../shouldNotDeactivateOverridingChildren.xml | 0 .../shouldRemoveParent-result.xml | 0 .../shouldRemoveParent.xml | 0 .../shouldSetParent-result.xml | 0 .../InheritedProfilesTest/shouldSetParent.xml | 0 .../shouldSupportEnabledField.xml | 0 .../shouldSupportMissingEnabledField.xml | 0 .../changeParentProfile-result.xml | 0 .../RuleChangeTest/changeParentProfile.xml | 0 .../RuleChangeTest/initialData.xml | 0 .../removeActivatedRules-result.xml | 0 .../RuleChangeTest/ruleActivated-result.xml | 0 .../RuleChangeTest/ruleDeactivated-result.xml | 0 .../ruleParamChanged-result.xml | 0 .../RuleChangeTest/ruleReverted-result.xml | 0 .../RuleChangeTest/ruleReverted.xml | 0 .../ruleSeverityChanged-result.xml | 0 ...aram_change_on_rule_revert_if_no_param.xml | 0 .../versionIncreaseIfUsed-result.xml | 0 ...sionIncreaseIfUsedAndInChildren-result.xml | 0 62 files changed, 20 insertions(+), 476 deletions(-) rename sonar-server/src/main/java/org/sonar/server/{configuration => qualityprofile}/ProfilesBackup.java (98%) rename sonar-server/src/main/java/org/sonar/server/{configuration => qualityprofile}/ProfilesManager.java (99%) rename sonar-server/src/test/java/org/sonar/server/{configuration => qualityprofile}/InheritedProfilesTest.java (95%) rename sonar-server/src/test/java/org/sonar/server/{configuration => qualityprofile}/ProfilesBackupTest.java (94%) rename sonar-server/src/test/java/org/sonar/server/{configuration => qualityprofile}/ProfilesManagerTest.java (96%) rename sonar-server/src/test/java/org/sonar/server/{configuration => qualityprofile}/RuleChangeTest.java (98%) delete mode 100644 sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-empty.xml delete mode 100644 sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-restore-valid.xml delete mode 100644 sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-restore-without-inheritance.xml delete mode 100644 sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-valid.xml delete mode 100644 sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-with-cdata.xml delete mode 100644 sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-with-id-for-metrics.xml delete mode 100644 sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-with-splitted-cdata.xml delete mode 100644 sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-with-utf8-char.xml delete mode 100644 sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/shouldImportOneDotFiveFormat.xml delete mode 100644 sonar-server/src/test/resources/org/sonar/server/configuration/ConfigurationFactoryTest/checkExistentFile.properties delete mode 100644 sonar-server/src/test/resources/org/sonar/server/configuration/ConfigurationFactoryTest/shouldReadEnvironmentVariables.properties delete mode 100644 sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/backup-with-multiline-property.xml delete mode 100644 sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldExportAnArrayProperty.xml delete mode 100644 sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldExportProperties.xml delete mode 100644 sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldImportMultilineProperties.xml delete mode 100644 sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldImportProperties-result.xml delete mode 100644 sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldImportProperties.xml delete mode 100644 sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldNotExportPropertiesLinkedToResources.xml delete mode 100644 sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldNotImportSonarCoreIdProperty-result.xml delete mode 100644 sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldNotImportSonarCoreIdProperty.xml rename sonar-server/src/test/resources/org/sonar/server/{configuration => qualityprofile}/InheritedProfilesTest/shouldActivateInChildren-result.xml (100%) rename sonar-server/src/test/resources/org/sonar/server/{configuration => qualityprofile}/InheritedProfilesTest/shouldActivateInChildren.xml (100%) rename sonar-server/src/test/resources/org/sonar/server/{configuration => qualityprofile}/InheritedProfilesTest/shouldChangeParent-result.xml (100%) rename sonar-server/src/test/resources/org/sonar/server/{configuration => qualityprofile}/InheritedProfilesTest/shouldChangeParent.xml (100%) rename sonar-server/src/test/resources/org/sonar/server/{configuration => qualityprofile}/InheritedProfilesTest/shouldCheckCycles.xml (100%) rename sonar-server/src/test/resources/org/sonar/server/{configuration => qualityprofile}/InheritedProfilesTest/shouldDeactivateInChildren-result.xml (100%) rename sonar-server/src/test/resources/org/sonar/server/{configuration => qualityprofile}/InheritedProfilesTest/shouldDeactivateInChildren.xml (100%) rename sonar-server/src/test/resources/org/sonar/server/{configuration => qualityprofile}/InheritedProfilesTest/shouldNotDeactivateOverridingChildren-result.xml (100%) rename sonar-server/src/test/resources/org/sonar/server/{configuration => qualityprofile}/InheritedProfilesTest/shouldNotDeactivateOverridingChildren.xml (100%) rename sonar-server/src/test/resources/org/sonar/server/{configuration => qualityprofile}/InheritedProfilesTest/shouldRemoveParent-result.xml (100%) rename sonar-server/src/test/resources/org/sonar/server/{configuration => qualityprofile}/InheritedProfilesTest/shouldRemoveParent.xml (100%) rename sonar-server/src/test/resources/org/sonar/server/{configuration => qualityprofile}/InheritedProfilesTest/shouldSetParent-result.xml (100%) rename sonar-server/src/test/resources/org/sonar/server/{configuration => qualityprofile}/InheritedProfilesTest/shouldSetParent.xml (100%) rename sonar-server/src/test/resources/org/sonar/server/{configuration => qualityprofile}/ProfilesBackupTest/shouldSupportEnabledField.xml (100%) rename sonar-server/src/test/resources/org/sonar/server/{configuration => qualityprofile}/ProfilesBackupTest/shouldSupportMissingEnabledField.xml (100%) rename sonar-server/src/test/resources/org/sonar/server/{configuration => qualityprofile}/RuleChangeTest/changeParentProfile-result.xml (100%) rename sonar-server/src/test/resources/org/sonar/server/{configuration => qualityprofile}/RuleChangeTest/changeParentProfile.xml (100%) rename sonar-server/src/test/resources/org/sonar/server/{configuration => qualityprofile}/RuleChangeTest/initialData.xml (100%) rename sonar-server/src/test/resources/org/sonar/server/{configuration => qualityprofile}/RuleChangeTest/removeActivatedRules-result.xml (100%) rename sonar-server/src/test/resources/org/sonar/server/{configuration => qualityprofile}/RuleChangeTest/ruleActivated-result.xml (100%) rename sonar-server/src/test/resources/org/sonar/server/{configuration => qualityprofile}/RuleChangeTest/ruleDeactivated-result.xml (100%) rename sonar-server/src/test/resources/org/sonar/server/{configuration => qualityprofile}/RuleChangeTest/ruleParamChanged-result.xml (100%) rename sonar-server/src/test/resources/org/sonar/server/{configuration => qualityprofile}/RuleChangeTest/ruleReverted-result.xml (100%) rename sonar-server/src/test/resources/org/sonar/server/{configuration => qualityprofile}/RuleChangeTest/ruleReverted.xml (100%) rename sonar-server/src/test/resources/org/sonar/server/{configuration => qualityprofile}/RuleChangeTest/ruleSeverityChanged-result.xml (100%) rename sonar-server/src/test/resources/org/sonar/server/{configuration => qualityprofile}/RuleChangeTest/should_not_track_param_change_on_rule_revert_if_no_param.xml (100%) rename sonar-server/src/test/resources/org/sonar/server/{configuration => qualityprofile}/RuleChangeTest/versionIncreaseIfUsed-result.xml (100%) rename sonar-server/src/test/resources/org/sonar/server/{configuration => qualityprofile}/RuleChangeTest/versionIncreaseIfUsedAndInChildren-result.xml (100%) diff --git a/sonar-server/src/main/java/org/sonar/server/platform/Platform.java b/sonar-server/src/main/java/org/sonar/server/platform/Platform.java index 90a071daa43..4d9ac55497e 100644 --- a/sonar-server/src/main/java/org/sonar/server/platform/Platform.java +++ b/sonar-server/src/main/java/org/sonar/server/platform/Platform.java @@ -74,7 +74,7 @@ import org.sonar.jpa.session.ThreadLocalDatabaseSessionFactory; import org.sonar.server.charts.ChartFactory; import org.sonar.server.component.DefaultComponentFinder; import org.sonar.server.component.DefaultRubyComponentService; -import org.sonar.server.configuration.ProfilesManager; +import org.sonar.server.qualityprofile.ProfilesManager; import org.sonar.server.db.EmbeddedDatabaseFactory; import org.sonar.server.db.migrations.DatabaseMigration; import org.sonar.server.db.migrations.DatabaseMigrations; diff --git a/sonar-server/src/main/java/org/sonar/server/configuration/ProfilesBackup.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ProfilesBackup.java similarity index 98% rename from sonar-server/src/main/java/org/sonar/server/configuration/ProfilesBackup.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/ProfilesBackup.java index e18c9f9c5d8..7c1cf830170 100644 --- a/sonar-server/src/main/java/org/sonar/server/configuration/ProfilesBackup.java +++ b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ProfilesBackup.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.configuration; +package org.sonar.server.qualityprofile; import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.converters.Converter; @@ -34,6 +34,7 @@ import org.sonar.api.profiles.RulesProfile; import org.sonar.api.rules.*; import org.sonar.core.preview.PreviewCache; import org.sonar.jpa.dao.RulesDao; +import org.sonar.server.configuration.SonarConfig; import java.util.*; @@ -126,7 +127,7 @@ public class ProfilesBackup { private void importAlerts(RulesProfile profile) { if (profile.getAlerts() != null) { - for (Iterator ia = profile.getAlerts().iterator(); ia.hasNext();) { + for (Iterator ia = profile.getAlerts().iterator(); ia.hasNext(); ) { Alert alert = ia.next(); Metric unMarshalledMetric = alert.getMetric(); String validKey = unMarshalledMetric.getKey(); @@ -143,7 +144,7 @@ public class ProfilesBackup { } private void importActiveRules(RulesDao rulesDao, RulesProfile profile) { - for (Iterator iar = profile.getActiveRules(true).iterator(); iar.hasNext();) { + for (Iterator iar = profile.getActiveRules(true).iterator(); iar.hasNext(); ) { ActiveRule activeRule = iar.next(); Rule unMarshalledRule = activeRule.getRule(); Rule matchingRuleInDb = rulesDao.getRuleByKey(unMarshalledRule.getRepositoryKey(), unMarshalledRule.getKey()); @@ -155,7 +156,7 @@ public class ProfilesBackup { activeRule.setRule(matchingRuleInDb); activeRule.setRulesProfile(profile); activeRule.getActiveRuleParams(); - for (Iterator irp = activeRule.getActiveRuleParams().iterator(); irp.hasNext();) { + for (Iterator irp = activeRule.getActiveRuleParams().iterator(); irp.hasNext(); ) { ActiveRuleParam activeRuleParam = irp.next(); RuleParam unMarshalledRP = activeRuleParam.getRuleParam(); RuleParam matchingRPInDb = rulesDao.getRuleParam(matchingRuleInDb, unMarshalledRP.getKey()); diff --git a/sonar-server/src/main/java/org/sonar/server/configuration/ProfilesManager.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ProfilesManager.java similarity index 99% rename from sonar-server/src/main/java/org/sonar/server/configuration/ProfilesManager.java rename to sonar-server/src/main/java/org/sonar/server/qualityprofile/ProfilesManager.java index 717b168f66f..c1f636dc25a 100644 --- a/sonar-server/src/main/java/org/sonar/server/configuration/ProfilesManager.java +++ b/sonar-server/src/main/java/org/sonar/server/qualityprofile/ProfilesManager.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.configuration; +package org.sonar.server.qualityprofile; import com.google.common.collect.Lists; import org.apache.commons.lang.ObjectUtils; @@ -31,7 +31,6 @@ import org.sonar.jpa.dao.RulesDao; import javax.annotation.CheckForNull; import javax.annotation.Nullable; - import java.util.List; public class ProfilesManager extends BaseDao { diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileActiveRuleOperations.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileActiveRuleOperations.java index 022de16f19c..99f5d1cc555 100644 --- a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileActiveRuleOperations.java +++ b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileActiveRuleOperations.java @@ -37,7 +37,6 @@ import org.sonar.core.qualityprofile.db.*; import org.sonar.core.rule.RuleDao; import org.sonar.core.rule.RuleDto; import org.sonar.core.rule.RuleParamDto; -import org.sonar.server.configuration.ProfilesManager; import org.sonar.server.exceptions.BadRequestException; import org.sonar.server.user.UserSession; import org.sonar.server.util.TypeValidations; diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileOperations.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileOperations.java index c53705c7696..7f40c7079ae 100644 --- a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileOperations.java +++ b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileOperations.java @@ -31,7 +31,6 @@ import org.sonar.core.properties.PropertyDto; import org.sonar.core.qualityprofile.db.ActiveRuleDao; import org.sonar.core.qualityprofile.db.QualityProfileDao; import org.sonar.core.qualityprofile.db.QualityProfileDto; -import org.sonar.server.configuration.ProfilesManager; import org.sonar.server.exceptions.BadRequestException; import org.sonar.server.user.UserSession; diff --git a/sonar-server/src/main/java/org/sonar/server/rule/RuleRegistration.java b/sonar-server/src/main/java/org/sonar/server/rule/RuleRegistration.java index 938ddfb90da..26549264a4d 100644 --- a/sonar-server/src/main/java/org/sonar/server/rule/RuleRegistration.java +++ b/sonar-server/src/main/java/org/sonar/server/rule/RuleRegistration.java @@ -36,7 +36,7 @@ import org.sonar.check.Cardinality; import org.sonar.core.persistence.MyBatis; import org.sonar.core.qualityprofile.db.ActiveRuleDao; import org.sonar.core.rule.*; -import org.sonar.server.configuration.ProfilesManager; +import org.sonar.server.qualityprofile.ProfilesManager; import javax.annotation.CheckForNull; diff --git a/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java b/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java index 307e7b61f58..0ac545ac080 100644 --- a/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java +++ b/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java @@ -46,7 +46,7 @@ import org.sonar.core.purge.PurgeDao; import org.sonar.core.resource.ResourceIndexerDao; import org.sonar.core.resource.ResourceKeyUpdaterDao; import org.sonar.core.timemachine.Periods; -import org.sonar.server.configuration.ProfilesManager; +import org.sonar.server.qualityprofile.ProfilesManager; import org.sonar.server.db.migrations.DatabaseMigrator; import org.sonar.server.platform.Platform; import org.sonar.server.platform.ServerIdGenerator; diff --git a/sonar-server/src/test/java/org/sonar/server/configuration/InheritedProfilesTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/InheritedProfilesTest.java similarity index 95% rename from sonar-server/src/test/java/org/sonar/server/configuration/InheritedProfilesTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/InheritedProfilesTest.java index b47906fe862..c17c4faf1ef 100644 --- a/sonar-server/src/test/java/org/sonar/server/configuration/InheritedProfilesTest.java +++ b/sonar-server/src/test/java/org/sonar/server/qualityprofile/InheritedProfilesTest.java @@ -17,18 +17,19 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.configuration; +package org.sonar.server.qualityprofile; import org.junit.Before; import org.junit.Test; import org.sonar.core.preview.PreviewCache; import org.sonar.jpa.test.AbstractDbUnitTestCase; +import org.sonar.server.qualityprofile.ProfilesManager; import static org.fest.assertions.Assertions.assertThat; import static org.mockito.Mockito.mock; public class InheritedProfilesTest extends AbstractDbUnitTestCase { - private ProfilesManager profilesManager; + ProfilesManager profilesManager; @Before public void setUp() { diff --git a/sonar-server/src/test/java/org/sonar/server/configuration/ProfilesBackupTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/ProfilesBackupTest.java similarity index 94% rename from sonar-server/src/test/java/org/sonar/server/configuration/ProfilesBackupTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/ProfilesBackupTest.java index 2b74446d91a..102f58d6abc 100644 --- a/sonar-server/src/test/java/org/sonar/server/configuration/ProfilesBackupTest.java +++ b/sonar-server/src/test/java/org/sonar/server/qualityprofile/ProfilesBackupTest.java @@ -17,12 +17,14 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.configuration; +package org.sonar.server.qualityprofile; import org.junit.Before; import org.junit.Test; import org.sonar.api.profiles.RulesProfile; import org.sonar.jpa.test.AbstractDbUnitTestCase; +import org.sonar.server.configuration.SonarConfig; +import org.sonar.server.qualityprofile.ProfilesBackup; import java.util.Arrays; diff --git a/sonar-server/src/test/java/org/sonar/server/configuration/ProfilesManagerTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/ProfilesManagerTest.java similarity index 96% rename from sonar-server/src/test/java/org/sonar/server/configuration/ProfilesManagerTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/ProfilesManagerTest.java index 84d3c31a668..f8d3adfa8bd 100644 --- a/sonar-server/src/test/java/org/sonar/server/configuration/ProfilesManagerTest.java +++ b/sonar-server/src/test/java/org/sonar/server/qualityprofile/ProfilesManagerTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.configuration; +package org.sonar.server.qualityprofile; import org.junit.Before; import org.junit.Test; @@ -27,6 +27,7 @@ import org.sonar.api.rules.Rule; import org.sonar.api.rules.RulePriority; import org.sonar.core.preview.PreviewCache; import org.sonar.jpa.test.AbstractDbUnitTestCase; +import org.sonar.server.qualityprofile.ProfilesManager; import static org.fest.assertions.Assertions.assertThat; import static org.mockito.Mockito.mock; diff --git a/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileActiveRuleOperationsTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileActiveRuleOperationsTest.java index a5f286dc3eb..ce3fa00d0f9 100644 --- a/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileActiveRuleOperationsTest.java +++ b/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileActiveRuleOperationsTest.java @@ -41,7 +41,6 @@ import org.sonar.core.qualityprofile.db.*; import org.sonar.core.rule.RuleDao; import org.sonar.core.rule.RuleDto; import org.sonar.core.rule.RuleParamDto; -import org.sonar.server.configuration.ProfilesManager; import org.sonar.server.exceptions.BadRequestException; import org.sonar.server.exceptions.ForbiddenException; import org.sonar.server.user.MockUserSession; diff --git a/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileOperationsTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileOperationsTest.java index c72d4091ba1..3848a6e3799 100644 --- a/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileOperationsTest.java +++ b/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileOperationsTest.java @@ -39,7 +39,6 @@ import org.sonar.core.qualityprofile.db.ActiveRuleDao; import org.sonar.core.qualityprofile.db.ActiveRuleDto; import org.sonar.core.qualityprofile.db.QualityProfileDao; import org.sonar.core.qualityprofile.db.QualityProfileDto; -import org.sonar.server.configuration.ProfilesManager; import org.sonar.server.exceptions.BadRequestException; import org.sonar.server.exceptions.ForbiddenException; import org.sonar.server.exceptions.NotFoundException; diff --git a/sonar-server/src/test/java/org/sonar/server/configuration/RuleChangeTest.java b/sonar-server/src/test/java/org/sonar/server/qualityprofile/RuleChangeTest.java similarity index 98% rename from sonar-server/src/test/java/org/sonar/server/configuration/RuleChangeTest.java rename to sonar-server/src/test/java/org/sonar/server/qualityprofile/RuleChangeTest.java index 23da77803a7..55a19b98a5a 100644 --- a/sonar-server/src/test/java/org/sonar/server/configuration/RuleChangeTest.java +++ b/sonar-server/src/test/java/org/sonar/server/qualityprofile/RuleChangeTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.configuration; +package org.sonar.server.qualityprofile; import org.junit.Before; import org.junit.Test; @@ -27,6 +27,7 @@ import org.sonar.api.rules.Rule; import org.sonar.api.rules.RulePriority; import org.sonar.core.preview.PreviewCache; import org.sonar.jpa.test.AbstractDbUnitTestCase; +import org.sonar.server.qualityprofile.ProfilesManager; import static org.fest.assertions.Assertions.assertThat; import static org.mockito.Mockito.mock; diff --git a/sonar-server/src/test/java/org/sonar/server/rule/RuleRegistrationTest.java b/sonar-server/src/test/java/org/sonar/server/rule/RuleRegistrationTest.java index 1613c31d655..a1603ac6345 100644 --- a/sonar-server/src/test/java/org/sonar/server/rule/RuleRegistrationTest.java +++ b/sonar-server/src/test/java/org/sonar/server/rule/RuleRegistrationTest.java @@ -30,7 +30,7 @@ import org.sonar.core.persistence.MyBatis; import org.sonar.core.qualityprofile.db.ActiveRuleDao; import org.sonar.core.rule.RuleDao; import org.sonar.core.rule.RuleTagDao; -import org.sonar.server.configuration.ProfilesManager; +import org.sonar.server.qualityprofile.ProfilesManager; import static org.fest.assertions.Assertions.assertThat; import static org.mockito.Mockito.mock; diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-empty.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-empty.xml deleted file mode 100644 index d6e3147ca63..00000000000 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-empty.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-restore-valid.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-restore-valid.xml deleted file mode 100644 index c425caf0fc9..00000000000 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-restore-valid.xml +++ /dev/null @@ -1,110 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-restore-without-inheritance.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-restore-without-inheritance.xml deleted file mode 100644 index 77498b9ece7..00000000000 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-restore-without-inheritance.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-valid.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-valid.xml deleted file mode 100644 index db8bbdf9a92..00000000000 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-valid.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ]]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-with-cdata.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-with-cdata.xml deleted file mode 100644 index f1e0214577e..00000000000 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-with-cdata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - ]]> - - - - diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-with-id-for-metrics.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-with-id-for-metrics.xml deleted file mode 100644 index 7d201084514..00000000000 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-with-id-for-metrics.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-with-splitted-cdata.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-with-splitted-cdata.xml deleted file mode 100644 index cc6031719bc..00000000000 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-with-splitted-cdata.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - ]]> - - - - value2]]> - - - - value3]]> - - - - ]]> - - - diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-with-utf8-char.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-with-utf8-char.xml deleted file mode 100644 index 4673604a3a6..00000000000 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/backup-with-utf8-char.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/shouldImportOneDotFiveFormat.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/shouldImportOneDotFiveFormat.xml deleted file mode 100644 index e8abf3bfa98..00000000000 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/BackupTest/shouldImportOneDotFiveFormat.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/ConfigurationFactoryTest/checkExistentFile.properties b/sonar-server/src/test/resources/org/sonar/server/configuration/ConfigurationFactoryTest/checkExistentFile.properties deleted file mode 100644 index 9e7bb9aeedc..00000000000 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/ConfigurationFactoryTest/checkExistentFile.properties +++ /dev/null @@ -1 +0,0 @@ -this: is a test \ No newline at end of file diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/ConfigurationFactoryTest/shouldReadEnvironmentVariables.properties b/sonar-server/src/test/resources/org/sonar/server/configuration/ConfigurationFactoryTest/shouldReadEnvironmentVariables.properties deleted file mode 100644 index 99ff1a9b455..00000000000 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/ConfigurationFactoryTest/shouldReadEnvironmentVariables.properties +++ /dev/null @@ -1,2 +0,0 @@ -my.param.one: foo -my.param.two: ${env:PATH} \ No newline at end of file diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/backup-with-multiline-property.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/backup-with-multiline-property.xml deleted file mode 100644 index 3d577e3f4ab..00000000000 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/backup-with-multiline-property.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - JBJk2Ke7ZrTZvmO00u366sv9IY - rqqMuWRPpRNNRompPqrtwqnoPpMoqqprMrVVvVXXVtVppQ - RrnmqmUUnorrvrtommmmmUCasdaswommmmmUUJlkXoUUn - mmmm]]> - - - - - - \ No newline at end of file diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldExportAnArrayProperty.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldExportAnArrayProperty.xml deleted file mode 100644 index 14eeece367b..00000000000 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldExportAnArrayProperty.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldExportProperties.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldExportProperties.xml deleted file mode 100644 index 0465db20f30..00000000000 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldExportProperties.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldImportMultilineProperties.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldImportMultilineProperties.xml deleted file mode 100644 index 7c6403b5e4a..00000000000 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldImportMultilineProperties.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldImportProperties-result.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldImportProperties-result.xml deleted file mode 100644 index ef2bf774438..00000000000 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldImportProperties-result.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldImportProperties.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldImportProperties.xml deleted file mode 100644 index 70baf106f3c..00000000000 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldImportProperties.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldNotExportPropertiesLinkedToResources.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldNotExportPropertiesLinkedToResources.xml deleted file mode 100644 index f5bb4b2d1f7..00000000000 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldNotExportPropertiesLinkedToResources.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldNotImportSonarCoreIdProperty-result.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldNotImportSonarCoreIdProperty-result.xml deleted file mode 100644 index 6960761aeea..00000000000 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldNotImportSonarCoreIdProperty-result.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldNotImportSonarCoreIdProperty.xml b/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldNotImportSonarCoreIdProperty.xml deleted file mode 100644 index 67a28cb033e..00000000000 --- a/sonar-server/src/test/resources/org/sonar/server/configuration/PropertiesBackupTest/shouldNotImportSonarCoreIdProperty.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldActivateInChildren-result.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldActivateInChildren-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldActivateInChildren-result.xml rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldActivateInChildren-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldActivateInChildren.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldActivateInChildren.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldActivateInChildren.xml rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldActivateInChildren.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldChangeParent-result.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldChangeParent-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldChangeParent-result.xml rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldChangeParent-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldChangeParent.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldChangeParent.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldChangeParent.xml rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldChangeParent.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldCheckCycles.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldCheckCycles.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldCheckCycles.xml rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldCheckCycles.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldDeactivateInChildren-result.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldDeactivateInChildren-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldDeactivateInChildren-result.xml rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldDeactivateInChildren-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldDeactivateInChildren.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldDeactivateInChildren.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldDeactivateInChildren.xml rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldDeactivateInChildren.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldNotDeactivateOverridingChildren-result.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldNotDeactivateOverridingChildren-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldNotDeactivateOverridingChildren-result.xml rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldNotDeactivateOverridingChildren-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldNotDeactivateOverridingChildren.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldNotDeactivateOverridingChildren.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldNotDeactivateOverridingChildren.xml rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldNotDeactivateOverridingChildren.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldRemoveParent-result.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldRemoveParent-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldRemoveParent-result.xml rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldRemoveParent-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldRemoveParent.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldRemoveParent.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldRemoveParent.xml rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldRemoveParent.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldSetParent-result.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldSetParent-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldSetParent-result.xml rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldSetParent-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldSetParent.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldSetParent.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/configuration/InheritedProfilesTest/shouldSetParent.xml rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/InheritedProfilesTest/shouldSetParent.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/ProfilesBackupTest/shouldSupportEnabledField.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ProfilesBackupTest/shouldSupportEnabledField.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/configuration/ProfilesBackupTest/shouldSupportEnabledField.xml rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/ProfilesBackupTest/shouldSupportEnabledField.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/ProfilesBackupTest/shouldSupportMissingEnabledField.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ProfilesBackupTest/shouldSupportMissingEnabledField.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/configuration/ProfilesBackupTest/shouldSupportMissingEnabledField.xml rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/ProfilesBackupTest/shouldSupportMissingEnabledField.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/changeParentProfile-result.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/changeParentProfile-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/changeParentProfile-result.xml rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/changeParentProfile-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/changeParentProfile.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/changeParentProfile.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/changeParentProfile.xml rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/changeParentProfile.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/initialData.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/initialData.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/initialData.xml rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/initialData.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/removeActivatedRules-result.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/removeActivatedRules-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/removeActivatedRules-result.xml rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/removeActivatedRules-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/ruleActivated-result.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/ruleActivated-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/ruleActivated-result.xml rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/ruleActivated-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/ruleDeactivated-result.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/ruleDeactivated-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/ruleDeactivated-result.xml rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/ruleDeactivated-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/ruleParamChanged-result.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/ruleParamChanged-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/ruleParamChanged-result.xml rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/ruleParamChanged-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/ruleReverted-result.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/ruleReverted-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/ruleReverted-result.xml rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/ruleReverted-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/ruleReverted.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/ruleReverted.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/ruleReverted.xml rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/ruleReverted.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/ruleSeverityChanged-result.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/ruleSeverityChanged-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/ruleSeverityChanged-result.xml rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/ruleSeverityChanged-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/should_not_track_param_change_on_rule_revert_if_no_param.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/should_not_track_param_change_on_rule_revert_if_no_param.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/should_not_track_param_change_on_rule_revert_if_no_param.xml rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/should_not_track_param_change_on_rule_revert_if_no_param.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/versionIncreaseIfUsed-result.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/versionIncreaseIfUsed-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/versionIncreaseIfUsed-result.xml rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/versionIncreaseIfUsed-result.xml diff --git a/sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/versionIncreaseIfUsedAndInChildren-result.xml b/sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/versionIncreaseIfUsedAndInChildren-result.xml similarity index 100% rename from sonar-server/src/test/resources/org/sonar/server/configuration/RuleChangeTest/versionIncreaseIfUsedAndInChildren-result.xml rename to sonar-server/src/test/resources/org/sonar/server/qualityprofile/RuleChangeTest/versionIncreaseIfUsedAndInChildren-result.xml -- 2.39.5