Private
Public Access
1
0

a few more tests and removing old code

This commit is contained in:
Sander Roosendaal
2021-01-11 20:43:37 +01:00
parent e153e63481
commit 394d80d040
6 changed files with 47 additions and 487 deletions

View File

@@ -1000,9 +1000,28 @@ class GoldMedalScores(TestCase):
self.c = Client()
self.user_workouts = WorkoutFactory.create_batch(20, user=self.r)
ws = Workout.objects.all().order_by('date')
ws[0].rankingpiece = True
ws[0].save()
result = get_random_file(filename='rowers/tests/testdata/onwater2.csv')
self.w1 = WorkoutFactory(user=self.r,
csvfilename=result['filename'],
starttime=result['starttime'],
startdatetime=result['startdatetime'],
duration=result['duration'],
distance=result['totaldist'],
workouttype = 'water',
rankingpiece=True
)
result = get_random_file(filename='rowers/tests/testdata/onwater2.csv')
self.w2 = WorkoutFactory(user=self.r,
csvfilename=result['filename'],
starttime=result['starttime'],
startdatetime=result['startdatetime'],
duration=result['duration'],
distance=result['totaldist'],
workouttype = 'water',
rankingpiece=True
)
self.factory = RequestFactory()
self.password = faker.word()
self.u.set_password(self.password)
@@ -1020,6 +1039,9 @@ class GoldMedalScores(TestCase):
def test_workouts_goldmedalscores(self, mocked_sqlalchemy,
mocked_getsmallrowdata_db):
ws = Workout.objects.filter(rankingpiece=True)
self.assertEqual(ws.count(),2)
login = self.c.login(username=self.u.username, password=self.password)
self.assertTrue(login)

View File

@@ -71,7 +71,10 @@ class InteractivePlotTests(TestCase):
self.assertFalse(len(script)==0)
self.assertFalse(len(div)==0)
def test_interactive_chart(self):
@patch('rowers.dataprep.create_engine')
@patch('rowers.dataprep.getsmallrowdata_db', side_effect=mocked_getsmallrowdata_db)
def test_interactive_chart(self, mocked_sqlalchemy,
mocked_getsmallrowdata_db):
workout = Workout.objects.filter(user=self.r,workouttype__in=mytypes.rowtypes)[0]
id = workout.id
@@ -99,3 +102,14 @@ class InteractivePlotTests(TestCase):
script, div = interactiveplots.interactive_chart_video(data)
self.assertFalse(len(script)==0)
self.assertFalse(len(div)==0)
@patch('rowers.dataprep.create_engine')
@patch('rowers.dataprep.getsmallrowdata_db', side_effect=mocked_getsmallrowdata_db)
def test_interactive_flexchart_stacked(self, mocked_sqlalchemy,
mocked_getsmallrowdata_db):
workout = Workout.objects.filter(user=self.r,workouttype__in=mytypes.rowtypes)[0]
id = workout.id
script, div, js_res, css_res, comment = interactiveplots.interactive_flexchart_stacked(id,self.r)
self.assertFalse(len(script)==0)
self.assertFalse(len(div)==0)

View File

@@ -205,9 +205,10 @@ class TestForceUnit(TestCase):
average_N = int(row.df[' AverageDriveForce (N)'].mean())
self.assertEqual(average_N,398)
df = dataprep.getsmallrowdata_db(['averageforce'],ids=[w[0].id],doclean=False,
compute=False)
rowdata = dataprep.rdata('rowers/tests/testdata/PainsledForce.csv')
df = dataprep.dataprep(rowdata.df)
#df = dataprep.getsmallrowdata_db(['averageforce'],ids=[w[0].id],doclean=False,
# compute=False)
try:
average_N = int(df['averageforce'].mean())
if average_N != 0: