Allon Mureinik has uploaded a new change for review. Change subject: core: Clean up object serialization tests ......................................................................
core: Clean up object serialization tests Cleaned up ObjectStreamSerializerTest and ObjectDeserializerTest - there's no reason to catch an exception and fail the test, the exception should just be thrown and JUnit's framework should be allowed to fail it on its own. Change-Id: Ib92967d4a41b7b8dcdc4eaea45cb7bcbbdcf1de1 Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ObjectStreamDeserializerTest.java M backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ObjectStreamSerializerTest.java 2 files changed, 2 insertions(+), 16 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/36/14336/1 diff --git a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ObjectStreamDeserializerTest.java b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ObjectStreamDeserializerTest.java index 199c21e..6801b2f 100644 --- a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ObjectStreamDeserializerTest.java +++ b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ObjectStreamDeserializerTest.java @@ -1,13 +1,11 @@ package org.ovirt.engine.core.utils; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; import java.io.ByteArrayOutputStream; import java.io.ObjectOutputStream; import org.junit.Test; - import org.ovirt.engine.core.common.businessentities.StorageDomainOwnerType; import org.ovirt.engine.core.common.businessentities.StorageDomainStatus; import org.ovirt.engine.core.common.businessentities.StoragePoolIsoMap; @@ -16,8 +14,7 @@ public class ObjectStreamDeserializerTest { @Test - public void testDeserialize() { - try { + public void testDeserialize() throws Exception { ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); StoragePoolIsoMap isoMap = new StoragePoolIsoMap(); isoMap.setstorage_id(Guid.NewGuid()); @@ -29,9 +26,5 @@ ObjectStreamDeserializer deserializer = new ObjectStreamDeserializer(); StoragePoolIsoMap readEntity = deserializer.deserialize(bytes, StoragePoolIsoMap.class); assertEquals(isoMap, readEntity); - } catch (Exception ex) { - assertTrue(ex.getMessage(), false); - } - } } diff --git a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ObjectStreamSerializerTest.java b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ObjectStreamSerializerTest.java index 371a7c0..c30a5a3 100644 --- a/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ObjectStreamSerializerTest.java +++ b/backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/ObjectStreamSerializerTest.java @@ -1,13 +1,11 @@ package org.ovirt.engine.core.utils; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; import java.io.ByteArrayInputStream; import java.io.ObjectInputStream; import org.junit.Test; - import org.ovirt.engine.core.common.businessentities.StorageDomainOwnerType; import org.ovirt.engine.core.common.businessentities.StorageDomainStatus; import org.ovirt.engine.core.common.businessentities.StoragePoolIsoMap; @@ -16,8 +14,7 @@ public class ObjectStreamSerializerTest { @Test - public void testSerialize() { - try { + public void testSerialize() throws Exception { ObjectStreamSerializer serializer = new ObjectStreamSerializer(); StoragePoolIsoMap isoMap = new StoragePoolIsoMap(); isoMap.setstorage_id(Guid.NewGuid()); @@ -28,9 +25,5 @@ StoragePoolIsoMap readEntity = (StoragePoolIsoMap) new ObjectInputStream(new ByteArrayInputStream(bytes)).readObject(); assertEquals(isoMap, readEntity); - } catch (Exception ex) { - assertTrue(ex.getMessage(), false); - } - } } -- To view, visit http://gerrit.ovirt.org/14336 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib92967d4a41b7b8dcdc4eaea45cb7bcbbdcf1de1 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
