Skip to content

Commit

Permalink
#99 don't use instance variables, if not needed
Browse files Browse the repository at this point in the history
  • Loading branch information
Sh4kE committed Dec 10, 2016
1 parent d2817e6 commit d1d8378
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 27 deletions.
20 changes: 10 additions & 10 deletions core/tests/unit/views/test_ofm_stadium_detail_view.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,28 +7,28 @@

class OFMStadiumDetailsViewTestCase(TestCase):
def setUp(self):
self.matchday = MatchdayFactory.create()
self.second_matchday = MatchdayFactory.create(number=1)
self.user1 = OFMUser.objects.create_user(
MatchdayFactory.create()
MatchdayFactory.create(number=1)
user1 = OFMUser.objects.create_user(
username='alice',
email='[email protected]',
password='alice',
ofm_username='alice',
ofm_password='alice'
)
self.user2 = OFMUser.objects.create_user(
OFMUser.objects.create_user(
username='bob',
email='[email protected]',
password='bob',
ofm_username='bob',
ofm_password='bob'
)
self.match = MatchFactory.create(user=self.user1)
self.stadium_stat = MatchStadiumStatisticsFactory.create(match=self.match)
self.north_stand_stat = StadiumStandStatisticsFactory.create(stadium_statistics=self.stadium_stat, sector='N')
self.south_stand_stat = StadiumStandStatisticsFactory.create(stadium_statistics=self.stadium_stat, sector='S')
self.west_stand_stat = StadiumStandStatisticsFactory.create(stadium_statistics=self.stadium_stat, sector='W')
self.east_stand_stat = StadiumStandStatisticsFactory.create(stadium_statistics=self.stadium_stat, sector='O')
match = MatchFactory.create(user=user1)
self.stadium_stat = MatchStadiumStatisticsFactory.create(match=match)
StadiumStandStatisticsFactory.create(stadium_statistics=self.stadium_stat, sector='N')
StadiumStandStatisticsFactory.create(stadium_statistics=self.stadium_stat, sector='S')
StadiumStandStatisticsFactory.create(stadium_statistics=self.stadium_stat, sector='W')
StadiumStandStatisticsFactory.create(stadium_statistics=self.stadium_stat, sector='O')
self.client.login(username='alice', password='alice')

def test_user_can_see_his_data(self):
Expand Down
18 changes: 9 additions & 9 deletions core/tests/unit/views/test_ofm_stadium_stand_statistics_view.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,27 +10,27 @@

class OFMStadiumStandStatisticsViewTestCase(TestCase):
def setUp(self):
self.matchday = MatchdayFactory.create()
self.user1 = OFMUser.objects.create_user(
MatchdayFactory.create()
user1 = OFMUser.objects.create_user(
username='alice',
email='[email protected]',
password='alice',
ofm_username='alice',
ofm_password='alice'
)
self.user2 = OFMUser.objects.create_user(
OFMUser.objects.create_user(
username='bob',
email='[email protected]',
password='bob',
ofm_username='bob',
ofm_password='bob'
)
self.match = MatchFactory.create(user=self.user1)
self.stadium_stat = MatchStadiumStatisticsFactory.create(match=self.match)
self.north_stand_stat = StadiumStandStatisticsFactory.create(stadium_statistics=self.stadium_stat, sector='N')
self.south_stand_stat = StadiumStandStatisticsFactory.create(stadium_statistics=self.stadium_stat, sector='S')
self.west_stand_stat = StadiumStandStatisticsFactory.create(stadium_statistics=self.stadium_stat, sector='W')
self.east_stand_stat = StadiumStandStatisticsFactory.create(stadium_statistics=self.stadium_stat, sector='O')
match = MatchFactory.create(user=user1)
stadium_stat = MatchStadiumStatisticsFactory.create(match=match)
StadiumStandStatisticsFactory.create(stadium_statistics=stadium_stat, sector='N')
StadiumStandStatisticsFactory.create(stadium_statistics=stadium_stat, sector='S')
StadiumStandStatisticsFactory.create(stadium_statistics=stadium_stat, sector='W')
StadiumStandStatisticsFactory.create(stadium_statistics=stadium_stat, sector='O')
self.client.login(username='alice', password='alice')

def test_user_can_see_his_data(self):
Expand Down
16 changes: 8 additions & 8 deletions core/tests/unit/views/test_ofm_stadium_statistics_view.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ def setUp(self):
self.match = MatchFactory.create(user=self.user)

self.stadium_stat = MatchStadiumStatisticsFactory.create(match=self.match)
self.north_stand_stat = StadiumStandStatisticsFactory.create(stadium_statistics=self.stadium_stat, sector='N')
self.south_stand_stat = StadiumStandStatisticsFactory.create(stadium_statistics=self.stadium_stat, sector='S')
self.west_stand_stat = StadiumStandStatisticsFactory.create(stadium_statistics=self.stadium_stat, sector='W')
self.east_stand_stat = StadiumStandStatisticsFactory.create(stadium_statistics=self.stadium_stat, sector='O')
StadiumStandStatisticsFactory.create(stadium_statistics=self.stadium_stat, sector='N')
StadiumStandStatisticsFactory.create(stadium_statistics=self.stadium_stat, sector='S')
StadiumStandStatisticsFactory.create(stadium_statistics=self.stadium_stat, sector='W')
StadiumStandStatisticsFactory.create(stadium_statistics=self.stadium_stat, sector='O')

def test_user_can_see_table(self):
response = self.client.get(reverse('core:ofm:stadium_statistics_overview'))
Expand Down Expand Up @@ -154,10 +154,10 @@ def test_user_can_filter_for_stadium_configuration(self):
light_level = StadiumLevelItemFactory(current_level=1)
level = StadiumLevelFactory.create(light=light_level)
stadium_stat_2 = MatchStadiumStatisticsFactory.create(match=match2, level=level)
self.north_stand_stat = StadiumStandStatisticsFactory.create(stadium_statistics=stadium_stat_2, sector='N')
self.south_stand_stat = StadiumStandStatisticsFactory.create(stadium_statistics=stadium_stat_2, sector='S')
self.west_stand_stat = StadiumStandStatisticsFactory.create(stadium_statistics=stadium_stat_2, sector='W')
self.east_stand_stat = StadiumStandStatisticsFactory.create(stadium_statistics=stadium_stat_2, sector='O')
StadiumStandStatisticsFactory.create(stadium_statistics=stadium_stat_2, sector='N')
StadiumStandStatisticsFactory.create(stadium_statistics=stadium_stat_2, sector='S')
StadiumStandStatisticsFactory.create(stadium_statistics=stadium_stat_2, sector='W')
StadiumStandStatisticsFactory.create(stadium_statistics=stadium_stat_2, sector='O')

options = {
'harmonic_strength': 50,
Expand Down

0 comments on commit d1d8378

Please sign in to comment.