Renaming composite modes in API

hyades · Jan 7, 2015 · df622cb · df622cb
1 parent 5e6df69
commit df622cb
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 12 deletions.
diff --git a/python-api/gstswitch/controller.py b/python-api/gstswitch/controller.py
@@ -213,9 +213,11 @@ def set_composite_mode(self, mode):
         """
         self.establish_connection()
         # only modes from 0 to 3 are supported
-        if mode >= 0 and mode <= 3:
+        mode_map = {'NONE': 0, 'PIP': 1, 'DUAL_PREVIEW': 2, 'DUAL_EQUAL': 3}
+        res = None
+        if mode in mode_map:
             try:
-                conn = self.connection.set_composite_mode(mode)
+                conn = self.connection.set_composite_mode(mode_map[mode])
                 print conn
                 res = conn.unpack()[0]
                 if res is True:

diff --git a/python-api/tests/integrationtests/compare.py b/python-api/tests/integrationtests/compare.py
@@ -32,10 +32,10 @@ class BaseCompareVideo(object):
     """Base class containing image operations"""
 
     TESTS = {
-        'composite_mode_0': 0,
-        'composite_mode_1': 1,
-        'composite_mode_2': 2,
-        'composite_mode_3': 3,
+        'composite_mode_NONE': 0,
+        'composite_mode_PIP': 1,
+        'composite_mode_DUAL_PREVIEW': 2,
+        'composite_mode_DUAL_EQUAL': 3,
         'adjust_pip_4': 4
     }
     REF_FRAME_DIR = os.getcwd() + '/tests/integrationtests/reference_frames'

diff --git a/python-api/tests/integrationtests/test_controller.py b/python-api/tests/integrationtests/test_controller.py
@@ -306,7 +306,7 @@ def set_composite_mode(self, mode, generate_frames=False):
                 sources.terminate_video()
                 serv.terminate(1)
                 if not generate_frames:
-                    if mode == 3:
+                    if mode == 'DUAL_EQUAL':
                         assert res is False
                     else:
                         assert res is True
@@ -343,10 +343,21 @@ def verify_output(self, mode, video):
             return True
         return False
 
-    def test_set_composite_mode(self):
+    def test_set_composite_mode_none(self):
         """Test set_composite_mode"""
-        for i in range(4):
-            self.set_composite_mode(i)
+        self.set_composite_mode('NONE')
+
+    def test_set_composite_mode_pip(self):
+        """Test set_composite_mode"""
+        self.set_composite_mode('PIP')
+
+    def test_set_composite_mode_preview(self):
+        """Test set_composite_mode"""
+        self.set_composite_mode('DUAL_PREVIEW')
+
+    def test_set_composite_mode_equal(self):
+        """Test set_composite_mode"""
+        self.set_composite_mode('DUAL_EQUAL')
 
 
 class TestNewRecord(object):

diff --git a/python-api/tests/unittests/test_controller_unit.py b/python-api/tests/unittests/test_controller_unit.py
@@ -284,14 +284,14 @@ def test_unpack(self):
         controller.establish_connection = Mock(return_value=None)
         controller.connection = MockConnection(True)
         with pytest.raises(ConnectionReturnError):
-            controller.set_composite_mode(1)
+            controller.set_composite_mode('NONE')
 
     def test_normal_unpack(self):
         """Test if valid"""
         controller = Controller(address='unix:abstract=abcdef')
         controller.establish_connection = Mock(return_value=None)
         controller.connection = MockConnection(False)
-        assert controller.set_composite_mode(1) is True
+        assert controller.set_composite_mode('NONE') is True
 
 
 class TestSetEncodeMode(object):