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

Merge branch 'feature/testcoverage' into develop

Browse Source
This commit is contained in:
Sander Roosendaal
2019-01-18 13:27:36 +01:00
parent 0dbb668f70 eb736b9f1e
commit 7d1973d1c6
9 changed files with 40569 additions and 462380 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rowers/tests/test_analysis.py
View File

@@ -61,8 +61,8 @@ class WorkoutCompareTest(TestCase):
form = WorkoutMultipleCompareForm(form_data) form = WorkoutMultipleCompareForm(form_data)
chartform = ChartParamChoiceForm(form_data) chartform = ChartParamChoiceForm(form_data)
self.assertTrue(form.is_valid) self.assertTrue(form.is_valid())
self.assertTrue(chartform.is_valid) self.assertTrue(chartform.is_valid())
response = self.c.post('/rowers/multi-compare/',form_data) response = self.c.post('/rowers/multi-compare/',form_data)
@@ -130,8 +130,8 @@ class BoxPlotTest(TestCase):
form = WorkoutMultipleCompareForm(form_data) form = WorkoutMultipleCompareForm(form_data)
chartform = BoxPlotChoiceForm(form_data) chartform = BoxPlotChoiceForm(form_data)
self.assertTrue(form.is_valid) self.assertTrue(form.is_valid())
self.assertTrue(chartform.is_valid) self.assertTrue(chartform.is_valid())
response = self.c.get('/rowers/user-boxplot/',follow=True) response = self.c.get('/rowers/user-boxplot/',follow=True)
self.assertEqual(response.status_code,200) self.assertEqual(response.status_code,200)
@@ -394,7 +394,7 @@ class CumFlexTest(TestCase):
} }
form = TrendFlexModalForm(form_data) form = TrendFlexModalForm(form_data)
self.assertTrue(form.is_valid) self.assertTrue(form.is_valid())
self.factory.user = self.u self.factory.user = self.u
form = FlexAxesForm(self.factory,form_data) form = FlexAxesForm(self.factory,form_data)
@@ -505,7 +505,7 @@ class MultiFlexTest(TestCase):
} }
form = MultiFlexChoiceForm(form_data) form = MultiFlexChoiceForm(form_data)
self.assertTrue(form.is_valid) self.assertTrue(form.is_valid())
url = '/rowers/user-multiflex-select/' url = '/rowers/user-multiflex-select/'

6
rowers/tests/test_courses.py
View File

@@ -26,8 +26,8 @@ class CoursesTest(TestCase):
'file':f, 'file':f,
} }
courseform = CourseForm(form_data,file_data) courseform = CourseForm(form_data)
self.assertTrue(courseform.is_valid) self.assertTrue(courseform.is_valid())
response = self.c.get('/rowers/courses/upload/') response = self.c.get('/rowers/courses/upload/')
self.assertTrue(response.status_code,200) self.assertTrue(response.status_code,200)
@@ -61,7 +61,7 @@ class CoursesTest(TestCase):
} }
form = GeoCourseEditForm(form_data) form = GeoCourseEditForm(form_data)
self.assertTrue(form.is_valid) self.assertTrue(form.is_valid())
response = self.c.post('/rowers/courses/1/edit/',form_data) response = self.c.post('/rowers/courses/1/edit/',form_data)
self.assertTrue(response.status_code,200) self.assertTrue(response.status_code,200)

4
rowers/tests/test_cpchart.py
View File

@@ -95,10 +95,10 @@ class CPChartTest(TestCase):
} }
form = MetricsForm(form_data) form = MetricsForm(form_data)
self.assertTrue(form.is_valid) self.assertTrue(form.is_valid())
form = WorkoutForm(form_data) form = WorkoutForm(form_data)
self.assertTrue(form.is_valid) self.assertTrue(form.is_valid())
url = '/rowers/workout/addmanual/' url = '/rowers/workout/addmanual/'

18
rowers/tests/test_payments.py
View File

@@ -97,10 +97,10 @@ class PaymentTest(TestCase):
} }
form = RowerBillingAddressForm(form_data) form = RowerBillingAddressForm(form_data)
self.assertTrue(form.is_valid) self.assertTrue(form.is_valid())
form = PlanSelectForm(form_data,paymentprocessor='braintree') form = PlanSelectForm(form_data,paymentprocessor='braintree')
self.assertTrue(form.is_valid) self.assertTrue(form.is_valid())
response = self.c.post(url,form_data,follow=True) response = self.c.post(url,form_data,follow=True)
self.assertEqual(response.status_code,200) self.assertEqual(response.status_code,200)
@@ -160,10 +160,10 @@ class PaymentTest(TestCase):
} }
form = RowerBillingAddressForm(form_data) form = RowerBillingAddressForm(form_data)
self.assertTrue(form.is_valid) self.assertTrue(form.is_valid())
form = PlanSelectForm(form_data,paymentprocessor='braintree') form = PlanSelectForm(form_data,paymentprocessor='braintree')
self.assertTrue(form.is_valid) self.assertTrue(form.is_valid())
response = self.c.post(url,form_data,follow=True) response = self.c.post(url,form_data,follow=True)
self.assertEqual(response.status_code,200) self.assertEqual(response.status_code,200)
@@ -226,10 +226,10 @@ class PaymentTest(TestCase):
} }
form = RowerBillingAddressForm(form_data) form = RowerBillingAddressForm(form_data)
self.assertTrue(form.is_valid) self.assertTrue(form.is_valid())
form = PlanSelectForm(form_data,paymentprocessor='braintree') form = PlanSelectForm(form_data,paymentprocessor='braintree')
self.assertTrue(form.is_valid) self.assertTrue(form.is_valid())
response = self.c.post(url,form_data,follow=True) response = self.c.post(url,form_data,follow=True)
self.assertEqual(response.status_code,200) self.assertEqual(response.status_code,200)
@@ -368,7 +368,7 @@ class PaymentTest(TestCase):
} }
form = BillingForm(form_data) form = BillingForm(form_data)
self.assertTrue(form.is_valid) self.assertTrue(form.is_valid())
login = self.c.login(username=u.username, password=self.password) login = self.c.login(username=u.username, password=self.password)
self.assertTrue(login) self.assertTrue(login)
@@ -412,7 +412,7 @@ class PaymentTest(TestCase):
} }
form = BillingForm(form_data) form = BillingForm(form_data)
self.assertTrue(form.is_valid) self.assertTrue(form.is_valid())
login = self.c.login(username=u.username, password=self.password) login = self.c.login(username=u.username, password=self.password)
self.assertTrue(login) self.assertTrue(login)
@@ -455,7 +455,7 @@ class PaymentTest(TestCase):
} }
form = BillingForm(form_data) form = BillingForm(form_data)
self.assertTrue(form.is_valid) self.assertTrue(form.is_valid())
login = self.c.login(username=u.username, password=self.password) login = self.c.login(username=u.username, password=self.password)
self.assertTrue(login) self.assertTrue(login)

2
rowers/tests/test_simplefunctions.py
View File

@@ -62,7 +62,7 @@ class SimpleViewTest(TestCase):
form = EmailForm(form_data) form = EmailForm(form_data)
self.assertTrue(form.is_valid) self.assertTrue(form.is_valid())
response = self.c.post(url,form_data,follow=True) response = self.c.post(url,form_data,follow=True)
self.assertEqual(response.status_code,200) self.assertEqual(response.status_code,200)

48
rowers/tests/test_user.py
View File

@@ -116,8 +116,8 @@ class UserPreferencesTest(TestCase):
form = AccountRowerForm(form_data) form = AccountRowerForm(form_data)
userform = UserForm(form_data,instance=self.u) userform = UserForm(form_data,instance=self.u)
self.assertTrue(form.is_valid) self.assertTrue(form.is_valid())
self.assertTrue(userform.is_valid) self.assertTrue(userform.is_valid())
response = self.c.post(url,form_data) response = self.c.post(url,form_data)
self.assertEqual(response.status_code,200) self.assertEqual(response.status_code,200)
@@ -148,12 +148,44 @@ class UserPreferencesTest(TestCase):
} }
form = RowerExportForm(form_data) form = RowerExportForm(form_data)
self.assertTrue(form.is_valid) self.assertTrue(form.is_valid())
response = self.c.post(url,form_data) response = self.c.post(url,form_data)
self.assertEqual(response.status_code,200) self.assertEqual(response.status_code,200)
def test_zones_workflowsettings(self):
login = self.c.login(username=self.u.username,password=self.password)
self.assertTrue(login)
post_data = {
u'middlepanel-0-panel':u'panel_middlesocial.html',
u'middlepanel-1-panel':u'panel_statcharts.html',
u'middlepanel-2-panel':u'flexthumbnails.html',
u'middlepanel-3-panel':u'panel_summary.html',
u'middlepanel-4-panel':u'panel_map.html',
u'middlepanel-5-panel':u'panel_notes.html',
u'middlepanel-6-panel':u'panel_shortcomment.html',
u'middlepanel-7-panel':u'None',
u'middlepanel-8-panel':u'None',
u'middlepanel-INITIAL_FORMS':'8',
u'middlepanel-MAX_NUM_FORMS':u'1000',
u'middlepanel-MIN_NUM_FORMS':u'0',
u'middlepanel-TOTAL_FORMS':u'8',
}
MiddlePanelFormSet = formset_factory(WorkFlowMiddlePanelElement,extra=1)
middlepanel_formset = MiddlePanelFormSet(post_data,prefix='middlepanel')
self.assertTrue(middlepanel_formset.is_valid())
url = '/rowers/me/workflowconfig2/'
response = self.c.get(url)
self.assertEqual(response.status_code,200)
response = self.c.post(url,post_data)
self.assertEqual(response.status_code,200)
def test_zones_preferences(self): def test_zones_preferences(self):
login = self.c.login(username=self.u.username,password=self.password) login = self.c.login(username=self.u.username,password=self.password)
self.assertTrue(login) self.assertTrue(login)
@@ -162,14 +194,14 @@ class UserPreferencesTest(TestCase):
'max':181, 'max':181,
'ut2':140, 'ut2':140,
'ut1':150, 'ut1':150,
'tr':160, 'tr':170,
'at':170, 'at':160,
'an':175, 'an':175,
'rest':50 'rest':50
} }
form = RowerForm(form_data) form = RowerForm(form_data)
self.assertTrue(form.is_valid) self.assertTrue(form.is_valid())
url = '/rowers/me/preferences/' url = '/rowers/me/preferences/'
@@ -186,7 +218,7 @@ class UserPreferencesTest(TestCase):
} }
form = RowerPowerForm(form_data) form = RowerPowerForm(form_data)
self.assertTrue(form.is_valid) self.assertTrue(form.is_valid())
response = self.c.post(url,form_data,follow=True) response = self.c.post(url,form_data,follow=True)
self.assertEqual(response.status_code,200) self.assertEqual(response.status_code,200)

502857
rowers/tests/testdata/cumstats.csv vendored
View File

File diff suppressed because it is too large Load Diff

BIN
rowers/tests/testdata/testdata.csv.gz vendored
View File

Binary file not shown.

2
rowers/tests/testdata/testdata.tcx vendored
View File

@@ -2502,7 +2502,7 @@
</Trackpoint> </Trackpoint>
</Track> </Track>
</Lap> </Lap>
<Notes>&lt;Element 'Notes' at 0x138c9ef0&gt;</Notes> <Notes>&lt;Element 'Notes' at 0x138f7dd8&gt;</Notes>
</Activity> </Activity>
</Activities> </Activities>
<Creator> <Creator>