previous next exercise coverage

avalax · Jan 12, 2018 · 8b50710 · 8b50710
1 parent 1b11ce8
commit 8b50710
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/main/java/de/avalax/fitbuddy/application/workout/WorkoutService.java b/src/main/java/de/avalax/fitbuddy/application/workout/WorkoutService.java
@@ -89,16 +89,15 @@ public boolean hasPreviousExercise(int exerciseIndex) {
         if (!workoutSession.hasWorkout()) {
             return false;
         }
-        int size = workoutSession.getWorkout().getExercises().size();
-        return exerciseIndex > 0 && exerciseIndex < size;
+        return exerciseIndex > 0;
     }
 
     public boolean hasNextExercise(int exerciseIndex) {
         if (!workoutSession.hasWorkout()) {
             return false;
         }
         int size = workoutSession.getWorkout().getExercises().size();
-        return size > exerciseIndex + 1;
+        return exerciseIndex + 1 < size;
     }
 
     public boolean hasActiveWorkout() {

diff --git a/src/test/java/de/avalax/fitbuddy/application/workout/WorkoutServiceTest.java b/src/test/java/de/avalax/fitbuddy/application/workout/WorkoutServiceTest.java
@@ -108,18 +108,23 @@ public void setUp() throws Exception {
         }
 
         @Test
-        public void noActiveWorkout_shouldReturnFalse() throws Exception {
+        public void noActiveWorkout_shouldReturnIsNotActive() throws Exception {
             when(workoutSession.hasWorkout()).thenReturn(false);
             when(workoutSession.getWorkout()).thenReturn(null);
 
             Assertions.assertThat(workoutService.isActiveWorkout(workout)).isFalse();
         }
 
         @Test
-        public void currentWorkoutIsActive_shouldReturnTrue() throws Exception {
+        public void currentWorkout_shouldReturnIsActive() throws Exception {
             Assertions.assertThat(workoutService.isActiveWorkout(workout)).isTrue();
         }
 
+        @Test
+        public void anotherWorkout_shouldReturnIsNotActive() throws Exception {
+            Assertions.assertThat(workoutService.isActiveWorkout(new BasicWorkout())).isFalse();
+        }
+
         @Test
         public void switchWorkout_shouldSetWorkout() throws Exception {
             workoutService.switchWorkout(workout);