mw/com: switch proxy event fixture to NiceMock and adapt tests

rework UnsubscribeWhileNotHoldingSamplePtrs to have nice mocks and update test logic

Author: KrishaDeshkool

score/mw/com/impl/proxy_event_test.cpp

@@ -72,19 +72,19 @@ struct ProxyEventStruct
 {
     using SampleType = TestSampleType;
     using ProxyEventType = ProxyEvent<TestSampleType>;
-    using MockProxyEventType = StrictMock<mock_binding::ProxyEvent<TestSampleType>>;
+    using MockProxyEventType = NiceMock<mock_binding::ProxyEvent<TestSampleType>>;
 };
 struct GenericProxyEventStruct
 {
     using SampleType = void;
     using ProxyEventType = GenericProxyEvent;
-    using MockProxyEventType = StrictMock<mock_binding::GenericProxyEvent>;
+    using MockProxyEventType = NiceMock<mock_binding::GenericProxyEvent>;
 };
 struct ProxyFieldStruct
 {
     using SampleType = TestSampleType;
     using ProxyEventType = ProxyField<TestSampleType>;
-    using MockProxyEventType = StrictMock<mock_binding::ProxyEvent<TestSampleType>>;
+    using MockProxyEventType = NiceMock<mock_binding::ProxyEvent<TestSampleType>>;
 };
 
 /// \brief Templated test fixture for ProxyEvent functionality that works for both ProxyEvent and GenericProxyEvent
@@ -255,12 +255,10 @@ TYPED_TEST(ProxyEventDeathTest, DieOnUnsubscribingWhileHoldingSamplePtrs)
     Base::RecordProperty("DerivationTechnique", "Analysis of requirements");
 
     // Given a subscribed proxy event that has delivered a sample which is still held
+    ON_CALL(Base::mock_proxy_event_, Subscribe(1U)).WillByDefault(Return(score::Result<void>{}));
     EXPECT_CALL(Base::mock_proxy_event_, GetSubscriptionState())
-        .WillOnce(Return(SubscriptionState::kNotSubscribed))      // called by Subscribe
-        .WillRepeatedly(Return(SubscriptionState::kSubscribed));  // called by Unsubscribe
-    EXPECT_CALL(Base::mock_proxy_event_, Subscribe(1U));
-    EXPECT_CALL(Base::mock_proxy_event_, GetNewSamples(_, _));
-    EXPECT_CALL(Base::mock_proxy_event_, Unsubscribe()).Times(AtMost(1));
+        .WillOnce(Return(SubscriptionState::kNotSubscribed))
+        .WillRepeatedly(Return(SubscriptionState::kSubscribed));
 
     Base::mock_proxy_event_.PushFakeSample(3U);
     std::ignore = Base::proxy_event_.Subscribe(1U);
@@ -283,11 +281,12 @@ TYPED_TEST(ProxyEventFixture, UnsubscribeWhileNotHoldingSamplePtrs)
     using Base = ProxyEventFixture<TypeParam>;
 
     // Given a subscribed proxy event that received a sample but no longer holds it
+    ON_CALL(Base::mock_proxy_event_, Subscribe(1U)).WillByDefault(Return(score::Result<void>{}));
     EXPECT_CALL(Base::mock_proxy_event_, GetSubscriptionState())
         .WillOnce(Return(SubscriptionState::kNotSubscribed))
         .WillRepeatedly(Return(SubscriptionState::kSubscribed));
-    EXPECT_CALL(Base::mock_proxy_event_, Subscribe(1U));
-    EXPECT_CALL(Base::mock_proxy_event_, GetNewSamples(_, _));
+
+    // Expecting that Unsubscribe is called on the binding
     EXPECT_CALL(Base::mock_proxy_event_, Unsubscribe());
 
     Base::mock_proxy_event_.PushFakeSample(3U);

score/mw/com/impl/tracing/test/proxy_event_tracing_test.cpp

@@ -104,6 +104,8 @@ class ProxyEventTracingFixture : public ::testing::Test
 
         ON_CALL(*mock_proxy_event_binding_, SetReceiveHandler(_)).WillByDefault(Return(score::Result<void>{}));
         ON_CALL(*mock_proxy_event_binding_, GetBindingType()).WillByDefault(Return(BindingType::kLoLa));
+        ON_CALL(*mock_proxy_event_binding_, GetSubscriptionState())
+            .WillByDefault(Return(SubscriptionState::kNotSubscribed));
     }
 
     void CreateProxy()
@@ -769,7 +771,6 @@ TYPED_TEST(ProxyEventTracingUnsubscribeFixture,
 
     ProxyEventTracingData expected_enabled_trace_points{};
     expected_enabled_trace_points.enable_unsubscribe = true;
-    expected_enabled_trace_points.enable_subscribe = true;
     expected_enabled_trace_points.enable_call_receive_handler = true;
 
     const tracing::ServiceElementInstanceIdentifierView expected_service_element_instance_identifier_view =
@@ -790,27 +791,6 @@ TYPED_TEST(ProxyEventTracingUnsubscribeFixture,
         typename ProxyEventTracingFixture<TypeParam>::TracePointType>(
         expected_enabled_trace_points, kServiceIdentifierStringView, kServiceElementName, kInstanceSpecifierStringView);
 
-    // Expect that GetSubscriptionState returns kNotSubscribed then kSubscribed
-    EXPECT_CALL(*this->mock_proxy_event_binding_, GetSubscriptionState())
-        .WillOnce(Return(SubscriptionState::kNotSubscribed))
-        .WillOnce(Return(SubscriptionState::kSubscribed));
-
-    // Expect that a trace call relating to Subscribe is called
-    tracing::ITracingRuntime::TracePointType subscribe_trace_point_type{
-        ProxyEventTracingFixture<TypeParam>::TracePointType::SUBSCRIBE};
-    EXPECT_CALL(tracing_runtime_mock,
-                Trace(BindingType::kLoLa,
-                      expected_service_element_instance_identifier_view,
-                      subscribe_trace_point_type,
-                      std::optional<tracing::ITracingRuntime::TracePointDataId>{},
-                      _,
-                      _))
-        .WillOnce(Return(Result<void>{}));
-
-
-    // and that Subscribe will be called on the binding
-    EXPECT_CALL(*this->mock_proxy_event_binding_, Subscribe(max_sample_count));
-
     // Then a trace call relating to Unsubscribe should be called containing the correct max_sample_count which returns
     // an error
     tracing::ITracingRuntime::TracePointType trace_point_type{
@@ -824,9 +804,6 @@ TYPED_TEST(ProxyEventTracingUnsubscribeFixture,
                       0U))
         .WillOnce(Return(MakeUnexpected(tracing::TraceErrorCode::TraceErrorDisableTracePointInstance)));
 
-    // and that Unsubscribe will be called on the binding
-    EXPECT_CALL(*this->mock_proxy_event_binding_, Unsubscribe());
-
     // When a Proxy containing a ProxyEvent is created based on a lola deployment
     this->CreateProxy();
 
@@ -857,7 +834,6 @@ TYPED_TEST(ProxyEventTracingUnsubscribeFixture,
 
     ProxyEventTracingData expected_enabled_trace_points{};
     expected_enabled_trace_points.enable_unsubscribe = true;
-    expected_enabled_trace_points.enable_subscribe = true;
     expected_enabled_trace_points.enable_call_receive_handler = true;
 
     const tracing::ServiceElementInstanceIdentifierView expected_service_element_instance_identifier_view =
@@ -878,27 +854,6 @@ TYPED_TEST(ProxyEventTracingUnsubscribeFixture,
         typename ProxyEventTracingFixture<TypeParam>::TracePointType>(
         expected_enabled_trace_points, kServiceIdentifierStringView, kServiceElementName, kInstanceSpecifierStringView);
 
-    // Expect that GetSubscriptionState returns kNotSubscribed then kSubscribed
-    EXPECT_CALL(*this->mock_proxy_event_binding_, GetSubscriptionState())
-        .WillOnce(Return(SubscriptionState::kNotSubscribed))
-        .WillOnce(Return(SubscriptionState::kSubscribed));
-
-    // Expect that a trace call relating to Subscribe is called
-    tracing::ITracingRuntime::TracePointType subscribe_trace_point_type{
-        ProxyEventTracingFixture<TypeParam>::TracePointType::SUBSCRIBE};
-    EXPECT_CALL(tracing_runtime_mock,
-                Trace(BindingType::kLoLa,
-                      expected_service_element_instance_identifier_view,
-                      subscribe_trace_point_type,
-                      std::optional<tracing::ITracingRuntime::TracePointDataId>{},
-                      _,
-                      _))
-        .WillOnce(Return(Result<void>{}));
-
-
-    // and that Subscribe will be called on the binding
-    EXPECT_CALL(*this->mock_proxy_event_binding_, Subscribe(max_sample_count));
-
     // Then a trace call relating to Unsubscribe should be called containing the correct max_sample_count which returns
     // an error
     tracing::ITracingRuntime::TracePointType trace_point_type{
@@ -912,9 +867,6 @@ TYPED_TEST(ProxyEventTracingUnsubscribeFixture,
                       0U))
         .WillOnce(Return(MakeUnexpected(tracing::TraceErrorCode::TraceErrorDisableAllTracePoints)));
 
-    // and that Unsubscribe will be called on the binding
-    EXPECT_CALL(*this->mock_proxy_event_binding_, Unsubscribe());
-
     // When a Proxy containing a ProxyEvent is created based on a lola deployment
     this->CreateProxy();