From 6d0443dbb9b3108e54882bd818e8192bb78df0a0 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Tue, 2 Aug 2016 10:05:34 +0200 Subject: [PATCH] Enable Oracle12c and PostgreSQL in QA --- .cix.yml | 50 +++++++++++++++++++ .../src/test/java/it/dbCleaner/PurgeTest.java | 4 +- .../list_sort_by_ncloc.html | 8 +-- .../MeasureFiltersTest/list_widget_sort.html | 10 ++-- run-integration-tests.sh | 1 + 5 files changed, 63 insertions(+), 10 deletions(-) diff --git a/.cix.yml b/.cix.yml index 71c8e86530a..2b8ffbeafa0 100644 --- a/.cix.yml +++ b/.cix.yml @@ -13,6 +13,16 @@ RUN_ACTIVITY: - run-db-integration-tests-mssql2014-Category3 - run-db-integration-tests-mssql2014-Category4 - run-db-integration-tests-mssql2014-Category5 + - run-db-integration-tests-oracle12c-Category1 + - run-db-integration-tests-oracle12c-Category2 + - run-db-integration-tests-oracle12c-Category3 + - run-db-integration-tests-oracle12c-Category4 + - run-db-integration-tests-oracle12c-Category5 + - run-db-integration-tests-postgresql93-Category1 + - run-db-integration-tests-postgresql93-Category2 + - run-db-integration-tests-postgresql93-Category3 + - run-db-integration-tests-postgresql93-Category4 + - run-db-integration-tests-postgresql93-Category5 - run-upgrade-tests-mssql2014 - run-upgrade-tests-mysql56 - run-upgrade-tests-oracle12c @@ -43,6 +53,26 @@ exclude: SLAVE_TYPE: performance - RUN_ACTIVITY: run-db-integration-tests-mssql2014-Category5 SLAVE_TYPE: performance + - RUN_ACTIVITY: run-db-integration-tests-oracle12c-Category1 + SLAVE_TYPE: performance + - RUN_ACTIVITY: run-db-integration-tests-oracle12c-Category2 + SLAVE_TYPE: performance + - RUN_ACTIVITY: run-db-integration-tests-oracle12c-Category3 + SLAVE_TYPE: performance + - RUN_ACTIVITY: run-db-integration-tests-oracle12c-Category4 + SLAVE_TYPE: performance + - RUN_ACTIVITY: run-db-integration-tests-oracle12c-Category5 + SLAVE_TYPE: performance + - RUN_ACTIVITY: run-db-integration-tests-postgresql93-Category1 + SLAVE_TYPE: performance + - RUN_ACTIVITY: run-db-integration-tests-postgresql93-Category2 + SLAVE_TYPE: performance + - RUN_ACTIVITY: run-db-integration-tests-postgresql93-Category3 + SLAVE_TYPE: performance + - RUN_ACTIVITY: run-db-integration-tests-postgresql93-Category4 + SLAVE_TYPE: performance + - RUN_ACTIVITY: run-db-integration-tests-postgresql93-Category5 + SLAVE_TYPE: performance - RUN_ACTIVITY: run-upgrade-tests-mssql2014 SLAVE_TYPE: performance - RUN_ACTIVITY: run-upgrade-tests-mysql56 @@ -79,6 +109,26 @@ exclude: SLAVE_TYPE: windows - RUN_ACTIVITY: run-db-integration-tests-mssql2014-Category5 SLAVE_TYPE: windows + - RUN_ACTIVITY: run-db-integration-tests-oracle12c-Category1 + SLAVE_TYPE: windows + - RUN_ACTIVITY: run-db-integration-tests-oracle12c-Category2 + SLAVE_TYPE: windows + - RUN_ACTIVITY: run-db-integration-tests-oracle12c-Category3 + SLAVE_TYPE: windows + - RUN_ACTIVITY: run-db-integration-tests-oracle12c-Category4 + SLAVE_TYPE: windows + - RUN_ACTIVITY: run-db-integration-tests-oracle12c-Category5 + SLAVE_TYPE: windows + - RUN_ACTIVITY: run-db-integration-tests-postgresql93-Category1 + SLAVE_TYPE: windows + - RUN_ACTIVITY: run-db-integration-tests-postgresql93-Category2 + SLAVE_TYPE: windows + - RUN_ACTIVITY: run-db-integration-tests-postgresql93-Category3 + SLAVE_TYPE: windows + - RUN_ACTIVITY: run-db-integration-tests-postgresql93-Category4 + SLAVE_TYPE: windows + - RUN_ACTIVITY: run-db-integration-tests-postgresql93-Category5 + SLAVE_TYPE: windows - RUN_ACTIVITY: run-upgrade-tests-mssql2014 SLAVE_TYPE: windows - RUN_ACTIVITY: run-upgrade-tests-mysql56 diff --git a/it/it-tests/src/test/java/it/dbCleaner/PurgeTest.java b/it/it-tests/src/test/java/it/dbCleaner/PurgeTest.java index 8aee97c9286..73cade69b6f 100644 --- a/it/it-tests/src/test/java/it/dbCleaner/PurgeTest.java +++ b/it/it-tests/src/test/java/it/dbCleaner/PurgeTest.java @@ -316,10 +316,10 @@ public class PurgeTest { private static Boolean toBoolean(Map s) { String value = s.get("ENABLED"); - if (value.equalsIgnoreCase("true") || value.equals("1")) { + if (value.equalsIgnoreCase("true") || value.equalsIgnoreCase("t") || value.equals("1")) { return true; } - if (value.equalsIgnoreCase("false") || value.equals("0")) { + if (value.equalsIgnoreCase("false") || value.equalsIgnoreCase("f") || value.equals("0")) { return false; } throw new IllegalArgumentException("Unsupported value can not be converted to boolean " + value); 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 f57885645b9..d389f54b006 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 @@ -65,8 +65,8 @@ waitForText - measures-table - *a2/HelloA2.xoo*a1/HelloA1.xoo*b1/HelloB1.xoo*b2/HelloB2.xoo* + css=#measures-table tbody tr:nth-of-type(1) + *a2/HelloA2.xoo* waitForText @@ -85,8 +85,8 @@ waitForText - measures-table - *a1/HelloA1.xoo*b1/HelloB1.xoo*b2/HelloB2.xoo*a2/HelloA2.xoo* + css=#measures-table tbody tr:nth-of-type(4) + *a2/HelloA2.xoo* 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 ab4dda0d92a..8cddf927986 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 @@ -115,8 +115,9 @@ waitForText - block_1 - *a2/HelloA2.xoo*a1/HelloA1.xoo*b1/HelloB1.xoo*b2/HelloB2.xoo* + + css=#block_1 tbody tr:nth-of-type(1) + *a2/HelloA2.xoo* click @@ -125,8 +126,9 @@ waitForText - block_1 - *HelloA1*HelloB1*HelloB2*HelloA2* + + css=#block_1 tbody tr:nth-of-type(4) + *a2/HelloA2* diff --git a/run-integration-tests.sh b/run-integration-tests.sh index b3db6e6bab3..82f20df03b4 100755 --- a/run-integration-tests.sh +++ b/run-integration-tests.sh @@ -20,4 +20,5 @@ cd it mvn verify \ -Dcategory=$CATEGORY \ -Dorchestrator.configUrl=$ORCHESTRATOR_CONFIG_URL \ + -Dwith-db-drivers \ -Dsource.skip=true -B -e -V $* -- 2.39.5