Skip to content

Commit d2680ef

Browse files
committed
Fixed tests for Excel border color fallback
1 parent e7d7eb0 commit d2680ef

File tree

1 file changed

+33
-24
lines changed

1 file changed

+33
-24
lines changed

pandas/tests/io/formats/test_to_excel.py

+33-24
Original file line numberDiff line numberDiff line change
@@ -113,63 +113,72 @@
113113
"border-style: solid",
114114
{
115115
"border": {
116-
"top": {"style": "medium"},
117-
"bottom": {"style": "medium"},
118-
"left": {"style": "medium"},
119-
"right": {"style": "medium"},
116+
"top": {"style": "medium", "color": "000000"},
117+
"bottom": {"style": "medium", "color": "000000"},
118+
"left": {"style": "medium", "color": "000000"},
119+
"right": {"style": "medium", "color": "000000"},
120120
}
121121
},
122122
),
123123
(
124124
"border-style: solid; border-width: thin",
125125
{
126126
"border": {
127-
"top": {"style": "thin"},
128-
"bottom": {"style": "thin"},
129-
"left": {"style": "thin"},
130-
"right": {"style": "thin"},
127+
"top": {"style": "thin", "color": "000000"},
128+
"bottom": {"style": "thin", "color": "000000"},
129+
"left": {"style": "thin", "color": "000000"},
130+
"right": {"style": "thin", "color": "000000"},
131131
}
132132
},
133133
),
134134
(
135135
"border-top-style: solid; border-top-width: thin",
136-
{"border": {"top": {"style": "thin"}}},
136+
{"border": {"top": {"style": "thin", "color": "000000"}}},
137137
),
138138
(
139139
"border-top-style: solid; border-top-width: 1pt",
140-
{"border": {"top": {"style": "thin"}}},
140+
{"border": {"top": {"style": "thin", "color": "000000"}}},
141+
),
142+
(
143+
"border-top-style: solid",
144+
{"border": {"top": {"style": "medium", "color": "000000"}}},
141145
),
142-
("border-top-style: solid", {"border": {"top": {"style": "medium"}}}),
143146
(
144147
"border-top-style: solid; border-top-width: medium",
145-
{"border": {"top": {"style": "medium"}}},
148+
{"border": {"top": {"style": "medium", "color": "000000"}}},
146149
),
147150
(
148151
"border-top-style: solid; border-top-width: 2pt",
149-
{"border": {"top": {"style": "medium"}}},
152+
{"border": {"top": {"style": "medium", "color": "000000"}}},
150153
),
151154
(
152155
"border-top-style: solid; border-top-width: thick",
153-
{"border": {"top": {"style": "thick"}}},
156+
{"border": {"top": {"style": "thick", "color": "000000"}}},
154157
),
155158
(
156159
"border-top-style: solid; border-top-width: 4pt",
157-
{"border": {"top": {"style": "thick"}}},
160+
{"border": {"top": {"style": "thick", "color": "000000"}}},
158161
),
159162
(
160163
"border-top-style: dotted",
161-
{"border": {"top": {"style": "mediumDashDotDot"}}},
164+
{"border": {"top": {"style": "mediumDashDotDot", "color": "000000"}}},
162165
),
163166
(
164167
"border-top-style: dotted; border-top-width: thin",
165-
{"border": {"top": {"style": "dotted"}}},
168+
{"border": {"top": {"style": "dotted", "color": "000000"}}},
169+
),
170+
(
171+
"border-top-style: dashed",
172+
{"border": {"top": {"style": "mediumDashed", "color": "000000"}}},
166173
),
167-
("border-top-style: dashed", {"border": {"top": {"style": "mediumDashed"}}}),
168174
(
169175
"border-top-style: dashed; border-top-width: thin",
170-
{"border": {"top": {"style": "dashed"}}},
176+
{"border": {"top": {"style": "dashed", "color": "000000"}}},
177+
),
178+
(
179+
"border-top-style: double",
180+
{"border": {"top": {"style": "double", "color": "000000"}}},
171181
),
172-
("border-top-style: double", {"border": {"top": {"style": "double"}}}),
173182
# - color
174183
(
175184
"border-style: solid; border-color: #0000ff",
@@ -240,10 +249,10 @@ def test_css_to_excel_multiple():
240249
assert {
241250
"font": {"bold": True, "underline": "single", "color": "FF0000"},
242251
"border": {
243-
"top": {"style": "thin"},
244-
"right": {"style": "thin"},
245-
"bottom": {"style": "thin"},
246-
"left": {"style": "thin"},
252+
"top": {"style": "thin", "color": "000000"},
253+
"right": {"style": "thin", "color": "000000"},
254+
"bottom": {"style": "thin", "color": "000000"},
255+
"left": {"style": "thin", "color": "000000"},
247256
},
248257
"alignment": {"horizontal": "center", "vertical": "top"},
249258
} == actual

0 commit comments

Comments
 (0)