From 84287f428bcc77bedcbcc94ee580aca06f4a8da6 Mon Sep 17 00:00:00 2001 From: Jon Reid Date: Fri, 20 Aug 2021 18:49:34 -0700 Subject: [PATCH 1/8] e Update Swift Package Manager version --- swift/Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swift/Package.swift b/swift/Package.swift index fea88e3e..8730f481 100644 --- a/swift/Package.swift +++ b/swift/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.1 +// swift-tools-version:5.3 import PackageDescription From 569b40fc1dc0b743ed52bbf2cc89bf4d041d7b48 Mon Sep 17 00:00:00 2001 From: Jon Reid Date: Fri, 20 Aug 2021 18:54:10 -0700 Subject: [PATCH 2/8] r Follow more standard Swift formatting around spaces --- swift/Sources/GildedRose/GildedRose.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/swift/Sources/GildedRose/GildedRose.swift b/swift/Sources/GildedRose/GildedRose.swift index 9b975467..024d9870 100644 --- a/swift/Sources/GildedRose/GildedRose.swift +++ b/swift/Sources/GildedRose/GildedRose.swift @@ -1,12 +1,12 @@ public class GildedRose { - var items:[Item] + var items: [Item] - public init(items:[Item]) { + public init(items: [Item]) { self.items = items } public func updateQuality() { - for i in 0.. 0) { if (items[i].name != "Sulfuras, Hand of Ragnaros") { From 31825b24107793ee73af0144b62b8012c33d682f Mon Sep 17 00:00:00 2001 From: Jon Reid Date: Fri, 20 Aug 2021 21:27:23 -0700 Subject: [PATCH 3/8] t Remove semicolons from test --- swift/Tests/GildedRoseTests/GildedRoseTests.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/swift/Tests/GildedRoseTests/GildedRoseTests.swift b/swift/Tests/GildedRoseTests/GildedRoseTests.swift index 67a7c251..6b64062a 100644 --- a/swift/Tests/GildedRoseTests/GildedRoseTests.swift +++ b/swift/Tests/GildedRoseTests/GildedRoseTests.swift @@ -5,8 +5,8 @@ class GildedRoseTests: XCTestCase { func testFoo() { let items = [Item(name: "foo", sellIn: 0, quality: 0)] - let app = GildedRose(items: items); - app.updateQuality(); + let app = GildedRose(items: items) + app.updateQuality() XCTAssertEqual("fixme", app.items[0].name); } From f26e495403260e1412cdf2799281e413b7abf4c5 Mon Sep 17 00:00:00 2001 From: Jon Reid Date: Fri, 20 Aug 2021 21:27:52 -0700 Subject: [PATCH 4/8] t Define test as throws --- swift/Tests/GildedRoseTests/GildedRoseTests.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swift/Tests/GildedRoseTests/GildedRoseTests.swift b/swift/Tests/GildedRoseTests/GildedRoseTests.swift index 6b64062a..45717905 100644 --- a/swift/Tests/GildedRoseTests/GildedRoseTests.swift +++ b/swift/Tests/GildedRoseTests/GildedRoseTests.swift @@ -3,7 +3,7 @@ import XCTest class GildedRoseTests: XCTestCase { - func testFoo() { + func testFoo() throws { let items = [Item(name: "foo", sellIn: 0, quality: 0)] let app = GildedRose(items: items) app.updateQuality() From 3ef1dc16fbe68e8570d9b573588609ea8828a91c Mon Sep 17 00:00:00 2001 From: Jon Reid Date: Fri, 20 Aug 2021 21:28:56 -0700 Subject: [PATCH 5/8] t Update allTests so newer, simpler style --- swift/Tests/GildedRoseTests/GildedRoseTests.swift | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/swift/Tests/GildedRoseTests/GildedRoseTests.swift b/swift/Tests/GildedRoseTests/GildedRoseTests.swift index 45717905..384699d6 100644 --- a/swift/Tests/GildedRoseTests/GildedRoseTests.swift +++ b/swift/Tests/GildedRoseTests/GildedRoseTests.swift @@ -10,9 +10,7 @@ class GildedRoseTests: XCTestCase { XCTAssertEqual("fixme", app.items[0].name); } - static var allTests : [(String, (GildedRoseTests) -> () throws -> Void)] { - return [ - ("testFoo", testFoo), - ] - } + static var allTests = [ + ("testFoo", testFoo), + ] } From 8eab172f250b108f88b02d43879f0b62b7ce5b7d Mon Sep 17 00:00:00 2001 From: Jon Reid Date: Fri, 20 Aug 2021 21:51:36 -0700 Subject: [PATCH 6/8] d Add Swift-specific readme --- swift/README.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 swift/README.md diff --git a/swift/README.md b/swift/README.md new file mode 100644 index 00000000..60168d5b --- /dev/null +++ b/swift/README.md @@ -0,0 +1,12 @@ +## Build and test using any of the following + +Command line: +- `swift test` + +Xcode: +- Open this "swift" folder to open package +- In the Xcode menu, select Product > Test to run tests + +AppCode: +- Open this "swift" folder to open package +- Select "GildedRoseTests" configuration and run From 2d8824480768b68f025d39db8e9dfcd6c4677aa0 Mon Sep 17 00:00:00 2001 From: Jon Reid Date: Fri, 20 Aug 2021 22:06:19 -0700 Subject: [PATCH 7/8] t Remove another semicolon --- swift/Tests/GildedRoseTests/GildedRoseTests.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swift/Tests/GildedRoseTests/GildedRoseTests.swift b/swift/Tests/GildedRoseTests/GildedRoseTests.swift index 384699d6..471bdbb9 100644 --- a/swift/Tests/GildedRoseTests/GildedRoseTests.swift +++ b/swift/Tests/GildedRoseTests/GildedRoseTests.swift @@ -7,7 +7,7 @@ class GildedRoseTests: XCTestCase { let items = [Item(name: "foo", sellIn: 0, quality: 0)] let app = GildedRose(items: items) app.updateQuality() - XCTAssertEqual("fixme", app.items[0].name); + XCTAssertEqual("fixme", app.items[0].name) } static var allTests = [ From 746bb0e46716720ab598ca65920fec1f4f3cfcdf Mon Sep 17 00:00:00 2001 From: Jon Reid Date: Fri, 20 Aug 2021 22:07:10 -0700 Subject: [PATCH 8/8] t Switch order of assertion arguments --- swift/Tests/GildedRoseTests/GildedRoseTests.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swift/Tests/GildedRoseTests/GildedRoseTests.swift b/swift/Tests/GildedRoseTests/GildedRoseTests.swift index 471bdbb9..289352f2 100644 --- a/swift/Tests/GildedRoseTests/GildedRoseTests.swift +++ b/swift/Tests/GildedRoseTests/GildedRoseTests.swift @@ -7,7 +7,7 @@ class GildedRoseTests: XCTestCase { let items = [Item(name: "foo", sellIn: 0, quality: 0)] let app = GildedRose(items: items) app.updateQuality() - XCTAssertEqual("fixme", app.items[0].name) + XCTAssertEqual(app.items[0].name, "fixme") } static var allTests = [