Verify type of object before mapping them

davidahouse · Oct 4, 2019 · 8f5b0da · 8f5b0da
1 parent afb327a
commit 8f5b0da
Show file tree

Hide file tree

Showing 10 changed files with 39 additions and 17 deletions.
diff --git a/Sources/XCResultKit/ActionTestActivitySummary.swift b/Sources/XCResultKit/ActionTestActivitySummary.swift
@@ -34,8 +34,10 @@ public struct ActionTestActivitySummary: XCResultObject {
             uuid = try xcRequired(element: "uuid", from: json)
             start = xcOptional(element: "start", from: json)
             finish = xcOptional(element: "finish", from: json)
-            attachments = xcArray(element: "attachments", from: json).compactMap { ActionTestAttachment($0) }
-            subactivities = xcArray(element: "subactivities", from: json).compactMap { ActionTestActivitySummary($0) }
+            attachments = xcArray(element: "attachments", from: json)
+                .ofType(ActionTestAttachment.self)
+            subactivities = xcArray(element: "subactivities", from: json)
+                .ofType(ActionTestActivitySummary.self)
         } catch {
             debug("Error parsing ActionTestActivitySummary: \(error.localizedDescription)")
             return nil

diff --git a/Sources/XCResultKit/ActionTestPerformanceMetricSummary.swift b/Sources/XCResultKit/ActionTestPerformanceMetricSummary.swift
@@ -36,7 +36,7 @@ public struct ActionTestPerformanceMetricSummary: XCResultObject {
         do {
             displayName = try xcRequired(element: "displayName", from: json)
             unitOfMeasurement = try xcRequired(element: "unitOfMeasurement", from: json)
-            measurements = xcArray(element: "measurements", from: json).compactMap { Double($0) }
+            measurements = xcArray(element: "measurements", from: json).ofType(Double.self)
             identifier = xcOptional(element: "identifier", from: json)
             baselineName = xcOptional(element: "baselineName", from: json)
             baselineAverage = xcOptional(element: "baselineAverage", from: json)

diff --git a/Sources/XCResultKit/ActionTestPlanRunSummaries.swift b/Sources/XCResultKit/ActionTestPlanRunSummaries.swift
@@ -15,6 +15,6 @@ public struct ActionTestPlanRunSummaries: XCResultObject {
     public let summaries: [ActionTestPlanRunSummary]
 
     public init?(_ json: [String : AnyObject]) {        
-        summaries = xcArray(element: "summaries", from: json).compactMap { ActionTestPlanRunSummary($0) }
+        summaries = xcArray(element: "summaries", from: json).ofType(ActionTestPlanRunSummary.self)
     }
 }
diff --git a/Sources/XCResultKit/ActionTestPlanRunSummary.swift b/Sources/XCResultKit/ActionTestPlanRunSummary.swift
@@ -19,7 +19,7 @@ public struct ActionTestPlanRunSummary: XCResultObject {
     public init?(_ json: [String : AnyObject]) {
         do {
             name = try xcRequired(element: "name", from: json)
-            testableSummaries = xcArray(element: "testableSummaries", from: json).compactMap { ActionTestableSummary($0) }
+            testableSummaries = xcArray(element: "testableSummaries", from: json).ofType(ActionTestableSummary.self)
         } catch {
             debug("Error parsing ActionTestPlanRunSummary: \(error.localizedDescription)")
             return nil

diff --git a/Sources/XCResultKit/ActionTestSummary.swift b/Sources/XCResultKit/ActionTestSummary.swift
@@ -32,9 +32,12 @@ public struct ActionTestSummary: XCResultObject {
             identifier = try xcRequired(element: "identifier", from: json)
             testStatus = try xcRequired(element: "testStatus", from: json)
             duration = try xcRequired(element: "duration", from: json)
-            performanceMetrics = xcArray(element: "performanceMetrics", from: json).compactMap { ActionTestPerformanceMetricSummary($0) }
-            failureSummaries = xcArray(element: "failureSummaries", from: json).compactMap { ActionTestFailureSummary($0) }
-            activitySummaries = xcArray(element: "activitySummaries", from: json).compactMap { ActionTestActivitySummary($0) }
+            performanceMetrics = xcArray(element: "performanceMetrics", from: json)
+                .ofType(ActionTestPerformanceMetricSummary.self)
+            failureSummaries = xcArray(element: "failureSummaries", from: json)
+                .ofType(ActionTestFailureSummary.self)
+            activitySummaries = xcArray(element: "activitySummaries", from: json)
+                .ofType(ActionTestActivitySummary.self)
         } catch {
             debug("Error parsing ActionTestSummary: \(error.localizedDescription)")
             return nil

diff --git a/Sources/XCResultKit/ActionTestSummaryGroup.swift b/Sources/XCResultKit/ActionTestSummaryGroup.swift
@@ -25,8 +25,10 @@ public struct ActionTestSummaryGroup: XCResultObject {
             name = try xcRequired(element: "name", from: json)
             identifier = try xcRequired(element: "identifier", from: json)
             duration = try xcRequired(element: "duration", from: json)
-            subtestGroups = xcArray(element: "subtests", from: json).compactMap { ActionTestSummaryGroup($0) }
-            subtests = xcArray(element: "subtests", from: json).compactMap { ActionTestMetadata($0) }
+            subtestGroups = xcArray(element: "subtests", from: json)
+                .ofType(ActionTestSummaryGroup.self)
+            subtests = xcArray(element: "subtests", from: json)
+                .ofType(ActionTestMetadata.self)
         } catch {
             debug("Error parsing ActionTestSummaryGroup: \(error.localizedDescription)")
             return nil

diff --git a/Sources/XCResultKit/ActionTestableSummary.swift b/Sources/XCResultKit/ActionTestableSummary.swift
@@ -33,9 +33,9 @@ public struct ActionTestableSummary: XCResultObject {
         projectRelativePath = xcOptional(element: "projectRelativePath", from: json)
         targetName = xcOptional(element: "targetName", from: json)
         testKind = xcOptional(element: "testKind", from: json)
-        tests = xcArray(element: "tests", from: json).compactMap { ActionTestSummaryGroup($0) }
+        tests = xcArray(element: "tests", from: json).ofType(ActionTestSummaryGroup.self)
         diagnosticsDirectoryName = xcOptional(element: "diagnosticsDirectoryName", from: json)
-        failureSummaries = xcArray(element: "failureSummaries", from: json).compactMap { ActionTestFailureSummary($0) }
+        failureSummaries = xcArray(element: "failureSummaries", from: json).ofType(ActionTestFailureSummary.self)
         testLanguage = xcOptional(element: "testLanguage", from: json)
         testRegion = xcOptional(element: "testRegion", from: json)
     }

diff --git a/Sources/XCResultKit/ActionsInvocationRecord.swift b/Sources/XCResultKit/ActionsInvocationRecord.swift
@@ -31,7 +31,7 @@ public struct ActionsInvocationRecord: XCResultObject {
             issues = try xcRequired(element: "issues", from: json)
             metadataRef = xcOptional(element: "metadataRef", from: json)
             archive = xcOptional(element: "archive", from: json)
-            actions = xcArray(element: "actions", from: json).compactMap { ActionRecord($0) }
+            actions = xcArray(element: "actions", from: json).ofType(ActionRecord.self)
         } catch {
             debug("Error parsing ActionsInvocationRecord: \(error.localizedDescription)")
             return nil

diff --git a/Sources/XCResultKit/ResultIssueSummaries.swift b/Sources/XCResultKit/ResultIssueSummaries.swift
@@ -21,9 +21,9 @@ public struct ResultIssueSummaries: XCResultObject {
     public let warningSummaries: [IssueSummary]
 
     public init?(_ json: [String: AnyObject]) {        
-        analyzerWarningSummaries = xcArray(element: "analyzerWarningSummaries", from: json).compactMap { IssueSummary($0) }
-        errorSummaries = xcArray(element: "errorSummaries", from: json).compactMap { IssueSummary($0) }
-        testFailureSummaries = xcArray(element: "testFailureSummaries", from: json).compactMap { TestFailureIssueSummary($0) }
-        warningSummaries = xcArray(element: "warningSummaries", from: json).compactMap { IssueSummary($0) }
+        analyzerWarningSummaries = xcArray(element: "analyzerWarningSummaries", from: json).ofType(IssueSummary.self)
+        errorSummaries = xcArray(element: "errorSummaries", from: json).ofType(IssueSummary.self)
+        testFailureSummaries = xcArray(element: "testFailureSummaries", from: json).ofType(TestFailureIssueSummary.self)
+        warningSummaries = xcArray(element: "warningSummaries", from: json).ofType(IssueSummary.self)
     }
 }
diff --git a/Sources/XCResultKit/XCResultObject.swift b/Sources/XCResultKit/XCResultObject.swift
@@ -48,3 +48,18 @@ func xcArray(element: String, from json: [String: AnyObject]) -> [[String: AnyOb
         return []
     }
 }
+
+extension Array where Element == [String: AnyObject] {
+
+    func ofType(_ type: String) -> [Element] {
+        return filter { json -> Bool in
+            guard let typeJson = json["_type"] as? [String: AnyObject] else { return false }
+            guard let typeNameJson = typeJson["_name"] as? String else { return false }
+            return type == typeNameJson
+        }
+    }
+
+    func ofType<T>(_ type: T.Type) -> [T] where T: XCResultObject {
+        return ofType(String(describing: type)).compactMap(T.init)
+    }
+}