From 1b7b72c0e96856d2b9f73f705787af3426662bcf Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 28 Dec 2020 04:36:32 +1100 Subject: Ensure single newline at EOF for core files (#11310) --- tests/basic/config.h | 5 +---- tests/basic/rules.mk | 2 +- tests/basic/test_macro.cpp | 2 +- tests/test_common/keyboard_report_util.cpp | 2 +- tests/test_common/keyboard_report_util.hpp | 2 +- tests/test_common/test_driver.hpp | 8 ++------ tests/test_common/test_fixture.hpp | 4 ++-- 7 files changed, 9 insertions(+), 16 deletions(-) (limited to 'tests') diff --git a/tests/basic/config.h b/tests/basic/config.h index e5d018a32a..99bd62d991 100644 --- a/tests/basic/config.h +++ b/tests/basic/config.h @@ -14,10 +14,7 @@ * along with this program. If not, see . */ -#ifndef TESTS_BASIC_CONFIG_H_ -#define TESTS_BASIC_CONFIG_H_ +#pragma once #define MATRIX_ROWS 4 #define MATRIX_COLS 10 - -#endif /* TESTS_BASIC_CONFIG_H_ */ diff --git a/tests/basic/rules.mk b/tests/basic/rules.mk index 8a906807cf..9fb5d43610 100644 --- a/tests/basic/rules.mk +++ b/tests/basic/rules.mk @@ -13,4 +13,4 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -CUSTOM_MATRIX=yes \ No newline at end of file +CUSTOM_MATRIX=yes diff --git a/tests/basic/test_macro.cpp b/tests/basic/test_macro.cpp index a1fa317089..dc4a77796a 100644 --- a/tests/basic/test_macro.cpp +++ b/tests/basic/test_macro.cpp @@ -68,4 +68,4 @@ TEST_F(Macro, PlayASimpleMacro) { EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport(KC_LSFT))).AT_TIME(210); EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).AT_TIME(220); run_one_scan_loop(); -} \ No newline at end of file +} diff --git a/tests/test_common/keyboard_report_util.cpp b/tests/test_common/keyboard_report_util.cpp index 245072c0ea..cb044c92b3 100644 --- a/tests/test_common/keyboard_report_util.cpp +++ b/tests/test_common/keyboard_report_util.cpp @@ -71,4 +71,4 @@ bool KeyboardReportMatcher::MatchAndExplain(report_keyboard_t& report, MatchResu void KeyboardReportMatcher::DescribeTo(::std::ostream* os) const { *os << "is equal to " << m_report; } -void KeyboardReportMatcher::DescribeNegationTo(::std::ostream* os) const { *os << "is not equal to " << m_report; } \ No newline at end of file +void KeyboardReportMatcher::DescribeNegationTo(::std::ostream* os) const { *os << "is not equal to " << m_report; } diff --git a/tests/test_common/keyboard_report_util.hpp b/tests/test_common/keyboard_report_util.hpp index 48543c2053..2c33f0412e 100644 --- a/tests/test_common/keyboard_report_util.hpp +++ b/tests/test_common/keyboard_report_util.hpp @@ -36,4 +36,4 @@ private: template inline testing::Matcher KeyboardReport(Ts... keys) { return testing::MakeMatcher(new KeyboardReportMatcher(std::vector({keys...}))); -} \ No newline at end of file +} diff --git a/tests/test_common/test_driver.hpp b/tests/test_common/test_driver.hpp index c3ae17b1a4..f86308df95 100644 --- a/tests/test_common/test_driver.hpp +++ b/tests/test_common/test_driver.hpp @@ -14,8 +14,7 @@ * along with this program. If not, see . */ -#ifndef TESTS_TEST_COMMON_TEST_DRIVER_H_ -#define TESTS_TEST_COMMON_TEST_DRIVER_H_ +#pragma once #include "gmock/gmock.h" #include @@ -28,7 +27,7 @@ public: TestDriver(); ~TestDriver(); void set_leds(uint8_t leds) { m_leds = leds; } - + MOCK_METHOD1(send_keyboard_mock, void (report_keyboard_t&)); MOCK_METHOD1(send_mouse_mock, void (report_mouse_t&)); MOCK_METHOD1(send_system_mock, void (uint16_t)); @@ -43,6 +42,3 @@ private: uint8_t m_leds = 0; static TestDriver* m_this; }; - - -#endif /* TESTS_TEST_COMMON_TEST_DRIVER_H_ */ diff --git a/tests/test_common/test_fixture.hpp b/tests/test_common/test_fixture.hpp index fb37e440fc..340503665b 100644 --- a/tests/test_common/test_fixture.hpp +++ b/tests/test_common/test_fixture.hpp @@ -14,7 +14,7 @@ * along with this program. If not, see . */ - #pragma once +#pragma once #include "gtest/gtest.h" @@ -27,4 +27,4 @@ public: void run_one_scan_loop(); void idle_for(unsigned ms); -}; \ No newline at end of file +}; -- cgit v1.2.1