modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/performance/test/AvailabilityInsertPurgeTest.java
| 4 +---
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/performance/test/EventsInsertPurgeTest.java
| 3 +--
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3PerformanceTest.java
| 1 -
modules/helpers/perftest-support/src/main/java/org/rhq/helpers/perftest/support/reporting/ExcelExporter.java
| 5 ++++-
modules/helpers/perftest-support/src/main/java/org/rhq/helpers/perftest/support/testng/DatabaseSetupInterceptor.java
| 2 --
5 files changed, 6 insertions(+), 9 deletions(-)
New commits:
commit b5fd30f9a7c1ce7e79f9aaab2130a096012a49c6
Merge: 22e236a... 75e5b1b...
Author: John Sanda <jsanda(a)redhat.com>
Date: Wed Oct 27 09:02:14 2010 -0400
Merge branch 'master' into delete-agent-plugin
commit 75e5b1b2a50369a4951cdc59c9b2deebe807ea8e
Merge: 3602a25... 6f81d33...
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed Oct 27 14:56:14 2010 +0200
Merge branch 'master' of
ssh://git.fedorahosted.org/git/rhq/rhq
commit 3602a2549e5278591129f31effe1f6ed53ca8120
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Mon Oct 25 10:03:57 2010 +0200
Small cleanup.
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 1c5bbb2..1c35c5f 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
@@ -77,7 +77,6 @@ public class AvailabilityInsertPurgeTest extends
AbstractEJB3PerformanceTest {
@BeforeMethod
public void beforeMethod() {
Date now = new Date();
- System.out.println(">>>>> beforeMethod (AI Purge Test) ===
" + now.getTime());
try {
this.availabilityManager = LookupUtil.getAvailabilityManager();
this.resourceManager = LookupUtil.getResourceManager();
@@ -109,7 +108,6 @@ public class AvailabilityInsertPurgeTest extends
AbstractEJB3PerformanceTest {
Subject overlord = LookupUtil.getSubjectManager().getOverlord();
Date now = new Date();
- System.out.println(">>>>>>> testAlternating (AI Purge
Test) === " + now.getTime());
EntityManager em = getEntityManager();
Query q = em.createQuery("SELECT r FROM Resource r");
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 0332905..1b62820 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
@@ -80,7 +80,6 @@ public class EventsInsertPurgeTest extends AbstractEJB3PerformanceTest
{
@BeforeMethod
public void beforeMethod() {
Date now = new Date();
- System.out.println(">>>>> beforeMethod (AI Purge Test) ===
" + now.getTime());
try {
this.availabilityManager = LookupUtil.getAvailabilityManager();
this.resourceManager = LookupUtil.getResourceManager();
diff --git
a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3PerformanceTest.java
b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3PerformanceTest.java
index 280db19..b38d934 100644
---
a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3PerformanceTest.java
+++
b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/test/AbstractEJB3PerformanceTest.java
@@ -99,7 +99,6 @@ public class AbstractEJB3PerformanceTest extends AbstractEJB3Test {
@AfterMethod
protected void reportTimings(ITestResult result, Method meth) {
Date now = new Date();
- System.out.println(">>> after " + meth.getName() + "
(AbstraceEJB3PerformanceTest) === " + now.getTime());
printTimings(meth.getName());
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 d7f10ef..9efbdff 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
@@ -78,7 +78,6 @@ public class DatabaseSetupInterceptor implements IInvokedMethodListener
{
}
Date now = new Date();
- System.out.println(">> beforeInvocation(DBInterceptor) " +
method.getTestMethod().getMethodName() + " == " + now.getTime());
try {
@@ -133,7 +132,6 @@ public class DatabaseSetupInterceptor implements
IInvokedMethodListener {
}
Date now = new Date();
- System.out.println(">> afterInvocation(DBInterceptor) == " +
method.getTestMethod().getMethodName() + " === " + now.getTime()); //nothing to
do
try {
IDatabaseConnection connection = new DatabaseDataSourceConnection(new
InitialContext(),
commit b1200d28b0ac40586602ac469eaf239b84b11ea0
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Fri Oct 22 15:54:25 2010 +0200
Put stuff into target/
diff --git
a/modules/helpers/perftest-support/src/main/java/org/rhq/helpers/perftest/support/reporting/ExcelExporter.java
b/modules/helpers/perftest-support/src/main/java/org/rhq/helpers/perftest/support/reporting/ExcelExporter.java
index 1314ce8..910670d 100644
---
a/modules/helpers/perftest-support/src/main/java/org/rhq/helpers/perftest/support/reporting/ExcelExporter.java
+++
b/modules/helpers/perftest-support/src/main/java/org/rhq/helpers/perftest/support/reporting/ExcelExporter.java
@@ -42,6 +42,7 @@ import java.util.TreeSet;
public class ExcelExporter implements PerformanceReportExporter {
private static final String DOT_XLS = ".xls";
+ static final String TARGET = "target/";
String baseFileName ;
PerformanceReporting.Rolling rolling;
CellStyle integerStyle;
@@ -49,7 +50,9 @@ public class ExcelExporter implements PerformanceReportExporter {
@Override
public void setBaseFile(String fileName) {
- baseFileName = fileName;
+ baseFileName = fileName;
+ if (baseFileName.startsWith(TARGET))
+ baseFileName = TARGET + baseFileName;
}
@Override
commit 548bcc3fc7e81012bed6d8bf38626c1679aa8430
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Fri Oct 22 15:52:56 2010 +0200
Re-enable
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 44e61f5..1c5bbb2 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
@@ -57,7 +57,7 @@ import org.testng.annotations.Test;
* @author Heiko W. Rupp
* @author Lukas Krejci
*/
-@Test(groups = "PERF" , enabled = false)
+@Test(groups = "PERF" )
@Listeners({ DatabaseSetupInterceptor.class })
@PerformanceReporting(exporter=ExcelExporter.class)
@DatabaseState(url =
"perftest/AvailabilityInsertPurgeTest-testOne-data.xml.zip",
dbVersion="2.94")
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 3df95dd..0332905 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
@@ -57,7 +57,7 @@ import java.util.Set;
*
* @author Heiko W. Rupp
*/
-@Test(groups = "PERF", enabled = false)
+@Test(groups = "PERF")
@Listeners({ DatabaseSetupInterceptor.class })
@PerformanceReporting(exporter=ExcelExporter.class)
@DatabaseState(url =
"perftest/AvailabilityInsertPurgeTest-testOne-data.xml.zip",
dbVersion="2.94")