mirrors/tools
1
0
Fork 0
mirror of https://github.com/dlang/tools.git synced 2025-04-28 14:10:32 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #354 from wilzbach/tests-line-number

Browse source 
Display the correct line number when executing the extracted public tests
merged-on-behalf-of: Petar Kirov <ZombineDev@users.noreply.github.com>
This commit is contained in:
The Dlang Bot 2018-06-25 09:12:43 +02:00 • committed by GitHub
commit c048231ac9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 47 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

30
test/tests_extractor/ascii.d.ext
View file

@ -1,4 +1,4 @@
// Line 109 # line 107
unittest unittest
{ {
import std.ascii; import std.ascii;
@ -11,7 +11,7 @@ unittest
assert(!isAlphaNum('á')); assert(!isAlphaNum('á'));
} }
// Line 140 # line 138
unittest unittest
{ {
import std.ascii; import std.ascii;
@ -24,7 +24,7 @@ unittest
assert(!isAlpha('á')); assert(!isAlpha('á'));
} }
// Line 170 # line 168
unittest unittest
{ {
import std.ascii; import std.ascii;
@ -38,7 +38,7 @@ unittest
assert(!isLower('Á')); assert(!isLower('Á'));
} }
// Line 201 # line 199
unittest unittest
{ {
import std.ascii; import std.ascii;
@ -52,7 +52,7 @@ unittest
assert(!isUpper('Á')); assert(!isUpper('Á'));
} }
// Line 232 # line 230
unittest unittest
{ {
import std.ascii; import std.ascii;
@ -67,7 +67,7 @@ unittest
assert(!isDigit('４')); // full-width digit four (U+FF14) assert(!isDigit('４')); // full-width digit four (U+FF14)
} }
// Line 264 # line 262
unittest unittest
{ {
import std.ascii; import std.ascii;
@ -79,7 +79,7 @@ unittest
assert(!isOctalDigit('#')); assert(!isOctalDigit('#'));
} }
// Line 293 # line 291
unittest unittest
{ {
import std.ascii; import std.ascii;
@ -92,7 +92,7 @@ unittest
assert(!isHexDigit('#')); assert(!isHexDigit('#'));
} }
// Line 325 # line 323
unittest unittest
{ {
import std.ascii; import std.ascii;
@ -110,7 +110,7 @@ unittest
assert(!isWhite('\u00A0')); // std.ascii.isWhite assert(!isWhite('\u00A0')); // std.ascii.isWhite
} }
// Line 360 # line 358
unittest unittest
{ {
import std.ascii; import std.ascii;
@ -129,7 +129,7 @@ unittest
assert(!isControl('\u2029')); assert(!isControl('\u2029'));
} }
// Line 399 # line 397
unittest unittest
{ {
import std.ascii; import std.ascii;
@ -153,7 +153,7 @@ unittest
assert(!isPunctuation('\u2012')); // (U+2012 = en-dash) assert(!isPunctuation('\u2012')); // (U+2012 = en-dash)
} }
// Line 443 # line 441
unittest unittest
{ {
import std.ascii; import std.ascii;
@ -169,7 +169,7 @@ unittest
assert(!isGraphical('á')); assert(!isGraphical('á'));
} }
// Line 479 # line 477
unittest unittest
{ {
import std.ascii; import std.ascii;
@ -184,7 +184,7 @@ unittest
assert(!isPrintable('á')); assert(!isPrintable('á'));
} }
// Line 515 # line 513
unittest unittest
{ {
import std.ascii; import std.ascii;
@ -193,7 +193,7 @@ unittest
assert(!isASCII('á')); assert(!isASCII('á'));
} }
// Line 556 # line 554
unittest unittest
{ {
import std.ascii; import std.ascii;
@ -206,7 +206,7 @@ unittest
assert(toLower('Á') == 'Á'); assert(toLower('Á') == 'Á');
} }
// Line 618 # line 616
unittest unittest
{ {
import std.ascii; import std.ascii;

50
test/tests_extractor/iteration.d.ext
View file

@ -1,4 +1,4 @@
// Line 165 # line 163
unittest unittest
{ {
import std.algorithm.iteration; import std.algorithm.iteration;
@ -42,7 +42,7 @@ unittest
assert(counter == iota(-4, 5).length); assert(counter == iota(-4, 5).length);
} }
// Line 220 # line 218
unittest unittest
{ {
import std.algorithm.iteration; import std.algorithm.iteration;
@ -62,7 +62,7 @@ unittest
assert(i == 3); //cache has accessed 3. It is still stored internally by cache. assert(i == 3); //cache has accessed 3. It is still stored internally by cache.
} }
// Line 497 # line 495
unittest unittest
{ {
import std.algorithm.iteration; import std.algorithm.iteration;
@ -75,7 +75,7 @@ unittest
assert(equal(squares, [ 1, 4, 9, 16, 25, 36 ])); assert(equal(squares, [ 1, 4, 9, 16, 25, 36 ]));
} }
// Line 512 # line 510
unittest unittest
{ {
import std.algorithm.iteration; import std.algorithm.iteration;
@ -92,7 +92,7 @@ unittest
} }
} }
// Line 530 # line 528
unittest unittest
{ {
import std.algorithm.iteration; import std.algorithm.iteration;
@ -104,7 +104,7 @@ unittest
assert(equal(stringize([ 1, 2, 3, 4 ]), [ "1", "2", "3", "4" ])); assert(equal(stringize([ 1, 2, 3, 4 ]), [ "1", "2", "3", "4" ]));
} }
// Line 957 # line 955
unittest unittest
{ {
import std.algorithm.iteration; import std.algorithm.iteration;
@ -147,7 +147,7 @@ unittest
assert(s.x == 1); assert(s.x == 1);
} }
// Line 1102 # line 1100
unittest unittest
{ {
import std.algorithm.iteration; import std.algorithm.iteration;
@ -178,7 +178,7 @@ unittest
assert(approxEqual(r1, [ 2.5 ])); assert(approxEqual(r1, [ 2.5 ]));
} }
// Line 1322 # line 1320
unittest unittest
{ {
import std.algorithm.iteration; import std.algorithm.iteration;
@ -199,7 +199,7 @@ unittest
assert(r.back == 102); assert(r.back == 102);
} }
// Line 1504 # line 1502
unittest unittest
{ {
import std.algorithm.iteration; import std.algorithm.iteration;
@ -212,7 +212,7 @@ unittest
tuple(4, 3u), tuple(5, 1u) ][])); tuple(4, 3u), tuple(5, 1u) ][]));
} }
// Line 1518 # line 1516
unittest unittest
{ {
import std.algorithm.iteration; import std.algorithm.iteration;
@ -229,7 +229,7 @@ unittest
assert(result == ["a": 2U, "b": 2U, "c": 3U, "d": 1U, "e": 1U]); assert(result == ["a": 2U, "b": 2U, "c": 3U, "d": 1U, "e": 1U]);
} }
// Line 1909 # line 1907
unittest unittest
{ {
import std.algorithm.iteration; import std.algorithm.iteration;
@ -258,7 +258,7 @@ unittest
])); ]));
} }
// Line 1959 # line 1957
unittest unittest
{ {
import std.algorithm.iteration; import std.algorithm.iteration;
@ -310,7 +310,7 @@ unittest
} }
} }
// Line 2282 # line 2280
unittest unittest
{ {
import std.algorithm.iteration; import std.algorithm.iteration;
@ -327,7 +327,7 @@ unittest
assert(["", ""].joiner("xyz").equal("xyz")); assert(["", ""].joiner("xyz").equal("xyz"));
} }
// Line 2885 # line 2883
unittest unittest
{ {
import std.algorithm.iteration; import std.algorithm.iteration;
@ -377,7 +377,7 @@ unittest
assert(approxEqual(r2, 112.5)); assert(approxEqual(r2, 112.5));
} }
// Line 2940 # line 2938
unittest unittest
{ {
import std.algorithm.iteration; import std.algorithm.iteration;
@ -402,7 +402,7 @@ unittest
auto stdev = sqrt(r[1] / a.length - avg * avg); auto stdev = sqrt(r[1] / a.length - avg * avg);
} }
// Line 3212 # line 3210
unittest unittest
{ {
import std.algorithm.iteration; import std.algorithm.iteration;
@ -431,7 +431,7 @@ unittest
assert(arr.fold!((a, b) => b) == 5); assert(arr.fold!((a, b) => b) == 5);
} }
// Line 3420 # line 3418
unittest unittest
{ {
import std.algorithm.iteration; import std.algorithm.iteration;
@ -482,7 +482,7 @@ unittest
assert(approxEqual(r2, [3, 7, 107, 109.5, 112.5])); assert(approxEqual(r2, [3, 7, 107, 109.5, 112.5]));
} }
// Line 3476 # line 3474
unittest unittest
{ {
import std.algorithm.iteration; import std.algorithm.iteration;
@ -505,7 +505,7 @@ unittest
assert(approxEqual(r2.map!"a[1]", [9, 25, 74, 195, 204, 208, 233])); // sum of squares assert(approxEqual(r2.map!"a[1]", [9, 25, 74, 195, 204, 208, 233])); // sum of squares
} }
// Line 3833 # line 3831
unittest unittest
{ {
import std.algorithm.iteration; import std.algorithm.iteration;
@ -524,7 +524,7 @@ unittest
assert(equal(splitter!"a.front == b"(w, 1), [ [[0]], [[2]] ])); assert(equal(splitter!"a.front == b"(w, 1), [ [[0]], [[2]] ]));
} }
// Line 4071 # line 4069
unittest unittest
{ {
import std.algorithm.iteration; import std.algorithm.iteration;
@ -541,7 +541,7 @@ unittest
assert(equal(splitter(a, [0, 0]), [ [], [1] ])); assert(equal(splitter(a, [0, 0]), [ [], [1] ]));
} }
// Line 4220 # line 4218
unittest unittest
{ {
import std.algorithm.iteration; import std.algorithm.iteration;
@ -561,7 +561,7 @@ unittest
assert(equal(splitter!(a => a.front == 1)(w), [ [[0]], [[2]] ])); assert(equal(splitter!(a => a.front == 1)(w), [ [[0]], [[2]] ]));
} }
// Line 4509 # line 4507
unittest unittest
{ {
import std.algorithm.iteration; import std.algorithm.iteration;
@ -571,7 +571,7 @@ unittest
assert(equal(splitter(a), ["a", "bcd", "ef", "gh"][])); assert(equal(splitter(a), ["a", "bcd", "ef", "gh"][]));
} }
// Line 4822 # line 4820
unittest unittest
{ {
import std.algorithm.iteration; import std.algorithm.iteration;
@ -603,7 +603,7 @@ unittest
.approxEqual((ulong.max / 2) * 4096.0 + 4096^^2 / 2)); .approxEqual((ulong.max / 2) * 4096.0 + 4096^^2 / 2));
} }
// Line 4954 # line 4952
unittest unittest
{ {
import std.algorithm.iteration; import std.algorithm.iteration;
@ -624,7 +624,7 @@ unittest
assert(equal(uniq([ 1, 1, 2, 1, 1, 3, 1]), [1, 2, 1, 3, 1])); assert(equal(uniq([ 1, 1, 2, 1, 1, 3, 1]), [1, 2, 1, 3, 1]));
} }
// Line 5180 # line 5178
unittest unittest
{ {
import std.algorithm.iteration; import std.algorithm.iteration;

10
tests_extractor.d
View file

@ -67,9 +67,13 @@ class TestVisitor : ASTVisitor
private: private:
void print(const Unittest u) void print(const Unittest u)
{ {
/*
// write the origin source code line Write the origin source code line
outFile.writefln("// Line %d", u.line); u.line is the first line of the unittest block, hence we need to
subtract two lines from it as we add "import <current.module>\n\n" at
the top of the unittest.
*/
outFile.writefln("# line %d", u.line > 2 ? u.line - 2 : 0);
// write the unittest block // write the unittest block
outFile.write("unittest\n{\n"); outFile.write("unittest\n{\n");