Work on tests

Author: Cleptomania

arcade/application.py

@@ -170,6 +170,8 @@ def __init__(
         desired_gl_provider = "gl"
         if is_pyodide():
             gl_api = "webgl"
+
+        if gl_api == "webgl":
             desired_gl_provider = "webgl"
 
         # Detect Raspberry Pi and switch to OpenGL ES 3.1

arcade/gl/backends/gl/framebuffer.py

@@ -100,8 +100,6 @@ def __init__(
         if self._ctx.gc_mode == "auto" and not self.is_default:
             weakref.finalize(self, GLFramebuffer.delete_glo, ctx, fbo_id)
 
-        self.ctx.stats.incr("framebuffer")
-
     def __del__(self):
         # Intercept garbage collection if we are using Context.gc()
         if self._ctx.gc_mode == "context_gc" and not self.is_default and self._glo.value > 0:

arcade/gl/backends/gl/texture_array.py

@@ -126,6 +126,7 @@ def __init__(
         compressed: bool = False,
         compressed_data: bool = False,
     ):
+        super().__init__(ctx, size, components=components, dtype=dtype, data=data, filter=filter, wrap_x=wrap_x, wrap_y=wrap_y, depth=depth, samples=samples, immutable=immutable, internal_format=internal_format, compressed=compressed, compressed_data=compressed_data)
         self._glo = glo = gl.GLuint()
 
         # Default filters for float and integer textures

pyproject.toml

@@ -136,6 +136,10 @@ norecursedirs = [
     "dist",
     "tempt",
 ]
+markers = [
+    "backendgl: Run OpenGL (or OpenGL ES) backend specific tests",
+    "backendwebgl: Run WebGL backend specific tests"
+]
 
 [tool.pyright]
 include = ["arcade"]

tests/conftest.py

@@ -26,12 +26,33 @@
 FIXTURE_ROOT = PROJECT_ROOT / "tests" / "fixtures"
 arcade.resources.add_resource_handle("fixtures", FIXTURE_ROOT)
 REAL_WINDOW_CLASS = arcade.Window
+GL_BACKEND = "gl"
 WINDOW = None
 OFFSCREEN = None
 
+POSSIBLE_BACKENDS = [
+    "backendgl",
+    "backendwebgl"
+]
+
 arcade.resources.load_kenney_fonts()
 
 
+def pytest_addoption(parser):
+    parser.addoption("--gl-backend", default="gl")
+
+def pytest_configure(config):
+    global GL_BACKEND
+    GL_BACKEND = config.option.gl_backend
+
+def pytest_collection_modifyitems(config, items):
+    desired_backend = "backend" + GL_BACKEND
+    for item in items:
+        for backend in POSSIBLE_BACKENDS:
+            if backend in item.keywords:
+                if backend != desired_backend:
+                    item.add_marker(pytest.mark.skip(f"Skipping GL backend specific test for {backend}"))
+
 def make_window_caption(request=None, prefix="Testing", sep=" - ") -> str:
     """Centralizes test name customization.
 
@@ -51,7 +72,7 @@ def create_window(width=1280, height=720, caption="Testing", **kwargs):
     global WINDOW
     if not WINDOW:
         WINDOW = REAL_WINDOW_CLASS(
-            width=width, height=height, title=caption, vsync=False, antialiasing=False
+            width=width, height=height, title=caption, vsync=False, antialiasing=False, gl_api = GL_BACKEND
         )
         WINDOW.set_vsync(False)
         # This value is being monkey-patched into the Window class so that tests can identify if we are using

tests/unit/gl/__init__.py

@@ -4,9 +4,10 @@
 from pyglet import gl
 from pyglet.math import Mat4, Mat3
 from arcade.gl import ShaderException
-from arcade.gl.uniform import UniformBlock
-from arcade.gl.glsl import ShaderSource
+from arcade.gl.backends.gl.uniform import UniformBlock
+from arcade.gl.backends.gl.glsl import ShaderSource
 
+pytestmark = pytest.mark.backendgl
 
 def test_shader_source(ctx):
     """Test shader source parsing"""

tests/unit/gl/backends/__init__.py

@@ -77,7 +77,7 @@ def test_enable_disable(ctx):
     assert ctx.is_enabled(ctx.BLEND) is False
     assert len(ctx._flags) == 2
 
-    ctx.enable_only(ctx.BLEND, ctx.CULL_FACE, ctx.DEPTH_TEST, ctx.PROGRAM_POINT_SIZE)
+    ctx.enable_only(ctx.BLEND, ctx.CULL_FACE, ctx.DEPTH_TEST)
 
 
 def test_enabled(ctx):

tests/unit/gl/backends/gl/__init__.py

@@ -26,9 +26,9 @@ def test_properties(ctx):
     with pytest.raises(ValueError):
         texture.filter = None
 
-    texture.wrap_x = ctx.CLAMP_TO_BORDER
+    texture.wrap_x = ctx.CLAMP_TO_EDGE
     texture.wrap_y = ctx.CLAMP_TO_EDGE
-    assert texture.wrap_x == ctx.CLAMP_TO_BORDER
+    assert texture.wrap_x == ctx.CLAMP_TO_EDGE
     assert texture.wrap_y == ctx.CLAMP_TO_EDGE