Fix vlanIdModified test

OvsVlanMemberConfigUpdateHelper.vlanIdModified() has an apparent
copy-paste error in its null/non-null check. The whole test simplifies
down to !Object.equals(), so this patch just uses that.

Change-Id: I6b3548da5441e8318cf20eab3f4817d162c97fa6
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/renderer/ovs/confighelpers/OvsVlanMemberConfigUpdateHelper.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/renderer/ovs/confighelpers/OvsVlanMemberConfigUpdateHelper.java
index 285b236fa8c29c0206048c990922cfedd2f69be4..49149419a5ff96ae6fc6c3674d675d54780fa39e 100644 (file)
--- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/renderer/ovs/confighelpers/OvsVlanMemberConfigUpdateHelper.java
+++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/renderer/ovs/confighelpers/OvsVlanMemberConfigUpdateHelper.java
@@ -10,6 +10,7 @@ package org.opendaylight.genius.interfacemanager.renderer.ovs.confighelpers;
 import com.google.common.util.concurrent.ListenableFuture;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
@@ -103,13 +104,6 @@ public class OvsVlanMemberConfigUpdateHelper {
     }
 
     public static boolean vlanIdModified(VlanId vlanIdOld, VlanId vlanIdNew) {
-        if (vlanIdOld != null && vlanIdNew == null || vlanIdOld == null && vlanIdOld != null) {
-            return true;
-        }
-
-        if (vlanIdOld != null && vlanIdNew != null && !vlanIdOld.equals(vlanIdNew)) {
-            return true;
-        }
-        return false;
+        return !Objects.equals(vlanIdOld, vlanIdNew);
     }
 }

diff --git a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/renderer/ovs/confighelpers/OvsVlanMemberConfigUpdateHelperTest.java b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/renderer/ovs/confighelpers/OvsVlanMemberConfigUpdateHelperTest.java
new file mode 100644 (file)
index 0000000..3c97cd6
--- /dev/null
+++ b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/renderer/ovs/confighelpers/OvsVlanMemberConfigUpdateHelperTest.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright © 2017 Red Hat, Inc. and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.opendaylight.genius.interfacemanager.renderer.ovs.confighelpers;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.l2.types.rev130827.VlanId;
+
+/**
+ * Unit tests for {@link OvsVlanMemberConfigUpdateHelper}.
+ */
+public class OvsVlanMemberConfigUpdateHelperTest {
+    @Test
+    public void testVlanIdModified() {
+        VlanId vlanId1 = new VlanId(1);
+        VlanId vlanId2 = new VlanId(2);
+        assertFalse(OvsVlanMemberConfigUpdateHelper.vlanIdModified(null, null));
+        assertTrue(OvsVlanMemberConfigUpdateHelper.vlanIdModified(null, vlanId2));
+        assertTrue(OvsVlanMemberConfigUpdateHelper.vlanIdModified(vlanId1, null));
+        assertFalse(OvsVlanMemberConfigUpdateHelper.vlanIdModified(vlanId1, vlanId1));
+        assertTrue(OvsVlanMemberConfigUpdateHelper.vlanIdModified(vlanId1, vlanId2));
+    }
+}