diff options
author | Justin Beharry <109764059+jshivabeharry@users.noreply.github.com> | 2022-08-19 11:50:25 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-19 11:50:25 -0400 |
commit | 6e71163a1fbf520e05a977744f7f36e87fb95a84 (patch) | |
tree | 6f1e1b281e8a0226cdf30e1bba1aca375816c62a | |
parent | bf9ef2c11aa1d2239a1c41b4d82855bf38c9e962 (diff) | |
download | sdl_ios-6e71163a1fbf520e05a977744f7f36e87fb95a84.tar.gz |
Apply suggestions from code review
Co-authored-by: Joel Fischer <joeljfischer@gmail.com>
-rw-r--r-- | SmartDeviceLink/public/SDLSystemCapabilityManager.m | 5 | ||||
-rw-r--r-- | SmartDeviceLinkTests/SDLSystemCapabilityManagerSpec.m | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/SmartDeviceLink/public/SDLSystemCapabilityManager.m b/SmartDeviceLink/public/SDLSystemCapabilityManager.m index def2c853c..0259288a6 100644 --- a/SmartDeviceLink/public/SDLSystemCapabilityManager.m +++ b/SmartDeviceLink/public/SDLSystemCapabilityManager.m @@ -157,7 +157,8 @@ typedef NSString * SDLServiceID; NSUInteger currentWindowID = windowCapability.windowID != nil ? windowCapability.windowID.unsignedIntegerValue : SDLPredefinedWindowsDefaultWindow; if (currentWindowID != windowID) { continue; } - windowCapability.windowID = [NSNumber<SDLUInt> numberWithUnsignedLong:windowID]; + // A nil windowID is assumed to be the DefaultWindow according to the spec, but that can be hard for developers to check, so set it explicitly. + windowCapability.windowID = [NSNumber numberWithUnsignedLong:currentWindowID]; return windowCapability; } @@ -257,7 +258,7 @@ typedef NSString * SDLServiceID; convertedCapabilities.templatesAvailable = [defaultMainWindowCapabilities.templatesAvailable copy]; convertedCapabilities.numCustomPresetsAvailable = [defaultMainWindowCapabilities.numCustomPresetsAvailable copy]; // Set to an empty list if no formats are available - convertedCapabilities.mediaClockFormats = self.displayCapabilities.mediaClockFormats ? self.displayCapabilities.mediaClockFormats : @[]; + convertedCapabilities.mediaClockFormats = self.displayCapabilities.mediaClockFormats ?: @[]; convertedCapabilities.graphicSupported = @([defaultMainWindowCapabilities.imageTypeSupported containsObject:SDLImageTypeDynamic]); convertedCapabilities.screenParams = self.displayCapabilities.screenParams; diff --git a/SmartDeviceLinkTests/SDLSystemCapabilityManagerSpec.m b/SmartDeviceLinkTests/SDLSystemCapabilityManagerSpec.m index 055ccb827..392b83f6d 100644 --- a/SmartDeviceLinkTests/SDLSystemCapabilityManagerSpec.m +++ b/SmartDeviceLinkTests/SDLSystemCapabilityManagerSpec.m @@ -714,12 +714,12 @@ describe(@"a system capability manager", ^{ expect(testSystemCapabilityManager.defaultMainWindowCapability.imageFields).to(haveCount(18)); }); - it(@"should retrieve window id if window id is missing in window capabilities", ^{ - // set window id to nil. windowID can be potentialy nil in real applications + it(@"should set the default window id if window id is missing", ^{ + // Set window id to nil. windowID can be potentially nil in real applications testSystemCapabilityManager.displays[0].windowCapabilities[0].windowID = nil; - expect(testSystemCapabilityManager.defaultMainWindowCapability.windowID).to(equal(0)); - expect([testSystemCapabilityManager windowCapabilityWithWindowID:0].windowID).to(equal(0)); + expect(testSystemCapabilityManager.defaultMainWindowCapability.windowID).to(equal(SDLPredefinedWindowsDefaultWindow)); + expect([testSystemCapabilityManager windowCapabilityWithWindowID:0].windowID).to(equal(SDLPredefinedWindowsDefaultWindow)); }); }); }); |