Merge pull request #43 from Contraz/extend-tests

einarf · web-flow · commit 0b4290b6e968 · 2018-08-04T17:50:31.000+02:00
Extend tests
diff --git a/demosys/context/base.py b/demosys/context/base.py
@@ -45,6 +45,10 @@ def __init__(self):
         # ModernGL context
         self.ctx = None
 
+    @property
+    def size(self):
+        return (self.width, self.height)
+
     def draw(self, current_time, frame_time):
         self.set_default_viewport()
         self.manager.draw(current_time, frame_time, self.fbo)
diff --git a/demosys/core/datafiles/finders.py b/demosys/core/datafiles/finders.py
@@ -1,9 +1,5 @@
-import functools
-
 from demosys.core import finders
 from demosys.conf import settings
-from demosys.core.exceptions import ImproperlyConfigured
-from demosys.utils.module_loading import import_string
 
 
 class FileSystemFinder(finders.BaseFileSystemFinder):
@@ -18,20 +14,4 @@ class EffectDirectoriesFinder(finders.BaseEffectDirectoriesFinder):
 
 def get_finders():
     for finder in settings.DATA_FINDERS:
-        yield get_finder(finder)
-
-
-@functools.lru_cache(maxsize=None)
-def get_finder(import_path):
-    """
-    Get a finder class from an import path.
-    Raises ``demosys.core.exceptions.ImproperlyConfigured`` if the finder is not found.
-    This function uses an lru cache.
-
-    :param import_path: string representing an import path
-    :return: An instance of the finder
-    """
-    Finder = import_string(import_path)
-    if not issubclass(Finder, finders.BaseFileSystemFinder):
-        raise ImproperlyConfigured('Finder {} is not a subclass of core.finders.FileSystemFinder'.format(import_path))
-    return Finder()
+        yield finders.get_finder(finder)
diff --git a/demosys/core/finders.py b/demosys/core/finders.py
@@ -1,11 +1,13 @@
 """
 Base finders
 """
+import functools
 from collections import namedtuple
 from pathlib import Path
 
 from demosys.conf import settings
 from demosys.core.exceptions import ImproperlyConfigured
+from demosys.utils.module_loading import import_string
 
 FinderEntry = namedtuple('FinderEntry', ['path', 'abspath', 'exists'])
 
@@ -17,11 +19,10 @@ class BaseFileSystemFinder:
     def __init__(self):
         if not hasattr(settings, self.settings_attr):
             raise ImproperlyConfigured(
-                "Settings module don't define TEXTURE_DIRS."
-                "This is required when using a FileSystemFinder."
+                "Settings module don't define {}."
+                "This is required when using a FileSystemFinder.".format(self.settings_attr)
             )
         self.paths = getattr(settings, self.settings_attr)
-        self._cached_paths = {}
 
     def find(self, path: Path):
         """
@@ -31,6 +32,11 @@ def find(self, path: Path):
         :param path: The path to find
         :return: The absolute path to the file or None if not found
         """
+        # Update paths from settings to make them editable runtime
+        # This is only possible for FileSystemFinders
+        if getattr(self, 'settings_attr', None):
+            self.paths = getattr(settings, self.settings_attr)
+
         path_found = None
 
         for entry in self.paths:
@@ -46,9 +52,29 @@ class BaseEffectDirectoriesFinder(BaseFileSystemFinder):
     directory = None
 
     def __init__(self):
-        from demosys.effects.registry import effects
-        self.paths = list(effects.get_dirs())
+        pass
 
     def find(self, path: Path):
         path = Path(self.directory) / Path(path)
         return super().find(path)
+
+    @property
+    def paths(self):
+        from demosys.effects.registry import effects
+        return list(effects.get_dirs())
+
+
+@functools.lru_cache(maxsize=None)
+def get_finder(import_path):
+    """
+    Get a finder class from an import path.
+    Raises ``demosys.core.exceptions.ImproperlyConfigured`` if the finder is not found.
+    This function uses an lru cache.
+
+    :param import_path: string representing an import path
+    :return: An instance of the finder
+    """
+    Finder = import_string(import_path)
+    if not issubclass(Finder, BaseFileSystemFinder):
+        raise ImproperlyConfigured('Finder {} is not a subclass of core.finders.FileSystemFinder'.format(import_path))
+    return Finder()
diff --git a/demosys/core/scenefiles/finders.py b/demosys/core/scenefiles/finders.py
@@ -1,9 +1,5 @@
-import functools
-
 from demosys.core import finders
 from demosys.conf import settings
-from demosys.core.exceptions import ImproperlyConfigured
-from demosys.utils.module_loading import import_string
 
 
 class FileSystemFinder(finders.BaseFileSystemFinder):
@@ -18,20 +14,4 @@ class EffectDirectoriesFinder(finders.BaseEffectDirectoriesFinder):
 
 def get_finders():
     for finder in settings.SCENE_FINDERS:
-        yield get_finder(finder)
-
-
-@functools.lru_cache(maxsize=None)
-def get_finder(import_path):
-    """
-    Get a finder class from an import path.
-    Raises ``demosys.core.exceptions.ImproperlyConfigured`` if the finder is not found.
-    This function uses an lru cache.
-
-    :param import_path: string representing an import path
-    :return: An instance of the finder
-    """
-    Finder = import_string(import_path)
-    if not issubclass(Finder, finders.BaseFileSystemFinder):
-        raise ImproperlyConfigured('Finder {} is not a subclass of core.finders.FileSystemFinder'.format(import_path))
-    return Finder()
+        yield finders.get_finder(finder)
diff --git a/demosys/core/shaderfiles/finders.py b/demosys/core/shaderfiles/finders.py
@@ -1,9 +1,5 @@
-import functools
-
 from demosys.core import finders
 from demosys.conf import settings
-from demosys.core.exceptions import ImproperlyConfigured
-from demosys.utils.module_loading import import_string
 
 
 class FileSystemFinder(finders.BaseFileSystemFinder):
@@ -18,20 +14,4 @@ class EffectDirectoriesFinder(finders.BaseEffectDirectoriesFinder):
 
 def get_finders():
     for finder in settings.SHADER_FINDERS:
-        yield get_finder(finder)
-
-
-@functools.lru_cache(maxsize=None)
-def get_finder(import_path):
-    """
-    Get a finder class from an import path.
-    Raises ``demosys.core.exceptions.ImproperlyConfigured`` if the finder is not found.
-    This function uses an lru cache.
-
-    :param import_path: string representing an import path
-    :return: An instance of the finder
-    """
-    Finder = import_string(import_path)
-    if not issubclass(Finder, finders.BaseFileSystemFinder):
-        raise ImproperlyConfigured('Finder {} is not a subclass of core.finders.FileSystemFinder'.format(import_path))
-    return Finder()
+        yield finders.get_finder(finder)
diff --git a/demosys/core/texturefiles/finders.py b/demosys/core/texturefiles/finders.py
@@ -1,9 +1,5 @@
-import functools
-
 from demosys.core import finders
 from demosys.conf import settings
-from demosys.core.exceptions import ImproperlyConfigured
-from demosys.utils.module_loading import import_string
 
 
 class FileSystemFinder(finders.BaseFileSystemFinder):
@@ -18,20 +14,4 @@ class EffectDirectoriesFinder(finders.BaseEffectDirectoriesFinder):
 
 def get_finders():
     for finder in settings.TEXTURE_FINDERS:
-        yield get_finder(finder)
-
-
-@functools.lru_cache(maxsize=None)
-def get_finder(import_path):
-    """
-    Get a finder class from an import path.
-    Raises ``demosys.core.exceptions.ImproperlyConfigured`` if the finder is not found.
-    This function uses an lru cache.
-
-    :param import_path: string representing an import path
-    :return: An instance of the finder
-    """
-    Finder = import_string(import_path)
-    if not issubclass(Finder, finders.BaseFileSystemFinder):
-        raise ImproperlyConfigured('Finder {} is not a subclass of core.finders.FileSystemFinder'.format(import_path))
-    return Finder()
+        yield finders.get_finder(finder)
diff --git a/demosys/deferred/__init__.py b/demosys/deferred/__init__.py
@@ -1 +1,9 @@
-from .renderer import DeferredRenderer  # noqa
+import os
+
+from demosys.conf import settings
+
+settings.add_shader_dir(
+    os.path.join(os.path.dirname(os.path.abspath(__file__)), 'shaders')
+)
+
+from .renderer import DeferredRenderer  # noqa
diff --git a/demosys/deferred/effect.py b/demosys/deferred/effect.py
diff --git a/demosys/effect_templates/raymarching_simple/effect.py b/demosys/effect_templates/raymarching_simple/effect.py
@@ -14,7 +14,6 @@ def __init__(self):
         # create plane to fit whole screen
         self.plane = geometry.plane.plane_xz(size=(self.window_width, self.window_height), resolution=(10, 10))
 
-    @effect.bind_target
     def draw(self, time, frametime, target):
         self.ctx.enable(moderngl.DEPTH_TEST)
 
diff --git a/demosys/resources/base.py b/demosys/resources/base.py
@@ -30,7 +30,7 @@ def load_pool(self):
         Loads all the data files using the configured finders.
         """
         for path, data_file in self.file_map.items():
-            if self.file_map[path] is None:
+            if data_file is None:
                 self._load(self.file_meta[path])
 
     def delete(self, obj, destroy=False):
@@ -42,6 +42,7 @@ def delete(self, obj, destroy=False):
             if data == obj:
                 del self.file_map[path]
                 del self.file_meta[path]
+
                 if destroy:
                     self._destroy(obj)
                 break
@@ -53,7 +54,11 @@ def _destroy(self, obj):
     def flush(self, destroy=False):
         """Delete all resources"""
         for obj in list(self.file_map.values()):
-            self.delete(obj, destroy=destroy)
+            if obj is not None:
+                self.delete(obj, destroy=destroy)
+
+        self.file_map = {}
+        self.file_meta = {}
 
     def _find_last_of(self, file_path, finders):
         """Find the last occurance of the file in finders"""
diff --git a/demosys/resources/data.py b/demosys/resources/data.py
@@ -107,7 +107,7 @@ def load_deferred(self, path: str, cls=Data, mode='binary', **kwargs):
 
     def _load(self, meta) -> Data:
         """Internal loader"""
-        found_path = self._find_last_of(meta.path, list(get_finders()))
+        found_path = self._find_last_of(meta.path, get_finders())
 
         if not found_path:
             raise ImproperlyConfigured("Cannot find data file {}".format(meta.path))
diff --git a/demosys/resources/scenes.py b/demosys/resources/scenes.py
@@ -72,7 +72,7 @@ def load_deferred(self, path: Union[str, Path], **kwargs) -> SceneMeta:
         return meta
 
     def _load(self, meta) -> Scene:
-        found_path = self._find_last_of(meta.path, list(get_finders()))
+        found_path = self._find_last_of(meta.path, get_finders())
 
         if not found_path:
             raise ImproperlyConfigured("Cannot find scene file {}".format(meta.path))
diff --git a/demosys/resources/shaders.py b/demosys/resources/shaders.py
@@ -56,7 +56,7 @@ def load_deferred(self, path: Union[str, Path], **kwargs) -> ShaderMeta:
         return meta
 
     def _load(self, meta, reload=False):
-        found_path = self._find_last_of(meta.path, list(get_finders()))
+        found_path = self._find_last_of(meta.path, get_finders())
 
         if not found_path:
             raise ImproperlyConfigured("Cannot find shader {}".format(meta.path))
diff --git a/demosys/resources/textures.py b/demosys/resources/textures.py
@@ -63,7 +63,7 @@ def _load(self, meta):
         """
         Loads all the textures using the configured finders.
         """
-        found_path = self._find_last_of(meta.path, list(get_finders()))
+        found_path = self._find_last_of(meta.path, get_finders())
 
         if not found_path:
             raise ImproperlyConfigured("Cannot find texture {}".format(meta.path))
diff --git a/tests/effect.py b/tests/effect.py
@@ -0,0 +1,10 @@
+from demosys.effects import Effect
+
+
+class TestEffect(Effect):
+
+    def __init__(self):
+        pass
+
+    def draw(self, time, frametime, target):
+        pass
diff --git a/tests/resources/data_override/data.txt b/tests/resources/data_override/data.txt
@@ -0,0 +1 @@
+4567
diff --git a/tests/test_context.py b/tests/test_context.py
@@ -0,0 +1,24 @@
+import moderngl
+
+from demosys.test import DemosysTestCase
+from demosys import geometry
+
+
+class ContextTestCase(DemosysTestCase):
+    """Test the headless context/window"""
+
+    def test_properties(self):
+        self.assertEqual(type(self.window.ctx), moderngl.Context)
+        # We don't have a default framebuffer in headless mode
+        self.assertIsNone(self.ctx.screen)
+        self.assertIsNotNone(self.window.fbo)
+
+    def test_basic_render(self):
+        """Ensure we actually draw something to the screen"""
+        vao = geometry.quad_fs()
+        shader = self.create_shader(path='vf_pos_color.glsl')
+        shader.uniform("color", (1.0, 1.0, 1.0, 1.0))
+        vao.draw(shader)
+
+        data = self.window.fbo.read()
+        self.assertEqual(data[:10], b'\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff')
diff --git a/tests/test_deferred.py b/tests/test_deferred.py
@@ -0,0 +1,27 @@
+from pyrr import matrix44
+
+from demosys.test import DemosysTestCase
+from demosys.deferred import DeferredRenderer
+from demosys import geometry
+from demosys.opengl import Projection
+
+class DeferredTestCase(DemosysTestCase):
+    """Crude test executing deferred code"""
+
+    def test_create(self):
+        renderer = DeferredRenderer(self.window.width, self.window.height)
+        renderer.add_point_light(position=[0.0, 0.0, 0.0], radius=40.0)
+
+        cube = geometry.cube(width=8.0, height=8.0, depth=8.0)
+        geo_shader_color = self.create_shader(path="deferred/geometry_color.glsl")
+        projection = Projection()
+
+        with renderer.gbuffer:
+            cube.draw(geo_shader_color)
+
+        renderer.render_lights(
+            matrix44.create_identity(dtype='f4'),
+            projection,
+        )
+        renderer.combine()
+        renderer.clear()
diff --git a/tests/test_effect.py b/tests/test_effect.py
diff --git a/tests/test_effect_templates.py b/tests/test_effect_templates.py
diff --git a/tests/test_resources.py b/tests/test_resources.py
