From 4aa8ef00b661dcda31a027981741baa7a6716b0a Mon Sep 17 00:00:00 2001
From: Matěj Cepl <mcepl@redhat.com>
Date: Tue, 22 Nov 2011 10:29:03 +0100
Subject: Added test for -i functionality. It actually works!

(and test doesn't run for that long, so it can be switched on per
default).
---
 test/diff-result-only-testing-data.json | 293 ++++++++++++++++++++++++++++++++
 test_json_diff.py                       |   7 +-
 2 files changed, 299 insertions(+), 1 deletion(-)
 create mode 100644 test/diff-result-only-testing-data.json

diff --git a/test/diff-result-only-testing-data.json b/test/diff-result-only-testing-data.json
new file mode 100644
index 0000000..4363a76
--- /dev/null
+++ b/test/diff-result-only-testing-data.json
@@ -0,0 +1,293 @@
+{
+    "_update": {
+        "tests": {
+            "_update": {
+                "shaders/glsl-link-bug30552": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "shaders/glsl-link-invariant-01": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "shaders/glsl-fs-texturecube-2": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "shaders/glsl-fs-fogcolor-statechange": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "shaders/glsl-fs-fragcoord-zw-ortho": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "shaders/glsl-fs-fragcoord-zw-perspective": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "shaders/glsl-vs-arrays": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "shaders/glsl-fs-texturecube-bias": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "shaders/glsl-vs-normalscale": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "spec/ARB_explicit_attrib_location/glsl-explicit-location-04": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "shaders/glsl-vs-loop": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "shaders/glsl-link-struct-array": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "shaders/glsl-fs-texturecube-2-bias": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "shaders/glsl-link-initializer-02": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "shaders/glsl-link-initializer-03": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "shaders/glsl-vs-mov-after-deref": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "shaders/glsl-fs-texture2drect": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "shaders/glsl-vs-if-bool": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "shaders/glsl-link-initializer-05": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "shaders/glsl-fs-sqrt-branch": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "shaders/glsl-fs-mix": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "shaders/glsl-fs-texture2drect-proj4": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "shaders/glsl-vs-texturematrix-2": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "shaders/glsl-getactiveuniform-array-size": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "shaders/glsl-fs-sampler-numbering": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "shaders/glsl-fs-exp2": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "shaders/glsl-vs-functions": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "shaders/glsl-vs-sqrt-zero": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "shaders/glsl-uniform-update": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "shaders/glsl-orangebook-ch06-bump": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "shaders/glsl-vs-texturematrix-1": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "shaders/glsl-unused-varying": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "spec/ARB_explicit_attrib_location/glsl-explicit-location-01": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "shaders/glsl-getactiveuniform-count: glsl-getactiveuniform-length": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "shaders/glsl-fs-loop": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "shaders/glsl-arb-fragment-coord-conventions-define": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "shaders/glsl-vs-mvp-statechange": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "shaders/glsl-preprocessor-comments": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "spec/ARB_explicit_attrib_location/glsl-explicit-location-05": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "shaders/glsl-arb-fragment-coord-conventions": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "shaders/glsl-fs-mix-constant": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "shaders/glsl-fs-textureenvcolor-statechange": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "spec/ARB_explicit_attrib_location/glsl-explicit-location-03": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "spec/ARB_explicit_attrib_location/glsl-explicit-location-02": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "shaders/glsl-fs-loop-nested": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "shaders/glsl-getactiveuniform-length": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "shaders/glsl-fs-sqrt-zero": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "shaders/glsl-fs-texturecube": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "shaders/glsl-fs-flat-color": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "shaders/glsl-fs-bug25902": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "shaders/glsl-fs-fragcoord": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "shaders/glsl-vs-loop-nested": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "shaders/glsl-fs-texture2drect-proj3": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "shaders/glsl-link-centroid-01": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "shaders/glsl-fs-texturelod-01": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "fbo/fbo-fragcoord": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }, 
+                "shaders/glsl-vs-point-size": {
+                    "_update": {
+                        "result": "pass"
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/test_json_diff.py b/test_json_diff.py
index 1b601a4..5b93044 100644
--- a/test_json_diff.py
+++ b/test_json_diff.py
@@ -125,10 +125,15 @@ class TestadPath(OurTestCase):
             u'{"a": 01}', '{"a": 2}', u'{"_update": {"a": 2}}',
             "Octal numbers not supported")
 
-#class TestPiglitData(OurTestCase):
+class TestPiglitData(OurTestCase):
 #    def test_piglit_results(self):
 #        self._run_test(open("test/old-testing-data.json"), open("test/new-testing-data.json"),
 #            open("test/diff-testing-data.json"), "Large piglit results diff.")
 
+    def test_piglit_result_only(self):
+        self._run_test(open("test/old-testing-data.json"), open("test/new-testing-data.json"),
+            open("test/diff-result-only-testing-data.json"),
+            "Large piglit reports diff (just resume field).",  inc=('result',))
+
 if __name__ == "__main__":
     unittest.main()
-- 
cgit