From 2642a5287ed07d8122f2feb92d6edccdb2da1dbc Mon Sep 17 00:00:00 2001 From: cxl Date: Tue, 7 Mar 2017 10:42:09 +0000 Subject: [PATCH] .autotest git-svn-id: svn://ultimatepp.org/upp/trunk@10912 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- autotest/Witz/Witz.upp | 1 - autotest/Witz/etalon2 | 1 - autotest/Witz/main.cpp | 5 +++-- 3 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 autotest/Witz/etalon2 diff --git a/autotest/Witz/Witz.upp b/autotest/Witz/Witz.upp index 0892ff52f..9e97bfec9 100644 --- a/autotest/Witz/Witz.upp +++ b/autotest/Witz/Witz.upp @@ -9,7 +9,6 @@ file index.witz, index2.witz, etalon, - etalon2, main.cpp; mainconfig diff --git a/autotest/Witz/etalon2 b/autotest/Witz/etalon2 deleted file mode 100644 index f0716bd55..000000000 --- a/autotest/Witz/etalon2 +++ /dev/null @@ -1 +0,0 @@ -Error in template: /home/cxl/upp.src/autotest/Witz/index2.witz(17,13): missing number \ No newline at end of file diff --git a/autotest/Witz/main.cpp b/autotest/Witz/main.cpp index 921047db8..48cdc1076 100644 --- a/autotest/Witz/main.cpp +++ b/autotest/Witz/main.cpp @@ -76,8 +76,9 @@ CONSOLE_APP_MAIN LOG(result); LOG("------------"); // SaveFile(GetDataFile("etalon"), result); - result.Replace("/home/upp", "/home/cxl"); - ASSERT(result == LoadFile(GetDataFile("etalon2"))); + + ASSERT(result.Find("autotest/Witz/index2.witz(17,13): missing number") >= 0); + m.Add("name", "What is that?"); http("res", m);