modules/core/domain/src/test/java/org/rhq/core/domain/drift/DriftConfigurationTest.java
| 20 +++++-----
modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java
| 8 ++--
2 files changed, 14 insertions(+), 14 deletions(-)
New commits:
commit 044113ead28a4449d07651e9f402eddac928c646
Author: John Sanda <jsanda(a)redhat.com>
Date: Tue Aug 30 21:42:31 2011 -0400
fixing test failures
diff --git
a/modules/core/domain/src/test/java/org/rhq/core/domain/drift/DriftConfigurationTest.java
b/modules/core/domain/src/test/java/org/rhq/core/domain/drift/DriftConfigurationTest.java
index 1cf29d6..b59dd01 100644
---
a/modules/core/domain/src/test/java/org/rhq/core/domain/drift/DriftConfigurationTest.java
+++
b/modules/core/domain/src/test/java/org/rhq/core/domain/drift/DriftConfigurationTest.java
@@ -1,12 +1,5 @@
package org.rhq.core.domain.drift;
-import static java.util.Arrays.asList;
-import static org.rhq.core.domain.drift.DriftConfigurationDefinition.PROP_BASEDIR;
-import static
org.rhq.core.domain.drift.DriftConfigurationDefinition.PROP_BASEDIR_VALUECONTEXT;
-import static
org.rhq.core.domain.drift.DriftConfigurationDefinition.PROP_BASEDIR_VALUENAME;
-import static
org.rhq.core.domain.drift.DriftConfigurationDefinition.BaseDirValueContext.fileSystem;
-import static org.testng.Assert.assertEquals;
-
import java.util.List;
import org.testng.annotations.Test;
@@ -18,6 +11,13 @@ import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.domain.drift.DriftConfigurationComparator.CompareMode;
import org.rhq.core.domain.drift.DriftConfigurationDefinition.BaseDirValueContext;
+import static java.util.Arrays.asList;
+import static
org.rhq.core.domain.drift.DriftConfigurationDefinition.BaseDirValueContext.fileSystem;
+import static org.rhq.core.domain.drift.DriftConfigurationDefinition.PROP_BASEDIR;
+import static
org.rhq.core.domain.drift.DriftConfigurationDefinition.PROP_BASEDIR_VALUECONTEXT;
+import static
org.rhq.core.domain.drift.DriftConfigurationDefinition.PROP_BASEDIR_VALUENAME;
+import static org.testng.Assert.assertEquals;
+
public class DriftConfigurationTest {
@Test
public void getCompareIgnoreIncludesExcludes() {
@@ -28,7 +28,7 @@ public class DriftConfigurationTest {
// make sure our comparator can deal with all the nulls that are in empty
configs
assert comparator.compare(dc1, dc2) == 0 : dc1 + " should equal " +
dc2;
- dc1.setEnabled(true);
+ dc1.setEnabled(false);
assert comparator.compare(dc1, dc2) != 0 : dc1 + " should not equal " +
dc2;
assert comparator.compare(dc2, dc1) != 0 : dc2 + " should not equal " +
dc1;
dc1.setInterval(1000L);
@@ -38,14 +38,14 @@ public class DriftConfigurationTest {
assert comparator.compare(dc1, dc2) != 0 : dc1 + " should not equal " +
dc2;
assert comparator.compare(dc2, dc1) != 0 : dc2 + " should not equal " +
dc1;
- dc2.setEnabled(true);
+ dc2.setEnabled(false);
dc2.setInterval(1000L);
dc2.setName("the-name");
assert comparator.compare(dc1, dc2) == 0 : dc1 + " should equal " +
dc2;
dc1.setEnabled(!dc2.isEnabled());
- assert comparator.compare(dc1, dc2) < 0 : dc1 + " should have different
enabled than " + dc2;
+ assert comparator.compare(dc1, dc2) > 0 : dc1 + " should have different
enabled than " + dc2;
dc1.setEnabled(dc2.isEnabled()); // put them back to the same value
dc1.setInterval(dc2.getInterval() + 2222L);
diff --git
a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java
b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java
index 511df03..ca9ee2a 100644
---
a/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java
+++
b/modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/resource/metadata/ResourceMetadataManagerBeanTest.java
@@ -168,7 +168,7 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest
{
for (ConfigurationTemplate drift : drifts) {
if (drift.getName().equals("drift-pc")) {
driftConfig = new DriftConfiguration(drift.getConfiguration());
- assertFalse(driftConfig.isEnabled());
+ assertTrue(driftConfig.isEnabled());
assertEquals(BaseDirValueContext.pluginConfiguration,
driftConfig.getBasedir().getValueContext());
assertEquals("connectionPropertyX",
driftConfig.getBasedir().getValueName());
assertEquals(123456L, driftConfig.getInterval());
@@ -185,7 +185,7 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest
{
assertEquals("", filter.getPattern());
} else if (drift.getName().equals("drift-fs")) {
driftConfig = new DriftConfiguration(drift.getConfiguration());
- assertFalse(driftConfig.isEnabled());
+ assertTrue(driftConfig.isEnabled());
assertEquals(BaseDirValueContext.fileSystem,
driftConfig.getBasedir().getValueContext());
assertEquals("/", driftConfig.getBasedir().getValueName());
assertEquals(DriftConfigurationDefinition.DEFAULT_INTERVAL,
driftConfig.getInterval());
@@ -290,7 +290,7 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest
{
for (ConfigurationTemplate drift : drifts) {
if (drift.getName().equals("drift-rc")) {
driftConfig = new DriftConfiguration(drift.getConfiguration());
- assertFalse(driftConfig.isEnabled());
+ assertTrue(driftConfig.isEnabled());
assertEquals(BaseDirValueContext.resourceConfiguration,
driftConfig.getBasedir().getValueContext());
assertEquals("resourceConfig1",
driftConfig.getBasedir().getValueName());
assertEquals(DriftConfigurationDefinition.DEFAULT_INTERVAL,
driftConfig.getInterval());
@@ -298,7 +298,7 @@ public class ResourceMetadataManagerBeanTest extends MetadataBeanTest
{
assertEquals(0, driftConfig.getExcludes().size());
} else if (drift.getName().equals("drift-mt")) {
driftConfig = new DriftConfiguration(drift.getConfiguration());
- assertFalse(driftConfig.isEnabled());
+ assertTrue(driftConfig.isEnabled());
assertEquals(BaseDirValueContext.measurementTrait,
driftConfig.getBasedir().getValueContext());
assertEquals("trait1",
driftConfig.getBasedir().getValueName());
assertEquals(DriftConfigurationDefinition.DEFAULT_INTERVAL,
driftConfig.getInterval());
Show replies by date