🔀 Merge branch 'yann/refactor/bufferedserial/remove-enable-input-disa…

…ble-input' into develop
leka · Feb 4, 2024 · f1298d8 · f1298d8
2 parents 648101b + 0ff2987
commit f1298d8
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 34 deletions.
diff --git a/drivers/CoreBufferedSerial/include/CoreBufferedSerial.h b/drivers/CoreBufferedSerial/include/CoreBufferedSerial.h
@@ -23,9 +23,6 @@ class CoreBufferedSerial : public interface::BufferedSerial
 
 	auto readable() -> bool final;
 
-	void enable_input() final;
-	void disable_input() final;
-
 	void enableDeepSleep() final;
 	void disableDeepSleep() final;
 

diff --git a/drivers/CoreBufferedSerial/source/CoreBufferedSerial.cpp b/drivers/CoreBufferedSerial/source/CoreBufferedSerial.cpp
@@ -21,12 +21,12 @@ auto CoreBufferedSerial::readable() -> bool
 	return _serial.readable();
 }
 
-void CoreBufferedSerial::enable_input()
+void CoreBufferedSerial::disableDeepSleep()
 {
 	_serial.enable_input(true);
 }
 
-void CoreBufferedSerial::disable_input()
+void CoreBufferedSerial::enableDeepSleep()
 {
 	_serial.enable_input(false);
 }
@@ -36,13 +36,3 @@ void CoreBufferedSerial::sigio(std::function<void()> const &callback)
 	_sigio_callback = callback;
 	_serial.sigio(mbed::Callback<void()> {[this] { _sigio_callback(); }});
 }
-
-void CoreBufferedSerial::enableDeepSleep()
-{
-	disable_input();
-}
-
-void CoreBufferedSerial::disableDeepSleep()
-{
-	enable_input();
-}
diff --git a/drivers/CoreBufferedSerial/tests/CoreBufferedSerial_test.cpp b/drivers/CoreBufferedSerial/tests/CoreBufferedSerial_test.cpp
@@ -59,20 +59,6 @@ TEST_F(CoreBufferedSerialTest, readable)
 	// nothing expected
 }
 
-TEST_F(CoreBufferedSerialTest, enableInput)
-{
-	coreserial.enable_input();
-
-	ASSERT_TRUE(spy_BufferedSerial_getEnableInput());
-}
-
-TEST_F(CoreBufferedSerialTest, disableInput)
-{
-	coreserial.disable_input();
-
-	ASSERT_FALSE(spy_BufferedSerial_getEnableInput());
-}
-
 TEST_F(CoreBufferedSerialTest, sigio)
 {
 	auto mock_function = MockFunction<void()> {};

diff --git a/include/interface/drivers/BufferedSerial.h b/include/interface/drivers/BufferedSerial.h
@@ -21,9 +21,6 @@ class BufferedSerial : public interface::DeepSleepEnabled
 
 	virtual auto readable() -> bool = 0;
 
-	virtual void disable_input() = 0;
-	virtual void enable_input()	 = 0;
-
 	virtual void sigio(std::function<void()> const &callback) = 0;
 };
 

diff --git a/tests/unit/mocks/mocks/leka/CoreBufferedSerial.h b/tests/unit/mocks/mocks/leka/CoreBufferedSerial.h
@@ -15,8 +15,6 @@ class CoreBufferedSerial : public interface::BufferedSerial
 	MOCK_METHOD(std::size_t, read, (uint8_t *, std::size_t), (override));
 	MOCK_METHOD(std::size_t, write, (const uint8_t *, std::size_t), (override));
 	MOCK_METHOD(bool, readable, (), (override));
-	MOCK_METHOD(void, disable_input, (), (override));
-	MOCK_METHOD(void, enable_input, (), (override));
 	MOCK_METHOD(void, sigio, (std::function<void()> const &), (override));
 
 	MOCK_METHOD(void, enableDeepSleep, (), (override));