OLD | NEW |
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 #include "base/bind.h" | 5 #include "base/bind.h" |
6 #include "base/json/json_string_value_serializer.h" | 6 #include "base/json/json_string_value_serializer.h" |
7 #include "base/memory/ref_counted_memory.h" | 7 #include "base/memory/ref_counted_memory.h" |
8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
9 #include "base/strings/stringprintf.h" | 9 #include "base/strings/stringprintf.h" |
10 #include "extensions/browser/api/printer_provider/printer_provider_api.h" | 10 #include "extensions/browser/api/printer_provider/printer_provider_api.h" |
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
332 | 332 |
333 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); | 333 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); |
334 | 334 |
335 run_loop.Run(); | 335 run_loop.Run(); |
336 | 336 |
337 std::vector<std::string> expected_printers; | 337 std::vector<std::string> expected_printers; |
338 expected_printers.push_back(base::StringPrintf( | 338 expected_printers.push_back(base::StringPrintf( |
339 "{" | 339 "{" |
340 "\"description\":\"Test printer\"," | 340 "\"description\":\"Test printer\"," |
341 "\"extensionId\":\"%s\"," | 341 "\"extensionId\":\"%s\"," |
| 342 "\"extensionName\": \"Test printer provider\"," |
342 "\"id\":\"%s:printer1\"," | 343 "\"id\":\"%s:printer1\"," |
343 "\"name\":\"Printer 1\"" | 344 "\"name\":\"Printer 1\"" |
344 "}", | 345 "}", |
345 extension_id.c_str(), extension_id.c_str())); | 346 extension_id.c_str(), extension_id.c_str())); |
346 expected_printers.push_back(base::StringPrintf( | 347 expected_printers.push_back(base::StringPrintf( |
347 "{" | 348 "{" |
348 "\"extensionId\":\"%s\"," | 349 "\"extensionId\":\"%s\"," |
| 350 "\"extensionName\": \"Test printer provider\"," |
349 "\"id\":\"%s:printerNoDesc\"," | 351 "\"id\":\"%s:printerNoDesc\"," |
350 "\"name\":\"Printer 2\"" | 352 "\"name\":\"Printer 2\"" |
351 "}", | 353 "}", |
352 extension_id.c_str(), extension_id.c_str())); | 354 extension_id.c_str(), extension_id.c_str())); |
353 | 355 |
354 ValidatePrinterListValue(printers, expected_printers); | 356 ValidatePrinterListValue(printers, expected_printers); |
355 } | 357 } |
356 | 358 |
357 IN_PROC_BROWSER_TEST_F(PrinterProviderApiTest, GetPrintersAsyncSuccess) { | 359 IN_PROC_BROWSER_TEST_F(PrinterProviderApiTest, GetPrintersAsyncSuccess) { |
358 extensions::ResultCatcher catcher; | 360 extensions::ResultCatcher catcher; |
(...skipping 11 matching lines...) Expand all Loading... |
370 | 372 |
371 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); | 373 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); |
372 | 374 |
373 run_loop.Run(); | 375 run_loop.Run(); |
374 | 376 |
375 std::vector<std::string> expected_printers; | 377 std::vector<std::string> expected_printers; |
376 expected_printers.push_back(base::StringPrintf( | 378 expected_printers.push_back(base::StringPrintf( |
377 "{" | 379 "{" |
378 "\"description\":\"Test printer\"," | 380 "\"description\":\"Test printer\"," |
379 "\"extensionId\":\"%s\"," | 381 "\"extensionId\":\"%s\"," |
| 382 "\"extensionName\": \"Test printer provider\"," |
380 "\"id\":\"%s:printer1\"," | 383 "\"id\":\"%s:printer1\"," |
381 "\"name\":\"Printer 1\"" | 384 "\"name\":\"Printer 1\"" |
382 "}", | 385 "}", |
383 extension_id.c_str(), extension_id.c_str())); | 386 extension_id.c_str(), extension_id.c_str())); |
384 | 387 |
385 ValidatePrinterListValue(printers, expected_printers); | 388 ValidatePrinterListValue(printers, expected_printers); |
386 } | 389 } |
387 | 390 |
388 IN_PROC_BROWSER_TEST_F(PrinterProviderApiTest, GetPrintersTwoExtensions) { | 391 IN_PROC_BROWSER_TEST_F(PrinterProviderApiTest, GetPrintersTwoExtensions) { |
389 extensions::ResultCatcher catcher; | 392 extensions::ResultCatcher catcher; |
(...skipping 18 matching lines...) Expand all Loading... |
408 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); | 411 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); |
409 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); | 412 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); |
410 | 413 |
411 run_loop.Run(); | 414 run_loop.Run(); |
412 | 415 |
413 std::vector<std::string> expected_printers; | 416 std::vector<std::string> expected_printers; |
414 expected_printers.push_back(base::StringPrintf( | 417 expected_printers.push_back(base::StringPrintf( |
415 "{" | 418 "{" |
416 "\"description\":\"Test printer\"," | 419 "\"description\":\"Test printer\"," |
417 "\"extensionId\":\"%s\"," | 420 "\"extensionId\":\"%s\"," |
| 421 "\"extensionName\": \"Test printer provider\"," |
418 "\"id\":\"%s:printer1\"," | 422 "\"id\":\"%s:printer1\"," |
419 "\"name\":\"Printer 1\"" | 423 "\"name\":\"Printer 1\"" |
420 "}", | 424 "}", |
421 extension_id_1.c_str(), extension_id_1.c_str())); | 425 extension_id_1.c_str(), extension_id_1.c_str())); |
422 expected_printers.push_back(base::StringPrintf( | 426 expected_printers.push_back(base::StringPrintf( |
423 "{" | 427 "{" |
424 "\"extensionId\":\"%s\"," | 428 "\"extensionId\":\"%s\"," |
| 429 "\"extensionName\": \"Test printer provider\"," |
425 "\"id\":\"%s:printerNoDesc\"," | 430 "\"id\":\"%s:printerNoDesc\"," |
426 "\"name\":\"Printer 2\"" | 431 "\"name\":\"Printer 2\"" |
427 "}", | 432 "}", |
428 extension_id_1.c_str(), extension_id_1.c_str())); | 433 extension_id_1.c_str(), extension_id_1.c_str())); |
429 expected_printers.push_back(base::StringPrintf( | 434 expected_printers.push_back(base::StringPrintf( |
430 "{" | 435 "{" |
431 "\"description\":\"Test printer\"," | 436 "\"description\":\"Test printer\"," |
432 "\"extensionId\":\"%s\"," | 437 "\"extensionId\":\"%s\"," |
| 438 "\"extensionName\": \"Test printer provider\"," |
433 "\"id\":\"%s:printer1\"," | 439 "\"id\":\"%s:printer1\"," |
434 "\"name\":\"Printer 1\"" | 440 "\"name\":\"Printer 1\"" |
435 "}", | 441 "}", |
436 extension_id_2.c_str(), extension_id_2.c_str())); | 442 extension_id_2.c_str(), extension_id_2.c_str())); |
437 expected_printers.push_back(base::StringPrintf( | 443 expected_printers.push_back(base::StringPrintf( |
438 "{" | 444 "{" |
439 "\"extensionId\":\"%s\"," | 445 "\"extensionId\":\"%s\"," |
| 446 "\"extensionName\": \"Test printer provider\"," |
440 "\"id\":\"%s:printerNoDesc\"," | 447 "\"id\":\"%s:printerNoDesc\"," |
441 "\"name\":\"Printer 2\"" | 448 "\"name\":\"Printer 2\"" |
442 "}", | 449 "}", |
443 extension_id_2.c_str(), extension_id_2.c_str())); | 450 extension_id_2.c_str(), extension_id_2.c_str())); |
444 | 451 |
445 ValidatePrinterListValue(printers, expected_printers); | 452 ValidatePrinterListValue(printers, expected_printers); |
446 } | 453 } |
447 | 454 |
448 IN_PROC_BROWSER_TEST_F(PrinterProviderApiTest, | 455 IN_PROC_BROWSER_TEST_F(PrinterProviderApiTest, |
449 GetPrintersTwoExtensionsBothUnloaded) { | 456 GetPrintersTwoExtensionsBothUnloaded) { |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
501 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); | 508 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); |
502 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); | 509 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); |
503 | 510 |
504 run_loop.Run(); | 511 run_loop.Run(); |
505 | 512 |
506 std::vector<std::string> expected_printers; | 513 std::vector<std::string> expected_printers; |
507 expected_printers.push_back(base::StringPrintf( | 514 expected_printers.push_back(base::StringPrintf( |
508 "{" | 515 "{" |
509 "\"description\":\"Test printer\"," | 516 "\"description\":\"Test printer\"," |
510 "\"extensionId\":\"%s\"," | 517 "\"extensionId\":\"%s\"," |
| 518 "\"extensionName\": \"Test printer provider\"," |
511 "\"id\":\"%s:printer1\"," | 519 "\"id\":\"%s:printer1\"," |
512 "\"name\":\"Printer 1\"" | 520 "\"name\":\"Printer 1\"" |
513 "}", | 521 "}", |
514 extension_id_2.c_str(), extension_id_2.c_str())); | 522 extension_id_2.c_str(), extension_id_2.c_str())); |
515 expected_printers.push_back(base::StringPrintf( | 523 expected_printers.push_back(base::StringPrintf( |
516 "{" | 524 "{" |
517 "\"extensionId\":\"%s\"," | 525 "\"extensionId\":\"%s\"," |
| 526 "\"extensionName\": \"Test printer provider\"," |
518 "\"id\":\"%s:printerNoDesc\"," | 527 "\"id\":\"%s:printerNoDesc\"," |
519 "\"name\":\"Printer 2\"" | 528 "\"name\":\"Printer 2\"" |
520 "}", | 529 "}", |
521 extension_id_2.c_str(), extension_id_2.c_str())); | 530 extension_id_2.c_str(), extension_id_2.c_str())); |
522 | 531 |
523 ValidatePrinterListValue(printers, expected_printers); | 532 ValidatePrinterListValue(printers, expected_printers); |
524 } | 533 } |
525 | 534 |
526 IN_PROC_BROWSER_TEST_F(PrinterProviderApiTest, | 535 IN_PROC_BROWSER_TEST_F(PrinterProviderApiTest, |
527 GetPrintersTwoExtensionsOneWithNoListener) { | 536 GetPrintersTwoExtensionsOneWithNoListener) { |
(...skipping 19 matching lines...) Expand all Loading... |
547 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); | 556 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); |
548 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); | 557 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); |
549 | 558 |
550 run_loop.Run(); | 559 run_loop.Run(); |
551 | 560 |
552 std::vector<std::string> expected_printers; | 561 std::vector<std::string> expected_printers; |
553 expected_printers.push_back(base::StringPrintf( | 562 expected_printers.push_back(base::StringPrintf( |
554 "{" | 563 "{" |
555 "\"description\":\"Test printer\"," | 564 "\"description\":\"Test printer\"," |
556 "\"extensionId\":\"%s\"," | 565 "\"extensionId\":\"%s\"," |
| 566 "\"extensionName\": \"Test printer provider\"," |
557 "\"id\":\"%s:printer1\"," | 567 "\"id\":\"%s:printer1\"," |
558 "\"name\":\"Printer 1\"" | 568 "\"name\":\"Printer 1\"" |
559 "}", | 569 "}", |
560 extension_id_2.c_str(), extension_id_2.c_str())); | 570 extension_id_2.c_str(), extension_id_2.c_str())); |
561 expected_printers.push_back(base::StringPrintf( | 571 expected_printers.push_back(base::StringPrintf( |
562 "{" | 572 "{" |
563 "\"extensionId\":\"%s\"," | 573 "\"extensionId\":\"%s\"," |
| 574 "\"extensionName\": \"Test printer provider\"," |
564 "\"id\":\"%s:printerNoDesc\"," | 575 "\"id\":\"%s:printerNoDesc\"," |
565 "\"name\":\"Printer 2\"" | 576 "\"name\":\"Printer 2\"" |
566 "}", | 577 "}", |
567 extension_id_2.c_str(), extension_id_2.c_str())); | 578 extension_id_2.c_str(), extension_id_2.c_str())); |
568 | 579 |
569 ValidatePrinterListValue(printers, expected_printers); | 580 ValidatePrinterListValue(printers, expected_printers); |
570 } | 581 } |
571 | 582 |
572 IN_PROC_BROWSER_TEST_F(PrinterProviderApiTest, GetPrintersNoListener) { | 583 IN_PROC_BROWSER_TEST_F(PrinterProviderApiTest, GetPrintersNoListener) { |
573 extensions::ResultCatcher catcher; | 584 extensions::ResultCatcher catcher; |
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
648 &printers, run_loop.QuitClosure())); | 659 &printers, run_loop.QuitClosure())); |
649 | 660 |
650 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); | 661 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); |
651 | 662 |
652 run_loop.Run(); | 663 run_loop.Run(); |
653 | 664 |
654 EXPECT_TRUE(printers.empty()); | 665 EXPECT_TRUE(printers.empty()); |
655 } | 666 } |
656 | 667 |
657 } // namespace | 668 } // namespace |
OLD | NEW |