Tests: rename mss to sct to fit the documentation, and add on test for save()

BoboTiG · BoboTiG · commit a5c457d6fae3 · 2016-10-15T12:51:10.000+02:00
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -5,7 +5,7 @@
 
 import pytest
 
-from mss import mss as MSS
+from mss import mss
 
 
 def pytest_addoption(parser):
@@ -19,12 +19,12 @@ def display(request):
 
 
 @pytest.fixture(scope='module')
-def mss(display):
+def sct(display):
     try:
         # display keyword is only for GNU/Linux
-        return MSS(display=display)
+        return mss(display=display)
     except TypeError:
-        return MSS()
+        return mss()
 
 
 @pytest.fixture(scope='session')
diff --git a/tests/test_attributes.py b/tests/test_attributes.py
@@ -2,17 +2,17 @@
 # coding: utf-8
 
 
-def test_attribute_image(mss):
-    assert mss.image is None
+def test_attribute_image(sct):
+    assert sct.image is None
 
 
-def test_attribute_monitors(mss):
-    assert mss.monitors == []
+def test_attribute_monitors(sct):
+    assert sct.monitors == []
 
 
-def test_attribute_width(mss):
-    assert mss.width == 0
+def test_attribute_width(sct):
+    assert sct.width == 0
 
 
-def test_attribute_height(mss):
-    assert mss.height == 0
+def test_attribute_height(sct):
+    assert sct.height == 0
diff --git a/tests/test_enum_display_monitors.py b/tests/test_enum_display_monitors.py
@@ -2,43 +2,43 @@
 # coding: utf-8
 
 
-def test_get_monitors(mss):
-    monitors = mss.enum_display_monitors()
-    assert monitors is mss.monitors
+def test_get_monitors(sct):
+    monitors = sct.enum_display_monitors()
+    assert monitors is sct.monitors
     assert monitors
 
 
-def test_get_monitors_force(mss):
-    monitors = mss.enum_display_monitors(force=True)
-    assert monitors is mss.monitors
+def test_get_monitors_force(sct):
+    monitors = sct.enum_display_monitors(force=True)
+    assert monitors is sct.monitors
     assert monitors
 
 
-def test_keys_aio(mss):
-    all_monitors = mss.monitors[0]
+def test_keys_aio(sct):
+    all_monitors = sct.monitors[0]
     assert 'top' in all_monitors
     assert 'left' in all_monitors
     assert 'height' in all_monitors
     assert 'width' in all_monitors
 
 
-def test_keys_monitor_1(mss):
-    mon1 = mss.monitors[1]
+def test_keys_monitor_1(sct):
+    mon1 = sct.monitors[1]
     assert 'top' in mon1
     assert 'left' in mon1
     assert 'height' in mon1
     assert 'width' in mon1
 
 
-def test_dimensions(mss, is_travis):
-    mon = mss.monitors[1]
+def test_dimensions(sct, is_travis):
+    mon = sct.monitors[1]
     if not is_travis:
         assert mon['width'] > 0
         assert mon['height'] > 0
 
 
-def test_dimensions_travis(mss, is_travis):
-    mon = mss.monitors[1]
+def test_dimensions_travis(sct, is_travis):
+    mon = sct.monitors[1]
     if is_travis:
         assert mon['width'] == 1920
         assert mon['height'] == 1440
diff --git a/tests/test_get_pixels.py b/tests/test_get_pixels.py
@@ -2,8 +2,8 @@
 # coding: utf-8
 
 
-def test_get_pixels(mss):
-    mon1 = mss.enum_display_monitors()[1]
-    pixels = mss.get_pixels(mon1)
-    assert pixels is mss.image
-    assert isinstance(mss.image, bytes)
+def test_get_pixels(sct):
+    mon1 = sct.enum_display_monitors()[1]
+    pixels = sct.get_pixels(mon1)
+    assert pixels is sct.image
+    assert isinstance(sct.image, bytes)
diff --git a/tests/test_save.py b/tests/test_save.py
@@ -1,7 +1,14 @@
 #!/usr/bin/env python
 # coding: utf-8
 
+from os.path import isfile
 
-def test_at_least_2_monitors(mss):
-    shots = list(mss.save(mon=0))
+
+def test_at_least_2_monitors(sct):
+    shots = list(sct.save(mon=0))
     assert len(shots) >= 1
+
+
+def test_files_exist(sct):
+    for filename in sct.save(mon=0):
+        assert isfile(filename)
