@@ -180,22 +180,22 @@ TEST(TestCodegenModelViaMocks, GetCluterInfo)
180
180
181
181
chip::Test::ResetVersion ();
182
182
183
- ASSERT_FALSE (model.GetClusterInfo (ConcreteClusterPath (kInvalidEndpointId , kInvalidClusterId )).HasValue ());
184
- ASSERT_FALSE (model.GetClusterInfo (ConcreteClusterPath (kInvalidEndpointId , MockClusterId (1 ))).HasValue ());
185
- ASSERT_FALSE (model.GetClusterInfo (ConcreteClusterPath (kMockEndpoint1 , kInvalidClusterId )).HasValue ());
186
- ASSERT_FALSE (model.GetClusterInfo (ConcreteClusterPath (kMockEndpoint1 , MockClusterId (10 ))).HasValue ());
183
+ ASSERT_FALSE (model.GetClusterInfo (ConcreteClusterPath (kInvalidEndpointId , kInvalidClusterId )).has_value ());
184
+ ASSERT_FALSE (model.GetClusterInfo (ConcreteClusterPath (kInvalidEndpointId , MockClusterId (1 ))).has_value ());
185
+ ASSERT_FALSE (model.GetClusterInfo (ConcreteClusterPath (kMockEndpoint1 , kInvalidClusterId )).has_value ());
186
+ ASSERT_FALSE (model.GetClusterInfo (ConcreteClusterPath (kMockEndpoint1 , MockClusterId (10 ))).has_value ());
187
187
188
188
// now get the value
189
- Optional <ClusterInfo> info = model.GetClusterInfo (ConcreteClusterPath (kMockEndpoint1 , MockClusterId (1 )));
190
- ASSERT_TRUE (info.HasValue ());
191
- ASSERT_EQ (info. Value (). dataVersion , 0u );
192
- ASSERT_EQ (info. Value (). flags .Raw (), 0u );
189
+ std::optional <ClusterInfo> info = model.GetClusterInfo (ConcreteClusterPath (kMockEndpoint1 , MockClusterId (1 )));
190
+ ASSERT_TRUE (info.has_value ());
191
+ EXPECT_EQ (info-> dataVersion , 0u );
192
+ EXPECT_EQ (info-> flags .Raw (), 0u );
193
193
194
194
chip::Test::BumpVersion ();
195
195
info = model.GetClusterInfo (ConcreteClusterPath (kMockEndpoint1 , MockClusterId (1 )));
196
- ASSERT_TRUE (info.HasValue ());
197
- ASSERT_EQ (info. Value (). dataVersion , 1u );
198
- ASSERT_EQ (info. Value (). flags .Raw (), 0u );
196
+ ASSERT_TRUE (info.has_value ());
197
+ EXPECT_EQ (info-> dataVersion , 1u );
198
+ EXPECT_EQ (info-> flags .Raw (), 0u );
199
199
}
200
200
201
201
TEST (TestCodegenModelViaMocks, IterateOverAttributes)
@@ -270,20 +270,21 @@ TEST(TestCodegenModelViaMocks, GetAttributeInfo)
270
270
271
271
// various non-existent or invalid paths should return no info data
272
272
ASSERT_FALSE (
273
- model.GetAttributeInfo (ConcreteAttributePath (kInvalidEndpointId , kInvalidClusterId , kInvalidAttributeId )).HasValue ());
274
- ASSERT_FALSE (model.GetAttributeInfo (ConcreteAttributePath (kInvalidEndpointId , kInvalidClusterId , FeatureMap::Id)).HasValue ());
275
- ASSERT_FALSE (model.GetAttributeInfo (ConcreteAttributePath (kInvalidEndpointId , MockClusterId (1 ), FeatureMap::Id)).HasValue ());
276
- ASSERT_FALSE (model.GetAttributeInfo (ConcreteAttributePath (kMockEndpoint1 , kInvalidClusterId , FeatureMap::Id)).HasValue ());
277
- ASSERT_FALSE (model.GetAttributeInfo (ConcreteAttributePath (kMockEndpoint1 , MockClusterId (10 ), FeatureMap::Id)).HasValue ());
278
- ASSERT_FALSE (model.GetAttributeInfo (ConcreteAttributePath (kMockEndpoint1 , MockClusterId (10 ), kInvalidAttributeId )).HasValue ());
279
- ASSERT_FALSE (model.GetAttributeInfo (ConcreteAttributePath (kMockEndpoint1 , MockClusterId (1 ), MockAttributeId (10 ))).HasValue ());
273
+ model.GetAttributeInfo (ConcreteAttributePath (kInvalidEndpointId , kInvalidClusterId , kInvalidAttributeId )).has_value ());
274
+ ASSERT_FALSE (model.GetAttributeInfo (ConcreteAttributePath (kInvalidEndpointId , kInvalidClusterId , FeatureMap::Id)).has_value ());
275
+ ASSERT_FALSE (model.GetAttributeInfo (ConcreteAttributePath (kInvalidEndpointId , MockClusterId (1 ), FeatureMap::Id)).has_value ());
276
+ ASSERT_FALSE (model.GetAttributeInfo (ConcreteAttributePath (kMockEndpoint1 , kInvalidClusterId , FeatureMap::Id)).has_value ());
277
+ ASSERT_FALSE (model.GetAttributeInfo (ConcreteAttributePath (kMockEndpoint1 , MockClusterId (10 ), FeatureMap::Id)).has_value ());
278
+ ASSERT_FALSE (model.GetAttributeInfo (ConcreteAttributePath (kMockEndpoint1 , MockClusterId (10 ), kInvalidAttributeId )).has_value ());
279
+ ASSERT_FALSE (model.GetAttributeInfo (ConcreteAttributePath (kMockEndpoint1 , MockClusterId (1 ), MockAttributeId (10 ))).has_value ());
280
280
281
281
// valid info
282
- Optional<AttributeInfo> info = model.GetAttributeInfo (ConcreteAttributePath (kMockEndpoint1 , MockClusterId (1 ), FeatureMap::Id));
283
- ASSERT_TRUE (info.HasValue ());
284
- ASSERT_FALSE (info.Value ().flags .Has (AttributeQualityFlags::kListAttribute ));
282
+ std::optional<AttributeInfo> info =
283
+ model.GetAttributeInfo (ConcreteAttributePath (kMockEndpoint1 , MockClusterId (1 ), FeatureMap::Id));
284
+ ASSERT_TRUE (info.has_value ());
285
+ ASSERT_FALSE (info->flags .Has (AttributeQualityFlags::kListAttribute ));
285
286
286
287
info = model.GetAttributeInfo (ConcreteAttributePath (kMockEndpoint2 , MockClusterId (2 ), MockAttributeId (2 )));
287
- ASSERT_TRUE (info.HasValue ());
288
- ASSERT_TRUE (info. Value (). flags .Has (AttributeQualityFlags::kListAttribute ));
288
+ ASSERT_TRUE (info.has_value ());
289
+ ASSERT_TRUE (info-> flags .Has (AttributeQualityFlags::kListAttribute ));
289
290
}
0 commit comments