From 5f8cca44651b032a7bf804b53396d796f16896d0 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Wed, 2 Jan 2019 11:33:54 +0100 Subject: [PATCH] moved tests to tests folder and made it working --- rowers/tests/__init__.py | 21 +++ .../{ => tests}/testdata/2016-03-25-0758.CSV | 0 .../testdata/2016-03-25-0758_data.CSV | 0 rowers/{ => tests}/testdata/2x20min_o.csv | 0 rowers/{ => tests}/testdata/3km_cd_o.csv | 0 rowers/{ => tests}/testdata/3x250m.fit | Bin rowers/{ => tests}/testdata/NoHR.tcx | 0 rowers/{ => tests}/testdata/RP_interval.csv | 0 .../testdata/RP_interval.csv_o.CSV | 0 rowers/{ => tests}/testdata/RP_testdata.csv | 0 .../testdata/SpeedCoach GPS Workout.csv | 0 .../testdata/SpeedCoach2Link_interval.csv | 0 .../testdata/SpeedCoach2Linkv1.27.csv | 0 .../testdata/Speedcoach2example.csv | 0 rowers/{ => tests}/testdata/boatcoach.csv | 0 .../{ => tests}/testdata/c2jsonstrokedata.txt | 0 .../testdata/c2jsonworkoutdata.txt | 0 rowers/{ => tests}/testdata/c2strokedata.csv | 0 .../{ => tests}/testdata/c2strokedatanohr.txt | 0 .../{ => tests}/testdata/c2stroketestdata.txt | 0 rowers/{ => tests}/testdata/c2testdata.txt | 0 rowers/{ => tests}/testdata/c2workoutlist.txt | 0 .../testdata/crewnerd_interval.csv | 0 rowers/{ => tests}/testdata/crewnerddata.CSV | 0 rowers/{ => tests}/testdata/crewnerddata.tcx | 0 .../{ => tests}/testdata/crewnerddata_o.CSV | 0 .../testdata/emails/NKEmporfromgreg.csv | 0 .../testdata/emails/NKLiNKv130.csv | 0 .../testdata/emails/NKLiNKv130.csv.gz | Bin .../testdata/emails/SpeedCoach2v2.12.csv | 0 .../testdata/emails/boatcoach.csv.gz | Bin .../testdata/emails/boatcoach_otw.csv | 0 rowers/{ => tests}/testdata/emails/colin.csv | 0 .../testdata/emails/correctedpainsled.csv | 0 .../{ => tests}/testdata/emails/coxmate.csv | 0 .../testdata/emails/crewnerddata.tcx | 0 .../testdata/emails/crewnerddata_o.CSV | 0 .../{ => tests}/testdata/emails/davidfit.fit | Bin .../testdata/emails/ergdata_example.csv_o.CSV | 0 .../testdata/emails/ergstick.csv_o.CSV | 0 .../testdata/emails/example_data.csv | 0 .../testdata/emails/impeller_empower.csv | 0 .../{ => tests}/testdata/emails/kinomap.csv | 0 .../testdata/emails/rowperfect.csv | 0 .../{ => tests}/testdata/emails/rowpro5.csv | 0 .../{ => tests}/testdata/emails/testdata.ZIP | Bin .../{ => tests}/testdata/emails/testdata.csv | 0 .../testdata/emails/testdata.csv.gz | Bin .../testdata/emails/testlapidx.csv | 0 rowers/{ => tests}/testdata/emails/划船.csv | 0 .../{ => tests}/testdata/ergdata_example.csv | 0 .../testdata/ergdata_example.csv_o.CSV | 0 rowers/{ => tests}/testdata/ergstick.csv | 0 .../{ => tests}/testdata/ergstick.csv_o.CSV | 0 rowers/{ => tests}/testdata/ergstick_o.csv | 0 rowers/{ => tests}/testdata/example.csv | 0 rowers/{ => tests}/testdata/example_data.csv | 0 rowers/{ => tests}/testdata/faketcx.tcx | 0 rowers/{ => tests}/testdata/linkios.zip | Bin rowers/{ => tests}/testdata/logcard.csv | 0 rowers/{ => tests}/testdata/mystery.csv | 0 .../testdata/painsled_desktop_example.csv | 0 .../testdata/painsled_out_data.csv | 0 ..._20160221-105218_erg-400150318_760465m.csv | 0 rowers/{ => tests}/testdata/rkstrokes.txt | 0 .../{ => tests}/testdata/rkworkoutslist.txt | 0 .../testdata/rowinginmotionexample.TCX | 0 .../testdata/rowinginmotionexample.TCX_o.CSV | 0 rowers/{ => tests}/testdata/rowperfect.csv | 0 rowers/{ => tests}/testdata/rowpro5.csv | 0 rowers/{ => tests}/testdata/rp_out.csv | 0 rowers/{ => tests}/testdata/sander.txt | 0 .../{ => tests}/testdata/speedcoach2test2.csv | 0 .../{ => tests}/testdata/speedcoach3test3.csv | 0 .../testdata/speedcoachexample.csv | 0 .../testdata/speedcoachexample.csv_o.CSV | 0 .../testdata/sporttracksstrokedata.txt | 0 .../testdata/sporttrackstestdata.txt | 0 .../testdata/sporttrackstestnohr.txt | 0 .../testdata/sporttracksworkouts.txt | 0 .../testdata/stravadistancetestdata.txt | 0 .../{ => tests}/testdata/stravahrtestdata.txt | 0 .../testdata/stravahrtestnodata.txt | 0 .../testdata/stravalatlongtestdata.txt | 0 .../testdata/stravapowertestdata.txt | 0 .../testdata/stravaspmtestdata.txt | 0 .../testdata/stravasummarytestdata.txt | 0 .../testdata/stravatimetestdata.txt | 0 .../testdata/stravavelotestdata.txt | 0 .../testdata/stravaworkoutlist.txt | 0 .../testdata/stravaworkoutsummary.txt | 0 rowers/{ => tests}/testdata/strokedata.txt | 0 rowers/{ => tests}/testdata/testdata.csv | 0 rowers/{ => tests}/testdata/testdata.csv.gz | Bin .../{ => tests}/testdata/testdatasummary.csv | 0 rowers/{ => tests}/testdata/testlapidx.csv | 0 rowers/{ => tests}/testdata/tim.csv | 0 .../{ => tests}/testdata/tpuploadresponse.txt | 0 .../testdata/uapostworkoutresponse.txt | 0 rowers/{ => tests}/testdata/uastrokes.txt | 0 rowers/{ => tests}/testdata/uauser.txt | 0 rowers/{ => tests}/testdata/uaworkoutlist.txt | 0 rowers/{ => tests}/testdata/zipfile.zip | Bin rowers/{ => tests}/tests.py | 128 +++++++++--------- 104 files changed, 85 insertions(+), 64 deletions(-) create mode 100644 rowers/tests/__init__.py rename rowers/{ => tests}/testdata/2016-03-25-0758.CSV (100%) rename rowers/{ => tests}/testdata/2016-03-25-0758_data.CSV (100%) rename rowers/{ => tests}/testdata/2x20min_o.csv (100%) rename rowers/{ => tests}/testdata/3km_cd_o.csv (100%) rename rowers/{ => tests}/testdata/3x250m.fit (100%) rename rowers/{ => tests}/testdata/NoHR.tcx (100%) rename rowers/{ => tests}/testdata/RP_interval.csv (100%) rename rowers/{ => tests}/testdata/RP_interval.csv_o.CSV (100%) rename rowers/{ => tests}/testdata/RP_testdata.csv (100%) rename rowers/{ => tests}/testdata/SpeedCoach GPS Workout.csv (100%) rename rowers/{ => tests}/testdata/SpeedCoach2Link_interval.csv (100%) rename rowers/{ => tests}/testdata/SpeedCoach2Linkv1.27.csv (100%) rename rowers/{ => tests}/testdata/Speedcoach2example.csv (100%) rename rowers/{ => tests}/testdata/boatcoach.csv (100%) rename rowers/{ => tests}/testdata/c2jsonstrokedata.txt (100%) rename rowers/{ => tests}/testdata/c2jsonworkoutdata.txt (100%) rename rowers/{ => tests}/testdata/c2strokedata.csv (100%) rename rowers/{ => tests}/testdata/c2strokedatanohr.txt (100%) rename rowers/{ => tests}/testdata/c2stroketestdata.txt (100%) rename rowers/{ => tests}/testdata/c2testdata.txt (100%) rename rowers/{ => tests}/testdata/c2workoutlist.txt (100%) rename rowers/{ => tests}/testdata/crewnerd_interval.csv (100%) rename rowers/{ => tests}/testdata/crewnerddata.CSV (100%) rename rowers/{ => tests}/testdata/crewnerddata.tcx (100%) rename rowers/{ => tests}/testdata/crewnerddata_o.CSV (100%) rename rowers/{ => tests}/testdata/emails/NKEmporfromgreg.csv (100%) rename rowers/{ => tests}/testdata/emails/NKLiNKv130.csv (100%) rename rowers/{ => tests}/testdata/emails/NKLiNKv130.csv.gz (100%) rename rowers/{ => tests}/testdata/emails/SpeedCoach2v2.12.csv (100%) rename rowers/{ => tests}/testdata/emails/boatcoach.csv.gz (100%) rename rowers/{ => tests}/testdata/emails/boatcoach_otw.csv (100%) rename rowers/{ => tests}/testdata/emails/colin.csv (100%) rename rowers/{ => tests}/testdata/emails/correctedpainsled.csv (100%) rename rowers/{ => tests}/testdata/emails/coxmate.csv (100%) rename rowers/{ => tests}/testdata/emails/crewnerddata.tcx (100%) rename rowers/{ => tests}/testdata/emails/crewnerddata_o.CSV (100%) rename rowers/{ => tests}/testdata/emails/davidfit.fit (100%) rename rowers/{ => tests}/testdata/emails/ergdata_example.csv_o.CSV (100%) rename rowers/{ => tests}/testdata/emails/ergstick.csv_o.CSV (100%) rename rowers/{ => tests}/testdata/emails/example_data.csv (100%) rename rowers/{ => tests}/testdata/emails/impeller_empower.csv (100%) rename rowers/{ => tests}/testdata/emails/kinomap.csv (100%) rename rowers/{ => tests}/testdata/emails/rowperfect.csv (100%) rename rowers/{ => tests}/testdata/emails/rowpro5.csv (100%) rename rowers/{ => tests}/testdata/emails/testdata.ZIP (100%) rename rowers/{ => tests}/testdata/emails/testdata.csv (100%) rename rowers/{ => tests}/testdata/emails/testdata.csv.gz (100%) rename rowers/{ => tests}/testdata/emails/testlapidx.csv (100%) rename rowers/{ => tests}/testdata/emails/划船.csv (100%) rename rowers/{ => tests}/testdata/ergdata_example.csv (100%) rename rowers/{ => tests}/testdata/ergdata_example.csv_o.CSV (100%) rename rowers/{ => tests}/testdata/ergstick.csv (100%) rename rowers/{ => tests}/testdata/ergstick.csv_o.CSV (100%) rename rowers/{ => tests}/testdata/ergstick_o.csv (100%) rename rowers/{ => tests}/testdata/example.csv (100%) rename rowers/{ => tests}/testdata/example_data.csv (100%) rename rowers/{ => tests}/testdata/faketcx.tcx (100%) rename rowers/{ => tests}/testdata/linkios.zip (100%) rename rowers/{ => tests}/testdata/logcard.csv (100%) rename rowers/{ => tests}/testdata/mystery.csv (100%) rename rowers/{ => tests}/testdata/painsled_desktop_example.csv (100%) rename rowers/{ => tests}/testdata/painsled_out_data.csv (100%) rename rowers/{ => tests}/testdata/painsled_to_csv_20160221-105218_erg-400150318_760465m.csv (100%) rename rowers/{ => tests}/testdata/rkstrokes.txt (100%) rename rowers/{ => tests}/testdata/rkworkoutslist.txt (100%) rename rowers/{ => tests}/testdata/rowinginmotionexample.TCX (100%) rename rowers/{ => tests}/testdata/rowinginmotionexample.TCX_o.CSV (100%) rename rowers/{ => tests}/testdata/rowperfect.csv (100%) rename rowers/{ => tests}/testdata/rowpro5.csv (100%) rename rowers/{ => tests}/testdata/rp_out.csv (100%) rename rowers/{ => tests}/testdata/sander.txt (100%) rename rowers/{ => tests}/testdata/speedcoach2test2.csv (100%) rename rowers/{ => tests}/testdata/speedcoach3test3.csv (100%) rename rowers/{ => tests}/testdata/speedcoachexample.csv (100%) rename rowers/{ => tests}/testdata/speedcoachexample.csv_o.CSV (100%) rename rowers/{ => tests}/testdata/sporttracksstrokedata.txt (100%) rename rowers/{ => tests}/testdata/sporttrackstestdata.txt (100%) rename rowers/{ => tests}/testdata/sporttrackstestnohr.txt (100%) rename rowers/{ => tests}/testdata/sporttracksworkouts.txt (100%) rename rowers/{ => tests}/testdata/stravadistancetestdata.txt (100%) rename rowers/{ => tests}/testdata/stravahrtestdata.txt (100%) rename rowers/{ => tests}/testdata/stravahrtestnodata.txt (100%) rename rowers/{ => tests}/testdata/stravalatlongtestdata.txt (100%) rename rowers/{ => tests}/testdata/stravapowertestdata.txt (100%) rename rowers/{ => tests}/testdata/stravaspmtestdata.txt (100%) rename rowers/{ => tests}/testdata/stravasummarytestdata.txt (100%) rename rowers/{ => tests}/testdata/stravatimetestdata.txt (100%) rename rowers/{ => tests}/testdata/stravavelotestdata.txt (100%) rename rowers/{ => tests}/testdata/stravaworkoutlist.txt (100%) rename rowers/{ => tests}/testdata/stravaworkoutsummary.txt (100%) rename rowers/{ => tests}/testdata/strokedata.txt (100%) rename rowers/{ => tests}/testdata/testdata.csv (100%) rename rowers/{ => tests}/testdata/testdata.csv.gz (100%) rename rowers/{ => tests}/testdata/testdatasummary.csv (100%) rename rowers/{ => tests}/testdata/testlapidx.csv (100%) rename rowers/{ => tests}/testdata/tim.csv (100%) rename rowers/{ => tests}/testdata/tpuploadresponse.txt (100%) rename rowers/{ => tests}/testdata/uapostworkoutresponse.txt (100%) rename rowers/{ => tests}/testdata/uastrokes.txt (100%) rename rowers/{ => tests}/testdata/uauser.txt (100%) rename rowers/{ => tests}/testdata/uaworkoutlist.txt (100%) rename rowers/{ => tests}/testdata/zipfile.zip (100%) rename rowers/{ => tests}/tests.py (94%) diff --git a/rowers/tests/__init__.py b/rowers/tests/__init__.py new file mode 100644 index 00000000..613de3e3 --- /dev/null +++ b/rowers/tests/__init__.py @@ -0,0 +1,21 @@ +pkg_mox = None + + +def setUpPackage(): + global pkg_mox + import urllib + import urllib2 + import mox + import requests + pkg_mox = mox.Mox() + pkg_mox.StubOutWithMock(requests.api.sessions.Session, 'send') + pkg_mox.StubOutWithMock(urllib.URLopener, 'open') + pkg_mox.StubOutWithMock(urllib2.OpenerDirector, 'open') + pkg_mox.ReplayAll() + + +def tearDownPackage(): + pkg_mox.VerifyAll() + pkg_mox.UnsetStubs() + +from tests import * diff --git a/rowers/testdata/2016-03-25-0758.CSV b/rowers/tests/testdata/2016-03-25-0758.CSV similarity index 100% rename from rowers/testdata/2016-03-25-0758.CSV rename to rowers/tests/testdata/2016-03-25-0758.CSV diff --git a/rowers/testdata/2016-03-25-0758_data.CSV b/rowers/tests/testdata/2016-03-25-0758_data.CSV similarity index 100% rename from rowers/testdata/2016-03-25-0758_data.CSV rename to rowers/tests/testdata/2016-03-25-0758_data.CSV diff --git a/rowers/testdata/2x20min_o.csv b/rowers/tests/testdata/2x20min_o.csv similarity index 100% rename from rowers/testdata/2x20min_o.csv rename to rowers/tests/testdata/2x20min_o.csv diff --git a/rowers/testdata/3km_cd_o.csv b/rowers/tests/testdata/3km_cd_o.csv similarity index 100% rename from rowers/testdata/3km_cd_o.csv rename to rowers/tests/testdata/3km_cd_o.csv diff --git a/rowers/testdata/3x250m.fit b/rowers/tests/testdata/3x250m.fit similarity index 100% rename from rowers/testdata/3x250m.fit rename to rowers/tests/testdata/3x250m.fit diff --git a/rowers/testdata/NoHR.tcx b/rowers/tests/testdata/NoHR.tcx similarity index 100% rename from rowers/testdata/NoHR.tcx rename to rowers/tests/testdata/NoHR.tcx diff --git a/rowers/testdata/RP_interval.csv b/rowers/tests/testdata/RP_interval.csv similarity index 100% rename from rowers/testdata/RP_interval.csv rename to rowers/tests/testdata/RP_interval.csv diff --git a/rowers/testdata/RP_interval.csv_o.CSV b/rowers/tests/testdata/RP_interval.csv_o.CSV similarity index 100% rename from rowers/testdata/RP_interval.csv_o.CSV rename to rowers/tests/testdata/RP_interval.csv_o.CSV diff --git a/rowers/testdata/RP_testdata.csv b/rowers/tests/testdata/RP_testdata.csv similarity index 100% rename from rowers/testdata/RP_testdata.csv rename to rowers/tests/testdata/RP_testdata.csv diff --git a/rowers/testdata/SpeedCoach GPS Workout.csv b/rowers/tests/testdata/SpeedCoach GPS Workout.csv similarity index 100% rename from rowers/testdata/SpeedCoach GPS Workout.csv rename to rowers/tests/testdata/SpeedCoach GPS Workout.csv diff --git a/rowers/testdata/SpeedCoach2Link_interval.csv b/rowers/tests/testdata/SpeedCoach2Link_interval.csv similarity index 100% rename from rowers/testdata/SpeedCoach2Link_interval.csv rename to rowers/tests/testdata/SpeedCoach2Link_interval.csv diff --git a/rowers/testdata/SpeedCoach2Linkv1.27.csv b/rowers/tests/testdata/SpeedCoach2Linkv1.27.csv similarity index 100% rename from rowers/testdata/SpeedCoach2Linkv1.27.csv rename to rowers/tests/testdata/SpeedCoach2Linkv1.27.csv diff --git a/rowers/testdata/Speedcoach2example.csv b/rowers/tests/testdata/Speedcoach2example.csv similarity index 100% rename from rowers/testdata/Speedcoach2example.csv rename to rowers/tests/testdata/Speedcoach2example.csv diff --git a/rowers/testdata/boatcoach.csv b/rowers/tests/testdata/boatcoach.csv similarity index 100% rename from rowers/testdata/boatcoach.csv rename to rowers/tests/testdata/boatcoach.csv diff --git a/rowers/testdata/c2jsonstrokedata.txt b/rowers/tests/testdata/c2jsonstrokedata.txt similarity index 100% rename from rowers/testdata/c2jsonstrokedata.txt rename to rowers/tests/testdata/c2jsonstrokedata.txt diff --git a/rowers/testdata/c2jsonworkoutdata.txt b/rowers/tests/testdata/c2jsonworkoutdata.txt similarity index 100% rename from rowers/testdata/c2jsonworkoutdata.txt rename to rowers/tests/testdata/c2jsonworkoutdata.txt diff --git a/rowers/testdata/c2strokedata.csv b/rowers/tests/testdata/c2strokedata.csv similarity index 100% rename from rowers/testdata/c2strokedata.csv rename to rowers/tests/testdata/c2strokedata.csv diff --git a/rowers/testdata/c2strokedatanohr.txt b/rowers/tests/testdata/c2strokedatanohr.txt similarity index 100% rename from rowers/testdata/c2strokedatanohr.txt rename to rowers/tests/testdata/c2strokedatanohr.txt diff --git a/rowers/testdata/c2stroketestdata.txt b/rowers/tests/testdata/c2stroketestdata.txt similarity index 100% rename from rowers/testdata/c2stroketestdata.txt rename to rowers/tests/testdata/c2stroketestdata.txt diff --git a/rowers/testdata/c2testdata.txt b/rowers/tests/testdata/c2testdata.txt similarity index 100% rename from rowers/testdata/c2testdata.txt rename to rowers/tests/testdata/c2testdata.txt diff --git a/rowers/testdata/c2workoutlist.txt b/rowers/tests/testdata/c2workoutlist.txt similarity index 100% rename from rowers/testdata/c2workoutlist.txt rename to rowers/tests/testdata/c2workoutlist.txt diff --git a/rowers/testdata/crewnerd_interval.csv b/rowers/tests/testdata/crewnerd_interval.csv similarity index 100% rename from rowers/testdata/crewnerd_interval.csv rename to rowers/tests/testdata/crewnerd_interval.csv diff --git a/rowers/testdata/crewnerddata.CSV b/rowers/tests/testdata/crewnerddata.CSV similarity index 100% rename from rowers/testdata/crewnerddata.CSV rename to rowers/tests/testdata/crewnerddata.CSV diff --git a/rowers/testdata/crewnerddata.tcx b/rowers/tests/testdata/crewnerddata.tcx similarity index 100% rename from rowers/testdata/crewnerddata.tcx rename to rowers/tests/testdata/crewnerddata.tcx diff --git a/rowers/testdata/crewnerddata_o.CSV b/rowers/tests/testdata/crewnerddata_o.CSV similarity index 100% rename from rowers/testdata/crewnerddata_o.CSV rename to rowers/tests/testdata/crewnerddata_o.CSV diff --git a/rowers/testdata/emails/NKEmporfromgreg.csv b/rowers/tests/testdata/emails/NKEmporfromgreg.csv similarity index 100% rename from rowers/testdata/emails/NKEmporfromgreg.csv rename to rowers/tests/testdata/emails/NKEmporfromgreg.csv diff --git a/rowers/testdata/emails/NKLiNKv130.csv b/rowers/tests/testdata/emails/NKLiNKv130.csv similarity index 100% rename from rowers/testdata/emails/NKLiNKv130.csv rename to rowers/tests/testdata/emails/NKLiNKv130.csv diff --git a/rowers/testdata/emails/NKLiNKv130.csv.gz b/rowers/tests/testdata/emails/NKLiNKv130.csv.gz similarity index 100% rename from rowers/testdata/emails/NKLiNKv130.csv.gz rename to rowers/tests/testdata/emails/NKLiNKv130.csv.gz diff --git a/rowers/testdata/emails/SpeedCoach2v2.12.csv b/rowers/tests/testdata/emails/SpeedCoach2v2.12.csv similarity index 100% rename from rowers/testdata/emails/SpeedCoach2v2.12.csv rename to rowers/tests/testdata/emails/SpeedCoach2v2.12.csv diff --git a/rowers/testdata/emails/boatcoach.csv.gz b/rowers/tests/testdata/emails/boatcoach.csv.gz similarity index 100% rename from rowers/testdata/emails/boatcoach.csv.gz rename to rowers/tests/testdata/emails/boatcoach.csv.gz diff --git a/rowers/testdata/emails/boatcoach_otw.csv b/rowers/tests/testdata/emails/boatcoach_otw.csv similarity index 100% rename from rowers/testdata/emails/boatcoach_otw.csv rename to rowers/tests/testdata/emails/boatcoach_otw.csv diff --git a/rowers/testdata/emails/colin.csv b/rowers/tests/testdata/emails/colin.csv similarity index 100% rename from rowers/testdata/emails/colin.csv rename to rowers/tests/testdata/emails/colin.csv diff --git a/rowers/testdata/emails/correctedpainsled.csv b/rowers/tests/testdata/emails/correctedpainsled.csv similarity index 100% rename from rowers/testdata/emails/correctedpainsled.csv rename to rowers/tests/testdata/emails/correctedpainsled.csv diff --git a/rowers/testdata/emails/coxmate.csv b/rowers/tests/testdata/emails/coxmate.csv similarity index 100% rename from rowers/testdata/emails/coxmate.csv rename to rowers/tests/testdata/emails/coxmate.csv diff --git a/rowers/testdata/emails/crewnerddata.tcx b/rowers/tests/testdata/emails/crewnerddata.tcx similarity index 100% rename from rowers/testdata/emails/crewnerddata.tcx rename to rowers/tests/testdata/emails/crewnerddata.tcx diff --git a/rowers/testdata/emails/crewnerddata_o.CSV b/rowers/tests/testdata/emails/crewnerddata_o.CSV similarity index 100% rename from rowers/testdata/emails/crewnerddata_o.CSV rename to rowers/tests/testdata/emails/crewnerddata_o.CSV diff --git a/rowers/testdata/emails/davidfit.fit b/rowers/tests/testdata/emails/davidfit.fit similarity index 100% rename from rowers/testdata/emails/davidfit.fit rename to rowers/tests/testdata/emails/davidfit.fit diff --git a/rowers/testdata/emails/ergdata_example.csv_o.CSV b/rowers/tests/testdata/emails/ergdata_example.csv_o.CSV similarity index 100% rename from rowers/testdata/emails/ergdata_example.csv_o.CSV rename to rowers/tests/testdata/emails/ergdata_example.csv_o.CSV diff --git a/rowers/testdata/emails/ergstick.csv_o.CSV b/rowers/tests/testdata/emails/ergstick.csv_o.CSV similarity index 100% rename from rowers/testdata/emails/ergstick.csv_o.CSV rename to rowers/tests/testdata/emails/ergstick.csv_o.CSV diff --git a/rowers/testdata/emails/example_data.csv b/rowers/tests/testdata/emails/example_data.csv similarity index 100% rename from rowers/testdata/emails/example_data.csv rename to rowers/tests/testdata/emails/example_data.csv diff --git a/rowers/testdata/emails/impeller_empower.csv b/rowers/tests/testdata/emails/impeller_empower.csv similarity index 100% rename from rowers/testdata/emails/impeller_empower.csv rename to rowers/tests/testdata/emails/impeller_empower.csv diff --git a/rowers/testdata/emails/kinomap.csv b/rowers/tests/testdata/emails/kinomap.csv similarity index 100% rename from rowers/testdata/emails/kinomap.csv rename to rowers/tests/testdata/emails/kinomap.csv diff --git a/rowers/testdata/emails/rowperfect.csv b/rowers/tests/testdata/emails/rowperfect.csv similarity index 100% rename from rowers/testdata/emails/rowperfect.csv rename to rowers/tests/testdata/emails/rowperfect.csv diff --git a/rowers/testdata/emails/rowpro5.csv b/rowers/tests/testdata/emails/rowpro5.csv similarity index 100% rename from rowers/testdata/emails/rowpro5.csv rename to rowers/tests/testdata/emails/rowpro5.csv diff --git a/rowers/testdata/emails/testdata.ZIP b/rowers/tests/testdata/emails/testdata.ZIP similarity index 100% rename from rowers/testdata/emails/testdata.ZIP rename to rowers/tests/testdata/emails/testdata.ZIP diff --git a/rowers/testdata/emails/testdata.csv b/rowers/tests/testdata/emails/testdata.csv similarity index 100% rename from rowers/testdata/emails/testdata.csv rename to rowers/tests/testdata/emails/testdata.csv diff --git a/rowers/testdata/emails/testdata.csv.gz b/rowers/tests/testdata/emails/testdata.csv.gz similarity index 100% rename from rowers/testdata/emails/testdata.csv.gz rename to rowers/tests/testdata/emails/testdata.csv.gz diff --git a/rowers/testdata/emails/testlapidx.csv b/rowers/tests/testdata/emails/testlapidx.csv similarity index 100% rename from rowers/testdata/emails/testlapidx.csv rename to rowers/tests/testdata/emails/testlapidx.csv diff --git a/rowers/testdata/emails/划船.csv b/rowers/tests/testdata/emails/划船.csv similarity index 100% rename from rowers/testdata/emails/划船.csv rename to rowers/tests/testdata/emails/划船.csv diff --git a/rowers/testdata/ergdata_example.csv b/rowers/tests/testdata/ergdata_example.csv similarity index 100% rename from rowers/testdata/ergdata_example.csv rename to rowers/tests/testdata/ergdata_example.csv diff --git a/rowers/testdata/ergdata_example.csv_o.CSV b/rowers/tests/testdata/ergdata_example.csv_o.CSV similarity index 100% rename from rowers/testdata/ergdata_example.csv_o.CSV rename to rowers/tests/testdata/ergdata_example.csv_o.CSV diff --git a/rowers/testdata/ergstick.csv b/rowers/tests/testdata/ergstick.csv similarity index 100% rename from rowers/testdata/ergstick.csv rename to rowers/tests/testdata/ergstick.csv diff --git a/rowers/testdata/ergstick.csv_o.CSV b/rowers/tests/testdata/ergstick.csv_o.CSV similarity index 100% rename from rowers/testdata/ergstick.csv_o.CSV rename to rowers/tests/testdata/ergstick.csv_o.CSV diff --git a/rowers/testdata/ergstick_o.csv b/rowers/tests/testdata/ergstick_o.csv similarity index 100% rename from rowers/testdata/ergstick_o.csv rename to rowers/tests/testdata/ergstick_o.csv diff --git a/rowers/testdata/example.csv b/rowers/tests/testdata/example.csv similarity index 100% rename from rowers/testdata/example.csv rename to rowers/tests/testdata/example.csv diff --git a/rowers/testdata/example_data.csv b/rowers/tests/testdata/example_data.csv similarity index 100% rename from rowers/testdata/example_data.csv rename to rowers/tests/testdata/example_data.csv diff --git a/rowers/testdata/faketcx.tcx b/rowers/tests/testdata/faketcx.tcx similarity index 100% rename from rowers/testdata/faketcx.tcx rename to rowers/tests/testdata/faketcx.tcx diff --git a/rowers/testdata/linkios.zip b/rowers/tests/testdata/linkios.zip similarity index 100% rename from rowers/testdata/linkios.zip rename to rowers/tests/testdata/linkios.zip diff --git a/rowers/testdata/logcard.csv b/rowers/tests/testdata/logcard.csv similarity index 100% rename from rowers/testdata/logcard.csv rename to rowers/tests/testdata/logcard.csv diff --git a/rowers/testdata/mystery.csv b/rowers/tests/testdata/mystery.csv similarity index 100% rename from rowers/testdata/mystery.csv rename to rowers/tests/testdata/mystery.csv diff --git a/rowers/testdata/painsled_desktop_example.csv b/rowers/tests/testdata/painsled_desktop_example.csv similarity index 100% rename from rowers/testdata/painsled_desktop_example.csv rename to rowers/tests/testdata/painsled_desktop_example.csv diff --git a/rowers/testdata/painsled_out_data.csv b/rowers/tests/testdata/painsled_out_data.csv similarity index 100% rename from rowers/testdata/painsled_out_data.csv rename to rowers/tests/testdata/painsled_out_data.csv diff --git a/rowers/testdata/painsled_to_csv_20160221-105218_erg-400150318_760465m.csv b/rowers/tests/testdata/painsled_to_csv_20160221-105218_erg-400150318_760465m.csv similarity index 100% rename from rowers/testdata/painsled_to_csv_20160221-105218_erg-400150318_760465m.csv rename to rowers/tests/testdata/painsled_to_csv_20160221-105218_erg-400150318_760465m.csv diff --git a/rowers/testdata/rkstrokes.txt b/rowers/tests/testdata/rkstrokes.txt similarity index 100% rename from rowers/testdata/rkstrokes.txt rename to rowers/tests/testdata/rkstrokes.txt diff --git a/rowers/testdata/rkworkoutslist.txt b/rowers/tests/testdata/rkworkoutslist.txt similarity index 100% rename from rowers/testdata/rkworkoutslist.txt rename to rowers/tests/testdata/rkworkoutslist.txt diff --git a/rowers/testdata/rowinginmotionexample.TCX b/rowers/tests/testdata/rowinginmotionexample.TCX similarity index 100% rename from rowers/testdata/rowinginmotionexample.TCX rename to rowers/tests/testdata/rowinginmotionexample.TCX diff --git a/rowers/testdata/rowinginmotionexample.TCX_o.CSV b/rowers/tests/testdata/rowinginmotionexample.TCX_o.CSV similarity index 100% rename from rowers/testdata/rowinginmotionexample.TCX_o.CSV rename to rowers/tests/testdata/rowinginmotionexample.TCX_o.CSV diff --git a/rowers/testdata/rowperfect.csv b/rowers/tests/testdata/rowperfect.csv similarity index 100% rename from rowers/testdata/rowperfect.csv rename to rowers/tests/testdata/rowperfect.csv diff --git a/rowers/testdata/rowpro5.csv b/rowers/tests/testdata/rowpro5.csv similarity index 100% rename from rowers/testdata/rowpro5.csv rename to rowers/tests/testdata/rowpro5.csv diff --git a/rowers/testdata/rp_out.csv b/rowers/tests/testdata/rp_out.csv similarity index 100% rename from rowers/testdata/rp_out.csv rename to rowers/tests/testdata/rp_out.csv diff --git a/rowers/testdata/sander.txt b/rowers/tests/testdata/sander.txt similarity index 100% rename from rowers/testdata/sander.txt rename to rowers/tests/testdata/sander.txt diff --git a/rowers/testdata/speedcoach2test2.csv b/rowers/tests/testdata/speedcoach2test2.csv similarity index 100% rename from rowers/testdata/speedcoach2test2.csv rename to rowers/tests/testdata/speedcoach2test2.csv diff --git a/rowers/testdata/speedcoach3test3.csv b/rowers/tests/testdata/speedcoach3test3.csv similarity index 100% rename from rowers/testdata/speedcoach3test3.csv rename to rowers/tests/testdata/speedcoach3test3.csv diff --git a/rowers/testdata/speedcoachexample.csv b/rowers/tests/testdata/speedcoachexample.csv similarity index 100% rename from rowers/testdata/speedcoachexample.csv rename to rowers/tests/testdata/speedcoachexample.csv diff --git a/rowers/testdata/speedcoachexample.csv_o.CSV b/rowers/tests/testdata/speedcoachexample.csv_o.CSV similarity index 100% rename from rowers/testdata/speedcoachexample.csv_o.CSV rename to rowers/tests/testdata/speedcoachexample.csv_o.CSV diff --git a/rowers/testdata/sporttracksstrokedata.txt b/rowers/tests/testdata/sporttracksstrokedata.txt similarity index 100% rename from rowers/testdata/sporttracksstrokedata.txt rename to rowers/tests/testdata/sporttracksstrokedata.txt diff --git a/rowers/testdata/sporttrackstestdata.txt b/rowers/tests/testdata/sporttrackstestdata.txt similarity index 100% rename from rowers/testdata/sporttrackstestdata.txt rename to rowers/tests/testdata/sporttrackstestdata.txt diff --git a/rowers/testdata/sporttrackstestnohr.txt b/rowers/tests/testdata/sporttrackstestnohr.txt similarity index 100% rename from rowers/testdata/sporttrackstestnohr.txt rename to rowers/tests/testdata/sporttrackstestnohr.txt diff --git a/rowers/testdata/sporttracksworkouts.txt b/rowers/tests/testdata/sporttracksworkouts.txt similarity index 100% rename from rowers/testdata/sporttracksworkouts.txt rename to rowers/tests/testdata/sporttracksworkouts.txt diff --git a/rowers/testdata/stravadistancetestdata.txt b/rowers/tests/testdata/stravadistancetestdata.txt similarity index 100% rename from rowers/testdata/stravadistancetestdata.txt rename to rowers/tests/testdata/stravadistancetestdata.txt diff --git a/rowers/testdata/stravahrtestdata.txt b/rowers/tests/testdata/stravahrtestdata.txt similarity index 100% rename from rowers/testdata/stravahrtestdata.txt rename to rowers/tests/testdata/stravahrtestdata.txt diff --git a/rowers/testdata/stravahrtestnodata.txt b/rowers/tests/testdata/stravahrtestnodata.txt similarity index 100% rename from rowers/testdata/stravahrtestnodata.txt rename to rowers/tests/testdata/stravahrtestnodata.txt diff --git a/rowers/testdata/stravalatlongtestdata.txt b/rowers/tests/testdata/stravalatlongtestdata.txt similarity index 100% rename from rowers/testdata/stravalatlongtestdata.txt rename to rowers/tests/testdata/stravalatlongtestdata.txt diff --git a/rowers/testdata/stravapowertestdata.txt b/rowers/tests/testdata/stravapowertestdata.txt similarity index 100% rename from rowers/testdata/stravapowertestdata.txt rename to rowers/tests/testdata/stravapowertestdata.txt diff --git a/rowers/testdata/stravaspmtestdata.txt b/rowers/tests/testdata/stravaspmtestdata.txt similarity index 100% rename from rowers/testdata/stravaspmtestdata.txt rename to rowers/tests/testdata/stravaspmtestdata.txt diff --git a/rowers/testdata/stravasummarytestdata.txt b/rowers/tests/testdata/stravasummarytestdata.txt similarity index 100% rename from rowers/testdata/stravasummarytestdata.txt rename to rowers/tests/testdata/stravasummarytestdata.txt diff --git a/rowers/testdata/stravatimetestdata.txt b/rowers/tests/testdata/stravatimetestdata.txt similarity index 100% rename from rowers/testdata/stravatimetestdata.txt rename to rowers/tests/testdata/stravatimetestdata.txt diff --git a/rowers/testdata/stravavelotestdata.txt b/rowers/tests/testdata/stravavelotestdata.txt similarity index 100% rename from rowers/testdata/stravavelotestdata.txt rename to rowers/tests/testdata/stravavelotestdata.txt diff --git a/rowers/testdata/stravaworkoutlist.txt b/rowers/tests/testdata/stravaworkoutlist.txt similarity index 100% rename from rowers/testdata/stravaworkoutlist.txt rename to rowers/tests/testdata/stravaworkoutlist.txt diff --git a/rowers/testdata/stravaworkoutsummary.txt b/rowers/tests/testdata/stravaworkoutsummary.txt similarity index 100% rename from rowers/testdata/stravaworkoutsummary.txt rename to rowers/tests/testdata/stravaworkoutsummary.txt diff --git a/rowers/testdata/strokedata.txt b/rowers/tests/testdata/strokedata.txt similarity index 100% rename from rowers/testdata/strokedata.txt rename to rowers/tests/testdata/strokedata.txt diff --git a/rowers/testdata/testdata.csv b/rowers/tests/testdata/testdata.csv similarity index 100% rename from rowers/testdata/testdata.csv rename to rowers/tests/testdata/testdata.csv diff --git a/rowers/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz similarity index 100% rename from rowers/testdata/testdata.csv.gz rename to rowers/tests/testdata/testdata.csv.gz diff --git a/rowers/testdata/testdatasummary.csv b/rowers/tests/testdata/testdatasummary.csv similarity index 100% rename from rowers/testdata/testdatasummary.csv rename to rowers/tests/testdata/testdatasummary.csv diff --git a/rowers/testdata/testlapidx.csv b/rowers/tests/testdata/testlapidx.csv similarity index 100% rename from rowers/testdata/testlapidx.csv rename to rowers/tests/testdata/testlapidx.csv diff --git a/rowers/testdata/tim.csv b/rowers/tests/testdata/tim.csv similarity index 100% rename from rowers/testdata/tim.csv rename to rowers/tests/testdata/tim.csv diff --git a/rowers/testdata/tpuploadresponse.txt b/rowers/tests/testdata/tpuploadresponse.txt similarity index 100% rename from rowers/testdata/tpuploadresponse.txt rename to rowers/tests/testdata/tpuploadresponse.txt diff --git a/rowers/testdata/uapostworkoutresponse.txt b/rowers/tests/testdata/uapostworkoutresponse.txt similarity index 100% rename from rowers/testdata/uapostworkoutresponse.txt rename to rowers/tests/testdata/uapostworkoutresponse.txt diff --git a/rowers/testdata/uastrokes.txt b/rowers/tests/testdata/uastrokes.txt similarity index 100% rename from rowers/testdata/uastrokes.txt rename to rowers/tests/testdata/uastrokes.txt diff --git a/rowers/testdata/uauser.txt b/rowers/tests/testdata/uauser.txt similarity index 100% rename from rowers/testdata/uauser.txt rename to rowers/tests/testdata/uauser.txt diff --git a/rowers/testdata/uaworkoutlist.txt b/rowers/tests/testdata/uaworkoutlist.txt similarity index 100% rename from rowers/testdata/uaworkoutlist.txt rename to rowers/tests/testdata/uaworkoutlist.txt diff --git a/rowers/testdata/zipfile.zip b/rowers/tests/testdata/zipfile.zip similarity index 100% rename from rowers/testdata/zipfile.zip rename to rowers/tests/testdata/zipfile.zip diff --git a/rowers/tests.py b/rowers/tests/tests.py similarity index 94% rename from rowers/tests.py rename to rowers/tests/tests.py index c787627a..43ba5ceb 100644 --- a/rowers/tests.py +++ b/rowers/tests/tests.py @@ -6,7 +6,7 @@ from django.test import TestCase, Client,override_settings from django.core.management import call_command from django.utils.six import StringIO from django.test.client import RequestFactory -from .views import checkworkoutuser,c2_open +from rowers.views import checkworkoutuser,c2_open from rowers.models import Workout, User, Rower, WorkoutForm,RowerForm,GraphImage from rowers.forms import DocumentsForm,CNsummaryForm,RegistrationFormUniqueEmail import rowers.plots as plots @@ -35,7 +35,7 @@ import numpy as np from rowers import urls from rowers.views import error500_view,error404_view,error400_view,error403_view -from dataprep import delete_strokedata +from rowers.dataprep import delete_strokedata from redis import StrictRedis redis_connection = StrictRedis() @@ -54,17 +54,17 @@ class DjangoTestCase(TestCase, MockTestCase): # to be done add polar mocks (for email processing) def mocked_requests(*args, **kwargs): - with open('rowers/testdata/c2jsonworkoutdata.txt','r') as infile: + with open('rowers/tests/testdata/c2jsonworkoutdata.txt','r') as infile: c2workoutdata = json.load(infile) - with open('rowers/testdata/c2jsonstrokedata.txt','r') as infile: + with open('rowers/tests/testdata/c2jsonstrokedata.txt','r') as infile: c2strokedata = json.load(infile) polar_json = { 'available-user-data': [] } - c2workoutlist = json.load(open('rowers/testdata/c2workoutlist.txt')) + c2workoutlist = json.load(open('rowers/tests/testdata/c2workoutlist.txt')) c2uploadjson = { "data": { @@ -85,27 +85,27 @@ def mocked_requests(*args, **kwargs): } } - stravaworkoutlist = json.load(open('rowers/testdata/stravaworkoutlist.txt')) - sporttracksworkoutlist = json.load(open('rowers/testdata/sporttracksworkouts.txt')) + stravaworkoutlist = json.load(open('rowers/tests/testdata/stravaworkoutlist.txt')) + sporttracksworkoutlist = json.load(open('rowers/tests/testdata/sporttracksworkouts.txt')) - rkworkoutlistjson = json.load(open('rowers/testdata/rkworkoutslist.txt','r')) - uaworkoutlistjson = json.load(open('rowers/testdata/uaworkoutlist.txt','r')) + rkworkoutlistjson = json.load(open('rowers/tests/testdata/rkworkoutslist.txt','r')) + uaworkoutlistjson = json.load(open('rowers/tests/testdata/uaworkoutlist.txt','r')) - stravasummaryjson = json.load(open('rowers/testdata/stravaworkoutsummary.txt','r')) + stravasummaryjson = json.load(open('rowers/tests/testdata/stravaworkoutsummary.txt','r')) - stravatimejson = json.load(open('rowers/testdata/stravatimetestdata.txt','r')) - stravavelojson = json.load(open('rowers/testdata/stravavelotestdata.txt','r')) + stravatimejson = json.load(open('rowers/tests/testdata/stravatimetestdata.txt','r')) + stravavelojson = json.load(open('rowers/tests/testdata/stravavelotestdata.txt','r')) - stravapowerjson = json.load(open('rowers/testdata/stravapowertestdata.txt','r')) + stravapowerjson = json.load(open('rowers/tests/testdata/stravapowertestdata.txt','r')) - stravadistancejson = json.load(open('rowers/testdata/stravadistancetestdata.txt','r')) - stravalatlongjson = json.load(open('rowers/testdata/stravalatlongtestdata.txt','r')) - stravahrjson = json.load(open('rowers/testdata/stravahrtestdata.txt','r')) - stravaspmjson = json.load(open('rowers/testdata/stravaspmtestdata.txt','r')) + stravadistancejson = json.load(open('rowers/tests/testdata/stravadistancetestdata.txt','r')) + stravalatlongjson = json.load(open('rowers/tests/testdata/stravalatlongtestdata.txt','r')) + stravahrjson = json.load(open('rowers/tests/testdata/stravahrtestdata.txt','r')) + stravaspmjson = json.load(open('rowers/tests/testdata/stravaspmtestdata.txt','r')) - uapostworkoutjson = json.load(open('rowers/testdata/uapostworkoutresponse.txt','r')) + uapostworkoutjson = json.load(open('rowers/tests/testdata/uapostworkoutresponse.txt','r')) - tpuploadresponse = json.load(open('rowers/testdata/tpuploadresponse.txt','r')) + tpuploadresponse = json.load(open('rowers/tests/testdata/tpuploadresponse.txt','r')) stravastreamjson = { 'time':stravatimejson, @@ -117,12 +117,12 @@ def mocked_requests(*args, **kwargs): 'power':stravapowerjson, } - ststrokesjson = json.load(open('rowers/testdata/sporttracksstrokedata.txt','r')) + ststrokesjson = json.load(open('rowers/tests/testdata/sporttracksstrokedata.txt','r')) - rkstrokesjson = json.load(open('rowers/testdata/rkstrokes.txt','r')) + rkstrokesjson = json.load(open('rowers/tests/testdata/rkstrokes.txt','r')) - uastrokesjson = json.load(open('rowers/testdata/uastrokes.txt','r')) - uauserjson = json.load(open('rowers/testdata/uauser.txt','r')) + uastrokesjson = json.load(open('rowers/tests/testdata/uastrokes.txt','r')) + uauserjson = json.load(open('rowers/tests/testdata/uauser.txt','r')) class MockResponse: def __init__(self, json_data, status_code): @@ -399,7 +399,7 @@ class C2Objects(DjangoTestCase): self.nu = datetime.datetime.now() - filename = 'rowers/testdata/testdata.csv' + filename = 'rowers/tests/testdata/testdata.csv' rr = rrower(hrmax=self.r.max,hrut2=self.r.ut2, hrut1=self.r.ut1,hrat=self.r.at, @@ -478,12 +478,12 @@ class C2Objects(DjangoTestCase): def test_strokedata(self): - with open('rowers/testdata/c2stroketestdata.txt','r') as infile: + with open('rowers/tests/testdata/c2stroketestdata.txt','r') as infile: res = json.load(infile) strokedata = pd.DataFrame.from_dict(res['data']) - with open('rowers/testdata/c2testdata.txt','r') as infile: + with open('rowers/tests/testdata/c2testdata.txt','r') as infile: res = json.load(infile) data = res['data'] @@ -493,12 +493,12 @@ class C2Objects(DjangoTestCase): res = add_workout_from_strokedata(self.u,1,data,strokedata,source='c2') def test_strokedatanohr(self): - with open('rowers/testdata/c2strokedatanohr.txt','r') as infile: + with open('rowers/tests/testdata/c2strokedatanohr.txt','r') as infile: res = json.load(infile) strokedata = pd.DataFrame.from_dict(res['data']) - with open('rowers/testdata/c2testdata.txt','r') as infile: + with open('rowers/tests/testdata/c2testdata.txt','r') as infile: res = json.load(infile) data = res['data'] @@ -571,7 +571,7 @@ class STObjects(DjangoTestCase): self.nu = datetime.datetime.now() - filename = 'rowers/testdata/testdata.csv' + filename = 'rowers/tests/testdata/testdata.csv' rr = rrower(hrmax=self.r.max,hrut2=self.r.ut2, hrut1=self.r.ut1,hrat=self.r.at, @@ -647,7 +647,7 @@ class STObjects(DjangoTestCase): self.assertEqual(response.status_code, 200) def test_strokedata(self): - with open('rowers/testdata/sporttrackstestdata.txt','r') as infile: + with open('rowers/tests/testdata/sporttrackstestdata.txt','r') as infile: data = json.load(infile) from rowers.sporttracksstuff import add_workout_from_data @@ -655,7 +655,7 @@ class STObjects(DjangoTestCase): res = add_workout_from_data(self.u,1,data,data) def test_strokedatanohr(self): - with open('rowers/testdata/sporttrackstestnohr.txt','r') as infile: + with open('rowers/tests/testdata/sporttrackstestnohr.txt','r') as infile: data = json.load(infile) from rowers.sporttracksstuff import add_workout_from_data @@ -687,7 +687,7 @@ class RunKeeperObjects(DjangoTestCase): self.nu = datetime.datetime.now() - filename = 'rowers/testdata/testdata.csv' + filename = 'rowers/tests/testdata/testdata.csv' rr = rrower(hrmax=self.r.max,hrut2=self.r.ut2, hrut1=self.r.ut1,hrat=self.r.at, @@ -779,7 +779,7 @@ class UAObjects(DjangoTestCase): self.nu = datetime.datetime.now() - filename = 'rowers/testdata/testdata.csv' + filename = 'rowers/tests/testdata/testdata.csv' rr = rrower(hrmax=self.r.max,hrut2=self.r.ut2, hrut1=self.r.ut1,hrat=self.r.at, @@ -879,7 +879,7 @@ class TPObjects(DjangoTestCase): self.nu = datetime.datetime.now() - filename = 'rowers/testdata/testdata.csv' + filename = 'rowers/tests/testdata/testdata.csv' rr = rrower(hrmax=self.r.max,hrut2=self.r.ut2, hrut1=self.r.ut1,hrat=self.r.at, @@ -1022,7 +1022,7 @@ boattype: 2x """) m.save() a2 = 'media/mailbox_attachments/'+filename - copyfile('rowers/testdata/'+filename,a2) + copyfile('rowers/tests/testdata/'+filename,a2) a = MessageAttachment(message=m,document=a2[6:]) a.save() @@ -1062,7 +1062,7 @@ workout run """) m.save() a2 = 'media/mailbox_attachments/colin2.csv' - copyfile('rowers/testdata/emails/colin.csv',a2) + copyfile('rowers/tests/testdata/emails/colin.csv',a2) a = MessageAttachment(message=m,document=a2[6:]) a.save() @@ -1098,7 +1098,7 @@ class EmailTests(TestCase): failbox = Mailbox.objects.create(name='Failed') failbox.save() - for filename in os.listdir(u'rowers/testdata/emails'): + for filename in os.listdir(u'rowers/tests/testdata/emails'): m = Message(mailbox=workoutsbox, from_header = u.email, subject = filename, @@ -1110,7 +1110,7 @@ boattype: 4x """) m.save() a2 = 'media/mailbox_attachments/'+filename - copyfile(u'rowers/testdata/emails/'+filename,a2) + copyfile(u'rowers/tests/testdata/emails/'+filename,a2) a = MessageAttachment(message=m,document=a2[6:]) a.save() @@ -1122,7 +1122,7 @@ workout water """) m.save() a2 = 'media/mailbox_attachments/colin2.csv' - copyfile('rowers/testdata/emails/colin.csv',a2) + copyfile('rowers/tests/testdata/emails/colin.csv',a2) a = MessageAttachment(message=m,document=a2[6:]) a.save() @@ -1298,7 +1298,7 @@ class DataTest(TestCase): self.assertFalse(form.is_valid()) def test_painsled(self): - filename = 'rowers/testdata/testdata.csv' + filename = 'rowers/tests/testdata/testdata.csv' f = open(filename,'rb') file_data = {'file': SimpleUploadedFile(f.name, f.read())} form_data = { @@ -1394,7 +1394,7 @@ class ViewTest(TestCase): def test_upload_view_sled(self): self.c.login(username='john',password='koeinsloot') - filename = 'rowers/testdata/testdata.csv' + filename = 'rowers/tests/testdata/testdata.csv' f = open(filename,'rb') file_data = {'file': f} form_data = { @@ -1467,7 +1467,7 @@ class ViewTest(TestCase): def test_upload_view_sled_negativetime(self): self.c.login(username='john',password='koeinsloot') - filename = 'rowers/testdata/tim.csv' + filename = 'rowers/tests/testdata/tim.csv' f = open(filename,'rb') file_data = {'file': f} form_data = { @@ -1512,7 +1512,7 @@ class ViewTest(TestCase): def test_upload_view_sled_noname(self): self.c.login(username='john',password='koeinsloot') - filename = 'rowers/testdata/testdata.csv' + filename = 'rowers/tests/testdata/testdata.csv' f = open(filename,'rb') file_data = {'file': f} form_data = { @@ -1544,7 +1544,7 @@ class ViewTest(TestCase): def test_upload_view_logcard(self): self.c.login(username='john',password='koeinsloot') - filename = 'rowers/testdata/logcard.csv' + filename = 'rowers/tests/testdata/logcard.csv' f = open(filename,'rb') file_data = {'file': f} form_data = { @@ -1576,7 +1576,7 @@ class ViewTest(TestCase): def test_upload_view_TCX_CN(self): self.c.login(username='john',password='koeinsloot') - filename = 'rowers/testdata/crewnerddata.tcx' + filename = 'rowers/tests/testdata/crewnerddata.tcx' f = open(filename,'rb') file_data = {'file': f} @@ -1600,7 +1600,7 @@ class ViewTest(TestCase): self.assertEqual(response.status_code, 200) - filename = 'rowers/testdata/crewnerddata.CSV' + filename = 'rowers/tests/testdata/crewnerddata.CSV' f = open(filename,'rb') file_data = {'file': f} form_data = {} @@ -1620,7 +1620,7 @@ class ViewTest(TestCase): def test_upload_view_TCX_SpeedCoach2a(self): self.c.login(username='john',password='koeinsloot') - filename = 'rowers/testdata/Speedcoach2example.csv' + filename = 'rowers/tests/testdata/Speedcoach2example.csv' f = open(filename,'rb') file_data = {'file': f} @@ -1651,7 +1651,7 @@ class ViewTest(TestCase): def test_upload_view_TCX_SpeedCoach2b(self): self.c.login(username='john',password='koeinsloot') - filename = 'rowers/testdata/Speedcoach2example.csv' + filename = 'rowers/tests/testdata/Speedcoach2example.csv' f = open(filename,'rb') file_data = {'file': f} @@ -1684,7 +1684,7 @@ class ViewTest(TestCase): def test_upload_view_TCX_SpeedCoach2c(self): self.c.login(username='john',password='koeinsloot') - filename = 'rowers/testdata/speedcoach3test3.csv' + filename = 'rowers/tests/testdata/speedcoach3test3.csv' f = open(filename,'rb') file_data = {'file': f} @@ -1715,7 +1715,7 @@ class ViewTest(TestCase): def test_upload_view_SpeedCoach2v127(self): self.c.login(username='john',password='koeinsloot') - filename = 'rowers/testdata/SpeedCoach2Linkv1.27.csv' + filename = 'rowers/tests/testdata/SpeedCoach2Linkv1.27.csv' f = open(filename,'rb') file_data = {'file': f} @@ -1747,7 +1747,7 @@ class ViewTest(TestCase): def test_upload_view_SpeedCoach2v127intervals(self): self.c.login(username='john',password='koeinsloot') - filename = 'rowers/testdata/SpeedCoach2Link_interval.csv' + filename = 'rowers/tests/testdata/SpeedCoach2Link_interval.csv' f = open(filename,'rb') file_data = {'file': f} @@ -1779,7 +1779,7 @@ class ViewTest(TestCase): def test_upload_view_TCX_NoHR(self): self.c.login(username='john',password='koeinsloot') - filename = 'rowers/testdata/NoHR.tcx' + filename = 'rowers/tests/testdata/NoHR.tcx' f = open(filename,'rb') file_data = {'file': f} @@ -1810,7 +1810,7 @@ class ViewTest(TestCase): def test_upload_view_TCX_CN(self): self.c.login(username='john',password='koeinsloot') - filename = 'rowers/testdata/rowinginmotionexample.tcx' + filename = 'rowers/tests/testdata/rowinginmotionexample.tcx' f = open(filename,'rb') file_data = {'file': f} form_data = { @@ -1838,7 +1838,7 @@ class ViewTest(TestCase): def test_upload_view_RP(self): self.c.login(username='john',password='koeinsloot') - filename = 'rowers/testdata/RP_testdata.csv' + filename = 'rowers/tests/testdata/RP_testdata.csv' f = open(filename,'rb') file_data = {'file': f} form_data = { @@ -1866,7 +1866,7 @@ class ViewTest(TestCase): def test_upload_view_Mystery(self): self.c.login(username='john',password='koeinsloot') - filename = 'rowers/testdata/mystery.csv' + filename = 'rowers/tests/testdata/mystery.csv' f = open(filename,'rb') file_data = {'file': f} form_data = { @@ -1894,7 +1894,7 @@ class ViewTest(TestCase): def test_upload_view_RP_interval(self): self.c.login(username='john',password='koeinsloot') - filename = 'rowers/testdata/RP_interval.csv' + filename = 'rowers/tests/testdata/RP_interval.csv' f = open(filename,'rb') file_data = {'file': f} form_data = { @@ -1923,7 +1923,7 @@ class ViewTest(TestCase): def test_upload_view_sled_desktop(self): self.c.login(username='john',password='koeinsloot') - filename = 'rowers/testdata/painsled_desktop_example.csv' + filename = 'rowers/tests/testdata/painsled_desktop_example.csv' f = open(filename,'rb') file_data = {'file': f} form_data = { @@ -1951,7 +1951,7 @@ class ViewTest(TestCase): def test_upload_view_sled_ergdata(self): self.c.login(username='john',password='koeinsloot') - filename = 'rowers/testdata/ergdata_example.csv' + filename = 'rowers/tests/testdata/ergdata_example.csv' f = open(filename,'rb') file_data = {'file': f} form_data = { @@ -1979,7 +1979,7 @@ class ViewTest(TestCase): def test_upload_view_sled_boatcoach(self): self.c.login(username='john',password='koeinsloot') - filename = 'rowers/testdata/boatcoach.csv' + filename = 'rowers/tests/testdata/boatcoach.csv' f = open(filename,'rb') file_data = {'file': f} form_data = { @@ -2007,7 +2007,7 @@ class ViewTest(TestCase): def test_upload_view_sled_ergstick(self): self.c.login(username='john',password='koeinsloot') - filename = 'rowers/testdata/ergstick.csv' + filename = 'rowers/tests/testdata/ergstick.csv' f = open(filename,'rb') file_data = {'file': f} form_data = { @@ -2036,7 +2036,7 @@ class ViewTest(TestCase): # def test_upload_view_FIT_SpeedCoach2a(self): # self.c.login(username='john',password='koeinsloot') -# filename = 'rowers/testdata/3x250m.fit' +# filename = 'rowers/tests/testdata/3x250m.fit' # with open(filename,'rb') as f: # file_data = {'file': f} @@ -2079,7 +2079,7 @@ class URLTests(TestCase): self.c.login(username='john',password='koeinsloot') self.nu = datetime.datetime.now() - filename = 'rowers/testdata/testdata.csv' + filename = 'rowers/tests/testdata/testdata.csv' self.wotw = Workout.objects.create(name='testworkout', workouttype='water', user=r,date=self.nu.strftime('%Y-%m-%d'), @@ -2321,7 +2321,7 @@ class subroutinetests(TestCase): 'koeinsloot') r = Rower.objects.create(user=u) nu = datetime.datetime.now() - filename = 'rowers/testdata/testdata.csv' + filename = 'rowers/tests/testdata/testdata.csv' self.w = Workout.objects.create(name='testworkout', workouttype='water', user=r,date=nu.strftime('%Y-%m-%d'), @@ -2346,7 +2346,7 @@ class PlotTests(TestCase): 'koeinsloot') r = Rower.objects.create(user=u) self.nu = datetime.datetime.now() - filename = 'rowers/testdata/testdata.csv' + filename = 'rowers/tests/testdata/testdata.csv' self.wotw = Workout.objects.create(name='testworkout', workouttype='water', user=r,date=self.nu.strftime('%Y-%m-%d'),