Merge branch 'feature/restapitesting' into develop

rowers/tests.py

@@ -15,13 +15,49 @@ import os
 from rowers.tasks import handle_makeplot
 from rowers.c2stuff import C2NoTokenError
 
+from minimocktest import MockTestCase
+import pandas as pd
+
 import json
 
 from rowers import urls
 from rowers.views import error500_view,error404_view,error400_view,error403_view
 
+class DjangoTestCase(TestCase, MockTestCase):
+    def _pre_setup(self):
+	MockTestCase.setUp(self)
+	TestCase._pre_setup(self)
+	self.client = Client()
+
+    def _post_teardown(self):
+	TestCase._post_teardown(self)
+	MockTestCase.tearDown(self)
+
 # Create your tests here.
 
+class C2Objects(DjangoTestCase):
+    def test_strokedata(self):
+	with open('c2stroketestdata.txt','r') as infile:
+	    res = json.load(infile)
+
+	strokedata = pd.DataFrame.from_dict(res['data'])
+
+	with open('c2testdata.txt','r') as infile:
+	    res = json.load(infile)
+
+	data = res['data']
+
+	from rowers.views import add_workout_from_strokedata
+
+	u = User.objects.create_user('john',
+				     'sander@ds.ds',
+				     'koeinsloot')
+	r = Rower.objects.create(user=u)
+
+	res = add_workout_from_strokedata(u,1,data,strokedata,source='c2')
+
+    
+
 class TestErrorPages(TestCase):
     def test_error_handlers(self):
         self.assertTrue(urls.handler404.endswith('.error404_view'))

rowers/views.py

@@ -371,6 +371,7 @@ def add_workout_from_strokedata(user,importid,data,strokedata,source='c2'):
 		       ' Stroke500mPace (sec/500m)':pace,
 		       ' DragFactor':np.zeros(nr_rows),
 		       ' Power (watts)':power,
+		       ' DragFactor':np.zeros(nr_rows),
 		       ' DriveLength (meters)':np.zeros(nr_rows),
 		       ' StrokeDistance (meters)':strokelength,
 		       ' DriveTime (ms)':np.zeros(nr_rows),