tests: better test initializing allowing for better printing (#5379)
Co-authored-by: Nerixyz <nerixdev@outlook.de>
This commit is contained in:
+19
-24
@@ -13,8 +13,8 @@
|
||||
#include "providers/twitch/TwitchBadge.hpp"
|
||||
#include "providers/twitch/TwitchMessageBuilder.hpp"
|
||||
#include "singletons/Emotes.hpp"
|
||||
#include "Test.hpp"
|
||||
|
||||
#include <gtest/gtest.h>
|
||||
#include <QColor>
|
||||
#include <QVariant>
|
||||
|
||||
@@ -101,7 +101,7 @@ namespace chatterino::filters {
|
||||
|
||||
std::ostream &operator<<(std::ostream &os, Type t)
|
||||
{
|
||||
os << qUtf8Printable(typeToString(t));
|
||||
os << typeToString(t);
|
||||
return os;
|
||||
}
|
||||
|
||||
@@ -138,8 +138,8 @@ TEST(Filters, Validity)
|
||||
auto filterResult = Filter::fromString(input);
|
||||
bool isValid = std::holds_alternative<Filter>(filterResult);
|
||||
EXPECT_EQ(isValid, expected)
|
||||
<< "Filter::fromString( " << qUtf8Printable(input)
|
||||
<< " ) should be " << (expected ? "valid" : "invalid");
|
||||
<< "Filter::fromString( " << input << " ) should be "
|
||||
<< (expected ? "valid" : "invalid");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -168,15 +168,14 @@ TEST(Filters, TypeSynthesis)
|
||||
{
|
||||
auto filterResult = Filter::fromString(input);
|
||||
bool isValid = std::holds_alternative<Filter>(filterResult);
|
||||
ASSERT_TRUE(isValid) << "Filter::fromString( " << qUtf8Printable(input)
|
||||
<< " ) is invalid";
|
||||
ASSERT_TRUE(isValid)
|
||||
<< "Filter::fromString( " << input << " ) is invalid";
|
||||
|
||||
auto filter = std::move(std::get<Filter>(filterResult));
|
||||
T type = filter.returnType();
|
||||
EXPECT_EQ(type, expected)
|
||||
<< "Filter{ " << qUtf8Printable(input) << " } has type " << type
|
||||
<< " instead of " << expected << ".\nDebug: "
|
||||
<< qUtf8Printable(filter.debugString(typingContext));
|
||||
<< "Filter{ " << input << " } has type " << type << " instead of "
|
||||
<< expected << ".\nDebug: " << filter.debugString(typingContext);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -244,17 +243,16 @@ TEST(Filters, Evaluation)
|
||||
{
|
||||
auto filterResult = Filter::fromString(input);
|
||||
bool isValid = std::holds_alternative<Filter>(filterResult);
|
||||
ASSERT_TRUE(isValid) << "Filter::fromString( " << qUtf8Printable(input)
|
||||
<< " ) is invalid";
|
||||
ASSERT_TRUE(isValid)
|
||||
<< "Filter::fromString( " << input << " ) is invalid";
|
||||
|
||||
auto filter = std::move(std::get<Filter>(filterResult));
|
||||
auto result = filter.execute(contextMap);
|
||||
|
||||
EXPECT_EQ(result, expected)
|
||||
<< "Filter{ " << qUtf8Printable(input) << " } evaluated to "
|
||||
<< qUtf8Printable(result.toString()) << " instead of "
|
||||
<< qUtf8Printable(expected.toString()) << ".\nDebug: "
|
||||
<< qUtf8Printable(filter.debugString(typingContext));
|
||||
<< "Filter{ " << input << " } evaluated to " << result.toString()
|
||||
<< " instead of " << expected.toString()
|
||||
<< ".\nDebug: " << filter.debugString(typingContext);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -354,20 +352,17 @@ TEST_F(FiltersF, ExpressionDebug)
|
||||
{
|
||||
const auto filterResult = Filter::fromString(input);
|
||||
const auto *filter = std::get_if<Filter>(&filterResult);
|
||||
EXPECT_NE(filter, nullptr)
|
||||
<< "Filter::fromString(" << qUtf8Printable(input)
|
||||
<< ") did not build a proper filter";
|
||||
EXPECT_NE(filter, nullptr) << "Filter::fromString(" << input
|
||||
<< ") did not build a proper filter";
|
||||
|
||||
const auto actualDebugString = filter->debugString(typingContext);
|
||||
EXPECT_EQ(actualDebugString, debugString)
|
||||
<< "filter->debugString() on '" << qUtf8Printable(input)
|
||||
<< "' should be '" << qUtf8Printable(debugString) << "', but got '"
|
||||
<< qUtf8Printable(actualDebugString) << "'";
|
||||
<< "filter->debugString() on '" << input << "' should be '"
|
||||
<< debugString << "', but got '" << actualDebugString << "'";
|
||||
|
||||
const auto actualFilterString = filter->filterString();
|
||||
EXPECT_EQ(actualFilterString, filterString)
|
||||
<< "filter->filterString() on '" << qUtf8Printable(input)
|
||||
<< "' should be '" << qUtf8Printable(filterString) << "', but got '"
|
||||
<< qUtf8Printable(actualFilterString) << "'";
|
||||
<< "filter->filterString() on '" << input << "' should be '"
|
||||
<< filterString << "', but got '" << actualFilterString << "'";
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user