| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #import <EarlGrey/EarlGrey.h> | 5 #import <EarlGrey/EarlGrey.h> |
| 6 #import <UIKit/UIKit.h> | 6 #import <UIKit/UIKit.h> |
| 7 #import <XCTest/XCTest.h> | 7 #import <XCTest/XCTest.h> |
| 8 | 8 |
| 9 #include "base/strings/sys_string_conversions.h" | 9 #include "base/strings/sys_string_conversions.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| (...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 342 AssertButtonNotVisibleWithID(IDS_IOS_READING_LIST_MARK_READ_BUTTON); | 342 AssertButtonNotVisibleWithID(IDS_IOS_READING_LIST_MARK_READ_BUTTON); |
| 343 AssertButtonNotVisibleWithID(IDS_IOS_READING_LIST_MARK_UNREAD_BUTTON); | 343 AssertButtonNotVisibleWithID(IDS_IOS_READING_LIST_MARK_UNREAD_BUTTON); |
| 344 AssertButtonNotVisibleWithID(IDS_IOS_READING_LIST_MARK_ALL_BUTTON); | 344 AssertButtonNotVisibleWithID(IDS_IOS_READING_LIST_MARK_ALL_BUTTON); |
| 345 AssertButtonNotVisibleWithID(IDS_IOS_READING_LIST_MARK_BUTTON); | 345 AssertButtonNotVisibleWithID(IDS_IOS_READING_LIST_MARK_BUTTON); |
| 346 AssertButtonNotVisibleWithID(IDS_IOS_READING_LIST_CANCEL_BUTTON); | 346 AssertButtonNotVisibleWithID(IDS_IOS_READING_LIST_CANCEL_BUTTON); |
| 347 AssertButtonVisibleWithID(IDS_IOS_READING_LIST_EDIT_BUTTON); | 347 AssertButtonVisibleWithID(IDS_IOS_READING_LIST_EDIT_BUTTON); |
| 348 } | 348 } |
| 349 | 349 |
| 350 // Tests that only the "Cancel", "Delete All Read" and "Mark All…" buttons are | 350 // Tests that only the "Cancel", "Delete All Read" and "Mark All…" buttons are |
| 351 // showing when not editing. | 351 // showing when not editing. |
| 352 // TODO(crbug.com/704401): Re-enable this test. | 352 - (void)testVisibleButtonsEditingModeEmptySelection { |
| 353 - (void)DISABLED_testVisibleButtonsEditingModeEmptySelection { | |
| 354 AddEntriesAndEnterEdit(); | 353 AddEntriesAndEnterEdit(); |
| 355 | 354 |
| 356 AssertButtonNotVisibleWithID(IDS_IOS_READING_LIST_DELETE_BUTTON); | 355 AssertButtonNotVisibleWithID(IDS_IOS_READING_LIST_DELETE_BUTTON); |
| 357 AssertButtonNotVisibleWithID(IDS_IOS_READING_LIST_MARK_READ_BUTTON); | 356 AssertButtonNotVisibleWithID(IDS_IOS_READING_LIST_MARK_READ_BUTTON); |
| 358 AssertButtonNotVisibleWithID(IDS_IOS_READING_LIST_MARK_UNREAD_BUTTON); | 357 AssertButtonNotVisibleWithID(IDS_IOS_READING_LIST_MARK_UNREAD_BUTTON); |
| 359 AssertButtonNotVisibleWithID(IDS_IOS_READING_LIST_MARK_BUTTON); | 358 AssertButtonNotVisibleWithID(IDS_IOS_READING_LIST_MARK_BUTTON); |
| 360 AssertButtonNotVisibleWithID(IDS_IOS_READING_LIST_EDIT_BUTTON); | 359 AssertButtonNotVisibleWithID(IDS_IOS_READING_LIST_EDIT_BUTTON); |
| 361 AssertButtonVisibleWithID(IDS_IOS_READING_LIST_DELETE_ALL_READ_BUTTON); | 360 AssertButtonVisibleWithID(IDS_IOS_READING_LIST_DELETE_ALL_READ_BUTTON); |
| 362 AssertButtonVisibleWithID(IDS_IOS_READING_LIST_MARK_ALL_BUTTON); | 361 AssertButtonVisibleWithID(IDS_IOS_READING_LIST_MARK_ALL_BUTTON); |
| 363 AssertButtonVisibleWithID(IDS_IOS_READING_LIST_CANCEL_BUTTON); | 362 AssertButtonVisibleWithID(IDS_IOS_READING_LIST_CANCEL_BUTTON); |
| 364 } | 363 } |
| 365 | 364 |
| 366 // Tests that only the "Cancel", "Delete" and "Mark Unread" buttons are showing | 365 // Tests that only the "Cancel", "Delete" and "Mark Unread" buttons are showing |
| 367 // when not editing. | 366 // when not editing. |
| 368 // TODO(crbug.com/704401): Re-enable this test. | 367 - (void)testVisibleButtonsOnlyReadEntrySelected { |
| 369 - (void)DISABLED_testVisibleButtonsOnlyReadEntrySelected { | |
| 370 AddEntriesAndEnterEdit(); | 368 AddEntriesAndEnterEdit(); |
| 371 TapEntry(kReadTitle); | 369 TapEntry(kReadTitle); |
| 372 | 370 |
| 373 AssertButtonNotVisibleWithID(IDS_IOS_READING_LIST_DELETE_ALL_READ_BUTTON); | 371 AssertButtonNotVisibleWithID(IDS_IOS_READING_LIST_DELETE_ALL_READ_BUTTON); |
| 374 AssertButtonNotVisibleWithID(IDS_IOS_READING_LIST_MARK_READ_BUTTON); | 372 AssertButtonNotVisibleWithID(IDS_IOS_READING_LIST_MARK_READ_BUTTON); |
| 375 AssertButtonNotVisibleWithID(IDS_IOS_READING_LIST_MARK_BUTTON); | 373 AssertButtonNotVisibleWithID(IDS_IOS_READING_LIST_MARK_BUTTON); |
| 376 AssertButtonNotVisibleWithID(IDS_IOS_READING_LIST_EDIT_BUTTON); | 374 AssertButtonNotVisibleWithID(IDS_IOS_READING_LIST_EDIT_BUTTON); |
| 377 AssertButtonNotVisibleWithID(IDS_IOS_READING_LIST_MARK_ALL_BUTTON); | 375 AssertButtonNotVisibleWithID(IDS_IOS_READING_LIST_MARK_ALL_BUTTON); |
| 378 AssertButtonVisibleWithID(IDS_IOS_READING_LIST_MARK_UNREAD_BUTTON); | 376 AssertButtonVisibleWithID(IDS_IOS_READING_LIST_MARK_UNREAD_BUTTON); |
| 379 AssertButtonVisibleWithID(IDS_IOS_READING_LIST_DELETE_BUTTON); | 377 AssertButtonVisibleWithID(IDS_IOS_READING_LIST_DELETE_BUTTON); |
| 380 AssertButtonVisibleWithID(IDS_IOS_READING_LIST_CANCEL_BUTTON); | 378 AssertButtonVisibleWithID(IDS_IOS_READING_LIST_CANCEL_BUTTON); |
| 381 } | 379 } |
| 382 | 380 |
| 383 // Tests that only the "Cancel", "Delete" and "Mark Read" buttons are showing | 381 // Tests that only the "Cancel", "Delete" and "Mark Read" buttons are showing |
| 384 // when not editing. | 382 // when not editing. |
| 385 // TODO(crbug.com/704401): Re-enable this test. | 383 - (void)testVisibleButtonsOnlyUnreadEntrySelected { |
| 386 - (void)DISABLED_testVisibleButtonsOnlyUnreadEntrySelected { | |
| 387 AddEntriesAndEnterEdit(); | 384 AddEntriesAndEnterEdit(); |
| 388 TapEntry(kUnreadTitle); | 385 TapEntry(kUnreadTitle); |
| 389 | 386 |
| 390 AssertButtonNotVisibleWithID(IDS_IOS_READING_LIST_DELETE_ALL_READ_BUTTON); | 387 AssertButtonNotVisibleWithID(IDS_IOS_READING_LIST_DELETE_ALL_READ_BUTTON); |
| 391 AssertButtonNotVisibleWithID(IDS_IOS_READING_LIST_MARK_UNREAD_BUTTON); | 388 AssertButtonNotVisibleWithID(IDS_IOS_READING_LIST_MARK_UNREAD_BUTTON); |
| 392 AssertButtonNotVisibleWithID(IDS_IOS_READING_LIST_MARK_BUTTON); | 389 AssertButtonNotVisibleWithID(IDS_IOS_READING_LIST_MARK_BUTTON); |
| 393 AssertButtonNotVisibleWithID(IDS_IOS_READING_LIST_EDIT_BUTTON); | 390 AssertButtonNotVisibleWithID(IDS_IOS_READING_LIST_EDIT_BUTTON); |
| 394 AssertButtonNotVisibleWithID(IDS_IOS_READING_LIST_MARK_ALL_BUTTON); | 391 AssertButtonNotVisibleWithID(IDS_IOS_READING_LIST_MARK_ALL_BUTTON); |
| 395 AssertButtonVisibleWithID(IDS_IOS_READING_LIST_MARK_READ_BUTTON); | 392 AssertButtonVisibleWithID(IDS_IOS_READING_LIST_MARK_READ_BUTTON); |
| 396 AssertButtonVisibleWithID(IDS_IOS_READING_LIST_DELETE_BUTTON); | 393 AssertButtonVisibleWithID(IDS_IOS_READING_LIST_DELETE_BUTTON); |
| 397 AssertButtonVisibleWithID(IDS_IOS_READING_LIST_CANCEL_BUTTON); | 394 AssertButtonVisibleWithID(IDS_IOS_READING_LIST_CANCEL_BUTTON); |
| 398 } | 395 } |
| 399 | 396 |
| 400 // Tests that only the "Cancel", "Delete" and "Mark…" buttons are showing when | 397 // Tests that only the "Cancel", "Delete" and "Mark…" buttons are showing when |
| 401 // not editing. | 398 // not editing. |
| 402 // TODO(crbug.com/704401): Re-enable this test. | 399 - (void)testVisibleButtonsMixedEntriesSelected { |
| 403 - (void)DISABLED_testVisibleButtonsMixedEntriesSelected { | |
| 404 AddEntriesAndEnterEdit(); | 400 AddEntriesAndEnterEdit(); |
| 405 TapEntry(kReadTitle); | 401 TapEntry(kReadTitle); |
| 406 TapEntry(kUnreadTitle); | 402 TapEntry(kUnreadTitle); |
| 407 | 403 |
| 408 AssertButtonNotVisibleWithID(IDS_IOS_READING_LIST_DELETE_ALL_READ_BUTTON); | 404 AssertButtonNotVisibleWithID(IDS_IOS_READING_LIST_DELETE_ALL_READ_BUTTON); |
| 409 AssertButtonNotVisibleWithID(IDS_IOS_READING_LIST_MARK_UNREAD_BUTTON); | 405 AssertButtonNotVisibleWithID(IDS_IOS_READING_LIST_MARK_UNREAD_BUTTON); |
| 410 AssertButtonNotVisibleWithID(IDS_IOS_READING_LIST_MARK_READ_BUTTON); | 406 AssertButtonNotVisibleWithID(IDS_IOS_READING_LIST_MARK_READ_BUTTON); |
| 411 AssertButtonNotVisibleWithID(IDS_IOS_READING_LIST_EDIT_BUTTON); | 407 AssertButtonNotVisibleWithID(IDS_IOS_READING_LIST_EDIT_BUTTON); |
| 412 AssertButtonNotVisibleWithID(IDS_IOS_READING_LIST_MARK_ALL_BUTTON); | 408 AssertButtonNotVisibleWithID(IDS_IOS_READING_LIST_MARK_ALL_BUTTON); |
| 413 AssertButtonVisibleWithID(IDS_IOS_READING_LIST_MARK_BUTTON); | 409 AssertButtonVisibleWithID(IDS_IOS_READING_LIST_MARK_BUTTON); |
| (...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 557 assertWithMatcher:grey_nil()]; | 553 assertWithMatcher:grey_nil()]; |
| 558 TapButtonWithID(IDS_IOS_READING_LIST_EDIT_BUTTON); | 554 TapButtonWithID(IDS_IOS_READING_LIST_EDIT_BUTTON); |
| 559 TapButtonWithID(IDS_IOS_READING_LIST_DELETE_ALL_READ_BUTTON); | 555 TapButtonWithID(IDS_IOS_READING_LIST_DELETE_ALL_READ_BUTTON); |
| 560 | 556 |
| 561 // Verify the background string is displayed. | 557 // Verify the background string is displayed. |
| 562 [[EarlGrey selectElementWithMatcher:EmptyBackground()] | 558 [[EarlGrey selectElementWithMatcher:EmptyBackground()] |
| 563 assertWithMatcher:grey_notNil()]; | 559 assertWithMatcher:grey_notNil()]; |
| 564 } | 560 } |
| 565 | 561 |
| 566 @end | 562 @end |
| OLD | NEW |