Use org.hamcrest.MatcherAssert.assertThat instead of the deprecated org.junit.Assert.assertThat calls (flutter#6946)

Author: jwren

flutter-idea/testSrc/unit/io/flutter/editor/ActiveEditorsOutlineServiceTest.java

@@ -23,8 +23,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.assertThat;
 
 public class ActiveEditorsOutlineServiceTest {
   private static final String fileContents = "void main() {\n" +

flutter-idea/testSrc/unit/io/flutter/editor/ExpressionParsingUtilsTest.java

@@ -8,7 +8,7 @@
 import org.junit.Test;
 
 import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class ExpressionParsingUtilsTest {
   @Test

flutter-idea/testSrc/unit/io/flutter/logging/FlutterConsoleLogManagerTest.java

@@ -33,7 +33,7 @@
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.not;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 

flutter-idea/testSrc/unit/io/flutter/run/bazel/BazelConfigurationFactoryTest.java

@@ -11,7 +11,7 @@
 import org.junit.Test;
 
 import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 
 /**

flutter-idea/testSrc/unit/io/flutter/run/bazel/LaunchCommandsTest.java

@@ -30,7 +30,7 @@
 import java.util.concurrent.CompletableFuture;
 
 import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 

flutter-idea/testSrc/unit/io/flutter/run/bazelTest/BazelTestConfigProducerTest.java

@@ -35,7 +35,7 @@
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.core.IsNot.not;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class BazelTestConfigProducerTest extends AbstractDartElementTest {
 

flutter-idea/testSrc/unit/io/flutter/run/bazelTest/BazelTestConfigurationFactoryTest.java

@@ -8,7 +8,7 @@
 import org.junit.Test;
 
 import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * Verify the behavior of bazel test configuration factories.

flutter-idea/testSrc/unit/io/flutter/run/bazelTest/LaunchCommandsTest.java

@@ -26,7 +26,7 @@
 import java.util.List;
 
 import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 public class LaunchCommandsTest {

flutter-idea/testSrc/unit/io/flutter/run/common/CommonTestConfigUtilsTest.java

@@ -25,7 +25,7 @@
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.core.IsNot.not;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * Verifies that named test targets can be identified correctly as part of a group or as an individual test target.

flutter-idea/testSrc/unit/io/flutter/utils/AsyncRateLimiterTest.java

@@ -22,6 +22,7 @@
 
 import static java.util.concurrent.CompletableFuture.supplyAsync;
 import static org.hamcrest.core.Is.is;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.*;
 
 public class AsyncRateLimiterTest {

flutter-idea/testSrc/unit/io/flutter/utils/EventStreamTest.java

@@ -20,7 +20,7 @@
 import java.util.concurrent.ExecutionException;
 
 import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.fail;
 
 public class EventStreamTest {

flutter-idea/testSrc/unit/io/flutter/utils/ThreadUtilTest.java

@@ -14,7 +14,7 @@
 
 import static org.hamcrest.CoreMatchers.hasItem;
 import static org.hamcrest.CoreMatchers.not;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 public class ThreadUtilTest {
   @Test