More test coverage

Author: grynspan

Sources/Overlays/_Testing_CoreGraphics/Attachments/AttachableImageFormat+UTType.swift

@@ -94,7 +94,8 @@ extension AttachableImageFormat {
   public init?(pathExtension: String, encodingQuality: Float = 1.0) {
     let pathExtension = pathExtension.drop { $0 == "." }
 
-    guard let contentType = UTType(filenameExtension: String(pathExtension), conformingTo: .image) else {
+    guard let contentType = UTType(filenameExtension: String(pathExtension), conformingTo: .image),
+          contentType.isDeclared else {
       return nil
     }
 

Sources/Testing/Attachments/Images/AttachableImageFormat.swift

@@ -98,10 +98,7 @@ extension AttachableImageFormat.Kind: Equatable, Hashable {
       return true
     case let (.systemValue(lhs), .systemValue(rhs)):
       func open<T>(_ lhs: T) -> Bool where T: Equatable {
-        guard let rhs = rhs as? T else {
-          return false
-        }
-        return lhs == rhs
+        lhs == (rhs as? T)
       }
       return open(lhs)
     default:

Tests/TestingTests/AttachmentTests.swift

@@ -840,6 +840,34 @@ extension AttachmentTests {
     @Test func imageFormatFromPathExtension() {
       let format = AttachableImageFormat(pathExtension: "png")
       #expect(format != nil)
+      #expect(format == .png)
+
+      let badFormat = AttachableImageFormat(pathExtension: "no-such-image-format")
+      #expect(badFormat == nil)
+    }
+
+    @available(_uttypesAPI, *)
+    @Test func imageFormatEquatableConformance() {
+      let format1 = AttachableImageFormat.png
+      let format2 = AttachableImageFormat.jpeg
+#if canImport(CoreGraphics) && canImport(_Testing_CoreGraphics)
+      let format3 = AttachableImageFormat(contentType: .tiff)
+#elseif canImport(WinSDK) && canImport(_Testing_WinSDK)
+      let format3 = AttachableImageFormat(encoderCLSID: .CLSID_WICTiffEncoder)
+#endif
+      #expect(format1 == format1)
+      #expect(format2 == format2)
+      #expect(format3 == format3)
+      #expect(format1 != format2)
+      #expect(format2 != format3)
+      #expect(format1 != format3)
+
+      #expect(format1.hashValue == format1.hashValue)
+      #expect(format2.hashValue == format2.hashValue)
+      #expect(format3.hashValue == format3.hashValue)
+      #expect(format1.hashValue != format2.hashValue)
+      #expect(format2.hashValue != format3.hashValue)
+      #expect(format1.hashValue != format3.hashValue)
     }
 #endif
   }