1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
|
From 517ce7d21194da275f8083fa2fd7de6977dc7e95 Mon Sep 17 00:00:00 2001
From: Charlie Clark <charlie.clark@clark-consulting.eu>
Date: Mon, 11 Mar 2024 13:38:08 +0100
Subject: [PATCH] Looks like pytest has dropped support for unittest setup
methods so switched to fixture.
--HG--
branch : 3.1
---
openpyxl/drawing/tests/test_drawing.py | 46 ++++++++++++++------------
1 file changed, 24 insertions(+), 22 deletions(-)
diff --git a/openpyxl/drawing/tests/test_drawing.py b/openpyxl/drawing/tests/test_drawing.py
index c4c0712dd..befd2267c 100644
--- a/openpyxl/drawing/tests/test_drawing.py
+++ b/openpyxl/drawing/tests/test_drawing.py
@@ -1,20 +1,20 @@
# Copyright (c) 2010-2024 openpyxl
import pytest
-
from openpyxl.xml.functions import tostring
-
from openpyxl.tests.helper import compare_xml
+@pytest.fixture
+def Drawing():
+ from ..drawing import Drawing
+ return Drawing
+
class TestDrawing(object):
- def setup(self):
- from ..drawing import Drawing
- self.drawing = Drawing()
- def test_ctor(self):
- d = self.drawing
+ def test_ctor(self, Drawing):
+ d = Drawing()
assert d.coordinates == ((1, 2), (16, 8))
assert d.width == 21
assert d.height == 192
@@ -26,34 +26,34 @@ class TestDrawing(object):
assert d.description == ""
assert d.name == ""
- def test_width(self):
- d = self.drawing
+ def test_width(self, Drawing):
+ d = Drawing()
d.width = 100
d.height = 50
assert d.width == 100
- def test_proportional_width(self):
- d = self.drawing
+ def test_proportional_width(self, Drawing):
+ d = Drawing()
d.resize_proportional = True
d.width = 100
d.height = 50
assert (d.width, d.height) == (5, 50)
- def test_height(self):
- d = self.drawing
+ def test_height(self, Drawing):
+ d = Drawing()
d.height = 50
d.width = 100
assert d.height == 50
- def test_proportional_height(self):
- d = self.drawing
+ def test_proportional_height(self, Drawing):
+ d = Drawing()
d.resize_proportional = True
d.height = 50
d.width = 100
assert (d.width, d.height) == (100, 1000)
- def test_set_dimension(self):
- d = self.drawing
+ def test_set_dimension(self, Drawing):
+ d = Drawing()
d.resize_proportional = True
d.set_dimension(100, 50)
assert d.width == 6
@@ -65,8 +65,9 @@ class TestDrawing(object):
@pytest.mark.pil_required
- def test_absolute_anchor(self):
- node = self.drawing.anchor
+ def test_absolute_anchor(self, Drawing):
+ drawing = Drawing()
+ node = drawing.anchor
xml = tostring(node.to_tree())
expected = """
<absoluteAnchor>
@@ -80,9 +81,10 @@ class TestDrawing(object):
@pytest.mark.pil_required
- def test_onecell_anchor(self):
- self.drawing.anchortype = "oneCell"
- node = self.drawing.anchor
+ def test_onecell_anchor(self, Drawing):
+ drawing = Drawing()
+ drawing.anchortype = "oneCell"
+ node = drawing.anchor
xml = tostring(node.to_tree())
expected = """
<oneCellAnchor>
--
GitLab
|
