Merge pull request #1693 from wilzbach/enable-tests

Fix Issue 17501 - Runnable unittest problem with AST rewrite
merged-on-behalf-of: Vladimir Panteleev <github@thecybershadow.net>

Author: dlang-bot

.travis.yml

@@ -0,0 +1,15 @@
+dist: trusty
+sudo: false
+
+language: d
+os:
+ - linux
+d:
+ - dmd
+ - dmd-beta
+ - dmd-nightly
+ - ldc
+ - ldc-beta
+
+script:
+  - make -f posix.mak test

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;
+}

changelog/2.072.0.dd

@@ -372,13 +372,13 @@ $(BUGSTITLE Library Changes,
             or program may malfunction due to changed call order of module static construction/destruction.
             In order to preserve the program behaviour without the need to specify `--DRT-oncycle` command line argument,
             it is possible to instruct the linker by declaring the following array in the source code:)
-            
+
             ---
             extern(C) __gshared string[] rt_options = [ "oncycle=ignore" ];
             ---
-            
+
         ($P For more information, please consult the D language specification, section Overriding Cycle Detection Abort in chapter 4
-            and chapter 28.7 Configuring the Garbage Collector.)        
+            and chapter 28.7 Configuring the Garbage Collector.)
     )
 
     $(LI $(LNAME2 std-digest-murmurhash, Implementation of `std.digest.murmurhash`).

changelog/2.073.0.dd

@@ -37,7 +37,7 @@ $(BUGSTITLE Compiler changes,
 $(LI $(LNAME2 mscrtlib-option,New command line option $(B -mscrtlib=$(I libname)) for Windows MS-COFF object files.)
     $(P
         If building MS-COFF object files with -m64 or -m32mscoff, this option
-        specifies the reference to the C runtime library $(I libname) that is 
+        specifies the reference to the C runtime library $(I libname) that is
         embedded into the object file containing `main`,
         `DllMain` or `WinMain` for automatic linking. The default is $(TT libcmt)
         (release version with static linkage), the other usual alternatives are

foundation.dd

@@ -63,8 +63,8 @@ $(H3 Official contacts)
 $(P The D Language Foundation has been incorporated with the state of Washington, USA.
     The employer ID is 47-5352856.)
 
-$(P To contact the D Language Foundation, please direct emails to 
-$(LINK2 mailto:foundation@dlang.org, foundation@dlang.org) and other correspondence to 
+$(P To contact the D Language Foundation, please direct emails to
+$(LINK2 mailto:foundation@dlang.org, foundation@dlang.org) and other correspondence to
 6830 NE Bothell Way, Suite C-162, Kenmore WA 98028.)
 
 )

posix.mak

@@ -560,7 +560,7 @@ ${STABLE_DMD}:
 		unzip -qd ${STABLE_DMD_ROOT} $${TMPFILE}.zip && rm $${TMPFILE}.zip
 
 ${DUB}: ${DUB_DIR} ${STABLE_DMD}
-	cd ${DUB_DIR} && DC="$(abspath ${STABLE_DMD}) -conf=$(abspath ${STABLE_DMD_CONF})" ./build.sh
+	cd ${DUB_DIR} && DMD="${STABLE_DMD}" ./build.sh
 
 ################################################################################
 # chm help files
@@ -589,11 +589,16 @@ d.tag : chmgen.d $(STABLE_DMD) $(ALL_FILES) phobos-release druntime-release
 
 ASSERT_WRITELN_BIN = $(GENERATED)/assert_writeln_magic
 
-$(ASSERT_WRITELN_BIN): assert_writeln_magic.d $(DUB)
+$(ASSERT_WRITELN_BIN): assert_writeln_magic.d $(DUB) $(STABLE_DMD)
 	@mkdir -p $(dir $@)
 	$(DUB) build --single --compiler=$(STABLE_DMD) $<
 	@mv ./assert_writeln_magic $@
 
+$(ASSERT_WRITELN_BIN)_test: assert_writeln_magic.d $(DUB) $(STABLE_DMD)
+	@mkdir -p $(dir $@)
+	$(DUB) build --single --compiler=$(STABLE_DMD) --build=unittest $<
+	@mv ./assert_writeln_magic $@
+
 $(PHOBOS_FILES_GENERATED): $(PHOBOS_DIR_GENERATED)/%: $(PHOBOS_DIR)/% $(DUB) $(ASSERT_WRITELN_BIN)
 	@mkdir -p $(dir $@)
 	@if [ $(subst .,, $(suffix $@)) == "d" ] && [ "$@" != "$(PHOBOS_DIR_GENERATED)/index.d" ] ; then \
@@ -610,9 +615,12 @@ $(PHOBOS_STABLE_FILES_GENERATED): $(PHOBOS_STABLE_DIR_GENERATED)/%: $(PHOBOS_STA
 # Style tests
 ################################################################################
 
-test:
+test: $(ASSERT_WRITELN_BIN)_test
 	@echo "Searching for trailing whitespace"
-	if [[ $$(find . -type f -name "*.dd" -exec egrep -l " +$$" {} \;) ]] ;  then $$(exit 1); fi
+	@echo "Check for trailing whitespace"
+	grep -n '[[:blank:]]$$' $$(find . -type f -name "*.dd") ; test $$? -eq 1
+	@echo "Executing assert_writeln_magic tests"
+	$<
 
 ################################################################################
 # Changelog generation