Private
Public Access
1
0

Increasing coverage

This commit is contained in:
2024-03-01 12:26:36 +01:00
parent eb33bd9a8a
commit c4426d8a0b
12 changed files with 226 additions and 85 deletions

View File

@@ -198,7 +198,7 @@ class WorkoutFactory(factory.DjangoModelFactory):
startdatetime = FuzzyDateTime(start_dt=one_month_ago, force_year=datetime.date.today().year)
starttime = get_random_file(name=faker.word())['starttime']
workouttype='water'
date=timezone.now().date()
date=startdatetime.evaluate(2,None, False).date()
duration=get_random_file(name=faker.word())['duration']
distance=get_random_file(name=faker.word())['totaldist']
csvfilename=get_random_file(name=faker.word())['filename']

View File

@@ -25,6 +25,11 @@ class ListWorkoutTest(TestCase):
self.c = Client()
self.user_workouts = WorkoutFactory.create_batch(5, user=self.r)
for w in self.user_workouts:
if w.date != w.startdatetime.date():
w.date = w.startdatetime.date()
w.save()
self.factory = RequestFactory()
self.password = faker.word()
self.u.set_password(self.password)
@@ -79,6 +84,10 @@ class PlannedSessionTests(TestCase):
self.c = Client()
self.user_workouts = WorkoutFactory.create_batch(5, user=self.r)
for w in self.user_workouts:
if w.date != w.startdatetime.date():
w.date = w.startdatetime.date()
w.save()
self.factory = RequestFactory()
self.password = faker.word()
self.u.set_password(self.password)
@@ -130,6 +139,22 @@ class ForcecurveTest(TestCase):
self.c = Client()
self.user_workouts = WorkoutFactory.create_batch(5, user=self.r)
for w in self.user_workouts:
if w.date != w.startdatetime.date():
w.date = w.startdatetime.date()
w.save()
result = get_random_file(filename='rowers/tests/testdata/quiske_in_stroke.csv')
self.winstroke = WorkoutFactory(user=self.r,
csvfilename=result['filename'],
starttime=result['starttime'],
startdatetime=result['startdatetime'],
duration=result['duration'],
distance=result['totaldist'],
workouttype = 'water',
)
self.factory = RequestFactory()
self.password = faker.word()
@@ -143,6 +168,7 @@ class ForcecurveTest(TestCase):
except (IOError, FileNotFoundError,OSError):
pass
@patch('rowers.dataprep.getsmallrowdata_db',side_effect = mocked_getempowerdata_db)
def test_forcecurve_plot(self, mocked_getsmallrowdata_db):
login = self.c.login(username=self.u.username, password = self.password)
@@ -182,7 +208,62 @@ class ForcecurveTest(TestCase):
response = self.c.get(url)
self.assertEqual(response.status_code,200)
url = '/rowers/analysis/forcecurveanalysis/1/delete/'
response = self.c.get(url)
self.assertEqual(response.status_code, 200)
form_data = {}
response = self.c.post(url, form_data, follow=True)
expected_url = '/rowers/analysis/forcecurveanalysis/'
self.assertRedirects(response, expected_url=expected_url, status_code=302,target_status_code=200)
def test_instroke_analysis(self):
login = self.c.login(username=self.u.username, password = self.password)
self.assertTrue(login)
encoded1 = str(encoder.encode_hex(self.winstroke.id))
url = '/rowers/workout/'+encoded1+'/instroke/interactive/'
response = self.c.get(url)
self.assertEqual(response.status_code,200)
# saving
form_data = {
'spm_min': 19,
'spm_max': 25,
'activeminutesmin': 0,
'activeminutesmax': 10,
'individual_curves': False,
'notes': 'aap',
'name': 'sdsd',
'metric': 'boat accelerator curve',
'_save_as_new':'Save'
}
form = InstrokeForm(form_data,choices=['boat accelerator curve', 'oar angle velocity curve'])
result = form.is_valid()
if not result:
print(form.errors)
self.assertTrue(form.is_valid())
response = self.c.post(url, form_data)
self.assertEqual(response.status_code,200)
url = '/rowers/analysis/instrokeanalysis/'
response = self.c.get(url)
self.assertEqual(response.status_code,200)
url = '/rowers/analysis/instrokeanalysis/1/delete/'
response = self.c.get(url)
self.assertEqual(response.status_code, 200)
form_data = {}
response = self.c.post(url, form_data, follow=True)
expected_url = '/rowers/analysis/instrokeanalysis/'
self.assertRedirects(response, expected_url=expected_url, status_code=302,target_status_code=200)
@@ -198,6 +279,10 @@ class WorkoutCompareTestNew(TestCase):
self.c = Client()
self.user_workouts = WorkoutFactory.create_batch(5, user=self.r)
for w in self.user_workouts:
if w.date != w.startdatetime.date():
w.date = w.startdatetime.date()
w.save()
self.factory = RequestFactory()
self.password = faker.word()
self.u.set_password(self.password)
@@ -296,6 +381,10 @@ class WorkoutBoxPlotTestNew(TestCase):
self.c = Client()
self.user_workouts = WorkoutFactory.create_batch(5, user=self.r)
for w in self.user_workouts:
if w.date != w.startdatetime.date():
w.date = w.startdatetime.date()
w.save()
self.factory = RequestFactory()
self.password = faker.word()
self.u.set_password(self.password)
@@ -393,6 +482,10 @@ class WorkoutHistoTestNew(TestCase):
self.c = Client()
self.user_workouts = WorkoutFactory.create_batch(5, user=self.r)
for w in self.user_workouts:
if w.date != w.startdatetime.date():
w.date = w.startdatetime.date()
w.save()
self.factory = RequestFactory()
self.password = faker.word()
self.u.set_password(self.password)
@@ -490,6 +583,10 @@ class History(TestCase):
self.c = Client()
self.user_workouts = WorkoutFactory.create_batch(20, user=self.r)
for w in self.user_workouts:
if w.date != w.startdatetime.date():
w.date = w.startdatetime.date()
w.save()
self.factory = RequestFactory()
self.password = faker.word()
self.u.set_password(self.password)
@@ -577,6 +674,10 @@ class GoldMedalScores(TestCase):
self.c = Client()
self.user_workouts = WorkoutFactory.create_batch(20, user=self.r)
for w in self.user_workouts:
if w.date != w.startdatetime.date():
w.date = w.startdatetime.date()
w.save()
result = get_random_file(filename='rowers/tests/testdata/onwater2.csv')
self.w1 = WorkoutFactory(user=self.r,
csvfilename=result['filename'],
@@ -677,6 +778,10 @@ class WorkoutFlexallTestNew(TestCase):
self.c = Client()
self.user_workouts = WorkoutFactory.create_batch(5, user=self.r)
for w in self.user_workouts:
if w.date != w.startdatetime.date():
w.date = w.startdatetime.date()
w.save()
self.factory = RequestFactory()
self.password = faker.word()
self.u.set_password(self.password)
@@ -774,6 +879,10 @@ class WorkoutStatsTestNew(TestCase):
self.c = Client()
self.user_workouts = WorkoutFactory.create_batch(5, user=self.r)
for w in self.user_workouts:
if w.date != w.startdatetime.date():
w.date = w.startdatetime.date()
w.save()
today = datetime.date.today()
i = 0
@@ -1082,6 +1191,10 @@ class MarkerPerformanceTest(TestCase):
self.c = Client()
self.user_workouts = WorkoutFactory.create_batch(5, user=self.r)
for w in self.user_workouts:
if w.date != w.startdatetime.date():
w.date = w.startdatetime.date()
w.save()
self.factory = RequestFactory()
self.password = faker.word()
self.u.set_password(self.password)
@@ -1095,6 +1208,8 @@ class MarkerPerformanceTest(TestCase):
workouttype='rower',
rankingpiece=True,
)
self.werg2k.date = self.werg2k.startdatetime.date()
self.werg2k.save()
# need a 2k, 5k, 1h row
self.werg5k = WorkoutFactory(
@@ -1104,6 +1219,8 @@ class MarkerPerformanceTest(TestCase):
workouttype='rower',
rankingpiece=True,
)
self.werg5k.date = self.werg5k.startdatetime.date()
self.werg5k.save()
# need a 2k, 5k, 1h row
self.werg1h = WorkoutFactory(
@@ -1113,6 +1230,8 @@ class MarkerPerformanceTest(TestCase):
workouttype='rower',
rankingpiece=True,
)
self.werg1h.date = self.werg1h.startdatetime.date()
self.werg1h.save()
def tearDown(self):
for workout in self.user_workouts:
@@ -1280,6 +1399,10 @@ class AlertTest(TestCase):
self.c = Client()
self.user_workouts = WorkoutFactory.create_batch(5, user=self.r)
for w in self.user_workouts:
if w.date != w.startdatetime.date():
w.date = w.startdatetime.date()
w.save()
self.factory = RequestFactory()
self.password = faker.word()
self.u.set_password(self.password)

View File

@@ -254,6 +254,34 @@ class WorkoutViewTest(TestCase):
response = self.c.post(url,form_data)
self.assertEqual(response.status_code,200)
@patch('rowers.dataprep.create_engine')
@patch('rowers.dataprep.getsmallrowdata_db')
@patch('rowers.middleware.myqueue')
def test_resample(self, mocked_sqlalchemy, mocked_getsmallrowdata_db,
mocked_myqueue):
login = self.c.login(username=self.u.username, password=self.password)
self.assertTrue(login)
url = reverse('workout_resample_view',kwargs={'id':encoder.encode_hex(self.wwater.id)})
response = self.c.get(url)
self.assertEqual(response.status_code,200)
form_data = {
'resamplechoice': 'copy',
}
response = self.c.post(url,form_data)
self.assertEqual(response.status_code,200)
form_data = {
'resamplechoice': 'overwrite',
}
response = self.c.post(url,form_data)
self.assertEqual(response.status_code,200)
@patch('rowers.dataprep.create_engine')
@patch('rowers.dataprep.getsmallrowdata_db')
@pytest.mark.django_db(transaction=True)

View File

@@ -61,3 +61,15 @@ class SimpleViewTest(TestCase):
self.assertRedirects(response,
expected_url='/rowers/list-workouts/',
status_code=302,target_status_code=200)
def test_start_coachtrial(self):
login = self.c.login(username=self.u.username, password=self.password)
self.assertTrue(login)
url = '/rowers/startcoachtrial/'
response = self.c.get(url,follow=True)
self.assertRedirects(response,
expected_url='/rowers/list-workouts/',
status_code=302,target_status_code=200)

View File

@@ -28,15 +28,6 @@ class ViewTest(TestCase):
self.nu = datetime.datetime.now()
def test_upload_view_notloggedin(self):
response = self.c.post('/rowers/workout/upload/',follow=True)
self.assertRedirects(response, expected_url='/login/?next=/rowers/workout/upload/',
status_code=302,target_status_code=200)
self.assertEqual(response.status_code, 200)
@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):
@@ -129,7 +120,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename
try:
os.remove(f_to_be_deleted+'.gz')
except (FileNotFoundError,OSError):
except (FileNotFoundError,OSError): # pragma: no cover
pass
@patch('rowers.dataprep.create_engine')
@@ -230,7 +221,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename
try:
os.remove(f_to_be_deleted+'.gz')
except (FileNotFoundError,OSError):
except (FileNotFoundError,OSError): # pragma: no cover
pass
@@ -271,7 +262,7 @@ class ViewTest(TestCase):
f_to_be_deleted = w.csvfilename
try:
os.remove(f_to_be_deleted+'.gz')
except (FileNotFoundError,OSError):
except (FileNotFoundError,OSError): # pragma: no cover
pass
@patch('rowers.dataprep.create_engine')
@@ -341,19 +332,6 @@ class ViewTest(TestCase):
self.assertEqual(response.status_code, 200)
filename = 'rowers/tests/testdata/crewnerddata.CSV'
f = open(filename,'rb')
file_data = {'file': f}
form_data = {}
form = CNsummaryForm(form_data,file_data)
response = self.c.post('rowers/workout/'+encoded1+'/crewnerdsummary',
form_data,
follow=True)
f.close()
self.assertEqual(response.status_code, 200)
w = Workout.objects.get(id=1)
f_to_be_deleted = w.csvfilename
try:
@@ -660,7 +638,7 @@ class ViewTest(TestCase):
@patch('rowers.dataprep.create_engine')
@patch('rowers.dataprep.TCXParser')
def test_upload_view_TCX_CN(self, mocked_sqlalchemy,
def test_upload_view_TCX_Rim(self, mocked_sqlalchemy,
mocked_tcx_parser):
self.c.login(username='john',password='koeinsloot')

Binary file not shown.