From c75c78bf87cd59f9153bb0ec6883c6f2dee2bb58 Mon Sep 17 00:00:00 2001 From: cxl Date: Wed, 19 Aug 2020 08:46:49 +0000 Subject: [PATCH] .autotest git-svn-id: svn://ultimatepp.org/upp/trunk@14836 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- autotest/SIMD2/SIMD2.cpp | 15 +-------------- autotest/VectorArrayN/Etalon.log | 8 ++++++++ autotest/VectorArrayN/VectorArrayN.cpp | 18 ++++++++++++++++++ autotest/VectorArrayN/VectorArrayN.upp | 12 ++++++++++++ 4 files changed, 39 insertions(+), 14 deletions(-) create mode 100644 autotest/VectorArrayN/Etalon.log create mode 100644 autotest/VectorArrayN/VectorArrayN.cpp create mode 100644 autotest/VectorArrayN/VectorArrayN.upp diff --git a/autotest/SIMD2/SIMD2.cpp b/autotest/SIMD2/SIMD2.cpp index 095f23e73..e34ef45b5 100644 --- a/autotest/SIMD2/SIMD2.cpp +++ b/autotest/SIMD2/SIMD2.cpp @@ -371,20 +371,7 @@ CONSOLE_APP_MAIN DDUMP(x); } - auto LoadLog = [](const String& path) { - String s = Filter(LoadFile(path), [](int c) { return c == '\r' ? 0 : c; }); - return s.Mid(max(s.FindAfter("\n"), 0)); - }; - - String log = LoadLog(GetStdLogPath()); - String etalon = LoadLog(GetDataFile("Etalon.log")); - - SaveFile(GetHomeDirFile("log.txt"), log); - SaveFile(GetHomeDirFile("etalon.txt"), etalon); - - ASSERT(log == etalon); - - Cout() << "================= OK\r\n"; + CheckLogEtalon(); #else Cout() << "================= NO SIMD\r\n"; #endif diff --git a/autotest/VectorArrayN/Etalon.log b/autotest/VectorArrayN/Etalon.log new file mode 100644 index 000000000..3c9a629f9 --- /dev/null +++ b/autotest/VectorArrayN/Etalon.log @@ -0,0 +1,8 @@ +* C:\upp\out\autotest\MSBT19.Debug.Debug_Full\VectorArrayN.exe 19.08.2020 10:14:47, user: cxl + +x.GetCount() = 20 +x = [123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123] +x = [123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123] +x.GetCount() = 20 +x = [123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123] +x = [123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123, 123] diff --git a/autotest/VectorArrayN/VectorArrayN.cpp b/autotest/VectorArrayN/VectorArrayN.cpp new file mode 100644 index 000000000..b4998dd22 --- /dev/null +++ b/autotest/VectorArrayN/VectorArrayN.cpp @@ -0,0 +1,18 @@ +#include + +using namespace Upp; + +CONSOLE_APP_MAIN +{ + StdLogSetup(LOG_COUT|LOG_FILE); + + { Vector x(20); DUMP(x.GetCount()); } + { Vector x(20, 123); DUMP(x); } + { Vector x(20, "123"); DUMP(x); } + + { Array x(20); DUMP(x.GetCount()); } + { Array x(20, 123); DUMP(x); } + { Array x(20, "123"); DUMP(x); } + + CheckLogEtalon(); +} diff --git a/autotest/VectorArrayN/VectorArrayN.upp b/autotest/VectorArrayN/VectorArrayN.upp new file mode 100644 index 000000000..0be2192f5 --- /dev/null +++ b/autotest/VectorArrayN/VectorArrayN.upp @@ -0,0 +1,12 @@ +description "Tests Vector/Array constructors with defined number of items\377"; + +uses + Core; + +file + Etalon.log, + VectorArrayN.cpp; + +mainconfig + "" = ""; +