Skip to content
This repository was archived by the owner on Aug 1, 2024. It is now read-only.

Commit 1635e05

Browse files
concavelenzshicks
concavelenz
authored and
shicks
committed
Migrate more tests to goog.module and ES6
RELNOTES:n/a ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=265541630
1 parent 1b12e5c commit 1635e05

File tree

9 files changed

+5302
-5243
lines changed

9 files changed

+5302
-5243
lines changed

‎closure/goog/array/array_test.js‎

Lines changed: 1960 additions & 1825 deletions
Large diffs are not rendered by default.

‎closure/goog/asserts/asserts_test.js‎

Lines changed: 305 additions & 300 deletions
Large diffs are not rendered by default.

‎closure/goog/date/duration_test.js‎

Lines changed: 119 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -12,128 +12,132 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
goog.provide('goog.date.durationTest');
16-
goog.setTestOnly('goog.date.durationTest');
17-
18-
goog.require('goog.date.duration');
19-
goog.require('goog.i18n.DateTimeFormat');
20-
goog.require('goog.i18n.DateTimeSymbols');
21-
goog.require('goog.i18n.DateTimeSymbols_bn'); // Bengali
22-
goog.require('goog.i18n.DateTimeSymbols_en');
23-
goog.require('goog.i18n.DateTimeSymbols_fa'); // Persian
24-
goog.require('goog.testing.PropertyReplacer');
25-
goog.require('goog.testing.jsunit');
15+
goog.module('goog.date.durationTest');
16+
goog.setTestOnly();
17+
18+
const DateTimeFormat = goog.require('goog.i18n.DateTimeFormat');
19+
/** @suppress {extraRequire} */
20+
const DateTimeSymbols = goog.require('goog.i18n.DateTimeSymbols');
21+
const DateTimeSymbols_bn = goog.require('goog.i18n.DateTimeSymbols_bn');
22+
const DateTimeSymbols_en = goog.require('goog.i18n.DateTimeSymbols_en');
23+
const DateTimeSymbols_fa = goog.require('goog.i18n.DateTimeSymbols_fa');
24+
const PropertyReplacer = goog.require('goog.testing.PropertyReplacer');
25+
const dateDuration = goog.require('goog.date.duration');
26+
const testSuite = goog.require('goog.testing.testSuite');
2627

2728
const MINUTE_MS = 60000;
2829
const HOUR_MS = 60 * MINUTE_MS;
2930
const DAY_MS = 24 * HOUR_MS;
3031

31-
const duration = goog.date.duration.format;
32-
33-
34-
function setUpPage() {
35-
const propertyReplacer = new goog.testing.PropertyReplacer();
36-
propertyReplacer.replace(goog, 'LOCALE', 'en_US');
37-
}
38-
39-
function testFormatDurationZeroMinutes() {
40-
assertEquals('0 minutes', duration(0));
41-
assertEquals('0 minutes', duration(MINUTE_MS - 1));
42-
}
43-
44-
function testFormatDurationMinutes() {
45-
assertEquals('1 minute', duration(MINUTE_MS));
46-
assertEquals('1 minute', duration(MINUTE_MS + 1));
47-
assertEquals('5 minutes', duration(5 * MINUTE_MS));
48-
assertEquals('45 minutes', duration(45 * MINUTE_MS));
49-
}
50-
51-
function testFormatDurationHours() {
52-
assertEquals('1 hour', duration(HOUR_MS));
53-
assertEquals('1 hour', duration(HOUR_MS + 1));
54-
assertEquals('1 hour 1 minute', duration(HOUR_MS + MINUTE_MS));
55-
assertEquals('1 hour 45 minutes', duration(HOUR_MS + 45 * MINUTE_MS));
56-
57-
assertEquals('5 hours', duration(5 * HOUR_MS));
58-
assertEquals('5 hours', duration(5 * HOUR_MS + 1));
59-
assertEquals('5 hours 1 minute', duration(5 * HOUR_MS + MINUTE_MS));
60-
assertEquals('5 hours 45 minutes', duration(5 * HOUR_MS + 45 * MINUTE_MS));
61-
62-
assertEquals('11 hours', duration(11 * HOUR_MS));
63-
assertEquals('11 hours', duration(11 * HOUR_MS + 1));
64-
assertEquals('11 hours 1 minute', duration(11 * HOUR_MS + MINUTE_MS));
65-
assertEquals('11 hours 45 minutes', duration(11 * HOUR_MS + 45 * MINUTE_MS));
66-
}
67-
68-
function testFormatDurationDays() {
69-
assertEquals('1 day', duration(DAY_MS));
70-
assertEquals('1 day', duration(DAY_MS + 1));
71-
assertEquals('1 day 1 minute', duration(DAY_MS + MINUTE_MS));
72-
assertEquals('1 day 45 minutes', duration(DAY_MS + 45 * MINUTE_MS));
73-
assertEquals('1 day 1 hour', duration(DAY_MS + HOUR_MS));
74-
assertEquals('1 day 11 hours', duration(DAY_MS + 11 * HOUR_MS));
75-
assertEquals('1 day 1 hour 1 minute', duration(DAY_MS + HOUR_MS + MINUTE_MS));
76-
assertEquals(
77-
'1 day 1 hour 45 minutes', duration(DAY_MS + HOUR_MS + 45 * MINUTE_MS));
78-
assertEquals(
79-
'1 day 11 hours 1 minute', duration(DAY_MS + 11 * HOUR_MS + MINUTE_MS));
80-
assertEquals(
81-
'1 day 11 hours 45 minutes',
82-
duration(DAY_MS + 11 * HOUR_MS + 45 * MINUTE_MS));
83-
84-
assertEquals('11 days', duration(11 * DAY_MS));
85-
assertEquals('11 days', duration(11 * DAY_MS + 1));
86-
assertEquals('11 days 1 minute', duration(11 * DAY_MS + MINUTE_MS));
87-
assertEquals('11 days 45 minutes', duration(11 * DAY_MS + 45 * MINUTE_MS));
88-
assertEquals('11 days 1 hour', duration(11 * DAY_MS + HOUR_MS));
89-
assertEquals('11 days 11 hours', duration(11 * DAY_MS + 11 * HOUR_MS));
90-
assertEquals(
91-
'11 days 1 hour 1 minute', duration(11 * DAY_MS + HOUR_MS + MINUTE_MS));
92-
assertEquals(
93-
'11 days 1 hour 45 minutes',
94-
duration(11 * DAY_MS + HOUR_MS + 45 * MINUTE_MS));
95-
assertEquals(
96-
'11 days 11 hours 1 minute',
97-
duration(11 * DAY_MS + 11 * HOUR_MS + MINUTE_MS));
98-
assertEquals(
99-
'11 days 11 hours 45 minutes',
100-
duration(11 * DAY_MS + 11 * HOUR_MS + 45 * MINUTE_MS));
101-
}
102-
103-
function testFormatDurationPersianDigits() {
104-
goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_fa;
105-
106-
// ۱ minute
107-
assertEquals(localizeNumber(1) + ' minute', duration(MINUTE_MS));
108-
// ۲ minutes
109-
assertEquals(localizeNumber(2) + ' minutes', duration(2 * MINUTE_MS));
110-
// ۱۰ hours
111-
assertEquals(localizeNumber(10) + ' hours', duration(10 * HOUR_MS));
112-
// ۲۳ days
113-
assertEquals(localizeNumber(23) + ' days', duration(23 * DAY_MS));
114-
115-
// Restore to English, to make sure we don't mess up other tests
116-
goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_en;
117-
}
118-
119-
function testFormatDurationBengaliDigits() {
120-
goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_bn;
121-
122-
// ১ minute
123-
assertEquals(localizeNumber(1) + ' minute', duration(MINUTE_MS));
124-
// ২ minutes
125-
assertEquals(localizeNumber(2) + ' minutes', duration(2 * MINUTE_MS));
126-
// ১০ hours
127-
assertEquals(localizeNumber(10) + ' hours', duration(10 * HOUR_MS));
128-
// ২৩ days
129-
assertEquals(localizeNumber(23) + ' days', duration(23 * DAY_MS));
130-
131-
// Restore to English, to make sure we don't mess up other tests
132-
goog.i18n.DateTimeSymbols = goog.i18n.DateTimeSymbols_en;
133-
}
32+
const duration = dateDuration.format;
13433

13534
function localizeNumber(value) {
13635
// Quick conversion to national digits, to increase readability of the
13736
// tests above.
138-
return goog.i18n.DateTimeFormat.localizeNumbers(value);
37+
return DateTimeFormat.localizeNumbers(value);
13938
}
39+
40+
testSuite({
41+
setUpPage() {
42+
const propertyReplacer = new PropertyReplacer();
43+
propertyReplacer.replace(goog, 'LOCALE', 'en_US');
44+
},
45+
46+
testFormatDurationZeroMinutes() {
47+
assertEquals('0 minutes', duration(0));
48+
assertEquals('0 minutes', duration(MINUTE_MS - 1));
49+
},
50+
51+
testFormatDurationMinutes() {
52+
assertEquals('1 minute', duration(MINUTE_MS));
53+
assertEquals('1 minute', duration(MINUTE_MS + 1));
54+
assertEquals('5 minutes', duration(5 * MINUTE_MS));
55+
assertEquals('45 minutes', duration(45 * MINUTE_MS));
56+
},
57+
58+
testFormatDurationHours() {
59+
assertEquals('1 hour', duration(HOUR_MS));
60+
assertEquals('1 hour', duration(HOUR_MS + 1));
61+
assertEquals('1 hour 1 minute', duration(HOUR_MS + MINUTE_MS));
62+
assertEquals('1 hour 45 minutes', duration(HOUR_MS + 45 * MINUTE_MS));
63+
64+
assertEquals('5 hours', duration(5 * HOUR_MS));
65+
assertEquals('5 hours', duration(5 * HOUR_MS + 1));
66+
assertEquals('5 hours 1 minute', duration(5 * HOUR_MS + MINUTE_MS));
67+
assertEquals('5 hours 45 minutes', duration(5 * HOUR_MS + 45 * MINUTE_MS));
68+
69+
assertEquals('11 hours', duration(11 * HOUR_MS));
70+
assertEquals('11 hours', duration(11 * HOUR_MS + 1));
71+
assertEquals('11 hours 1 minute', duration(11 * HOUR_MS + MINUTE_MS));
72+
assertEquals(
73+
'11 hours 45 minutes', duration(11 * HOUR_MS + 45 * MINUTE_MS));
74+
},
75+
76+
testFormatDurationDays() {
77+
assertEquals('1 day', duration(DAY_MS));
78+
assertEquals('1 day', duration(DAY_MS + 1));
79+
assertEquals('1 day 1 minute', duration(DAY_MS + MINUTE_MS));
80+
assertEquals('1 day 45 minutes', duration(DAY_MS + 45 * MINUTE_MS));
81+
assertEquals('1 day 1 hour', duration(DAY_MS + HOUR_MS));
82+
assertEquals('1 day 11 hours', duration(DAY_MS + 11 * HOUR_MS));
83+
assertEquals(
84+
'1 day 1 hour 1 minute', duration(DAY_MS + HOUR_MS + MINUTE_MS));
85+
assertEquals(
86+
'1 day 1 hour 45 minutes', duration(DAY_MS + HOUR_MS + 45 * MINUTE_MS));
87+
assertEquals(
88+
'1 day 11 hours 1 minute', duration(DAY_MS + 11 * HOUR_MS + MINUTE_MS));
89+
assertEquals(
90+
'1 day 11 hours 45 minutes',
91+
duration(DAY_MS + 11 * HOUR_MS + 45 * MINUTE_MS));
92+
93+
assertEquals('11 days', duration(11 * DAY_MS));
94+
assertEquals('11 days', duration(11 * DAY_MS + 1));
95+
assertEquals('11 days 1 minute', duration(11 * DAY_MS + MINUTE_MS));
96+
assertEquals('11 days 45 minutes', duration(11 * DAY_MS + 45 * MINUTE_MS));
97+
assertEquals('11 days 1 hour', duration(11 * DAY_MS + HOUR_MS));
98+
assertEquals('11 days 11 hours', duration(11 * DAY_MS + 11 * HOUR_MS));
99+
assertEquals(
100+
'11 days 1 hour 1 minute', duration(11 * DAY_MS + HOUR_MS + MINUTE_MS));
101+
assertEquals(
102+
'11 days 1 hour 45 minutes',
103+
duration(11 * DAY_MS + HOUR_MS + 45 * MINUTE_MS));
104+
assertEquals(
105+
'11 days 11 hours 1 minute',
106+
duration(11 * DAY_MS + 11 * HOUR_MS + MINUTE_MS));
107+
assertEquals(
108+
'11 days 11 hours 45 minutes',
109+
duration(11 * DAY_MS + 11 * HOUR_MS + 45 * MINUTE_MS));
110+
},
111+
112+
testFormatDurationPersianDigits() {
113+
goog.i18n.DateTimeSymbols = DateTimeSymbols_fa;
114+
115+
// ۱ minute
116+
assertEquals(localizeNumber(1) + ' minute', duration(MINUTE_MS));
117+
// ۲ minutes
118+
assertEquals(localizeNumber(2) + ' minutes', duration(2 * MINUTE_MS));
119+
// ۱۰ hours
120+
assertEquals(localizeNumber(10) + ' hours', duration(10 * HOUR_MS));
121+
// ۲۳ days
122+
assertEquals(localizeNumber(23) + ' days', duration(23 * DAY_MS));
123+
124+
// Restore to English, to make sure we don't mess up other tests
125+
goog.i18n.DateTimeSymbols = DateTimeSymbols_en;
126+
},
127+
128+
testFormatDurationBengaliDigits() {
129+
goog.i18n.DateTimeSymbols = DateTimeSymbols_bn;
130+
131+
// ১ minute
132+
assertEquals(localizeNumber(1) + ' minute', duration(MINUTE_MS));
133+
// ২ minutes
134+
assertEquals(localizeNumber(2) + ' minutes', duration(2 * MINUTE_MS));
135+
// ১০ hours
136+
assertEquals(localizeNumber(10) + ' hours', duration(10 * HOUR_MS));
137+
// ২৩ days
138+
assertEquals(localizeNumber(23) + ' days', duration(23 * DAY_MS));
139+
140+
// Restore to English, to make sure we don't mess up other tests
141+
goog.i18n.DateTimeSymbols = DateTimeSymbols_en;
142+
},
143+
});

0 commit comments

Comments
 (0)