Author: rgemmell Date: 2011-07-11 07:55:43 -0400 (Mon, 11 Jul 2011) New Revision: 4465 Added: store/trunk/java/bdbstore/test-profiles/JavaBDBExcludes store/trunk/java/bdbstore/test-profiles/java-bdb-spawn.0-10.testprofile store/trunk/java/bdbstore/test-profiles/java-bdb-spawn.0-9-1.testprofile Removed: store/trunk/java/bdbstore/test-profiles/java-bdb.0.10.excludes store/trunk/java/bdbstore/test-profiles/java-bdb.0.10.testprofile store/trunk/java/bdbstore/test-profiles/java-bdb.excludes store/trunk/java/bdbstore/test-profiles/java-bdb.testprofile Log: refactor test profiles to account for changes to main broker codebase Copied: store/trunk/java/bdbstore/test-profiles/JavaBDBExcludes (from rev 4464, store/trunk/java/bdbstore/test-profiles/java-bdb.0.10.excludes) =================================================================== --- store/trunk/java/bdbstore/test-profiles/JavaBDBExcludes (rev 0) +++ store/trunk/java/bdbstore/test-profiles/JavaBDBExcludes 2011-07-11 11:55:43 UTC (rev 4465) @@ -0,0 +1,3 @@ +//This test is subclassed within the bdbstore module to enable it to run and +//also add some bdb-specific tests. It is excluded to prevent running twice. +org.apache.qpid.server.store.MessageStoreTest#* Copied: store/trunk/java/bdbstore/test-profiles/java-bdb-spawn.0-10.testprofile (from rev 4464, store/trunk/java/bdbstore/test-profiles/java-bdb.0.10.testprofile) =================================================================== --- store/trunk/java/bdbstore/test-profiles/java-bdb-spawn.0-10.testprofile (rev 0) +++ store/trunk/java/bdbstore/test-profiles/java-bdb-spawn.0-10.testprofile 2011-07-11 11:55:43 UTC (rev 4465) @@ -0,0 +1,13 @@ +broker.language=java +broker.type=spawned +broker.command=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml +broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work/* +broker.ready=BRK-1004 +broker.stopped=Exception +broker.config=${project.root}/build/etc/config-systests-bdb.xml +messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore +profile.excludes=JavaExcludes JavaPersistentExcludes Java010Excludes JavaBDBExcludes +broker.clean.between.tests=true +broker.persistent=true +broker.version=v0_10 + Copied: store/trunk/java/bdbstore/test-profiles/java-bdb-spawn.0-9-1.testprofile (from rev 4464, store/trunk/java/bdbstore/test-profiles/java-bdb.testprofile) =================================================================== --- store/trunk/java/bdbstore/test-profiles/java-bdb-spawn.0-9-1.testprofile (rev 0) +++ store/trunk/java/bdbstore/test-profiles/java-bdb-spawn.0-9-1.testprofile 2011-07-11 11:55:43 UTC (rev 4465) @@ -0,0 +1,18 @@ +broker.language=java +broker.type=spawned +broker.command=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml +broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work/* +broker.ready=BRK-1004 +broker.stopped=Exception +broker.config=${project.root}/build/etc/config-systests-bdb.xml +messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore +profile.excludes=JavaExcludes JavaPersistentExcludes JavaPre010Excludes JavaBDBExcludes +broker.clean.between.tests=true +broker.persistent=true +broker.protocol.excludes=--exclude-0-10 @PORT +broker.version=v0_9_1 +# +# Do not enable. Allow client to attempt 0-10 and negotiate downwards +# +#qpid.amqp.version=0-91 + Deleted: store/trunk/java/bdbstore/test-profiles/java-bdb.0.10.excludes =================================================================== --- store/trunk/java/bdbstore/test-profiles/java-bdb.0.10.excludes 2011-07-08 11:45:14 UTC (rev 4464) +++ store/trunk/java/bdbstore/test-profiles/java-bdb.0.10.excludes 2011-07-11 11:55:43 UTC (rev 4465) @@ -1,7 +0,0 @@ -#These tests are broken -org.apache.qpid.server.store.berkeleydb.QueueDeleteWhilstRoutingTest#* - -//This test is subclassed within the bdbstore module to enable it to run and -//also add some bdb-specific tests. It is excluded to prevent running twice. -org.apache.qpid.server.store.MessageStoreTest#* - Deleted: store/trunk/java/bdbstore/test-profiles/java-bdb.0.10.testprofile =================================================================== --- store/trunk/java/bdbstore/test-profiles/java-bdb.0.10.testprofile 2011-07-08 11:45:14 UTC (rev 4464) +++ store/trunk/java/bdbstore/test-profiles/java-bdb.0.10.testprofile 2011-07-11 11:55:43 UTC (rev 4465) @@ -1,12 +0,0 @@ -broker.version=0-10 -broker.language=java -broker=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml -broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work/* -broker.ready=BRK-1004 -broker.stopped=Exception -broker.config=${project.root}/build/etc/config-systests-bdb.xml -messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore -profile.excludes=JavaStandaloneExcludes JavaPersistentExcludes Java010Excludes 08StandaloneExcludes -broker.clean.between.tests=true -broker.persistent=true - Deleted: store/trunk/java/bdbstore/test-profiles/java-bdb.excludes =================================================================== --- store/trunk/java/bdbstore/test-profiles/java-bdb.excludes 2011-07-08 11:45:14 UTC (rev 4464) +++ store/trunk/java/bdbstore/test-profiles/java-bdb.excludes 2011-07-11 11:55:43 UTC (rev 4465) @@ -1,6 +0,0 @@ -//These tests are broken -org.apache.qpid.server.store.berkeleydb.QueueDeleteWhilstRoutingTest#* - -//This test is subclassed within the bdbstore module to enable it to run and -//also add some bdb-specific tests. It is excluded to prevent running twice. -org.apache.qpid.server.store.MessageStoreTest#* Deleted: store/trunk/java/bdbstore/test-profiles/java-bdb.testprofile =================================================================== --- store/trunk/java/bdbstore/test-profiles/java-bdb.testprofile 2011-07-08 11:45:14 UTC (rev 4464) +++ store/trunk/java/bdbstore/test-profiles/java-bdb.testprofile 2011-07-11 11:55:43 UTC (rev 4465) @@ -1,15 +0,0 @@ -broker.language=java -broker=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT --exclude-0-10 @PORT -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml -broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work/* -broker.ready=BRK-1004 -broker.stopped=Exception -broker.config=${project.root}/build/etc/config-systests-bdb.xml -messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore -profile.excludes=JavaStandaloneExcludes JavaPersistentExcludes 08StandaloneExcludes -broker.clean.between.tests=true -broker.persistent=true -# -# Do not enable. Allow client to attempt 0-10 and negotiate downwards -# -#qpid.amqp.version=0-91 -