Merge pull request #159 from jacobwilliams/coverage

coverage increases

Author: jacobwilliams

src/tests/jf_test_11.F90

@@ -12,7 +12,7 @@ module jf_test_11_mod
     implicit none
 
     character(len=*),parameter :: dir = '../files/inputs/'  !! working directory
-# ifdef USE_UCS4
+#ifdef USE_UCS4
     character(len=*),parameter :: unicode_file = 'hello-world-ucs4.json'
 #endif
     character(len=*),parameter :: ascii_equivalent = 'hello-world-ascii.json'

src/tests/jf_test_15.f90

@@ -0,0 +1,98 @@
+!*****************************************************************************************
+!> author: Jacob Williams
+!  date: 10/28/2015
+!
+! Module for the 15th unit test.
+! This one is testing a lot of the error conditions.
+
+module jf_test_15_mod
+
+    use json_module, CK => json_CK
+    use, intrinsic :: iso_fortran_env , only: error_unit,output_unit,wp=>real64
+
+    implicit none
+
+contains
+
+    subroutine test_15(error_cnt)
+
+    !! Test some of the edge cases, and incorrect usages.
+
+    implicit none
+
+    integer,intent(out) :: error_cnt !! report number of errors to caller
+
+    type(json_core) :: json
+    type(json_value),pointer :: p,p2
+    type(json_file) :: file1, file2
+    logical :: found,status_ok
+    integer :: var_type,i,n_children
+    real(wp) :: d
+    logical :: tf
+    character(kind=CK,len=:),allocatable :: error_msg
+
+    write(error_unit,'(A)') ''
+    write(error_unit,'(A)') '================================='
+    write(error_unit,'(A)') '   TEST 15'
+    write(error_unit,'(A)') '================================='
+    write(error_unit,'(A)') ''
+
+    error_cnt = 0
+
+    nullify(p2)
+    nullify(p)
+
+    call json%parse(p2, '{"int": 1, "real": 2.0, "logical": true}')
+    call json%get(p2,'real',   i)
+    call json%get(p2,'logical',i)
+    call json%get(p2,'integer',d)
+    call json%get(p2,'logical',d)
+    call json%get(p2,'integer',tf)
+    call json%get(p2,'real',   tf)
+    call json%check_for_errors(status_ok, error_msg)  !error condition true
+    call json%initialize(print_signs=.true.)  !print signs flag
+
+    call json%check_for_errors(status_ok, error_msg)  !error condition false
+
+    call file1%move(file2) !should throw an exception since points are not associated
+    call file1%initialize()
+
+    call file1%print_file(-1)   !invalid input
+    call file1%initialize()
+
+    call file1%print_file(filename='') !invalid filename
+    call file1%initialize()
+
+    call file1%info('this path does not exist',found,var_type,n_children)
+    call file1%initialize()
+
+    call json%get_child(p2,-99,p)  !invalid index
+    call json%initialize()  !clear exceptions
+
+    call json%get_child(p2,'this child does not exist',p)  !invalid index
+    call json%initialize()  !clear exceptions
+
+    call json%print(p2,-1) !invalid input
+    call json%initialize()  !clear exceptions
+
+    call json%print(p2,filename='') !invalid input
+    call json%initialize()  !clear exceptions
+
+    end subroutine test_15
+
+end module jf_test_15_mod
+!*****************************************************************************************
+
+!*****************************************************************************************
+program jf_test_15
+
+    !! 15th unit test.
+
+    use jf_test_15_mod, only: test_15
+    implicit none
+    integer :: n_errors
+    call test_15(n_errors)
+    if ( n_errors /= 0) stop 1
+
+end program jf_test_15
+!*****************************************************************************************

src/tests/jf_test_2.f90

@@ -25,27 +25,27 @@ subroutine test_2(error_cnt)
 
     integer,intent(out) :: error_cnt
 
+    type(json_value),pointer :: p, inp, traj, tmp1, tmp2, p_tmp, p_integer_array, p_clone
     type(json_core) :: json  !! factory for manipulating `json_value` pointers
-    type(json_value),pointer :: p, inp, traj, p_tmp, p_integer_array, p_clone
 
     integer :: iunit
     character(kind=json_CK,len=:),allocatable :: name
     integer :: ival,ival_clone
     logical :: found
 
+    write(error_unit,'(A)') ''
+    write(error_unit,'(A)') '================================='
+    write(error_unit,'(A)') '   EXAMPLE 2'
+    write(error_unit,'(A)') '================================='
+    write(error_unit,'(A)') ''
+
     error_cnt = 0
     call json%initialize()
     if (json%failed()) then
         call json%print_error_message(error_unit)
         error_cnt = error_cnt + 1
     end if
 
-    write(error_unit,'(A)') ''
-    write(error_unit,'(A)') '================================='
-    write(error_unit,'(A)') '   EXAMPLE 2'
-    write(error_unit,'(A)') '================================='
-    write(error_unit,'(A)') ''
-
     !root:
     call json%create_object(p,dir//filename2)    ! create the value and associate the pointer
                                                  ! add the file name as the name of the overall structure
@@ -69,6 +69,10 @@ subroutine test_2(error_cnt)
         error_cnt = error_cnt + 1
     end if
 
+    !test get_parent:
+    call json%get_parent(inp,tmp1)  !will be root
+    call json%get_parent(tmp1,tmp2) !has no parent -> null()
+
     !trajectory structure:
     call json%create_array(traj,'trajectory')    !an array
     if (json%failed()) then
@@ -348,5 +352,6 @@ program jf_test_2
     n_errors = 0
     call test_2(n_errors)
     if (n_errors /= 0) stop 1
+
 end program jf_test_2
 !*****************************************************************************************

src/tests/jf_test_3.f90

@@ -32,19 +32,19 @@ subroutine test_3(error_cnt)
     character(kind=json_CK,len=10) :: str
     real(wp),dimension(:),allocatable :: rvec
 
+    write(error_unit,'(A)') ''
+    write(error_unit,'(A)') '================================='
+    write(error_unit,'(A)') '   EXAMPLE 3'
+    write(error_unit,'(A)') '================================='
+    write(error_unit,'(A)') ''
+
     error_cnt = 0
     call json%initialize()
     if (json%failed()) then
         call json%print_error_message(error_unit)
         error_cnt = error_cnt + 1
     end if
 
-    write(error_unit,'(A)') ''
-    write(error_unit,'(A)') '================================='
-    write(error_unit,'(A)') '   EXAMPLE 3'
-    write(error_unit,'(A)') '================================='
-    write(error_unit,'(A)') ''
-
     ! parse the json file:
     write(error_unit,'(A)') ''
     write(error_unit,'(A)') 'parsing file: '//dir//filename2