Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10)

Side by Side Diff: chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java

Issue 2619493006: [Android] Chagne items shown in context menu for tel link (Closed)
Patch Set: Solve conflicts of commit. Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 package org.chromium.chrome.browser.customtabs; 5 package org.chromium.chrome.browser.customtabs;
6 6
7 import static org.chromium.base.test.util.Restriction.RESTRICTION_TYPE_NON_LOW_E ND_DEVICE; 7 import static org.chromium.base.test.util.Restriction.RESTRICTION_TYPE_NON_LOW_E ND_DEVICE;
8 8
9 import android.app.Activity; 9 import android.app.Activity;
10 import android.app.Application; 10 import android.app.Application;
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 /** 288 /**
289 * Test the entries in the context menu shown when long clicking an image. 289 * Test the entries in the context menu shown when long clicking an image.
290 * @SmallTest 290 * @SmallTest
291 * @RetryOnFailure 291 * @RetryOnFailure
292 * BUG=crbug.com/655970 292 * BUG=crbug.com/655970
293 */ 293 */
294 @DisabledTest 294 @DisabledTest
295 public void testContextMenuEntriesForImage() throws InterruptedException, Ti meoutException { 295 public void testContextMenuEntriesForImage() throws InterruptedException, Ti meoutException {
296 startCustomTabActivityWithIntent(createMinimalCustomTabIntent()); 296 startCustomTabActivityWithIntent(createMinimalCustomTabIntent());
297 297
298 final int expectedMenuSize = 11; 298 final int expectedMenuSize = 12;
299 Menu menu = ContextMenuUtils.openContextMenu(this, getActivity().getActi vityTab(), "logo"); 299 Menu menu = ContextMenuUtils.openContextMenu(this, getActivity().getActi vityTab(), "logo");
300 assertEquals(expectedMenuSize, menu.size()); 300 assertEquals(expectedMenuSize, menu.size());
301 301
302 assertNotNull(menu.findItem(R.id.contextmenu_copy_link_address)); 302 assertNotNull(menu.findItem(R.id.contextmenu_copy_link_address));
303 assertNotNull(menu.findItem(R.id.contextmenu_call));
303 assertNotNull(menu.findItem(R.id.contextmenu_send_message)); 304 assertNotNull(menu.findItem(R.id.contextmenu_send_message));
304 assertNotNull(menu.findItem(R.id.contextmenu_add_to_contacts)); 305 assertNotNull(menu.findItem(R.id.contextmenu_add_to_contacts));
305 assertNotNull(menu.findItem(R.id.contextmenu_copy_email_address)); 306 assertNotNull(menu.findItem(R.id.contextmenu_copy));
306 assertNotNull(menu.findItem(R.id.contextmenu_copy_link_text)); 307 assertNotNull(menu.findItem(R.id.contextmenu_copy_link_text));
307 assertNotNull(menu.findItem(R.id.contextmenu_save_link_as)); 308 assertNotNull(menu.findItem(R.id.contextmenu_save_link_as));
308 assertNotNull(menu.findItem(R.id.contextmenu_save_image)); 309 assertNotNull(menu.findItem(R.id.contextmenu_save_image));
309 assertNotNull(menu.findItem(R.id.contextmenu_share_image)); 310 assertNotNull(menu.findItem(R.id.contextmenu_share_image));
310 assertNotNull(menu.findItem(R.id.contextmenu_open_image)); 311 assertNotNull(menu.findItem(R.id.contextmenu_open_image));
311 assertNotNull(menu.findItem(R.id.contextmenu_save_video)); 312 assertNotNull(menu.findItem(R.id.contextmenu_save_video));
312 313
313 assertTrue(menu.findItem(R.id.contextmenu_save_image).isVisible()); 314 assertTrue(menu.findItem(R.id.contextmenu_save_image).isVisible());
314 assertTrue(menu.findItem(R.id.contextmenu_share_image).isVisible()); 315 assertTrue(menu.findItem(R.id.contextmenu_share_image).isVisible());
315 assertTrue(menu.findItem(R.id.contextmenu_open_image).isVisible()); 316 assertTrue(menu.findItem(R.id.contextmenu_open_image).isVisible());
316 assertTrue(menu.findItem(R.id.contextmenu_search_by_image).isVisible()); 317 assertTrue(menu.findItem(R.id.contextmenu_search_by_image).isVisible());
317 318
318 assertFalse(menu.findItem(R.id.contextmenu_copy_link_address).isVisible( )); 319 assertFalse(menu.findItem(R.id.contextmenu_copy_link_address).isVisible( ));
320 assertFalse(menu.findItem(R.id.contextmenu_call).isVisible());
319 assertFalse(menu.findItem(R.id.contextmenu_send_message).isVisible()); 321 assertFalse(menu.findItem(R.id.contextmenu_send_message).isVisible());
320 assertFalse(menu.findItem(R.id.contextmenu_add_to_contacts).isVisible()) ; 322 assertFalse(menu.findItem(R.id.contextmenu_add_to_contacts).isVisible()) ;
321 assertFalse(menu.findItem(R.id.contextmenu_copy_email_address).isVisible ()); 323 assertFalse(menu.findItem(R.id.contextmenu_copy).isVisible());
322 assertFalse(menu.findItem(R.id.contextmenu_copy_link_text).isVisible()); 324 assertFalse(menu.findItem(R.id.contextmenu_copy_link_text).isVisible());
323 assertFalse(menu.findItem(R.id.contextmenu_save_link_as).isVisible()); 325 assertFalse(menu.findItem(R.id.contextmenu_save_link_as).isVisible());
324 assertFalse(menu.findItem(R.id.contextmenu_save_video).isVisible()); 326 assertFalse(menu.findItem(R.id.contextmenu_save_video).isVisible());
325 } 327 }
326 328
327 /** 329 /**
328 * Test the entries in the context menu shown when long clicking a link. 330 * Test the entries in the context menu shown when long clicking a link.
329 * @SmallTest 331 * @SmallTest
330 * @RetryOnFailure 332 * @RetryOnFailure
331 * BUG=crbug.com/655970 333 * BUG=crbug.com/655970
332 */ 334 */
333 @DisabledTest 335 @DisabledTest
334 public void testContextMenuEntriesForLink() throws InterruptedException, Tim eoutException { 336 public void testContextMenuEntriesForLink() throws InterruptedException, Tim eoutException {
335 startCustomTabActivityWithIntent(createMinimalCustomTabIntent()); 337 startCustomTabActivityWithIntent(createMinimalCustomTabIntent());
336 338
337 final int expectedMenuSize = 11; 339 final int expectedMenuSize = 12;
338 Menu menu = ContextMenuUtils.openContextMenu(this, getActivity().getActi vityTab(), 340 Menu menu = ContextMenuUtils.openContextMenu(this, getActivity().getActi vityTab(),
339 "aboutLink"); 341 "aboutLink");
340 assertEquals(expectedMenuSize, menu.size()); 342 assertEquals(expectedMenuSize, menu.size());
341 343
342 assertNotNull(menu.findItem(R.id.contextmenu_copy_link_address)); 344 assertNotNull(menu.findItem(R.id.contextmenu_copy_link_address));
345 assertNotNull(menu.findItem(R.id.contextmenu_call));
343 assertNotNull(menu.findItem(R.id.contextmenu_send_message)); 346 assertNotNull(menu.findItem(R.id.contextmenu_send_message));
344 assertNotNull(menu.findItem(R.id.contextmenu_add_to_contacts)); 347 assertNotNull(menu.findItem(R.id.contextmenu_add_to_contacts));
345 assertNotNull(menu.findItem(R.id.contextmenu_copy_email_address)); 348 assertNotNull(menu.findItem(R.id.contextmenu_copy));
346 assertNotNull(menu.findItem(R.id.contextmenu_copy_link_text)); 349 assertNotNull(menu.findItem(R.id.contextmenu_copy_link_text));
347 assertNotNull(menu.findItem(R.id.contextmenu_save_link_as)); 350 assertNotNull(menu.findItem(R.id.contextmenu_save_link_as));
348 assertNotNull(menu.findItem(R.id.contextmenu_save_image)); 351 assertNotNull(menu.findItem(R.id.contextmenu_save_image));
349 assertNotNull(menu.findItem(R.id.contextmenu_share_image)); 352 assertNotNull(menu.findItem(R.id.contextmenu_share_image));
350 assertNotNull(menu.findItem(R.id.contextmenu_open_image)); 353 assertNotNull(menu.findItem(R.id.contextmenu_open_image));
351 assertNotNull(menu.findItem(R.id.contextmenu_save_video)); 354 assertNotNull(menu.findItem(R.id.contextmenu_save_video));
352 355
353 assertTrue(menu.findItem(R.id.contextmenu_copy_link_address).isVisible() ); 356 assertTrue(menu.findItem(R.id.contextmenu_copy_link_address).isVisible() );
354 assertTrue(menu.findItem(R.id.contextmenu_copy_link_text).isVisible()); 357 assertTrue(menu.findItem(R.id.contextmenu_copy_link_text).isVisible());
355 assertTrue(menu.findItem(R.id.contextmenu_save_link_as).isVisible()); 358 assertTrue(menu.findItem(R.id.contextmenu_save_link_as).isVisible());
356 359
357 assertFalse(menu.findItem(R.id.contextmenu_share_image).isVisible()); 360 assertFalse(menu.findItem(R.id.contextmenu_share_image).isVisible());
361 assertFalse(menu.findItem(R.id.contextmenu_call).isVisible());
358 assertFalse(menu.findItem(R.id.contextmenu_send_message).isVisible()); 362 assertFalse(menu.findItem(R.id.contextmenu_send_message).isVisible());
359 assertFalse(menu.findItem(R.id.contextmenu_add_to_contacts).isVisible()) ; 363 assertFalse(menu.findItem(R.id.contextmenu_add_to_contacts).isVisible()) ;
360 assertFalse(menu.findItem(R.id.contextmenu_copy_email_address).isVisible ()); 364 assertFalse(menu.findItem(R.id.contextmenu_copy).isVisible());
361 assertFalse(menu.findItem(R.id.contextmenu_save_image).isVisible()); 365 assertFalse(menu.findItem(R.id.contextmenu_save_image).isVisible());
362 assertFalse(menu.findItem(R.id.contextmenu_open_image).isVisible()); 366 assertFalse(menu.findItem(R.id.contextmenu_open_image).isVisible());
363 assertFalse(menu.findItem(R.id.contextmenu_search_by_image).isVisible()) ; 367 assertFalse(menu.findItem(R.id.contextmenu_search_by_image).isVisible()) ;
364 assertFalse(menu.findItem(R.id.contextmenu_save_video).isVisible()); 368 assertFalse(menu.findItem(R.id.contextmenu_save_video).isVisible());
365 } 369 }
366 370
367 /** 371 /**
368 * Test the entries in the context menu shown when long clicking an mailto u rl. 372 * Test the entries in the context menu shown when long clicking an mailto u rl.
369 * @SmallTest 373 * @SmallTest
370 * @RetryOnFailure 374 * @RetryOnFailure
371 */ 375 */
372 @DisabledTest 376 @DisabledTest
373 public void testContextMenuEntriesForMailto() throws InterruptedException, T imeoutException { 377 public void testContextMenuEntriesForMailto() throws InterruptedException, T imeoutException {
374 startCustomTabActivityWithIntent(createMinimalCustomTabIntent()); 378 startCustomTabActivityWithIntent(createMinimalCustomTabIntent());
375 379
376 final int expectedMenuSize = 11; 380 final int expectedMenuSize = 12;
377 Menu menu = ContextMenuUtils.openContextMenu(this, getActivity().getActi vityTab(), "email"); 381 Menu menu = ContextMenuUtils.openContextMenu(this, getActivity().getActi vityTab(), "email");
378 assertEquals(expectedMenuSize, menu.size()); 382 assertEquals(expectedMenuSize, menu.size());
379 383
380 assertNotNull(menu.findItem(R.id.contextmenu_copy_link_address)); 384 assertNotNull(menu.findItem(R.id.contextmenu_copy_link_address));
385 assertNotNull(menu.findItem(R.id.contextmenu_call));
381 assertNotNull(menu.findItem(R.id.contextmenu_send_message)); 386 assertNotNull(menu.findItem(R.id.contextmenu_send_message));
382 assertNotNull(menu.findItem(R.id.contextmenu_add_to_contacts)); 387 assertNotNull(menu.findItem(R.id.contextmenu_add_to_contacts));
383 assertNotNull(menu.findItem(R.id.contextmenu_copy_email_address)); 388 assertNotNull(menu.findItem(R.id.contextmenu_copy));
384 assertNotNull(menu.findItem(R.id.contextmenu_copy_link_text)); 389 assertNotNull(menu.findItem(R.id.contextmenu_copy_link_text));
385 assertNotNull(menu.findItem(R.id.contextmenu_save_link_as)); 390 assertNotNull(menu.findItem(R.id.contextmenu_save_link_as));
386 assertNotNull(menu.findItem(R.id.contextmenu_save_image)); 391 assertNotNull(menu.findItem(R.id.contextmenu_save_image));
387 assertNotNull(menu.findItem(R.id.contextmenu_share_image)); 392 assertNotNull(menu.findItem(R.id.contextmenu_share_image));
388 assertNotNull(menu.findItem(R.id.contextmenu_open_image)); 393 assertNotNull(menu.findItem(R.id.contextmenu_open_image));
389 assertNotNull(menu.findItem(R.id.contextmenu_save_video)); 394 assertNotNull(menu.findItem(R.id.contextmenu_save_video));
390 395
391 assertTrue(menu.findItem(R.id.contextmenu_send_message).isVisible()); 396 assertTrue(menu.findItem(R.id.contextmenu_send_message).isVisible());
392 assertTrue(menu.findItem(R.id.contextmenu_add_to_contacts).isVisible()); 397 assertTrue(menu.findItem(R.id.contextmenu_add_to_contacts).isVisible());
393 assertTrue(menu.findItem(R.id.contextmenu_copy_email_address).isVisible( )); 398 assertTrue(menu.findItem(R.id.contextmenu_copy).isVisible());
399
400 assertFalse(menu.findItem(R.id.contextmenu_copy_link_address).isVisible( ));
401 assertFalse(menu.findItem(R.id.contextmenu_call).isVisible());
402 assertFalse(menu.findItem(R.id.contextmenu_save_image).isVisible());
403 assertFalse(menu.findItem(R.id.contextmenu_share_image).isVisible());
404 assertFalse(menu.findItem(R.id.contextmenu_open_image).isVisible());
405 assertFalse(menu.findItem(R.id.contextmenu_search_by_image).isVisible()) ;
406 assertFalse(menu.findItem(R.id.contextmenu_copy_link_text).isVisible());
407 assertFalse(menu.findItem(R.id.contextmenu_save_link_as).isVisible());
408 assertFalse(menu.findItem(R.id.contextmenu_save_video).isVisible());
409 }
410
411 /**
412 * Test the entries in the context menu shown when long clicking an tel url.
413 * @SmallTest
414 * @RetryOnFailure
415 */
416 @DisabledTest
417 public void testContextMenuEntriesForTel() throws InterruptedException, Time outException {
418 startCustomTabActivityWithIntent(createMinimalCustomTabIntent());
419
420 final int expectedMenuSize = 12;
421 Menu menu = ContextMenuUtils.openContextMenu(this, getActivity().getActi vityTab(), "tel");
422 assertEquals(expectedMenuSize, menu.size());
423
424 assertNotNull(menu.findItem(R.id.contextmenu_copy_link_address));
425 assertNotNull(menu.findItem(R.id.contextmenu_call));
426 assertNotNull(menu.findItem(R.id.contextmenu_send_message));
427 assertNotNull(menu.findItem(R.id.contextmenu_add_to_contacts));
428 assertNotNull(menu.findItem(R.id.contextmenu_copy));
429 assertNotNull(menu.findItem(R.id.contextmenu_copy_link_text));
430 assertNotNull(menu.findItem(R.id.contextmenu_save_link_as));
431 assertNotNull(menu.findItem(R.id.contextmenu_save_image));
432 assertNotNull(menu.findItem(R.id.contextmenu_share_image));
433 assertNotNull(menu.findItem(R.id.contextmenu_open_image));
434 assertNotNull(menu.findItem(R.id.contextmenu_save_video));
435
436 assertTrue(menu.findItem(R.id.contextmenu_call).isVisible());
437 assertTrue(menu.findItem(R.id.contextmenu_send_message).isVisible());
438 assertTrue(menu.findItem(R.id.contextmenu_add_to_contacts).isVisible());
439 assertTrue(menu.findItem(R.id.contextmenu_copy).isVisible());
394 440
395 assertFalse(menu.findItem(R.id.contextmenu_copy_link_address).isVisible( )); 441 assertFalse(menu.findItem(R.id.contextmenu_copy_link_address).isVisible( ));
396 assertFalse(menu.findItem(R.id.contextmenu_save_image).isVisible()); 442 assertFalse(menu.findItem(R.id.contextmenu_save_image).isVisible());
397 assertFalse(menu.findItem(R.id.contextmenu_share_image).isVisible()); 443 assertFalse(menu.findItem(R.id.contextmenu_share_image).isVisible());
398 assertFalse(menu.findItem(R.id.contextmenu_open_image).isVisible()); 444 assertFalse(menu.findItem(R.id.contextmenu_open_image).isVisible());
399 assertFalse(menu.findItem(R.id.contextmenu_search_by_image).isVisible()) ; 445 assertFalse(menu.findItem(R.id.contextmenu_search_by_image).isVisible()) ;
400 assertFalse(menu.findItem(R.id.contextmenu_copy_link_text).isVisible()); 446 assertFalse(menu.findItem(R.id.contextmenu_copy_link_text).isVisible());
401 assertFalse(menu.findItem(R.id.contextmenu_save_link_as).isVisible()); 447 assertFalse(menu.findItem(R.id.contextmenu_save_link_as).isVisible());
402 assertFalse(menu.findItem(R.id.contextmenu_save_video).isVisible()); 448 assertFalse(menu.findItem(R.id.contextmenu_save_video).isVisible());
403 } 449 }
(...skipping 1500 matching lines...) Expand 10 before | Expand all | Expand 10 after
1904 if (jsonText.equalsIgnoreCase("null")) jsonText = ""; 1950 if (jsonText.equalsIgnoreCase("null")) jsonText = "";
1905 value = jsonText; 1951 value = jsonText;
1906 } catch (InterruptedException | TimeoutException e) { 1952 } catch (InterruptedException | TimeoutException e) {
1907 e.printStackTrace(); 1953 e.printStackTrace();
1908 return false; 1954 return false;
1909 } 1955 }
1910 return TextUtils.equals(mExpected, value); 1956 return TextUtils.equals(mExpected, value);
1911 } 1957 }
1912 } 1958 }
1913 } 1959 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698