Align exercise 3 solution with new challenge structure

Author: connoraird

.github/workflows/test-exercises.yaml

@@ -51,7 +51,7 @@ jobs:
       - name: Test episode 2
         run: podman build . -f docker-tests/Dockerfile.02
 
-      - name: Test episode 2
+      - name: Test episode 3
         run: podman build . -f docker-tests/Dockerfile.03
 
       - name: Test episode 4

exercises/3-writing-your-first-unit-test/solution/pfunit/test_temp_conversions.pf

@@ -6,66 +6,43 @@ module test_temp_conversions
 
     public
 
-    !*************************************************************************!
-    !                            Derived Types                                !
-    !-------------------------------------------------------------------------!
-
-    !> Test parameter type to package the test parameters
-    @TestParameter
-    type, extends(AbstractTestParameter) :: temp_conversions_test_params_t
-        !> The temperature to input into the function being tested
-        real :: input
-        !> Theb temperature expected to be returned from the function being tested
-        real :: expected_output
-        !> A description of the test to be outputted for logging
-        character(len=100) :: description
-    contains
-        procedure :: toString => temp_conversions_test_params_t_toString
-    end type temp_conversions_test_params_t
-
-    !> Test case type to specify the style of test (paramaterized)
-    @TestCase(constructor=new_test_case)
-    type, extends(ParameterizedTestCase) :: temp_conversions_test_case_t
-        type(temp_conversions_test_params_t) :: params
-    end type temp_conversions_test_case_t
-
-    !*************************************************************************!
-
 contains
 
     !*************************************************************************!
     !                      Test fahrenheit_to_celsius                         !
     !-------------------------------------------------------------------------!
+    !> Test Logic, unit test subroutine for fahrenheit_to_celsius with 0.0°F
+    @Test
+    subroutine test_fahrenheit_to_celsius()
+        integer, parameter :: num_tests = 4
+        real :: actual_output, inputs(num_tests), expected_outputs(num_tests)
+        character(len=200) :: failure_message
+        integer :: i
 
-    !> Test Suite for tests of fahrenheit_to_celsius
-    function fahrenheit_to_celsius_testsuite() result(params)
-        !> An array of test parameters, each specifying an individual test
-        class(temp_conversions_test_params_t), allocatable :: params(:)
-
-        params = [ &
-            temp_conversions_test_params_t(0.0, -17.777779, "0.0 °F"), &
-            temp_conversions_test_params_t(32.0, 0.0, "0.0 °C"), &
-            temp_conversions_test_params_t(-100.0, -73.333336, "100 °F"), &
-            temp_conversions_test_params_t(1.23,-17.094444, "Decimal °F") &
+        inputs = [  &
+            0.0,    &
+            32.0,   &
+            -100.0, &
+            1.23    &
+        ]
+        expected_outputs = [ &
+            -17.777779,      &
+            0.0,             &
+            -73.333336,      &
+            -17.094444       &
         ]
-    end function fahrenheit_to_celsius_testsuite
-
-    !> Test Logic, unit test subroutine for fahrenheit_to_celsius
-    @Test(testParameters={fahrenheit_to_celsius_testsuite()})
-    subroutine test_fahrenheit_to_celsius(this)
-        !> The test case which indicates the type of test we are running
-        class(temp_conversions_test_case_t), intent(inout) :: this
 
-        character(len=200) :: failure_message
-        real :: actual_output
+        do i = 1, num_tests
+            ! Get the actual celsius value returned from fahrenheit_to_celsius
+            actual_output = fahrenheit_to_celsius(inputs(i))
 
-        ! Get the actual celsius value returned from fahrenheit_to_celsius
-        actual_output = fahrenheit_to_celsius(this%params%input)
+            ! Populate the failure message
+            write(failure_message, '(A,F7.2,A,F7.2,A,F7.2,A)') "Failed With ", inputs(i), " °F: Expected ", &
+                    expected_outputs(i), "°C but got ", actual_output, "°C"
+            @assertEqual(expected_outputs(i), actual_output, tolerance=1e-6, message=trim(failure_message))
 
-        ! Populate the failure message
-        write(failure_message, '(A,F7.2,A,F7.2,A,F7.2,A)') "Failed With ", this%params%input, " °F: Expected ", &
-                this%params%expected_output, "°C but got ", actual_output, "°C"
-        @assertEqual(this%params%expected_output, actual_output, tolerance=1e-6, message=trim(failure_message))
+            failure_message = ""
+        end do
 
     end subroutine test_fahrenheit_to_celsius
 
@@ -75,63 +52,40 @@ contains
     !*************************************************************************!
     !                         Test celsius_to_kelvin                          !
     !-------------------------------------------------------------------------!
-
-    !> Test Suite for tests of celsius_to_kelvin
-    function celsius_to_kelvin_testsuite() result(params)
-        !> An array of test parameters, each specifying an individual test
-        class(temp_conversions_test_params_t), allocatable :: params(:)
-
-        params = [ &
-            temp_conversions_test_params_t(0.0, 273.15, "0.0 °C"), &
-            temp_conversions_test_params_t(-273.15, 0.0, "0.0 °K"), &
-            temp_conversions_test_params_t(-173.15, 100.0, "100.0 °K") &
-        ]
-    end function celsius_to_kelvin_testsuite
-
     !> Test Logic, unit test subroutine for celsius_to_kelvin
-    @Test(testParameters={celsius_to_kelvin_testsuite()})
-    subroutine test_celsius_to_kelvin(this)
-        !> The test case which indicates the type of test we are running
-        class(temp_conversions_test_case_t), intent(inout) :: this
-
+    @Test
+    subroutine test_celsius_to_kelvin()
+        integer, parameter :: num_tests = 3
+        real :: actual_output, inputs(num_tests), expected_outputs(num_tests)
         character(len=200) :: failure_message
-        real :: actual_output
-
-        ! Get the actual kelvin value returned from celsius_to_kelvin
-        actual_output = celsius_to_kelvin(this%params%input)
-
-        ! Populate the failure message
-        write(failure_message, '(A,F7.2,A,F7.2,A,F7.2,A)') "Failed With ", this%params%input, "°C: Expected ", &
-                this%params%expected_output, "°K but got ", actual_output, "°K"
-        @assertEqual(this%params%expected_output, actual_output, tolerance=1e-6, message=trim(failure_message))
-
-    end subroutine test_celsius_to_kelvin
+        integer :: i
 
-    !*************************************************************************!
+        inputs = [   &
+            0.0,     &
+            -273.15, &
+            -173.15  &
+        ]
 
+        expected_outputs = [ &
+            273.15,          &
+            0.0,             &
+            100.0            &
+        ]
 
-    !*************************************************************************!
-    !                          Type Constructors                              !
-    !-------------------------------------------------------------------------!
+        do i = 1, num_tests
 
-    !> Constructor for converting test parameters into a test case
-    function new_test_case(testParameter) result(tst)
-        !> The parameters to be converted to a test case
-        type(temp_conversions_test_params_t), intent(in) :: testParameter
-        !> The test case to return after conversion from parameters
-        type(temp_conversions_test_case_t) :: tst
+            ! Get the actual kelvin value returned from celsius_to_kelvin
+            actual_output = celsius_to_kelvin(inputs(i))
 
-        tst%params = testParameter
-    end function new_test_case
+            ! Populate the failure message
+            write(failure_message, '(A,F7.2,A,F7.2,A,F7.2,A)') "Failed With ", inputs(i), "°C: Expected ", &
+                    expected_outputs(i), "°K but got ", actual_output, "°K"
+            @assertEqual(expected_outputs(i), actual_output, tolerance=1e-6, message=trim(failure_message))
 
-    !> Constructor for converting test parameters into a string
-    function temp_conversions_test_params_t_toString(this) result(string)
-        !> The parameters to be converted to a string
-        class(temp_conversions_test_params_t), intent(in) :: this
-        character(:), allocatable :: string
+            failure_message = ""
+        end do
 
-        string = trim(this%description)
-    end function temp_conversions_test_params_t_toString
+    end subroutine test_celsius_to_kelvin
 
     !*************************************************************************!