modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/performance/test/AvailabilityInsertPurgeTest.java | 2 +- modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/performance/test/EventsInsertPurgeTest.java | 2 +- modules/enterprise/server/jar/src/test/resources/perftest/AvailabilityInsertPurgeTest-testOne-data.xml.zip |binary modules/helpers/perftest-support/src/main/java/org/rhq/helpers/perftest/support/testng/DatabaseSetupInterceptor.java | 3 ++- 4 files changed, 4 insertions(+), 3 deletions(-)
New commits: commit ca25d496072ebaff5e7c79329eef950e647a40ea Author: Heiko W. Rupp hwr@redhat.com Date: Thu Oct 28 15:59:12 2010 +0200
Bump requested DB version and provide an updated data file, which adds the new column and a row for a call time metric.
diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/performance/test/AvailabilityInsertPurgeTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/performance/test/AvailabilityInsertPurgeTest.java index 1c35c5f..9bb6f0b 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/performance/test/AvailabilityInsertPurgeTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/performance/test/AvailabilityInsertPurgeTest.java @@ -60,7 +60,7 @@ import org.testng.annotations.Test; @Test(groups = "PERF" ) @Listeners({ DatabaseSetupInterceptor.class }) @PerformanceReporting(exporter=ExcelExporter.class) -@DatabaseState(url = "perftest/AvailabilityInsertPurgeTest-testOne-data.xml.zip", dbVersion="2.94") +@DatabaseState(url = "perftest/AvailabilityInsertPurgeTest-testOne-data.xml.zip", dbVersion="2.101") public class AvailabilityInsertPurgeTest extends AbstractEJB3PerformanceTest {
ResourceManagerLocal resourceManager; diff --git a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/performance/test/EventsInsertPurgeTest.java b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/performance/test/EventsInsertPurgeTest.java index 1b62820..0dcba79 100644 --- a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/performance/test/EventsInsertPurgeTest.java +++ b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/performance/test/EventsInsertPurgeTest.java @@ -60,7 +60,7 @@ import java.util.Set; @Test(groups = "PERF") @Listeners({ DatabaseSetupInterceptor.class }) @PerformanceReporting(exporter=ExcelExporter.class) -@DatabaseState(url = "perftest/AvailabilityInsertPurgeTest-testOne-data.xml.zip", dbVersion="2.94") +@DatabaseState(url = "perftest/AvailabilityInsertPurgeTest-testOne-data.xml.zip", dbVersion="2.101") public class EventsInsertPurgeTest extends AbstractEJB3PerformanceTest {
private static final int ROUNDS = 20000; diff --git a/modules/enterprise/server/jar/src/test/resources/perftest/AvailabilityInsertPurgeTest-testOne-data.xml.zip b/modules/enterprise/server/jar/src/test/resources/perftest/AvailabilityInsertPurgeTest-testOne-data.xml.zip index 811c952..70bd0ce 100644 Binary files a/modules/enterprise/server/jar/src/test/resources/perftest/AvailabilityInsertPurgeTest-testOne-data.xml.zip and b/modules/enterprise/server/jar/src/test/resources/perftest/AvailabilityInsertPurgeTest-testOne-data.xml.zip differ
commit d1b7036d96028993dcc9f49ffbb191a7e92b70bf Author: Heiko W. Rupp hwr@redhat.com Date: Thu Oct 28 15:33:31 2010 +0200
Be less verbose, but print the used database.
diff --git a/modules/helpers/perftest-support/src/main/java/org/rhq/helpers/perftest/support/testng/DatabaseSetupInterceptor.java b/modules/helpers/perftest-support/src/main/java/org/rhq/helpers/perftest/support/testng/DatabaseSetupInterceptor.java index 0dc7266..594627a 100644 --- a/modules/helpers/perftest-support/src/main/java/org/rhq/helpers/perftest/support/testng/DatabaseSetupInterceptor.java +++ b/modules/helpers/perftest-support/src/main/java/org/rhq/helpers/perftest/support/testng/DatabaseSetupInterceptor.java @@ -84,6 +84,7 @@ public class DatabaseSetupInterceptor implements IInvokedMethodListener { InputStreamProvider streamProvider = getInputStreamProvider(state.url(), state.storage(), method); IDatabaseConnection connection = new DatabaseDataSourceConnection(new InitialContext(), "java:/RHQDS"); + System.out.println("Using database at " + connection.getConnection().getMetaData().getURL());
setDatabaseType(connection);
@@ -162,7 +163,7 @@ public class DatabaseSetupInterceptor implements IInvokedMethodListener { // Filter out methods that are marked as setup/tear down Annotation[] annots = javaMethod.getAnnotations(); for (Annotation an : annots) { - System.out.println(" : " + an.toString()); +// System.out.println(" : " + an.toString()); if (an.annotationType().equals(BeforeMethod.class) || an.annotationType().equals(AfterMethod.class) || an.annotationType().equals(BeforeSuite.class) || an.annotationType().equals(AfterSuite.class) || an.annotationType().equals(BeforeTest.class) || an.annotationType().equals(AfterTest.class)