@@ -18,10 +18,9 @@ def get_user(self):
1818 return User .objects .get (pk = 1 )
1919
2020 def create_event (self , title = "Event title" ,
21- start_date = datetime .datetime .now () + datetime .timedelta (days = 0 , hours = 3 ),
22- end_date = datetime .datetime .now () + datetime .timedelta (days = 1 , hours = 3 ),
23- country_code = "SI" ,
24- status = "PENDING" ):
21+ start_date = datetime .datetime .now () + datetime .timedelta (days = 0 , hours = 3 ),
22+ end_date = datetime .datetime .now () + datetime .timedelta (days = 1 , hours = 3 ),
23+ country_code = "SI" , status = "PENDING" ):
2524
2625 event_data = {
2726 "end_date" : start_date ,
@@ -44,19 +43,19 @@ def setUp(self):
4443 self .up1 = UserProfile .objects .create (user = self .u1 )
4544
4645 Event .objects .create (organizer = "asdasd" ,
47- creator = User .objects .filter (pk = 1 )[0 ],
48- title = "asdasd" ,
49- description = "asdsad" ,
50- location = "asdsad" ,
51- start_date = datetime .datetime .now (),
52- end_date = datetime .datetime .now (),
53- event_url = "http://eee.com" ,
54- contact_person = "[email protected] " ,
55- country = "SI" ,
56- audience = [1 ],
57- theme = [1 ],
58- pub_date = datetime .datetime .now (),
59- tags = ["tag1" , "tag2" ])
46+ creator = User .objects .filter (pk = 1 )[0 ],
47+ title = "asdasd" ,
48+ description = "asdsad" ,
49+ location = "asdsad" ,
50+ start_date = datetime .datetime .now (),
51+ end_date = datetime .datetime .now (),
52+ event_url = "http://eee.com" ,
53+ contact_person = "[email protected] " ,
54+ country = "SI" ,
55+ audience = [1 ],
56+ theme = [1 ],
57+ pub_date = datetime .datetime .now (),
58+ tags = ["tag1" , "tag2" ])
6059
6160 def test_get_event (self ):
6261 test_event = Event .objects .get (title = "asdasd" )
@@ -134,15 +133,15 @@ def test_get_approved_event_without_filter_returns_zero(self):
134133
135134 def test_get_approved_event_without_filter_with_pending_event (self ):
136135 self .create_event (start_date = datetime .datetime .now () + datetime .timedelta (days = 0 , hours = 3 ),
137- end_date = datetime .datetime .now () + datetime .timedelta (days = 1 , hours = 3 ),
138- status = "APPROVED" ,)
136+ end_date = datetime .datetime .now () + datetime .timedelta (days = 1 , hours = 3 ),
137+ status = "APPROVED" ,)
139138 events = get_approved_events ()
140139 self .assertEqual (1 , len (events ))
141140
142141 def test_get_approved_event_without_filter_with_approved_event_but_passed_date (self ):
143142 self .create_event (start_date = datetime .datetime .now () - datetime .timedelta (days = 1 , hours = 3 ),
144- end_date = datetime .datetime .now () - datetime .timedelta (days = 2 , hours = 3 ),
145- status = "APPROVED" )
143+ end_date = datetime .datetime .now () - datetime .timedelta (days = 2 , hours = 3 ),
144+ status = "APPROVED" )
146145 events = get_approved_events ()
147146 self .assertEqual (0 , len (events ))
148147
@@ -156,8 +155,8 @@ def test_get_approved_event_with_filter_country_code_and_order_with_approved_eve
156155 countries = ["IS" , "DK" , "FI" , "FI" , "LI" ]
157156 for index , country in enumerate (countries ):
158157 self .create_event (title = "Testing event" + str (index + 1 ), country_code = country , status = "APPROVED" ,
159- start_date = datetime .datetime .now () + datetime .timedelta (days = 0 , hours = index + 1 ),
160- end_date = datetime .datetime .now () + datetime .timedelta (days = 1 , hours = index + 1 ))
158+ start_date = datetime .datetime .now () + datetime .timedelta (days = 0 , hours = index + 1 ),
159+ end_date = datetime .datetime .now () + datetime .timedelta (days = 1 , hours = index + 1 ))
161160
162161 events = get_approved_events (order = "start_date" )
163162 self .assertEqual (5 , len (events ))
@@ -171,8 +170,8 @@ def test_get_approved_event_with_filter_country_code_and_order_and_limit__with_a
171170 countries = ["IS" , "DK" , "FI" , "FI" , "FI" ]
172171 for index , country in enumerate (countries ):
173172 self .create_event (title = "Testing event" + str (index + 1 ), country_code = country , status = "APPROVED" ,
174- start_date = datetime .datetime .now () + datetime .timedelta (days = 0 , hours = index + 1 ),
175- end_date = datetime .datetime .now () + datetime .timedelta (days = 1 , hours = index + 1 ))
173+ start_date = datetime .datetime .now () + datetime .timedelta (days = 0 , hours = index + 1 ),
174+ end_date = datetime .datetime .now () + datetime .timedelta (days = 1 , hours = index + 1 ))
176175
177176 events = get_approved_events (order = "start_date" , limit = 2 , country_code = "FI" )
178177 self .assertEqual (2 , len (events ))
0 commit comments