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

Side by Side Diff: device/battery/battery_status_manager_linux_unittest.cc

Issue 2801173004: Add '.mojom' suffix for battery mojom modules. (Closed)
Patch Set: Rebase only Created 3 years, 8 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "device/battery/battery_status_manager_linux.h" 5 #include "device/battery/battery_status_manager_linux.h"
6 6
7 #include <limits> 7 #include <limits>
8 #include <list> 8 #include <list>
9 #include <string> 9 #include <string>
10 10
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after
360 void DeviceSignalChanged(MockBatteryObject* device); 360 void DeviceSignalChanged(MockBatteryObject* device);
361 void DeviceSignalPropertyChanged(MockBatteryObject* device, 361 void DeviceSignalPropertyChanged(MockBatteryObject* device,
362 const std::string& property_name); 362 const std::string& property_name);
363 363
364 void UPowerSignalDeviceAdded(const std::string& device_path); 364 void UPowerSignalDeviceAdded(const std::string& device_path);
365 void UPowerSignalDeviceRemoved(const std::string& device_path); 365 void UPowerSignalDeviceRemoved(const std::string& device_path);
366 366
367 void StartBatteryStatusManagerLinux(); 367 void StartBatteryStatusManagerLinux();
368 368
369 int count_battery_updates() const { return count_battery_updates_; } 369 int count_battery_updates() const { return count_battery_updates_; }
370 const BatteryStatus& last_battery_status() const { return last_status_; } 370 const mojom::BatteryStatus& last_battery_status() const {
371 return last_status_;
372 }
371 373
372 protected: 374 protected:
373 scoped_refptr<dbus::MockBus> mock_bus_; 375 scoped_refptr<dbus::MockBus> mock_bus_;
374 MockUPowerObject mock_upower_; 376 MockUPowerObject mock_upower_;
375 std::unique_ptr<MockBatteryObject> mock_display_device_; 377 std::unique_ptr<MockBatteryObject> mock_display_device_;
376 std::list<std::unique_ptr<MockBatteryObject>> mock_battery_devices_; 378 std::list<std::unique_ptr<MockBatteryObject>> mock_battery_devices_;
377 379
378 private: 380 private:
379 std::unique_ptr<MockBatteryObject> CreateMockBatteryObject( 381 std::unique_ptr<MockBatteryObject> CreateMockBatteryObject(
380 const std::string& object_path, 382 const std::string& object_path,
381 MockBatteryProperties* properties); 383 MockBatteryProperties* properties);
382 void BatteryUpdateCallback(const BatteryStatus& status); 384 void BatteryUpdateCallback(const mojom::BatteryStatus& status);
383 void SyncWithNotifierThread(); 385 void SyncWithNotifierThread();
384 386
385 std::unique_ptr<BatteryStatusManagerLinux> manager_; 387 std::unique_ptr<BatteryStatusManagerLinux> manager_;
386 int count_battery_updates_ = 0; 388 int count_battery_updates_ = 0;
387 BatteryStatus last_status_; 389 mojom::BatteryStatus last_status_;
388 390
389 DISALLOW_COPY_AND_ASSIGN(BatteryStatusManagerLinuxTest); 391 DISALLOW_COPY_AND_ASSIGN(BatteryStatusManagerLinuxTest);
390 }; 392 };
391 393
392 void BatteryStatusManagerLinuxTest::SetUp() { 394 void BatteryStatusManagerLinuxTest::SetUp() {
393 dbus::Bus::Options options; 395 dbus::Bus::Options options;
394 options.bus_type = dbus::Bus::SYSTEM; 396 options.bus_type = dbus::Bus::SYSTEM;
395 options.connection_type = dbus::Bus::PRIVATE; 397 options.connection_type = dbus::Bus::PRIVATE;
396 mock_bus_ = new NiceMock<dbus::MockBus>(options); 398 mock_bus_ = new NiceMock<dbus::MockBus>(options);
397 399
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
512 std::unique_ptr<MockBatteryObject> mock_object( 514 std::unique_ptr<MockBatteryObject> mock_object(
513 new MockBatteryObject(mock_bus_.get(), object_path, properties)); 515 new MockBatteryObject(mock_bus_.get(), object_path, properties));
514 ExpectGetObjectProxy(object_path, mock_object.get()); 516 ExpectGetObjectProxy(object_path, mock_object.get());
515 EXPECT_CALL(*mock_object->proxy.get(), MockCallMethodAndBlock(_, _)) 517 EXPECT_CALL(*mock_object->proxy.get(), MockCallMethodAndBlock(_, _))
516 .WillRepeatedly(Invoke(mock_object.get(), 518 .WillRepeatedly(Invoke(mock_object.get(),
517 &MockBatteryObject::CreateCallMethodResponse)); 519 &MockBatteryObject::CreateCallMethodResponse));
518 return mock_object; 520 return mock_object;
519 } 521 }
520 522
521 void BatteryStatusManagerLinuxTest::BatteryUpdateCallback( 523 void BatteryStatusManagerLinuxTest::BatteryUpdateCallback(
522 const BatteryStatus& status) { 524 const mojom::BatteryStatus& status) {
523 ++count_battery_updates_; 525 ++count_battery_updates_;
524 last_status_ = status; 526 last_status_ = status;
525 } 527 }
526 528
527 void BatteryStatusManagerLinuxTest::SyncWithNotifierThread() { 529 void BatteryStatusManagerLinuxTest::SyncWithNotifierThread() {
528 ASSERT_TRUE(manager_ != nullptr); 530 ASSERT_TRUE(manager_ != nullptr);
529 base::WaitableEvent event(base::WaitableEvent::ResetPolicy::MANUAL, 531 base::WaitableEvent event(base::WaitableEvent::ResetPolicy::MANUAL,
530 base::WaitableEvent::InitialState::NOT_SIGNALED); 532 base::WaitableEvent::InitialState::NOT_SIGNALED);
531 manager_->GetNotifierThreadForTesting()->task_runner()->PostTask( 533 manager_->GetNotifierThreadForTesting()->task_runner()->PostTask(
532 FROM_HERE, 534 FROM_HERE,
533 base::Bind(&base::WaitableEvent::Signal, base::Unretained(&event))); 535 base::Bind(&base::WaitableEvent::Signal, base::Unretained(&event)));
534 event.Wait(); 536 event.Wait();
535 } 537 }
536 538
537 TEST_F(BatteryStatusManagerLinuxTest, NoBattery) { 539 TEST_F(BatteryStatusManagerLinuxTest, NoBattery) {
538 BatteryStatus default_status; 540 mojom::BatteryStatus default_status;
539 StartBatteryStatusManagerLinux(); 541 StartBatteryStatusManagerLinux();
540 BatteryStatus status = last_battery_status(); 542 mojom::BatteryStatus status = last_battery_status();
541 EXPECT_LE(1, count_battery_updates()); 543 EXPECT_LE(1, count_battery_updates());
542 544
543 EXPECT_EQ(default_status.charging, status.charging); 545 EXPECT_EQ(default_status.charging, status.charging);
544 EXPECT_EQ(default_status.charging_time, status.charging_time); 546 EXPECT_EQ(default_status.charging_time, status.charging_time);
545 EXPECT_EQ(default_status.discharging_time, status.discharging_time); 547 EXPECT_EQ(default_status.discharging_time, status.discharging_time);
546 EXPECT_EQ(default_status.level, status.level); 548 EXPECT_EQ(default_status.level, status.level);
547 } 549 }
548 550
549 TEST_F(BatteryStatusManagerLinuxTest, ChargingHalfFull) { 551 TEST_F(BatteryStatusManagerLinuxTest, ChargingHalfFull) {
550 MockBatteryProperties battery_bat0_properties; 552 MockBatteryProperties battery_bat0_properties;
551 battery_bat0_properties.state = 553 battery_bat0_properties.state =
552 UPowerDeviceState::UPOWER_DEVICE_STATE_CHARGING; 554 UPowerDeviceState::UPOWER_DEVICE_STATE_CHARGING;
553 battery_bat0_properties.time_to_full = 0; 555 battery_bat0_properties.time_to_full = 0;
554 battery_bat0_properties.percentage = 50; 556 battery_bat0_properties.percentage = 50;
555 AddDeviceProxy(kUPowerDeviceBattery0Path, &battery_bat0_properties) 557 AddDeviceProxy(kUPowerDeviceBattery0Path, &battery_bat0_properties)
556 .ExpectConnectToSignalPropertyChanged(); 558 .ExpectConnectToSignalPropertyChanged();
557 559
558 StartBatteryStatusManagerLinux(); 560 StartBatteryStatusManagerLinux();
559 BatteryStatus status = last_battery_status(); 561 mojom::BatteryStatus status = last_battery_status();
560 EXPECT_LE(1, count_battery_updates()); 562 EXPECT_LE(1, count_battery_updates());
561 563
562 EXPECT_TRUE(status.charging); 564 EXPECT_TRUE(status.charging);
563 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.charging_time); 565 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.charging_time);
564 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.discharging_time); 566 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.discharging_time);
565 EXPECT_EQ(0.5, status.level); 567 EXPECT_EQ(0.5, status.level);
566 } 568 }
567 569
568 TEST_F(BatteryStatusManagerLinuxTest, ChargingTimeToFull) { 570 TEST_F(BatteryStatusManagerLinuxTest, ChargingTimeToFull) {
569 MockBatteryProperties battery_bat0_properties; 571 MockBatteryProperties battery_bat0_properties;
570 battery_bat0_properties.state = 572 battery_bat0_properties.state =
571 UPowerDeviceState::UPOWER_DEVICE_STATE_CHARGING; 573 UPowerDeviceState::UPOWER_DEVICE_STATE_CHARGING;
572 battery_bat0_properties.time_to_full = 100; 574 battery_bat0_properties.time_to_full = 100;
573 battery_bat0_properties.percentage = 1; 575 battery_bat0_properties.percentage = 1;
574 AddDeviceProxy(kUPowerDeviceBattery0Path, &battery_bat0_properties) 576 AddDeviceProxy(kUPowerDeviceBattery0Path, &battery_bat0_properties)
575 .ExpectConnectToSignalPropertyChanged(); 577 .ExpectConnectToSignalPropertyChanged();
576 578
577 StartBatteryStatusManagerLinux(); 579 StartBatteryStatusManagerLinux();
578 BatteryStatus status = last_battery_status(); 580 mojom::BatteryStatus status = last_battery_status();
579 EXPECT_LE(1, count_battery_updates()); 581 EXPECT_LE(1, count_battery_updates());
580 582
581 EXPECT_TRUE(status.charging); 583 EXPECT_TRUE(status.charging);
582 EXPECT_EQ(100, status.charging_time); 584 EXPECT_EQ(100, status.charging_time);
583 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.discharging_time); 585 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.discharging_time);
584 EXPECT_EQ(.01, status.level); 586 EXPECT_EQ(.01, status.level);
585 } 587 }
586 588
587 TEST_F(BatteryStatusManagerLinuxTest, FullyCharged) { 589 TEST_F(BatteryStatusManagerLinuxTest, FullyCharged) {
588 MockBatteryProperties battery_bat0_properties; 590 MockBatteryProperties battery_bat0_properties;
589 battery_bat0_properties.state = UPowerDeviceState::UPOWER_DEVICE_STATE_FULL; 591 battery_bat0_properties.state = UPowerDeviceState::UPOWER_DEVICE_STATE_FULL;
590 battery_bat0_properties.time_to_full = 100; 592 battery_bat0_properties.time_to_full = 100;
591 battery_bat0_properties.time_to_empty = 200; 593 battery_bat0_properties.time_to_empty = 200;
592 battery_bat0_properties.percentage = 100; 594 battery_bat0_properties.percentage = 100;
593 AddDeviceProxy(kUPowerDeviceBattery0Path, &battery_bat0_properties) 595 AddDeviceProxy(kUPowerDeviceBattery0Path, &battery_bat0_properties)
594 .ExpectConnectToSignalPropertyChanged(); 596 .ExpectConnectToSignalPropertyChanged();
595 597
596 StartBatteryStatusManagerLinux(); 598 StartBatteryStatusManagerLinux();
597 BatteryStatus status = last_battery_status(); 599 mojom::BatteryStatus status = last_battery_status();
598 EXPECT_LE(1, count_battery_updates()); 600 EXPECT_LE(1, count_battery_updates());
599 601
600 EXPECT_TRUE(status.charging); 602 EXPECT_TRUE(status.charging);
601 EXPECT_EQ(0, status.charging_time); 603 EXPECT_EQ(0, status.charging_time);
602 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.discharging_time); 604 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.discharging_time);
603 EXPECT_EQ(1, status.level); 605 EXPECT_EQ(1, status.level);
604 } 606 }
605 607
606 TEST_F(BatteryStatusManagerLinuxTest, Discharging) { 608 TEST_F(BatteryStatusManagerLinuxTest, Discharging) {
607 MockBatteryProperties battery_bat0_properties; 609 MockBatteryProperties battery_bat0_properties;
608 battery_bat0_properties.state = 610 battery_bat0_properties.state =
609 UPowerDeviceState::UPOWER_DEVICE_STATE_DISCHARGING; 611 UPowerDeviceState::UPOWER_DEVICE_STATE_DISCHARGING;
610 battery_bat0_properties.time_to_full = 0; 612 battery_bat0_properties.time_to_full = 0;
611 battery_bat0_properties.time_to_empty = 200; 613 battery_bat0_properties.time_to_empty = 200;
612 battery_bat0_properties.percentage = 90; 614 battery_bat0_properties.percentage = 90;
613 AddDeviceProxy(kUPowerDeviceBattery0Path, &battery_bat0_properties) 615 AddDeviceProxy(kUPowerDeviceBattery0Path, &battery_bat0_properties)
614 .ExpectConnectToSignalPropertyChanged(); 616 .ExpectConnectToSignalPropertyChanged();
615 617
616 StartBatteryStatusManagerLinux(); 618 StartBatteryStatusManagerLinux();
617 BatteryStatus status = last_battery_status(); 619 mojom::BatteryStatus status = last_battery_status();
618 EXPECT_LE(1, count_battery_updates()); 620 EXPECT_LE(1, count_battery_updates());
619 621
620 EXPECT_FALSE(status.charging); 622 EXPECT_FALSE(status.charging);
621 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.charging_time); 623 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.charging_time);
622 EXPECT_EQ(200, status.discharging_time); 624 EXPECT_EQ(200, status.discharging_time);
623 EXPECT_EQ(.9, status.level); 625 EXPECT_EQ(.9, status.level);
624 } 626 }
625 627
626 TEST_F(BatteryStatusManagerLinuxTest, DischargingTimeToEmptyUnknown) { 628 TEST_F(BatteryStatusManagerLinuxTest, DischargingTimeToEmptyUnknown) {
627 MockBatteryProperties battery_bat0_properties; 629 MockBatteryProperties battery_bat0_properties;
628 battery_bat0_properties.state = 630 battery_bat0_properties.state =
629 UPowerDeviceState::UPOWER_DEVICE_STATE_DISCHARGING; 631 UPowerDeviceState::UPOWER_DEVICE_STATE_DISCHARGING;
630 battery_bat0_properties.time_to_full = 0; 632 battery_bat0_properties.time_to_full = 0;
631 battery_bat0_properties.time_to_empty = 0; 633 battery_bat0_properties.time_to_empty = 0;
632 battery_bat0_properties.percentage = 90; 634 battery_bat0_properties.percentage = 90;
633 AddDeviceProxy(kUPowerDeviceBattery0Path, &battery_bat0_properties) 635 AddDeviceProxy(kUPowerDeviceBattery0Path, &battery_bat0_properties)
634 .ExpectConnectToSignalPropertyChanged(); 636 .ExpectConnectToSignalPropertyChanged();
635 637
636 StartBatteryStatusManagerLinux(); 638 StartBatteryStatusManagerLinux();
637 BatteryStatus status = last_battery_status(); 639 mojom::BatteryStatus status = last_battery_status();
638 EXPECT_LE(1, count_battery_updates()); 640 EXPECT_LE(1, count_battery_updates());
639 641
640 EXPECT_FALSE(status.charging); 642 EXPECT_FALSE(status.charging);
641 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.charging_time); 643 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.charging_time);
642 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.discharging_time); 644 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.discharging_time);
643 EXPECT_EQ(.9, status.level); 645 EXPECT_EQ(.9, status.level);
644 } 646 }
645 647
646 TEST_F(BatteryStatusManagerLinuxTest, DeviceStateUnknown) { 648 TEST_F(BatteryStatusManagerLinuxTest, DeviceStateUnknown) {
647 MockBatteryProperties battery_bat0_properties; 649 MockBatteryProperties battery_bat0_properties;
648 battery_bat0_properties.state = 650 battery_bat0_properties.state =
649 UPowerDeviceState::UPOWER_DEVICE_STATE_UNKNOWN; 651 UPowerDeviceState::UPOWER_DEVICE_STATE_UNKNOWN;
650 battery_bat0_properties.time_to_full = 0; 652 battery_bat0_properties.time_to_full = 0;
651 battery_bat0_properties.time_to_empty = 0; 653 battery_bat0_properties.time_to_empty = 0;
652 battery_bat0_properties.percentage = 50; 654 battery_bat0_properties.percentage = 50;
653 AddDeviceProxy(kUPowerDeviceBattery0Path, &battery_bat0_properties) 655 AddDeviceProxy(kUPowerDeviceBattery0Path, &battery_bat0_properties)
654 .ExpectConnectToSignalPropertyChanged(); 656 .ExpectConnectToSignalPropertyChanged();
655 657
656 StartBatteryStatusManagerLinux(); 658 StartBatteryStatusManagerLinux();
657 BatteryStatus status = last_battery_status(); 659 mojom::BatteryStatus status = last_battery_status();
658 EXPECT_LE(1, count_battery_updates()); 660 EXPECT_LE(1, count_battery_updates());
659 661
660 EXPECT_TRUE(status.charging); 662 EXPECT_TRUE(status.charging);
661 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.charging_time); 663 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.charging_time);
662 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.discharging_time); 664 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.discharging_time);
663 EXPECT_EQ(.5, status.level); 665 EXPECT_EQ(.5, status.level);
664 } 666 }
665 667
666 TEST_F(BatteryStatusManagerLinuxTest, DeviceStateEmpty) { 668 TEST_F(BatteryStatusManagerLinuxTest, DeviceStateEmpty) {
667 MockBatteryProperties battery_bat0_properties; 669 MockBatteryProperties battery_bat0_properties;
668 battery_bat0_properties.state = UPowerDeviceState::UPOWER_DEVICE_STATE_EMPTY; 670 battery_bat0_properties.state = UPowerDeviceState::UPOWER_DEVICE_STATE_EMPTY;
669 battery_bat0_properties.time_to_full = 0; 671 battery_bat0_properties.time_to_full = 0;
670 battery_bat0_properties.time_to_empty = 0; 672 battery_bat0_properties.time_to_empty = 0;
671 battery_bat0_properties.percentage = 0; 673 battery_bat0_properties.percentage = 0;
672 AddDeviceProxy(kUPowerDeviceBattery0Path, &battery_bat0_properties) 674 AddDeviceProxy(kUPowerDeviceBattery0Path, &battery_bat0_properties)
673 .ExpectConnectToSignalPropertyChanged(); 675 .ExpectConnectToSignalPropertyChanged();
674 676
675 StartBatteryStatusManagerLinux(); 677 StartBatteryStatusManagerLinux();
676 BatteryStatus status = last_battery_status(); 678 mojom::BatteryStatus status = last_battery_status();
677 EXPECT_LE(1, count_battery_updates()); 679 EXPECT_LE(1, count_battery_updates());
678 680
679 EXPECT_FALSE(status.charging); 681 EXPECT_FALSE(status.charging);
680 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.charging_time); 682 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.charging_time);
681 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.discharging_time); 683 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.discharging_time);
682 EXPECT_EQ(0, status.level); 684 EXPECT_EQ(0, status.level);
683 } 685 }
684 686
685 TEST_F(BatteryStatusManagerLinuxTest, LevelRoundedToThreeSignificantDigits) { 687 TEST_F(BatteryStatusManagerLinuxTest, LevelRoundedToThreeSignificantDigits) {
686 MockBatteryProperties battery_bat0_properties; 688 MockBatteryProperties battery_bat0_properties;
687 battery_bat0_properties.state = 689 battery_bat0_properties.state =
688 UPowerDeviceState::UPOWER_DEVICE_STATE_DISCHARGING; 690 UPowerDeviceState::UPOWER_DEVICE_STATE_DISCHARGING;
689 battery_bat0_properties.percentage = 14.56; 691 battery_bat0_properties.percentage = 14.56;
690 AddDeviceProxy(kUPowerDeviceBattery0Path, &battery_bat0_properties) 692 AddDeviceProxy(kUPowerDeviceBattery0Path, &battery_bat0_properties)
691 .ExpectConnectToSignalPropertyChanged(); 693 .ExpectConnectToSignalPropertyChanged();
692 694
693 StartBatteryStatusManagerLinux(); 695 StartBatteryStatusManagerLinux();
694 BatteryStatus status = last_battery_status(); 696 mojom::BatteryStatus status = last_battery_status();
695 EXPECT_LE(1, count_battery_updates()); 697 EXPECT_LE(1, count_battery_updates());
696 698
697 EXPECT_FALSE(status.charging); 699 EXPECT_FALSE(status.charging);
698 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.charging_time); 700 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.charging_time);
699 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.discharging_time); 701 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.discharging_time);
700 EXPECT_EQ(0.15, status.level); 702 EXPECT_EQ(0.15, status.level);
701 } 703 }
702 704
703 TEST_F(BatteryStatusManagerLinuxTest, UsingFirstBatteryDevice) { 705 TEST_F(BatteryStatusManagerLinuxTest, UsingFirstBatteryDevice) {
704 MockBatteryProperties battery_bat0_properties; 706 MockBatteryProperties battery_bat0_properties;
705 battery_bat0_properties.state = 707 battery_bat0_properties.state =
706 UPowerDeviceState::UPOWER_DEVICE_STATE_DISCHARGING; 708 UPowerDeviceState::UPOWER_DEVICE_STATE_DISCHARGING;
707 battery_bat0_properties.time_to_full = 0; 709 battery_bat0_properties.time_to_full = 0;
708 battery_bat0_properties.time_to_empty = 200; 710 battery_bat0_properties.time_to_empty = 200;
709 battery_bat0_properties.percentage = 70; 711 battery_bat0_properties.percentage = 70;
710 AddDeviceProxy(kUPowerDeviceBattery0Path, &battery_bat0_properties) 712 AddDeviceProxy(kUPowerDeviceBattery0Path, &battery_bat0_properties)
711 .ExpectConnectToSignalPropertyChanged(); 713 .ExpectConnectToSignalPropertyChanged();
712 714
713 MockBatteryProperties battery_bat1_properties; 715 MockBatteryProperties battery_bat1_properties;
714 battery_bat1_properties.state = 716 battery_bat1_properties.state =
715 UPowerDeviceState::UPOWER_DEVICE_STATE_CHARGING; 717 UPowerDeviceState::UPOWER_DEVICE_STATE_CHARGING;
716 battery_bat1_properties.time_to_full = 100; 718 battery_bat1_properties.time_to_full = 100;
717 battery_bat1_properties.time_to_empty = 0; 719 battery_bat1_properties.time_to_empty = 0;
718 battery_bat1_properties.percentage = 80; 720 battery_bat1_properties.percentage = 80;
719 AddDeviceProxy(kUPowerDeviceBattery1Path, &battery_bat1_properties); 721 AddDeviceProxy(kUPowerDeviceBattery1Path, &battery_bat1_properties);
720 722
721 StartBatteryStatusManagerLinux(); 723 StartBatteryStatusManagerLinux();
722 BatteryStatus status = last_battery_status(); 724 mojom::BatteryStatus status = last_battery_status();
723 EXPECT_LE(1, count_battery_updates()); 725 EXPECT_LE(1, count_battery_updates());
724 726
725 EXPECT_FALSE(status.charging); 727 EXPECT_FALSE(status.charging);
726 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.charging_time); 728 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.charging_time);
727 EXPECT_EQ(200, status.discharging_time); 729 EXPECT_EQ(200, status.discharging_time);
728 EXPECT_EQ(0.7, status.level); 730 EXPECT_EQ(0.7, status.level);
729 } 731 }
730 732
731 TEST_F(BatteryStatusManagerLinuxTest, SkipNonBatteryDevice) { 733 TEST_F(BatteryStatusManagerLinuxTest, SkipNonBatteryDevice) {
732 MockBatteryProperties line_power_AC_properties; 734 MockBatteryProperties line_power_AC_properties;
733 line_power_AC_properties.type = 735 line_power_AC_properties.type =
734 UPowerDeviceType::UPOWER_DEVICE_TYPE_LINE_POWER; 736 UPowerDeviceType::UPOWER_DEVICE_TYPE_LINE_POWER;
735 AddDeviceProxy(kUPowerDeviceACLinePath, &line_power_AC_properties); 737 AddDeviceProxy(kUPowerDeviceACLinePath, &line_power_AC_properties);
736 738
737 MockBatteryProperties battery_bat0_properties; 739 MockBatteryProperties battery_bat0_properties;
738 battery_bat0_properties.state = 740 battery_bat0_properties.state =
739 UPowerDeviceState::UPOWER_DEVICE_STATE_DISCHARGING; 741 UPowerDeviceState::UPOWER_DEVICE_STATE_DISCHARGING;
740 battery_bat0_properties.time_to_full = 0; 742 battery_bat0_properties.time_to_full = 0;
741 battery_bat0_properties.time_to_empty = 200; 743 battery_bat0_properties.time_to_empty = 200;
742 battery_bat0_properties.percentage = 70; 744 battery_bat0_properties.percentage = 70;
743 AddDeviceProxy(kUPowerDeviceBattery0Path, &battery_bat0_properties) 745 AddDeviceProxy(kUPowerDeviceBattery0Path, &battery_bat0_properties)
744 .ExpectConnectToSignalPropertyChanged(); 746 .ExpectConnectToSignalPropertyChanged();
745 747
746 StartBatteryStatusManagerLinux(); 748 StartBatteryStatusManagerLinux();
747 BatteryStatus status = last_battery_status(); 749 mojom::BatteryStatus status = last_battery_status();
748 EXPECT_LE(1, count_battery_updates()); 750 EXPECT_LE(1, count_battery_updates());
749 751
750 EXPECT_FALSE(status.charging); 752 EXPECT_FALSE(status.charging);
751 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.charging_time); 753 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.charging_time);
752 EXPECT_EQ(200, status.discharging_time); 754 EXPECT_EQ(200, status.discharging_time);
753 EXPECT_EQ(0.7, status.level); 755 EXPECT_EQ(0.7, status.level);
754 } 756 }
755 757
756 TEST_F(BatteryStatusManagerLinuxTest, UpdateDevicePropertyState) { 758 TEST_F(BatteryStatusManagerLinuxTest, UpdateDevicePropertyState) {
757 MockBatteryProperties battery_bat0_properties; 759 MockBatteryProperties battery_bat0_properties;
758 battery_bat0_properties.state = 760 battery_bat0_properties.state =
759 UPowerDeviceState::UPOWER_DEVICE_STATE_CHARGING; 761 UPowerDeviceState::UPOWER_DEVICE_STATE_CHARGING;
760 battery_bat0_properties.time_to_full = 100; 762 battery_bat0_properties.time_to_full = 100;
761 battery_bat0_properties.time_to_empty = 200; 763 battery_bat0_properties.time_to_empty = 200;
762 battery_bat0_properties.percentage = 80; 764 battery_bat0_properties.percentage = 80;
763 MockBatteryObject& battery_bat0 = 765 MockBatteryObject& battery_bat0 =
764 AddDeviceProxy(kUPowerDeviceBattery0Path, &battery_bat0_properties) 766 AddDeviceProxy(kUPowerDeviceBattery0Path, &battery_bat0_properties)
765 .ExpectConnectToSignalPropertyChanged(); 767 .ExpectConnectToSignalPropertyChanged();
766 768
767 StartBatteryStatusManagerLinux(); 769 StartBatteryStatusManagerLinux();
768 BatteryStatus status = last_battery_status(); 770 mojom::BatteryStatus status = last_battery_status();
769 EXPECT_LE(1, count_battery_updates()); 771 EXPECT_LE(1, count_battery_updates());
770 772
771 EXPECT_TRUE(status.charging); 773 EXPECT_TRUE(status.charging);
772 EXPECT_EQ(100, status.charging_time); 774 EXPECT_EQ(100, status.charging_time);
773 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.discharging_time); 775 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.discharging_time);
774 EXPECT_EQ(.8, status.level); 776 EXPECT_EQ(.8, status.level);
775 777
776 int last_count = count_battery_updates(); 778 int last_count = count_battery_updates();
777 battery_bat0_properties.state = 779 battery_bat0_properties.state =
778 UPowerDeviceState::UPOWER_DEVICE_STATE_DISCHARGING; 780 UPowerDeviceState::UPOWER_DEVICE_STATE_DISCHARGING;
(...skipping 12 matching lines...) Expand all
791 battery_bat0_properties.state = 793 battery_bat0_properties.state =
792 UPowerDeviceState::UPOWER_DEVICE_STATE_DISCHARGING; 794 UPowerDeviceState::UPOWER_DEVICE_STATE_DISCHARGING;
793 battery_bat0_properties.time_to_full = 100; 795 battery_bat0_properties.time_to_full = 100;
794 battery_bat0_properties.time_to_empty = 200; 796 battery_bat0_properties.time_to_empty = 200;
795 battery_bat0_properties.percentage = 80; 797 battery_bat0_properties.percentage = 80;
796 MockBatteryObject& battery_bat0 = 798 MockBatteryObject& battery_bat0 =
797 AddDeviceProxy(kUPowerDeviceBattery0Path, &battery_bat0_properties) 799 AddDeviceProxy(kUPowerDeviceBattery0Path, &battery_bat0_properties)
798 .ExpectConnectToSignalPropertyChanged(); 800 .ExpectConnectToSignalPropertyChanged();
799 801
800 StartBatteryStatusManagerLinux(); 802 StartBatteryStatusManagerLinux();
801 BatteryStatus status = last_battery_status(); 803 mojom::BatteryStatus status = last_battery_status();
802 EXPECT_LE(1, count_battery_updates()); 804 EXPECT_LE(1, count_battery_updates());
803 805
804 EXPECT_FALSE(status.charging); 806 EXPECT_FALSE(status.charging);
805 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.charging_time); 807 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.charging_time);
806 EXPECT_EQ(200, status.discharging_time); 808 EXPECT_EQ(200, status.discharging_time);
807 EXPECT_EQ(.8, status.level); 809 EXPECT_EQ(.8, status.level);
808 810
809 int last_count = count_battery_updates(); 811 int last_count = count_battery_updates();
810 battery_bat0_properties.percentage = 70; 812 battery_bat0_properties.percentage = 70;
811 DeviceSignalPropertyChanged(&battery_bat0, kUPowerDevicePropertyPercentage); 813 DeviceSignalPropertyChanged(&battery_bat0, kUPowerDevicePropertyPercentage);
(...skipping 11 matching lines...) Expand all
823 battery_bat0_properties.state = 825 battery_bat0_properties.state =
824 UPowerDeviceState::UPOWER_DEVICE_STATE_DISCHARGING; 826 UPowerDeviceState::UPOWER_DEVICE_STATE_DISCHARGING;
825 battery_bat0_properties.time_to_full = 100; 827 battery_bat0_properties.time_to_full = 100;
826 battery_bat0_properties.time_to_empty = 200; 828 battery_bat0_properties.time_to_empty = 200;
827 battery_bat0_properties.percentage = 80; 829 battery_bat0_properties.percentage = 80;
828 MockBatteryObject& battery_bat0 = 830 MockBatteryObject& battery_bat0 =
829 AddDeviceProxy(kUPowerDeviceBattery0Path, &battery_bat0_properties) 831 AddDeviceProxy(kUPowerDeviceBattery0Path, &battery_bat0_properties)
830 .ExpectConnectToSignalPropertyChanged(); 832 .ExpectConnectToSignalPropertyChanged();
831 833
832 StartBatteryStatusManagerLinux(); 834 StartBatteryStatusManagerLinux();
833 BatteryStatus status = last_battery_status(); 835 mojom::BatteryStatus status = last_battery_status();
834 EXPECT_LE(1, count_battery_updates()); 836 EXPECT_LE(1, count_battery_updates());
835 837
836 EXPECT_FALSE(status.charging); 838 EXPECT_FALSE(status.charging);
837 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.charging_time); 839 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.charging_time);
838 EXPECT_EQ(200, status.discharging_time); 840 EXPECT_EQ(200, status.discharging_time);
839 EXPECT_EQ(.8, status.level); 841 EXPECT_EQ(.8, status.level);
840 842
841 int last_count = count_battery_updates(); 843 int last_count = count_battery_updates();
842 battery_bat0_properties.time_to_empty = 150; 844 battery_bat0_properties.time_to_empty = 150;
843 DeviceSignalPropertyChanged(&battery_bat0, kUPowerDevicePropertyTimeToEmpty); 845 DeviceSignalPropertyChanged(&battery_bat0, kUPowerDevicePropertyTimeToEmpty);
(...skipping 11 matching lines...) Expand all
855 battery_bat0_properties.state = 857 battery_bat0_properties.state =
856 UPowerDeviceState::UPOWER_DEVICE_STATE_CHARGING; 858 UPowerDeviceState::UPOWER_DEVICE_STATE_CHARGING;
857 battery_bat0_properties.time_to_full = 100; 859 battery_bat0_properties.time_to_full = 100;
858 battery_bat0_properties.time_to_empty = 200; 860 battery_bat0_properties.time_to_empty = 200;
859 battery_bat0_properties.percentage = 80; 861 battery_bat0_properties.percentage = 80;
860 MockBatteryObject& battery_bat0 = 862 MockBatteryObject& battery_bat0 =
861 AddDeviceProxy(kUPowerDeviceBattery0Path, &battery_bat0_properties) 863 AddDeviceProxy(kUPowerDeviceBattery0Path, &battery_bat0_properties)
862 .ExpectConnectToSignalPropertyChanged(); 864 .ExpectConnectToSignalPropertyChanged();
863 865
864 StartBatteryStatusManagerLinux(); 866 StartBatteryStatusManagerLinux();
865 BatteryStatus status = last_battery_status(); 867 mojom::BatteryStatus status = last_battery_status();
866 EXPECT_LE(1, count_battery_updates()); 868 EXPECT_LE(1, count_battery_updates());
867 869
868 EXPECT_TRUE(status.charging); 870 EXPECT_TRUE(status.charging);
869 EXPECT_EQ(100, status.charging_time); 871 EXPECT_EQ(100, status.charging_time);
870 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.discharging_time); 872 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.discharging_time);
871 EXPECT_EQ(.8, status.level); 873 EXPECT_EQ(.8, status.level);
872 874
873 int last_count = count_battery_updates(); 875 int last_count = count_battery_updates();
874 battery_bat0_properties.time_to_full = 50; 876 battery_bat0_properties.time_to_full = 50;
875 DeviceSignalPropertyChanged(&battery_bat0, kUPowerDevicePropertyTimeToFull); 877 DeviceSignalPropertyChanged(&battery_bat0, kUPowerDevicePropertyTimeToFull);
(...skipping 14 matching lines...) Expand all
890 UPowerDeviceState::UPOWER_DEVICE_STATE_DISCHARGING; 892 UPowerDeviceState::UPOWER_DEVICE_STATE_DISCHARGING;
891 battery_bat0_properties.time_to_full = 100; 893 battery_bat0_properties.time_to_full = 100;
892 battery_bat0_properties.time_to_empty = 200; 894 battery_bat0_properties.time_to_empty = 200;
893 battery_bat0_properties.percentage = 80; 895 battery_bat0_properties.percentage = 80;
894 MockBatteryObject& battery_bat0 = 896 MockBatteryObject& battery_bat0 =
895 AddDeviceProxy(kUPowerDeviceBattery0Path, &battery_bat0_properties) 897 AddDeviceProxy(kUPowerDeviceBattery0Path, &battery_bat0_properties)
896 .ExpectConnectToSignalChanged() 898 .ExpectConnectToSignalChanged()
897 .ExpectConnectToSignalPropertyChanged(); 899 .ExpectConnectToSignalPropertyChanged();
898 900
899 StartBatteryStatusManagerLinux(); 901 StartBatteryStatusManagerLinux();
900 BatteryStatus status = last_battery_status(); 902 mojom::BatteryStatus status = last_battery_status();
901 EXPECT_LE(1, count_battery_updates()); 903 EXPECT_LE(1, count_battery_updates());
902 904
903 EXPECT_FALSE(status.charging); 905 EXPECT_FALSE(status.charging);
904 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.charging_time); 906 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.charging_time);
905 EXPECT_EQ(200, status.discharging_time); 907 EXPECT_EQ(200, status.discharging_time);
906 EXPECT_EQ(.8, status.level); 908 EXPECT_EQ(.8, status.level);
907 909
908 int last_count = count_battery_updates(); 910 int last_count = count_battery_updates();
909 battery_bat0_properties.percentage = 70; 911 battery_bat0_properties.percentage = 70;
910 DeviceSignalChanged(&battery_bat0); 912 DeviceSignalChanged(&battery_bat0);
(...skipping 14 matching lines...) Expand all
925 MockBatteryProperties battery_bat0_properties; 927 MockBatteryProperties battery_bat0_properties;
926 battery_bat0_properties.state = 928 battery_bat0_properties.state =
927 UPowerDeviceState::UPOWER_DEVICE_STATE_DISCHARGING; 929 UPowerDeviceState::UPOWER_DEVICE_STATE_DISCHARGING;
928 battery_bat0_properties.time_to_full = 0; 930 battery_bat0_properties.time_to_full = 0;
929 battery_bat0_properties.time_to_empty = 200; 931 battery_bat0_properties.time_to_empty = 200;
930 battery_bat0_properties.percentage = 90; 932 battery_bat0_properties.percentage = 90;
931 AddDeviceProxy(kUPowerDeviceBattery0Path, &battery_bat0_properties) 933 AddDeviceProxy(kUPowerDeviceBattery0Path, &battery_bat0_properties)
932 .ExpectConnectToSignalPropertyChanged(); 934 .ExpectConnectToSignalPropertyChanged();
933 935
934 StartBatteryStatusManagerLinux(); 936 StartBatteryStatusManagerLinux();
935 BatteryStatus status = last_battery_status(); 937 mojom::BatteryStatus status = last_battery_status();
936 EXPECT_LE(1, count_battery_updates()); 938 EXPECT_LE(1, count_battery_updates());
937 939
938 EXPECT_FALSE(status.charging); 940 EXPECT_FALSE(status.charging);
939 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.charging_time); 941 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.charging_time);
940 EXPECT_EQ(200, status.discharging_time); 942 EXPECT_EQ(200, status.discharging_time);
941 EXPECT_EQ(0.9, status.level); 943 EXPECT_EQ(0.9, status.level);
942 } 944 }
943 945
944 TEST_F(BatteryStatusManagerLinuxTest, DisplayDeviceBattery) { 946 TEST_F(BatteryStatusManagerLinuxTest, DisplayDeviceBattery) {
945 MockBatteryProperties display_device_properties; 947 MockBatteryProperties display_device_properties;
946 display_device_properties.state = 948 display_device_properties.state =
947 UPowerDeviceState::UPOWER_DEVICE_STATE_DISCHARGING; 949 UPowerDeviceState::UPOWER_DEVICE_STATE_DISCHARGING;
948 display_device_properties.time_to_full = 0; 950 display_device_properties.time_to_full = 0;
949 display_device_properties.time_to_empty = 200; 951 display_device_properties.time_to_empty = 200;
950 display_device_properties.percentage = 90; 952 display_device_properties.percentage = 90;
951 SetUpDisplayDeviceProxy(&display_device_properties) 953 SetUpDisplayDeviceProxy(&display_device_properties)
952 .ExpectConnectToSignalPropertyChanged(); 954 .ExpectConnectToSignalPropertyChanged();
953 955
954 StartBatteryStatusManagerLinux(); 956 StartBatteryStatusManagerLinux();
955 BatteryStatus status = last_battery_status(); 957 mojom::BatteryStatus status = last_battery_status();
956 EXPECT_LE(1, count_battery_updates()); 958 EXPECT_LE(1, count_battery_updates());
957 959
958 EXPECT_FALSE(status.charging); 960 EXPECT_FALSE(status.charging);
959 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.charging_time); 961 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.charging_time);
960 EXPECT_EQ(200, status.discharging_time); 962 EXPECT_EQ(200, status.discharging_time);
961 EXPECT_EQ(.9, status.level); 963 EXPECT_EQ(.9, status.level);
962 } 964 }
963 965
964 TEST_F(BatteryStatusManagerLinuxTest, DisplayDeviceBatterySkipsEnumerate) { 966 TEST_F(BatteryStatusManagerLinuxTest, DisplayDeviceBatterySkipsEnumerate) {
965 MockBatteryProperties display_device_properties; 967 MockBatteryProperties display_device_properties;
966 display_device_properties.state = 968 display_device_properties.state =
967 UPowerDeviceState::UPOWER_DEVICE_STATE_DISCHARGING; 969 UPowerDeviceState::UPOWER_DEVICE_STATE_DISCHARGING;
968 display_device_properties.time_to_full = 0; 970 display_device_properties.time_to_full = 0;
969 display_device_properties.time_to_empty = 200; 971 display_device_properties.time_to_empty = 200;
970 display_device_properties.percentage = 90; 972 display_device_properties.percentage = 90;
971 SetUpDisplayDeviceProxy(&display_device_properties) 973 SetUpDisplayDeviceProxy(&display_device_properties)
972 .ExpectConnectToSignalPropertyChanged(); 974 .ExpectConnectToSignalPropertyChanged();
973 975
974 AddDevicePath(kUPowerDeviceACLinePath); 976 AddDevicePath(kUPowerDeviceACLinePath);
975 AddDevicePath(kUPowerDeviceBattery0Path); 977 AddDevicePath(kUPowerDeviceBattery0Path);
976 AddDevicePath(kUPowerDeviceBattery1Path); 978 AddDevicePath(kUPowerDeviceBattery1Path);
977 979
978 StartBatteryStatusManagerLinux(); 980 StartBatteryStatusManagerLinux();
979 BatteryStatus status = last_battery_status(); 981 mojom::BatteryStatus status = last_battery_status();
980 EXPECT_LE(1, count_battery_updates()); 982 EXPECT_LE(1, count_battery_updates());
981 983
982 EXPECT_FALSE(status.charging); 984 EXPECT_FALSE(status.charging);
983 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.charging_time); 985 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.charging_time);
984 EXPECT_EQ(200, status.discharging_time); 986 EXPECT_EQ(200, status.discharging_time);
985 EXPECT_EQ(.9, status.level); 987 EXPECT_EQ(.9, status.level);
986 } 988 }
987 989
988 // Adding a display-device will make the BatteryStatusManagerLinux switch to 990 // Adding a display-device will make the BatteryStatusManagerLinux switch to
989 // the display-device. 991 // the display-device.
990 TEST_F(BatteryStatusManagerLinuxTest, SignalDeviceAddedDisplayDevice) { 992 TEST_F(BatteryStatusManagerLinuxTest, SignalDeviceAddedDisplayDevice) {
991 MockBatteryProperties battery_bat0_properties; 993 MockBatteryProperties battery_bat0_properties;
992 battery_bat0_properties.state = 994 battery_bat0_properties.state =
993 UPowerDeviceState::UPOWER_DEVICE_STATE_DISCHARGING; 995 UPowerDeviceState::UPOWER_DEVICE_STATE_DISCHARGING;
994 battery_bat0_properties.time_to_full = 0; 996 battery_bat0_properties.time_to_full = 0;
995 battery_bat0_properties.time_to_empty = 200; 997 battery_bat0_properties.time_to_empty = 200;
996 battery_bat0_properties.percentage = 70; 998 battery_bat0_properties.percentage = 70;
997 AddDeviceProxy(kUPowerDeviceBattery0Path, &battery_bat0_properties) 999 AddDeviceProxy(kUPowerDeviceBattery0Path, &battery_bat0_properties)
998 .ExpectConnectToSignalPropertyChanged(); 1000 .ExpectConnectToSignalPropertyChanged();
999 1001
1000 StartBatteryStatusManagerLinux(); 1002 StartBatteryStatusManagerLinux();
1001 BatteryStatus status = last_battery_status(); 1003 mojom::BatteryStatus status = last_battery_status();
1002 EXPECT_LE(1, count_battery_updates()); 1004 EXPECT_LE(1, count_battery_updates());
1003 1005
1004 EXPECT_FALSE(status.charging); 1006 EXPECT_FALSE(status.charging);
1005 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.charging_time); 1007 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.charging_time);
1006 EXPECT_EQ(200, status.discharging_time); 1008 EXPECT_EQ(200, status.discharging_time);
1007 EXPECT_EQ(0.7, status.level); 1009 EXPECT_EQ(0.7, status.level);
1008 1010
1009 int last_count = count_battery_updates(); 1011 int last_count = count_battery_updates();
1010 MockBatteryProperties display_device_properties; 1012 MockBatteryProperties display_device_properties;
1011 display_device_properties.state = 1013 display_device_properties.state =
(...skipping 19 matching lines...) Expand all
1031 MockBatteryProperties battery_bat1_properties; 1033 MockBatteryProperties battery_bat1_properties;
1032 battery_bat1_properties.state = 1034 battery_bat1_properties.state =
1033 UPowerDeviceState::UPOWER_DEVICE_STATE_DISCHARGING; 1035 UPowerDeviceState::UPOWER_DEVICE_STATE_DISCHARGING;
1034 battery_bat1_properties.time_to_full = 0; 1036 battery_bat1_properties.time_to_full = 0;
1035 battery_bat1_properties.time_to_empty = 200; 1037 battery_bat1_properties.time_to_empty = 200;
1036 battery_bat1_properties.percentage = 70; 1038 battery_bat1_properties.percentage = 70;
1037 AddDeviceProxy(kUPowerDeviceBattery1Path, &battery_bat1_properties) 1039 AddDeviceProxy(kUPowerDeviceBattery1Path, &battery_bat1_properties)
1038 .ExpectConnectToSignalPropertyChanged(); 1040 .ExpectConnectToSignalPropertyChanged();
1039 1041
1040 StartBatteryStatusManagerLinux(); 1042 StartBatteryStatusManagerLinux();
1041 BatteryStatus status = last_battery_status(); 1043 mojom::BatteryStatus status = last_battery_status();
1042 EXPECT_LE(1, count_battery_updates()); 1044 EXPECT_LE(1, count_battery_updates());
1043 1045
1044 EXPECT_FALSE(status.charging); 1046 EXPECT_FALSE(status.charging);
1045 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.charging_time); 1047 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.charging_time);
1046 EXPECT_EQ(200, status.discharging_time); 1048 EXPECT_EQ(200, status.discharging_time);
1047 EXPECT_EQ(0.7, status.level); 1049 EXPECT_EQ(0.7, status.level);
1048 1050
1049 int last_count = count_battery_updates(); 1051 int last_count = count_battery_updates();
1050 MockBatteryProperties battery_bat0_properties; 1052 MockBatteryProperties battery_bat0_properties;
1051 battery_bat0_properties.state = 1053 battery_bat0_properties.state =
(...skipping 18 matching lines...) Expand all
1070 MockBatteryProperties battery_bat0_properties; 1072 MockBatteryProperties battery_bat0_properties;
1071 battery_bat0_properties.state = 1073 battery_bat0_properties.state =
1072 UPowerDeviceState::UPOWER_DEVICE_STATE_DISCHARGING; 1074 UPowerDeviceState::UPOWER_DEVICE_STATE_DISCHARGING;
1073 battery_bat0_properties.time_to_full = 0; 1075 battery_bat0_properties.time_to_full = 0;
1074 battery_bat0_properties.time_to_empty = 150; 1076 battery_bat0_properties.time_to_empty = 150;
1075 battery_bat0_properties.percentage = 50; 1077 battery_bat0_properties.percentage = 50;
1076 AddDeviceProxy(kUPowerDeviceBattery0Path, &battery_bat0_properties) 1078 AddDeviceProxy(kUPowerDeviceBattery0Path, &battery_bat0_properties)
1077 .ExpectConnectToSignalPropertyChanged(); 1079 .ExpectConnectToSignalPropertyChanged();
1078 1080
1079 StartBatteryStatusManagerLinux(); 1081 StartBatteryStatusManagerLinux();
1080 BatteryStatus status = last_battery_status(); 1082 mojom::BatteryStatus status = last_battery_status();
1081 EXPECT_LE(1, count_battery_updates()); 1083 EXPECT_LE(1, count_battery_updates());
1082 1084
1083 EXPECT_FALSE(status.charging); 1085 EXPECT_FALSE(status.charging);
1084 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.charging_time); 1086 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.charging_time);
1085 EXPECT_EQ(150, status.discharging_time); 1087 EXPECT_EQ(150, status.discharging_time);
1086 EXPECT_EQ(0.5, status.level); 1088 EXPECT_EQ(0.5, status.level);
1087 1089
1088 int last_count = count_battery_updates(); 1090 int last_count = count_battery_updates();
1089 MockBatteryProperties battery_bat1_properties; 1091 MockBatteryProperties battery_bat1_properties;
1090 battery_bat1_properties.state = 1092 battery_bat1_properties.state =
(...skipping 17 matching lines...) Expand all
1108 MockBatteryProperties battery_bat0_properties; 1110 MockBatteryProperties battery_bat0_properties;
1109 battery_bat0_properties.state = 1111 battery_bat0_properties.state =
1110 UPowerDeviceState::UPOWER_DEVICE_STATE_DISCHARGING; 1112 UPowerDeviceState::UPOWER_DEVICE_STATE_DISCHARGING;
1111 battery_bat0_properties.time_to_full = 0; 1113 battery_bat0_properties.time_to_full = 0;
1112 battery_bat0_properties.time_to_empty = 200; 1114 battery_bat0_properties.time_to_empty = 200;
1113 battery_bat0_properties.percentage = 70; 1115 battery_bat0_properties.percentage = 70;
1114 AddDeviceProxy(kUPowerDeviceBattery0Path, &battery_bat0_properties) 1116 AddDeviceProxy(kUPowerDeviceBattery0Path, &battery_bat0_properties)
1115 .ExpectConnectToSignalPropertyChanged(); 1117 .ExpectConnectToSignalPropertyChanged();
1116 1118
1117 StartBatteryStatusManagerLinux(); 1119 StartBatteryStatusManagerLinux();
1118 BatteryStatus status = last_battery_status(); 1120 mojom::BatteryStatus status = last_battery_status();
1119 EXPECT_LE(1, count_battery_updates()); 1121 EXPECT_LE(1, count_battery_updates());
1120 1122
1121 EXPECT_FALSE(status.charging); 1123 EXPECT_FALSE(status.charging);
1122 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.charging_time); 1124 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.charging_time);
1123 EXPECT_EQ(200, status.discharging_time); 1125 EXPECT_EQ(200, status.discharging_time);
1124 EXPECT_EQ(0.7, status.level); 1126 EXPECT_EQ(0.7, status.level);
1125 1127
1126 int last_count = count_battery_updates(); 1128 int last_count = count_battery_updates();
1127 MockBatteryProperties line_power_AC_properties; 1129 MockBatteryProperties line_power_AC_properties;
1128 line_power_AC_properties.type = 1130 line_power_AC_properties.type =
(...skipping 22 matching lines...) Expand all
1151 MockBatteryProperties battery_bat1_properties; 1153 MockBatteryProperties battery_bat1_properties;
1152 battery_bat1_properties.state = 1154 battery_bat1_properties.state =
1153 UPowerDeviceState::UPOWER_DEVICE_STATE_CHARGING; 1155 UPowerDeviceState::UPOWER_DEVICE_STATE_CHARGING;
1154 battery_bat1_properties.time_to_full = 100; 1156 battery_bat1_properties.time_to_full = 100;
1155 battery_bat1_properties.time_to_empty = 0; 1157 battery_bat1_properties.time_to_empty = 0;
1156 battery_bat1_properties.percentage = 80; 1158 battery_bat1_properties.percentage = 80;
1157 MockBatteryObject& battery_bat1 = 1159 MockBatteryObject& battery_bat1 =
1158 AddDeviceProxy(kUPowerDeviceBattery1Path, &battery_bat1_properties); 1160 AddDeviceProxy(kUPowerDeviceBattery1Path, &battery_bat1_properties);
1159 1161
1160 StartBatteryStatusManagerLinux(); 1162 StartBatteryStatusManagerLinux();
1161 BatteryStatus status = last_battery_status(); 1163 mojom::BatteryStatus status = last_battery_status();
1162 EXPECT_LE(1, count_battery_updates()); 1164 EXPECT_LE(1, count_battery_updates());
1163 1165
1164 EXPECT_FALSE(status.charging); 1166 EXPECT_FALSE(status.charging);
1165 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.charging_time); 1167 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.charging_time);
1166 EXPECT_EQ(200, status.discharging_time); 1168 EXPECT_EQ(200, status.discharging_time);
1167 EXPECT_EQ(0.7, status.level); 1169 EXPECT_EQ(0.7, status.level);
1168 1170
1169 int last_count = count_battery_updates(); 1171 int last_count = count_battery_updates();
1170 ExpectGetObjectProxy(kUPowerDeviceBattery1Path, &battery_bat1); 1172 ExpectGetObjectProxy(kUPowerDeviceBattery1Path, &battery_bat1);
1171 battery_bat1.ExpectConnectToSignalPropertyChanged(); 1173 battery_bat1.ExpectConnectToSignalPropertyChanged();
(...skipping 19 matching lines...) Expand all
1191 battery_bat0_properties.percentage = 70; 1193 battery_bat0_properties.percentage = 70;
1192 AddDeviceProxy(kUPowerDeviceBattery0Path, &battery_bat0_properties) 1194 AddDeviceProxy(kUPowerDeviceBattery0Path, &battery_bat0_properties)
1193 .ExpectConnectToSignalPropertyChanged(); 1195 .ExpectConnectToSignalPropertyChanged();
1194 1196
1195 MockBatteryProperties line_power_AC_properties; 1197 MockBatteryProperties line_power_AC_properties;
1196 line_power_AC_properties.type = 1198 line_power_AC_properties.type =
1197 UPowerDeviceType::UPOWER_DEVICE_TYPE_LINE_POWER; 1199 UPowerDeviceType::UPOWER_DEVICE_TYPE_LINE_POWER;
1198 AddDeviceProxy(kUPowerDeviceACLinePath, &line_power_AC_properties); 1200 AddDeviceProxy(kUPowerDeviceACLinePath, &line_power_AC_properties);
1199 1201
1200 StartBatteryStatusManagerLinux(); 1202 StartBatteryStatusManagerLinux();
1201 BatteryStatus status = last_battery_status(); 1203 mojom::BatteryStatus status = last_battery_status();
1202 EXPECT_LE(1, count_battery_updates()); 1204 EXPECT_LE(1, count_battery_updates());
1203 1205
1204 EXPECT_FALSE(status.charging); 1206 EXPECT_FALSE(status.charging);
1205 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.charging_time); 1207 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.charging_time);
1206 EXPECT_EQ(200, status.discharging_time); 1208 EXPECT_EQ(200, status.discharging_time);
1207 EXPECT_EQ(0.7, status.level); 1209 EXPECT_EQ(0.7, status.level);
1208 1210
1209 int last_count = count_battery_updates(); 1211 int last_count = count_battery_updates();
1210 mock_upower_.devices.pop_back(); 1212 mock_upower_.devices.pop_back();
1211 UPowerSignalDeviceRemoved(kUPowerDeviceACLinePath); 1213 UPowerSignalDeviceRemoved(kUPowerDeviceACLinePath);
1212 status = last_battery_status(); 1214 status = last_battery_status();
1213 EXPECT_EQ(last_count, count_battery_updates()); 1215 EXPECT_EQ(last_count, count_battery_updates());
1214 1216
1215 EXPECT_FALSE(status.charging); 1217 EXPECT_FALSE(status.charging);
1216 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.charging_time); 1218 EXPECT_EQ(std::numeric_limits<double>::infinity(), status.charging_time);
1217 EXPECT_EQ(200, status.discharging_time); 1219 EXPECT_EQ(200, status.discharging_time);
1218 EXPECT_EQ(0.7, status.level); 1220 EXPECT_EQ(0.7, status.level);
1219 } 1221 }
1220 1222
1221 } // namespace device 1223 } // namespace device
OLDNEW
« no previous file with comments | « device/battery/battery_status_manager_linux.cc ('k') | device/battery/battery_status_manager_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698