diff --git a/unittest/cs-project3/histogram.cpp b/unittest/cs-project3/histogram.cpp index f23db86..45c959d 100644 --- a/unittest/cs-project3/histogram.cpp +++ b/unittest/cs-project3/histogram.cpp @@ -3,7 +3,7 @@ #include "histogram.h" using namespace std; -void +bool find_minmax(const vector& numbers, double& min, double& max) { min = numbers[0]; for (size_t i = 1; i < numbers.size(); i++) { diff --git a/unittest/cs-project3/histogram_internal.h b/unittest/cs-project3/histogram_internal.h index 7edd3d7..9f05ad0 100644 --- a/unittest/cs-project3/histogram_internal.h +++ b/unittest/cs-project3/histogram_internal.h @@ -2,5 +2,5 @@ #include -void +bool find_minmax(const std::vector& numbers, double& min, double& max); \ No newline at end of file diff --git a/unittest/cs-project3/unittest.cpp b/unittest/cs-project3/unittest.cpp index 825d0fb..29d8167 100644 --- a/unittest/cs-project3/unittest.cpp +++ b/unittest/cs-project3/unittest.cpp @@ -2,6 +2,9 @@ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN #include "doctest.h" #include "histogram_internal.h" +#include "svg.h" +#include +#include TEST_CASE("distinct positive numbers") { double min = 0; @@ -23,4 +26,23 @@ TEST_CASE("all numbers are same") { find_minmax({ 1, 1, 1, 1, 1, 1, 1, }, min, max); CHECK(min == 1); CHECK(max == 1); +} + TEST_CASE("all numbers are same") { + double min = 0; + double max = 0; + CHECK(!find_minmax({}, min, max)); + } + +TEST_CASE("histogram for exclusive variant is correct") { + std::fstream in, compare; + std::string line, compline; + bool flag = 0; + in.open("result.txt"); + compare.open("compare.txt"); + while (std::getline(in, line) && std::getline(compare, compline) && !flag) { + if (line != compline) { + flag = 1; + } + } + CHECK(flag == 0); } diff --git a/unittest/cs-project3/x64/Debug/cs-project3.ilk b/unittest/cs-project3/x64/Debug/cs-project3.ilk index ab39e02..1f31957 100644 Binary files a/unittest/cs-project3/x64/Debug/cs-project3.ilk and b/unittest/cs-project3/x64/Debug/cs-project3.ilk differ diff --git a/unittest/cs-project3/x64/Debug/cs-project3.log b/unittest/cs-project3/x64/Debug/cs-project3.log index 29e55bb..5639d80 100644 --- a/unittest/cs-project3/x64/Debug/cs-project3.log +++ b/unittest/cs-project3/x64/Debug/cs-project3.log @@ -1,2 +1,21 @@ - unittest.cpp - cs-project3.vcxproj -> C:\Users\justygrass\Desktop\progs\2_sem\3la\cs-project3\unittest\x64\Debug\cs-project3.exe + histogram.cpp + unittest.cpp +C:\Users\justygrass\Desktop\progs\2_sem\3la\cs-project3\unittest\cs-project3\doctest.h(1527,9): warning C4805: ==: небезопасное смешение типа "bool" и типа "T" в операции +C:\Users\justygrass\Desktop\progs\2_sem\3la\cs-project3\unittest\cs-project3\doctest.h(1527,9): warning C4805: with +C:\Users\justygrass\Desktop\progs\2_sem\3la\cs-project3\unittest\cs-project3\doctest.h(1527,9): warning C4805: [ +C:\Users\justygrass\Desktop\progs\2_sem\3la\cs-project3\unittest\cs-project3\doctest.h(1527,9): warning C4805: T=int +C:\Users\justygrass\Desktop\progs\2_sem\3la\cs-project3\unittest\cs-project3\doctest.h(1527,9): warning C4805: ] + (компиляция исходного файла "unittest.cpp") + C:\Users\justygrass\Desktop\progs\2_sem\3la\cs-project3\unittest\cs-project3\doctest.h(1527,9): + контекст создания экземпляра шаблона (сначала самый старый) + C:\Users\justygrass\Desktop\progs\2_sem\3la\cs-project3\unittest\cs-project3\unittest.cpp(47,5): + выполняется компиляция ссылки на экземпляр шаблон функции "doctest::detail::Result doctest::detail::Expression_lhs::operator ==(R &&)" + with + [ + R=int + ] + C:\Users\justygrass\Desktop\progs\2_sem\3la\cs-project3\unittest\cs-project3\unittest.cpp(47,5): + см. первую ссылку на "doctest::detail::Expression_lhs::operator ==" в "DOCTEST_ANON_FUNC_13" + + Создание кода... +C:\Users\justygrass\Desktop\progs\2_sem\3la\cs-project3\unittest\cs-project3\histogram.cpp(17,1): error C4716: find_minmax: должна возвращать значение diff --git a/unittest/cs-project3/x64/Debug/cs-project3.tlog/CL.command.1.tlog b/unittest/cs-project3/x64/Debug/cs-project3.tlog/CL.command.1.tlog index f2dd67b..46b134b 100644 Binary files a/unittest/cs-project3/x64/Debug/cs-project3.tlog/CL.command.1.tlog and b/unittest/cs-project3/x64/Debug/cs-project3.tlog/CL.command.1.tlog differ diff --git a/unittest/cs-project3/x64/Debug/cs-project3.tlog/CL.read.1.tlog b/unittest/cs-project3/x64/Debug/cs-project3.tlog/CL.read.1.tlog deleted file mode 100644 index 6048d5e..0000000 Binary files a/unittest/cs-project3/x64/Debug/cs-project3.tlog/CL.read.1.tlog and /dev/null differ diff --git a/unittest/cs-project3/x64/Debug/cs-project3.tlog/CL.write.1.tlog b/unittest/cs-project3/x64/Debug/cs-project3.tlog/CL.write.1.tlog deleted file mode 100644 index 1afbd11..0000000 Binary files a/unittest/cs-project3/x64/Debug/cs-project3.tlog/CL.write.1.tlog and /dev/null differ diff --git a/unittest/cs-project3/x64/Debug/histogram.obj b/unittest/cs-project3/x64/Debug/histogram.obj deleted file mode 100644 index b9883d1..0000000 Binary files a/unittest/cs-project3/x64/Debug/histogram.obj and /dev/null differ diff --git a/unittest/cs-project3/x64/Debug/unittest.obj b/unittest/cs-project3/x64/Debug/unittest.obj index ae7a5de..04d30f6 100644 Binary files a/unittest/cs-project3/x64/Debug/unittest.obj and b/unittest/cs-project3/x64/Debug/unittest.obj differ diff --git a/unittest/cs-project3/x64/Debug/vc143.idb b/unittest/cs-project3/x64/Debug/vc143.idb index 95c0fb5..57139cd 100644 Binary files a/unittest/cs-project3/x64/Debug/vc143.idb and b/unittest/cs-project3/x64/Debug/vc143.idb differ diff --git a/unittest/cs-project3/x64/Debug/vc143.pdb b/unittest/cs-project3/x64/Debug/vc143.pdb index 9708023..3df9c60 100644 Binary files a/unittest/cs-project3/x64/Debug/vc143.pdb and b/unittest/cs-project3/x64/Debug/vc143.pdb differ diff --git a/unittest/x64/Debug/cs-project3.pdb b/unittest/x64/Debug/cs-project3.pdb index e743d6e..afb863a 100644 Binary files a/unittest/x64/Debug/cs-project3.pdb and b/unittest/x64/Debug/cs-project3.pdb differ