Search all profiles should be sorted by profile name

diff --git a/sonar-core/src/main/resources/org/sonar/core/qualityprofile/db/QualityProfileMapper.xml b/sonar-core/src/main/resources/org/sonar/core/qualityprofile/db/QualityProfileMapper.xml
index a08c9aa888b8f7a79ad2e2f6a1095aa6928db244..3c80702667cbf4b3cdcaaa4a08615f6e8f08040a 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/core/qualityprofile/db/QualityProfileMapper.xml
+++ b/sonar-core/src/main/resources/org/sonar/core/qualityprofile/db/QualityProfileMapper.xml
@@ -15,6 +15,7 @@
   <select id="selectAll" parameterType="map" resultType="QualityProfile">
     SELECT <include refid="profilesColumns"/>
     FROM rules_profiles p
+    ORDER BY p.name
   </select>
 
   <select id="selectByNameAndLanguage" parameterType="map" resultType="QualityProfile">

diff --git a/sonar-core/src/test/java/org/sonar/core/qualityprofile/db/QualityProfileDaoTest.java b/sonar-core/src/test/java/org/sonar/core/qualityprofile/db/QualityProfileDaoTest.java
index 28e09e5d59b0d743844981dfad22401eb8bee1ad..ba0d7e3d7e1e7f191867668618e794d66dad0cfc 100644 (file)
--- a/sonar-core/src/test/java/org/sonar/core/qualityprofile/db/QualityProfileDaoTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/qualityprofile/db/QualityProfileDaoTest.java
@@ -62,6 +62,18 @@ public class QualityProfileDaoTest extends AbstractDaoTestCase {
     assertThat(dto2.isUsed()).isFalse();
   }
 
+  @Test
+  public void select_all_is_sorted_by_profile_name() {
+    setupData("select_all_is_sorted_by_profile_name");
+
+    List<QualityProfileDto> dtos = dao.selectAll();
+
+    assertThat(dtos).hasSize(3);
+    assertThat(dtos.get(0).getName()).isEqualTo("First");
+    assertThat(dtos.get(1).getName()).isEqualTo("Second");
+    assertThat(dtos.get(2).getName()).isEqualTo("Third");
+  }
+
   @Test
   public void select_default_profile() {
     setupData("shared");

diff --git a/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/QualityProfileDaoTest/select_all_is_sorted_by_profile_name.xml b/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/QualityProfileDaoTest/select_all_is_sorted_by_profile_name.xml
new file mode 100644 (file)
index 0000000..5630095
--- /dev/null
+++ b/sonar-core/src/test/resources/org/sonar/core/qualityprofile/db/QualityProfileDaoTest/select_all_is_sorted_by_profile_name.xml
@@ -0,0 +1,12 @@
+<dataset>
+
+  <rules_profiles id="3" name="Third" language="java" parent_name="[null]" version="1"
+                  used_profile="[false]"/>
+
+  <rules_profiles id="1" name="First" language="java" parent_name="[null]" version="1"
+                  used_profile="[false]"/>
+
+  <rules_profiles id="2" name="Second" language="java" parent_name="[null]" version="1"
+                  used_profile="[false]"/>
+
+</dataset>