modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/ChangeSetManagerImplTest.java
| 8 --------
modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftDetectorTest.java
| 10 ++++++----
2 files changed, 6 insertions(+), 12 deletions(-)
New commits:
commit 180a7eb872e0c09b61da70eef8a756676d262334
Author: John Sanda <jsanda(a)redhat.com>
Date: Wed Jun 29 16:24:05 2011 -0400
Fixing failing test
Test method broke as a result of the changes to the basedir property in
DriftConfiguration. It is no longer stored as a simple property and the
test was creating a config using a simple property for the basedir.
diff --git
a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/ChangeSetManagerImplTest.java
b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/ChangeSetManagerImplTest.java
index 997e65f..2cb74a2 100644
---
a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/ChangeSetManagerImplTest.java
+++
b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/ChangeSetManagerImplTest.java
@@ -67,14 +67,6 @@ public class ChangeSetManagerImplTest {
assertReaderOpenedOnChangeSet(reader, asList("server/conf",
"1"));
}
- DriftConfiguration driftConfiguration(String name, String basedir) {
- Configuration config = new Configuration();
- config.put(new PropertySimple("name", name));
- config.put(new PropertySimple("basedir", basedir));
-
- return new DriftConfiguration(config);
- }
-
/**
* Verifies that a {@link ChangeSetReader} has been opened on the expected change
set.
* This method first verifies that the reader is not null. It then reads the first
diff --git
a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftDetectorTest.java
b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftDetectorTest.java
index dfed1e2..b5f9bd2 100644
---
a/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftDetectorTest.java
+++
b/modules/core/plugin-container/src/test/java/org/rhq/core/pc/drift/DriftDetectorTest.java
@@ -3,6 +3,7 @@ package org.rhq.core.pc.drift;
import static org.apache.commons.io.FileUtils.deleteDirectory;
import static org.apache.commons.io.IOUtils.readLines;
import static org.rhq.core.domain.drift.DriftChangeSetCategory.COVERAGE;
+import static
org.rhq.core.domain.drift.DriftConfigurationDefinition.BaseDirValueContext.fileSystem;
import static org.testng.Assert.assertEquals;
import static org.unitils.thirdparty.org.apache.commons.io.FileUtils.touch;
@@ -24,6 +25,7 @@ import org.rhq.common.drift.DirectoryEntry;
import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.domain.drift.DriftConfiguration;
+import org.rhq.core.domain.drift.DriftConfigurationDefinition;
import org.rhq.test.JMockTest;
public class DriftDetectorTest extends JMockTest {
@@ -93,11 +95,11 @@ public class DriftDetectorTest extends JMockTest {
}
DriftConfiguration driftConfiguration(String name, String basedir) {
- Configuration config = new Configuration();
- config.put(new PropertySimple("name", name));
- config.put(new PropertySimple("basedir", basedir));
+ DriftConfiguration config = new DriftConfiguration(new Configuration());
+ config.setName(name);
+ config.setBasedir(config.new BaseDirectory(fileSystem, basedir));
- return new DriftConfiguration(config);
+ return config;
}
void assertHeaderEquals(List<String> lines, String... expected) {
Show replies by date