From 7f96d600d5907691c7233ab6c512b49b7d426be4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Cie=C5=9Blar?= Date: Tue, 23 Jan 2024 22:32:30 +0100 Subject: [PATCH] fix book release year tests (#494) --- src/modules/book/Book.cpp | 18 +++++++++--------- src/modules/book/BookTest.cpp | 22 ++++++++++++---------- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/src/modules/book/Book.cpp b/src/modules/book/Book.cpp index 81a96b61..4b939bea 100644 --- a/src/modules/book/Book.cpp +++ b/src/modules/book/Book.cpp @@ -2,16 +2,16 @@ #include "../../common/FormatHelper.h" #include "data/Authors.h" +#include "data/BookFormat.h" #include "data/Genres.h" #include "data/Publishers.h" +#include "data/Series.h" #include "data/Titles.h" #include "data/Translators.h" -#include "data/Series.h" -#include "data/BookFormat.h" -#include "faker-cxx/Helper.h" -#include "faker-cxx/String.h" #include "faker-cxx/Date.h" +#include "faker-cxx/Helper.h" #include "faker-cxx/Number.h" +#include "faker-cxx/String.h" namespace faker { @@ -43,26 +43,26 @@ std::string Book::isbn() int Book::releaseYear() { - return std::stoi(Date::pastDate(100).substr(0, 4)); + return Number::integer(1940, 2024); } std::string Book::translator() { - return Helper::arrayElement(translators); + return Helper::arrayElement(translators); } std::string Book::format() { - return Helper::arrayElement(bookFormats); + return Helper::arrayElement(bookFormats); } int Book::page() { - return Number::integer(50, 999); + return Number::integer(50, 999); } std::string Book::series() { - return Helper::arrayElement(bookSeries); + return Helper::arrayElement(bookSeries); } } diff --git a/src/modules/book/BookTest.cpp b/src/modules/book/BookTest.cpp index e47eb29f..5f8b5228 100644 --- a/src/modules/book/BookTest.cpp +++ b/src/modules/book/BookTest.cpp @@ -6,12 +6,12 @@ #include "../../common/StringHelper.h" #include "data/Authors.h" +#include "data/BookFormat.h" #include "data/Genres.h" #include "data/Publishers.h" +#include "data/Series.h" #include "data/Titles.h" #include "data/Translators.h" -#include "data/Series.h" -#include "data/BookFormat.h" using namespace ::testing; using namespace faker; @@ -64,9 +64,11 @@ TEST_F(BookTest, shouldGenerateIsbn) ASSERT_EQ(isbnNumbersGroups[4].size(), 1); } -TEST_F(BookTest, shouldGenerateReleaseYear) { - int releaseYear = Book::releaseYear(); - ASSERT_TRUE((releaseYear >= 1924) && (releaseYear <= 2024)); +TEST_F(BookTest, shouldGenerateReleaseYear) +{ + const auto releaseYear = Book::releaseYear(); + + ASSERT_TRUE((releaseYear >= 1940) && (releaseYear <= 2024)); } TEST_F(BookTest, shouldGenerateTranslator) @@ -80,9 +82,9 @@ TEST_F(BookTest, shouldGenerateTranslator) TEST_F(BookTest, shouldGenerateFormat) { const auto bookFormat = Book::format(); - - ASSERT_TRUE(std::ranges::any_of(bookFormats, [bookFormat](const std::string& format) - { return format == bookFormat; })); + + ASSERT_TRUE( + std::ranges::any_of(bookFormats, [bookFormat](const std::string& format) { return format == bookFormat; })); } TEST_F(BookTest, shouldGeneratePage) @@ -96,6 +98,6 @@ TEST_F(BookTest, shouldGenerateSeries) { const auto randomSeries = Book::series(); - ASSERT_TRUE(std::ranges::any_of(bookSeries, [randomSeries](const std::string& series) - { return series == randomSeries; })); + ASSERT_TRUE( + std::ranges::any_of(bookSeries, [randomSeries](const std::string& series) { return series == randomSeries; })); }