Skip to content

Commit

Permalink
Merge pull request #10128 from KyleAure/9260-dbroation_module
Browse files Browse the repository at this point in the history 
adding fattest.databases module
Errors in PB were for existing defects.
  • Loading branch information
@KyleAure
KyleAure committed Dec 16, 2019
2 parents 67c1366 + b73f8df commit b06d50f
Show file tree
Hide file tree
Showing 24 changed files with 743 additions and 682 deletions.
47 changes: 2 additions & 45 deletions dev/com.ibm.ws.concurrent.persistent_fat/build.gradle
View file
Expand Up @@ -9,50 +9,6 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/

configurations {
//Transitive dependencies in Oracle Maven pom are not necessary when just using
//the base JDBC driver. Excluding these dependencies will speed up test time and reduce clutter.
jdbcDrivers {
transitive = false;
}
}

dependencies {
//Test container libraries
requiredLibs 'org.testcontainers:testcontainers:1.12.3',
'org.testcontainers:database-commons:1.12.3',
'org.testcontainers:jdbc:1.12.3',
'org.testcontainers:oracle-xe:1.12.3',
'org.testcontainers:mssqlserver:1.12.3',
'org.testcontainers:postgresql:1.12.3',
'org.testcontainers:db2:1.12.3',
'org.apache.commons:commons-compress:1.18',
'org.rnorth.duct-tape:duct-tape:1.0.7',
'org.rnorth.visible-assertions:visible-assertions:2.1.2',
'org.rnorth:tcp-unix-socket-proxy:1.0.2',
'net.java.dev.jna:jna:5.2.0',
'org.slf4j:slf4j-api:1.7.7',
'org.slf4j:slf4j-jdk14:1.7.7'

//JDBC Drivers
jdbcDrivers 'com.ibm.db2:jcc:11.1.4.4',
'org.postgresql:postgresql:42.2.5',
'com.microsoft.sqlserver:mssql-jdbc:7.4.1.jre8',
'org.apache.derby:derby:10.11.1.1',
'com.oracle.ojdbc:ojdbc8_g:19.3.0.0'
}

task addJdbcDrivers(type: Copy) {
shouldRunAfter jar
from configurations.jdbcDrivers
into new File(autoFvtDir, 'publish/shared/resources/jdbc')
rename 'derby.*.jar', 'derby.jar'
rename 'jcc.*.jar', 'db2jcc.jar'
rename 'mssql-jdbc.*.jar', 'mssql-jdbc.jar'
rename 'postgresql.*.jar', 'postgresql.jar'
rename 'ojdbc8_g.*.jar', 'ojdbc8_g.jar'
}

task copyFeatureBundle(type: Copy) {
from buildDir
into new File(autoFvtDir, 'lib/LibertyFATTestFiles/bundles')
Expand All @@ -64,5 +20,6 @@ autoFVT {
}

addRequiredLibraries {
dependsOn addJdbcDrivers
dependsOn copyJdbcDrivers
dependsOn copyDatabaseRotationDrivers
}
48 changes: 2 additions & 46 deletions dev/com.ibm.ws.concurrent.persistent_fat_multiple/build.gradle
View file
Expand Up @@ -8,52 +8,8 @@
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
//TODO this can be moved to the wlp-gradle/subprojects/fat.gradle

configurations {
//Transitive dependencies in Oracle Maven pom are not necessary when just using
//the base JDBC driver. Excluding these dependencies will speed up test time and reduce clutter.
jdbcDrivers {
transitive = false
}
}

dependencies {
//Test container libraries
requiredLibs 'org.testcontainers:testcontainers:1.12.3',
'org.testcontainers:database-commons:1.12.3',
'org.testcontainers:jdbc:1.12.3',
'org.testcontainers:oracle-xe:1.12.3',
'org.testcontainers:mssqlserver:1.12.3',
'org.testcontainers:postgresql:1.12.3',
'org.testcontainers:db2:1.12.3',
'org.apache.commons:commons-compress:1.18',
'org.rnorth.duct-tape:duct-tape:1.0.7',
'org.rnorth.visible-assertions:visible-assertions:2.1.2',
'org.rnorth:tcp-unix-socket-proxy:1.0.2',
'net.java.dev.jna:jna:5.2.0',
'org.slf4j:slf4j-api:1.7.7',
'org.slf4j:slf4j-jdk14:1.7.7'

//JDBC Drivers
jdbcDrivers 'com.ibm.db2:jcc:11.1.4.4',
'org.postgresql:postgresql:42.2.5',
'com.microsoft.sqlserver:mssql-jdbc:7.4.1.jre8',
'org.apache.derby:derby:10.11.1.1',
'com.oracle.ojdbc:ojdbc8_g:19.3.0.0'
}

task addJdbcDrivers(type: Copy) {
shouldRunAfter jar
from configurations.jdbcDrivers
into new File(autoFvtDir, 'publish/shared/resources/jdbc')
rename 'derby.*.jar', 'derby.jar'
rename 'jcc.*.jar', 'db2jcc.jar'
rename 'mssql-jdbc.*.jar', 'mssql-jdbc.jar'
rename 'postgresql.*.jar', 'postgresql.jar'
rename 'ojdbc8_g.*.jar', 'ojdbc8_g.jar'
}

addRequiredLibraries {
dependsOn addJdbcDrivers
dependsOn copyJdbcDrivers
dependsOn copyDatabaseRotationDrivers
}
10 changes: 3 additions & 7 deletions dev/com.ibm.ws.concurrent.persistent_fat_timers/bnd.bnd
View file
Expand Up @@ -25,6 +25,7 @@ fat.test.databases: true
# fat.test.use.remote.docker: true

-buildpath: \
fattest.databases;version=latest,\
com.ibm.websphere.javaee.annotation.1.1;version=latest,\
com.ibm.websphere.javaee.concurrent.1.0;version=latest,\
com.ibm.websphere.javaee.servlet.3.1;version=latest,\
Expand All @@ -33,10 +34,5 @@ fat.test.databases: true
com.ibm.websphere.javaee.ejb.3.1,\
org.testcontainers:database-commons;version=1.12.3,\
org.testcontainers:jdbc;version=1.12.3,\
org.testcontainers:testcontainers;version=1.12.3,\
org.testcontainers:db2;version=1.12.3,\
org.testcontainers:postgresql;version=1.12.3,\
org.testcontainers:mssqlserver;version=1.12.3,\
org.testcontainers:oracle-xe;version=1.12.3,\
org.rnorth.duct-tape:duct-tape;version=1.0.7,\
org.slf4j:slf4j-api;version=1.7.7
org.testcontainers:testcontainers;version=1.12.3

48 changes: 3 additions & 45 deletions dev/com.ibm.ws.concurrent.persistent_fat_timers/build.gradle
View file
Expand Up @@ -9,50 +9,8 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/

configurations {
//Transitive dependencies in Oracle Maven pom are not necessary when just using
//the base JDBC driver. Excluding these dependencies will speed up test time and reduce clutter.
jdbcDrivers {
transitive = false
}
}

dependencies {
//Test container libraries
requiredLibs 'org.testcontainers:testcontainers:1.12.3',
'org.testcontainers:database-commons:1.12.3',
'org.testcontainers:jdbc:1.12.3',
'org.testcontainers:oracle-xe:1.12.3',
'org.testcontainers:mssqlserver:1.12.3',
'org.testcontainers:postgresql:1.12.3',
'org.testcontainers:db2:1.12.3',
'org.apache.commons:commons-compress:1.18',
'org.rnorth.duct-tape:duct-tape:1.0.7',
'org.rnorth.visible-assertions:visible-assertions:2.1.2',
'org.rnorth:tcp-unix-socket-proxy:1.0.2',
'net.java.dev.jna:jna:5.2.0',
'org.slf4j:slf4j-api:1.7.7',
'org.slf4j:slf4j-jdk14:1.7.7'

//JDBC Drivers
jdbcDrivers 'com.ibm.db2:jcc:11.1.4.4',
'org.postgresql:postgresql:42.2.5',
'com.microsoft.sqlserver:mssql-jdbc:7.4.1.jre8',
'org.apache.derby:derby:10.11.1.1',
'com.oracle.ojdbc:ojdbc8_g:19.3.0.0'
}

task addJdbcDrivers(type: Copy) {
shouldRunAfter jar
from configurations.jdbcDrivers
into new File(autoFvtDir, 'publish/shared/resources/jdbc')
rename 'derby.*.jar', 'derby.jar'
rename 'jcc.*.jar', 'db2jcc.jar'
rename 'mssql-jdbc.*.jar', 'mssql-jdbc.jar'
rename 'postgresql.*.jar', 'postgresql.jar'
rename 'ojdbc8_g.*.jar', 'ojdbc8_g.jar'
}

addRequiredLibraries {
dependsOn addJdbcDrivers
dependsOn copyJdbcDrivers
dependsOn copyDatabaseRotationDrivers
dependsOn copyFattestDatabases
}
126 changes: 0 additions & 126 deletions ..._timers/fat/src/com/ibm/ws/concurrent/persistent/fat/timers/DatabaseContainerFactory.java
View file

This file was deleted.

79 changes: 0 additions & 79 deletions ...fat_timers/fat/src/com/ibm/ws/concurrent/persistent/fat/timers/DatabaseContainerType.java
View file

This file was deleted.

0 comments on commit b06d50f

Please sign in to comment.