Changeset 813e855 in flowtimer for tests

Timestamp:

08/30/24 00:12:27 (9 months ago)

Author:

Enrico Schwass <ennoausberlin@…>

Branches:

guix

Children:

8f41b95

Parents:

0384305

Message:

predicates renamed

Location:

tests

Files:

• test_phase.py (modified) (4 diffs)
• test_recurring_phase_sequence.py (modified) (4 diffs)
• test_schedule.py (modified) (4 diffs)

tests/test_phase.py

@@ -20 +20 @@
         phase.start()
         assert phase.state == "running"
-        assert phase.running() is True
+        assert phase.is_running() is True
 
     def test_phase_pause(self):
@@ -27 +27 @@
         phase.pause()
         assert phase.state == "paused"
-        assert phase.paused() is True
+        assert phase.is_paused() is True
 
     def test_phase_abort(self):
@@ -33 +33 @@
         phase.abort()
         assert phase.state == "aborted"
-        assert phase.aborted() is True
+        assert phase.is_aborted() is True
 
     def test_phase_tick(self):
@@ -47 +47 @@
         phase.tick(300)
         assert phase.ticks_left == 0
-        assert phase.completed() is True
+        assert phase.is_completed() is True
 
     def test_phase_tick_beyond_completion(self):

tests/test_recurring_phase_sequence.py

@@ -2 +2 @@
 import json
 
-from flowtimer.Phase import Phase
 from flowtimer.RecurringPhaseSequence import RecurringPhaseSequence
 
@@ -23 +22 @@
         json_string = recurring_phase_sequence.to_json()
         data = json.loads(json_string)
-        assert data['state'] == "initial"
+        assert data['_state'] == "initial"
         assert data['initial_repetitions'] == 3
         assert data['passes_left'] == 3
@@ -29 +28 @@
 
     def test_initial_state(self, recurring_phase_sequence):
-        assert recurring_phase_sequence.state == "initial"
+        assert recurring_phase_sequence.state() == "initial"
         assert recurring_phase_sequence.current_phase.title == "Tasking"
         assert recurring_phase_sequence.passes_left == 3
@@ -57 +56 @@
 
     def test_completed(self, recurring_phase_sequence):
-        assert not recurring_phase_sequence.completed()
+        assert not recurring_phase_sequence.is_completed()
         for _ in range(3):
             for phase in recurring_phase_sequence.phases:
                 recurring_phase_sequence.tick(phase.initial_ticks)
-        assert recurring_phase_sequence.completed()
+        assert recurring_phase_sequence.is_completed()
 
     def test_abort(self, recurring_phase_sequence):
         recurring_phase_sequence.abort()
-        assert recurring_phase_sequence.state == "aborted"
-        assert recurring_phase_sequence.current_phase.aborted()
+        assert recurring_phase_sequence.state() == "aborted"
+        assert recurring_phase_sequence.current_phase.is_aborted()
 
     def test_tick_progression(self, recurring_phase_sequence):

tests/test_schedule.py

@@ -23 +23 @@
         assert schedule.blocks == [phase1, schedule.blocks[1]]
         assert schedule.current_block == phase1
-        assert schedule.state == "initial"
+        assert schedule.state() == "initial"
 
     def test_default_json_string(self):
@@ -48 +48 @@
         schedule, phase1, _, _ = setup_schedule
         schedule.start()
-        assert schedule.state == "running"
+        assert schedule.state() == "running"
         # assert phase1.ticks_left < phase1.initial_ticks  # Assuming the phase reduces ticks when started
 
@@ -54 +54 @@
         schedule, _, _, _ = setup_schedule
         schedule.start()
-        assert schedule.running() is True
+        assert schedule.is_running() is True
         schedule.pause()
-        assert schedule.running() is False
+        assert schedule.is_running() is False
 
     def test_paused(self, setup_schedule):
         schedule, _, _, _ = setup_schedule
         schedule.pause()
-        assert schedule.paused() is True
+        assert schedule.is_paused() is True
 
     def test_abort(self, setup_schedule):
         schedule, _, _, _ = setup_schedule
         schedule.abort()
-        assert schedule.state == "aborted"
+        assert schedule.state() == "aborted"
 
     def test_completed(self, setup_schedule):
@@ -74 +74 @@
         schedule.tick(phase1.initial_ticks)  # Complete phase1
         schedule.tick(sequence.initial_ticks)  # Complete sequence
-        assert schedule.completed() is True
-        assert schedule.state == "completed"
+        assert schedule.is_completed() is True
+        assert schedule.state() == "completed"
 
     def test_advance_to_next_block(self, setup_schedule):