Skip to content
Snippets Groups Projects
Commit 3f2354da authored by srosse's avatar srosse
Browse files

FXOLAT-376: check the unit tests configuration and fix an error in the olat.eclipse.properties

parent 6046d509
No related branches found
No related tags found
No related merge requests found
...@@ -2,16 +2,19 @@ ...@@ -2,16 +2,19 @@
# #
# This olat.local.properties file is only used when running junit tests! (Unit tests run in its own classpath environment) # This olat.local.properties file is only used when running junit tests! (Unit tests run in its own classpath environment)
# Use this file to set properties that affect or are a prerequisite for your tests. # Use this file to set properties that affect or are a prerequisite for your tests.
# from test/profile/hsql #
######################### #########################
db.vendor=test db.vendor=test
defaultlang=de defaultlang=de
db.show_sql=false db.show_sql=false
#force use of java.io.tmpDir for unit tests
archive.dir= archive.dir=
log.dir= log.dir=
folder.root= folder.root=
instance.id=${test.env.instance.id}
generate.index.at.startup=false generate.index.at.startup=false
# for UserTest # for UserTest
...@@ -20,19 +23,23 @@ keepUserLoginAfterDeletion=true ...@@ -20,19 +23,23 @@ keepUserLoginAfterDeletion=true
# do not run upgrades and scheduled jobs and such # do not run upgrades and scheduled jobs and such
cluster.singleton.services = disabled cluster.singleton.services = disabled
jmx.rmi.port=${test.env.jmx.rmi.port.0}
# SingleVM jms.broker.url # SingleVM jms.broker.url
jms.broker.url=vm://embedded?broker.persistent=false jms.broker.url=vm://embedded?broker.persistent=false
search.broker.url=vm://embedded?broker.persistent=false search.broker.url=vm://embedded?broker.persistent=false
codepoint.jms.broker.url=vm://embedded?broker.persistent=false codepoint.jms.broker.url=vm://embedded?broker.persistent=false
# Cluster (remote) jms.broker.url # Cluster (remote) jms.broker.url
#jms.broker.url=failover:(tcp://localhost:61616?wireFormat.maxInactivityDuration=0) #jms.broker.url=failover:(tcp://localhost:${test.env.jms.broker.port}?wireFormat.maxInactivityDuration=0)
#search.broker.url=failover:(tcp://localhost:61616?wireFormat.maxInactivityDuration=0) #search.broker.url=failover:(tcp://localhost:${test.env.jms.broker.port}?wireFormat.maxInactivityDuration=0)
#codepoint.jms.broker.url=failover:(tcp://localhost:61616?wireFormat.maxInactivityDuration=0) #codepoint.jms.broker.url=failover:(tcp://localhost:${test.env.jms.broker.port}?wireFormat.maxInactivityDuration=0)
# enable/disable codepoint/breakpoint framework # enable/disable codepoint/breakpoint framework
codepoint_server.enabled=true codepoint_server.enabled=true
smtp.host=testing
#
# #
# if you like to run your tests against mysql just uncomment the following. Please do not commit it! # if you like to run your tests against mysql just uncomment the following. Please do not commit it!
# #
......
...@@ -7,6 +7,10 @@ ...@@ -7,6 +7,10 @@
defaultlang=de defaultlang=de
db.show_sql=false db.show_sql=false
#force use of java.io.tmpDir for unit tests
archive.dir=
log.dir=
folder.root=
instance.id=2 instance.id=2
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
defaultlang=de defaultlang=de
db.show_sql=false db.show_sql=false
#force use of java.io.tmpDir for unit tests
archive.dir= archive.dir=
log.dir= log.dir=
folder.root= folder.root=
...@@ -41,15 +42,10 @@ smtp.host=testing ...@@ -41,15 +42,10 @@ smtp.host=testing
# #
# if you like to run your tests against mysql just uncomment the following. Please do not commit it! # if you like to run your tests against mysql just uncomment the following. Please do not commit it!
# #
db.vendor=mysql db.vendor=mysql
#
#
db.name=${test.env.db.name} db.name=${test.env.db.name}
db.user=${test.env.db.user} db.user=${test.env.db.user}
db.pass=${test.env.db.pass} db.pass=${test.env.db.pass}
db.host.port=${test.env.db.host.port} db.host.port=${test.env.db.host.port}
#
db.database.dialect=org.hibernate.dialect.MySQL5InnoDBDialect db.database.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
#
db.hibernate.ddl.auto=${test.env.db.hibernate.ddl.auto} db.hibernate.ddl.auto=${test.env.db.hibernate.ddl.auto}
...@@ -7,6 +7,10 @@ ...@@ -7,6 +7,10 @@
defaultlang=de defaultlang=de
db.show_sql=false db.show_sql=false
#force use of java.io.tmpDir for unit tests
archive.dir=
log.dir=
folder.root=
instance.id=2 instance.id=2
......
...@@ -7,9 +7,11 @@ ...@@ -7,9 +7,11 @@
defaultlang=de defaultlang=de
db.show_sql=false db.show_sql=false
#force use of java.io.tmpDir for unit tests
archive.dir= archive.dir=
log.dir= log.dir=
folder.root= folder.root=
instance.id=${test.env.instance.id} instance.id=${test.env.instance.id}
generate.index.at.startup=false generate.index.at.startup=false
...@@ -40,15 +42,10 @@ smtp.host=testing ...@@ -40,15 +42,10 @@ smtp.host=testing
# #
# if you like to run your tests against mysql just uncomment the following. Please do not commit it! # if you like to run your tests against mysql just uncomment the following. Please do not commit it!
# #
db.vendor=postgresql db.vendor=postgresql
#
#
db.name=${test.env.db.name} db.name=${test.env.db.name}
db.user=${test.env.db.postgresql.user} db.user=${test.env.db.postgresql.user}
db.pass=${test.env.db.postgresql.pass} db.pass=${test.env.db.postgresql.pass}
db.host.port=${test.env.db.postgresql.host.port} db.host.port=${test.env.db.postgresql.host.port}
#
db.database.dialect=org.hibernate.dialect.PostgreSQLDialect db.database.dialect=org.hibernate.dialect.PostgreSQLDialect
#
db.hibernate.ddl.auto=${test.env.db.hibernate.ddl.auto} db.hibernate.ddl.auto=${test.env.db.hibernate.ddl.auto}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment