Skip to content

Commit ddb0b04

Browse files
committed
Debugged DateTimeLabelUnitOptions and implemented unit tests.
1 parent e2106f9 commit ddb0b04

File tree

2 files changed

+38
-15
lines changed

2 files changed

+38
-15
lines changed

highcharts_core/utility_classes/date_time_label_formats.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ def _to_untrimmed_dict(self, in_cls=None) -> dict:
113113
untrimmed = {
114114
"list": self.list,
115115
"main": self.main,
116-
'range': slef.range,
116+
'range': self.range,
117117
}
118118

119119
return untrimmed
@@ -182,7 +182,7 @@ def hour(self, value):
182182
elif isinstance(value, str):
183183
self._hour = value
184184
else:
185-
self._hour = validate_types(value, DateTimeLabelUnitOptions)
185+
self._hour = validate_types(value, DateTimeLabelRangedUnitOptions)
186186

187187
@property
188188
def millisecond(self) -> Optional[str | DateTimeLabelRangedUnitOptions]:
@@ -202,7 +202,7 @@ def millisecond(self, value):
202202
elif isinstance(value, str):
203203
self._millisecond = value
204204
else:
205-
self._millisecond = validate_types(value, DateTimeLabelUnitOptions)
205+
self._millisecond = validate_types(value, DateTimeLabelRangedUnitOptions)
206206

207207
@property
208208
def minute(self) -> Optional[str | DateTimeLabelRangedUnitOptions]:
@@ -222,7 +222,7 @@ def minute(self, value):
222222
elif isinstance(value, str):
223223
self._minute = value
224224
else:
225-
self._minute = validate_types(value, DateTimeLabelUnitOptions)
225+
self._minute = validate_types(value, DateTimeLabelRangedUnitOptions)
226226

227227
@property
228228
def month(self) -> Optional[str | DateTimeLabelUnitOptions]:
@@ -262,7 +262,7 @@ def second(self, value):
262262
elif isinstance(value, str):
263263
self._second = value
264264
else:
265-
self._second = validate_types(value, DateTimeLabelUnitOptions)
265+
self._second = validate_types(value, DateTimeLabelRangedUnitOptions)
266266

267267
@property
268268
def week(self) -> Optional[str | DateTimeLabelUnitOptions]:

tests/utility_classes/test_date_time_label_formats.py

Lines changed: 33 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,39 @@
1212

1313
STANDARD_PARAMS = [
1414
({}, None),
15-
({
16-
'day': 'test',
17-
'hour': 'test',
18-
'millisecond': 'test',
19-
'minute': 'test',
20-
'month': 'test',
21-
'second': 'test',
22-
'week': 'test',
23-
'year': 'test'
24-
}, None),
15+
(
16+
{
17+
"day": "test",
18+
"hour": "test",
19+
"millisecond": "test",
20+
"minute": "test",
21+
"month": "test",
22+
"second": "test",
23+
"week": "test",
24+
"year": "test",
25+
},
26+
None,
27+
),
28+
(
29+
{
30+
"day": {
31+
'main': 'test',
32+
'list': ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday'],
33+
},
34+
"hour": {
35+
'main': 'test',
36+
'list': ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday'],
37+
'range': True,
38+
},
39+
"millisecond": "test",
40+
"minute": "test",
41+
"month": "test",
42+
"second": "test",
43+
"week": "test",
44+
"year": "test",
45+
},
46+
None,
47+
),
2548
]
2649

2750

0 commit comments

Comments
 (0)