Skip to content

Commit dc45106

Browse files
lucaswerkmeisterlucaswerkmeister
committed
Improvements to test.ceylon.time
- Many, MANY tests were calling assertEquals with the wrong argument order: assertEquals(expected, actual), whereas the correct order with positional arguments is assertEquals(actual, expected). A few of these mistakes were caught by eclipse-archived/ceylon#6183. I attempted to fix them in a way that would be consistent with other tests in the file, so sometimes I swapped the parameters, and sometimes I changed the invocation to use named arguments. - Some tests did manual exception handling instead of using assertThatException. - Some tests could be parameterized (eclipse-archived#159). - Some date_* variables were misspelled as data_*.
1 parent 401ddd5 commit dc45106

17 files changed

+812
-1113
lines changed

‎test-source/test/ceylon/time/testChronology.ceylon‎

Lines changed: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import ceylon.test {
22
assertEquals,
3-
test
3+
test,
4+
parameters
45
}
56
import ceylon.time {
67
date,
@@ -16,39 +17,42 @@ import ceylon.time.chronology {
1617
}
1718

1819
shared test void testUnixTime() {
19-
assertEquals(719163, unixTime.epoch);
20-
assertEquals(719163, unixTime.fixedFromTime(1));
21-
assertEquals(1356998400000, unixTime.timeFromFixed(date(2013, january, 1).dayOfEra));
22-
assertEquals(unixTime.timeOfDay(1357032630000), time(9, 30, 30).millisecondsOfDay);
20+
assertEquals { expected = 719163; actual = unixTime.epoch; };
21+
assertEquals { expected = 719163; actual = unixTime.fixedFromTime(1); };
22+
assertEquals { expected = 1356998400000; actual = unixTime.timeFromFixed(date(2013, january, 1).dayOfEra); };
23+
assertEquals { expected = unixTime.timeOfDay(1357032630000); actual = time(9, 30, 30).millisecondsOfDay; };
2324
}
2425

25-
shared test void testGregorianMonths() {
26-
assertEquals(1, gregorian.january);
27-
assertEquals(2, gregorian.february);
28-
assertEquals(3, gregorian.march);
29-
assertEquals(4, gregorian.april);
30-
assertEquals(5, gregorian.may);
31-
assertEquals(6, gregorian.june);
32-
assertEquals(7, gregorian.july);
33-
assertEquals(8, gregorian.august);
34-
assertEquals(9, gregorian.september);
35-
assertEquals(10, gregorian.october);
36-
assertEquals(11, gregorian.november);
37-
assertEquals(12, gregorian.december);
38-
}
26+
[[Integer, Integer]*] gregorianMonths = [
27+
[1, gregorian.january],
28+
[2, gregorian.february],
29+
[3, gregorian.march],
30+
[4, gregorian.april],
31+
[5, gregorian.may],
32+
[6, gregorian.june],
33+
[7, gregorian.july],
34+
[8, gregorian.august],
35+
[9, gregorian.september],
36+
[10, gregorian.october],
37+
[11, gregorian.november],
38+
[12, gregorian.december]
39+
];
40+
parameters (`value gregorianMonths`)
41+
shared test void testGregorianMonths(Integer expectedMonth, Integer actualMonth)
42+
=> assertEquals { expected = expectedMonth; actual = actualMonth; };
3943

4044
shared test void testGregorian() {
4145
gregorian.checkDate([2013, 1, 1]);
4246
gregorian.checkDate([2012, 2, 29]);
4347
gregorian.checkDate([2010, 12, 31]);
4448

45-
assertEquals([1970, 1, 1], gregorian.dateFrom(unixTime.epoch));
46-
assertEquals(1, gregorian.dayFrom(unixTime.epoch));
47-
assertEquals(tuesday.integer, gregorian.dayOfWeekFrom(735065));
48-
assertEquals(719163, gregorian.fixedFrom([1970,1,1]));
49+
assertEquals { expected = [1970, 1, 1]; actual = gregorian.dateFrom(unixTime.epoch); };
50+
assertEquals { expected = 1; actual = gregorian.dayFrom(unixTime.epoch); };
51+
assertEquals { expected = tuesday.integer; actual = gregorian.dayOfWeekFrom(735065); };
52+
assertEquals { expected = 719163; actual = gregorian.fixedFrom([1970,1,1]); };
4953

50-
assertEquals(true, gregorian.leapYear(2012));
51-
assertEquals(false, gregorian.leapYear(2010));
54+
assertEquals { expected = true; actual = gregorian.leapYear(2012); };
55+
assertEquals { expected = false; actual = gregorian.leapYear(2010); };
5256

53-
assertEquals(gregorian.january, gregorian.monthFrom(719163));
57+
assertEquals { expected = gregorian.january; actual = gregorian.monthFrom(719163); };
5458
}

‎test-source/test/ceylon/time/testClock.ceylon‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ import ceylon.time { systemTime, Instant, fixedTime, offsetTime, Duration }
33
import ceylon.time.base { milliseconds }
44

55
test shared void testSystemTimeString() {
6-
assertEquals("System time", systemTime.string);
6+
assertEquals { expected = "System time"; actual = systemTime.string; };
77
}
88

99
test shared void testFixedTimeString() {
10-
assertEquals("Fixed to 2013-11-07T20:52:10.000Z", fixedTime(Instant(1383857530000)).string);
11-
assertEquals("Fixed to 2013-11-07T20:52:10.000Z", fixedTime(1383857530000).string);
10+
assertEquals { expected = "Fixed to 2013-11-07T20:52:10.000Z"; actual = fixedTime(Instant(1383857530000)).string; };
11+
assertEquals { expected = "Fixed to 2013-11-07T20:52:10.000Z"; actual = fixedTime(1383857530000).string; };
1212
}
1313

1414
test shared void testOffsetTimeString() {
15-
assertEquals("Offset of PT1H from ``systemTime.string``", offsetTime(systemTime, Duration(milliseconds.perHour)).string);
15+
assertEquals { expected = "Offset of PT1H from ``systemTime.string``"; actual = offsetTime(systemTime, Duration(milliseconds.perHour)).string; };
1616
}

‎test-source/test/ceylon/time/testDateRange.ceylon‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,15 @@ shared test void testEqualsAndHashDateRange() {
4646
}
4747

4848
shared test void testStepDays() {
49-
assertEquals(days, jan_date_range.step);
49+
assertEquals { expected = days; actual = jan_date_range.step; };
5050
}
5151

5252
shared test void testStepMonths() {
53-
assertEquals(months, jan_date_range.stepBy(months).step);
53+
assertEquals { expected = months; actual = jan_date_range.stepBy(months).step; };
5454
}
5555

5656
shared test void testStepYears() {
57-
assertEquals(years, jan_date_range.stepBy(years).step);
57+
assertEquals { expected = years; actual = jan_date_range.stepBy(years).step; };
5858
}
5959

6060
shared test void testAnyExist() {
@@ -95,69 +95,69 @@ shared test void testGapDate() {
9595
DateRange mar = date(2013, march, 1).rangeTo(date(2013, march, 31));
9696
DateRange gap = date(2013, february, 1).rangeTo(date(2013, february, 28));
9797

98-
assertEquals(gap, jan_date_range.gap(mar));
98+
assertEquals { expected = gap; actual = jan_date_range.gap(mar); };
9999
}
100100

101101
shared test void testGapDateReverse() {
102102
DateRange mar = date(2013, march, 1).rangeTo(date(2013, march,31));
103103
DateRange gap = date(2013, february, 1).rangeTo(date(2013, february, 28));
104104

105-
assertEquals(gap, jan_date_range_reverse.gap(mar));
105+
assertEquals { expected = gap; actual = jan_date_range_reverse.gap(mar); };
106106
}
107107

108108
shared test void testGapDateOneYear() {
109109
DateRange _2013 = date(2013, january, 1).rangeTo(date(2013, december, 31));
110110
DateRange _2015 = date(2015, january, 1).rangeTo(date(2015, december, 31));
111111

112112
DateRange _2014 = date(2014, january, 1).rangeTo(date(2014, december, 31));
113-
assertEquals(_2014, _2015.gap(_2013));
113+
assertEquals { expected = _2014; actual = _2015.gap(_2013); };
114114
}
115115

116116
shared test void testGapDateEmpty() {
117117
DateRange feb = date(2013, february, 1).rangeTo(date(2013, february,28));
118118

119-
assertEquals(empty, jan_date_range_reverse.gap(feb));
119+
assertEquals { expected = empty; actual = jan_date_range_reverse.gap(feb); };
120120
}
121121

122122
shared test void testOverlapDateEmpty() {
123123
DateRange decemberRange = date(2013, december, 1).rangeTo(date(2013, december, 31));
124124

125-
assertEquals(empty, jan_date_range.overlap(decemberRange));
125+
assertEquals { expected = empty; actual = jan_date_range.overlap(decemberRange); };
126126
}
127127

128128
shared test void testOverlapDate() {
129129
DateRange halfJan = date(2013, january, 5).rangeTo(date(2013, january, 15));
130130
DateRange overlap = date(2013, january, 5).rangeTo(date(2013, january, 15));
131131

132-
assertEquals(overlap, jan_date_range.overlap(halfJan));
132+
assertEquals { expected = overlap; actual = jan_date_range.overlap(halfJan); };
133133
}
134134

135135
shared test void testStepDayReverse() {
136-
assertEquals( 31, jan_date_range_reverse.size);
137-
assertEquals( date(2013, january, 31), jan_date_range_reverse.first);
138-
assertEquals( date(2013, january, 1), jan_date_range_reverse.last);
136+
assertEquals { expected = 31; actual = jan_date_range_reverse.size; };
137+
assertEquals { expected = date(2013, january, 31); actual = jan_date_range_reverse.first; };
138+
assertEquals { expected = date(2013, january, 1); actual = jan_date_range_reverse.last; };
139139
}
140140

141141
shared test void testStepMonthReverse() {
142142
DateRange interval = jan_date_range_reverse.stepBy(months);
143-
assertEquals( 1, interval.size);
144-
assertEquals( date(2013, january, 31), interval.first);
145-
assertEquals( date(2013, january, 31), interval.last);
143+
assertEquals { expected = 1; actual = interval.size; };
144+
assertEquals { expected = date(2013, january, 31); actual = interval.first; };
145+
assertEquals { expected = date(2013, january, 31); actual = interval.last; };
146146
}
147147

148148
shared test void testStepYearReverse() {
149149
DateRange interval = jan_date_range_reverse.stepBy(years);
150-
assertEquals( 1, interval.size);
151-
assertEquals( date(2013, january, 31), interval.first);
152-
assertEquals( date(2013, january, 31), interval.last);
150+
assertEquals { expected = 1; actual = interval.size; };
151+
assertEquals { expected = date(2013, january, 31); actual = interval.first; };
152+
assertEquals { expected = date(2013, january, 31); actual = interval.last; };
153153
}
154154

155155
shared test void testContainsDate() {
156-
assertEquals(true, date(2013, january, 15) in jan_date_range);
156+
assertTrue(date(2013, january, 15) in jan_date_range);
157157
}
158158

159159
shared test void testNotContainsDate() {
160-
assertEquals(false, date(2013, january, 15) in jan_date_range.stepBy(years));
160+
assertFalse(date(2013, january, 15) in jan_date_range.stepBy(years));
161161
}
162162

163163
shared test void testGapRulesABSmallerCD() {
@@ -317,21 +317,21 @@ shared test void testOverlapRulesABHigherCD() {
317317
}
318318

319319
test void testDateRangeString() {
320-
assertEquals( "2013-10-01/2013-10-31", DateRange(date(2013, october, 1), date(2013, october, 31)).string );
321-
assertEquals( "2014-01-01/2013-01-01", DateRange(date(2014, january, 1), date(2013, january, 1)).string );
320+
assertEquals { expected = "2013-10-01/2013-10-31"; actual = DateRange(date(2013, october, 1), date(2013, october, 31)).string; };
321+
assertEquals { expected = "2014-01-01/2013-01-01"; actual = DateRange(date(2014, january, 1), date(2013, january, 1)).string; };
322322
}
323323

324324
void assertIntervalDate( Date start, Date end, Period period, Duration? duration = null ) {
325325
value range = start.rangeTo(end);
326-
assertEquals(period, range.period);
326+
assertEquals { expected = period; actual = range.period; };
327327

328-
assertEquals( end, start.plus(period) );
329-
assertEquals( start, end.minus(period) );
328+
assertEquals { expected = end; actual = start.plus(period); };
329+
assertEquals { expected = start; actual = end.minus(period); };
330330

331-
assertEquals( start, range.first );
332-
assertEquals( end, range.last );
331+
assertEquals { expected = start; actual = range.first; };
332+
assertEquals { expected = end; actual = range.last; };
333333

334334
if( exists duration ) {
335-
assertEquals(duration, range.duration);
335+
assertEquals { expected = duration; actual = range.duration; };
336336
}
337337
}

0 commit comments

Comments
 (0)