Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(580)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: tools/tests/render_pictures_test.py

Issue 226293002: add explicit filepaths to render_pictures JSON summary (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/tests/render_pictures_test.py
diff --git a/tools/tests/render_pictures_test.py b/tools/tests/render_pictures_test.py
index 162531a6adc698acc1f056912a3f5d9269bbce2c..262ea0186e23f3b6a2b824068c410adef45cef87 100755
--- a/tools/tests/render_pictures_test.py
+++ b/tools/tests/render_pictures_test.py
@@ -51,9 +51,15 @@ class RenderPicturesTest(base_unittest.TestCase):
"actual-results" : {
"no-comparison" : {
# Manually verified: 640x400 red rectangle with black border
- "red.png" : [ "bitmap-64bitMD5", 11092453015575919668 ],
+ "red.skp" : {
+ "bitmap-64bitMD5" : 11092453015575919668,
+ "filepath" : "red.png",
+ },
# Manually verified: 640x400 green rectangle with black border
- "green.png" : [ "bitmap-64bitMD5", 8891695120562235492 ],
+ "green.skp" : {
+ "bitmap-64bitMD5" : 8891695120562235492,
+ "filepath" : "green.png",
+ },
}
}
}
@@ -72,9 +78,15 @@ class RenderPicturesTest(base_unittest.TestCase):
"actual-results" : {
"no-comparison" : {
# Manually verified: 640x400 red rectangle with black border
- "red.png" : ["bitmap-64bitMD5", 11092453015575919668],
+ "red.skp" : {
+ "bitmap-64bitMD5" : 11092453015575919668,
+ "filepath" : "red.png",
+ },
# Manually verified: 640x400 green rectangle with black border
- "green.png" : ["bitmap-64bitMD5", 8891695120562235492],
+ "green.skp" : {
+ "bitmap-64bitMD5" : 8891695120562235492,
+ "filepath" : "green.png",
+ },
}
}
}
@@ -94,17 +106,26 @@ class RenderPicturesTest(base_unittest.TestCase):
"actual-results" : {
"no-comparison" : {
# Manually verified: 640x400 red rectangle with black border
- "red.png" : ["bitmap-64bitMD5", 11092453015575919668],
+ "red.skp" : {
+ "bitmap-64bitMD5" : 11092453015575919668,
+ "filepath" : "bitmap-64bitMD5/red_skp/11092453015575919668.png",
epoger 2014/04/04 18:14:40 instead of bitmap-64bitMD5/red_skp/11092453015575
epoger 2014/04/04 18:34:21 Done.
+ },
# Manually verified: 640x400 green rectangle with black border
- "green.png" : ["bitmap-64bitMD5", 8891695120562235492],
+ "green.skp" : {
+ "bitmap-64bitMD5" : 8891695120562235492,
+ "filepath" : "bitmap-64bitMD5/green_skp/8891695120562235492.png",
+ },
}
}
}
self._assert_json_contents(output_json_path, expected_summary_dict)
+ self._assert_directory_contents(self._temp_dir, ['output.json'])
self._assert_directory_contents(
- self._temp_dir, ['bitmap-64bitMD5_11092453015575919668.png',
- 'bitmap-64bitMD5_8891695120562235492.png',
- 'output.json'])
+ os.path.join(self._temp_dir, 'bitmap-64bitMD5', 'red_skp'),
+ ['11092453015575919668.png'])
+ self._assert_directory_contents(
+ os.path.join(self._temp_dir, 'bitmap-64bitMD5', 'green_skp'),
+ ['8891695120562235492.png'])
def test_untiled_validate(self):
"""Same as test_untiled, but with --validate.
@@ -156,30 +177,61 @@ class RenderPicturesTest(base_unittest.TestCase):
# Manually verified these 6 images, all 256x256 tiles,
# consistent with a tiled version of the 640x400 red rect
# with black borders.
- "red0.png" : ["bitmap-64bitMD5", 5815827069051002745],
- "red1.png" : ["bitmap-64bitMD5", 9323613075234140270],
- "red2.png" : ["bitmap-64bitMD5", 16670399404877552232],
- "red3.png" : ["bitmap-64bitMD5", 2507897274083364964],
- "red4.png" : ["bitmap-64bitMD5", 7325267995523877959],
- "red5.png" : ["bitmap-64bitMD5", 2181381724594493116],
+ "red.skp-tile0" : {
+ "bitmap-64bitMD5" : 5815827069051002745,
+ "filepath" : "red_skp-tile0.png",
+ },
+ "red.skp-tile1" : {
+ "bitmap-64bitMD5" : 9323613075234140270,
+ "filepath" : "red_skp-tile1.png",
+ },
+ "red.skp-tile2" : {
+ "bitmap-64bitMD5" : 16670399404877552232,
+ "filepath" : "red_skp-tile2.png",
+ },
+ "red.skp-tile3" : {
+ "bitmap-64bitMD5" : 2507897274083364964,
+ "filepath" : "red_skp-tile3.png",
+ },
+ "red.skp-tile4" : {
+ "bitmap-64bitMD5" : 7325267995523877959,
+ "filepath" : "red_skp-tile4.png",
+ },
+ "red.skp-tile5" : {
+ "bitmap-64bitMD5" : 2181381724594493116,
+ "filepath" : "red_skp-tile5.png",
+ },
# Manually verified these 6 images, all 256x256 tiles,
# consistent with a tiled version of the 640x400 green rect
# with black borders.
- "green0.png" : ["bitmap-64bitMD5", 12587324416545178013],
- "green1.png" : ["bitmap-64bitMD5", 7624374914829746293],
- "green2.png" : ["bitmap-64bitMD5", 5686489729535631913],
- "green3.png" : ["bitmap-64bitMD5", 7980646035555096146],
- "green4.png" : ["bitmap-64bitMD5", 17817086664365875131],
- "green5.png" : ["bitmap-64bitMD5", 10673669813016809363],
+ "green.skp-tile0" : {
+ "bitmap-64bitMD5" : 12587324416545178013,
+ "filepath" : "green_skp-tile0.png",
+ },
+ "green.skp-tile1" : {
+ "bitmap-64bitMD5" : 7624374914829746293,
+ "filepath" : "green_skp-tile1.png",
+ },
+ "green.skp-tile2" : {
+ "bitmap-64bitMD5" : 5686489729535631913,
+ "filepath" : "green_skp-tile2.png",
+ },
+ "green.skp-tile3" : {
+ "bitmap-64bitMD5" : 7980646035555096146,
+ "filepath" : "green_skp-tile3.png",
+ },
+ "green.skp-tile4" : {
+ "bitmap-64bitMD5" : 17817086664365875131,
+ "filepath" : "green_skp-tile4.png",
+ },
+ "green.skp-tile5" : {
+ "bitmap-64bitMD5" : 10673669813016809363,
+ "filepath" : "green_skp-tile5.png",
+ },
}
}
}
self._assert_json_contents(output_json_path, expected_summary_dict)
- self._assert_directory_contents(
- self._temp_dir,
- ['red0.png', 'red1.png', 'red2.png', 'red3.png', 'red4.png', 'red5.png',
- 'green0.png', 'green1.png', 'green2.png', 'green3.png', 'green4.png',
- 'green5.png', 'output.json'])
def test_tiled_writeChecksumBasedFilenames(self):
"""Same as test_tiled, but with --writeChecksumBasedFilenames."""
@@ -197,40 +249,61 @@ class RenderPicturesTest(base_unittest.TestCase):
# Manually verified these 6 images, all 256x256 tiles,
# consistent with a tiled version of the 640x400 red rect
# with black borders.
- "red0.png" : ["bitmap-64bitMD5", 5815827069051002745],
- "red1.png" : ["bitmap-64bitMD5", 9323613075234140270],
- "red2.png" : ["bitmap-64bitMD5", 16670399404877552232],
- "red3.png" : ["bitmap-64bitMD5", 2507897274083364964],
- "red4.png" : ["bitmap-64bitMD5", 7325267995523877959],
- "red5.png" : ["bitmap-64bitMD5", 2181381724594493116],
+ "red.skp-tile0" : {
epoger 2014/04/04 18:14:40 add some version header too
epoger 2014/04/04 18:34:21 Done.
+ "bitmap-64bitMD5" : 5815827069051002745,
+ "filepath" : "bitmap-64bitMD5/red_skp-tile0/5815827069051002745.png",
epoger 2014/04/04 18:14:40 instead of bitmap-64bitMD5/red_skp-tile0/58158270
epoger 2014/04/04 18:34:21 Done.
+ },
+ "red.skp-tile1" : {
epoger 2014/04/04 18:14:40 instead: "algorithm": "bitmap-64bitMD5", "checksum
epoger 2014/04/04 18:34:21 Done.
+ "bitmap-64bitMD5" : 9323613075234140270,
+ "filepath" : "bitmap-64bitMD5/red_skp-tile1/9323613075234140270.png",
+ },
+ "red.skp-tile2" : {
+ "bitmap-64bitMD5" : 16670399404877552232,
epoger 2014/04/04 18:14:40 Note: changing the format of this JSON will break
+ "filepath" : "bitmap-64bitMD5/red_skp-tile2/16670399404877552232.png",
+ },
+ "red.skp-tile3" : {
+ "bitmap-64bitMD5" : 2507897274083364964,
+ "filepath" : "bitmap-64bitMD5/red_skp-tile3/2507897274083364964.png",
+ },
+ "red.skp-tile4" : {
+ "bitmap-64bitMD5" : 7325267995523877959,
+ "filepath" : "bitmap-64bitMD5/red_skp-tile4/7325267995523877959.png",
+ },
+ "red.skp-tile5" : {
+ "bitmap-64bitMD5" : 2181381724594493116,
+ "filepath" : "bitmap-64bitMD5/red_skp-tile5/2181381724594493116.png",
+ },
# Manually verified these 6 images, all 256x256 tiles,
# consistent with a tiled version of the 640x400 green rect
# with black borders.
- "green0.png" : ["bitmap-64bitMD5", 12587324416545178013],
- "green1.png" : ["bitmap-64bitMD5", 7624374914829746293],
- "green2.png" : ["bitmap-64bitMD5", 5686489729535631913],
- "green3.png" : ["bitmap-64bitMD5", 7980646035555096146],
- "green4.png" : ["bitmap-64bitMD5", 17817086664365875131],
- "green5.png" : ["bitmap-64bitMD5", 10673669813016809363],
+ "green.skp-tile0" : {
+ "bitmap-64bitMD5" : 12587324416545178013,
+ "filepath" : "bitmap-64bitMD5/green_skp-tile0/12587324416545178013.png",
+ },
+ "green.skp-tile1" : {
+ "bitmap-64bitMD5" : 7624374914829746293,
+ "filepath" : "bitmap-64bitMD5/green_skp-tile1/7624374914829746293.png",
+ },
+ "green.skp-tile2" : {
+ "bitmap-64bitMD5" : 5686489729535631913,
+ "filepath" : "bitmap-64bitMD5/green_skp-tile2/5686489729535631913.png",
+ },
+ "green.skp-tile3" : {
+ "bitmap-64bitMD5" : 7980646035555096146,
+ "filepath" : "bitmap-64bitMD5/green_skp-tile3/7980646035555096146.png",
+ },
+ "green.skp-tile4" : {
+ "bitmap-64bitMD5" : 17817086664365875131,
+ "filepath" : "bitmap-64bitMD5/green_skp-tile4/17817086664365875131.png",
+ },
+ "green.skp-tile5" : {
+ "bitmap-64bitMD5" : 10673669813016809363,
+ "filepath" : "bitmap-64bitMD5/green_skp-tile5/10673669813016809363.png",
+ },
}
}
}
self._assert_json_contents(output_json_path, expected_summary_dict)
- self._assert_directory_contents(
- self._temp_dir,
- ['bitmap-64bitMD5_5815827069051002745.png',
- 'bitmap-64bitMD5_9323613075234140270.png',
- 'bitmap-64bitMD5_16670399404877552232.png',
- 'bitmap-64bitMD5_2507897274083364964.png',
- 'bitmap-64bitMD5_7325267995523877959.png',
- 'bitmap-64bitMD5_2181381724594493116.png',
- 'bitmap-64bitMD5_12587324416545178013.png',
- 'bitmap-64bitMD5_7624374914829746293.png',
- 'bitmap-64bitMD5_5686489729535631913.png',
- 'bitmap-64bitMD5_7980646035555096146.png',
- 'bitmap-64bitMD5_17817086664365875131.png',
- 'bitmap-64bitMD5_10673669813016809363.png',
- 'output.json'])
def _run_render_pictures(self, args):
binary = self.find_path_to_program('render_pictures')
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698