From: Robert Varga <robert.varga@pantheon.tech>
Date: Fri, 29 May 2020 16:04:50 +0000 (+0200)
Subject: Clean up AssertNonDataObjectsTest
X-Git-Tag: v6.0.1~13
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=f3e35e599df130b900aa407b16c7630339e07499;p=mdsal.git

Clean up AssertNonDataObjectsTest

The test throwing here actually wants to ensure that an exception
is thrown. Use assertThrows() and while we are at it, add another
assert on message and get rid of Google Thruth dependency, as it
really is not needed.

Change-Id: Ie5d4aa0f0f400ac77d1191eb973c9004fe4eaad6
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---

diff --git a/binding/mdsal-binding-test-utils/pom.xml b/binding/mdsal-binding-test-utils/pom.xml
index aefc46dded..0cf7d5d719 100644
--- a/binding/mdsal-binding-test-utils/pom.xml
+++ b/binding/mdsal-binding-test-utils/pom.xml
@@ -93,9 +93,5 @@
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-binding-test-model</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.truth</groupId>
-            <artifactId>truth</artifactId>
-        </dependency>
     </dependencies>
 </project>
diff --git a/binding/mdsal-binding-test-utils/src/test/java/org/opendaylight/mdsal/binding/testutils/AssertNonDataObjectsTest.java b/binding/mdsal-binding-test-utils/src/test/java/org/opendaylight/mdsal/binding/testutils/AssertNonDataObjectsTest.java
index da9c36b15c..f66cf81cc5 100644
--- a/binding/mdsal-binding-test-utils/src/test/java/org/opendaylight/mdsal/binding/testutils/AssertNonDataObjectsTest.java
+++ b/binding/mdsal-binding-test-utils/src/test/java/org/opendaylight/mdsal/binding/testutils/AssertNonDataObjectsTest.java
@@ -7,7 +7,10 @@
  */
 package org.opendaylight.mdsal.binding.testutils;
 
-import static com.google.common.truth.Truth.assertThat;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.startsWith;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertThrows;
 
 import ch.vorburger.xtendbeans.AssertBeans;
 import org.junit.ComparisonFailure;
@@ -33,12 +36,12 @@ public class AssertNonDataObjectsTest {
             return name;
         }
 
-        public void setName(String name) {
+        public void setName(final String name) {
             this.name = name;
         }
 
         @Override
-        public boolean equals(Object obj) {
+        public boolean equals(final Object obj) {
             if (this == obj) {
                 return true;
             }
@@ -81,11 +84,10 @@ public class AssertNonDataObjectsTest {
         SomeBean actual = new SomeBean();
         actual.setName("hello, world 2");
 
-        try {
-            AssertDataObjects.assertEqualBeans(expected, actual);
-        } catch (ComparisonFailure e) {
-            assertThat(e.getExpected()).contains("hello, world 1");
-            assertThat(e.getActual()).contains("hello, world 2");
-        }
+        ComparisonFailure ex = assertThrows(ComparisonFailure.class,
+            () -> AssertDataObjects.assertEqualBeans(expected, actual));
+        assertThat(ex.getMessage(), startsWith("Expected and actual beans do not match"));
+        assertThat(ex.getExpected(), containsString("hello, world 1"));
+        assertThat(ex.getActual(), containsString("hello, world 2"));
     }
 }
diff --git a/binding/mdsal-binding-test-utils/src/test/java/org/opendaylight/mdsal/binding/testutils/DataBrokerTestModuleTest.java b/binding/mdsal-binding-test-utils/src/test/java/org/opendaylight/mdsal/binding/testutils/DataBrokerTestModuleTest.java
index bf191be37e..3dc10b8588 100644
--- a/binding/mdsal-binding-test-utils/src/test/java/org/opendaylight/mdsal/binding/testutils/DataBrokerTestModuleTest.java
+++ b/binding/mdsal-binding-test-utils/src/test/java/org/opendaylight/mdsal/binding/testutils/DataBrokerTestModuleTest.java
@@ -7,7 +7,7 @@
  */
 package org.opendaylight.mdsal.binding.testutils;
 
-import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertNotNull;
 
 import org.junit.Test;
 
@@ -20,6 +20,6 @@ public class DataBrokerTestModuleTest {
 
     @Test
     public void ensureDataBrokerTestModuleWorksWithoutException() {
-        assertThat(DataBrokerTestModule.dataBroker()).isNotNull();
+        assertNotNull(DataBrokerTestModule.dataBroker());
     }
 }