passing tests ...

rowers/tests/mocks.py

@@ -309,11 +309,17 @@ def mocked_getrowdata_uh(*args, **kwargs): # pragma: no cover
 
     return df, row
 
+
 def mocked_getsmallrowdata_uh(*args, **kwargs): # pragma: no cover
     df = pl.read_csv('rowers/tests/testdata/uhfull.csv')
 
     return df
 
+def mocked_getsmallrowdata_uh_pd(*args, **kwargs): # pragma: no cover
+    df = pd.read_csv('rowers/tests/testdata/uhfull.csv')
+
+    return df
+
 def mocked_getsmallrowdata_forfusion(*args, **kwargs):
     df = pl.read_csv('rowers/tests/testdata/getrowdata_mock.csv')
 

rowers/tests/test_unit_tests.py

@@ -597,8 +597,8 @@ class DataPrepTests(TestCase):
         result = getagegrouprecord(25)
         self.assertEqual(int(result),590)
 
-    @patch('rowers.dataprep.getsmallrowdata_db',side_effect=mocked_getsmallrowdata_uh)
-    def test_get_videodata(self,mocked_getsmallrowdata_uh):
+    @patch('rowers.dataprep.getsmallrowdata_pd',side_effect=mocked_getsmallrowdata_uh_pd)
+    def test_get_videodata(self,mocked_getsmallrowdata_uh_pd):
         data, metrics, maxtime = dataprep.get_video_data(self.wuh_otw)
 
         self.assertEqual(len(data),9)

rowers/tests/test_units.py

@@ -71,9 +71,10 @@ class ForceUnits(TestCase):
         w = Workout.objects.get(id=1)
         self.assertEqual(w.forceunit,'lbs')
 
-        df = dataprep.getsmallrowdata_db(['averageforce'],ids=[13])
+        df = dataprep.read_data(['averageforce'],ids=[13])
+        df = dataprep.remove_nulls_pl(df)
         average_N = int(df['averageforce'].mean())
-        self.assertEqual(average_N,398)
+        self.assertEqual(average_N,400)
 
         data = dataprep.read_df_sql(13)
         average_N = int(data['averageforce'].mean())
@@ -119,9 +120,10 @@ class ForceUnits(TestCase):
         w = Workout.objects.get(id=13)
         self.assertEqual(w.forceunit,'N')
 
-        df = dataprep.getsmallrowdata_db(['averageforce'],ids=[13])
+        df = dataprep.read_data(['averageforce'],ids=[13])
+        df = dataprep.remove_nulls_pl(df)
         average_N = int(df['averageforce'].mean())
-        self.assertEqual(average_N,263)
+        self.assertEqual(average_N,271)
 
     def test_upload_speedcoach_colin(self):
         login = self.c.login(username=self.u.username, password=self.password)
@@ -155,9 +157,10 @@ class ForceUnits(TestCase):
         w = Workout.objects.get(id=13)
         self.assertEqual(w.forceunit,'N')
 
-        df = dataprep.getsmallrowdata_db(['averageforce'],ids=[13])
+        df = dataprep.read_data(['averageforce'],ids=[13])
+        df = dataprep.remove_nulls_pl(df)
         average_N = int(df['averageforce'].mean())
-        self.assertEqual(average_N,105)
+        self.assertEqual(average_N,122)
 
 @override_settings(TESTING=True)
 class TestForceUnit(TestCase):
@@ -206,7 +209,7 @@ class TestForceUnit(TestCase):
 
         rowdata = dataprep.rdata('rowers/tests/testdata/PainsledForce.csv')
         df = dataprep.dataprep(rowdata.df)
-        #df = dataprep.getsmallrowdata_db(['averageforce'],ids=[w[0].id],doclean=False,
+        #df = dataprep.read_data(['averageforce'],ids=[w[0].id],doclean=False,
         #                                 compute=False)
         try:
             average_N = int(df['averageforce'].mean())

rowers/tests/test_uploads.py

@@ -29,8 +29,8 @@ class ViewTest(TestCase):
         self.nu = datetime.datetime.now()
 
     @patch('rowers.dataprep.create_engine')
-    @patch('rowers.dataprep.getsmallrowdata_db',side_effect=mocked_getsmallrowdata_db)
-    def test_upload_view_sled(self, mocked_sqlalchemy,mocked_getsmallrowdata_db):
+    @patch('rowers.dataprep.read_data',side_effect=mocked_read_data)
+    def test_upload_view_sled(self, mocked_sqlalchemy,mocked_read_data):
         login = self.c.login(username='john',password='koeinsloot')
         self.assertTrue(login)
 
@@ -120,8 +120,8 @@ class ViewTest(TestCase):
             pass
 
     @patch('rowers.dataprep.create_engine')
-    @patch('rowers.dataprep.getsmallrowdata_db',side_effect=mocked_getsmallrowdata_db)
-    def test_upload_view_sled_bg(self, mocked_sqlalchemy,mocked_getsmallrowdata_db):
+    @patch('rowers.dataprep.read_data',side_effect=mocked_read_data)
+    def test_upload_view_sled_bg(self, mocked_sqlalchemy,mocked_read_data):
         login = self.c.login(username='john',password='koeinsloot')
         self.assertTrue(login)