SONAR-2007 fix IT

diff --git a/tests/integration/tests/src/it/selenium/all-tests.html b/tests/integration/tests/src/it/selenium/all-tests.html
index c21f9ca566cf815f96af0fee353796cb63d3744e..a89d19a087cc16656de372e09e433db315b0c23a 100644 (file)
--- a/tests/integration/tests/src/it/selenium/all-tests.html
+++ b/tests/integration/tests/src/it/selenium/all-tests.html
@@ -458,9 +458,6 @@
 <tr>
   <td><a href="rules/search_by_plugin.html">rules/search_by_plugin</a></td>
 </tr>
-<tr>
-  <td><a href="rules/search_by_rule_category.html">rules/search_by_rule_category</a></td>
-</tr>
 <tr>
   <td><a href="rules/search_by_rule_title.html">rules/search_by_rule_title</a></td>
 </tr>
@@ -584,9 +581,6 @@
 <tr>
   <td><a href="violations_drilldown/select_resource.html">violations_drilldown/select_resource</a></td>
 </tr>
-<tr>
-  <td><a href="violations_drilldown/SONAR-722_filter_rule.html">violations_drilldown/SONAR-722_filter_rule</a></td>
-</tr>
 <tr>
   <td><a href="violations_drilldown/popup-on-rules.html">violations_drilldown/popup-on-rules</a>
   </td>

diff --git a/tests/integration/tests/src/it/selenium/rules/rule_search_verify_form_values_on_first_call.html b/tests/integration/tests/src/it/selenium/rules/rule_search_verify_form_values_on_first_call.html
index 12fce2c5822b05ebfead095feb2f3c98f410aa5f..cd42140ef57e36c21c33408691e2a6ceab676a2c 100644 (file)
--- a/tests/integration/tests/src/it/selenium/rules/rule_search_verify_form_values_on_first_call.html
+++ b/tests/integration/tests/src/it/selenium/rules/rule_search_verify_form_values_on_first_call.html
@@ -26,11 +26,6 @@
        <td>//select[@id=&quot;search_plugin&quot;]/option[@selected=&quot;selected&quot;]/@value</td>
        <td></td>
 </tr>
-<tr>
-       <td>assertValue</td>
-       <td>//select[@id=&quot;search_category&quot;]/option[@selected=&quot;selected&quot;]/@value</td>
-       <td></td>
-</tr>
 <tr>
        <td>assertValue</td>
        <td>//select[@id=&quot;search_status&quot;]/option[@selected=&quot;selected&quot;]/@value</td>
@@ -51,7 +46,6 @@
        <td>//table[@id=&quot;result_table&quot;]//tr[100]</td>
        <td></td>
 </tr>
-
 </tbody></table>
 </body>
 </html>

diff --git a/tests/integration/tests/src/it/selenium/rules/search_any_rules.html b/tests/integration/tests/src/it/selenium/rules/search_any_rules.html
index de4482e9ef1916188c32b905aef0ee080bfe7c21..d7f6cc3a61ee7117947142ca7d89ce247935139e 100644 (file)
--- a/tests/integration/tests/src/it/selenium/rules/search_any_rules.html
+++ b/tests/integration/tests/src/it/selenium/rules/search_any_rules.html
@@ -26,11 +26,6 @@
        <td>search_plugin</td>
        <td>label=Any</td>
 </tr>
-<tr>
-       <td>select</td>
-       <td>search_category</td>
-       <td>label=Any</td>
-</tr>
 <tr>
        <td>select</td>
        <td>search_priority</td>
@@ -51,7 +46,11 @@
        <td>results</td>
        <td></td>
 </tr>
-
+<tr>
+       <td>assertElementPresent</td>
+       <td>result_table</td>
+       <td></td>
+</tr>
 </tbody></table>
 </body>
 </html>

diff --git a/tests/integration/tests/src/it/selenium/rules/search_by_plugin.html b/tests/integration/tests/src/it/selenium/rules/search_by_plugin.html
index beca938768cc09a651d759f80c610c0e97d12a7d..74d183aaffe97623efcfb9c26e6d9dde131ed510 100644 (file)
--- a/tests/integration/tests/src/it/selenium/rules/search_by_plugin.html
+++ b/tests/integration/tests/src/it/selenium/rules/search_by_plugin.html
@@ -31,32 +31,31 @@
        <td>search_plugin</td>
        <td>label=Checkstyle</td>
 </tr>
-<tr>
-       <td>select</td>
-       <td>search_category</td>
-       <td>label=Efficiency</td>
-</tr>
 <tr>
        <td>clickAndWait</td>
        <td>submit_search</td>
        <td></td>
 </tr>
 <tr>
-       <td>assertXpathCount</td>
-       <td>//*[contains(text(), 'Findbugs')]</td>
-       <td>1</td>
+       <td>assertText</td>
+       <td>result_table</td>
+       <td>glob:*Checkstyle*</td>
+</tr>
+<tr>
+       <td>assertText</td>
+       <td>result_table</td>
+       <td>glob:*Pmd*</td>
 </tr>
 <tr>
-       <td>assertXpathCount</td>
-       <td>//*[contains(text(), 'Checkstyle')]</td>
-       <td>2</td>
+       <td>assertNotText</td>
+       <td>result_table</td>
+       <td>glob:*Findbugs*</td>
 </tr>
 <tr>
-       <td>assertXpathCount</td>
-       <td>//*[contains(text(), 'Pmd')]</td>
-       <td>14</td>
+       <td>assertNotText</td>
+       <td>result_table</td>
+       <td>glob:*Squid*</td>
 </tr>
-
 </tbody></table>
 </body>
 </html>

diff --git a/tests/integration/tests/src/it/selenium/rules/search_by_rule_category.html b/tests/integration/tests/src/it/selenium/rules/search_by_rule_category.html
deleted file mode 100644 (file)
index 0047baa..0000000
--- a/tests/integration/tests/src/it/selenium/rules/search_by_rule_category.html
+++ /dev/null
@@ -1,57 +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" />
-<link rel="selenium.base" href="" />
-<title>search_by_rule_category</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">search_by_rule_category</td></tr>
-</thead><tbody>
-<tr>
-       <td>open</td>
-       <td>/profiles</td>
-       <td></td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>rules-java-Sonar%20way</td>
-       <td></td>
-</tr>
-<tr>
-       <td>removeSelection</td>
-       <td>search_plugin</td>
-       <td>label=Any</td>
-</tr>
-<tr>
-       <td>addSelection</td>
-       <td>search_plugin</td>
-       <td>label=Checkstyle</td>
-</tr>
-<tr>
-       <td>select</td>
-       <td>search_category</td>
-       <td>label=Maintainability</td>
-</tr>
-<tr>
-       <td>addSelection</td>
-       <td>search_category</td>
-       <td>label=Reliability</td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>submit_search</td>
-       <td></td>
-</tr>
-<tr>
-       <td>assertTextPresent</td>
-       <td>16 results</td>
-       <td></td>
-</tr>
-
-</tbody></table>
-</body>
-</html>

diff --git a/tests/integration/tests/src/it/selenium/rules/search_by_rule_priority.html b/tests/integration/tests/src/it/selenium/rules/search_by_rule_priority.html
index e0420bf4644291fd5650b23f40c6644225b2413e..826f70d8984d87a6e8bcc40d3871b2481f302c49 100644 (file)
--- a/tests/integration/tests/src/it/selenium/rules/search_by_rule_priority.html
+++ b/tests/integration/tests/src/it/selenium/rules/search_by_rule_priority.html
@@ -31,24 +31,9 @@
        <td>search_plugin</td>
        <td>label=Checkstyle</td>
 </tr>
-<tr>
-       <td>select</td>
-       <td>search_category</td>
-       <td>label=Maintainability</td>
-</tr>
-<tr>
-       <td>addSelection</td>
-       <td>search_category</td>
-       <td>label=Reliability</td>
-</tr>
 <tr>
        <td>select</td>
        <td>search_priority</td>
-       <td>label=Major</td>
-</tr>
-<tr>
-       <td>addSelection</td>
-       <td>search_priority</td>
        <td>label=Critical</td>
 </tr>
 <tr>
@@ -58,25 +43,19 @@
 </tr>
 <tr>
        <td>waitForTextPresent</td>
-       <td>10 results</td>
+       <td>results</td>
        <td></td>
 </tr>
 <tr>
-       <td>assertXpathCount</td>
-       <td>//*[contains(text(), 'Checkstyle')]</td>
-       <td>11</td>
-</tr>
-<tr>
-       <td>assertXpathCount</td>
-       <td>//*[contains(text(), 'Pmd')]</td>
-       <td>0</td>
+       <td>assertText</td>
+       <td>result_table</td>
+       <td>glob:*Equals Hash Code*</td>
 </tr>
 <tr>
-       <td>assertXpathCount</td>
-       <td>//*[contains(text(), 'Findbugs')]</td>
-       <td>1</td>
+       <td>assertNotText</td>
+       <td>result_table</td>
+       <td>glob:*Anon Inner Length *</td>
 </tr>
-
 </tbody></table>
 </body>
 </html>

diff --git a/tests/integration/tests/src/it/selenium/rules/search_by_rule_status.html b/tests/integration/tests/src/it/selenium/rules/search_by_rule_status.html
index a8c6c9c0783699d64f51d058218a3ff473ebf769..6d1d67ac633fba945520d52e1727dc6a05e392b1 100644 (file)
--- a/tests/integration/tests/src/it/selenium/rules/search_by_rule_status.html
+++ b/tests/integration/tests/src/it/selenium/rules/search_by_rule_status.html
@@ -31,16 +31,6 @@
        <td>search_plugin</td>
        <td>label=Checkstyle</td>
 </tr>
-<tr>
-       <td>select</td>
-       <td>search_category</td>
-       <td>label=Maintainability</td>
-</tr>
-<tr>
-       <td>addSelection</td>
-       <td>search_category</td>
-       <td>label=Reliability</td>
-</tr>
 <tr>
        <td>select</td>
        <td>search_priority</td>
@@ -57,29 +47,24 @@
        <td>label=Any</td>
 </tr>
 <tr>
-       <td>click</td>
+       <td>clickAndWait</td>
        <td>submit_search</td>
        <td></td>
 </tr>
 <tr>
-       <td>waitForTextPresent</td>
-       <td>44 results</td>
+       <td>waitForElementPresent</td>
+       <td>result_table</td>
        <td></td>
 </tr>
 <tr>
-       <td>assertXpathCount</td>
-       <td>//*[contains(text(), 'Checkstyle')]</td>
-       <td>45</td>
-</tr>
-<tr>
-       <td>assertXpathCount</td>
-       <td>//*[contains(text(), 'Pmd')]</td>
-       <td>0</td>
+       <td>assertText</td>
+       <td>result_table</td>
+       <td>glob:*Abstract Class Name*</td>
 </tr>
 <tr>
-       <td>assertXpathCount</td>
-       <td>//*[contains(text(), 'Findbugs')]</td>
-       <td>1</td>
+       <td>assertText</td>
+       <td>result_table</td>
+       <td>glob:*Anon Inner Length *</td>
 </tr>
 <tr>
        <td>select</td>
@@ -92,26 +77,20 @@
        <td></td>
 </tr>
 <tr>
-       <td>assertTextPresent</td>
-       <td>34 results</td>
+       <td>waitForElementPresent</td>
+       <td>result_table</td>
        <td></td>
 </tr>
 <tr>
-       <td>assertXpathCount</td>
-       <td>//*[contains(text(), 'Checkstyle')]</td>
-       <td>35</td>
-</tr>
-<tr>
-       <td>assertXpathCount</td>
-       <td>//*[contains(text(), 'Pmd')]</td>
-       <td>0</td>
+       <td>assertText</td>
+       <td>result_table</td>
+       <td>glob:*Abstract Class Name *</td>
 </tr>
 <tr>
-       <td>assertXpathCount</td>
-       <td>//*[contains(text(), 'Findbugs')]</td>
-       <td>1</td>
+       <td>assertNotText</td>
+       <td>result_table</td>
+       <td>glob:*Anon Inner Length *</td>
 </tr>
-
 </tbody></table>
 </body>
 </html>

diff --git a/tests/integration/tests/src/it/selenium/violations_drilldown/SONAR-722_filter_rule.html b/tests/integration/tests/src/it/selenium/violations_drilldown/SONAR-722_filter_rule.html
deleted file mode 100644 (file)
index 151c344..0000000
--- a/tests/integration/tests/src/it/selenium/violations_drilldown/SONAR-722_filter_rule.html
+++ /dev/null
@@ -1,57 +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" />
-<link rel="selenium.base" href="http://localhost:9000/" />
-<title>SONAR-722_filter_rule</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">SONAR-722_filter_rule</td></tr>
-</thead><tbody>
-<tr>
-       <td>open</td>
-       <td>/drilldown/violations/org.sonar.tests:reference?filter=category</td>
-       <td></td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>col_categories</td>
-       <td>glob:*Maintainability*28*</td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>link=Maintainability</td>
-       <td></td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>col_DIR</td>
-       <td>glob:*22*2*2*2*</td>
-</tr>
-<tr>
-       <td>assertNotText</td>
-       <td>col_DIR</td>
-       <td>glob:*19*4*</td>
-</tr>
-<tr>
-       <td>clickAndWait</td>
-       <td>link=Cyclomatic Complexity</td>
-       <td></td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>col_DIR</td>
-       <td>glob:*2*2*</td>
-</tr>
-<tr>
-       <td>assertNotText</td>
-       <td>col_DIR</td>
-       <td>glob:*15*</td>
-</tr>
-
-</tbody></table>
-</body>
-</html>

diff --git a/tests/integration/tests/src/it/selenium/violations_drilldown/select_resource.html b/tests/integration/tests/src/it/selenium/violations_drilldown/select_resource.html
index 6fb0744f11cebe7d81a964059d7cfd788501dbf5..9970a5e6af4a1f5f01dc53c129a1b49e0ce824dc 100644 (file)
--- a/tests/integration/tests/src/it/selenium/violations_drilldown/select_resource.html
+++ b/tests/integration/tests/src/it/selenium/violations_drilldown/select_resource.html
@@ -21,11 +21,6 @@
        <td>col_rules</td>
        <td>glob:*Unused local variable*</td>
 </tr>
-<tr>
-       <td>assertText</td>
-       <td>col_categories</td>
-       <td>glob:*Maintainability*</td>
-</tr>
 <tr>
        <td>assertText</td>
        <td>col_DIR</td>
@@ -51,7 +46,6 @@
        <td>col_FIL</td>
        <td>glob:*DuplicatedLinesInSamePackage1*</td>
 </tr>
-
 </tbody></table>
 </body>
 </html>