Yair Zaslavsky has uploaded a new change for review. Change subject: core: Change rpmRevision field to be called rpmRelease ......................................................................
core: Change rpmRevision field to be called rpmRelease Change-Id: I98153d1770bf4d5b83b4bda12bf80169d65fe7c0 Signed-off-by: Yair Zaslavsky <[email protected]> --- M backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/RpmVersion.java M backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/RpmVersionTest.java M frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/ovirt/engine/core/compat/RpmVersion.java 3 files changed, 25 insertions(+), 24 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/69/18369/1 diff --git a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/RpmVersion.java b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/RpmVersion.java index 2dc6a61..8418165 100644 --- a/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/RpmVersion.java +++ b/backend/manager/modules/compat/src/main/java/org/ovirt/engine/core/compat/RpmVersion.java @@ -16,7 +16,7 @@ private static final String RPM_REGEX = "([^ ]+)\\-([0-9][^ \\-]*\\-[0-9\\.]+)\\.(.*)"; private static final Pattern rpmCompiled = Pattern.compile(RPM_REGEX); private String rpmName; - private String rpmRevision; + private String rpmRelease; public RpmVersion() { super(); @@ -30,7 +30,7 @@ public RpmVersion(String rpmName) { this.rpmName = rpmName; setValue(extractRpmVersion(rpmName)); - extractRpmRevision(rpmName); + extractRpmRelease(rpmName); } /** @@ -64,12 +64,12 @@ } else { raw = rpmName; } - extractRpmRevision(raw); + extractRpmRelease(raw); setValue(extractRpmVersion(raw.toCharArray())); } } - private void extractRpmRevision(String rpmName) { + private void extractRpmRelease(String rpmName) { if (rpmName == null || rpmName.isEmpty()) { return; } @@ -77,8 +77,7 @@ if (lastDashIndex == -1) { return; } - rpmRevision = rpmName.substring(lastDashIndex + 1); - + rpmRelease = rpmName.substring(lastDashIndex + 1); } public String getRpmName() { @@ -172,12 +171,12 @@ return true; } - public String getRpmRevision() { - return rpmRevision; + public String getRpmRelease() { + return rpmRelease; } - public void setRpmRevision(String rpmRevision) { - this.rpmRevision = rpmRevision; + public void setRpmRelease(String rpmRelease) { + this.rpmRelease = rpmRelease; } } diff --git a/backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/RpmVersionTest.java b/backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/RpmVersionTest.java index b95a225..083096f 100644 --- a/backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/RpmVersionTest.java +++ b/backend/manager/modules/compat/src/test/java/org/ovirt/engine/core/compat/RpmVersionTest.java @@ -41,12 +41,14 @@ } @Test - public void testRpmRevision() { - assertEquals(new RpmVersion("test-javadb-common-10.2.2.2.2-1.1.i386").getRpmRevision(), "1.1.i386"); - assertEquals(new RpmVersion("java-1.7.0-openjdk-devel-1.7.0.25-2.3.10.4.fc18.x86_64").getRpmRevision(), - "2.3.10.4.fc18.x86_64"); - assertEquals(new RpmVersion("rhev-agent-2.3.7.10.3-1.el6", "RHEV-Agent", true).getRpmRevision(), "1.el6"); - assertEquals(new RpmVersion("rhev-agent-2.3.7.10.3-1.el6", "rhev-agent", false).getRpmRevision(), "1.el6"); + public void testRpmRelease() { + assertEquals(new RpmVersion("ovirt-node-iso-2.6.0-20130212.fc18.noarch").getRpmRelease(), + "20130212"); + assertEquals(new RpmVersion("test-javadb-common-10.2.2.2.2-1.1.i386").getRpmRelease(), "1.1"); + assertEquals(new RpmVersion("java-1.7.0-openjdk-devel-1.7.0.25-2.3.10.4.fc18.x86_64").getRpmRelease(), + "2.3.10.4"); + assertEquals(new RpmVersion("rhev-agent-2.3.7.10.3-1.el6", "RHEV-Agent", true).getRpmRelease(), "1"); + assertEquals(new RpmVersion("rhev-agent-2.3.7.10.3-1.el6", "rhev-agent", false).getRpmRelease(), "1"); } @Test diff --git a/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/ovirt/engine/core/compat/RpmVersion.java b/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/ovirt/engine/core/compat/RpmVersion.java index 2742c35..296f0c2 100644 --- a/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/ovirt/engine/core/compat/RpmVersion.java +++ b/frontend/webadmin/modules/gwt-extension/src/main/java/org/ovirt/engine/ui/uioverrides/org/ovirt/engine/core/compat/RpmVersion.java @@ -16,16 +16,16 @@ return false; } else if (!rpmName.equals(other.rpmName)) return false; - if (rpmRevision == null) { - if (other.rpmRevision != null) + if (rpmRelease == null) { + if (other.rpmRelease != null) return false; - } else if (!rpmRevision.equals(other.rpmRevision)) + } else if (!rpmRelease.equals(other.rpmRelease)) return false; return true; } private String rpmName; - private String rpmRevision; + private String rpmRelease; public String getRpmName() { return this.rpmName; @@ -35,12 +35,12 @@ this.rpmName = rpmName; } - public String getRpmRevision() { - return this.rpmRevision; + public String getRpmRelease() { + return this.rpmRelease; } - public void setRpmRevision(String rpmRevision) { - this.rpmRevision = rpmRevision; + public void setRpmRelease(String rpmRelease) { + this.rpmRelease = rpmRelease; } -- To view, visit http://gerrit.ovirt.org/18369 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I98153d1770bf4d5b83b4bda12bf80169d65fe7c0 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yair Zaslavsky <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
