SONAR-6315 do not rely on quality profile keys in ITs

required for IT to work now that quality profile key is not based on the QP's name anymore

diff --git a/it/it-tests/src/test/java/it/ui/UiTest.java b/it/it-tests/src/test/java/it/ui/UiTest.java
index c197debb4694e02a08270470ea9336ccefa3d96f..4c789853776f1ad0f3564122f3be63976470b439 100644 (file)
--- a/it/it-tests/src/test/java/it/ui/UiTest.java
+++ b/it/it-tests/src/test/java/it/ui/UiTest.java
@@ -107,7 +107,7 @@ public class UiTest {
       .click();
 
     // on profile page
-    assertThat(url()).contains("/profiles/show?key=xoo-basic");
+    assertThat(url()).contains("/profiles/show");
     $(".quality-profile-inheritance")
       .shouldBe(visible)
       .shouldHave(text("active rules"));

diff --git a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesPageTest/should_copy.html b/it/it-tests/src/test/resources/qualityProfile/QualityProfilesPageTest/should_copy.html
index 16812ddbb28d8ee27da6311002bd93c8afe81462..d8ff976d04d74727732db6d5206c9e7369fdefda 100644 (file)
--- a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesPageTest/should_copy.html
+++ b/it/it-tests/src/test/resources/qualityProfile/QualityProfilesPageTest/should_copy.html
@@ -51,12 +51,12 @@
 </tr>
 <tr>
        <td>waitForElementPresent</td>
-       <td>css=.quality-profiles-table-name a[href^=&quot;/profiles/show?key=xoo-sample&quot;]</td>
+       <td>css=table[data-language=&quot;xoo&quot;] tr[data-name=&quot;sample&quot;] .quality-profiles-table-name a</td>
        <td></td>
 </tr>
 <tr>
        <td>click</td>
-       <td>css=.quality-profiles-table-name a[href^=&quot;/profiles/show?key=xoo-sample&quot;]</td>
+       <td>css=table[data-language=&quot;xoo&quot;] tr[data-name=&quot;sample&quot;] .quality-profiles-table-name a</td>
        <td></td>
 </tr>
 <tr>
@@ -101,7 +101,7 @@
 </tr>
 <tr>
        <td>waitForElementPresent</td>
-       <td>css=.quality-profiles-table-row[data-name=&quot;copied&quot;]</td>
+       <td>css=table[data-language=&quot;xoo&quot;] tr[data-name=&quot;copied&quot;]</td>
        <td></td>
 </tr>
 </tbody>

diff --git a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesPageTest/should_delete.html b/it/it-tests/src/test/resources/qualityProfile/QualityProfilesPageTest/should_delete.html
index c83aa07fdfc92b0b2a7734e311ff5476873aad00..69e80a57c98a3230ff74351cd4b249d07cd9608a 100644 (file)
--- a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesPageTest/should_delete.html
+++ b/it/it-tests/src/test/resources/qualityProfile/QualityProfilesPageTest/should_delete.html
@@ -51,12 +51,12 @@
 </tr>
 <tr>
        <td>waitForElementPresent</td>
-       <td>css=.quality-profiles-table-name a[href^=&quot;/profiles/show?key=xoo-sample&quot;]</td>
+       <td>css=table[data-language=&quot;xoo&quot;] tr[data-name=&quot;sample&quot;] .quality-profiles-table-name a</td>
        <td></td>
 </tr>
 <tr>
        <td>click</td>
-       <td>css=.quality-profiles-table-name a[href^=&quot;/profiles/show?key=xoo-sample&quot;]</td>
+       <td>css=table[data-language=&quot;xoo&quot;] tr[data-name=&quot;sample&quot;] .quality-profiles-table-name a</td>
        <td></td>
 </tr>
 <tr>
@@ -86,12 +86,12 @@
 </tr>
 <tr>
        <td>waitForElementPresent</td>
-       <td>css=.quality-profiles-table-row[data-name=&quot;Basic&quot;]</td>
+       <td>css=table[data-language=&quot;xoo&quot;] tr[data-name=&quot;Basic&quot;]</td>
        <td></td>
 </tr>
 <tr>
        <td>waitForElementNotPresent</td>
-       <td>css=.quality-profiles-table-row[data-name=&quot;sample&quot;]</td>
+       <td>css=table[data-language=&quot;xoo&quot;] tr[data-name=&quot;sample&quot;]</td>
        <td></td>
 </tr>
 <tr>
@@ -101,12 +101,12 @@
 </tr>
 <tr>
        <td>waitForElementPresent</td>
-       <td>css=.quality-profiles-table-row[data-name=&quot;Basic&quot;]</td>
+       <td>css=table[data-language=&quot;xoo&quot;] tr[data-name=&quot;Basic&quot;]</td>
        <td></td>
 </tr>
 <tr>
        <td>assertElementNotPresent</td>
-       <td>css=.quality-profiles-table-row[data-name=&quot;sample&quot;]</td>
+       <td>css=table[data-language=&quot;xoo&quot;] tr[data-name=&quot;sample&quot;]</td>
        <td></td>
 </tr>
 </tbody>

diff --git a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesPageTest/should_display_changelog.html b/it/it-tests/src/test/resources/qualityProfile/QualityProfilesPageTest/should_display_changelog.html
index 18851fbf8b5824956317139c03aac92796aa2949..8614c2fdab918d8357e81f69f95635e96a699a89 100644 (file)
--- a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesPageTest/should_display_changelog.html
+++ b/it/it-tests/src/test/resources/qualityProfile/QualityProfilesPageTest/should_display_changelog.html
@@ -21,22 +21,22 @@
 </tr>
 <tr>
        <td>waitForElementPresent</td>
-       <td>css=.quality-profiles-table-name a[href^=&quot;/profiles/show?key=xoo-basic&quot;]</td>
+       <td>css=table[data-language=&quot;xoo&quot;] tr[data-name=&quot;Basic&quot;] .quality-profiles-table-name a</td>
        <td></td>
 </tr>
 <tr>
        <td>click</td>
-       <td>css=.quality-profiles-table-name a[href^=&quot;/profiles/show?key=xoo-basic&quot;]</td>
+       <td>css=table[data-language=&quot;xoo&quot;] tr[data-name=&quot;Basic&quot;] .quality-profiles-table-name a</td>
        <td></td>
 </tr>
 <tr>
        <td>waitForElementPresent</td>
-       <td>css=a[href^=&quot;/profiles/changelog?key=xoo-basic&quot;]</td>
+       <td>css=a[href^=&quot;/profiles/changelog&quot;]</td>
        <td></td>
 </tr>
 <tr>
        <td>click</td>
-       <td>css=a[href^=&quot;/profiles/changelog?key=xoo-basic&quot;]</td>
+       <td>css=a[href^=&quot;/profiles/changelog&quot;]</td>
        <td></td>
 </tr>
 <tr>

diff --git a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesPageTest/should_display_list.html b/it/it-tests/src/test/resources/qualityProfile/QualityProfilesPageTest/should_display_list.html
index 05a3d763f2befbf4ae6ef315cc3e29e1f6bbd943..9e3cf2060991076e4d02201b3f0b05addf6d6ece 100644 (file)
--- a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesPageTest/should_display_list.html
+++ b/it/it-tests/src/test/resources/qualityProfile/QualityProfilesPageTest/should_display_list.html
@@ -35,37 +35,37 @@
 </tr>
 <tr>
        <td>assertElementPresent</td>
-       <td>css=.quality-profiles-table-row[data-key^=&quot;xoo-basic&quot;]</td>
+       <td>css=table[data-language=&quot;xoo&quot;] tr[data-name=&quot;Basic&quot;]</td>
        <td></td>
 </tr>
 <tr>
        <td>assertText</td>
-       <td>css=.quality-profiles-table-row[data-key^=&quot;xoo-basic&quot;] .quality-profiles-table-name</td>
+       <td>css=table[data-language=&quot;xoo&quot;] tr[data-name=&quot;Basic&quot;] .quality-profiles-table-name</td>
        <td>*Basic*</td>
 </tr>
 <tr>
        <td>assertText</td>
-       <td>css=.quality-profiles-table-row[data-key^=&quot;xoo-basic&quot;] .quality-profiles-table-projects</td>
+       <td>css=table[data-language=&quot;xoo&quot;] tr[data-name=&quot;Basic&quot;] .quality-profiles-table-projects</td>
        <td>*Default*</td>
 </tr>
 <tr>
        <td>assertText</td>
-       <td>css=.quality-profiles-table-row[data-key^=&quot;xoo-basic&quot;] .quality-profiles-table-rules</td>
+       <td>css=table[data-language=&quot;xoo&quot;] tr[data-name=&quot;Basic&quot;] .quality-profiles-table-rules</td>
        <td>*1*</td>
 </tr>
 <tr>
        <td>assertElementPresent</td>
-       <td>css=.quality-profiles-table-row[data-key^=&quot;xoo-basic&quot;] .quality-profiles-table-rules a[href^=&quot;/coding_rules#qprofile=xoo-basic&quot;]</td>
+       <td>css=table[data-language=&quot;xoo&quot;] tr[data-name=&quot;Basic&quot;] .quality-profiles-table-rules a[href^=&quot;/coding_rules#qprofile&quot;]</td>
        <td></td>
 </tr>
 <tr>
        <td>assertText</td>
-       <td>css=.quality-profiles-table-row[data-key^=&quot;xoo-empty&quot;] .quality-profiles-table-projects</td>
+       <td>css=table[data-language=&quot;xoo&quot;] tr[data-name=&quot;empty&quot;] .quality-profiles-table-projects</td>
        <td>*0*</td>
 </tr>
 <tr>
        <td>assertText</td>
-       <td>css=.quality-profiles-table-row[data-key^=&quot;xoo2-basic&quot;] .quality-profiles-table-name</td>
+       <td>css=table[data-language=&quot;xoo2&quot;] tr[data-name=&quot;Basic&quot;] .quality-profiles-table-name</td>
        <td>*Basic*</td>
 </tr>
 </tbody>

diff --git a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesPageTest/should_display_profile_exporters.html b/it/it-tests/src/test/resources/qualityProfile/QualityProfilesPageTest/should_display_profile_exporters.html
index aaabd19baace333ab54d34da66d19edc29dca5c5..ea8b1d321f1fb22776ae7ae0f7344a36c2af270c 100644 (file)
--- a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesPageTest/should_display_profile_exporters.html
+++ b/it/it-tests/src/test/resources/qualityProfile/QualityProfilesPageTest/should_display_profile_exporters.html
@@ -21,12 +21,12 @@
 </tr>
 <tr>
        <td>waitForElementPresent</td>
-       <td>css=.quality-profiles-table-name a[href^=&quot;/profiles/show?key=xoo-sample&quot;]</td>
+       <td>css=table[data-language=&quot;xoo&quot;] tr[data-name=&quot;sample&quot;] .quality-profiles-table-name a</td>
        <td></td>
 </tr>
 <tr>
        <td>click</td>
-       <td>css=.quality-profiles-table-name a[href^=&quot;/profiles/show?key=xoo-sample&quot;]</td>
+       <td>css=table[data-language=&quot;xoo&quot;] tr[data-name=&quot;sample&quot;] .quality-profiles-table-name a</td>
        <td></td>
 </tr>
 <tr>

diff --git a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesPageTest/should_display_profile_inheritance.html b/it/it-tests/src/test/resources/qualityProfile/QualityProfilesPageTest/should_display_profile_inheritance.html
index 22477a9b4d409e3ca66f689d6b305c67ddba6c58..501ae5b5df868e5dafc5d36be2576dd08f9a9927 100644 (file)
--- a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesPageTest/should_display_profile_inheritance.html
+++ b/it/it-tests/src/test/resources/qualityProfile/QualityProfilesPageTest/should_display_profile_inheritance.html
@@ -21,12 +21,12 @@
 </tr>
 <tr>
        <td>waitForElementPresent</td>
-       <td>css=.quality-profiles-table-name a[href^=&quot;/profiles/show?key=xoo-sample&quot;]</td>
+       <td>css=table[data-language=&quot;xoo&quot;] tr[data-name=&quot;sample&quot;] .quality-profiles-table-name a</td>
        <td></td>
 </tr>
 <tr>
        <td>click</td>
-       <td>css=.quality-profiles-table-name a[href^=&quot;/profiles/show?key=xoo-sample&quot;]</td>
+       <td>css=table[data-language=&quot;xoo&quot;] tr[data-name=&quot;sample&quot;] .quality-profiles-table-name a</td>
        <td></td>
 </tr>
 <tr>

diff --git a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesPageTest/should_display_profile_projects.html b/it/it-tests/src/test/resources/qualityProfile/QualityProfilesPageTest/should_display_profile_projects.html
index fba5742452a1764e0525d0a167c0a0d49783b6a0..ff38495e3189e8b9495aaa18ebbfef0a93aacda0 100644 (file)
--- a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesPageTest/should_display_profile_projects.html
+++ b/it/it-tests/src/test/resources/qualityProfile/QualityProfilesPageTest/should_display_profile_projects.html
@@ -21,12 +21,12 @@
 </tr>
 <tr>
        <td>waitForElementPresent</td>
-       <td>css=.quality-profiles-table-name a[href^=&quot;/profiles/show?key=xoo-sample&quot;]</td>
+       <td>css=table[data-language=&quot;xoo&quot;] tr[data-name=&quot;sample&quot;] .quality-profiles-table-name a</td>
        <td></td>
 </tr>
 <tr>
        <td>click</td>
-       <td>css=.quality-profiles-table-name a[href^=&quot;/profiles/show?key=xoo-sample&quot;]</td>
+       <td>css=table[data-language=&quot;xoo&quot;] tr[data-name=&quot;sample&quot;] .quality-profiles-table-name a</td>
        <td></td>
 </tr>
 <tr>

diff --git a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesPageTest/should_display_profile_rules.html b/it/it-tests/src/test/resources/qualityProfile/QualityProfilesPageTest/should_display_profile_rules.html
index 9819f42bdecdd910b5525f66472b3858c13621e7..eb5ccf3194b5a08132eb49229dbb0f45a8c258a6 100644 (file)
--- a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesPageTest/should_display_profile_rules.html
+++ b/it/it-tests/src/test/resources/qualityProfile/QualityProfilesPageTest/should_display_profile_rules.html
@@ -21,12 +21,12 @@
 </tr>
 <tr>
        <td>waitForElementPresent</td>
-       <td>css=.quality-profiles-table-name a[href^=&quot;/profiles/show?key=xoo-basic&quot;]</td>
+       <td>css=table[data-language=&quot;xoo&quot;] tr[data-name=&quot;Basic&quot;] .quality-profiles-table-name a</td>
        <td></td>
 </tr>
 <tr>
        <td>click</td>
-       <td>css=.quality-profiles-table-name a[href^=&quot;/profiles/show?key=xoo-basic&quot;]</td>
+       <td>css=table[data-language=&quot;xoo&quot;] tr[data-name=&quot;Basic&quot;] .quality-profiles-table-name a</td>
        <td></td>
 </tr>
 <tr>

diff --git a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesPageTest/should_open_from_list.html b/it/it-tests/src/test/resources/qualityProfile/QualityProfilesPageTest/should_open_from_list.html
index a41de0e79c7525f0ca326abb2701e87250d4d537..de19c00a0174319135549742e9012ddbc49e2d08 100644 (file)
--- a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesPageTest/should_open_from_list.html
+++ b/it/it-tests/src/test/resources/qualityProfile/QualityProfilesPageTest/should_open_from_list.html
@@ -20,12 +20,12 @@
 </tr>
 <tr>
        <td>waitForElementPresent</td>
-       <td>css=.quality-profiles-table-row[data-key^=&quot;xoo-basic&quot;]</td>
+       <td>css=table[data-language=&quot;xoo&quot;] tr[data-name=&quot;Basic&quot;]</td>
        <td></td>
 </tr>
 <tr>
        <td>click</td>
-       <td>css=.quality-profiles-table-row[data-key^=&quot;xoo-basic&quot;] .quality-profiles-table-name a</td>
+       <td>css=table[data-language=&quot;xoo&quot;] tr[data-name=&quot;Basic&quot;] .quality-profiles-table-name a</td>
        <td></td>
 </tr>
 <tr>

diff --git a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesPageTest/should_rename.html b/it/it-tests/src/test/resources/qualityProfile/QualityProfilesPageTest/should_rename.html
index d86dbc2040c7150d05f1cb2d3a04a5f4497a77e6..7f533d09f36ef6a05b7ec5a0b4866ee9feb69e8c 100644 (file)
--- a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesPageTest/should_rename.html
+++ b/it/it-tests/src/test/resources/qualityProfile/QualityProfilesPageTest/should_rename.html
@@ -51,12 +51,12 @@
 </tr>
 <tr>
        <td>waitForElementPresent</td>
-       <td>css=.quality-profiles-table-name a[href^=&quot;/profiles/show?key=xoo-sample&quot;]</td>
+       <td>css=table[data-language=&quot;xoo&quot;] tr[data-name=&quot;sample&quot;] .quality-profiles-table-name a</td>
        <td></td>
 </tr>
 <tr>
        <td>click</td>
-       <td>css=.quality-profiles-table-name a[href^=&quot;/profiles/show?key=xoo-sample&quot;]</td>
+       <td>css=table[data-language=&quot;xoo&quot;] tr[data-name=&quot;sample&quot;] .quality-profiles-table-name a</td>
        <td></td>
 </tr>
 <tr>
@@ -101,12 +101,7 @@
 </tr>
 <tr>
        <td>waitForElementPresent</td>
-       <td>css=.quality-profiles-table-name a[href^=&quot;/profiles/show?key=xoo-sample&quot;]</td>
-       <td></td>
-</tr>
-<tr>
-       <td>assertElementPresent</td>
-       <td>css=.quality-profiles-table-row[data-name=&quot;new name&quot;]</td>
+       <td>css=table[data-language=&quot;xoo&quot;] tr[data-name=&quot;new name&quot;] .quality-profiles-table-name a</td>
        <td></td>
 </tr>
 </tbody>

diff --git a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesPageTest/should_set_default.html b/it/it-tests/src/test/resources/qualityProfile/QualityProfilesPageTest/should_set_default.html
index 9d514aa3c869a857e04b6e29671af51e01a57528..3f1d0db80a4c5784bfa2f80672e220c88e93b1ea 100644 (file)
--- a/it/it-tests/src/test/resources/qualityProfile/QualityProfilesPageTest/should_set_default.html
+++ b/it/it-tests/src/test/resources/qualityProfile/QualityProfilesPageTest/should_set_default.html
@@ -51,12 +51,12 @@
 </tr>
 <tr>
        <td>waitForElementPresent</td>
-       <td>css=.quality-profiles-table-name a[href^=&quot;/profiles/show?key=xoo-sample&quot;]</td>
+       <td>css=table[data-language=&quot;xoo&quot;] tr[data-name=&quot;sample&quot;] .quality-profiles-table-name a</td>
        <td></td>
 </tr>
 <tr>
        <td>click</td>
-       <td>css=.quality-profiles-table-name a[href^=&quot;/profiles/show?key=xoo-sample&quot;]</td>
+       <td>css=table[data-language=&quot;xoo&quot;] tr[data-name=&quot;sample&quot;] .quality-profiles-table-name a</td>
        <td></td>
 </tr>
 <tr>