diff --git a/rowers/tests/test_async_tasks.py b/rowers/tests/test_async_tasks.py index 3f32347c..91382b5b 100644 --- a/rowers/tests/test_async_tasks.py +++ b/rowers/tests/test_async_tasks.py @@ -9,6 +9,7 @@ import pandas as pd nu = datetime.datetime.now() from rowers import tasks +from rowers import upload_tasks import rowers.courses as courses from rowers.integrations.sporttracks import default as stdefault @@ -91,76 +92,76 @@ class AsyncTaskTests(TestCase): def test_summaryfromsplitdata(self): splitdata = [ - { - "type": "distance", - "time": 415, - "rest_time": 600, - "stroke_rate": 35, - "distance": 220, - "heart_rate": { - "ending": 160, - "rest": 60 - } + { + "type": "distance", + "time": 415, + "rest_time": 600, + "stroke_rate": 35, + "distance": 220, + "heart_rate": { + "ending": 160, + "rest": 60 + } }, - { - "type": "distance", - "time": 347, - "rest_time": 600, - "stroke_rate": 45, - "distance": 220, - "heart_rate": { - "ending": 170, - "rest": 70 - } - } - ] - - data = { - "date": "2015-08-30 14:24:00", - "timezone": "Europe/London", - "distance": 440, - "time": 762, - "type": "rower", - "weight_class": "H", - "heart_rate": { - "average": 140 - }, - "workout_type": "FixedDistanceInterval", - "rest_distance": 43, - "rest_time": 1200, - "workout": { - "targets": { - "stroke_rate": 30, - "heart_rate_zone": 4, - "pace": 1050 - }, - "intervals": [ - { - "type": "distance", - "time": 415, - "rest_time": 600, - "stroke_rate": 35, - "distance": 220, - "heart_rate": { - "ending": 160, - "rest": 60 - } - }, - { - "type": "distance", - "time": 347, - "rest_time": 600, - "stroke_rate": 45, - "distance": 220, - "heart_rate": { - "ending": 170, - "rest": 70 - } - } + { + "type": "distance", + "time": 347, + "rest_time": 600, + "stroke_rate": 45, + "distance": 220, + "heart_rate": { + "ending": 170, + "rest": 70 + } + } ] + + data = { + "date": "2015-08-30 14:24:00", + "timezone": "Europe/London", + "distance": 440, + "time": 762, + "type": "rower", + "weight_class": "H", + "heart_rate": { + "average": 140 + }, + "workout_type": "FixedDistanceInterval", + "rest_distance": 43, + "rest_time": 1200, + "workout": { + "targets": { + "stroke_rate": 30, + "heart_rate_zone": 4, + "pace": 1050 + }, + "intervals": [ + { + "type": "distance", + "time": 415, + "rest_time": 600, + "stroke_rate": 35, + "distance": 220, + "heart_rate": { + "ending": 160, + "rest": 60 + } + }, + { + "type": "distance", + "time": 347, + "rest_time": 600, + "stroke_rate": 45, + "distance": 220, + "heart_rate": { + "ending": 170, + "rest": 70 + } + } + ] + } } - } - res = tasks.summaryfromsplitdata(splitdata,data,'test.csv') + res = upload_tasks.summaryfromsplitdata(splitdata,data,'test.csv') self.assertEqual(len(res[0]),478) @@ -182,7 +183,7 @@ class AsyncTaskTests(TestCase): @patch('rowers.tasks.requests.post',side_effect=mocked_requests) @patch('rowers.tasks.requests.session',side_effect=mocked_requests) def test_fetch_strava_workout(self, mock_get, mock_post, mock_Session): - res = tasks.fetch_strava_workout('aap',None,12,'rowers/tests/testdata/temp/tesmp.csv', + res = upload_tasks.fetch_strava_workout('aap',None,12,'rowers/tests/testdata/temp/tesmp.csv', self.u.id) self.assertEqual(res,1) diff --git a/rowers/tests/test_unit_tests.py b/rowers/tests/test_unit_tests.py index 9c5c2957..bca119ff 100644 --- a/rowers/tests/test_unit_tests.py +++ b/rowers/tests/test_unit_tests.py @@ -19,6 +19,7 @@ import polars as pl from rowers import interactiveplots from rowers import dataprep from rowers import tasks +from rowers import upload_tasks from rowers import plannedsessions from rowers.views.workoutviews import get_video_id @@ -124,7 +125,7 @@ class OtherUnitTests(TestCase): s = f.read() data = json.loads(s) splitdata = data['workout']['intervals'] - summary = tasks.summaryfromsplitdata(splitdata,data,'aap.txt') + summary = upload_tasks.summaryfromsplitdata(splitdata,data,'aap.txt') self.assertEqual(len(summary),3) sums = summary[0] diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz index ab2cee39..529a7af8 100644 Binary files a/rowers/tests/testdata/testdata.tcx.gz and b/rowers/tests/testdata/testdata.tcx.gz differ