Apply suggestions from code review

Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>

Author: nivi-apple

src/darwin/Framework/CHIP/MTRDevice.h

@@ -426,7 +426,7 @@ MTR_EXTERN NSString * const MTRDataVersionKey MTR_NEWLY_AVAILABLE;
 /**
  * This is called when the MTRDevice object detects a change in the device configuration.
  *
- * Device configuration is a set of functionality implemented by the device.
+ * Device configuration is the set of functionality implemented by the device.
  *
  * The intention is that this is called whenever any of the things that usually don't change about a device might have changed.
  */

src/darwin/Framework/CHIP/MTRDevice.mm

@@ -2469,9 +2469,9 @@ - (void)_noteDataVersion:(NSNumber *)dataVersion forClusterPath:(MTRClusterPath
     }
 }
 
-- (BOOL)_isAttributeAffectingDeviceConfigurationChanged:(MTRAttributePath *)attributePath
+- (BOOL)_attributeAffectsDeviceConfiguration:(MTRAttributePath *)attributePath
 {
-    // Check for attributes in the descriptor cluster that affect device configuration changed.
+    // Check for attributes in the descriptor cluster that affect device configuration.
     if (attributePath.cluster.unsignedLongValue == MTRClusterIDTypeDescriptorID) {
         switch (attributePath.attribute.unsignedLongValue) {
         case MTRAttributeIDTypeClusterDescriptorAttributePartsListID:
@@ -2482,7 +2482,7 @@ - (BOOL)_isAttributeAffectingDeviceConfigurationChanged:(MTRAttributePath *)attr
         }
     }
 
-    // Check for global attributes that affect device configuration changed.
+    // Check for global attributes that affect device configuration.
     switch (attributePath.attribute.unsignedLongValue) {
     case MTRAttributeIDTypeGlobalAttributeAcceptedCommandListID:
     case MTRAttributeIDTypeGlobalAttributeAttributeListID:

src/darwin/Framework/CHIPTests/MTRDeviceTests.m

@@ -1574,10 +1574,11 @@ - (void)test017_TestMTRDeviceBasics
         [resubscriptionGotReportsExpectation fulfill];
     };
 
-    // Set the onDeviceConfigurationChanged callback but do nothing. We shouldn't be called.
-    __block BOOL wasOnDeviceConfigurationChangedCallbackCalled = false;
+    // Make sure there are no device configuration changed notifications during this test.
+    // There is nothing changing about the server that would lead to those.
+    __block BOOL wasOnDeviceConfigurationChangedCallbackCalled = NO;
     delegate.onDeviceConfigurationChanged = ^() {
-        wasOnDeviceConfigurationChangedCallbackCalled = true;
+        wasOnDeviceConfigurationChangedCallbackCalled = YES;
     };
 
     // reset the onAttributeDataReceived to validate the following resubscribe test
@@ -3052,8 +3053,8 @@ - (void)test032_MTRPathClassesEncoding
     XCTAssertEqualObjects(originalCommandPath, decodedCommandPath);
 }
 
-// Helper API to test if changes in an attribute with a path specified by endpointId, clusterId and attributeId affect
-// device configuration changed for a given MTRDevice. This API creates a fake attribute report for the given attribute path
+// Helper API to test if changes in an attribute with a path specified by endpointId, clusterId and attributeId trigger
+// device configuration changed callbacks for a given MTRDevice. This API creates a fake attribute report for the given attribute path
 // and injects it into MTRDevice to exercise and test the delegate's device configuration changed callback.
 + (void)runTestDeviceConfigurationChangedForAttribute:(MTRAttributeIDType)attributeId
                                             clusterId:(MTRClusterIDType)clusterId
@@ -3093,17 +3094,17 @@ + (void)runTestDeviceConfigurationChangedForAttribute:(MTRAttributeIDType)attrib
             MTRAttributePath * attributePath = attributeDict[MTRAttributePathKey];
             XCTAssertNotNil(attributePath);
 
-            XCTAssert(attributePath.cluster.unsignedLongValue == clusterId);
-            XCTAssert(attributePath.attribute.unsignedLongValue == attributeId);
+            XCTAssertEqualObjects(attributePath.cluster, @(clusterId));
+            XCTAssertEqualObjects(attributePath.attribute, @(attributeId));
 
             NSDictionary * data = attributeDict[MTRDataKey];
             XCTAssertNotNil(data);
-            XCTAssert([data[MTRDataVersionKey] isEqualToNumber:dataVersion]);
+            XCTAssertEqualObjects(data[MTRDataVersionKey], dataVersion);
 
             NSArray<NSNumber *> * dataValue = data[MTRValueKey];
             XCTAssertNotNil(dataValue);
             XCTAssertNotNil(testDataValue);
-            XCTAssert([dataValue isEqual:testDataValue]);
+            XCTAssertEqualObjects(dataValue, testDataValue);
             [gotAttributeReportExpectation fulfill];
         }
     };
@@ -3187,13 +3188,11 @@ - (void)test033_TestMTRDeviceDeviceConfigurationChanged
                 switch (attributePath.attribute.unsignedLongValue) {
                 case MTRAttributeIDTypeGlobalAttributeAttributeListID: {
                     dataVersionForAttributeList = data[MTRDataVersionKey];
-                    ;
                     XCTAssertNotNil(dataVersionForAttributeList);
                     break;
                 }
                 case MTRAttributeIDTypeGlobalAttributeClusterRevisionID: {
                     dataVersionForClusterRevision = data[MTRDataVersionKey];
-                    ;
                     XCTAssertNotNil(dataVersionForClusterRevision);
                     break;
                 }
@@ -3202,7 +3201,6 @@ - (void)test033_TestMTRDeviceDeviceConfigurationChanged
                 NSDictionary * data = attributeDict[MTRDataKey];
                 XCTAssertNotNil(data);
                 dataVersionForAcceptedCommandList = data[MTRDataVersionKey];
-                ;
                 XCTAssertNotNil(dataVersionForAcceptedCommandList);
             } else if (attributePath.cluster.unsignedLongValue == MTRClusterIDTypeGroupsID && attributePath.attribute.unsignedLongValue == MTRAttributeIDTypeGlobalAttributeFeatureMapID) {
                 NSDictionary * data = attributeDict[MTRDataKey];