Drop unneeded generic type specifiers

[yangtools.git] / yang / yang-model-util / src / test / java / org / opendaylight / yangtools / yang / model / util / MustDefinitionImplTest.java

diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/MustDefinitionImplTest.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/MustDefinitionImplTest.java
index 838d795cd775ef7017f907a9fead5f06487b7972..20c7b37d497b897b421869a5a01a967d7d459815 100644 (file)
--- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/MustDefinitionImplTest.java
+++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/MustDefinitionImplTest.java
@@ -10,13 +10,14 @@ package org.opendaylight.yangtools.yang.model.util;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 
-import org.junit.Test;
-
 import com.google.common.base.Optional;
+import org.junit.Test;
 
 public class MustDefinitionImplTest {
 
     @Test
+    // We're testing equals()
+    @SuppressWarnings({"ObjectEqualsNull", "EqualsBetweenInconvertibleTypes"})
     public void test() {
         MustDefinitionImpl mdiA;
         MustDefinitionImpl mdiB;
@@ -24,7 +25,7 @@ public class MustDefinitionImplTest {
 
         assertEquals("mdiA should equals to itsefl", mdiA, mdiA);
         assertFalse("mdiA shouldn't equal to null", mdiA.equals(null));
-        assertFalse("mdiA shouldn't equal to object of other type", mdiA.equals(new String("str")));
+        assertFalse("mdiA shouldn't equal to object of other type", mdiA.equals("str"));
 
         // test of equals method
 
@@ -47,7 +48,7 @@ public class MustDefinitionImplTest {
         assertFalse("mdiA shouldn't equal to mdiB", mdiA.equals(mdiB));
 
         // //description
-        mdiA = MustDefinitionImpl.create("mustStr", Optional.<String>absent(), reference, errorAppTag, errorMessage);
+        mdiA = MustDefinitionImpl.create("mustStr", Optional.absent(), reference, errorAppTag, errorMessage);
         mdiB = MustDefinitionImpl.create("mustStr", description, reference, errorAppTag, errorMessage);
         assertFalse("mdiA shouldn't equal to mdiB", mdiA.equals(mdiB));
 
@@ -56,7 +57,7 @@ public class MustDefinitionImplTest {
         assertFalse("mdiA shouldn't equal to mdiB", mdiA.equals(mdiB));
 
         // //reference
-        mdiA = MustDefinitionImpl.create("mustStr", description, Optional.<String>absent(), errorAppTag, errorMessage);
+        mdiA = MustDefinitionImpl.create("mustStr", description, Optional.absent(), errorAppTag, errorMessage);
         mdiB = MustDefinitionImpl.create("mustStr", description, reference, errorAppTag, errorMessage);
         assertFalse("mdiA shouldn't equal to mdiB", mdiA.equals(mdiB));
 
@@ -64,6 +65,10 @@ public class MustDefinitionImplTest {
         mdiB = MustDefinitionImpl.create("mustStr", description, Optional.of("referenceB"), errorAppTag, errorMessage);
         assertFalse("mdiA shouldn't equal to mdiB", mdiA.equals(mdiB));
 
+        assertEquals(description.get(), mdiA.getDescription());
+        assertEquals(errorAppTag.get(), mdiA.getErrorAppTag());
+        assertEquals(errorMessage.get(), mdiA.getErrorMessage());
+        assertEquals("referenceA", mdiA.getReference());
+        assertEquals(null, mdiA.getXpath());
     }
-
-}
+}
\ No newline at end of file