Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixed issue with JUnit reports on rerun and added preliminary script …
…for supporting other DBs Signed-off-by: anajosep <anand.francis.joseph.augustin@oracle.com>
- Loading branch information
Showing
8 changed files
with
127 additions
and
36 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| mysql.dbName=cts | ||
| mysql.port=3306 | ||
| mysql.user=cts1 | ||
| mysql.passwd=cts1 | ||
| mysql.properties=user\=${mysql.user}:password\=${mysql.passwd}:DatabaseName\=${mysql.dbName}\:ServerName\=${mysql.server}\:port\=${mysql.port}\:jdbcCompliantTruncation\=false | ||
|
|
||
| jdbc.poolName=${mysql.poolName} | ||
| jdbc.db=mysql | ||
| jdbc.maxpoolsize=64 | ||
| jdbc.steadypoolsize=32 | ||
| db.dml.file=${mysql.dml.file} | ||
| db.dml.file.ri=${mysql.dml.file} | ||
|
|
||
| batch.db.dataSource=${mysql.dataSource} | ||
| batch.db.properties=${mysql.properties} | ||
|
|
||
| jdbc.db.classes=${mysql.classes} | ||
|
|
||
| jstl.db.driver=${mysql.driver} | ||
| jstl.db.url=${mysql.url} | ||
| jstl.db.user=${mysql.user} | ||
| jstl.db.password=${mysql.passwd} | ||
|
|
||
| user1=${mysql.user} | ||
| password1=${mysql.passwd} | ||
| user2=${mysql.user} | ||
| password2=${mysql.passwd} | ||
| user3=${mysql.user} | ||
| password3=${mysql.passwd} | ||
|
|
||
| db.supports.sequence=false | ||
|
|
||
| javax.persistence.jdbc.driver=${mysql.driver} | ||
| javax.persistence.jdbc.url=${mysql.url} | ||
| javax.persistence.jdbc.user=${mysql.user} | ||
| javax.persistence.jdbc.password=${mysql.passwd} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| oracle.dbName=orcl | ||
| oracle.port=1521 | ||
| oracle.user=cts1 | ||
| oracle.passwd=cts1 | ||
| oracle.classes=${jdbc.lib.class.path}/ojdbc8.jar${pathsep}${jdbc.lib.class.path}/oracle.jar | ||
| oracle.properties=user\=${oracle.user}:password\=${oracle.passwd}:DatabaseName\=${oracle.dbName}:ServerName\=${oracle.server}:PortNumber\=${oracle.port}:driverType\=thin | ||
|
|
||
| jdbc.poolName=${oracle.poolName} | ||
| jdbc.db=oracle | ||
| jdbc.maxpoolsize=64 | ||
| jdbc.steadypoolsize=32 | ||
| jdbc.db.classes=${oracle.classes} | ||
| jdbc.datasource.props=\"driverType=thin\" | ||
|
|
||
| db.dml.file=${oracle.dml.file} | ||
| db.dml.file.ri=${oracle.dml.file} | ||
|
|
||
| batch.db.dataSource=${oracle.dataSource} | ||
| batch.db.properties=${oracle.properties} | ||
|
|
||
| jstl.db.driver=${oracle.driver} | ||
| jstl.db.url=${oracle.url} | ||
| jstl.db.user=${oracle.user} | ||
| jstl.db.password=${oracle.passwd} | ||
|
|
||
| user1=${oracle.user} | ||
| password1=${oracle.passwd} | ||
| user2=${oracle.user} | ||
| password2=${oracle.passwd} | ||
| user3=${oracle.user} | ||
| password3=${oracle.passwd} | ||
| oracleOCI.classes=${jdbc.lib.class.path}/ojdbc8.jar | ||
|
|
||
| javax.persistence.jdbc.driver=${oracle.driver} | ||
| javax.persistence.jdbc.url=${oracle.url} | ||
| javax.persistence.jdbc.user=${oracle.user} | ||
| javax.persistence.jdbc.password=${oracle.passwd} | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| #!/bin/bash -x | ||
|
|
||
| if [ $# -lt 2 ];then | ||
| echo "Did not receive the required arguments for running this script." | ||
| echo "Please specify the Database type and TCK home directory." | ||
| echo "eg: ./process_db_config.sh Oracle " | ||
| exit 1 | ||
| fi | ||
|
|
||
| DB_TYPE=$2 | ||
| TS_HOME=$3 | ||
| DB_CFG_FILE="conf/${DB_TYPE}.cfg" | ||
|
|
||
| if [ ! -f "${DB_CFG_FILE}" ];then | ||
| echo "The specified Database type $DB_TYPE is not yet supported for running the TCK." | ||
| exit 1 | ||
| fi | ||
|
|
||
| while IFS="" read -r keyvalue_pair || [ -n "$keyvalue_pair" ] | ||
| do | ||
| if [[ \#* == $keyvalue_pair || -z $keyvalue_pair ]]; then | ||
| echo "Ignoring comment" | ||
| else | ||
| printf '%s\n' "$keyvalue_pair" | ||
| key=`echo $keyvalue_pair | cut -f1 -d=` | ||
| value=`echo $keyvalue_pair | cut -f2 -d=` | ||
| echo "Key: $key" | ||
| echo "Value: $value" | ||
| if [[ ! -z "$key" && ! -z "$value" ]]; then | ||
| sed -i "s#$key#$value#g" $TS_HOME/bin/ts.jte | ||
| fi | ||
| fi | ||
| done <${DB_CFG_FILE} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters