fix bulk deletion ITs

diff --git a/it/it-tests/src/test/java/administration/suite/administration/BulkDeletionTest.java b/it/it-tests/src/test/java/administration/suite/administration/BulkDeletionTest.java
index 4ee932e5d67455e81f74724c8f21554ef36b47af..739ca8394773e892b9c24884a9a262ef598881f4 100644 (file)
--- a/it/it-tests/src/test/java/administration/suite/administration/BulkDeletionTest.java
+++ b/it/it-tests/src/test/java/administration/suite/administration/BulkDeletionTest.java
@@ -56,21 +56,6 @@ public class BulkDeletionTest {
     new SeleneseTest(selenese).runOn(orchestrator);
   }
 
-  /**
-   * SONAR-4560
-   */
-  @Test
-  public void should_support_two_letters_long_project_name() throws Exception {
-    executeBuild("xo", "xo");
-
-    Selenese selenese = Selenese.builder()
-      .setHtmlTestsInClasspath("bulk-delete-projects-with-short-name",
-        "/administration/suite/BulkDeletionTest/project-bulk-deletion/display-two-letters-long-project.html",
-        "/administration/suite/BulkDeletionTest/project-bulk-deletion/filter-two-letters-long-project.html"
-      ).build();
-    new SeleneseTest(selenese).runOn(orchestrator);
-  }
-
   private void executeBuild(String projectKey, String projectName) {
     orchestrator.executeBuild(
       SonarRunner.create(projectDir("shared/xoo-sample"))

diff --git a/it/it-tests/src/test/resources/administration/suite/BulkDeletionTest/project-bulk-deletion/bulk-delete-filter-projects.html b/it/it-tests/src/test/resources/administration/suite/BulkDeletionTest/project-bulk-deletion/bulk-delete-filter-projects.html
index 8ff4b7089c2b68cd386cff97e558115e8ddf5c29..1991870c69d1e979c746d1dff90a613543a4997a 100644 (file)
--- a/it/it-tests/src/test/resources/administration/suite/BulkDeletionTest/project-bulk-deletion/bulk-delete-filter-projects.html
+++ b/it/it-tests/src/test/resources/administration/suite/BulkDeletionTest/project-bulk-deletion/bulk-delete-filter-projects.html
@@ -9,66 +9,66 @@
 <table cellpadding="1" cellspacing="1" border="1">
     <tbody>
     <tr>
-        <td>open</td>
-        <td>/sonar/sessions/logout</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>open</td>
-        <td>/sonar/sessions/login</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>type</td>
-        <td>login</td>
-        <td>admin</td>
-    </tr>
-    <tr>
-        <td>type</td>
-        <td>password</td>
-        <td>admin</td>
-    </tr>
-    <tr>
-        <td>clickAndWait</td>
-        <td>commit</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>open</td>
-        <td>/sonar/bulk_deletion</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>assertText</td>
-        <td>content</td>
-        <td>*Bar-Sonar-Plugin*Foo-Application*Sample-Project*</td>
-    </tr>
-    <tr>
-        <td>type</td>
-        <td>id=resource_filter</td>
-        <td>s</td>
-    </tr>
-    <tr>
-        <td>clickAndWait</td>
-        <td>id=filter_resources</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>assertText</td>
-        <td>content</td>
-        <td>*Bar-Sonar-Plugin*Sample-Project*</td>
-    </tr>
-    <tr>
-        <td>assertText</td>
-        <td>content</td>
-        <td>*cameleon-3*cameleon-1*</td>
-    </tr>
-    <tr>
-        <td>assertTextNotPresent</td>
-        <td>content</td>
-        <td>*Foo-Application*</td>
-    </tr>
-    </tbody>
+       <td>open</td>
+       <td>/sonar/sessions/logout</td>
+       <td></td>
+</tr>
+<tr>
+       <td>open</td>
+       <td>/sonar/sessions/login</td>
+       <td></td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>login</td>
+       <td>admin</td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>password</td>
+       <td>admin</td>
+</tr>
+<tr>
+       <td>clickAndWait</td>
+       <td>commit</td>
+       <td></td>
+</tr>
+<tr>
+       <td>open</td>
+       <td>/sonar/projects</td>
+       <td></td>
+</tr>
+<tr>
+       <td>waitForText</td>
+       <td>content</td>
+       <td>*Bar-Sonar-Plugin*Foo-Application*Sample-Project*</td>
+</tr>
+<tr>
+       <td>type</td>
+       <td>css=.search-box-input</td>
+       <td>s</td>
+</tr>
+<tr>
+       <td>click</td>
+       <td>css=.search-box-submit</td>
+       <td></td>
+</tr>
+<tr>
+       <td>waitForText</td>
+       <td>content</td>
+       <td>*Bar-Sonar-Plugin*Sample-Project*</td>
+</tr>
+<tr>
+       <td>waitForText</td>
+       <td>content</td>
+       <td>*cameleon-3*cameleon-1*</td>
+</tr>
+<tr>
+       <td>assertTextNotPresent</td>
+       <td>content</td>
+       <td>*Foo-Application*</td>
+</tr>
+</tbody>
 </table>
 </body>
 </html>

diff --git a/it/it-tests/src/test/resources/administration/suite/BulkDeletionTest/project-bulk-deletion/display-two-letters-long-project.html b/it/it-tests/src/test/resources/administration/suite/BulkDeletionTest/project-bulk-deletion/display-two-letters-long-project.html
deleted file mode 100644 (file)
index 3f0095f..0000000
--- a/it/it-tests/src/test/resources/administration/suite/BulkDeletionTest/project-bulk-deletion/display-two-letters-long-project.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head profile="http://selenium-ide.openqa.org/profiles/test-case">
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <title>display-two-letters-long-project</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-    <tbody>
-    <tr>
-        <td>open</td>
-        <td>/sonar/sessions/logout</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>open</td>
-        <td>/sonar/sessions/login</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>type</td>
-        <td>login</td>
-        <td>admin</td>
-    </tr>
-    <tr>
-        <td>type</td>
-        <td>password</td>
-        <td>admin</td>
-    </tr>
-    <tr>
-        <td>clickAndWait</td>
-        <td>commit</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>open</td>
-        <td>/sonar/bulk_deletion</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>assertText</td>
-        <td>resources-to-delete</td>
-        <td>*xo*xo*</td>
-    </tr>
-    </tbody>
-</table>
-</body>
-</html>

diff --git a/it/it-tests/src/test/resources/administration/suite/BulkDeletionTest/project-bulk-deletion/filter-two-letters-long-project.html b/it/it-tests/src/test/resources/administration/suite/BulkDeletionTest/project-bulk-deletion/filter-two-letters-long-project.html
deleted file mode 100644 (file)
index 17e6732..0000000
--- a/it/it-tests/src/test/resources/administration/suite/BulkDeletionTest/project-bulk-deletion/filter-two-letters-long-project.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head profile="http://selenium-ide.openqa.org/profiles/test-case">
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <title>filter-two-letters-long-project</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-    <tbody>
-    <tr>
-        <td>open</td>
-        <td>/sonar/sessions/logout</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>open</td>
-        <td>/sonar/sessions/login</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>type</td>
-        <td>login</td>
-        <td>admin</td>
-    </tr>
-    <tr>
-        <td>type</td>
-        <td>password</td>
-        <td>admin</td>
-    </tr>
-    <tr>
-        <td>clickAndWait</td>
-        <td>commit</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>open</td>
-        <td>/sonar/bulk_deletion</td>
-        <td></td>
-    </tr>
-    <tr>
-      <td>type</td>
-      <td>id=resource_filter</td>
-      <td>xo</td>
-    </tr>
-    <tr>
-      <td>clickAndWait</td>
-      <td>id=filter_resources</td>
-      <td></td>
-    </tr>
-    <tr>
-      <td>assertText</td>
-      <td>resources-to-delete</td>
-      <td>*xo*xo*</td>
-    </tr>
-    </tbody>
-</table>
-</body>
-</html>