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 aefc46dded7742db284c95a64aca683ba5977301..0cf7d5d71945f5615f13cc1a673f5b8dadd09b99 100644 (file)
--- 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 da9c36b15c6b3c1fc0f6412c277d512252083648..f66cf81cc59d518aa56615803cdb08ad2294267f 100644 (file)
--- 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 bf191be37eda1351672e912a6e89457ebfbe9b96..3dc10b85881ef58e64e23fca7dd74753263e9566 100644 (file)
--- 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());
     }
 }