additional tests defined

rowers/tests/test_user.py

@@ -19,6 +19,8 @@ import rowers.dataprep as dataprep
 
 from redis import StrictRedis
 redis_connection = StrictRedis()
+from rowingdata import rowingdata as rdata
+from rowingdata import rower as rrower
 
 from rowers.models import User,Rower, Workout
 
@@ -27,51 +29,48 @@ class UserMiddleWareTest(TestCase):
 	u = User.objects.create_user('john',
 				     'sander@ds.ds',
 				     'koeinsloot')
-	r = Rower.objects.create(user=u)
+	self.r = Rower.objects.create(user=u)
         
         self.c = Client()
         self.c.login(username='john',password='koeinsloot')
-	nu = datetime.datetime.now()
+	self.nu = datetime.datetime.now()
 
-        response = dataprep.new_workout_from_file(r,'/media/testdata.csv.gz',
-                                                  title='sample')
+	filename = 'rowers/tests/testdata/testdata.csv'
+	
+ 	rr = rrower(hrmax=self.r.max,hrut2=self.r.ut2,
+		    hrut1=self.r.ut1,hrat=self.r.at,
+		    hrtr=self.r.tr,hran=self.r.an,ftp=self.r.ftp)
+	row = rdata(filename,rower=rr)
+	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)']
 
-        newworkoutid = response[0]
-        self.w = Workout.objects.get(id=newworkoutid)
+	
+	hours = int(totaltime/3600.)
+	minutes = int((totaltime - 3600.*hours)/60.)
+	seconds = int(totaltime - 3600.*hours - 60.*minutes)
+	tenths = int(10*(totaltime - 3600.*hours - 60.*minutes - seconds))
+
+	duration = "%s:%s:%s.%s" % (hours,minutes,seconds,tenths)
+
+
+	workoutdate = row.rowdatetime.strftime('%Y-%m-%d')
+	workoutstarttime = row.rowdatetime.strftime('%H:%M:%S')
+
+	self.w = Workout.objects.create(
+            name='testworkout',workouttype='water',
+	    user=self.r,date=self.nu.strftime('%Y-%m-%d'),
+	    starttime=workoutstarttime,
+            startdatetime=row.rowdatetime,
+	    duration=duration,distance=totaldist,
+	    csvfilename=filename
+        )
         
         
     def test_middleware(self):
         response = self.c.get('/rowers/list-workouts',follow=True)
         self.assertEqual(response.status_code,200)
         
-class UserExpireTest(TestCase):
-    def setUp(self):
-        redis_connection.publish('tasks','KILL')
-	self.u = User.objects.create_user('john',
-				     'sander@ds.ds',
-				     'koeinsloot')
-
-        yesterday_dt = timezone.now()-datetime.timedelta(days=1)
-        yesterday = yesterday_dt.date()
-        
-	r = Rower.objects.create(user=self.u,planexpires = yesterday,rowerplan='pro',
-                                 paymenttype='single')
-        
-        self.c = Client()
-        self.c.login(username='john',password='koeinsloot')
-	nu = datetime.datetime.now()
-
-        response = dataprep.new_workout_from_file(r,'/media/testdata.csv.gz',
-                                                  title='sample')
-
-        newworkoutid = response[0]
-        self.w = Workout.objects.get(id=newworkoutid)
-        
-        
-    def test_expire(self):
-        response = self.c.get('/rowers/list-workouts',follow=True)
-        self.assertEqual(response.status_code,200)
-        self.assertEqual(self.u.rower.rowerplan,'basic')
         
 class UserTestsNoRower(TestCase):
     def setUp(self):