From 1d3a8d887e0bc1bad3de59b9c132d900063c3450 Mon Sep 17 00:00:00 2001 From: Maciej Witaszek Date: Thu, 27 Oct 2016 13:08:11 +0700 Subject: [PATCH] Moved Swift code into package --- swift/.gitignore | 4 ++++ swift/Package.swift | 5 +++++ swift/{ => Sources}/GildedRose.swift | 0 swift/{ => Sources}/Item.swift | 0 swift/{ => Sources}/main.swift | 0 .../GildedRoseTests/GildedRoseTests.swift} | 13 +++++++++---- swift/Tests/LinuxMain.swift | 7 +++++++ swift/Tests/swiftTests/GildedRoseTests.swift | 18 ++++++++++++++++++ 8 files changed, 43 insertions(+), 4 deletions(-) create mode 100644 swift/.gitignore create mode 100644 swift/Package.swift rename swift/{ => Sources}/GildedRose.swift (100%) rename swift/{ => Sources}/Item.swift (100%) rename swift/{ => Sources}/main.swift (100%) rename swift/{GildedRoseTest.swift => Tests/GildedRoseTests/GildedRoseTests.swift} (52%) create mode 100644 swift/Tests/LinuxMain.swift create mode 100644 swift/Tests/swiftTests/GildedRoseTests.swift diff --git a/swift/.gitignore b/swift/.gitignore new file mode 100644 index 00000000..02c08753 --- /dev/null +++ b/swift/.gitignore @@ -0,0 +1,4 @@ +.DS_Store +/.build +/Packages +/*.xcodeproj diff --git a/swift/Package.swift b/swift/Package.swift new file mode 100644 index 00000000..3475d81e --- /dev/null +++ b/swift/Package.swift @@ -0,0 +1,5 @@ +import PackageDescription + +let package = Package( + name: "GildedRose" +) diff --git a/swift/GildedRose.swift b/swift/Sources/GildedRose.swift similarity index 100% rename from swift/GildedRose.swift rename to swift/Sources/GildedRose.swift diff --git a/swift/Item.swift b/swift/Sources/Item.swift similarity index 100% rename from swift/Item.swift rename to swift/Sources/Item.swift diff --git a/swift/main.swift b/swift/Sources/main.swift similarity index 100% rename from swift/main.swift rename to swift/Sources/main.swift diff --git a/swift/GildedRoseTest.swift b/swift/Tests/GildedRoseTests/GildedRoseTests.swift similarity index 52% rename from swift/GildedRoseTest.swift rename to swift/Tests/GildedRoseTests/GildedRoseTests.swift index 66b066dd..67a7c251 100644 --- a/swift/GildedRoseTest.swift +++ b/swift/Tests/GildedRoseTests/GildedRoseTests.swift @@ -1,13 +1,18 @@ - +@testable import GildedRose import XCTest -class GildedRoseTest: XCTestCase { - +class GildedRoseTests: XCTestCase { + func testFoo() { let items = [Item(name: "foo", sellIn: 0, quality: 0)] let app = GildedRose(items: items); app.updateQuality(); XCTAssertEqual("fixme", app.items[0].name); } - + + static var allTests : [(String, (GildedRoseTests) -> () throws -> Void)] { + return [ + ("testFoo", testFoo), + ] + } } diff --git a/swift/Tests/LinuxMain.swift b/swift/Tests/LinuxMain.swift new file mode 100644 index 00000000..b80b87f5 --- /dev/null +++ b/swift/Tests/LinuxMain.swift @@ -0,0 +1,7 @@ +@testable import GildedRoseTestSuit + +import XCTest + +XCTMain([ + testCase(GildedRoseTests.allTests), +]) diff --git a/swift/Tests/swiftTests/GildedRoseTests.swift b/swift/Tests/swiftTests/GildedRoseTests.swift new file mode 100644 index 00000000..67a7c251 --- /dev/null +++ b/swift/Tests/swiftTests/GildedRoseTests.swift @@ -0,0 +1,18 @@ +@testable import GildedRose +import XCTest + +class GildedRoseTests: XCTestCase { + + func testFoo() { + let items = [Item(name: "foo", sellIn: 0, quality: 0)] + let app = GildedRose(items: items); + app.updateQuality(); + XCTAssertEqual("fixme", app.items[0].name); + } + + static var allTests : [(String, (GildedRoseTests) -> () throws -> Void)] { + return [ + ("testFoo", testFoo), + ] + } +}