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>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-binding-test-model</artifactId>
</dependency>
<groupId>org.opendaylight.mdsal</groupId>
<artifactId>mdsal-binding-test-model</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.truth</groupId>
- <artifactId>truth</artifactId>
- </dependency>
</dependencies>
</project>
</dependencies>
</project>
*/
package org.opendaylight.mdsal.binding.testutils;
*/
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;
import ch.vorburger.xtendbeans.AssertBeans;
import org.junit.ComparisonFailure;
- public void setName(String name) {
+ public void setName(final String name) {
this.name = name;
}
@Override
this.name = name;
}
@Override
- public boolean equals(Object obj) {
+ public boolean equals(final Object obj) {
if (this == obj) {
return true;
}
if (this == obj) {
return true;
}
SomeBean actual = new SomeBean();
actual.setName("hello, world 2");
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"));
*/
package org.opendaylight.mdsal.binding.testutils;
*/
package org.opendaylight.mdsal.binding.testutils;
-import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertNotNull;
@Test
public void ensureDataBrokerTestModuleWorksWithoutException() {
@Test
public void ensureDataBrokerTestModuleWorksWithoutException() {
- assertThat(DataBrokerTestModule.dataBroker()).isNotNull();
+ assertNotNull(DataBrokerTestModule.dataBroker());