Skip to content

Commit f8acfef

Browse files
jacobwilliamsjacobwilliams
authored
Merge pull request #625 from jacobwilliams/624-test-reorganization
moved tests to test folder
2 parents 6077c15 + 2b699fc commit f8acfef

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+71
-334
lines changed

‎.github/workflows/CI.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ jobs:
189189
run: |
190190
echo ${TAGNAME}
191191
rm -rf doc
192-
sed "2 s/^/version: ${TAGNAME}\n/" json-fortran.md > json-fortran.tagged.md
192+
sed "2 s/^/version: ${TAGNAME}\n/" ford.md > json-fortran.tagged.md
193193
ford --debug json-fortran.tagged.md
194194
195195
- name: Deploy documentation for tagged release
@@ -206,5 +206,5 @@ jobs:
206206
run: |
207207
rm json_*.F90-*unicode.gcov || true
208208
mv json_*.F90.gcov src/
209-
mv jf_test*.[fF]90.gcov src/tests/
209+
mv jf_test*.[fF]90.gcov test/
210210
bash <(curl -s https://codecov.io/bash) -v -X $GCOV

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ build/
55
install/
66
doc/
77
.vscode/
8+
/env
89

910
*.gcov
1011
*.gcov.md*

‎CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ set ( JF_LIB_SRCS src/json_kinds.F90
9292
src/json_value_module.F90
9393
src/json_file_module.F90
9494
src/json_module.F90 )
95-
file ( GLOB JF_TEST_SRCS "src/tests/jf_test_*.F90" )
95+
file ( GLOB JF_TEST_SRCS "test/jf_test_*.F90" )
9696
set ( JF_TEST_UCS4_SUPPORT_SRC "${PROJECT_SOURCE_DIR}/src/tests/introspection/test_iso_10646_support.f90")
9797

9898
#-----------------------------------------
@@ -252,7 +252,7 @@ if ( NOT SKIP_DOC_GEN )
252252
set ( DOC_DIR "${PROJECT_BINARY_DIR}/doc" )
253253
set ( PAGES_DIR "${PROJECT_SOURCE_DIR}/pages" )
254254
set ( PROJ_DIR "${PROJECT_SOURCE_DIR}/src" )
255-
set ( FORD_PROJECT_FILE "${PROJECT_SOURCE_DIR}/json-fortran.md" )
255+
set ( FORD_PROJECT_FILE "${PROJECT_SOURCE_DIR}/ford.md" )
256256
if ( ENABLE_UNICODE )
257257
set ( MACRO_FLAG "-m USE_UCS4" )
258258
else ()
@@ -288,7 +288,7 @@ if ( NOT SKIP_DOC_GEN )
288288

289289
foreach ( DOC_SRC_FILE ${JF_LIB_SRCS} ${JF_TEST_SRCS} ${PROJECT_SOURCE_DIR}/README.md
290290
${PROJECT_SOURCE_DIR}/CHANGELOG.md ${PROJECT_SOURCE_DIR}/.github/CONTRIBUTING.md
291-
${PROJECT_SOURCE_DIR}/LICENSE ${PROJECT_SOURCE_DIR}/json-fortran.md ${PAGES_FILES} )
291+
${PROJECT_SOURCE_DIR}/LICENSE ${PROJECT_SOURCE_DIR}/ford.md ${PAGES_FILES} )
292292
list ( APPEND FORD_DEPENDS "${DOC_SRC_FILE}" )
293293
endforeach ()
294294
add_custom_command ( OUTPUT ${FORD_OUTPUTS_CACHED}

‎build.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,12 @@
7272
#set -v
7373
set -o errexit
7474

75-
FORDMD='json-fortran.md' # FORD options file for building documentation
75+
FORDMD='ford.md' # FORD options file for building documentation
7676
DOCDIR='./doc/' # build directory for documentation
7777
PAGESDIR='./pages/' # Directory for FORD "pages"
7878
SRCDIR='./src/' # library source directory
79-
TESTDIR='./src/tests/' # unit test source directory
80-
INTROSPECDIR='./src/tests/introspection/' # pre compile configuration tests directory
79+
TESTDIR='./test/' # unit test source directory
80+
INTROSPECDIR='./test/introspection/' # pre compile configuration tests directory
8181
UCS4TESTCODE='test_iso_10646_support.f90'
8282
BINDIR='./bin/' # build directory for unit tests
8383
LIBDIR='./lib/' # build directory for library

‎codecov.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ coverage:
44
fixes:
55
- doc/src::src
66
ignore:
7-
- src/tests
7+
- test
88
- doc
99
status:
1010
patch:

json-fortran.md renamed to ford.md

Lines changed: 0 additions & 2 deletions

‎fpm.toml‎

Lines changed: 3 additions & 265 deletions
Original file line numberDiff line numberDiff line change
@@ -9,271 +9,9 @@ keywords = ["JSON"]
99

1010
[build]
1111
external-modules = "ifcore"
12+
auto-executables = true
13+
auto-examples = true
14+
auto-tests = true
1215

1316
[library]
1417
source-dir = "src"
15-
16-
[[test]]
17-
name = "jf_test_01"
18-
source-dir = "src/tests"
19-
main = "jf_test_01.F90"
20-
21-
[[test]]
22-
name = "jf_test_02"
23-
source-dir = "src/tests"
24-
main = "jf_test_02.F90"
25-
26-
[[test]]
27-
name = "jf_test_03"
28-
source-dir = "src/tests"
29-
main = "jf_test_03.F90"
30-
31-
[[test]]
32-
name = "jf_test_04"
33-
source-dir = "src/tests"
34-
main = "jf_test_04.F90"
35-
36-
[[test]]
37-
name = "jf_test_05"
38-
source-dir = "src/tests"
39-
main = "jf_test_05.F90"
40-
41-
[[test]]
42-
name = "jf_test_06"
43-
source-dir = "src/tests"
44-
main = "jf_test_06.F90"
45-
46-
[[test]]
47-
name = "jf_test_07"
48-
source-dir = "src/tests"
49-
main = "jf_test_07.F90"
50-
51-
[[test]]
52-
name = "jf_test_08"
53-
source-dir = "src/tests"
54-
main = "jf_test_08.F90"
55-
56-
[[test]]
57-
name = "jf_test_09"
58-
source-dir = "src/tests"
59-
main = "jf_test_09.F90"
60-
61-
[[test]]
62-
name = "jf_test_10"
63-
source-dir = "src/tests"
64-
main = "jf_test_10.F90"
65-
66-
[[test]]
67-
name = "jf_test_11"
68-
source-dir = "src/tests"
69-
main = "jf_test_11.F90"
70-
71-
[[test]]
72-
name = "jf_test_12"
73-
source-dir = "src/tests"
74-
main = "jf_test_12.F90"
75-
76-
[[test]]
77-
name = "jf_test_13"
78-
source-dir = "src/tests"
79-
main = "jf_test_13.F90"
80-
81-
[[test]]
82-
name = "jf_test_14"
83-
source-dir = "src/tests"
84-
main = "jf_test_14.F90"
85-
86-
[[test]]
87-
name = "jf_test_15"
88-
source-dir = "src/tests"
89-
main = "jf_test_15.F90"
90-
91-
[[test]]
92-
name = "jf_test_16"
93-
source-dir = "src/tests"
94-
main = "jf_test_16.F90"
95-
96-
[[test]]
97-
name = "jf_test_17"
98-
source-dir = "src/tests"
99-
main = "jf_test_17.F90"
100-
101-
[[test]]
102-
name = "jf_test_18"
103-
source-dir = "src/tests"
104-
main = "jf_test_18.F90"
105-
106-
[[test]]
107-
name = "jf_test_19"
108-
source-dir = "src/tests"
109-
main = "jf_test_19.F90"
110-
111-
[[test]]
112-
name = "jf_test_20"
113-
source-dir = "src/tests"
114-
main = "jf_test_20.F90"
115-
116-
[[test]]
117-
name = "jf_test_21"
118-
source-dir = "src/tests"
119-
main = "jf_test_21.F90"
120-
121-
[[test]]
122-
name = "jf_test_22"
123-
source-dir = "src/tests"
124-
main = "jf_test_22.F90"
125-
126-
[[test]]
127-
name = "jf_test_23"
128-
source-dir = "src/tests"
129-
main = "jf_test_23.F90"
130-
131-
[[test]]
132-
name = "jf_test_24"
133-
source-dir = "src/tests"
134-
main = "jf_test_24.F90"
135-
136-
[[test]]
137-
name = "jf_test_25"
138-
source-dir = "src/tests"
139-
main = "jf_test_25.F90"
140-
141-
[[test]]
142-
name = "jf_test_26"
143-
source-dir = "src/tests"
144-
main = "jf_test_26.F90"
145-
146-
[[test]]
147-
name = "jf_test_27"
148-
source-dir = "src/tests"
149-
main = "jf_test_27.F90"
150-
151-
[[test]]
152-
name = "jf_test_28"
153-
source-dir = "src/tests"
154-
main = "jf_test_28.F90"
155-
156-
[[test]]
157-
name = "jf_test_29"
158-
source-dir = "src/tests"
159-
main = "jf_test_29.F90"
160-
161-
[[test]]
162-
name = "jf_test_30"
163-
source-dir = "src/tests"
164-
main = "jf_test_30.F90"
165-
166-
[[test]]
167-
name = "jf_test_31"
168-
source-dir = "src/tests"
169-
main = "jf_test_31.F90"
170-
171-
[[test]]
172-
name = "jf_test_32"
173-
source-dir = "src/tests"
174-
main = "jf_test_32.F90"
175-
176-
[[test]]
177-
name = "jf_test_33"
178-
source-dir = "src/tests"
179-
main = "jf_test_33.F90"
180-
181-
[[test]]
182-
name = "jf_test_34"
183-
source-dir = "src/tests"
184-
main = "jf_test_34.F90"
185-
186-
[[test]]
187-
name = "jf_test_35"
188-
source-dir = "src/tests"
189-
main = "jf_test_35.F90"
190-
191-
[[test]]
192-
name = "jf_test_36"
193-
source-dir = "src/tests"
194-
main = "jf_test_36.F90"
195-
196-
[[test]]
197-
name = "jf_test_37"
198-
source-dir = "src/tests"
199-
main = "jf_test_37.F90"
200-
201-
[[test]]
202-
name = "jf_test_38"
203-
source-dir = "src/tests"
204-
main = "jf_test_38.F90"
205-
206-
[[test]]
207-
name = "jf_test_39"
208-
source-dir = "src/tests"
209-
main = "jf_test_39.F90"
210-
211-
[[test]]
212-
name = "jf_test_40"
213-
source-dir = "src/tests"
214-
main = "jf_test_40.F90"
215-
216-
[[test]]
217-
name = "jf_test_41"
218-
source-dir = "src/tests"
219-
main = "jf_test_41.F90"
220-
221-
[[test]]
222-
name = "jf_test_42"
223-
source-dir = "src/tests"
224-
main = "jf_test_42.F90"
225-
226-
[[test]]
227-
name = "jf_test_43"
228-
source-dir = "src/tests"
229-
main = "jf_test_43.F90"
230-
231-
[[test]]
232-
name = "jf_test_44"
233-
source-dir = "src/tests"
234-
main = "jf_test_44.F90"
235-
236-
[[test]]
237-
name = "jf_test_45"
238-
source-dir = "src/tests"
239-
main = "jf_test_45.F90"
240-
241-
[[test]]
242-
name = "jf_test_46"
243-
source-dir = "src/tests"
244-
main = "jf_test_46.F90"
245-
246-
[[test]]
247-
name = "jf_test_47"
248-
source-dir = "src/tests"
249-
main = "jf_test_47.F90"
250-
251-
[[test]]
252-
name = "jf_test_48"
253-
source-dir = "src/tests"
254-
main = "jf_test_48.F90"
255-
256-
[[test]]
257-
name = "jf_test_49"
258-
source-dir = "src/tests"
259-
main = "jf_test_49.F90"
260-
261-
[[test]]
262-
name = "jf_test_50"
263-
source-dir = "src/tests"
264-
main = "jf_test_50.F90"
265-
266-
[[test]]
267-
name = "jf_test_51"
268-
source-dir = "src/tests"
269-
main = "jf_test_51.F90"
270-
271-
[[test]]
272-
name = "jf_test_52"
273-
source-dir = "src/tests"
274-
main = "jf_test_52.F90"
275-
276-
[[test]]
277-
name = "jf_test_53"
278-
source-dir = "src/tests"
279-
main = "jf_test_53.F90"

‎json-fortran.fobis‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ modes = static-gnu static-gnu-debug
88

99
[common-variables]
1010
$MOD_FILE = json_module.F90
11-
$FORD_FILE = json-fortran.md
11+
$FORD_FILE = ford.md
1212
$STATIC_LIB = libjsonfortran.a
1313
$SHARED_LIB = libjsonfortran.so
1414
$OPTIMIZE = -O2
15-
$CSTATIC_GNU = -c -fbacktrace -Wall -Wextra -Wno-maybe-uninitialized -Wno-unused-function -pedantic -std=f2008ts
16-
$DEBUG_GNU = -O0 -g3 -Warray-bounds -Wcharacter-truncation -Wline-truncation -Wimplicit-interface -Wimplicit-procedure -Wunderflow -fcheck=all -fmodule-private -ffree-line-length-132 -fimplicit-none -fbacktrace -fdump-core -finit-real=nan -std=f2008ts -fall-intrinsics
15+
$CSTATIC_GNU = -c -fbacktrace -Wall -Wextra -Wno-maybe-uninitialized -Wno-unused-function -pedantic
16+
$DEBUG_GNU = -O0 -g3 -Warray-bounds -Wcharacter-truncation -Wline-truncation -Wimplicit-interface -Wimplicit-procedure -Wunderflow -fcheck=all -fmodule-private -ffree-line-length-132 -fimplicit-none -fbacktrace -fdump-core -finit-real=nan -fall-intrinsics
1717
$CSTATIC_INT = -c -std18
1818
$DEBUG_INT = -O0 -debug all -check all -warn all -extend-source 132 -traceback -gen-interfaces -fpe-all=0 -fp-stack-check -fstack-protector-all -ftrapuv -no-ftz -std18
19-
$EXCLUDE_DIRS = ./src/tests/introspection
19+
$EXCLUDE_DIRS = ./test/introspection
2020
./visual_studio/jsonfortrantest
2121

2222
# modes templates

‎src/json_value_module.F90‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2503,7 +2503,7 @@ end subroutine json_value_create
25032503
! an object or array. It does not destroy the parent or
25042504
! previous elements.
25052505
!
2506-
!@Note There is some protection here to enable destruction of
2506+
!@note There is some protection here to enable destruction of
25072507
! improperly-created linked lists. However, likely there
25082508
! are cases not handled. Use the [[json_value_validate]]
25092509
! method to validate a JSON structure that was manually

src/tests/introspection/test_iso_10646_support.f90 renamed to test/introspection/test_iso_10646_support.f90

File renamed without changes.

0 commit comments

Comments
 (0)