From b1ec8ce1639328595de5ceead98b5c7b0e338398 Mon Sep 17 00:00:00 2001 From: Eugene Auduchinok Date: Fri, 14 Apr 2023 14:53:31 +0200 Subject: [PATCH 1/4] Tests/syntax: produce tmp file when result doesn't match baselines --- tests/service/SyntaxTreeTests.fs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/service/SyntaxTreeTests.fs b/tests/service/SyntaxTreeTests.fs index 2650ad1720e..55e6400f10e 100644 --- a/tests/service/SyntaxTreeTests.fs +++ b/tests/service/SyntaxTreeTests.fs @@ -187,5 +187,7 @@ let ParseFile fileName = if not (isNull testUpdateBSLEnv) && testUpdateBSLEnv.Trim() = "1" then File.WriteAllText(bslPath, actual) + elif expected <> actual then + File.WriteAllText($"{fullPath}.tmp", actual) Assert.AreEqual(expected, actual) From 46df9a285cf0564fecc0fd5dfd498545cc300fba Mon Sep 17 00:00:00 2001 From: Eugene Auduchinok Date: Fri, 14 Apr 2023 16:35:17 +0200 Subject: [PATCH 2/4] Delete tmp file when results matches --- tests/service/SyntaxTreeTests.fs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/service/SyntaxTreeTests.fs b/tests/service/SyntaxTreeTests.fs index 55e6400f10e..49317b15271 100644 --- a/tests/service/SyntaxTreeTests.fs +++ b/tests/service/SyntaxTreeTests.fs @@ -175,7 +175,9 @@ let ParseFile fileName = $"%A{ast}\n\n%s{diagnostics}" |> normalize |> sprintf "%s\n" + let bslPath = $"{fullPath}.bsl" + let tmpPath = $"{fullPath}.tmp" let expected = if File.Exists bslPath then @@ -183,11 +185,14 @@ let ParseFile fileName = else "No baseline was found" + let equals = expected = actual let testUpdateBSLEnv = System.Environment.GetEnvironmentVariable("TEST_UPDATE_BSL") if not (isNull testUpdateBSLEnv) && testUpdateBSLEnv.Trim() = "1" then File.WriteAllText(bslPath, actual) - elif expected <> actual then - File.WriteAllText($"{fullPath}.tmp", actual) + elif not equals then + File.WriteAllText(tmpPath, actual) + else + File.Delete(tmpPath) Assert.AreEqual(expected, actual) From 86803fb59c0892a0eb3eb6f72572db999d8c9a97 Mon Sep 17 00:00:00 2001 From: Eugene Auduchinok Date: Mon, 17 Apr 2023 16:37:34 +0200 Subject: [PATCH 3/4] Rename tmp -> actual --- tests/service/SyntaxTreeTests.fs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/service/SyntaxTreeTests.fs b/tests/service/SyntaxTreeTests.fs index 49317b15271..426ecb513a9 100644 --- a/tests/service/SyntaxTreeTests.fs +++ b/tests/service/SyntaxTreeTests.fs @@ -177,7 +177,7 @@ let ParseFile fileName = |> sprintf "%s\n" let bslPath = $"{fullPath}.bsl" - let tmpPath = $"{fullPath}.tmp" + let actualPath = $"{fullPath}.actual" let expected = if File.Exists bslPath then @@ -191,8 +191,8 @@ let ParseFile fileName = if not (isNull testUpdateBSLEnv) && testUpdateBSLEnv.Trim() = "1" then File.WriteAllText(bslPath, actual) elif not equals then - File.WriteAllText(tmpPath, actual) + File.WriteAllText(actualPath, actual) else - File.Delete(tmpPath) + File.Delete(actualPath) Assert.AreEqual(expected, actual) From 40579fa359a120f4e1a7727685b5067320732e28 Mon Sep 17 00:00:00 2001 From: Eugene Auduchinok Date: Mon, 17 Apr 2023 16:37:47 +0200 Subject: [PATCH 4/4] Ignore tmp files in git --- tests/service/data/SyntaxTree/.gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 tests/service/data/SyntaxTree/.gitignore diff --git a/tests/service/data/SyntaxTree/.gitignore b/tests/service/data/SyntaxTree/.gitignore new file mode 100644 index 00000000000..5842cb6df9b --- /dev/null +++ b/tests/service/data/SyntaxTree/.gitignore @@ -0,0 +1 @@ +*.actual