Skip to content

Move test database properties to test resources #3628

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
duanemay wants to merge 1 commit into
base: develop
Choose a base branch
from
+38 −17
Draft

Move test database properties to test resources #3628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions server/src/main/resources/application-mysql.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,2 @@
# These used to be in env.xml ; they look like test properties
database.driverClassName=org.mariadb.jdbc.Driver
database.username=root
database.password=changeme
database.maxParameters=-1
database.useSkipLocked=false
# mysql defaults to true
database.caseinsensitive=true
database.default-url=jdbc:mysql://127.0.0.1:3306/uaa?useSSL=true&trustServerCertificate=true
# This file is required by: org.cloudfoundry.identity.uaa.db.beans.DatabaseConfiguration
database.driverClassName=org.mariadb.jdbc.Driver
10 changes: 2 additions & 8 deletions server/src/main/resources/application-postgresql.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,2 @@
# These used to be in env.xml ; they look like test properties
database.driverClassName=org.postgresql.Driver
database.username=root
database.password=changeme
database.maxParameters=32767
database.useSkipLocked=true
database.caseinsensitive=false
database.default-url=jdbc:postgresql:uaa
# This file is required by : org.cloudfoundry.identity.uaa.db.beans.DatabaseConfiguration
database.driverClassName=org.postgresql.Driver
9 changes: 9 additions & 0 deletions server/src/test/resources/application-mysql.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# These used to be in env.xml ; they look like test properties
database.driverClassName=org.mariadb.jdbc.Driver
database.username=root
database.password=changeme
database.maxParameters=-1
database.useSkipLocked=false
# mysql defaults to true
database.caseinsensitive=true
database.default-url=jdbc:mysql://127.0.0.1:3306/uaa?useSSL=true&trustServerCertificate=true
8 changes: 8 additions & 0 deletions server/src/test/resources/application-postgresql.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# These used to be in env.xml ; they look like test properties
database.driverClassName=org.postgresql.Driver
database.username=root
database.password=changeme
database.maxParameters=32767
database.useSkipLocked=true
database.caseinsensitive=false
database.default-url=jdbc:postgresql:uaa
9 changes: 9 additions & 0 deletions uaa/src/test/resources/application-mysql.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# These used to be in env.xml ; they look like test properties
database.driverClassName=org.mariadb.jdbc.Driver
database.username=root
database.password=changeme
database.maxParameters=-1
database.useSkipLocked=false
# mysql defaults to true
database.caseinsensitive=true
database.default-url=jdbc:mysql://127.0.0.1:3306/uaa?useSSL=true&trustServerCertificate=true
8 changes: 8 additions & 0 deletions uaa/src/test/resources/application-postgresql.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# These used to be in env.xml ; they look like test properties
database.driverClassName=org.postgresql.Driver
database.username=root
database.password=changeme
database.maxParameters=32767
database.useSkipLocked=true
database.caseinsensitive=false
database.default-url=jdbc:postgresql:uaa
Loading