Migrate Assert.assertThat()

Migrate to non-deprecated version of assertThat().

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

diff --git a/aaa-shiro/impl/src/test/java/org/opendaylight/aaa/shiro/realm/KeystoneAuthRealmTest.java b/aaa-shiro/impl/src/test/java/org/opendaylight/aaa/shiro/realm/KeystoneAuthRealmTest.java
index b1a52aae0e6037e5035354913cdff07fb1631d09..352f218fa94fee87cebaea66385db5107021187e 100644 (file)
--- a/aaa-shiro/impl/src/test/java/org/opendaylight/aaa/shiro/realm/KeystoneAuthRealmTest.java
+++ b/aaa-shiro/impl/src/test/java/org/opendaylight/aaa/shiro/realm/KeystoneAuthRealmTest.java
@@ -7,10 +7,10 @@
  */
 package org.opendaylight.aaa.shiro.realm;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.arrayContaining;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
-import static org.junit.Assert.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.same;
 import static org.mockito.Mockito.verify;

diff --git a/aaa-shiro/impl/src/test/java/org/opendaylight/aaa/shiro/realm/util/http/SimpleHttpRequestTest.java b/aaa-shiro/impl/src/test/java/org/opendaylight/aaa/shiro/realm/util/http/SimpleHttpRequestTest.java
index f522cdb48baca60ee4a70a7e6951bfd45ccf82c2..e98f817359a010667faa5540644a40df0802aacb 100644 (file)
--- a/aaa-shiro/impl/src/test/java/org/opendaylight/aaa/shiro/realm/util/http/SimpleHttpRequestTest.java
+++ b/aaa-shiro/impl/src/test/java/org/opendaylight/aaa/shiro/realm/util/http/SimpleHttpRequestTest.java
@@ -5,11 +5,10 @@
  * 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.aaa.shiro.realm.util.http;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
 
 import com.google.common.collect.ImmutableList;
 import javax.ws.rs.HttpMethod;
@@ -33,7 +32,7 @@ public class SimpleHttpRequestTest extends JerseyTest {
     @Path("keystone")
     public static class KeystoneHandler {
         @POST
-        public KeystoneToken keystoneToken(String input) {
+        public KeystoneToken keystoneToken(final String input) {
             return KEYSTONE_TOKEN;
         }
     }
@@ -41,7 +40,7 @@ public class SimpleHttpRequestTest extends JerseyTest {
     @Path("simple")
     public static class SimpleResponseHandler {
         @POST
-        public Response handle(String input) {
+        public Response handle(final String input) {
             return Response.ok("hello").build();
         }
     }