diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/diff-testing-data.json | 24 | ||||
| -rw-r--r-- | test/diff.json | 28 | ||||
| -rw-r--r-- | test/nested_html_output.html | 43 | ||||
| -rw-r--r-- | test/new.json | 5 | ||||
| -rw-r--r-- | test/old.json | 4 |
5 files changed, 75 insertions, 29 deletions
diff --git a/test/diff-testing-data.json b/test/diff-testing-data.json index 884b7e1..0fe28b1 100644 --- a/test/diff-testing-data.json +++ b/test/diff-testing-data.json @@ -1,54 +1,54 @@ { - "update": { + "_update": { "tests": { - "update": { + "_update": { "spec/ARB_shader_texture_lod/execution/arb_shader_texture_lod-texgrad": { - "update": { + "_update": { "info": "Returncode: 1\n\nErrors:\n\n\nOutput:\nLeft: texture2D, Right: texture2DGradARB\nProbe at (4,2)\n Left: 1.000000 0.000000 0.000000 1.000000\n Right: 0.945098 0.890196 0.945098 1.000000\n" } }, "glean/fbo": { - "update": { + "_update": { "info": "Returncode: 0\n\nErrors:\n\n\nOutput:\n----------------------------------------------------------------------\nfbo test: Test OpenGL Extension GL_EXT_framebuffer_object\n\nGL_EXT_framebuffer_object is supported\nGL_ARB_framebuffer_object is supported\n (FBOTest::testRender2SingleTexture:648)GL_FRAMEBUFFER_UNSUPPORTED_EXT\n (FBOTest::testRender2SingleTexture:648)GL_FRAMEBUFFER_UNSUPPORTED_EXT\n (FBOTest::testRender2SingleTexture:648)GL_FRAMEBUFFER_UNSUPPORTED_EXT\n (FBOTest::testRender2SingleTexture:648)GL_FRAMEBUFFER_UNSUPPORTED_EXT\nfbo: NOTE perf[0] = 182.54 MB/s, which is using glCopyTexImage2D\nfbo: NOTE perf[1] = 165.462 MB/s, which is using FBO\nfbo: PASS rgba8, db, z24, s8, win+pmap, id 33\n\t8 tests passed, 0 tests failed.\n\n" } }, "glx/glx-pixmap-crosscheck": { - "remove": { + "_remove": { "returncode": 0 } }, "glean/pbo": { - "update": { + "_update": { "info": "Returncode: 0\n\nErrors:\n\n\nOutput:\n----------------------------------------------------------------------\npbo test: Test OpenGL Extension GL_ARB_pixel_buffer_object\n\npbo: PASS rgba8, db, z24, s8, win+pmap, id 33\n\t10 tests passed, 0 tests failed.\n\n" } }, "glx/glx-swap-singlebuffer": { - "update": { + "_update": { "info": "Returncode: 1\n\nErrors:\nX Error of failed request: BadDrawable (invalid Pixmap or Window parameter)\n Major opcode of failed request: 137 (DRI2)\n Minor opcode of failed request: 8 ()\n Resource id in failed request: 0x9e00002\n Serial number of failed request: 35\n Current serial number in output stream: 35\n\n\nOutput:\n" } }, "glean/teapot": { - "update": { + "_update": { "info": "Returncode: 0\n\nErrors:\n\n\nOutput:\n----------------------------------------------------------------------\nThis test simply displays a teapot, rotates it, and attempts to\ndetermine the frame/sec the pipeline can generate\n\nteapot: PASS Teapots/Sec: 59.4814 rgba8, db, z24, s8, win+pmap, id 33\n\n" } }, "spec/!OpenGL 2.0/vertex-program-two-side enabled back2": { - "update": { + "_update": { "info": "Returncode: 1\n\nErrors:\n\n\nOutput:\nWindow quadrants show:\n+-------------------------+------------------------+\n| front gl_Color | back gl_Color |\n+-------------------------+------------------------+\n| front gl_SecondaryColor | back gl_SecondaryColor |\n+-------------------------+------------------------+\nProbe at (50,0)\n Expected: 0.000000 0.000000 0.250000 0.000000\n Observed: 0.007843 0.007843 0.007843 0.007843\n" } }, "spec/glsl-1.10/execution/samplers/in-parameter-struct": { - "update": { + "_update": { "info": "Returncode: -6\n\nErrors:\n\n\nOutput:\nir_dereference_variable @ 0x1247460 specifies undeclared variable `channel_expressions' @ 0x11d00e0\n" } }, "fbo/fbo-sys-blit": { - "update": { + "_update": { "info": "Returncode: 1\n\nErrors:\n\n\nOutput:\nProbe at (64,64)\n Expected: 0.000000 1.000000 0.000000\n Observed: 0.325490 0.529412 0.823529\n" } }, "spec/glsl-1.10/execution/samplers/normal-parameter-struct": { - "update": { + "_update": { "info": "Returncode: -6\n\nErrors:\n\n\nOutput:\nir_dereference_variable @ 0x1de33f0 specifies undeclared variable `channel_expressions' @ 0x1d6c230\n" } } diff --git a/test/diff.json b/test/diff.json index df7a5f5..e8a2330 100644 --- a/test/diff.json +++ b/test/diff.json @@ -1,17 +1,19 @@ { - "append": { - "c": 3, - "daughter": { - "name": "Maruška" + "_remove": { + "b": 2 + }, + "_update": { + "a": 2, + "children": { + "_update": { + "son": "Ivánek" + }, + "_append": { + "daughter": "Maruška" + } } - }, - "remove": { - "b": 2, - "son": { - "name": "Janošek" - } - }, - "update": { - "a": 2 + }, + "_append": { + "c": 3 } } diff --git a/test/nested_html_output.html b/test/nested_html_output.html new file mode 100644 index 0000000..6c5b83c --- /dev/null +++ b/test/nested_html_output.html @@ -0,0 +1,43 @@ + +<!DOCTYPE html> +<html lang='en'> +<meta charset="utf-8" /> +<title>json_diff result</title> +<style> +td { + text-align: center; +} +.append_class { + color: green; +} +.remove_class { + color: red; +} +.update_class { + color: navy; +} +</style> +<body> + <h1>json_diff result</h1> + <table> + <tr> + <td class='remove_class'>b = 2</td> + </tr> +<tr> + <td class='update_class'>a = 2</td> + </tr> +<tr> + <td> </td><td class='update_class'>son = Ivánek</td> + </tr> +<tr> + <td> </td><td class='append_class'>daughter = Maruška</td> + </tr> +<tr> + <td class='append_class'>c = 3</td> + </tr> + + + </table> + </body> + </html> + diff --git a/test/new.json b/test/new.json index 86da691..235c843 100644 --- a/test/new.json +++ b/test/new.json @@ -1,7 +1,8 @@ { "a": 2, "c": 3, - "daughter": { - "name": "Maruška" + "children": { + "son": "Ivánek", + "daughter": "Maruška" } } diff --git a/test/old.json b/test/old.json index 17d6738..f887343 100644 --- a/test/old.json +++ b/test/old.json @@ -1,7 +1,7 @@ { "a": 1, "b": 2, - "son": { - "name": "Janošek" + "children": { + "son": "Janošek" } } |