From 5c2cb68c62ff8690284fba2682d782571802d529 Mon Sep 17 00:00:00 2001 From: Libor Polčák Date: Jul 26 2022 14:35:47 +0000 Subject: integration t: WebGL test_other_parameters: Split asserts Originally only a single assert was tested which made debugging not practical. This was it is easy to see what assert is violated. --- diff --git a/tests/integration_tests/testing/tests_definition/test_11_webgl.py b/tests/integration_tests/testing/tests_definition/test_11_webgl.py index d48f822..f995e24 100644 --- a/tests/integration_tests/testing/tests_definition/test_11_webgl.py +++ b/tests/integration_tests/testing/tests_definition/test_11_webgl.py @@ -110,45 +110,45 @@ def test_other_parameters(browser, webgl_params, expected): spoof_sum += browser.real.webgl_parameters['MAX_ARRAY_TEXTURE_LAYERS'] - webgl_params['MAX_ARRAY_TEXTURE_LAYERS'] assert spoof_sum > 0 elif expected.webgl_parameters == 'ZERO VALUE': - assert ((webgl_params['MAX_VERTEX_UNIFORM_COMPONENTS'] == 0) and - (webgl_params['MAX_VERTEX_UNIFORM_BLOCKS'] == 0) and - (webgl_params['MAX_VERTEX_OUTPUT_COMPONENTS'] == 0) and - (webgl_params['MAX_VARYING_COMPONENTS'] == 0) and - (webgl_params['MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS'] == 0) and - (webgl_params['MAX_FRAGMENT_UNIFORM_COMPONENTS'] == 0) and - (webgl_params['MAX_FRAGMENT_UNIFORM_BLOCKS'] == 0) and - (webgl_params['MAX_FRAGMENT_INPUT_COMPONENTS'] == 0) and - (webgl_params['MAX_UNIFORM_BUFFER_BINDINGS'] == 0) and - (webgl_params['MAX_COMBINED_UNIFORM_BLOCKS'] == 0) and - (webgl_params['MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS'] == 0) and - (webgl_params['MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS'] == 0) and - (webgl_params['MAX_VERTEX_ATTRIBS'] == browser.real.webgl_parameters['MAX_VERTEX_ATTRIBS']) and - (webgl_params['MAX_VERTEX_UNIFORM_VECTORS'] == browser.real.webgl_parameters['MAX_VERTEX_UNIFORM_VECTORS']) and - (webgl_params['MAX_VERTEX_TEXTURE_IMAGE_UNITS'] == browser.real.webgl_parameters['MAX_VERTEX_TEXTURE_IMAGE_UNITS']) and - (webgl_params['MAX_TEXTURE_SIZE'] == browser.real.webgl_parameters['MAX_TEXTURE_SIZE']) and - (webgl_params['MAX_CUBE_MAP_TEXTURE_SIZE'] == browser.real.webgl_parameters['MAX_CUBE_MAP_TEXTURE_SIZE']) and - (webgl_params['MAX_3D_TEXTURE_SIZE'] == browser.real.webgl_parameters['MAX_3D_TEXTURE_SIZE']) and - (webgl_params['MAX_ARRAY_TEXTURE_LAYERS'] == browser.real.webgl_parameters['MAX_ARRAY_TEXTURE_LAYERS'])) + assert (webgl_params['MAX_VERTEX_UNIFORM_COMPONENTS'] == 0) + assert (webgl_params['MAX_VERTEX_UNIFORM_BLOCKS'] == 0) + assert (webgl_params['MAX_VERTEX_OUTPUT_COMPONENTS'] == 0) + assert (webgl_params['MAX_VARYING_COMPONENTS'] == 0) + assert (webgl_params['MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS'] == 0) + assert (webgl_params['MAX_FRAGMENT_UNIFORM_COMPONENTS'] == 0) + assert (webgl_params['MAX_FRAGMENT_UNIFORM_BLOCKS'] == 0) + assert (webgl_params['MAX_FRAGMENT_INPUT_COMPONENTS'] == 0) + assert (webgl_params['MAX_UNIFORM_BUFFER_BINDINGS'] == 0) + assert (webgl_params['MAX_COMBINED_UNIFORM_BLOCKS'] == 0) + assert (webgl_params['MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS'] == 0) + assert (webgl_params['MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS'] == 0) + assert (webgl_params['MAX_VERTEX_ATTRIBS'] == 0) + assert (webgl_params['MAX_VERTEX_UNIFORM_VECTORS'] == 0) + assert (webgl_params['MAX_VERTEX_TEXTURE_IMAGE_UNITS'] == 0) + assert (webgl_params['MAX_TEXTURE_SIZE'] == 0) + assert (webgl_params['MAX_CUBE_MAP_TEXTURE_SIZE'] == 0) + assert (webgl_params['MAX_3D_TEXTURE_SIZE'] == 0) + assert (webgl_params['MAX_ARRAY_TEXTURE_LAYERS'] == 0) else: - assert ((webgl_params['MAX_VERTEX_UNIFORM_COMPONENTS'] == browser.real.webgl_parameters['MAX_VERTEX_UNIFORM_COMPONENTS']) and - (webgl_params['MAX_VERTEX_UNIFORM_BLOCKS'] == browser.real.webgl_parameters['MAX_VERTEX_UNIFORM_BLOCKS']) and - (webgl_params['MAX_VERTEX_OUTPUT_COMPONENTS'] == browser.real.webgl_parameters['MAX_VERTEX_OUTPUT_COMPONENTS']) and - (webgl_params['MAX_VARYING_COMPONENTS'] == browser.real.webgl_parameters['MAX_VARYING_COMPONENTS']) and - (webgl_params['MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS'] == browser.real.webgl_parameters['MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS']) and - (webgl_params['MAX_FRAGMENT_UNIFORM_COMPONENTS'] == browser.real.webgl_parameters['MAX_FRAGMENT_UNIFORM_COMPONENTS']) and - (webgl_params['MAX_FRAGMENT_UNIFORM_BLOCKS'] == browser.real.webgl_parameters['MAX_FRAGMENT_UNIFORM_BLOCKS']) and - (webgl_params['MAX_FRAGMENT_INPUT_COMPONENTS'] == browser.real.webgl_parameters['MAX_FRAGMENT_INPUT_COMPONENTS']) and - (webgl_params['MAX_UNIFORM_BUFFER_BINDINGS'] == browser.real.webgl_parameters['MAX_UNIFORM_BUFFER_BINDINGS']) and - (webgl_params['MAX_COMBINED_UNIFORM_BLOCKS'] == browser.real.webgl_parameters['MAX_COMBINED_UNIFORM_BLOCKS']) and - (webgl_params['MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS'] == browser.real.webgl_parameters['MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS']) and - (webgl_params['MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS'] == browser.real.webgl_parameters['MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS']) and - (webgl_params['MAX_VERTEX_ATTRIBS'] == browser.real.webgl_parameters['MAX_VERTEX_ATTRIBS']) and - (webgl_params['MAX_VERTEX_UNIFORM_VECTORS'] == browser.real.webgl_parameters['MAX_VERTEX_UNIFORM_VECTORS']) and - (webgl_params['MAX_VERTEX_TEXTURE_IMAGE_UNITS'] == browser.real.webgl_parameters['MAX_VERTEX_TEXTURE_IMAGE_UNITS']) and - (webgl_params['MAX_TEXTURE_SIZE'] == browser.real.webgl_parameters['MAX_TEXTURE_SIZE']) and - (webgl_params['MAX_CUBE_MAP_TEXTURE_SIZE'] == browser.real.webgl_parameters['MAX_CUBE_MAP_TEXTURE_SIZE']) and - (webgl_params['MAX_3D_TEXTURE_SIZE'] == browser.real.webgl_parameters['MAX_3D_TEXTURE_SIZE']) and - (webgl_params['MAX_ARRAY_TEXTURE_LAYERS'] == browser.real.webgl_parameters['MAX_ARRAY_TEXTURE_LAYERS'])) + assert (webgl_params['MAX_VERTEX_UNIFORM_COMPONENTS'] == browser.real.webgl_parameters['MAX_VERTEX_UNIFORM_COMPONENTS']) + assert (webgl_params['MAX_VERTEX_UNIFORM_BLOCKS'] == browser.real.webgl_parameters['MAX_VERTEX_UNIFORM_BLOCKS']) + assert (webgl_params['MAX_VERTEX_OUTPUT_COMPONENTS'] == browser.real.webgl_parameters['MAX_VERTEX_OUTPUT_COMPONENTS']) + assert (webgl_params['MAX_VARYING_COMPONENTS'] == browser.real.webgl_parameters['MAX_VARYING_COMPONENTS']) + assert (webgl_params['MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS'] == browser.real.webgl_parameters['MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS']) + assert (webgl_params['MAX_FRAGMENT_UNIFORM_COMPONENTS'] == browser.real.webgl_parameters['MAX_FRAGMENT_UNIFORM_COMPONENTS']) + assert (webgl_params['MAX_FRAGMENT_UNIFORM_BLOCKS'] == browser.real.webgl_parameters['MAX_FRAGMENT_UNIFORM_BLOCKS']) + assert (webgl_params['MAX_FRAGMENT_INPUT_COMPONENTS'] == browser.real.webgl_parameters['MAX_FRAGMENT_INPUT_COMPONENTS']) + assert (webgl_params['MAX_UNIFORM_BUFFER_BINDINGS'] == browser.real.webgl_parameters['MAX_UNIFORM_BUFFER_BINDINGS']) + assert (webgl_params['MAX_COMBINED_UNIFORM_BLOCKS'] == browser.real.webgl_parameters['MAX_COMBINED_UNIFORM_BLOCKS']) + assert (webgl_params['MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS'] == browser.real.webgl_parameters['MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS']) + assert (webgl_params['MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS'] == browser.real.webgl_parameters['MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS']) + assert (webgl_params['MAX_VERTEX_ATTRIBS'] == browser.real.webgl_parameters['MAX_VERTEX_ATTRIBS']) + assert (webgl_params['MAX_VERTEX_UNIFORM_VECTORS'] == browser.real.webgl_parameters['MAX_VERTEX_UNIFORM_VECTORS']) + assert (webgl_params['MAX_VERTEX_TEXTURE_IMAGE_UNITS'] == browser.real.webgl_parameters['MAX_VERTEX_TEXTURE_IMAGE_UNITS']) + assert (webgl_params['MAX_TEXTURE_SIZE'] == browser.real.webgl_parameters['MAX_TEXTURE_SIZE']) + assert (webgl_params['MAX_CUBE_MAP_TEXTURE_SIZE'] == browser.real.webgl_parameters['MAX_CUBE_MAP_TEXTURE_SIZE']) + assert (webgl_params['MAX_3D_TEXTURE_SIZE'] == browser.real.webgl_parameters['MAX_3D_TEXTURE_SIZE']) + assert (webgl_params['MAX_ARRAY_TEXTURE_LAYERS'] == browser.real.webgl_parameters['MAX_ARRAY_TEXTURE_LAYERS']) # Test WebGLRenderingContext.getShaderPrecisionFormat def test_webgl_precisions(browser, expected):