From 2e1c4c276eea4ce5e6b8acc29561904022d43a87 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Mon, 22 Feb 2016 19:22:51 +0100 Subject: Fix ITs in QA env --- it/it-tests/src/test/java/it/analysis/IssueJsonReportTest.java | 10 +++++++--- .../measureFilter/MeasureFiltersTest/empty_filter.html | 2 +- .../measureFilter/MeasureFiltersTest/list_change_columns.html | 6 +++--- .../measureFilter/MeasureFiltersTest/list_delete_column.html | 4 ++-- .../measureFilter/MeasureFiltersTest/list_move_columns.html | 4 ++-- .../MeasureFiltersTest/list_sort_by_descending_name.html | 2 +- .../measureFilter/MeasureFiltersTest/list_sort_by_ncloc.html | 10 +++++----- .../measureFilter/MeasureFiltersTest/list_widget.html | 4 ++-- .../measureFilter/MeasureFiltersTest/list_widget_sort.html | 4 ++-- .../list_widget_warning_if_missing_filter.html | 2 +- .../MeasureFiltersTest/save_with_special_characters.html | 4 ++-- .../measureFilter/MeasureFiltersTest/search-by-key.html | 4 ++-- .../measureFilter/MeasureFiltersTest/search-by-name.html | 4 ++-- .../measureFilter/MeasureFiltersTest/search_for_files.html | 4 ++-- .../measureFilter/MeasureFiltersTest/search_for_projects.html | 2 +- .../should-unshare-filter-remove-other-filters-favourite.html | 2 +- .../project-settings/only-on-project-settings.html | 2 +- .../project-settings/override-global-settings.html | 2 +- .../settings/PropertySetsTest/auto-generated/update.html | 5 +++++ it/it-tests/src/test/resources/ui/UiTest/footer.html | 2 +- 20 files changed, 44 insertions(+), 35 deletions(-) diff --git a/it/it-tests/src/test/java/it/analysis/IssueJsonReportTest.java b/it/it-tests/src/test/java/it/analysis/IssueJsonReportTest.java index 08ca0f84174..f2c8a4a2cb2 100644 --- a/it/it-tests/src/test/java/it/analysis/IssueJsonReportTest.java +++ b/it/it-tests/src/test/java/it/analysis/IssueJsonReportTest.java @@ -85,7 +85,7 @@ public class IssueJsonReportTest { assertThat(jsonIssue.get("startOffset")).isNotNull(); } - List lineNumbers = new ArrayList(16); + List lineNumbers = new ArrayList<>(16); for (long i = 1L; i < 18; i++) { lineNumbers.add(i); } @@ -276,7 +276,10 @@ public class IssueJsonReportTest { @Test public void sanityCheck() { - assertThat(sanitize("5.0.0-5868-SILVER-SNAPSHOT")).isEqualTo(""); + assertThat(sanitize("5.0-SNAPSHOT")).isEqualTo(""); + assertThat(sanitize("5.0.0-5868-SNAPSHOT")).isEqualTo(""); + assertThat(sanitize("5.0-build1234")).isEqualTo(""); + assertThat(sanitize("5.0.1-build1234")).isEqualTo(""); } @Test @@ -285,8 +288,9 @@ public class IssueJsonReportTest { } private static String sanitize(String s) { - // sanitize sonar version. Note that "-SILVER-SNAPSHOT" is used by Goldeneye jobs + // sanitize sonarqube version: "5.4-SNAPSHOT" or "5.4-build1234" s = s.replaceAll("\\d\\.\\d(.\\d)?(\\-.*)?\\-SNAPSHOT", ""); + s = s.replaceAll("\\d\\.\\d(.\\d)?(\\-.*)?\\-build.*", ""); // sanitize issue uuid keys s = s.replaceAll("\"[a-zA-Z_0-9\\-]{15,20}\"", ""); diff --git a/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/empty_filter.html b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/empty_filter.html index 0c5231b3df2..6101b19390f 100644 --- a/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/empty_filter.html +++ b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/empty_filter.html @@ -14,7 +14,7 @@ - assertText + waitForText measures-table *No data* diff --git a/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_change_columns.html b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_change_columns.html index 21616d359b7..d7b3f886a06 100644 --- a/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_change_columns.html +++ b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_change_columns.html @@ -79,7 +79,7 @@ - assertText + waitForText measures-table *Name*Cmpx* @@ -109,7 +109,7 @@ - assertText + waitForText measures-table *Name*Cmpx*Comment lines*last* @@ -119,7 +119,7 @@ - assertText + waitForText measures-table *Name*Cmpx*Comment lines*last* diff --git a/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_delete_column.html b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_delete_column.html index 7a8b69ef551..85b19ab0ac6 100644 --- a/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_delete_column.html +++ b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_delete_column.html @@ -34,7 +34,7 @@ - assertText + waitForText measures-table *Name*Last Analysis*LOC* @@ -59,7 +59,7 @@ - assertText + waitForText measures-table *Name*LOC* diff --git a/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_move_columns.html b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_move_columns.html index c3f1f605c3e..d209eb3ac9d 100644 --- a/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_move_columns.html +++ b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_move_columns.html @@ -34,7 +34,7 @@ - assertText + waitForText measures-table *Name*Last Analysis*LOC* @@ -64,7 +64,7 @@ - assertText + waitForText measures-table *Last Analysis*LOC*Name* diff --git a/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_sort_by_descending_name.html b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_sort_by_descending_name.html index 466808ab981..e9a6405b438 100644 --- a/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_sort_by_descending_name.html +++ b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_sort_by_descending_name.html @@ -59,7 +59,7 @@ - assertText + waitForText measures-table *b2/HelloB2.xoo*b1/HelloB1.xoo*a2/HelloA2.xoo*a1/HelloA1.xoo* diff --git a/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_sort_by_ncloc.html b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_sort_by_ncloc.html index ac15db6c1f1..f57885645b9 100644 --- a/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_sort_by_ncloc.html +++ b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_sort_by_ncloc.html @@ -54,7 +54,7 @@ - assertText + waitForText css=#measures-table tfoot *4 results* @@ -64,12 +64,12 @@ - assertText + waitForText measures-table *a2/HelloA2.xoo*a1/HelloA1.xoo*b1/HelloB1.xoo*b2/HelloB2.xoo* - assertText + waitForText css=#measures-table tfoot *4 results* @@ -79,12 +79,12 @@ - assertText + waitForText css=#measures-table tfoot *4 results* - assertText + waitForText measures-table *a1/HelloA1.xoo*b1/HelloB1.xoo*b2/HelloB2.xoo*a2/HelloA2.xoo* diff --git a/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_widget.html b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_widget.html index bedcccf4868..acbbc61e350 100644 --- a/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_widget.html +++ b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_widget.html @@ -49,12 +49,12 @@ - assertText + waitForText block_1 *Name*Version*LOC*Last Analysis* - assertText + waitForText block_1 *Multi-modules Sample*1.0-SNAPSHOT* diff --git a/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_widget_sort.html b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_widget_sort.html index c7555b6e7b4..2b4b072cde6 100644 --- a/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_widget_sort.html +++ b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_widget_sort.html @@ -94,12 +94,12 @@ - assertText + waitForText block_1 *Name*LOC* - assertText + waitForText block_1 *a1/HelloA1.xoo*a2/HelloA2.xoo*b1/HelloB1.xoo*b2/HelloB2.xoo* diff --git a/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_widget_warning_if_missing_filter.html b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_widget_warning_if_missing_filter.html index e145cb46e5f..aaa29436daf 100644 --- a/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_widget_warning_if_missing_filter.html +++ b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_widget_warning_if_missing_filter.html @@ -14,7 +14,7 @@ - assertText + waitForText block_1 *This widget is configured to display a measure filter that does not exist anymore.* diff --git a/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/save_with_special_characters.html b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/save_with_special_characters.html index 970c1f58b0f..ea6b998299b 100644 --- a/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/save_with_special_characters.html +++ b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/save_with_special_characters.html @@ -75,7 +75,7 @@ - assertText + waitForText filter-description *description with special characters " ' éà* @@ -90,7 +90,7 @@ - assertText + waitForText my-filters *special $àé'@"*description with special characters " ' éà* diff --git a/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/search-by-key.html b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/search-by-key.html index cf5be3f2bac..ddc4d9d33eb 100644 --- a/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/search-by-key.html +++ b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/search-by-key.html @@ -64,12 +64,12 @@ - assertText + waitForText measures-table *Sonar :: Integration Tests :: Multi-modules Sample* - assertText + waitForText css=#measures-table tfoot *1 results* diff --git a/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/search-by-name.html b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/search-by-name.html index fddc9529d47..ea7a389711a 100644 --- a/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/search-by-name.html +++ b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/search-by-name.html @@ -64,12 +64,12 @@ - assertText + waitForText measures-table *Sonar :: Integration Tests :: Multi-modules Sample* - assertText + waitForText css=#measures-table tfoot *1 results* diff --git a/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/search_for_files.html b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/search_for_files.html index 0795c7a7f9e..6c55db2b97f 100644 --- a/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/search_for_files.html +++ b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/search_for_files.html @@ -29,12 +29,12 @@ - assertText + waitForText measures-table *a1/HelloA1.xoo*a2/HelloA2.xoo*b1/HelloB1.xoo*b2/HelloB2.xoo* - assertText + waitForText css=#measures-table tfoot *4 results* diff --git a/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/search_for_projects.html b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/search_for_projects.html index e630b7f0bcb..4a61aef1395 100644 --- a/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/search_for_projects.html +++ b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/search_for_projects.html @@ -54,7 +54,7 @@ - assertText + waitForText measures-table *Sonar :: Integration Tests :: Multi-modules Sample* diff --git a/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/should-unshare-filter-remove-other-filters-favourite.html b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/should-unshare-filter-remove-other-filters-favourite.html index 4335fb5c09c..dd5f99b68ff 100644 --- a/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/should-unshare-filter-remove-other-filters-favourite.html +++ b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/should-unshare-filter-remove-other-filters-favourite.html @@ -124,7 +124,7 @@ *My Measures Filters* - assertText + waitForText shared-filters *user_${FILTER_NAME}* diff --git a/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-settings/only-on-project-settings.html b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-settings/only-on-project-settings.html index 49d6d34d809..e06e83d52ce 100644 --- a/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-settings/only-on-project-settings.html +++ b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-settings/only-on-project-settings.html @@ -49,7 +49,7 @@ - assertValue + waitForValue id=input_prop_only_on_project foo diff --git a/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-settings/override-global-settings.html b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-settings/override-global-settings.html index 8158e973149..8d76ad511fb 100644 --- a/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-settings/override-global-settings.html +++ b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-settings/override-global-settings.html @@ -49,7 +49,7 @@ - assertValue + waitForValue id=input_sonar.skippedModules my-excluded-module diff --git a/it/it-tests/src/test/resources/settings/PropertySetsTest/auto-generated/update.html b/it/it-tests/src/test/resources/settings/PropertySetsTest/auto-generated/update.html index 1e7941208d9..dc4e7ac8ccf 100644 --- a/it/it-tests/src/test/resources/settings/PropertySetsTest/auto-generated/update.html +++ b/it/it-tests/src/test/resources/settings/PropertySetsTest/auto-generated/update.html @@ -43,6 +43,11 @@ link=Delete + + waitForVisible + id=submit_settings + + click id=submit_settings diff --git a/it/it-tests/src/test/resources/ui/UiTest/footer.html b/it/it-tests/src/test/resources/ui/UiTest/footer.html index d31fd4b5e8a..f95b351399c 100644 --- a/it/it-tests/src/test/resources/ui/UiTest/footer.html +++ b/it/it-tests/src/test/resources/ui/UiTest/footer.html @@ -25,7 +25,7 @@ assertText footer - *Version *.*-SNAPSHOT* - Community - Documentation - Get Support - Plugins* + *Version *.*-* - Community - Documentation - Get Support - Plugins* -- cgit v1.2.3