| ... | @@ -3,7 +3,6 @@ import json | ... | @@ -3,7 +3,6 @@ import json |
| 3 | from pathlib import Path | 3 | from pathlib import Path |
| 4 | import runpy | 4 | import runpy |
| 5 | import shutil | 5 | import shutil |
| 6 | import struct | | |
| 7 | import subprocess | 6 | import subprocess |
| 8 | from tempfile import TemporaryDirectory | 7 | from tempfile import TemporaryDirectory |
| 9 | import unittest | 8 | import unittest |
| ... | @@ -188,11 +187,9 @@ class OutlineEditTest(unittest.TestCase): | ... | @@ -188,11 +187,9 @@ class OutlineEditTest(unittest.TestCase): |
| 188 | else: | 187 | else: |
| 189 | self.fail(name) | 188 | self.fail(name) |
| 190 | if case['shape'] not in ('cell', 'cell-only'): | 189 | if case['shape'] not in ('cell', 'cell-only'): |
| 191 | reservation = actual[outline]['extra'][0][-1] | 190 | reservation = actual[outline]['layout']['reserved_width'] |
| 192 | self.assertEqual(reservation['id'], 0x14001cdb) | 191 | self.assertAlmostEqual(reservation, 423.75, places=3) |
| 193 | width, = struct.unpack('<f', bytes.fromhex(reservation['value']['Bytes'])) | 192 | expected[outline]['layout']['reserved_width'] = reservation |
| 194 | self.assertAlmostEqual(width * 36, 423.75, places=3) | | |
| 195 | expected[outline]['extra'][0].append(reservation) | | |
| 196 | self.assertEqual(actual.keys(), expected.keys()) | 193 | self.assertEqual(actual.keys(), expected.keys()) |
| 197 | for oid, node in expected.items(): | 194 | for oid, node in expected.items(): |
| 198 | self.preserved_node(node, actual[oid]) | 195 | self.preserved_node(node, actual[oid]) |