Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot
2026-04-09 12:26:50 +00:00
3 changed files with 58 additions and 55 deletions
+5 -5
View File
@@ -19,21 +19,21 @@
#include <ostream>
#include "gmock/gmock.h"
bool operator==(const report_keyboard_t& lhs, const report_keyboard_t& rhs);
bool operator==(const report_keyboard_t& lhs, const report_keyboard_t& rhs);
std::ostream& operator<<(std::ostream& stream, const report_keyboard_t& value);
class KeyboardReportMatcher : public testing::MatcherInterface<report_keyboard_t&> {
public:
public:
KeyboardReportMatcher(const std::vector<uint8_t>& keys);
virtual bool MatchAndExplain(report_keyboard_t& report, testing::MatchResultListener* listener) const override;
virtual void DescribeTo(::std::ostream* os) const override;
virtual void DescribeNegationTo(::std::ostream* os) const override;
private:
private:
report_keyboard_t m_report;
};
template<typename... Ts>
template <typename... Ts>
inline testing::Matcher<report_keyboard_t&> KeyboardReport(Ts... keys) {
return testing::MakeMatcher(new KeyboardReportMatcher(std::vector<uint8_t>({keys...})));
}
+1 -1
View File
@@ -21,7 +21,7 @@
class TestLogger : public std::ostream {
public:
TestLogger() : std::ostream(&m_log){};
TestLogger() : std::ostream(&m_log) {};
TestLogger& info();
TestLogger& trace();
TestLogger& error();