Skip to content

Commit

Permalink
Merge pull request #101 from czechboy0/hd/renamed_issue
Browse files Browse the repository at this point in the history 
Renamed Issue
  • Loading branch information
Honza Dvorsky committed Sep 5, 2015
2 parents a2d7e48 + cef3042 commit 9c01d2d
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 32 deletions.
26 changes: 13 additions & 13 deletions XcodeServerSDK.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,9 @@
700C93571B54F58A00B3C6E6 /* get_devices.json in Resources */ = {isa = PBXBuildFile; fileRef = 700C93551B54F58A00B3C6E6 /* get_devices.json */; };
70138A811B62478100477F91 /* get_integration_commits.json in Resources */ = {isa = PBXBuildFile; fileRef = 70138A801B62478100477F91 /* get_integration_commits.json */; };
70138A821B62478100477F91 /* get_integration_commits.json in Resources */ = {isa = PBXBuildFile; fileRef = 70138A801B62478100477F91 /* get_integration_commits.json */; };
7014A53F1B7120980034DA74 /* Issue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7014A53E1B7120980034DA74 /* Issue.swift */; };
7014A5401B7120980034DA74 /* Issue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7014A53E1B7120980034DA74 /* Issue.swift */; };
7014A5411B7120980034DA74 /* Issue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7014A53E1B7120980034DA74 /* Issue.swift */; };
7014A53F1B7120980034DA74 /* IntegrationIssue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7014A53E1B7120980034DA74 /* IntegrationIssue.swift */; };
7014A5401B7120980034DA74 /* IntegrationIssue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7014A53E1B7120980034DA74 /* IntegrationIssue.swift */; };
7014A5411B7120980034DA74 /* IntegrationIssue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7014A53E1B7120980034DA74 /* IntegrationIssue.swift */; };
7019563C1B5E26C5007CDF0B /* Commit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7019563B1B5E26C5007CDF0B /* Commit.swift */; };
7019563D1B5E26C5007CDF0B /* Commit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7019563B1B5E26C5007CDF0B /* Commit.swift */; };
7019563E1B5E26C5007CDF0B /* Commit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7019563B1B5E26C5007CDF0B /* Commit.swift */; };
Expand Down Expand Up @@ -242,7 +242,7 @@
700B43571B5FA7A200E27175 /* FileTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FileTests.swift; sourceTree = "<group>"; };
700C93551B54F58A00B3C6E6 /* get_devices.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = get_devices.json; sourceTree = "<group>"; };
70138A801B62478100477F91 /* get_integration_commits.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = get_integration_commits.json; sourceTree = "<group>"; };
7014A53E1B7120980034DA74 /* Issue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Issue.swift; sourceTree = "<group>"; };
7014A53E1B7120980034DA74 /* IntegrationIssue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IntegrationIssue.swift; sourceTree = "<group>"; };
7019563B1B5E26C5007CDF0B /* Commit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Commit.swift; sourceTree = "<group>"; };
7019563F1B5E2BEE007CDF0B /* Contributor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Contributor.swift; sourceTree = "<group>"; };
701956431B5E2F79007CDF0B /* ContributorTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContributorTests.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -488,21 +488,21 @@
3A7B48D61B2A5ADE0077ABEA /* Bot.swift */,
3A7B48D71B2A5ADE0077ABEA /* BotConfiguration.swift */,
707D08991B2C6986003900F3 /* BotSchedule.swift */,
7019563B1B5E26C5007CDF0B /* Commit.swift */,
7019563F1B5E2BEE007CDF0B /* Contributor.swift */,
3A7B48D91B2A5ADE0077ABEA /* Device.swift */,
3ABE68651B3AC3C500FA0A61 /* DeviceSpecification.swift */,
707D08971B2C6954003900F3 /* EmailConfiguration.swift */,
701956461B5E54E8007CDF0B /* File.swift */,
3A7B48DA1B2A5ADE0077ABEA /* Integration.swift */,
7073359E1B60B5DB0018D2A6 /* IntegrationCommits.swift */,
708904CF1B7B98800004426D /* IntegrationIssues.swift */,
7014A53E1B7120980034DA74 /* IntegrationIssue.swift */,
7045917E1B4074CC00BA226C /* Repository.swift */,
3A7B48DB1B2A5ADE0077ABEA /* SourceControlBlueprint.swift */,
3A7CCD391B55F97B00CED8BC /* TestHierarchy.swift */,
707D089B1B2C69C4003900F3 /* Trigger.swift */,
707D089D1B2C6A1F003900F3 /* TriggerConditions.swift */,
7019563F1B5E2BEE007CDF0B /* Contributor.swift */,
7019563B1B5E26C5007CDF0B /* Commit.swift */,
701956461B5E54E8007CDF0B /* File.swift */,
7073359E1B60B5DB0018D2A6 /* IntegrationCommits.swift */,
7014A53E1B7120980034DA74 /* Issue.swift */,
708904CF1B7B98800004426D /* IntegrationIssues.swift */,
);
path = "Server Entities";
sourceTree = "<group>";
Expand Down Expand Up @@ -981,7 +981,7 @@
11376BDF1B3A2FE30005A681 /* EmailConfiguration.swift in Sources */,
11376BE61B3A2FEB0005A681 /* CIServer.swift in Sources */,
11376BE91B3A2FEB0005A681 /* XcodeServerConstants.swift in Sources */,
7014A5411B7120980034DA74 /* Issue.swift in Sources */,
7014A5411B7120980034DA74 /* IntegrationIssue.swift in Sources */,
70B43A8F1B43D6EA004F9DEB /* XcodeServer+Platform.swift in Sources */,
708904D21B7B98800004426D /* IntegrationIssues.swift in Sources */,
702706871B445F6A00E09FDF /* XcodeServer+SCM.swift in Sources */,
Expand Down Expand Up @@ -1015,7 +1015,7 @@
buildActionMask = 2147483647;
files = (
7027067F1B44548800E09FDF /* XcodeServer+Bot.swift in Sources */,
7014A5401B7120980034DA74 /* Issue.swift in Sources */,
7014A5401B7120980034DA74 /* IntegrationIssue.swift in Sources */,
11FB71B01B34AF3300D57A52 /* CIServer.swift in Sources */,
70DE3FA81B443137000761B7 /* XcodeServer+Integration.swift in Sources */,
11FB71B31B34AF3300D57A52 /* XcodeServerConstants.swift in Sources */,
Expand Down Expand Up @@ -1075,7 +1075,7 @@
buildActionMask = 2147483647;
files = (
3A7B48E61B2A5ADE0077ABEA /* SourceControlBlueprint.swift in Sources */,
7014A53F1B7120980034DA74 /* Issue.swift in Sources */,
7014A53F1B7120980034DA74 /* IntegrationIssue.swift in Sources */,
3A7B48E31B2A5ADE0077ABEA /* CIServer.swift in Sources */,
3A7B48E71B2A5ADE0077ABEA /* XcodeServer.swift in Sources */,
3A7B48E91B2A5ADE0077ABEA /* XcodeServerEndpoints.swift in Sources */,
Expand Down
2 changes: 1 addition & 1 deletion XcodeServerSDK/Server Entities/Issue.swift → ...DK/Server Entities/IntegrationIssue.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import Foundation

public class Issue: XcodeServerEntity {
public class IntegrationIssue: XcodeServerEntity {

public enum IssueType: String {
case BuildServiceError = "buildServiceError"
Expand Down
28 changes: 14 additions & 14 deletions XcodeServerSDK/Server Entities/IntegrationIssues.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,26 @@ import BuildaUtils

public class IntegrationIssues: XcodeServerEntity {

public let buildServiceErrors: [Issue]
public let buildServiceWarnings: [Issue]
public let triggerErrors: [Issue]
public let errors: [Issue]
public let warnings: [Issue]
public let testFailures: [Issue]
public let analyzerWarnings: [Issue]
public let buildServiceErrors: [IntegrationIssue]
public let buildServiceWarnings: [IntegrationIssue]
public let triggerErrors: [IntegrationIssue]
public let errors: [IntegrationIssue]
public let warnings: [IntegrationIssue]
public let testFailures: [IntegrationIssue]
public let analyzerWarnings: [IntegrationIssue]

// MARK: Initialization

public required init(json: NSDictionary) {
self.buildServiceErrors = json.arrayForKey("buildServiceErrors").map { Issue(json: $0) }
self.buildServiceWarnings = json.arrayForKey("buildServiceWarnings").map { Issue(json: $0) }
self.triggerErrors = json.arrayForKey("triggerErrors").map { Issue(json: $0) }
self.buildServiceErrors = json.arrayForKey("buildServiceErrors").map { IntegrationIssue(json: $0) }
self.buildServiceWarnings = json.arrayForKey("buildServiceWarnings").map { IntegrationIssue(json: $0) }
self.triggerErrors = json.arrayForKey("triggerErrors").map { IntegrationIssue(json: $0) }

// Nested issues
self.errors = json.dictionaryForKey("errors").allValues.filter { $0.count != 0 }.flatMap { ($0 as! NSArray).map { Issue(json: $0 as! NSDictionary) } }
self.warnings = json.dictionaryForKey("warnings").allValues.filter { $0.count != 0 }.flatMap { ($0 as! NSArray).map { Issue(json: $0 as! NSDictionary) } }
self.testFailures = json.dictionaryForKey("testFailures").allValues.filter { $0.count != 0 }.flatMap { ($0 as! NSArray).map { Issue(json: $0 as! NSDictionary) } }
self.analyzerWarnings = json.dictionaryForKey("analyzerWarnings").allValues.filter { $0.count != 0 }.flatMap { ($0 as! NSArray).map { Issue(json: $0 as! NSDictionary) } }
self.errors = json.dictionaryForKey("errors").allValues.filter { $0.count != 0 }.flatMap { ($0 as! NSArray).map { IntegrationIssue(json: $0 as! NSDictionary) } }
self.warnings = json.dictionaryForKey("warnings").allValues.filter { $0.count != 0 }.flatMap { ($0 as! NSArray).map { IntegrationIssue(json: $0 as! NSDictionary) } }
self.testFailures = json.dictionaryForKey("testFailures").allValues.filter { $0.count != 0 }.flatMap { ($0 as! NSArray).map { IntegrationIssue(json: $0 as! NSDictionary) } }
self.analyzerWarnings = json.dictionaryForKey("analyzerWarnings").allValues.filter { $0.count != 0 }.flatMap { ($0 as! NSArray).map { IntegrationIssue(json: $0 as! NSDictionary) } }

super.init(json: json)
}
Expand Down
8 changes: 4 additions & 4 deletions XcodeServerSDKTests/IssueTests.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import XCTest

class IssueTests: XCTestCase {

let buildServiceError = Issue(json: [
let buildServiceError = IntegrationIssue(json: [
"_id": "99e84a22b20df344df2217d5e4186094",
"_rev": "3-0cf0b25e995f1a050617d3c5824007f7",
"message": "This integration was canceled.",
Expand All @@ -23,7 +23,7 @@ class IssueTests: XCTestCase {
"status": 0
])

let errorWithCommits = Issue(json: [
let errorWithCommits = IntegrationIssue(json: [
"_id": "99e84a22b20df344df2217d5e413f43e",
"_rev": "3-7dfc0aa57a8119c025cd2d86143589f2",
"message": "Expected declaration",
Expand Down Expand Up @@ -70,8 +70,8 @@ class IssueTests: XCTestCase {
XCTAssertNotNil(errorWithCommits)

// Check types
XCTAssertEqual(buildServiceError.type, Issue.IssueType.BuildServiceError)
XCTAssertEqual(errorWithCommits.type, Issue.IssueType.Error)
XCTAssertEqual(buildServiceError.type, IntegrationIssue.IssueType.BuildServiceError)
XCTAssertEqual(errorWithCommits.type, IntegrationIssue.IssueType.Error)
}

func testPayload() {
Expand Down

0 comments on commit 9c01d2d

Please sign in to comment.