sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'develop' into feature/opaqueid

Browse Source
This commit is contained in:
Sander Roosendaal
2019-02-13 17:14:33 +01:00
parent dd633076f1 82d6b09224
commit f148b8494e
119 changed files with 116778 additions and 10192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
rowers/tests/test_cpchart.py
View File

@@ -10,7 +10,7 @@ from rowers.utils import calculate_age
import rowers.dataprep as dataprep
@override_settings(TESTING=True)
class OTWCPChartTest(TestCase):
def setUp(self):
self.u = UserFactory()
@@ -36,11 +36,11 @@ class OTWCPChartTest(TestCase):
for filename in os.listdir(u'rowers/tests/testdata/otwcp'):
a2 = 'rowers/tests/testdata/otwcp/temp/'+filename
try:
copyfile(u'rowers/tests/testdata/otwcp/'+filename,a2)
copy(u'rowers/tests/testdata/otwcp/'+filename,a2)
row = rdata(a2)
totaldist = row.df['cum_dist'].max()
totaltime = row.df['TimeStamp (sec)'].max()-row.df['TimeStamp (sec)'].min()
totaltime = totaltime+row.df.ix[0,' ElapsedTime (sec)']
totaltime = totaltime+row.df.loc[:,' ElapsedTime (sec)'].iloc[0]
hours = int(totaltime/3600.)
@@ -71,13 +71,16 @@ class OTWCPChartTest(TestCase):
pass
def tearDown(self):
for filename in os.listdir('rowers/tests/testdata/otwcp/temp'):
path = os.path.join('rowers/tests/testdata/otwcp/temp/',filename)
if not os.path.isdir(path):
try:
os.remove(path)
except (IOError,WindowsError):
pass
try:
for filename in os.listdir('rowers/tests/testdata/otwcp/temp'):
path = os.path.join('rowers/tests/testdata/otwcp/temp/',filename)
if not os.path.isdir(path):
try:
os.remove(path)
except (IOError,WindowsError,OSError):
pass
except (IOError,WindowsError,OSError):
pass
@patch('rowers.dataprep.getsmallrowdata_db',side_effect=mocked_cpraw)
@patch('rowers.dataprep.getcpdata_sql',side_effect=mocked_getcpdata_sql)
@@ -99,6 +102,7 @@ class OTWCPChartTest(TestCase):
self.assertEqual(response.status_code, 200)
@override_settings(TESTING=True)
class CPChartTest(TestCase):
def setUp(self):
self.u = UserFactory()
@@ -121,16 +125,16 @@ class CPChartTest(TestCase):
recordsdf = pd.read_csv('rowers/tests/worldrecords.csv',encoding='utf-8')
for i in range(len(recordsdf)):
for i in recordsdf.index:
record = C2WorldClassAgePerformance(
name = recordsdf.ix[i,'name'],
age = recordsdf.ix[i,'age'],
distance = recordsdf.ix[i,'distance'],
duration = recordsdf.ix[i,'duration'],
power = recordsdf.ix[i,'power'],
season = recordsdf.ix[i,'season'],
sex = recordsdf.ix[i,'sex'],
weightcategory = recordsdf.ix[i,'weightcategory'],
name = recordsdf.loc[i,'name'],
age = recordsdf.loc[i,'age'],
distance = recordsdf.loc[i,'distance'],
duration = recordsdf.loc[i,'duration'],
power = recordsdf.loc[i,'power'],
season = recordsdf.loc[i,'season'],
sex = recordsdf.loc[i,'sex'],
weightcategory = recordsdf.loc[i,'weightcategory'],
)
record.save()
@@ -139,11 +143,11 @@ class CPChartTest(TestCase):
r = self.u.rower
for i in range(len(perfsdf)):
for i in perfsdf.index:
perf = CalcAgePerformance(
age = age,
duration = perfsdf.ix[i,'duration'],
power = perfsdf.ix[i,'power'],
duration = perfsdf.loc[i,'duration'],
power = perfsdf.loc[i,'power'],
sex = r.sex,
weightcategory = r.weightcategory
)
@@ -153,7 +157,7 @@ class CPChartTest(TestCase):
for workout in self.user_workouts:
try:
os.remove(workout.csvfilename)
except (IOError, WindowsError):
except (IOError, WindowsError,OSError):
pass
def test_analytics_page(self):