| commit | 0d004e947db37f2b3a02e385c24fcd15dc0ee8fb | [log] [tgz] |
|---|---|---|
| author | ztenghui <ztenghui@google.com> | Tue May 26 18:06:05 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue May 26 18:06:08 2015 +0000 |
| tree | e1b70e3172600a32b57fe04c56877e92a9da52b1 | |
| parent | 6b83db023ee2c051f859cceb818fd503cdc63745 [diff] | |
| parent | a3b27852635dfa0106b5317ea7cc40dfc8a8d34f [diff] |
Merge "Update the golden images and compare algorithm" into mnc-dev
diff --git a/tests/tests/graphics/res/drawable-nodpi/vector_icon_random_path_1_golden.png b/tests/tests/graphics/res/drawable-nodpi/vector_icon_random_path_1_golden.png index 91776a9..67f5746 100644 --- a/tests/tests/graphics/res/drawable-nodpi/vector_icon_random_path_1_golden.png +++ b/tests/tests/graphics/res/drawable-nodpi/vector_icon_random_path_1_golden.png Binary files differ
diff --git a/tests/tests/graphics/res/drawable-nodpi/vector_icon_random_path_2_golden.png b/tests/tests/graphics/res/drawable-nodpi/vector_icon_random_path_2_golden.png index 9af40a3..c60dfba 100644 --- a/tests/tests/graphics/res/drawable-nodpi/vector_icon_random_path_2_golden.png +++ b/tests/tests/graphics/res/drawable-nodpi/vector_icon_random_path_2_golden.png Binary files differ
diff --git a/tests/tests/graphics/res/drawable-nodpi/vector_icon_repeated_a_1_golden.png b/tests/tests/graphics/res/drawable-nodpi/vector_icon_repeated_a_1_golden.png index b3acfe7..e7cc4d1 100644 --- a/tests/tests/graphics/res/drawable-nodpi/vector_icon_repeated_a_1_golden.png +++ b/tests/tests/graphics/res/drawable-nodpi/vector_icon_repeated_a_1_golden.png Binary files differ
diff --git a/tests/tests/graphics/res/drawable-nodpi/vector_icon_repeated_a_2_golden.png b/tests/tests/graphics/res/drawable-nodpi/vector_icon_repeated_a_2_golden.png index bbc84b9..c7c049b 100644 --- a/tests/tests/graphics/res/drawable-nodpi/vector_icon_repeated_a_2_golden.png +++ b/tests/tests/graphics/res/drawable-nodpi/vector_icon_repeated_a_2_golden.png Binary files differ
diff --git a/tests/tests/graphics/res/drawable-nodpi/vector_icon_repeated_cq_golden.png b/tests/tests/graphics/res/drawable-nodpi/vector_icon_repeated_cq_golden.png index 8d73cfd..5880467 100644 --- a/tests/tests/graphics/res/drawable-nodpi/vector_icon_repeated_cq_golden.png +++ b/tests/tests/graphics/res/drawable-nodpi/vector_icon_repeated_cq_golden.png Binary files differ
diff --git a/tests/tests/graphics/res/drawable-nodpi/vector_icon_repeated_st_golden.png b/tests/tests/graphics/res/drawable-nodpi/vector_icon_repeated_st_golden.png index 6094a9a..93fb1d0 100644 --- a/tests/tests/graphics/res/drawable-nodpi/vector_icon_repeated_st_golden.png +++ b/tests/tests/graphics/res/drawable-nodpi/vector_icon_repeated_st_golden.png Binary files differ
diff --git a/tests/tests/graphics/res/drawable-nodpi/vector_icon_scale_1_golden.png b/tests/tests/graphics/res/drawable-nodpi/vector_icon_scale_1_golden.png index f8b660a..899a235 100644 --- a/tests/tests/graphics/res/drawable-nodpi/vector_icon_scale_1_golden.png +++ b/tests/tests/graphics/res/drawable-nodpi/vector_icon_scale_1_golden.png Binary files differ
diff --git a/tests/tests/graphics/res/drawable-nodpi/vector_icon_scale_2_golden.png b/tests/tests/graphics/res/drawable-nodpi/vector_icon_scale_2_golden.png index e86e1b0..ba6d8c7 100644 --- a/tests/tests/graphics/res/drawable-nodpi/vector_icon_scale_2_golden.png +++ b/tests/tests/graphics/res/drawable-nodpi/vector_icon_scale_2_golden.png Binary files differ
diff --git a/tests/tests/graphics/res/drawable-nodpi/vector_icon_transformation_1_golden.png b/tests/tests/graphics/res/drawable-nodpi/vector_icon_transformation_1_golden.png index baf418d..1703878 100644 --- a/tests/tests/graphics/res/drawable-nodpi/vector_icon_transformation_1_golden.png +++ b/tests/tests/graphics/res/drawable-nodpi/vector_icon_transformation_1_golden.png Binary files differ
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/VectorDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/VectorDrawableTest.java index d266efd..fdb8dae 100644 --- a/tests/tests/graphics/src/android/graphics/drawable/cts/VectorDrawableTest.java +++ b/tests/tests/graphics/src/android/graphics/drawable/cts/VectorDrawableTest.java
@@ -101,7 +101,8 @@ // exactly with the golden image. // We can increase the threshold if the Skia is drawing with some variance // on different devices. So far, the tests show they are matching correctly. - private static final float PIXEL_ERROR_THRESHOLD = 0.00001f; + private static final float PIXEL_ERROR_THRESHOLD = 0.02f; + private static final float PIXEL_ERROR_COUNT_THRESHOLD = 0.005f; private static final boolean DBG_DUMP_PNG = false; @@ -220,7 +221,7 @@ totalDiffPixelCount++; } } - if ((totalDiffPixelCount / totalPixelCount) >= PIXEL_ERROR_THRESHOLD) { + if ((totalDiffPixelCount / totalPixelCount) >= PIXEL_ERROR_COUNT_THRESHOLD) { fail((filename +": totalDiffPixelCount is " + totalDiffPixelCount)); }
