Updated tests to use XCTAssertEqual where possible

Author: bryce-b

Tests/InstrumentationTests/sdk-resource-extension-tests/ApplicationResourceProviderTests.swift

@@ -26,7 +26,7 @@ import XCTest
 
             let resource = provider.create()
 
-            XCTAssertTrue(appData.name == resource.attributes[ResourceAttributes.serviceName.rawValue]?.description)
+            XCTAssertEqual(appData.name, resource.attributes[ResourceAttributes.serviceName.rawValue]?.description)
             let versionDescription = resource.attributes[ResourceAttributes.serviceVersion.rawValue]?.description
 
             XCTAssertNotNil(versionDescription)
@@ -42,12 +42,12 @@ import XCTest
 
             let resource = provider.create()
 
-            XCTAssertTrue(appData.name == resource.attributes[ResourceAttributes.serviceName.rawValue]?.description)
+            XCTAssertEqual(appData.name, resource.attributes[ResourceAttributes.serviceName.rawValue]?.description)
             let versionDescription = resource.attributes[ResourceAttributes.serviceVersion.rawValue]?.description
 
             XCTAssertNotNil(versionDescription)
 
-            XCTAssertTrue(versionDescription! == appData.version!)
+            XCTAssertEqual(versionDescription, appData.version)
         }
 
         func testNoShortVersion() {
@@ -57,12 +57,11 @@ import XCTest
 
             let resource = provider.create()
 
-            XCTAssertTrue(appData.name == resource.attributes[ResourceAttributes.serviceName.rawValue]?.description)
+            XCTAssertEqual(appData.name, resource.attributes[ResourceAttributes.serviceName.rawValue]?.description)
             let versionDescription = resource.attributes[ResourceAttributes.serviceVersion.rawValue]?.description
 
             XCTAssertNotNil(versionDescription)
-
-            XCTAssertTrue(versionDescription! == appData.build!)
+            XCTAssertEqual(versionDescription, appData.build)
         }
 
         func testNoAppData() {

Tests/InstrumentationTests/sdk-resource-extension-tests/DeviceResourceProviderTests.swift

@@ -26,7 +26,7 @@ class DeviceResourceProviderTests: XCTestCase {
 
         let resource = provider.create()
 
-        XCTAssertTrue(resource.attributes["device.model"]?.description == mock.model)
-        XCTAssertTrue(resource.attributes[ResourceAttributes.hostId.rawValue]?.description == mock.identifier)
+        XCTAssertEqual(mock.model, resource.attributes["device.model"]?.description)
+        XCTAssertEqual(mock.identifier, resource.attributes[ResourceAttributes.hostId.rawValue]?.description)
     }
 }

Tests/InstrumentationTests/sdk-resource-extension-tests/OSResourceProviderTests.swift

@@ -27,8 +27,8 @@ import XCTest
 
             let resource = provider.create()
 
-            XCTAssertTrue(resource.attributes["os.type"]?.description == mock.type)
-            XCTAssertTrue(resource.attributes["os.description"]?.description == mock.description)
+            XCTAssertEqual(mock.type, resource.attributes["os.type"]?.description)
+            XCTAssertEqual(mock.description, resource.attributes["os.description"]?.description)
         }
     }
 

Tests/InstrumentationTests/sdk-resource-extension-tests/TelemetryResourceProviderTests.swift

@@ -32,9 +32,9 @@ class TelemetryResourceProviderTests: XCTestCase {
 
         let resource = provider.create()
 
-        XCTAssertTrue(resource.attributes["telemetry.sdk.name"]?.description == mock.name)
-        XCTAssertTrue(resource.attributes["telemetry.sdk.language"]?.description == mock.language)
-        XCTAssertTrue(resource.attributes["telemetry.sdk.version"]?.description == mock.version)
+        XCTAssertEqual(mock.name, resource.attributes["telemetry.sdk.name"]?.description)
+        XCTAssertEqual(mock.language, resource.attributes["telemetry.sdk.language"]?.description)
+        XCTAssertEqual(mock.version, resource.attributes["telemetry.sdk.version"]?.description)
     }
 
     func testNils() {
@@ -43,8 +43,8 @@ class TelemetryResourceProviderTests: XCTestCase {
 
         let resource = provider.create()
 
-        XCTAssertTrue(resource.attributes["telemetry.sdk.name"]?.description == mock.name)
-        XCTAssertTrue(resource.attributes["telemetry.sdk.language"]?.description == mock.language)
+        XCTAssertEqual(mock.name, resource.attributes["telemetry.sdk.name"]?.description)
+        XCTAssertEqual(mock.language, resource.attributes["telemetry.sdk.language"]?.description)
         XCTAssertNil(resource.attributes["telemetry.sdk.version"])
     }
 }