Test workout creation both with MFTMuscles and MFTMuscleGroups.

Commit
f42dd77d9bd61b08bb68448506dd603a1b491abd
Author
Marius Peter <marius.peter@tutanota.com>
Author date
Committer
Marius Peter <marius.peter@tutanota.com>
Committer date
Changed files
src/MyFitnessTracker-Tests/MFTExerciseTest.class.st
index 489a016c..3ddade88 100644..100644
@@ -6,8 +6,8 @@
6 6
7 7 { #category : #tests }
8 8 MFTExerciseTest >> testExerciseIsCreatedCorrectly [
9 Added:
9 10 | exercise |
10 Removed: exercise := MFTExercise
11 Removed: name: 'bicep curl'.
12 Removed: self assert: exercise name equals: 'bicep curl'.
11 Added: exercise := MFTExercise new name: 'bicep curl'.
12 Added: self assert: exercise name equals: 'bicep curl'
13 13 ]
src/MyFitnessTracker-Tests/MFTWorkoutTest.class.st
index 9c8280be..28b7beb8 100644..100644
@@ -6,46 +6,51 @@
6 6
7 7 { #category : #tests }
8 8 MFTWorkoutTest >> testWorkoutHasExercises [
9 Removed: "This was my workout today, 11 September 2023."
9 Added: "This was my workout today, 11 September 2023."
10 Added:
10 11 | workout |
11 12 workout := MFTWorkout new
12 Removed: addExercise:
13 Removed: (MFTExercise cableRow sets:
14 Removed: { MFTSet reps: 8 rpe: 6.
15 Removed: MFTSet reps: 6 rpe: 8.
16 Removed: MFTSet reps: 6 rpe: 10.
17 Removed: MFTSet reps: 15 rpe: 4. });
18 Removed: addExercise:
19 Removed: (MFTExercise name: 'hammer curl' sets:
20 Removed: { MFTSet reps: 8 rpe: 5.
21 Removed: MFTSet reps: 8 rpe: 8.
22 Removed: MFTSet reps: 6 rpe: 9. });
23 Removed: addExercise:
24 Removed: (MFTExercise name: 'barbell row' sets:
25 Removed: { MFTSet reps: 8 rpe: 5.
26 Removed: MFTSet reps: 6 rpe: 8.
27 Removed: MFTSet reps: 6 rpe: 10. });
28 Removed: addExercise:
29 Removed: (MFTExercise name: 'lat pulldown' sets:
30 Removed: { MFTSet reps: 8 rpe: 6.
31 Removed: MFTSet reps: 6 rpe: 8.
32 Removed: MFTSet reps: 6 rpe: 10.
33 Removed: MFTSet reps: 16 rpe: 4. });
34 Removed: addExercise:
35 Removed: (MFTExercise name: 'reverse grip bicep curl' sets:
36 Removed: { MFTSet reps: 8 rpe: 6.
37 Removed: MFTSet reps: 6 rpe: 8.
38 Removed: MFTSet reps: 6 rpe: 9. });
39 Removed: addExercise:
40 Removed: (MFTExercise name: 'seated rear delt fly' sets:
41 Removed: { MFTSet reps: 12 rpe: 6.
42 Removed: MFTSet reps: 12 rpe: 6.
43 Removed: MFTSet reps: 12 rpe: 6. }).
13 Added: addExercise: (MFTExercise cableRow sets: {
14 Added: (MFTSet reps: 8 rpe: 6).
15 Added: (MFTSet reps: 6 rpe: 8).
16 Added: (MFTSet reps: 6 rpe: 10).
17 Added: (MFTSet reps: 15 rpe: 4) });
18 Added: addExercise: (MFTExercise new
19 Added: name: 'hammer curl';
20 Added: sets: {
21 Added: (MFTSet reps: 8 rpe: 5).
22 Added: (MFTSet reps: 8 rpe: 8).
23 Added: (MFTSet reps: 6 rpe: 9) });
24 Added: addExercise: (MFTExercise new
25 Added: name: 'barbell row';
26 Added: sets: {
27 Added: (MFTSet reps: 8 rpe: 5).
28 Added: (MFTSet reps: 6 rpe: 8).
29 Added: (MFTSet reps: 6 rpe: 10) });
30 Added: addExercise: (MFTExercise new
31 Added: name: 'lat pulldown';
32 Added: sets: {
33 Added: (MFTSet reps: 8 rpe: 6).
34 Added: (MFTSet reps: 6 rpe: 8).
35 Added: (MFTSet reps: 6 rpe: 10).
36 Added: (MFTSet reps: 16 rpe: 4) });
37 Added: addExercise: (MFTExercise new
38 Added: name: 'reverse grip bicep curl';
39 Added: sets: {
40 Added: (MFTSet reps: 8 rpe: 6).
41 Added: (MFTSet reps: 6 rpe: 8).
42 Added: (MFTSet reps: 6 rpe: 9) });
43 Added: addExercise: (MFTExercise new
44 Added: name: 'seated rear delt fly';
45 Added: sets: {
46 Added: (MFTSet reps: 12 rpe: 6).
47 Added: (MFTSet reps: 12 rpe: 6).
48 Added: (MFTSet reps: 12 rpe: 6) }).
44 49 self assert: workout exercises size equals: 6.
45 50 self assert: (workout exercises at: 1) name equals: 'cable row'.
46 51 self assert: (workout exercises at: 2) name equals: 'hammer curl'.
47 52 self assert: (workout exercises at: 5) sets first reps equals: 8.
48 Removed: self assert: (workout exercises at: 6) sets first rpe equals: 6.
53 Added: self assert: (workout exercises at: 6) sets first rpe equals: 6
49 54 ]
50 55
51 56 { #category : #tests }
@@ -59,9 +64,9 @@
59 64 MFTWorkoutTest >> testWorkoutWithPrimaryIsCreatedCorrectly [
60 65
61 66 | workout |
62 Removed: workout := MFTWorkout primaryMuscle: MFTMuscle back.
67 Added: workout := MFTWorkout primaryMuscle: MFTMuscleGroup back.
63 68 self
64 Removed: assert: workout primaryMuscle equals: 'back';
69 Added: assert: workout primaryMuscle name equals: 'back';
65 70 assert: workout date equals: Date today
66 71 ]
67 72
@@ -70,13 +75,13 @@
70 75
71 76 | workout |
72 77 workout := MFTWorkout
73 Removed: primaryMuscle: MFTMuscle back
78 Added: primaryMuscle: MFTMuscleGroup back
74 79 secondaryMuscles: {
75 Removed: MFTMuscle biceps.
76 Removed: MFTMuscle chest }.
80 Added: MFTMuscleGroup arm.
81 Added: MFTMuscleGroup chest }.
77 82 self
78 Removed: assert: workout primaryMuscle equals: 'back';
79 Removed: assert: workout secondaryMuscles first name equals: 'biceps';
83 Added: assert: workout primaryMuscle name equals: 'back';
84 Added: assert: workout secondaryMuscles first name equals: 'arm';
80 85 assert: (workout secondaryMuscles at: 2) name equals: 'chest';
81 86 assert: workout date equals: Date today
82 87 ]