Update CoreSTM32HalBasicTimer_test.cpp

leka · Jul 3, 2024 · 8277491 · 8277491
1 parent ee6f940
commit 8277491
Showing 1 changed file with 31 additions and 17 deletions.
diff --git a/drivers/CoreDAC/tests/CoreSTM32HalBasicTimer_test.cpp b/drivers/CoreDAC/tests/CoreSTM32HalBasicTimer_test.cpp
@@ -22,23 +22,7 @@ using ::testing::SaveArgPointee;
 class CoreSTM32HalBasicTimerTest : public ::testing::Test
 {
   protected:
-	void SetUp() override
-	{
-		basic_timer.registerCallback(callback.AsStdFunction());
-
-		EXPECT_CALL(halmock, HAL_TIM_RegisterCallback(_, HAL_TIM_BASE_MSPINIT_CB_ID, _))
-			.WillOnce(DoAll(SaveArg<2>(&mspinit_callback), Return(HAL_StatusTypeDef::HAL_OK)));
-		EXPECT_CALL(halmock, HAL_TIM_RegisterCallback(_, HAL_TIM_BASE_MSPDEINIT_CB_ID, _))
-			.WillOnce(DoAll(SaveArg<2>(&mspdeinit_callback), Return(HAL_StatusTypeDef::HAL_OK)));
-		EXPECT_CALL(halmock, HAL_TIM_RegisterCallback(_, HAL_TIM_PERIOD_ELAPSED_CB_ID, _))
-			.WillOnce(DoAll(SaveArg<2>(&period_elapsed_callback), Return(HAL_StatusTypeDef::HAL_OK)));
-
-		EXPECT_CALL(halmock, HAL_TIM_Base_Init);
-		EXPECT_CALL(halmock, HAL_TIMEx_MasterConfigSynchronization)
-			.WillOnce(DoAll(SaveArgPointee<1>(&basic_timer_master_config), Return(HAL_StatusTypeDef::HAL_OK)));
-
-		basic_timer.initialize();
-	}
+	// void SetUp() override {}
 	// void TearDown() override {}
 
 	mock::CoreSTM32Hal halmock;
@@ -88,6 +72,21 @@ TEST_F(CoreSTM32HalBasicTimerTest, initialize)
 
 TEST_F(CoreSTM32HalBasicTimerTest, initializeMspInit)
 {
+	basic_timer.registerCallback(callback.AsStdFunction());
+
+	EXPECT_CALL(halmock, HAL_TIM_RegisterCallback(_, HAL_TIM_BASE_MSPINIT_CB_ID, _))
+		.WillOnce(DoAll(SaveArg<2>(&mspinit_callback), Return(HAL_StatusTypeDef::HAL_OK)));
+	EXPECT_CALL(halmock, HAL_TIM_RegisterCallback(_, HAL_TIM_BASE_MSPDEINIT_CB_ID, _))
+		.WillOnce(DoAll(SaveArg<2>(&mspdeinit_callback), Return(HAL_StatusTypeDef::HAL_OK)));
+	EXPECT_CALL(halmock, HAL_TIM_RegisterCallback(_, HAL_TIM_PERIOD_ELAPSED_CB_ID, _))
+		.WillOnce(DoAll(SaveArg<2>(&period_elapsed_callback), Return(HAL_StatusTypeDef::HAL_OK)));
+
+	EXPECT_CALL(halmock, HAL_TIM_Base_Init);
+	EXPECT_CALL(halmock, HAL_TIMEx_MasterConfigSynchronization)
+		.WillOnce(DoAll(SaveArgPointee<1>(&basic_timer_master_config), Return(HAL_StatusTypeDef::HAL_OK)));
+
+	basic_timer.initialize();
+
 	auto *basic_timer_instance = basic_timer.getHandle().Instance;
 
 	if (basic_timer_instance == TIM6) {
@@ -107,6 +106,21 @@ TEST_F(CoreSTM32HalBasicTimerTest, initializeMspInit)
 
 TEST_F(CoreSTM32HalBasicTimerTest, initializeMspDeinit)
 {
+	basic_timer.registerCallback(callback.AsStdFunction());
+
+	EXPECT_CALL(halmock, HAL_TIM_RegisterCallback(_, HAL_TIM_BASE_MSPINIT_CB_ID, _))
+		.WillOnce(DoAll(SaveArg<2>(&mspinit_callback), Return(HAL_StatusTypeDef::HAL_OK)));
+	EXPECT_CALL(halmock, HAL_TIM_RegisterCallback(_, HAL_TIM_BASE_MSPDEINIT_CB_ID, _))
+		.WillOnce(DoAll(SaveArg<2>(&mspdeinit_callback), Return(HAL_StatusTypeDef::HAL_OK)));
+	EXPECT_CALL(halmock, HAL_TIM_RegisterCallback(_, HAL_TIM_PERIOD_ELAPSED_CB_ID, _))
+		.WillOnce(DoAll(SaveArg<2>(&period_elapsed_callback), Return(HAL_StatusTypeDef::HAL_OK)));
+
+	EXPECT_CALL(halmock, HAL_TIM_Base_Init);
+	EXPECT_CALL(halmock, HAL_TIMEx_MasterConfigSynchronization)
+		.WillOnce(DoAll(SaveArgPointee<1>(&basic_timer_master_config), Return(HAL_StatusTypeDef::HAL_OK)));
+
+	basic_timer.initialize();
+
 	auto *basic_timer_instance = basic_timer.getHandle().Instance;
 
 	if (basic_timer_instance == TIM6) {