Remove usage of MoreAsserts as it has been deprecated.

BUG= Change-Id: If69d11225a5832ff5217c23e3e1dde505f7f4d58 Reviewed-on: https://chromium-review.googlesource.com/797944 Reviewed-by: Maria Khomenko <mariakhomenko@chromium.org> Reviewed-by: Tommy Nyquist <nyquist@chromium.org> Commit-Queue: Ted Choc <tedchoc@chromium.org> Cr-Commit-Position: refs/heads/master@{#520636}
hylschwy · Nov 30, 2017 · be7bb93 · be7bb93
1 parent b926c70
commit be7bb93
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 36 deletions.
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/BluetoothChooserDialogTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/BluetoothChooserDialogTest.java
@@ -10,7 +10,6 @@
 import android.content.pm.PackageManager;
 import android.location.LocationManager;
 import android.support.test.filters.LargeTest;
-import android.test.MoreAsserts;
 import android.view.View;
 import android.widget.Button;
 import android.widget.ListView;
@@ -304,7 +303,7 @@ public void testNoLocationPermission() {
                 () -> errorView.getClickableSpans()[0].onClick(errorView));
 
         // Permission was requested.
-        MoreAsserts.assertEquals(permissionDelegate.mPermissionsRequested,
+        Assert.assertArrayEquals(permissionDelegate.mPermissionsRequested,
                 new String[] {Manifest.permission.ACCESS_COARSE_LOCATION});
         Assert.assertNotNull(permissionDelegate.mCallback);
         // Grant permission.

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/OSKOverscrollTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/OSKOverscrollTest.java
@@ -6,7 +6,6 @@
 
 import android.graphics.Rect;
 import android.support.test.filters.MediumTest;
-import android.test.MoreAsserts;
 
 import org.junit.Assert;
 import org.junit.Rule;
@@ -96,7 +95,7 @@ private int getViewportHeight(WebContents webContents) {
         try {
             String jsonText = JavaScriptUtils.executeJavaScriptAndWaitForResult(
                     webContents, "window.visualViewport.height");
-            MoreAsserts.assertNotEqual(jsonText.trim().toLowerCase(Locale.US), "null");
+            Assert.assertNotEquals(jsonText.trim().toLowerCase(Locale.US), "null");
             return Integer.parseInt(jsonText);
         } catch (Exception ex) {
             Assert.fail(ex.toString());

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/PrerenderTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/PrerenderTest.java
@@ -8,7 +8,6 @@
 
 import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.LargeTest;
-import android.test.MoreAsserts;
 
 import org.junit.After;
 import org.junit.Assert;
@@ -112,7 +111,7 @@ public void testPrerenderNotDead() throws InterruptedException, TimeoutException
         PrerenderTestHelper.prerenderUrl(testUrl, tab);
 
         // Make sure the current tab title is NOT from the prerendered page.
-        MoreAsserts.assertNotEqual(newTitle, tab.getTitle());
+        Assert.assertNotEquals(newTitle, tab.getTitle());
 
         TabTitleObserver observer = new TabTitleObserver(tab, newTitle);
 

diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/ContextMenuTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/ContextMenuTest.java
@@ -11,10 +11,10 @@
 import android.support.test.filters.LargeTest;
 import android.support.test.filters.MediumTest;
 import android.support.test.filters.SmallTest;
-import android.test.MoreAsserts;
 import android.view.ContextMenu;
 import android.view.KeyEvent;
 
+import org.hamcrest.Matchers;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -454,7 +454,7 @@ private void assertMenuItemsAreEqual(ContextMenu menu, Integer... expectedItems)
             }
         }
 
-        MoreAsserts.assertContentsInAnyOrder(actualItems, expectedItems);
+        Assert.assertThat(actualItems, Matchers.containsInAnyOrder(expectedItems));
     }
 
     private void saveMediaFromContextMenu(String mediaDOMElement, int saveMenuID,

diff --git a/...me/android/javatests/src/org/chromium/chrome/browser/download/OMADownloadHandlerTest.java b/...me/android/javatests/src/org/chromium/chrome/browser/download/OMADownloadHandlerTest.java
@@ -11,8 +11,8 @@
 import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.MediumTest;
 import android.support.test.filters.SmallTest;
-import android.test.MoreAsserts;
 
+import org.hamcrest.Matchers;
 import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
@@ -234,8 +234,8 @@ public void testParseValidDownloadDescriptor() {
         Assert.assertEquals(info.getValue(OMADownloadHandler.OMA_DESCRIPTION), "testjpg");
         Assert.assertEquals(info.getValue(OMADownloadHandler.OMA_NEXT_URL), "http://nexturl.html");
         List<String> types = info.getTypes();
-        MoreAsserts.assertContentsInAnyOrder(
-                types, "image/jpeg", OMADownloadHandler.OMA_DRM_MESSAGE_MIME);
+        Assert.assertThat(types,
+                Matchers.containsInAnyOrder("image/jpeg", OMADownloadHandler.OMA_DRM_MESSAGE_MIME));
     }
 
     /**

diff --git a/...ndroid/javatests/src/org/chromium/chrome/browser/omnibox/VoiceSuggestionProviderTest.java b/...ndroid/javatests/src/org/chromium/chrome/browser/omnibox/VoiceSuggestionProviderTest.java
@@ -167,7 +167,7 @@ public void testNoSuggestions() {
         List<OmniboxSuggestion> suggestions = createDummySuggestions("a", "b", "c");
         List<OmniboxSuggestion> updatedSuggestions = provider.addVoiceSuggestions(suggestions, 10);
 
-        android.test.MoreAsserts.assertEquals(suggestions.toArray(), updatedSuggestions.toArray());
+        Assert.assertArrayEquals(suggestions.toArray(), updatedSuggestions.toArray());
     }
 
     @Test

diff --git a/...e/android/javatests/src/org/chromium/chrome/browser/push_messaging/PushMessagingTest.java b/...e/android/javatests/src/org/chromium/chrome/browser/push_messaging/PushMessagingTest.java
@@ -13,7 +13,6 @@
 import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.LargeTest;
 import android.support.test.filters.MediumTest;
-import android.test.MoreAsserts;
 import android.util.Pair;
 
 import org.junit.After;
@@ -29,6 +28,7 @@
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.Feature;
+import org.chromium.base.test.util.Matchers;
 import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.infobar.InfoBar;
@@ -264,7 +264,8 @@ public void testDefaultNotification() throws InterruptedException, TimeoutExcept
         // After grace runs out a default notification will be shown.
         sendPushAndWaitForCallback(appIdAndSenderId);
         NotificationEntry notificationEntry = mNotificationTestRule.waitForNotification();
-        MoreAsserts.assertContainsRegex("user_visible_auto_notification", notificationEntry.tag);
+        Assert.assertThat(
+                notificationEntry.tag, Matchers.containsString("user_visible_auto_notification"));
 
         // When another push does show a notification, the default notification is automatically
         // dismissed (an additional mutation) so there is only one left in the end.

diff --git a/...android/javatests/src/org/chromium/components/minidump_uploader/CrashFileManagerTest.java b/...android/javatests/src/org/chromium/components/minidump_uploader/CrashFileManagerTest.java
@@ -9,7 +9,6 @@
 import android.os.ParcelFileDescriptor;
 import android.support.test.filters.MediumTest;
 import android.support.test.filters.SmallTest;
-import android.test.MoreAsserts;
 
 import org.junit.Assert;
 import org.junit.Before;
@@ -172,20 +171,19 @@ public void testGetMatchingFiles() {
         Pattern testPattern = Pattern.compile("^123");
         File[] actualFiles = crashFileManager.listCrashFiles(testPattern);
         Assert.assertNotNull(actualFiles);
-        MoreAsserts.assertEquals("Failed to match file by pattern", expectedFiles, actualFiles);
+        assertArrayEquals("Failed to match file by pattern", expectedFiles, actualFiles);
     }
 
     @Test
     @MediumTest
     @Feature({"Android-AppBase"})
-    public void testFileComparator() throws IOException {
-        CrashFileManager crashFileManager = new CrashFileManager(mTestRule.getCacheDir());
+    public void testFileComparator() {
         File[] expectedFiles = new File[] {mTmpFile3, mTmpFile2, mTmpFile1};
         File[] originalFiles = new File[] {mTmpFile1, mTmpFile2, mTmpFile3};
-        Arrays.sort(originalFiles, crashFileManager.sFileComparator);
+        Arrays.sort(originalFiles, CrashFileManager.sFileComparator);
         Assert.assertNotNull(originalFiles);
-        MoreAsserts.assertEquals("File comparator failed to prioritize last modified file",
-                expectedFiles, originalFiles);
+        assertArrayEquals("File comparator failed to prioritize last modified file", expectedFiles,
+                originalFiles);
     }
 
     @Test
@@ -199,7 +197,7 @@ public void testGetAllFilesSorted() {
                 mTmpFile1};
         File[] actualFiles = crashFileManager.listCrashFiles(null);
         Assert.assertNotNull(actualFiles);
-        MoreAsserts.assertEquals(
+        assertArrayEquals(
                 "Failed to sort all files by modification time", expectedFiles, actualFiles);
     }
 
@@ -268,13 +266,13 @@ public void testSetReadyForUpload_MinidumpWithPid() throws IOException {
     @Test
     @SmallTest
     @Feature({"Android-AppBase"})
-    public void testGetMinidumpsSansLogcat() throws IOException {
+    public void testGetMinidumpsSansLogcat() {
         CrashFileManager crashFileManager = new CrashFileManager(mTestRule.getCacheDir());
         File[] expectedFiles = new File[] {mDmpSansLogcatFile2, mDmpSansLogcatFile1};
         File[] actualFiles = crashFileManager.getMinidumpsSansLogcat();
         Assert.assertNotNull(actualFiles);
-        MoreAsserts.assertEquals("Failed to get the correct minidump files in directory",
-                expectedFiles, actualFiles);
+        assertArrayEquals("Failed to get the correct minidump files in directory", expectedFiles,
+                actualFiles);
     }
 
     @Test
@@ -290,8 +288,8 @@ public void testGetMinidumpsReadyForUpload() throws IOException {
         File[] expectedFiles = new File[] {forcedFile, mOneBelowMaxTriesFile, mDmpFile2, mDmpFile1};
         File[] actualFiles = crashFileManager.getMinidumpsReadyForUpload(MAX_TRIES_ALLOWED);
         Assert.assertNotNull(actualFiles);
-        MoreAsserts.assertEquals("Failed to get the correct minidump files in directory",
-                expectedFiles, actualFiles);
+        assertArrayEquals("Failed to get the correct minidump files in directory", expectedFiles,
+                actualFiles);
     }
 
     @Test
@@ -304,23 +302,23 @@ public void testGetMinidumpsReadyForUpload_MultiDigitMaxTries() {
         File[] actualFiles =
                 crashFileManager.getMinidumpsReadyForUpload(MULTI_DIGIT_MAX_TRIES_ALLOWED);
         Assert.assertNotNull(actualFiles);
-        MoreAsserts.assertEquals("Failed to get the correct minidump files in directory",
-                expectedFiles, actualFiles);
+        assertArrayEquals("Failed to get the correct minidump files in directory", expectedFiles,
+                actualFiles);
     }
 
     @Test
     @SmallTest
     @Feature({"Android-AppBase"})
     public void testGetFilesBelowMaxTries() {
         // No files in input -> return empty
-        MoreAsserts.assertEquals(new File[0],
+        assertArrayEquals(new File[0],
                 CrashFileManager.getFilesBelowMaxTries(new File[0], MAX_TRIES_ALLOWED));
         // Only files above MAX_TRIES -> return empty
-        MoreAsserts.assertEquals(
-                new File[0], CrashFileManager.getFilesBelowMaxTries(
-                                     new File[] {mMaxTriesFile}, MAX_TRIES_ALLOWED));
+        assertArrayEquals(new File[0],
+                CrashFileManager.getFilesBelowMaxTries(
+                        new File[] {mMaxTriesFile}, MAX_TRIES_ALLOWED));
         // Keep only files below MAX_TRIES
-        MoreAsserts.assertEquals(new File[] {mDmpFile1, mDmpFile2, mOneBelowMaxTriesFile},
+        assertArrayEquals(new File[] {mDmpFile1, mDmpFile2, mOneBelowMaxTriesFile},
                 CrashFileManager.getFilesBelowMaxTries(
                         new File[] {mDmpFile1, mDmpFile2, mOneBelowMaxTriesFile, mMaxTriesFile},
                         MAX_TRIES_ALLOWED));
@@ -334,8 +332,8 @@ public void testGetAllUploadedFiles() {
         File[] expectedFiles = new File[] { mUpFile2, mUpFile1 };
         File[] actualFiles = crashFileManager.getAllUploadedFiles();
         Assert.assertNotNull(actualFiles);
-        MoreAsserts.assertEquals("Failed to get the correct uploaded files in directory",
-                expectedFiles, actualFiles);
+        assertArrayEquals("Failed to get the correct uploaded files in directory", expectedFiles,
+                actualFiles);
     }
 
     @Test