test 47 fix

jacobwilliams · jacobwilliams · commit c2aac982b003 · 2021-05-31T17:29:31.000-05:00
there was an intent(out) variable used before it was assigned a value.
some other formatting updates for unit tests
diff --git a/src/tests/jf_test_01.F90 b/src/tests/jf_test_01.F90
@@ -27,10 +27,11 @@ subroutine test_1(error_cnt)
 
     implicit none
 
+    integer,intent(out) :: error_cnt
+
     type(json_file) :: json       !! the JSON structure read from the file
     type(json_value),pointer :: p !! a pointer for low-level manipulations
     type(json_core) :: core       !! factory for manipulating `json_value` pointers
-    integer,intent(out) :: error_cnt
     integer(IK) :: ival
     character(kind=json_CK,len=:),allocatable :: cval
     real(wp) :: rval
@@ -508,7 +509,6 @@ program jf_test_1
     use jf_test_1_mod , only: test_1
     implicit none
     integer :: n_errors
-    n_errors = 0
     call test_1(n_errors)
     if (n_errors /= 0) stop 1
 
diff --git a/src/tests/jf_test_02.F90 b/src/tests/jf_test_02.F90
@@ -416,7 +416,6 @@ program jf_test_2
     use jf_test_2_mod , only: test_2
     implicit none
     integer :: n_errors
-    n_errors = 0
     call test_2(n_errors)
     if (n_errors /= 0) stop 1
 
diff --git a/src/tests/jf_test_03.F90 b/src/tests/jf_test_03.F90
@@ -27,6 +27,7 @@ subroutine test_3(error_cnt)
     implicit none
 
     integer,intent(out) :: error_cnt
+
     integer(IK) :: ival
     character(kind=json_CK,len=:),allocatable :: cval
     real(wp) :: rval
@@ -151,7 +152,6 @@ program jf_test_3
     use jf_test_3_mod , only: test_3
     implicit none
     integer :: n_errors
-    n_errors = 0
     call test_3(n_errors)
     if (n_errors /= 0) stop 1
 
diff --git a/src/tests/jf_test_04.F90 b/src/tests/jf_test_04.F90
@@ -31,6 +31,7 @@ subroutine test_4(error_cnt)
     implicit none
 
     integer,intent(out) :: error_cnt
+
     type(json_value),pointer :: p,inp
     type(json_file) :: json
     type(json_core) :: core  !! factory for manipulating `json_value` pointers
@@ -172,7 +173,6 @@ program jf_test_4
     use jf_test_4_mod , only: test_4
     implicit none
     integer :: n_errors
-    n_errors = 0
     call test_4(n_errors)
     if (n_errors /= 0) stop 1
 end program jf_test_4
diff --git a/src/tests/jf_test_05.F90 b/src/tests/jf_test_05.F90
@@ -29,6 +29,7 @@ subroutine test_5(error_cnt)
     implicit none
 
     integer,intent(out) :: error_cnt
+
     integer(IK) :: vv
     integer(IK),dimension(:),allocatable :: vvv
     real(wp) :: d
@@ -117,7 +118,6 @@ program jf_test_5
     use jf_test_5_mod , only: test_5
     implicit none
     integer :: n_errors
-    n_errors = 0
     call test_5(n_errors)
     if (n_errors /= 0) stop 1
 
diff --git a/src/tests/jf_test_06.F90 b/src/tests/jf_test_06.F90
@@ -120,7 +120,6 @@ program jf_test_6
     use jf_test_6_mod , only: test_6
     implicit none
     integer :: n_errors
-    n_errors = 0
     call test_6(n_errors)
     if (n_errors /= 0) stop 1
 
diff --git a/src/tests/jf_test_07.F90 b/src/tests/jf_test_07.F90
@@ -273,7 +273,6 @@ program jf_test_7
     use jf_test_7_mod , only: test_7
     implicit none
     integer :: n_errors
-    n_errors = 0
     call test_7(n_errors)
     if (n_errors /= 0) stop 1
 
diff --git a/src/tests/jf_test_08.F90 b/src/tests/jf_test_08.F90
@@ -138,7 +138,6 @@ program jf_test_8
     use jf_test_8_mod , only: test_8
     implicit none
     integer :: n_errors
-    n_errors = 0
     call test_8(n_errors)
     if (n_errors /= 0) stop 1
 
diff --git a/src/tests/jf_test_09.F90 b/src/tests/jf_test_09.F90
@@ -153,7 +153,6 @@ program jf_test_9
     use jf_test_9_mod , only: test_9
     implicit none
     integer :: n_errors
-    n_errors = 0
     call test_9(n_errors)
     if (n_errors /= 0) stop 1
 
diff --git a/src/tests/jf_test_10.F90 b/src/tests/jf_test_10.F90
@@ -349,7 +349,6 @@ program jf_test_10
     use jf_test_10_mod , only: test_10
     implicit none
     integer :: n_errors
-    n_errors = 0
     call test_10(n_errors)
     if (n_errors /= 0) stop 1
 
diff --git a/src/tests/jf_test_11.F90 b/src/tests/jf_test_11.F90
@@ -29,6 +29,7 @@ subroutine test_11(error_cnt)
     implicit none
 
     integer,intent(out) :: error_cnt
+
     character(kind=json_CK,len=:),allocatable :: cval
     type(json_file) :: json    !the JSON structure read from the file:
 # ifdef USE_UCS4
@@ -286,7 +287,6 @@ program jf_test_11
     use jf_test_11_mod , only: test_11
     implicit none
     integer :: n_errors
-    n_errors = 0
     call test_11(n_errors)
     if (n_errors /= 0) stop 1
 
diff --git a/src/tests/jf_test_12.F90 b/src/tests/jf_test_12.F90
@@ -247,7 +247,6 @@ program jf_test_12
     use jf_test_12_mod, only: test_12
     implicit none
     integer :: n_errors
-    n_errors = 0
     call test_12(n_errors)
     if ( n_errors /= 0) stop 1
 
diff --git a/src/tests/jf_test_22.F90 b/src/tests/jf_test_22.F90
@@ -23,9 +23,10 @@ subroutine test_22(error_cnt)
 
     implicit none
 
-    type(json_file) :: json          !! the JSON structure read from the file
     integer,intent(out) :: error_cnt !! error counter
 
+    type(json_file) :: json          !! the JSON structure read from the file
+
     write(error_unit,'(A)') ''
     write(error_unit,'(A)') '================================='
     write(error_unit,'(A)') '   TEST 22'
@@ -88,7 +89,6 @@ program jf_test_22
     use jf_test_22_mod , only: test_22
     implicit none
     integer :: n_errors
-    n_errors = 0
     call test_22(n_errors)
     if (n_errors /= 0) stop 1
 
diff --git a/src/tests/jf_test_23.F90 b/src/tests/jf_test_23.F90
@@ -24,10 +24,11 @@ subroutine test_23(error_cnt)
 
     implicit none
 
+    integer,intent(out) :: error_cnt
+
     type(json_file) :: json       !! the JSON structure read from the file
     type(json_value),pointer :: p
     type(json_core) :: core
-    integer,intent(out) :: error_cnt
     character(kind=json_CK,len=:),allocatable :: cval
     character(kind=json_CK,len=:),allocatable :: key
     character(kind=json_CK,len=:),allocatable :: path
@@ -301,7 +302,6 @@ program jf_test_23
     use jf_test_23_mod , only: test_23
     implicit none
     integer :: n_errors
-    n_errors = 0
     call test_23(n_errors)
     if (n_errors /= 0) stop 1
 
diff --git a/src/tests/jf_test_24.F90 b/src/tests/jf_test_24.F90
@@ -169,7 +169,6 @@ program jf_test_24
     use jf_test_24_mod , only: test_24
     implicit none
     integer :: n_errors
-    n_errors = 0
     call test_24(n_errors)
     if (n_errors /= 0) stop 1
 
diff --git a/src/tests/jf_test_25.F90 b/src/tests/jf_test_25.F90
@@ -157,7 +157,6 @@ program jf_test_25
     use jf_test_25_mod , only: test_25
     implicit none
     integer :: n_errors
-    n_errors = 0
     call test_25(n_errors)
     if (n_errors /= 0) stop 1
 
diff --git a/src/tests/jf_test_27.F90 b/src/tests/jf_test_27.F90
@@ -84,7 +84,6 @@ program jf_test_27
     use jf_test_27_mod , only: test_27
     implicit none
     integer :: n_errors
-    n_errors = 0
     call test_27(n_errors)
     if (n_errors /= 0) stop 1
 
diff --git a/src/tests/jf_test_28.F90 b/src/tests/jf_test_28.F90
@@ -125,7 +125,6 @@ program jf_test_28
     use jf_test_28_mod , only: test_28
     implicit none
     integer :: n_errors
-    n_errors = 0
     call test_28(n_errors)
     if (n_errors /= 0) stop 1
 
diff --git a/src/tests/jf_test_29.F90 b/src/tests/jf_test_29.F90
@@ -151,7 +151,6 @@ program jf_test_29
     use jf_test_29_mod , only: test_29
     implicit none
     integer :: n_errors
-    n_errors = 0
     call test_29(n_errors)
     if (n_errors /= 0) stop 1
 
diff --git a/src/tests/jf_test_30.F90 b/src/tests/jf_test_30.F90
@@ -78,7 +78,6 @@ program jf_test_30
     use jf_test_30_mod , only: test_30
     implicit none
     integer :: n_errors
-    n_errors = 0
     call test_30(n_errors)
     if (n_errors /= 0) stop 1
 
diff --git a/src/tests/jf_test_31.F90 b/src/tests/jf_test_31.F90
@@ -21,6 +21,7 @@ subroutine test_31(error_cnt)
     implicit none
 
     integer,intent(out) :: error_cnt
+
     type(json_file) :: json
     integer(IK) :: ival
     real(RK)    :: rval
@@ -103,7 +104,6 @@ program jf_test_31
     use jf_test_31_mod , only: test_31
     implicit none
     integer :: n_errors
-    n_errors = 0
     call test_31(n_errors)
     if (n_errors /= 0) stop 1
 
diff --git a/src/tests/jf_test_32.F90 b/src/tests/jf_test_32.F90
@@ -21,6 +21,7 @@ subroutine test_32(error_cnt)
     implicit none
 
     integer,intent(out) :: error_cnt
+
     integer :: i !! counter
     integer :: j !! counter
     type(json_core) :: json
@@ -118,7 +119,6 @@ program jf_test_32
     use jf_test_32_mod , only: test_32
     implicit none
     integer :: n_errors
-    n_errors = 0
     call test_32(n_errors)
     if (n_errors /= 0) stop 1
 
diff --git a/src/tests/jf_test_33.F90 b/src/tests/jf_test_33.F90
@@ -103,7 +103,6 @@ program jf_test_33
     use jf_test_33_mod , only: test_33
     implicit none
     integer :: n_errors
-    n_errors = 0
     call test_33(n_errors)
     if (n_errors /= 0) stop 1
 
diff --git a/src/tests/jf_test_34.F90 b/src/tests/jf_test_34.F90
@@ -156,7 +156,6 @@ program jf_test_34
     use jf_test_34_mod , only: test_34
     implicit none
     integer :: n_errors
-    n_errors = 0
     call test_34(n_errors)
     if (n_errors /= 0) stop 1
 
diff --git a/src/tests/jf_test_35.F90 b/src/tests/jf_test_35.F90
@@ -94,7 +94,6 @@ program jf_test_35
     use jf_test_35_mod , only: test_35
     implicit none
     integer :: n_errors
-    n_errors = 0
     call test_35(n_errors)
     if (n_errors /= 0) stop 1
 
diff --git a/src/tests/jf_test_41.F90 b/src/tests/jf_test_41.F90
@@ -132,7 +132,6 @@ program jf_test_41
     use jf_test_41_mod , only: test_41
     implicit none
     integer :: n_errors
-    n_errors = 0
     call test_41(n_errors)
     if (n_errors /= 0) stop 1
 
diff --git a/src/tests/jf_test_42.F90 b/src/tests/jf_test_42.F90
@@ -20,14 +20,14 @@ subroutine test_42(error_cnt)
 
     implicit none
 
-    type(json_file) :: json          !! the JSON structure read from the file
     integer,intent(out) :: error_cnt !! error counter
 
     character(kind=CK,len=*),parameter :: str = CK_'{'//&
-             CK_'"bad_reals": [1.0, null, "NaN", "+Infinity", "-Infinity", 4.0],'//&
-             CK_'"nonstandard_json": [.1e1, .1D1, .1d+1, +.1d1, +.1D1, +1.0, +1.0d0, +1.0D0]'//&
-             CK_'}'
+            CK_'"bad_reals": [1.0, null, "NaN", "+Infinity", "-Infinity", 4.0],'//&
+            CK_'"nonstandard_json": [.1e1, .1D1, .1d+1, +.1d1, +.1D1, +1.0, +1.0d0, +1.0D0]'//&
+            CK_'}'
 
+    type(json_file) :: json !! the JSON structure read from the file
     real(rk),dimension(:),allocatable :: bad_reals
     logical(lk) :: found
 
@@ -129,7 +129,6 @@ program jf_test_42
     use jf_test_42_mod , only: test_42
     implicit none
     integer :: n_errors
-    n_errors = 0
     call test_42(n_errors)
     if (n_errors /= 0) stop 1
 
diff --git a/src/tests/jf_test_43.F90 b/src/tests/jf_test_43.F90
@@ -91,7 +91,6 @@ program jf_test_43
     use jf_test_43_mod , only: test_43
     implicit none
     integer :: n_errors
-    n_errors = 0
     call test_43(n_errors)
     if (n_errors /= 0) stop 1
 
diff --git a/src/tests/jf_test_44.F90 b/src/tests/jf_test_44.F90
@@ -101,7 +101,6 @@ program jf_test_44
     use jf_test_44_mod , only: test_44
     implicit none
     integer :: n_errors
-    n_errors = 0
     call test_44(n_errors)
     if (n_errors /= 0) stop 1
 
diff --git a/src/tests/jf_test_45.F90 b/src/tests/jf_test_45.F90
@@ -149,7 +149,6 @@ program jf_test_45
     use jf_test_45_mod , only: test_45
     implicit none
     integer :: n_errors
-    n_errors = 0
     call test_45(n_errors)
     if (n_errors /= 0) stop 1
 
diff --git a/src/tests/jf_test_46.F90 b/src/tests/jf_test_46.F90
@@ -298,7 +298,6 @@ program jf_test_46
     use jf_test_46_mod , only: test_46
     implicit none
     integer :: n_errors
-    n_errors = 0
     call test_46(n_errors)
     if (n_errors /= 0) stop 1
 
diff --git a/src/tests/jf_test_47.F90 b/src/tests/jf_test_47.F90
@@ -52,6 +52,8 @@ subroutine test_47(error_cnt)
     write(error_unit,'(A)') '================================='
     write(error_unit,'(A)') ''
 
+    error_cnt = 0
+
     call json%deserialize(inp, STR)
     call json%check_for_errors(status_ok, errtxt)
     if (.not. status_ok) then
@@ -137,7 +139,6 @@ program jf_test_47
     use jf_test_47_mod , only: test_47
     implicit none
     integer :: n_errors
-    n_errors = 0
     call test_47(n_errors)
     if (n_errors /= 0) stop 1
 
