Attachment #8675801: Fix b2g xpcshell for bug #1187233

View | Details | Raw Unified | Return to bug 1187233
Collapse All | Expand All

(-)a/dom/network/tests/unit_stats/test_networkstats_service_proxy.js (-10 / +5 lines)
Line     Link Here 
 Lines 56-81   add_test(function test_saveAppStats() { Link Here 
56
      var key2 = 1 + "" + false + "" + mobileNetId + "";
56
      var key2 = 1 + "" + false + "" + mobileNetId + "";
57
57
58
      do_check_eq(Object.keys(cachedStats).length, 2);
58
      do_check_eq(Object.keys(cachedStats).length, 2);
59
      do_check_eq(cachedStats[key1].appId, 1);
59
      do_check_eq(cachedStats[key1].appId, 1);
60
      do_check_eq(cachedStats[key1].isInBrowser, false);
60
      do_check_eq(cachedStats[key1].isInBrowser, false);
61
      do_check_eq(cachedStats[key1].serviceType.length, 0);
61
      do_check_eq(cachedStats[key1].serviceType.length, 0);
62
      do_check_eq(cachedStats[key1].networkId, wifi.id);
62
      do_check_eq(cachedStats[key1].networkId, wifi.id);
63
      do_check_eq(cachedStats[key1].networkType, wifi.type);
63
      do_check_eq(cachedStats[key1].networkType, wifi.type);
64
      do_check_eq(new Date(cachedStats[key1].date).getTime() / 1000,
64
      do_check_eq(cachedStats[key1].date.getTime(), timestamp);
65
                  Math.floor(timestamp / 1000));
66
      do_check_eq(cachedStats[key1].rxBytes, 10);
65
      do_check_eq(cachedStats[key1].rxBytes, 10);
67
      do_check_eq(cachedStats[key1].txBytes, 20);
66
      do_check_eq(cachedStats[key1].txBytes, 20);
68
      do_check_eq(cachedStats[key2].appId, 1);
67
      do_check_eq(cachedStats[key2].appId, 1);
69
      do_check_eq(cachedStats[key1].serviceType.length, 0);
68
      do_check_eq(cachedStats[key1].serviceType.length, 0);
70
      do_check_eq(cachedStats[key2].networkId, mobile.id);
69
      do_check_eq(cachedStats[key2].networkId, mobile.id);
71
      do_check_eq(cachedStats[key2].networkType, mobile.type);
70
      do_check_eq(cachedStats[key2].networkType, mobile.type);
72
      do_check_eq(new Date(cachedStats[key2].date).getTime() / 1000,
71
      do_check_eq(cachedStats[key2].date.getTime(), timestamp);
73
                  Math.floor(timestamp / 1000));
74
      do_check_eq(cachedStats[key2].rxBytes, 10);
72
      do_check_eq(cachedStats[key2].rxBytes, 10);
75
      do_check_eq(cachedStats[key2].txBytes, 20);
73
      do_check_eq(cachedStats[key2].txBytes, 20);
76
74
77
      run_next_test();
75
      run_next_test();
78
    });
76
    });
79
  });
77
  });
80
});
78
});
81
79
 Lines 108-133   add_test(function test_saveServiceStats( Link Here 
108
        var key2 = 0 + "" + false + "" + serviceType + mobileNetId + "";
106
        var key2 = 0 + "" + false + "" + serviceType + mobileNetId + "";
109
107
110
        do_check_eq(Object.keys(cachedStats).length, 2);
108
        do_check_eq(Object.keys(cachedStats).length, 2);
111
        do_check_eq(cachedStats[key1].appId, 0);
109
        do_check_eq(cachedStats[key1].appId, 0);
112
        do_check_eq(cachedStats[key1].isInBrowser, false);
110
        do_check_eq(cachedStats[key1].isInBrowser, false);
113
        do_check_eq(cachedStats[key1].serviceType, serviceType);
111
        do_check_eq(cachedStats[key1].serviceType, serviceType);
114
        do_check_eq(cachedStats[key1].networkId, wifi.id);
112
        do_check_eq(cachedStats[key1].networkId, wifi.id);
115
        do_check_eq(cachedStats[key1].networkType, wifi.type);
113
        do_check_eq(cachedStats[key1].networkType, wifi.type);
116
        do_check_eq(new Date(cachedStats[key1].date).getTime() / 1000,
114
        do_check_eq(cachedStats[key1].date.getTime(), timestamp);
117
                    Math.floor(timestamp / 1000));
118
        do_check_eq(cachedStats[key1].rxBytes, 10);
115
        do_check_eq(cachedStats[key1].rxBytes, 10);
119
        do_check_eq(cachedStats[key1].txBytes, 20);
116
        do_check_eq(cachedStats[key1].txBytes, 20);
120
        do_check_eq(cachedStats[key2].appId, 0);
117
        do_check_eq(cachedStats[key2].appId, 0);
121
        do_check_eq(cachedStats[key1].serviceType, serviceType);
118
        do_check_eq(cachedStats[key1].serviceType, serviceType);
122
        do_check_eq(cachedStats[key2].networkId, mobile.id);
119
        do_check_eq(cachedStats[key2].networkId, mobile.id);
123
        do_check_eq(cachedStats[key2].networkType, mobile.type);
120
        do_check_eq(cachedStats[key2].networkType, mobile.type);
124
        do_check_eq(new Date(cachedStats[key2].date).getTime() / 1000,
121
        do_check_eq(cachedStats[key2].date.getTime(), timestamp);
125
                    Math.floor(timestamp / 1000));
126
        do_check_eq(cachedStats[key2].rxBytes, 10);
122
        do_check_eq(cachedStats[key2].rxBytes, 10);
127
        do_check_eq(cachedStats[key2].txBytes, 20);
123
        do_check_eq(cachedStats[key2].txBytes, 20);
128
124
129
        run_next_test();
125
        run_next_test();
130
      });
126
      });
131
    });
127
    });
132
  });
128
  });
133
});
129
});
 Lines 152-169   add_test(function test_saveStatsWithDiff Link Here 
152
        var cachedStats = NetworkStatsService.cachedStats;
148
        var cachedStats = NetworkStatsService.cachedStats;
153
        var key = 2 + "" + false + "" +
149
        var key = 2 + "" + false + "" +
154
                  NetworkStatsService.getNetworkId(mobile.id, mobile.type);
150
                  NetworkStatsService.getNetworkId(mobile.id, mobile.type);
155
        do_check_eq(Object.keys(cachedStats).length, 1);
151
        do_check_eq(Object.keys(cachedStats).length, 1);
156
        do_check_eq(cachedStats[key].appId, 2);
152
        do_check_eq(cachedStats[key].appId, 2);
157
        do_check_eq(cachedStats[key].isInBrowser, false);
153
        do_check_eq(cachedStats[key].isInBrowser, false);
158
        do_check_eq(cachedStats[key].networkId, mobile.id);
154
        do_check_eq(cachedStats[key].networkId, mobile.id);
159
        do_check_eq(cachedStats[key].networkType, mobile.type);
155
        do_check_eq(cachedStats[key].networkType, mobile.type);
160
        do_check_eq(new Date(cachedStats[key].date).getTime() / 1000,
156
        do_check_eq(cachedStats[key].date.getTime(), tomorrow.getTime());
161
                    Math.floor(tomorrow.getTime() / 1000));
162
        do_check_eq(cachedStats[key].rxBytes, 30);
157
        do_check_eq(cachedStats[key].rxBytes, 30);
163
        do_check_eq(cachedStats[key].txBytes, 40);
158
        do_check_eq(cachedStats[key].txBytes, 40);
164
159
165
        run_next_test();
160
        run_next_test();
166
      });
161
      });
167
    });
162
    });
168
  });
163
  });
169
});
164
});

Return to bug 1187233