Enable Oracle12c and PostgreSQL in QA

diff --git a/.cix.yml b/.cix.yml
index 71c8e86530a3ac7fec14eb25edd2e9ffddc1c38d..2b8ffbeafa0bef1c799ce1d9908787cc5a678ab8 100644 (file)
--- 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 8aee97c9286f29fe6cb8b0da86f11886e04b4cbe..73cade69b6f5eca3a84e12903dad8db91019df66 100644 (file)
--- 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<String, String> 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 f57885645b973f213d31de4ac5ac08b69a167764..d389f54b006a73924fd61ebb1423882fdb5ac8b3 100644 (file)
--- 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 @@
   </tr>
   <tr>
     <td>waitForText</td>
-    <td>measures-table</td>
-    <td>*a2/HelloA2.xoo*a1/HelloA1.xoo*b1/HelloB1.xoo*b2/HelloB2.xoo*</td>
+    <td>css=#measures-table tbody tr:nth-of-type(1)</td>
+    <td>*a2/HelloA2.xoo*</td>
   </tr>
   <tr>
     <td>waitForText</td>
@@ -85,8 +85,8 @@
   </tr>
   <tr>
     <td>waitForText</td>
-    <td>measures-table</td>
-    <td>*a1/HelloA1.xoo*b1/HelloB1.xoo*b2/HelloB2.xoo*a2/HelloA2.xoo*</td>
+    <td>css=#measures-table tbody tr:nth-of-type(4)</td>
+    <td>*a2/HelloA2.xoo*</td>
   </tr>
   </tbody>
 </table>

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 ab4dda0d92ad17ecbd59709495fcc8ffade29229..8cddf92798643c3a8b4505bb1c16b5afbabde667 100644 (file)
--- 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 @@
 </tr>
 <tr>
        <td>waitForText</td>
-       <td>block_1</td>
-       <td>*a2/HelloA2.xoo*a1/HelloA1.xoo*b1/HelloB1.xoo*b2/HelloB2.xoo*</td>
+       <!-- test only the first row as the other ones have all the same number of LOC -->
+       <td>css=#block_1 tbody tr:nth-of-type(1)</td>
+       <td>*a2/HelloA2.xoo*</td>
 </tr>
 <tr>
        <td>click</td>
@@ -125,8 +126,9 @@
 </tr>
 <tr>
        <td>waitForText</td>
-       <td>block_1</td>
-       <td>*HelloA1*HelloB1*HelloB2*HelloA2*</td>
+       <!-- test only the 4th row as the other ones have all the same number of LOC -->
+       <td>css=#block_1 tbody tr:nth-of-type(4)</td>
+       <td>*a2/HelloA2*</td>
 </tr>
 </tbody>
 </table>

diff --git a/run-integration-tests.sh b/run-integration-tests.sh
index b3db6e6bab380064106337aa289c6ddeb20948ce..82f20df03b4e3ce21549056aba7da9d47859f774 100755 (executable)
--- 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 $*