feat: rm object_t test from test/main

Author: rouson

tests/main.f90

@@ -11,19 +11,15 @@ subroutine run()
         use formats_test, only: &
                 formats_object => &
                     test_object
-        use object_m_test, only: &
-                object_m_object => &
-                    test_object
         use vegetables, only: test_item_t, test_that, run_tests
 
 
 
         type(test_item_t) :: tests
-        type(test_item_t) :: individual_tests(3)
+        type(test_item_t) :: individual_tests(2)
 
         individual_tests(1) = data_partition_data_partition()
         individual_tests(2) = formats_object()
-        individual_tests(3) = object_m_object()
         tests = test_that(individual_tests)
 
 

tests/object_m_test.f90

@@ -1,59 +1,60 @@
 module object_m_test
-   !! author: Damian Rouson
-   !!
-   !! summary: verify object pattern asbtract parent
-   use vegetables, only: &
-     result_t, input_t, integer_input_t, test_item_t, &   ! types
-     describe, it, assert_equals, assert_that, assert_not ! functions
-   use object_m, only : object_t
-   implicit none
+  !! Verify object pattern asbtract parent
+  use test_m, only : test_t, test_result_t
+  use object_m, only : object_t
+  implicit none
 
-   private
-   public :: test_object
+  private
+  public :: object_test_t
 
-   type, extends(object_t) :: subject
-   contains
-     procedure write_formatted
-   end type
+  type, extends(test_t) :: object_test_t
+  contains
+    procedure, nopass :: subject
+    procedure, nopass :: results
+  end type
+
+  type, extends(object_t) :: subject_t
+  contains
+    procedure write_formatted
+  end type
 
 contains
 
-  function test_object() result(tests)
-    type(test_item_t) tests
+  pure function subject() result(specimen)
+    character(len=:), allocatable :: specimen
+    specimen = "The object_m type" 
+  end function
+
+  pure function results() result(test_results)
+    type(test_result_t), allocatable :: test_results(:)
 
-    tests = describe( &
-     "object class", &
-     [it( &
-       ".not. user_defined() if only default-initialized", &
-       check_default_initialization), &
-      it( &
-       "user_defined() after call mark_as_defined", &
-       check_mark_as_defined)])
+    test_results = [ &
+      test_result_t(".not. user_defined() if only default-initialized", check_default_initialization()), &
+      test_result_t("user_defined() after call mark_as_defined", check_mark_as_defined()) &
+    ]
   end function
 
-  function check_default_initialization() result(result_)
+  pure function check_default_initialization() result(passed)
     !! Verify that user_defined() is .false. for a default-initialied object
-   class(object_t), allocatable :: object
-    type(result_t) result_
-
-    allocate(subject :: object)
+    class(object_t), allocatable :: object
+    logical passed
 
-    result_ = assert_not(object%user_defined())
+    allocate(subject_t :: object)
+    passed = .not. object%user_defined()
   end function
 
-  function check_mark_as_defined() result(result_)
+  pure function check_mark_as_defined() result(passed)
     !! Verify that mark_as_defined results in user_defined() being .true.
     class(object_t), allocatable :: object
-    type(result_t) result_
-
-    allocate(subject :: object)
+    logical passed
 
+    allocate(subject_t :: object)
     call object%mark_as_defined
-    result_ = assert_that(object%user_defined())
+    passed = object%user_defined()
   end function
 
   subroutine write_formatted(self, unit, iotype, v_list, iostat, iomsg)
-    class(subject), intent(in) :: self
+    class(subject_t), intent(in) :: self
     integer, intent(in) :: unit
     character(*), intent(in) :: iotype
     integer, intent(in) :: v_list(:)
@@ -67,7 +68,7 @@ subroutine write_formatted(self, unit, iotype, v_list, iostat, iomsg)
         iomsg = ""
       case default
         iostat = -1
-        iomsg = "object_m_test: subject%write_formatted iotype received unsupported iotype " // iotype
+        iomsg = "object_m_test: subject_t%write_formatted iotype received unsupported iotype " // iotype
     end select
 
     associate( unused => v_list)

tests/test-driver.f90

@@ -1,8 +1,11 @@
 program main
   use user_defined_collectives_test, only : collectives_test_t  
+  use object_m_test, only : object_test_t  
   implicit none
 
   type(collectives_test_t) collectives_test
+  type(object_test_t) object_test
 
   call collectives_test%report()
+  call object_test%report()
 end program