From 4ea3bbdb4cbb02310623c9dfc464d84e4f653492 Mon Sep 17 00:00:00 2001 From: "Colin T.A. Gray" Date: Thu, 14 Dec 2017 16:15:52 -0700 Subject: [PATCH] add tests for action_layer.c and reset layer state after tests --- tests/basic/test_action_layer.cpp | 92 ++++++++++++++++++++++++++++++ tests/test_common/test_common.hpp | 4 +- tests/test_common/test_fixture.cpp | 9 ++- 3 files changed, 102 insertions(+), 3 deletions(-) create mode 100644 tests/basic/test_action_layer.cpp diff --git a/tests/basic/test_action_layer.cpp b/tests/basic/test_action_layer.cpp new file mode 100644 index 00000000000..d00a0859b9c --- /dev/null +++ b/tests/basic/test_action_layer.cpp @@ -0,0 +1,92 @@ +/* Copyright 2017 Colin T.A. Gray + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "test_common.hpp" + +using testing::_; +using testing::Return; + +class ActionLayer : public TestFixture {}; + +// TEST_F(ActionLayer, LayerStateDBG) { +// layer_state_set(0); +// } + +// TEST_F(ActionLayer, LayerStateSet) { +// layer_state_set(0); +// EXPECT_EQ(layer_state, 0); +// layer_state_set(0b001100); +// EXPECT_EQ(layer_state, 0b001100); +// } + +// TEST_F(ActionLayer, LayerStateIs) { +// layer_state_set(0); +// EXPECT_EQ(layer_state_is(0), true); +// EXPECT_EQ(layer_state_is(1), true); +// layer_state_set(1); +// EXPECT_EQ(layer_state_is(0), true); +// EXPECT_EQ(layer_state_is(1), true); +// layer_state_set(2); +// EXPECT_EQ(layer_state_is(0), false); +// EXPECT_EQ(layer_state_is(1), false); +// EXPECT_EQ(layer_state_is(2), true); +// } + +TEST_F(ActionLayer, LayerStateCmp) { + uint32_t prev_layer; + + prev_layer = 0; + EXPECT_EQ(layer_state_cmp(prev_layer, 0), true); + EXPECT_EQ(layer_state_cmp(prev_layer, 1), false); + + prev_layer = 1; + EXPECT_EQ(layer_state_cmp(prev_layer, 0), true); + EXPECT_EQ(layer_state_cmp(prev_layer, 1), false); + + prev_layer = 2; + EXPECT_EQ(layer_state_cmp(prev_layer, 0), false); + EXPECT_EQ(layer_state_cmp(prev_layer, 1), true); + EXPECT_EQ(layer_state_cmp(prev_layer, 2), false); +} + +// TEST_F(ActionLayer, LayerClear) { +// layer_clear(); +// EXPECT_EQ(layer_state, 0); +// } + +// TEST_F(ActionLayer, LayerMove) { +// layer_move(0); +// EXPECT_EQ(layer_state, 1); +// layer_move(3); +// EXPECT_EQ(layer_state, 0b1000); +// } + +// TEST_F(ActionLayer, LayerOn) { +// layer_clear(); +// layer_on(1); +// layer_on(3); +// layer_on(3); +// EXPECT_EQ(layer_state, 0b1010); +// } + +// TEST_F(ActionLayer, LayerOff) { +// layer_clear(); +// layer_on(1); +// layer_on(3); +// layer_off(3); +// layer_off(2); +// EXPECT_EQ(layer_state, 0b1000); +// } diff --git a/tests/test_common/test_common.hpp b/tests/test_common/test_common.hpp index 2398446339b..a88fa8d7b8e 100644 --- a/tests/test_common/test_common.hpp +++ b/tests/test_common/test_common.hpp @@ -17,8 +17,10 @@ #include "gtest/gtest.h" #include "gmock/gmock.h" +extern "C" { #include "quantum.h" +} #include "test_driver.hpp" #include "test_matrix.h" #include "keyboard_report_util.hpp" -#include "test_fixture.hpp" \ No newline at end of file +#include "test_fixture.hpp" diff --git a/tests/test_common/test_fixture.cpp b/tests/test_common/test_fixture.cpp index 4084ee9c676..d86681eeaa3 100644 --- a/tests/test_common/test_fixture.cpp +++ b/tests/test_common/test_fixture.cpp @@ -6,6 +6,10 @@ #include "action.h" #include "action_tapping.h" +extern "C" { +#include "action_layer.h" +} + extern "C" { void set_time(uint32_t t); void advance_time(uint32_t ms); @@ -30,11 +34,12 @@ TestFixture::TestFixture() { TestFixture::~TestFixture() { TestDriver driver; + layer_clear(); clear_all_keys(); // Run for a while to make sure all keys are completely released EXPECT_CALL(driver, send_keyboard_mock(_)).Times(AnyNumber()); idle_for(TAPPING_TERM + 10); - testing::Mock::VerifyAndClearExpectations(&driver); + testing::Mock::VerifyAndClearExpectations(&driver); // Verify that the matrix really is cleared EXPECT_CALL(driver, send_keyboard_mock(KeyboardReport())).Times(Between(0, 1)); } @@ -48,4 +53,4 @@ void TestFixture::idle_for(unsigned time) { for (unsigned i=0; i