Allon Mureinik has uploaded a new change for review. Change subject: core: Consolidate Guid.createFromStringXXX impl ......................................................................
core: Consolidate Guid.createFromStringXXX impl Consolidated the implementation of Guid.createFromString(Stirng) and Guid.createFromStringDefaultEmpty(String), and added some unit tests to assure no functionality was broken. Change-Id: I91521dd873c6c9a3594ea601d79954e8915d1a00 Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/Guid.java M backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/GuidTest.java 2 files changed, 25 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/83/15883/1 diff --git a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/Guid.java b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/Guid.java index cbfbbdc..075bad8 100644 --- a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/Guid.java +++ b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/Guid.java @@ -55,15 +55,16 @@ } public static Guid createGuidFromString(String candidate) { - if (candidate == null) { - return null; - } - return new Guid(candidate); + return createGuidFromStringWithDefault(candidate, null); } public static Guid createGuidFromStringDefaultEmpty(String candidate) { + return createGuidFromStringWithDefault(candidate, Guid.Empty); + } + + private static Guid createGuidFromStringWithDefault(String candidate, Guid defaultValue) { if (candidate == null) { - return Guid.Empty; + return defaultValue; } return new Guid(candidate); } diff --git a/backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/GuidTest.java b/backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/GuidTest.java index 6a1fd12..f6c0ab7 100644 --- a/backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/GuidTest.java +++ b/backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/GuidTest.java @@ -1,4 +1,6 @@ package org.ovirt.engine.core.compat; + +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import org.junit.Test; @@ -17,4 +19,21 @@ assertTrue(guid2.compareTo(guid1) > 0); } + @Test + public void testStringCreation() { + Guid guid = Guid.newGuid(); + Guid guidFromString = new Guid(guid.toString()); + assertEquals(guidFromString, guid); + + guidFromString = Guid.createGuidFromString(guid.toString()); + assertEquals(guidFromString, guid); + guidFromString = Guid.createGuidFromString(null); + assertEquals(guidFromString, null); + + guidFromString = Guid.createGuidFromStringDefaultEmpty(guid.toString()); + assertEquals(guidFromString, guid); + guidFromString = Guid.createGuidFromStringDefaultEmpty(null); + assertEquals(guidFromString, Guid.Empty); + } + } -- To view, visit http://gerrit.ovirt.org/15883 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I91521dd873c6c9a3594ea601d79954e8915d1a00 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
