Migrate deprecated assertThat()

This utility is on its way to Hamcrest, migrate it.

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

diff --git a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/ParserTest.java b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/ParserTest.java
index 4a41ac204a94a424d3e1649ac213bc2a2630965f..f1f5350fe82d990d8eacd3076ab7940a908034be 100644 (file)
--- a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/ParserTest.java
+++ b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/ParserTest.java
@@ -8,10 +8,10 @@
 package org.opendaylight.protocol.bgp.parser.impl;
 
 import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 

diff --git a/bgp/util/src/test/java/org/opendaylight/protocol/bgp/util/BGPBinaryFileParserTest.java b/bgp/util/src/test/java/org/opendaylight/protocol/bgp/util/BGPBinaryFileParserTest.java
index 97b872908034cfbe8a6a68fbff130294c81f22b8..6b8105d1d797716980c30c03036fdba3e716639e 100644 (file)
--- a/bgp/util/src/test/java/org/opendaylight/protocol/bgp/util/BGPBinaryFileParserTest.java
+++ b/bgp/util/src/test/java/org/opendaylight/protocol/bgp/util/BGPBinaryFileParserTest.java
@@ -7,9 +7,9 @@
  */
 package org.opendaylight.protocol.bgp.util;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

diff --git a/bgp/util/src/test/java/org/opendaylight/protocol/bgp/util/BGPHexFileParserTest.java b/bgp/util/src/test/java/org/opendaylight/protocol/bgp/util/BGPHexFileParserTest.java
index 1a27de1b86185009568985c53709a020713bfec7..04dcda30bed73de7c399ed67790210b478ccb7f8 100644 (file)
--- a/bgp/util/src/test/java/org/opendaylight/protocol/bgp/util/BGPHexFileParserTest.java
+++ b/bgp/util/src/test/java/org/opendaylight/protocol/bgp/util/BGPHexFileParserTest.java
@@ -8,8 +8,8 @@
 package org.opendaylight.protocol.bgp.util;
 
 import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
 
 import java.io.File;

diff --git a/concepts/src/test/java/org/opendaylight/protocol/concepts/ASNumberTest.java b/concepts/src/test/java/org/opendaylight/protocol/concepts/ASNumberTest.java
index c95af1da1aeec9833d7789151c873a5a43e51d5b..6381406c2048c538bfa093b205ea8ef336693fc1 100644 (file)
--- a/concepts/src/test/java/org/opendaylight/protocol/concepts/ASNumberTest.java
+++ b/concepts/src/test/java/org/opendaylight/protocol/concepts/ASNumberTest.java
@@ -5,14 +5,13 @@
  * 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.protocol.concepts;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertThat;
 
 import java.util.HashSet;
 import java.util.Set;

diff --git a/concepts/src/test/java/org/opendaylight/protocol/concepts/BandwidthTest.java b/concepts/src/test/java/org/opendaylight/protocol/concepts/BandwidthTest.java
index b98d2cc128d4abc25868d50038df089e1c8a806b..c32cbb9537dc77c94e2e96cef6412ef602a19b22 100644 (file)
--- a/concepts/src/test/java/org/opendaylight/protocol/concepts/BandwidthTest.java
+++ b/concepts/src/test/java/org/opendaylight/protocol/concepts/BandwidthTest.java
@@ -5,15 +5,14 @@
  * 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.protocol.concepts;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertThat;
 
 import io.netty.buffer.Unpooled;
 import java.util.HashSet;

diff --git a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/UtilTest.java b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/UtilTest.java
index 624881c1553498961bb3eef41e3d24fd190d4938..772b752e517a2b56b62343ca4c0bcb77f634c8cb 100644 (file)
--- a/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/UtilTest.java
+++ b/pcep/impl/src/test/java/org/opendaylight/protocol/pcep/impl/UtilTest.java
@@ -7,10 +7,10 @@
  */
 package org.opendaylight.protocol.pcep.impl;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.isA;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThat;
 
 import org.junit.Test;
 import org.opendaylight.protocol.pcep.impl.spi.Util;

diff --git a/util/src/test/java/org/opendaylight/protocol/util/PCEPHexDumpParserTest.java b/util/src/test/java/org/opendaylight/protocol/util/PCEPHexDumpParserTest.java
index 9e209925041a8d5be9a762b7b1152bcb4d029246..9f779fd516c5f0a52760749aba8fad927a6ba70b 100644 (file)
--- a/util/src/test/java/org/opendaylight/protocol/util/PCEPHexDumpParserTest.java
+++ b/util/src/test/java/org/opendaylight/protocol/util/PCEPHexDumpParserTest.java
@@ -8,8 +8,8 @@
 package org.opendaylight.protocol.util;
 
 import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
 
 import java.io.File;