From eae2ed4075709164d7d2de1682970f9b1c1a2d9a Mon Sep 17 00:00:00 2001
From: Sebastian Wilzbach <seb@wilzba.ch>
Date: Thu, 15 Jun 2017 02:43:57 +0200
Subject: [PATCH] Fix Issue 17501 - Runnable unittest problem with AST rewrite

---
 assert_writeln_magic.d | 105 +++++++++++++++++++++++++++++++++++------
 1 file changed, 90 insertions(+), 15 deletions(-)

diff --git a/assert_writeln_magic.d b/assert_writeln_magic.d
index e386ac81f1..56c608c593 100755
--- a/assert_writeln_magic.d
+++ b/assert_writeln_magic.d
@@ -43,14 +43,13 @@ private string formatNode(T)(const T t)
     return writer.data;
 }
 
-class TestVisitor : ASTVisitor
+class TestVisitor(Out) : ASTVisitor
 {
     import dparse.lexer : tok, Token;
 
-    this(string fileName, string destFile)
+    this(Out fl)
     {
-        this.fileName = fileName;
-        fl = FileLines(fileName, destFile);
+        this.fl = fl;
     }
 
     alias visit = ASTVisitor.visit;
@@ -77,6 +76,10 @@ class TestVisitor : ASTVisitor
         if (inFunctionCall)
             return;
 
+        // only look at `a == b` within the AssertExpression
+        if (typeid(expr.assertion) != typeid(CmpExpression))
+            return;
+
         lastAssert = expr;
         inAssert = true;
         expr.accept(this);
@@ -172,15 +175,26 @@ private:
     Rebindable!(const AssertExpression) lastAssert;
     Rebindable!(const EqualExpression) lastEqualExpression;
 
-    string fileName;
-    FileLines fl;
+    Out fl;
 }
 
-void parseFile(string fileName, string destFile)
+void parseString(Visitor)(ubyte[] sourceCode, string fileName, Visitor visitor)
 {
     import dparse.lexer;
     import dparse.parser : parseModule;
     import dparse.rollback_allocator : RollbackAllocator;
+
+    LexerConfig config;
+    auto cache = StringCache(StringCache.defaultBucketCount);
+    const(Token)[] tokens = getTokensForParser(sourceCode, config, &cache).array;
+
+    RollbackAllocator rba;
+    auto m = parseModule(tokens, fileName, &rba);
+    visitor.visit(m);
+}
+
+void parseFile(string fileName, string destFile)
+{
     import std.array : uninitializedArray;
 
     auto inFile = File(fileName);
@@ -192,14 +206,9 @@ void parseFile(string fileName, string destFile)
         return;
 
     inFile.rawRead(sourceCode);
-    LexerConfig config;
-    auto cache = StringCache(StringCache.defaultBucketCount);
-    const(Token)[] tokens = getTokensForParser(sourceCode, config, &cache).array;
-
-    RollbackAllocator rba;
-    auto m = parseModule(tokens, fileName, &rba);
-    auto visitor = new TestVisitor(fileName, destFile);
-    visitor.visit(m);
+    auto fl = FileLines(fileName, destFile);
+    auto visitor = new TestVisitor!(typeof(fl))(fl);
+    parseString(sourceCode, fileName, visitor);
     delete visitor;
 }
 
@@ -211,6 +220,7 @@ string rebasePath(string path, string oldBase, string newBase)
     return buildPath(newBase, path.absolutePath.relativePath(oldBase.absolutePath));
 }
 
+version(unittest) { void main(){} } else
 void main(string[] args)
 {
     import std.file;
@@ -324,3 +334,68 @@ struct FileLines
         lines[i] = line;
     }
 }
+
+version(unittest)
+{
+    struct FileLinesMock
+    {
+        string[] lines;
+        string opIndex(size_t i) { return lines[i]; }
+        void opIndexAssign(string line, size_t i) {
+            lines[i] = line;
+        }
+    }
+    auto runTest(string sourceCode)
+    {
+        import std.string : representation;
+        auto mock = FileLinesMock(sourceCode.split("\n"));
+        auto visitor = new TestVisitor!(typeof(mock))(mock);
+        parseString(sourceCode.representation.dup, "testmodule", visitor);
+        delete visitor;
+        return mock;
+    }
+}
+
+
+unittest
+{
+    "Running tests for assert_writeln_magic".writeln;
+
+    // purposefully not indented
+    string testCode = q{
+unittest
+{
+assert(equal(splitter!(a => a == ' ')("hello  world"), [ "hello", "", "world" ]));
+assert(equal(splitter!(a => a == 0)(a), w));
+}
+    };
+    auto res = runTest(testCode);
+    assert(res.lines[3 .. $ - 2] == [
+        "assert(equal(splitter!(a => a == ' ')(\"hello  world\"), [ \"hello\", \"\", \"world\" ]));",
+        "assert(equal(splitter!(a => a == 0)(a), w));"
+    ]);
+}
+
+unittest
+{
+    string testCode = q{
+unittest
+{
+assert(1 == 2);
+assert(foo() == "bar");
+assert(foo() == bar);
+assert(arr == [0, 1, 2]);
+assert(r.back == 1);
+}
+    };
+    auto res = runTest(testCode);
+    assert(res.lines[3 .. $ - 2] == [
+        "writeln(1); // 2",
+        "writeln(foo()); // \"bar\"",
+        "writeln(foo()); // bar",
+        "writeln(arr); // [0, 1, 2]",
+        "writeln(r.back); // 1",
+    ]);
+
+    "Successfully ran tests for assert_writeln_magic".writeln;
+}