modules/core/domain/src/test/java/org/rhq/core/domain/configuration/ConfigurationTest.java
| 26 ++--------
1 file changed, 7 insertions(+), 19 deletions(-)
New commits:
commit a6ef40107c68996f85a6d433c483657d11aed289
Author: John Sanda <john(a)localhost.localdomain>
Date: Fri Nov 27 12:05:11 2009 -0500
Refactoring tests to use common TestUtil class that now contains the
serializeAndDeserialize() method that was formerly a private helper method.
diff --git
a/modules/core/domain/src/test/java/org/rhq/core/domain/configuration/ConfigurationTest.java
b/modules/core/domain/src/test/java/org/rhq/core/domain/configuration/ConfigurationTest.java
index 72da7c0..3da4922 100644
---
a/modules/core/domain/src/test/java/org/rhq/core/domain/configuration/ConfigurationTest.java
+++
b/modules/core/domain/src/test/java/org/rhq/core/domain/configuration/ConfigurationTest.java
@@ -465,7 +465,7 @@ public class ConfigurationTest {
Configuration config = new Configuration();
config.setId(id);
- Configuration serializedConfig = serializeAndDeserialize(config);
+ Configuration serializedConfig = TestUtil.serializeAndDeserialize(config);
assertEquals(serializedConfig.getId(), id, "Failed to properly serialize the
id property");
}
@@ -495,7 +495,7 @@ public class ConfigurationTest {
Configuration config = new Configuration();
config.put(new PropertySimple("x", "1"));
- Configuration serializedConfig = serializeAndDeserialize(config);
+ Configuration serializedConfig = TestUtil.serializeAndDeserialize(config);
assertEquals(serializedConfig.getMap(), config.getMap(), "Failed to property
serialize the map property");
}
@@ -526,7 +526,7 @@ public class ConfigurationTest {
Configuration config = new Configuration();
config.setNotes("notes");
- Configuration serializedConfig = serializeAndDeserialize(config);
+ Configuration serializedConfig = TestUtil.serializeAndDeserialize(config);
assertEquals(serializedConfig.getNotes(), config.getNotes(), "Failed to
properly serialize the notes property");
}
@@ -556,7 +556,7 @@ public class ConfigurationTest {
Configuration config = new Configuration();
config.setVersion(1L);
- Configuration serializedConfig = serializeAndDeserialize(config);
+ Configuration serializedConfig = TestUtil.serializeAndDeserialize(config);
assertEquals(
serializedConfig.getVersion(),
@@ -590,7 +590,7 @@ public class ConfigurationTest {
Configuration config = new Configuration();
updateModifiedTime(config);
- Configuration serializedConfig = serializeAndDeserialize(config);
+ Configuration serializedConfig = TestUtil.serializeAndDeserialize(config);
assertEquals(
@@ -625,7 +625,7 @@ public class ConfigurationTest {
Configuration config = new Configuration();
updateCreatedTime(config);
- Configuration serializedConfig = serializeAndDeserialize(config);
+ Configuration serializedConfig = TestUtil.serializeAndDeserialize(config);
assertEquals(
serializedConfig.getCreatedTime(),
@@ -660,7 +660,7 @@ public class ConfigurationTest {
config.addRawConfiguration(createRawConfiguration("/tmp/foo.txt"));
config.addRawConfiguration(createRawConfiguration("/tmp/bar.txt"));
- Configuration serializedConfig = serializeAndDeserialize(config);
+ Configuration serializedConfig = TestUtil.serializeAndDeserialize(config);
assertRawConfigurationsEquals(
serializedConfig.getRawConfigurations(),
@@ -677,16 +677,4 @@ public class ConfigurationTest {
config.onPersist();
}
- private Configuration serializeAndDeserialize(Configuration config) throws Exception
{
- ByteArrayOutputStream byteOutputStream = new ByteArrayOutputStream();
- ObjectOutputStream ostream = new ObjectOutputStream(byteOutputStream);
-
- ostream.writeObject(config);
-
- ByteArrayInputStream byteInputStream = new
ByteArrayInputStream(byteOutputStream.toByteArray());
- ObjectInputStream istream = new ObjectInputStream(byteInputStream);
-
- return (Configuration) istream.readObject();
- }
-
}
Show replies by date