From 9b1eb3ec1c0c44256f967b1bc982491c8f978c25 Mon Sep 17 00:00:00 2001 From: simonbrandhof Date: Wed, 1 Dec 2010 13:55:49 +0000 Subject: [PATCH] SONAR-2007 fix IT --- .../tests/src/it/selenium/all-tests.html | 6 -- ...arch_verify_form_values_on_first_call.html | 6 -- .../it/selenium/rules/search_any_rules.html | 11 ++-- .../it/selenium/rules/search_by_plugin.html | 29 +++++----- .../rules/search_by_rule_category.html | 57 ------------------- .../rules/search_by_rule_priority.html | 35 +++--------- .../selenium/rules/search_by_rule_status.html | 55 ++++++------------ .../SONAR-722_filter_rule.html | 57 ------------------- .../violations_drilldown/select_resource.html | 6 -- 9 files changed, 43 insertions(+), 219 deletions(-) delete mode 100644 tests/integration/tests/src/it/selenium/rules/search_by_rule_category.html delete mode 100644 tests/integration/tests/src/it/selenium/violations_drilldown/SONAR-722_filter_rule.html diff --git a/tests/integration/tests/src/it/selenium/all-tests.html b/tests/integration/tests/src/it/selenium/all-tests.html index c21f9ca566c..a89d19a087c 100644 --- a/tests/integration/tests/src/it/selenium/all-tests.html +++ b/tests/integration/tests/src/it/selenium/all-tests.html @@ -458,9 +458,6 @@ rules/search_by_plugin - - rules/search_by_rule_category - rules/search_by_rule_title @@ -584,9 +581,6 @@ violations_drilldown/select_resource - - violations_drilldown/SONAR-722_filter_rule - violations_drilldown/popup-on-rules 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 12fce2c5822..cd42140ef57 100644 --- 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 @@ //select[@id="search_plugin"]/option[@selected="selected"]/@value - - assertValue - //select[@id="search_category"]/option[@selected="selected"]/@value - - assertValue //select[@id="search_status"]/option[@selected="selected"]/@value @@ -51,7 +46,6 @@ //table[@id="result_table"]//tr[100] - 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 de4482e9ef1..d7f6cc3a61e 100644 --- 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 @@ search_plugin label=Any - - select - search_category - label=Any - select search_priority @@ -51,7 +46,11 @@ results - + + assertElementPresent + result_table + + 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 beca938768c..74d183aaffe 100644 --- 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 @@ search_plugin label=Checkstyle - - select - search_category - label=Efficiency - clickAndWait submit_search - assertXpathCount - //*[contains(text(), 'Findbugs')] - 1 + assertText + result_table + glob:*Checkstyle* + + + assertText + result_table + glob:*Pmd* - assertXpathCount - //*[contains(text(), 'Checkstyle')] - 2 + assertNotText + result_table + glob:*Findbugs* - assertXpathCount - //*[contains(text(), 'Pmd')] - 14 + assertNotText + result_table + glob:*Squid* - 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 index 0047baa57cc..00000000000 --- a/tests/integration/tests/src/it/selenium/rules/search_by_rule_category.html +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - -search_by_rule_category - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
search_by_rule_category
open/profiles
clickAndWaitrules-java-Sonar%20way
removeSelectionsearch_pluginlabel=Any
addSelectionsearch_pluginlabel=Checkstyle
selectsearch_categorylabel=Maintainability
addSelectionsearch_categorylabel=Reliability
clickAndWaitsubmit_search
assertTextPresent16 results
- - 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 e0420bf4644..826f70d8984 100644 --- 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 @@ search_plugin label=Checkstyle - - select - search_category - label=Maintainability - - - addSelection - search_category - label=Reliability - select search_priority - label=Major - - - addSelection - search_priority label=Critical @@ -58,25 +43,19 @@ waitForTextPresent - 10 results + results - assertXpathCount - //*[contains(text(), 'Checkstyle')] - 11 - - - assertXpathCount - //*[contains(text(), 'Pmd')] - 0 + assertText + result_table + glob:*Equals Hash Code* - assertXpathCount - //*[contains(text(), 'Findbugs')] - 1 + assertNotText + result_table + glob:*Anon Inner Length * - 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 a8c6c9c0783..6d1d67ac633 100644 --- 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 @@ search_plugin label=Checkstyle - - select - search_category - label=Maintainability - - - addSelection - search_category - label=Reliability - select search_priority @@ -57,29 +47,24 @@ label=Any - click + clickAndWait submit_search - waitForTextPresent - 44 results + waitForElementPresent + result_table - assertXpathCount - //*[contains(text(), 'Checkstyle')] - 45 - - - assertXpathCount - //*[contains(text(), 'Pmd')] - 0 + assertText + result_table + glob:*Abstract Class Name* - assertXpathCount - //*[contains(text(), 'Findbugs')] - 1 + assertText + result_table + glob:*Anon Inner Length * select @@ -92,26 +77,20 @@ - assertTextPresent - 34 results + waitForElementPresent + result_table - assertXpathCount - //*[contains(text(), 'Checkstyle')] - 35 - - - assertXpathCount - //*[contains(text(), 'Pmd')] - 0 + assertText + result_table + glob:*Abstract Class Name * - assertXpathCount - //*[contains(text(), 'Findbugs')] - 1 + assertNotText + result_table + glob:*Anon Inner Length * - 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 index 151c344468e..00000000000 --- a/tests/integration/tests/src/it/selenium/violations_drilldown/SONAR-722_filter_rule.html +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - -SONAR-722_filter_rule - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
SONAR-722_filter_rule
open/drilldown/violations/org.sonar.tests:reference?filter=category
assertTextcol_categoriesglob:*Maintainability*28*
clickAndWaitlink=Maintainability
assertTextcol_DIRglob:*22*2*2*2*
assertNotTextcol_DIRglob:*19*4*
clickAndWaitlink=Cyclomatic Complexity
assertTextcol_DIRglob:*2*2*
assertNotTextcol_DIRglob:*15*
- - 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 6fb0744f11c..9970a5e6af4 100644 --- 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 @@ col_rules glob:*Unused local variable* - - assertText - col_categories - glob:*Maintainability* - assertText col_DIR @@ -51,7 +46,6 @@ col_FIL glob:*DuplicatedLinesInSamePackage1* - -- 2.39.5