Skip to content

Commit a9b996a

Browse files
committed
refac(srting_test): wrap workarounds in blocks
1 parent a2ae20c commit a9b996a

File tree

1 file changed

+58
-38
lines changed

1 file changed

+58
-38
lines changed

test/string_test.F90

Lines changed: 58 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,11 @@ function extracts_key() result(passed)
6060
passed = line%get_json_key() == string_t("foo")
6161
end associate
6262
#else
63-
type(string_t) line
64-
line = string_t('"foo" : "bar"')
65-
passed = line%get_json_key() == string_t("foo")
63+
block
64+
type(string_t) line
65+
line = string_t('"foo" : "bar"')
66+
passed = line%get_json_key() == string_t("foo")
67+
end block
6668
#endif
6769
end function
6870

@@ -74,9 +76,11 @@ function extracts_real_value() result(passed)
7476
passed = line%get_json_value(key=string_t("pi"), mold=1.) == 3.14159
7577
end associate
7678
#else
77-
type(string_t) line
78-
line = string_t('"pi" : 3.14159')
79-
passed = line%get_json_value(key=string_t("pi"), mold=1.) == 3.14159
79+
block
80+
type(string_t) line
81+
line = string_t('"pi" : 3.14159')
82+
passed = line%get_json_value(key=string_t("pi"), mold=1.) == 3.14159
83+
end block
8084
#endif
8185
end function
8286

@@ -88,9 +92,11 @@ function extracts_string_value() result(passed)
8892
passed = line%get_json_value(key=string_t("foo"), mold=string_t("")) == string_t("bar")
8993
end associate
9094
#else
91-
type(string_t) line
92-
line = string_t('"foo" : "bar"')
93-
passed = line%get_json_value(key=string_t("foo"), mold=string_t("")) == string_t("bar")
95+
block
96+
type(string_t) line
97+
line = string_t('"foo" : "bar"')
98+
passed = line%get_json_value(key=string_t("foo"), mold=string_t("")) == string_t("bar")
99+
end block
94100
#endif
95101
end function
96102

@@ -102,9 +108,11 @@ function extracts_integer_value() result(passed)
102108
passed = line%get_json_value(key=string_t("an integer"), mold=0) == 99
103109
end associate
104110
#else
105-
type(string_t) line
106-
line = string_t('"an integer" : 99')
107-
passed = line%get_json_value(key=string_t("an integer"), mold=0) == 99
111+
block
112+
type(string_t) line
113+
line = string_t('"an integer" : 99')
114+
passed = line%get_json_value(key=string_t("an integer"), mold=0) == 99
115+
end block
108116
#endif
109117
end function
110118

@@ -126,18 +134,20 @@ function extracts_logical_value() result(passed)
126134
end associate
127135
end associate
128136
#else
129-
type(string_t) key_true_pair, key_false_pair, trailing_comma
130-
logical true, false, true_too
137+
block
138+
type(string_t) key_true_pair, key_false_pair, trailing_comma
139+
logical true, false, true_too
131140

132-
key_true_pair = string_t('"yada yada" : true')
133-
key_false_pair = string_t('"blah blah" : false')
134-
trailing_comma = string_t('"trailing comma" : true,')
141+
key_true_pair = string_t('"yada yada" : true')
142+
key_false_pair = string_t('"blah blah" : false')
143+
trailing_comma = string_t('"trailing comma" : true,')
135144

136-
true = key_true_pair%get_json_value(key=string_t("yada yada"), mold=.true.)
137-
false = key_false_pair%get_json_value(key=string_t("blah blah"), mold=.true.)
138-
true_too = trailing_comma%get_json_value(key=string_t("trailing comma"), mold=.true.)
145+
true = key_true_pair%get_json_value(key=string_t("yada yada"), mold=.true.)
146+
false = key_false_pair%get_json_value(key=string_t("blah blah"), mold=.true.)
147+
true_too = trailing_comma%get_json_value(key=string_t("trailing comma"), mold=.true.)
139148

140-
passed = true .and. true_too .and. .not. false
149+
passed = true .and. true_too .and. .not. false
150+
end block
141151
#endif
142152
end function
143153

@@ -151,11 +161,13 @@ function extracts_integer_array_value() result(passed)
151161
end associate
152162
end associate
153163
#else
154-
type(string_t) key_integer_array_pair
155-
integer, allocatable :: integer_array(:)
156-
key_integer_array_pair = string_t('"some key" : [1, 2, 3],')
157-
integer_array = key_integer_array_pair%get_json_value(key=string_t("some key"), mold=[integer::])
158-
passed = all(integer_array == [1, 2, 3])
164+
block
165+
type(string_t) key_integer_array_pair
166+
integer, allocatable :: integer_array(:)
167+
key_integer_array_pair = string_t('"some key" : [1, 2, 3],')
168+
integer_array = key_integer_array_pair%get_json_value(key=string_t("some key"), mold=[integer::])
169+
passed = all(integer_array == [1, 2, 3])
170+
end block
159171
#endif
160172
end function
161173

@@ -203,9 +215,11 @@ function supports_concatenation_operator() result(passed)
203215
passed = prefix // infix // postfix == prefix // infix%string() // postfix
204216
end associate
205217
#else
206-
type(string_t) infix
207-
infix = string_t(" yada yada ")
208-
passed = prefix // infix // postfix == prefix // infix%string() // postfix
218+
block
219+
type(string_t) infix
220+
infix = string_t(" yada yada ")
221+
passed = prefix // infix // postfix == prefix // infix%string() // postfix
222+
end block
209223
#endif
210224
end function
211225

@@ -217,9 +231,11 @@ function constructs_from_default_integer() result(passed)
217231
passed = adjustl(trim(string%string())) == "1234567890"
218232
end associate
219233
#else
220-
type(string_t) string
221-
string = string_t(1234567890)
222-
passed = adjustl(trim(string%string())) == "1234567890"
234+
block
235+
type(string_t) string
236+
string = string_t(1234567890)
237+
passed = adjustl(trim(string%string())) == "1234567890"
238+
end block
223239
#endif
224240
end function
225241

@@ -252,9 +268,11 @@ function extracts_file_base_name() result(passed)
252268
passed = string%base_name() == "foo .bar"
253269
end associate
254270
#else
255-
type(string_t) string
256-
string = string_t(" foo .bar.too ")
257-
passed = string%base_name() == "foo .bar"
271+
block
272+
type(string_t) string
273+
string = string_t(" foo .bar.too ")
274+
passed = string%base_name() == "foo .bar"
275+
end block
258276
#endif
259277
end function
260278

@@ -266,9 +284,11 @@ function extracts_file_name_extension() result(passed)
266284
passed = string%file_extension() == "too"
267285
end associate
268286
#else
269-
type(string_t) string
270-
string = string_t(" foo .bar.too ")
271-
passed = string%file_extension() == "too"
287+
block
288+
type(string_t) string
289+
string = string_t(" foo .bar.too ")
290+
passed = string%file_extension() == "too"
291+
end block
272292
#endif
273293
end function
274294

0 commit comments

Comments
 (0)