LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

test_posttraverse{,_roundrobin}: Unduplicate expected list

Browse Source
This commit is contained in:
Johan Kiviniemi
2013-12-28 06:03:35 +02:00
parent 71e3441cb1
commit 6692d10af0
1 changed files with 61 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

162
test/test_rendertileset.py
View File

@@ -1,5 +1,7 @@
import unittest import unittest
from itertools import chain, izip
from overviewer_core.tileset import iterate_base4, RendertileSet from overviewer_core.tileset import iterate_base4, RendertileSet
from overviewer_core.util import roundrobin from overviewer_core.util import roundrobin
@@ -35,6 +37,61 @@ class RendertileSetTest(unittest.TestCase):
(2,3,3), (2,3,3),
# Nothing under quadrant 3 # Nothing under quadrant 3
]) ])
# The paths as yielded by posttraversal, in an expanding-from-the-center
# order.
tile_paths_posttraversal_lists = [
[
(0,0,3),
(0,0,1),
(0,0,2),
(0,0,0),
(0,0),
(0,),
],
[
(1,2,0),
(1,2),
(1,0,3),
(1,0),
(1,1,3),
(1,1),
(1,),
],
[
(2,1,1),
(2,1,0),
(2,1,3),
(2,1,2),
(2,1),
(2,0,1),
(2,0,3),
(2,0,0),
(2,0,2),
(2,0),
(2,3,1),
(2,3,0),
(2,3,3),
(2,3,2),
(2,3),
(2,2,1),
(2,2,0),
(2,2,3),
(2,2,2),
(2,2),
(2,),
],
]
# Non-round robin post-traversal: finish the first top-level quadrant
# before moving to the second etc.
tile_paths_posttraversal = list(chain(*tile_paths_posttraversal_lists)) + [()]
# Round-robin post-traversal: start rendering to all directions from the
# center.
tile_paths_posttraversal_robin = list(roundrobin(tile_paths_posttraversal_lists)) + [()]
def setUp(self): def setUp(self):
self.tree = RendertileSet(3) self.tree = RendertileSet(3)
@@ -143,115 +200,18 @@ class RendertileSetTest(unittest.TestCase):
def test_posttraverse(self): def test_posttraverse(self):
"""Test a post-traversal of the tree's dirty tiles""" """Test a post-traversal of the tree's dirty tiles"""
# Expect these results in this proper order. # Expect the results in this proper order.
expected_list = [
(0,0,3),
(0,0,1),
(0,0,2),
(0,0,0),
(0,0),
(0,),
(1,2,0),
(1,2),
(1,0,3),
(1,0),
(1,1,3),
(1,1),
(1,),
(2,1,1),
(2,1,0),
(2,1,3),
(2,1,2),
(2,1),
(2,0,1),
(2,0,3),
(2,0,0),
(2,0,2),
(2,0),
(2,3,1),
(2,3,0),
(2,3,3),
(2,3,2),
(2,3),
(2,2,1),
(2,2,0),
(2,2,3),
(2,2,2),
(2,2),
(2,),
# We should expect the root tile to need rendering too.
(),
]
iterator = iter(self.tree.posttraversal()) iterator = iter(self.tree.posttraversal())
from itertools import izip for expected, actual in izip(self.tile_paths_posttraversal, iterator):
for expected, actual in izip(expected_list, iterator):
self.assertEqual(actual, expected) self.assertEqual(actual, expected)
self.assertRaises(StopIteration, next, iterator) self.assertRaises(StopIteration, next, iterator)
def test_posttraverse_roundrobin(self): def test_posttraverse_roundrobin(self):
"""Test a round-robin post-traversal of the tree's dirty tiles""" """Test a round-robin post-traversal of the tree's dirty tiles"""
# Expect these results in this proper order. # Expect the results in this proper order.
expected_lists = [
[
(0,0,3),
(0,0,1),
(0,0,2),
(0,0,0),
(0,0),
(0,),
],
[
(1,2,0),
(1,2),
(1,0,3),
(1,0),
(1,1,3),
(1,1),
(1,),
],
[
(2,1,1),
(2,1,0),
(2,1,3),
(2,1,2),
(2,1),
(2,0,1),
(2,0,3),
(2,0,0),
(2,0,2),
(2,0),
(2,3,1),
(2,3,0),
(2,3,3),
(2,3,2),
(2,3),
(2,2,1),
(2,2,0),
(2,2,3),
(2,2,2),
(2,2),
(2,),
],
]
expected_list = list(roundrobin(expected_lists)) + [ () ]
iterator = iter(self.tree.posttraversal(robin=True)) iterator = iter(self.tree.posttraversal(robin=True))
from itertools import izip for expected, actual in izip(self.tile_paths_posttraversal_robin, iterator):
for expected, actual in izip(expected_list, iterator):
self.assertEqual(actual, expected) self.assertEqual(actual, expected)
self.assertRaises(StopIteration, next, iterator) self.assertRaises(StopIteration, next, iterator)