Home Explore Help
Sign In
bux
/
opencombat
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Fixes #40

Bastien Sevajol 6 years ago
parent
36b9f806be
commit
ebcc02c2d8
1 changed files with 17 additions and 13 deletions
Unified View Show Diff Stats
  1. 17 13
      tests/gui/test_interiors.py

+ 17 - 13
tests/gui/test_interiors.py View File

7
7
8 
 def test_interior_zones__one_zone():
 8 
 def test_interior_zones__one_zone():
9 
     map_ = TMXMap('tests/fixtures/one_interior.tmx')
 9 
     map_ = TMXMap('tests/fixtures/one_interior.tmx')
10 
-    manager = InteriorManager(map_)
10 
+    image = Image.open('tests/fixtures/complex_40x40.png')
11 
+    manager = InteriorManager(map_, original_image=image)
11 
     interiors = manager.get_interiors()
 12 
     interiors = manager.get_interiors()
12
13
13 
     assert interiors
 14 
     assert interiors
28
29
29 
 def test_interior_zones__two_separated_zones():
 30 
 def test_interior_zones__two_separated_zones():
30 
     map_ = TMXMap('tests/fixtures/two_interiors.tmx')
 31 
     map_ = TMXMap('tests/fixtures/two_interiors.tmx')
31 
-    manager = InteriorManager(map_)
32 
+    image = Image.open('tests/fixtures/complex_40x40.png')
33 
+    manager = InteriorManager(map_, original_image=image)
32 
     interiors = sorted(manager.get_interiors())
 34 
     interiors = sorted(manager.get_interiors())
33
35
34 
     assert interiors
 36 
     assert interiors
54
56
55 
 def test_interiors_zones__side_by_side_zones_with_separator():
 57 
 def test_interiors_zones__side_by_side_zones_with_separator():
56 
     map_ = TMXMap('tests/fixtures/side_by_side_interiors.tmx')
 58 
     map_ = TMXMap('tests/fixtures/side_by_side_interiors.tmx')
57 
-    manager = InteriorManager(map_)
59 
+    image = Image.open('tests/fixtures/complex_40x40.png')
60 
+    manager = InteriorManager(map_, original_image=image)
58 
     interiors = sorted(manager.get_interiors())
 61 
     interiors = sorted(manager.get_interiors())
59
62
60 
     assert interiors
 63 
     assert interiors
87 
 def test_interiors_zones__active_zones():
 90 
 def test_interiors_zones__active_zones():
88 
     # active zones are zone where someone is in
 91 
     # active zones are zone where someone is in
89 
     map_ = TMXMap('tests/fixtures/two_interiors.tmx')
 92 
     map_ = TMXMap('tests/fixtures/two_interiors.tmx')
90 
-    manager = InteriorManager(map_)
93 
+    image = Image.open('tests/fixtures/complex_40x40.png')
94 
+    manager = InteriorManager(map_, original_image=image)
91
95
92 
     interiors = manager.get_interiors(where_positions=[(0, 1)])
 96 
     interiors = manager.get_interiors(where_positions=[(0, 1)])
93
97
134
138
135 
 def test_interiors_zones__make_image_transparent__just_replace():
 139 
 def test_interiors_zones__make_image_transparent__just_replace():
136 
     map_ = TMXMap('tests/fixtures/one_interior.tmx')
 140 
     map_ = TMXMap('tests/fixtures/one_interior.tmx')
137 
-    manager = InteriorManager(map_)
138 
-    interiors = manager.get_interiors()
139 
     image = Image.open('tests/fixtures/white_40x40.png')
 141 
     image = Image.open('tests/fixtures/white_40x40.png')
142 
+    manager = InteriorManager(map_, original_image=image)
143 
+    interiors = manager.get_interiors()
140 
     after_image_bytes = Image.open('tests/fixtures/white_one_interior_40x40.png').tobytes()
 144 
     after_image_bytes = Image.open('tests/fixtures/white_one_interior_40x40.png').tobytes()
141
145
142 
-    manager.update_image_for_interiors(image, interiors, 8, 8)
146 
+    image = manager.update_image_for_interiors(interiors, 8, 8)
143 
     assert after_image_bytes == image.tobytes()
 147 
     assert after_image_bytes == image.tobytes()
144
148
145
149
146 
 def test_interiors_zones__make_image_complex_transparent__just_replace():
 150 
 def test_interiors_zones__make_image_complex_transparent__just_replace():
147 
     map_ = TMXMap('tests/fixtures/one_interior.tmx')
 151 
     map_ = TMXMap('tests/fixtures/one_interior.tmx')
148 
-    manager = InteriorManager(map_)
149 
-    interiors = manager.get_interiors()
150 
     image = Image.open('tests/fixtures/complex_40x40.png')
 152 
     image = Image.open('tests/fixtures/complex_40x40.png')
153 
+    manager = InteriorManager(map_, original_image=image)
154 
+    interiors = manager.get_interiors()
151 
     after_image_bytes = Image.open('tests/fixtures/complex_one_interior_40x40.png').tobytes()
 155 
     after_image_bytes = Image.open('tests/fixtures/complex_one_interior_40x40.png').tobytes()
152
156
153 
-    manager.update_image_for_interiors(image, interiors, 8, 8)
157 
+    image = manager.update_image_for_interiors(interiors, 8, 8)
154 
     assert after_image_bytes == image.tobytes()
 158 
     assert after_image_bytes == image.tobytes()
155
159
156
160
157 
 def test_interiors_zones__make_image_corner_transparent__just_replace():
 161 
 def test_interiors_zones__make_image_corner_transparent__just_replace():
158 
     map_ = TMXMap('tests/fixtures/corner_interior.tmx')
 162 
     map_ = TMXMap('tests/fixtures/corner_interior.tmx')
159 
-    manager = InteriorManager(map_)
160 
-    interiors = manager.get_interiors()
161 
     image = Image.open('tests/fixtures/white_40x40.png')
 163 
     image = Image.open('tests/fixtures/white_40x40.png')
164 
+    manager = InteriorManager(map_, original_image=image)
165 
+    interiors = manager.get_interiors()
162 
     after_image_bytes = Image.open('tests/fixtures/white_corner_interior_40x40.png').tobytes()
 166 
     after_image_bytes = Image.open('tests/fixtures/white_corner_interior_40x40.png').tobytes()
163
167
164 
-    manager.update_image_for_interiors(image, interiors, 8, 8)
168 
+    image = manager.update_image_for_interiors(interiors, 8, 8)
165 
     assert after_image_bytes == image.tobytes()
 169 
     assert after_image_bytes == image.tobytes()