From fde5de5ddc49b1b85049503ecab66801f630298d Mon Sep 17 00:00:00 2001 From: SolovyovaED Date: Tue, 7 May 2024 21:17:52 +0300 Subject: [PATCH] =?UTF-8?q?build:=D1=82=D0=B5=D1=81=D1=82=D1=8B=206=20?= =?UTF-8?q?=D0=B2=D0=B0=D1=80=D0=B8=D0=B0=D0=BD=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- svg.cpp | 21 ++++++++++++++++++++- unittest.cpp | 17 +++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/svg.cpp b/svg.cpp index 9533773..88bf76a 100644 --- a/svg.cpp +++ b/svg.cpp @@ -29,7 +29,26 @@ void svg_rect(double x, double y, double width, double height, string stroke = "chartreuse", string fill = "plum"){ cout << ""; } - +void +input_colors(string &colors_stroke, string &colors_fill){ + string color_personal; + cout << "Do you want to change colors? Yes/No" << endl; + cin >> color_personal; + while ((color_personal != "No") && (color_personal != "Yes")){ + cout << "WRONG ANSWER! Try again!" << endl; + cin >> color_personal; + } + if (color_personal == "No"){ + return; + } + else { + cout << "What color for a stroke do you want?" << endl; + cin >> colors_stroke; + cout << "What color to fill do you want?" << endl; + cin >> colors_fill; + } + return; +} void show_histogram_svg(const vector& bins, string stroke, string fill) { const auto IMAGE_WIDTH = 400; diff --git a/unittest.cpp b/unittest.cpp index 0acaa65..f4d7164 100644 --- a/unittest.cpp +++ b/unittest.cpp @@ -2,6 +2,23 @@ #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN #include "doctest.h" #include "histogram_internal.h" +#include "input_colors_internal.h" + +TEST_CASE("Mistakes in spelling") { + std::string colors_stroke = "black"; + std::string colors_fill = "green"; + input_colors(colors_stroke, colors_fill); + CHECK(colors_stroke == "yellow"); + CHECK(colors_fill == "pink"); +} + +TEST_CASE("The answer is No") { + std::string colors_stroke = "black"; + std::string colors_fill = "green"; + input_colors(colors_stroke, colors_fill); + CHECK(colors_stroke == "black"); + CHECK(colors_fill == "green"); +} TEST_CASE("distinct positive numbers") { double min = 0;