← Back to branch summary

~ubuntu-desktop/indicator-power/ubuntu

« back to all changes in this revision

Viewing changes to tests/test-device.cc

  • Committer: Sebastien Bacher
  • Date: 2012-11-14 10:09:49 UTC
  • mfrom: (67.1.18)
  • Revision ID: seb128@ubuntu.com-20121114100949-p5oasssax43qlmps
* New upstream release:
  - Fix a device display bug introduced in 12.10.3 (LP: #1075192)

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test-device.cc
555
555
                   INDICATOR_POWER_DEVICE_PERCENTAGE, 0.0,
556
556
                   INDICATOR_POWER_DEVICE_TIME, guint64(0),
557
557
                   NULL);
558
 
  check_strings (device, "AC Adapter", "AC Adapter", "AC Adapter");
 
558
  check_strings (device, "", "AC Adapter", "AC Adapter");
559
559
 
560
560
  // cleanup
561
561
  g_object_unref(o);
587
587
     sorted in order of preference wrt the spec's criteria.
588
588
     So tests[i] should be picked over any test with an index greater than i */
589
589
  struct {
 
590
    int kind;
590
591
    int state;
591
592
    guint64 time;
592
593
    double percentage;
593
594
  } tests[] = {
594
 
    { UP_DEVICE_STATE_DISCHARGING, 49, 50.0 },
595
 
    { UP_DEVICE_STATE_DISCHARGING, 50, 50.0 },
596
 
    { UP_DEVICE_STATE_DISCHARGING, 50, 100.0 },
597
 
    { UP_DEVICE_STATE_DISCHARGING, 51, 50.0 },
598
 
    { UP_DEVICE_STATE_CHARGING, 50, 50.0 },
599
 
    { UP_DEVICE_STATE_CHARGING, 49, 50.0 },
600
 
    { UP_DEVICE_STATE_CHARGING, 49, 100.0 },
601
 
    { UP_DEVICE_STATE_CHARGING, 48, 50.0 },
602
 
    { UP_DEVICE_STATE_FULLY_CHARGED, 0, 50.0 }
 
595
    { UP_DEVICE_KIND_BATTERY,    UP_DEVICE_STATE_DISCHARGING,   49,  50.0 },
 
596
    { UP_DEVICE_KIND_BATTERY,    UP_DEVICE_STATE_DISCHARGING,   50,  50.0 },
 
597
    { UP_DEVICE_KIND_BATTERY,    UP_DEVICE_STATE_DISCHARGING,   50, 100.0 },
 
598
    { UP_DEVICE_KIND_BATTERY,    UP_DEVICE_STATE_DISCHARGING,   51,  50.0 },
 
599
    { UP_DEVICE_KIND_BATTERY,    UP_DEVICE_STATE_CHARGING,      50,  50.0 },
 
600
    { UP_DEVICE_KIND_BATTERY,    UP_DEVICE_STATE_CHARGING,      49,  50.0 },
 
601
    { UP_DEVICE_KIND_BATTERY,    UP_DEVICE_STATE_CHARGING,      49, 100.0 },
 
602
    { UP_DEVICE_KIND_BATTERY,    UP_DEVICE_STATE_CHARGING,      48,  50.0 },
 
603
    { UP_DEVICE_KIND_BATTERY,    UP_DEVICE_STATE_FULLY_CHARGED,  0,  50.0 },
 
604
    { UP_DEVICE_KIND_KEYBOARD,   UP_DEVICE_STATE_FULLY_CHARGED,  0,  50.0 },
 
605
    { UP_DEVICE_KIND_LINE_POWER, UP_DEVICE_STATE_UNKNOWN,        0,   0.0 }
603
606
  };
604
607
 
605
608
  device_list = NULL;
610
613
    {
611
614
      for (int j=i+1; j<n; j++)
612
615
        {
613
 
          g_object_set (a, INDICATOR_POWER_DEVICE_STATE, tests[i].state,
 
616
          g_object_set (a, INDICATOR_POWER_DEVICE_KIND, tests[i].kind,
 
617
                           INDICATOR_POWER_DEVICE_STATE, tests[i].state,
614
618
                           INDICATOR_POWER_DEVICE_TIME, guint64(tests[i].time),
615
619
                           INDICATOR_POWER_DEVICE_PERCENTAGE, tests[i].percentage,
616
620
                           NULL);
617
 
          g_object_set (b, INDICATOR_POWER_DEVICE_STATE, tests[j].state,
 
621
          g_object_set (b, INDICATOR_POWER_DEVICE_KIND, tests[j].kind,
 
622
                           INDICATOR_POWER_DEVICE_STATE, tests[j].state,
618
623
                           INDICATOR_POWER_DEVICE_TIME, guint64(tests[j].time),
619
624
                           INDICATOR_POWER_DEVICE_PERCENTAGE, tests[j].percentage,
620
625
                           NULL);