Skip to content

Commit

Permalink
increase speed of tests (where possible, some have to be in realtime)
Browse files Browse the repository at this point in the history
  • Loading branch information
toomanybrians committed Mar 25, 2016
1 parent 5bc2192 commit f23b63e
Show file tree
Hide file tree
Showing 8 changed files with 36 additions and 36 deletions.
6 changes: 3 additions & 3 deletions mpfmc/tests/test_AnimatedImages.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def test_animated_images(self):
ball = self.mc.targets['default'].children[0].children[0].children[0]
stick_figures = self.mc.targets['default'].children[0].children[0].children[1]

self.advance_time(1)
self.advance_time()

# make sure they're playing as they should
self.assertEqual(ball.fps, 30)
Expand All @@ -45,9 +45,9 @@ def test_animated_images(self):

# test jumping to a new frame
stick_figures.current_frame = 5
self.advance_time(1)
self.advance_time()
self.assertEqual(stick_figures.current_frame, 5)

# test starting
stick_figures.play()
self.advance_time(1)
self.advance_time()
2 changes: 1 addition & 1 deletion mpfmc/tests/test_Animation.py
Original file line number Diff line number Diff line change
Expand Up @@ -163,4 +163,4 @@ def test_named_animation(self):

# post the event to animate it
self.mc.events.post('entrance3')
self.advance_time(1)
self.advance_time()
2 changes: 1 addition & 1 deletion mpfmc/tests/test_Image.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def test_image(self):

# This tests includes images that preload and that load on demand, so
# give it enough time to for the on demand ones to load
self.advance_time(1)
self.advance_time()

# Make sure that all the images are showing.
active_widget_names = [
Expand Down
2 changes: 1 addition & 1 deletion mpfmc/tests/test_Shapes.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ def get_config_file(self):

def test_line(self):
self.mc.events.post('slide1')
self.advance_time(1)
self.advance_time()
8 changes: 4 additions & 4 deletions mpfmc/tests/test_SlidePlayer.py
Original file line number Diff line number Diff line change
Expand Up @@ -155,17 +155,17 @@ def test_from_show_via_bcp(self):
**show_slide_section)

self.mc.bcp_processor.receive_bcp_message(bcp_string)
self.advance_time(1)
self.advance_time()

def test_slides_created_in_slide_player(self):
# Anon slides are where the widgets are listed in the slide_player
# section of a config file or the slides section of a show

self.mc.events.post('anon_slide_dict')
self.advance_time(1)
self.advance_time()

self.mc.events.post('anon_slide_list')
self.advance_time(1)
self.advance_time()

self.mc.events.post('anon_slide_widgets')
self.advance_time(1)
self.advance_time()
4 changes: 2 additions & 2 deletions mpfmc/tests/test_Text.py
Original file line number Diff line number Diff line change
Expand Up @@ -215,11 +215,11 @@ def test_number_grouping(self):

# should be 00 even though text is 0
self.assertEqual(self.get_widget().text, '00')
self.advance_time(1)
self.advance_time()

self.get_widget().update_text('2000000')
self.assertEqual(self.get_widget().text, '2,000,000')
self.advance_time(1)
self.advance_time()

def test_text_string1(self):
# simple text string in machine config
Expand Down
46 changes: 23 additions & 23 deletions mpfmc/tests/test_Transitions.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,44 +46,44 @@ def test_mpf_transition(self):
def test_target_transition_reset_when_done(self):
# Show slide1 with no transition
self.mc.events.post('show_slide1')
self.advance_time(1)
self.advance_time()
self.assertTrue(isinstance(self.mc.targets['default'].transition,
NoTransition))
self.assertEqual(self.mc.targets['default'].current_slide_name,
'slide1')

# Show slide2 with a transition
self.mc.events.post('push_left')
self.advance_time(1)
self.advance_time()
self.assertTrue(isinstance(self.mc.targets['default'].transition,
PushTransition))
self.assertEqual(self.mc.targets['default'].current_slide_name,
'slide2')

# Go back to slide1 with a transition
self.mc.events.post('show_slide1_with_push')
self.advance_time(1)
self.advance_time()
self.assertTrue(isinstance(self.mc.targets['default'].transition,
PushTransition))
self.assertEqual(self.mc.targets['default'].current_slide_name,
'slide1')

self.mc.events.post('push_left')
self.advance_time(1)
self.advance_time()
self.assertTrue(isinstance(self.mc.targets['default'].transition,
PushTransition))
self.assertEqual(self.mc.targets['default'].current_slide_name,
'slide2')

self.mc.events.post('show_slide1')
self.advance_time(1)
self.advance_time()
self.assertTrue(isinstance(self.mc.targets['default'].transition,
NoTransition))
self.assertEqual(self.mc.targets['default'].current_slide_name,
'slide1')

self.mc.events.post('show_slide2_no_transition')
self.advance_time(1)
self.advance_time()
self.assertTrue(isinstance(self.mc.targets['default'].transition,
NoTransition))
self.assertEqual(self.mc.targets['default'].current_slide_name,
Expand All @@ -93,103 +93,103 @@ def test_push_left(self):
self.mc.events.post('show_slide1')
self.advance_time()
self.mc.events.post('push_left')
self.advance_time(.5)
self.advance_time()

def test_push_right(self):
self.mc.events.post('show_slide1')
self.advance_time()
self.mc.events.post('push_right')
self.advance_time(.5)
self.advance_time()

def test_push_up(self):
self.mc.events.post('show_slide1')
self.advance_time()
self.mc.events.post('push_up')
self.advance_time(.5)
self.advance_time()

def test_push_down(self):
self.mc.events.post('show_slide1')
self.advance_time()
self.mc.events.post('push_down')
self.advance_time(.5)
self.advance_time()

def test_move_in_right(self):
self.mc.events.post('show_slide1')
self.advance_time()
self.mc.events.post('move_in_right')
self.advance_time(.5)
self.advance_time()

def test_move_in_left(self):
self.mc.events.post('show_slide1')
self.advance_time()
self.mc.events.post('move_in_left')
self.advance_time(.5)
self.advance_time()

def test_move_in_top(self):
self.mc.events.post('show_slide1')
self.advance_time()
self.mc.events.post('move_in_top')
self.advance_time(.5)
self.advance_time()

def test_move_in_bottom(self):
self.mc.events.post('show_slide1')
self.advance_time()
self.mc.events.post('move_in_bottom')
self.advance_time(.5)
self.advance_time()

def test_move_out_right(self):
self.mc.events.post('show_slide1')
self.advance_time()
self.mc.events.post('move_out_right')
self.advance_time(.5)
self.advance_time()

def test_move_out_left(self):
self.mc.events.post('show_slide1')
self.advance_time()
self.mc.events.post('move_out_left')
self.advance_time(.5)
self.advance_time()

def test_move_out_top(self):
self.mc.events.post('show_slide1')
self.advance_time()
self.mc.events.post('move_out_top')
self.advance_time(.5)
self.advance_time()

def test_move_out_bottom(self):
self.mc.events.post('show_slide1')
self.advance_time()
self.mc.events.post('move_out_bottom')
self.advance_time(.5)
self.advance_time()

def test_wipe(self):
self.mc.events.post('show_slide1')
self.advance_time()
self.mc.events.post('wipe')
self.advance_time(.5)
self.advance_time()

def test_swap(self):
self.mc.events.post('show_slide1')
self.advance_time()
self.mc.events.post('swap')
self.advance_time(2)
self.advance_time()

def test_fade(self):
self.mc.events.post('show_slide1')
self.advance_time()
self.mc.events.post('fade')
self.advance_time(.5)
self.advance_time()

def test_fade_back(self):
self.mc.events.post('show_slide1')
self.advance_time()
self.mc.events.post('fade_back')
self.advance_time(.5)
self.advance_time()

def test_rise_in(self):
self.mc.events.post('show_slide1')
self.advance_time()
self.mc.events.post('rise_in')
self.advance_time(.5)
self.advance_time()

# def test_no_transition_1(self):
# self.mc.events.post('show_slide1')
Expand Down
2 changes: 1 addition & 1 deletion mpfmc/tests/test_Video.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def test_video(self):
self.assertIn('mpf_video_small_test', self.mc.videos)

self.mc.events.post('show_slide1')
self.advance_time(1)
self.advance_time()

# This works locally but not on travis. I need to figure out the right
# library & format that can run on travis.
Expand Down

0 comments on commit f23b63e

Please sign in to comment.