Skip to content

Commit dac978f

Browse files
committed
Refactor: Extract common function in tests
1 parent 5727994 commit dac978f

File tree

1 file changed

+12
-36
lines changed

1 file changed

+12
-36
lines changed

source/iopipe/json/parser.d

Lines changed: 12 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -2370,15 +2370,23 @@ unittest
23702370
}
23712371
}
23722372

2373+
version(unittest)
2374+
{
2375+
bool check(Element)(Element item, JSONToken token, string expected)
2376+
{
2377+
if(item.token == token && item.data == expected)
2378+
return true;
2379+
import std.stdio;
2380+
writeln(item);
2381+
return false;
2382+
}
2383+
}
2384+
23732385
unittest
23742386
{
23752387
// test caching
23762388
auto jsonData = q"{{"a": 1,"b": 123.456, "c": null}}";
23772389
auto parser = jsonData.jsonTokenizer!(ParseConfig(false));
2378-
bool check(parser.Element item, JSONToken token, string expected)
2379-
{
2380-
return(item.token == token && item.data == expected);
2381-
}
23822390
with(JSONToken)
23832391
{
23842392
assert(check(parser.next, ObjectStart, "{"));
@@ -2427,14 +2435,6 @@ unittest
24272435
{
24282436
string jsonData = `{"a" : [1, 2, 3], "b" : {"c" : {"d": 2, "e": 3}}, "f": 3}`;
24292437
auto parser = jsonData.jsonTokenizer!(ParseConfig(false));
2430-
bool check(parser.Element item, JSONToken token, string expected)
2431-
{
2432-
if(item.token == token && item.data == expected)
2433-
return true;
2434-
import std.stdio;
2435-
writeln(item);
2436-
return false;
2437-
}
24382438

24392439
with(JSONToken)
24402440
{
@@ -2454,14 +2454,6 @@ unittest
24542454
auto jsonData = q"{{"a" : 1, "b" : {"c" : [1,2,3], "d" : { "hello" : "world" }}}}";
24552455

24562456
auto parser = jsonData.jsonTokenizer!(ParseConfig(false));
2457-
bool check(parser.Element item, JSONToken token, string expected)
2458-
{
2459-
if(item.token == token && item.data == expected)
2460-
return true;
2461-
import std.stdio;
2462-
writeln(item);
2463-
return false;
2464-
}
24652457
parser.Element doSkip()
24662458
{
24672459
auto token = parser.skipItem();
@@ -2514,14 +2506,6 @@ unittest
25142506
auto jsonData = q"{{'a' : 1, b : {c : [1,2,NaN,Infinity, 0x55, 55., .2], t : { false9: 'world' }}}}";
25152507

25162508
auto parser = jsonData.jsonTokenizer!(ParseConfig(false, true));
2517-
bool check(parser.Element item, JSONToken token, string expected)
2518-
{
2519-
if(item.token == token && item.data == expected)
2520-
return true;
2521-
import std.stdio;
2522-
writeln(item);
2523-
return false;
2524-
}
25252509
auto idx = parser.index;
25262510
parser.Element doSkip()
25272511
{
@@ -2585,14 +2569,6 @@ unittest
25852569
},
25862570
}`;
25872571
auto parser = jsonData.jsonTokenizer!(ParseConfig(false, true, false, true));
2588-
bool check(parser.Element item, JSONToken token, string expected)
2589-
{
2590-
if(item.token == token && item.data == expected)
2591-
return true;
2592-
import std.stdio;
2593-
writeln(item);
2594-
return false;
2595-
}
25962572
with(JSONToken)
25972573
{
25982574
assert(check(parser.next, Comment, "// This is a comment, it should be included\n"));

0 commit comments

Comments
 (0)