modules/core/domain/src/test/java/org/rhq/core/domain/test/AbstractEJB3Test.java | 9 +++++++++ modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/GenericJBossAS7PluginTest.java | 6 ++++++ 2 files changed, 15 insertions(+)
New commits: commit c9d13f6b1cc8745c11e047be4c55786a8b9ca16c Author: Heiko W. Rupp hwr@redhat.com Date: Thu Nov 22 09:10:41 2012 +0100
Add some excluded metrics, as they may indeed return null.
diff --git a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/GenericJBossAS7PluginTest.java b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/GenericJBossAS7PluginTest.java index 2b7ec7a..0bf2796 100644 --- a/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/GenericJBossAS7PluginTest.java +++ b/modules/plugins/jboss-as-7/src/test/java/org/rhq/modules/plugins/jbossas7/itest/GenericJBossAS7PluginTest.java @@ -23,6 +23,7 @@ import java.util.Map;
import org.testng.annotations.Test;
+import org.rhq.core.domain.resource.ResourceCategory; import org.rhq.core.domain.resource.ResourceType; import org.rhq.core.plugin.testutil.AbstractAgentPluginTest; import org.rhq.modules.plugins.jbossas7.itest.domain.ManagedServerTest; @@ -53,6 +54,11 @@ public class GenericJBossAS7PluginTest extends AbstractJBossAS7PluginTest { // It's normal for the "startTime" trait to be null for a Managed Server that is down/disabled. // It's normal for the "multicastAddress" trait to be null for a Managed Server that is not configured for JGroups HA. excludedMetricNamesByType.put(ManagedServerTest.RESOURCE_TYPE, new String[] {"startTime", "multicastAddress"}); + // Some memory pools do not expose those statistics (by default), so in case they + // are not exposed, it is normal that the server returns 'undefined' for the value + // Note that those + excludedMetricNamesByType.put(new ResourceType("Memory Pool Resource",PLUGIN_NAME, ResourceCategory.SERVICE,null), + new String[] {"collection-usage-threshold-count","collection-usage-threshold","collection-usage"}); assertAllNumericMetricsAndTraitsHaveNonNullValues(excludedMetricNamesByType); }
commit 94e78de367b5472188fcad8425b0e057f8d602af Author: Heiko W. Rupp hwr@redhat.com Date: Tue Nov 20 10:31:32 2012 +0100
Print the DB-url and user that is used to run the tests to make debugging easier.
diff --git a/modules/core/domain/src/test/java/org/rhq/core/domain/test/AbstractEJB3Test.java b/modules/core/domain/src/test/java/org/rhq/core/domain/test/AbstractEJB3Test.java index 82af5e0..b57f661 100644 --- a/modules/core/domain/src/test/java/org/rhq/core/domain/test/AbstractEJB3Test.java +++ b/modules/core/domain/src/test/java/org/rhq/core/domain/test/AbstractEJB3Test.java @@ -24,6 +24,7 @@ package org.rhq.core.domain.test;
import java.io.File; import java.net.URL; +import java.sql.DatabaseMetaData; import java.util.Date; import java.util.Hashtable;
@@ -79,6 +80,7 @@ public abstract class AbstractEJB3Test extends AssertJUnit {
deployer.start(); System.err.println("...... deployer started...."); + printDbVersion(); } catch (Throwable t) { // Catch RuntimeExceptions and Errors and dump their stack trace, because Surefire will completely swallow them // and throw a cryptic NPE (see http://jira.codehaus.org/browse/SUREFIRE-157)! @@ -100,6 +102,13 @@ public abstract class AbstractEJB3Test extends AssertJUnit { return lookupEntityManager(); }
+ private static void printDbVersion() throws Exception { + EntityManager em = lookupEntityManager(); + DatabaseMetaData md = ((org.hibernate.ejb.EntityManagerImpl) em).getSession().connection().getMetaData(); + System.err.println(">>> Database url for testing is [" + md.getURL() + "] with user [" + md.getUserName() + "] <<<"); + + } + public boolean isPostgres(EntityManager em) throws Exception { return ((org.hibernate.ejb.EntityManagerImpl) em).getSession().connection().getMetaData() .getDatabaseProductName().toLowerCase().indexOf("postgres") > -1;