print to browser console ; remove magic numbers ; improve tests

This commit is contained in:
GotPPay
2017-12-26 20:58:00 +01:00
parent b71eb244af
commit 627e31ef37
5 changed files with 31 additions and 32 deletions

View File

@@ -100,40 +100,30 @@ class PanelPresenterTest(unittest.TestCase):
actual_corners = self.subject.get_corners(buildings)
assert_array_equal(actual_corners,expected_corners)
def test_get_corners_box_building_rotated_90_degrees(self):
def test_get_corners_building(self):
self.subject = ProjectPresenter(SystemType.singleTilt, ModuleType.Cell96)
buildings = [ [ [0, 0], [0, 60], [-60,60], [-60, 0] ] ] # big square
buildings = [ [ [-3.42, 1.51], [-1.66, -1.64], [4.22, -0.87], [-0.8, 5.64]] ]
expected_corners = [[
{'x': 0, 'y': 0, 'length_cw': 60, 'length_ccw':60, 'angle':90},
{'x': 0, 'y': 60, 'length_cw': 60, 'length_ccw':60, 'angle':90},
{'x': -60, 'y': 60, 'length_cw': 60, 'length_ccw':60, 'angle':90},
{'x': -60, 'y': 0, 'length_cw': 60, 'length_ccw':60, 'angle':90}
{'x': -3.42, 'y': 1.51, 'length_cw': 4.890940604832571, 'length_ccw':3.6083375673570233, 'angle':118.41626123074676},
{'x': -1.66, 'y': -1.64, 'length_cw': 3.6083375673570233, 'length_ccw':5.930202357424239, 'angle':111.73284308914215},
{'x': 4.22, 'y': -0.87, 'length_cw': 5.930202357424239, 'length_ccw':8.22073597678456, 'angle':59.823982400990424},
{'x': -0.8, 'y': 5.64, 'length_cw': 8.22073597678456, 'length_ccw':4.890940604832571, 'angle':70.02691327912069}
]]
actual_corners = self.subject.get_corners(buildings)
assert_array_equal(actual_corners,expected_corners)
def test_get_corners_box_building_rotated_180_degrees(self):
def test_get_corners_wild_building_with_big_angles(self):
self.subject = ProjectPresenter(SystemType.singleTilt, ModuleType.Cell96)
buildings = [ [ [0, 0], [-60, 0], [-60,-60], [0, -60] ] ] # big square
buildings = [ [ [-3.58, 3.32], [-0.78, -2.9], [-1.56,0.88], [0.66, -2.16], [1.5, 1.16], [2.72, 2.36], [-0.8, 5.64] ] ]
expected_corners = [[
{'x': 0, 'y': 0, 'length_cw': 60, 'length_ccw':60, 'angle':90},
{'x': -60, 'y': 0, 'length_cw': 60, 'length_ccw':60, 'angle':90},
{'x': -60, 'y': -60, 'length_cw': 60, 'length_ccw':60, 'angle':90},
{'x': 0, 'y': -60, 'length_cw': 60, 'length_ccw':60, 'angle':90}
]]
actual_corners = self.subject.get_corners(buildings)
assert_array_equal(actual_corners,expected_corners)
def test_get_corners_box_building_rotated_270_degrees(self):
self.subject = ProjectPresenter(SystemType.singleTilt, ModuleType.Cell96)
buildings = [ [ [0, 0], [0, -60], [60,-60], [60, 0] ] ] # big square
expected_corners = [[
{'x': 0, 'y': 0, 'length_cw': 60, 'length_ccw':60, 'angle':90},
{'x': 0, 'y': -60, 'length_cw': 60, 'length_ccw':60, 'angle':90},
{'x': 60, 'y': -60, 'length_cw': 60, 'length_ccw':60, 'angle':90},
{'x': 60, 'y': 0, 'length_cw': 60, 'length_ccw':60, 'angle':90}
{'x': -3.58, 'y': 3.32, 'length_cw': 3.6208838699963852, 'length_ccw':6.821172919667115, 'angle':105.6106862572924},
{'x': -0.78, 'y': -2.9, 'length_cw': 6.821172919667115, 'length_ccw':3.8596372886580936, 'angle':12.576112527956795},
{'x': 0.66, 'y': -2.16, 'length_cw': 3.7643060449437424, 'length_ccw':3.424616766880639, 'angle':50.33783308603299},
{'x': 2.72, 'y': 2.36, 'length_cw': 1.7112568480505783, 'length_ccw':4.811319985201567, 'angle':87.50512700090906},
{'x': -0.8, 'y': 5.64, 'length_cw': 4.811319985201567, 'length_ccw':3.6208838699963852, 'angle':97.17527350158382}
]]
actual_corners = self.subject.get_corners(buildings)
print(actual_corners)
assert_array_equal(actual_corners,expected_corners)
def test_get_max_y(self):