Making all GazeFeatures test working again.

1 files changed, 16 insertions, 30 deletions

diff --git a/src/argaze.test/GazeFeatures.py b/src/argaze.test/GazeFeatures.py
index 7d18976..c6ccfca 100644
--- a/src/argaze.test/GazeFeatures.py
+++ b/src/argaze.test/GazeFeatures.py
@@ -494,7 +494,7 @@ class TestAOIScanStepClass(unittest.TestCase):
         self.assertEqual(aoi_scan_step.first_fixation, fixation)
         self.assertEqual(aoi_scan_step.last_saccade, saccade)
         self.assertGreater(aoi_scan_step.duration, 0)
-    @unittest.skip("DEBUG")
+    
     def test_error(self):
         """Test AOIScanStep creation error."""
 
@@ -524,18 +524,16 @@ def build_aoi_scan_path(expected_aoi, aoi_path):
     for aoi in aoi_path:
 
         fixation = TestFixation(random_gaze_positions(10))
-        ts, _ = fixation.first
-        aoi_scan_path.append_fixation(ts, fixation, aoi)
+        aoi_scan_path.append_fixation(fixation, aoi)
 
         saccade = TestSaccade(random_gaze_positions(2))
-        ts, _ = saccade.first
-        aoi_scan_path.append_saccade(ts, saccade)
+        aoi_scan_path.append_saccade(saccade)
 
     return aoi_scan_path
 
 class TestAOIScanPathClass(unittest.TestCase):
     """Test AOIScanPath class."""
-    @unittest.skip("DEBUG")
+    
     def test_new(self):
         """Test AOIScanPath creation."""
 
@@ -543,7 +541,7 @@ class TestAOIScanPathClass(unittest.TestCase):
         aoi_scan_path = GazeFeatures.AOIScanPath()
 
         self.assertEqual(len(aoi_scan_path), 0)
-    @unittest.skip("DEBUG")
+    
     def test_append(self):
         """Test AOIScanPath append methods."""
 
@@ -551,9 +549,7 @@ class TestAOIScanPathClass(unittest.TestCase):
 
         # Append fixation on A aoi
         fixation_A = TestFixation(random_gaze_positions(10))
-        ts, _ = fixation_A.first
-
-        new_step = aoi_scan_path.append_fixation(ts, fixation_A, 'Foo')
+        new_step = aoi_scan_path.append_fixation(fixation_A, 'Foo')
 
         # Check that no aoi scan step have been created yet
         self.assertEqual(len(aoi_scan_path), 0)
@@ -562,9 +558,7 @@ class TestAOIScanPathClass(unittest.TestCase):
 
         # Append saccade
         saccade_A = TestSaccade(random_gaze_positions(2))
-        ts, _ = saccade_A.first
-
-        new_step = aoi_scan_path.append_saccade(ts, saccade_A)
+        new_step = aoi_scan_path.append_saccade(saccade_A)
 
         # Check that no aoi scan step have been created yet
         self.assertEqual(len(aoi_scan_path), 0)
@@ -573,9 +567,7 @@ class TestAOIScanPathClass(unittest.TestCase):
 
         # Append fixation on B aoi
         fixation_B = TestFixation(random_gaze_positions(10))
-        ts, _ = fixation_B.first
-
-        new_step_A = aoi_scan_path.append_fixation(ts, fixation_B, 'Bar')
+        new_step_A = aoi_scan_path.append_fixation(fixation_B, 'Bar')
 
         # Check a first aoi scan step have been created once a new fixation is appened
         self.assertEqual(len(aoi_scan_path), 1)
@@ -584,14 +576,11 @@ class TestAOIScanPathClass(unittest.TestCase):
         self.assertEqual(new_step_A.aoi, 'Foo')
         self.assertEqual(new_step_A.letter, 'A')
 
-        first_ts, _ = fixation_A.first 
-        last_ts, _ = saccade_A.last
-
-        self.assertEqual(new_step_A.duration, last_ts - first_ts)
+        self.assertEqual(new_step_A.duration, saccade_A[-1].timestamp - fixation_A[0].timestamp)
 
         # Check letter affectation
         self.assertEqual(aoi_scan_path.get_letter_aoi('A'), 'Foo')
-    @unittest.skip("DEBUG")
+    
     def test_append_error(self):
         """Test AOIScanPath append error."""
 
@@ -599,9 +588,7 @@ class TestAOIScanPathClass(unittest.TestCase):
 
         # Append fixation on A aoi
         fixation = TestFixation(random_gaze_positions(10))
-        ts, _ = fixation.first
-
-        new_step = aoi_scan_path.append_fixation(ts, fixation, 'Foo')
+        new_step = aoi_scan_path.append_fixation(fixation, 'Foo')
 
         # Check that no aoi scan step have been created yet
         self.assertEqual(len(aoi_scan_path), 0)
@@ -609,18 +596,17 @@ class TestAOIScanPathClass(unittest.TestCase):
 
         # Append fixation on B aoi
         fixation = TestFixation(random_gaze_positions(10))
-        ts, _ = fixation.first
 
         # Check that aoi scan step creation fail when fixation is appened after another fixation
         with self.assertRaises(GazeFeatures.AOIScanStepError):
 
-            new_step = aoi_scan_path.append_fixation(ts, fixation, 'Bar')
+            new_step = aoi_scan_path.append_fixation(fixation, 'Bar')
 
         # Check that unexpected aoi scan step creation fail
         with self.assertRaises(GazeFeatures.AOIScanStepError):
 
-            new_step = aoi_scan_path.append_fixation(ts, fixation, 'Shu')
-    @unittest.skip("DEBUG")
+            new_step = aoi_scan_path.append_fixation(fixation, 'Shu')
+    
     def test_letter_index_and_string_reprentation(self):
         """Test AOIScanPath letter index and string representation feature."""
 
@@ -649,7 +635,7 @@ class TestAOIScanPathClass(unittest.TestCase):
 
         # Check letter sequence representation
         self.assertEqual(aoi_scan_path.letter_sequence, 'ABCA')
-    @unittest.skip("DEBUG")
+    
     def test_transition_matrix(self):
         """Test AOIScanPath transition matrix feature."""
 
@@ -668,7 +654,7 @@ class TestAOIScanPathClass(unittest.TestCase):
 
         self.assertEqual(aoi_scan_path.transition_matrix['Shu']['Foo'], 0)
         self.assertEqual(aoi_scan_path.transition_matrix['Shu']['Bar'], 1)
-    @unittest.skip("DEBUG")
+    
     def test_transition_matrix(self):
         """Test AOIScanPath fixations count feature."""