From 870952f9c0918dfa91d04883fe3a73c1e156df5d Mon Sep 17 00:00:00 2001 From: masakih Date: Sun, 22 Oct 2017 18:04:53 +0900 Subject: [PATCH] =?utf8?q?=E5=90=8D=E7=A7=B0=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- KCD.xcodeproj/project.pbxproj | 8 ++++---- .../{BattleAPIsTest.swift => NormalBattleAPIsTest.swift} | 13 ++++++------- 2 files changed, 10 insertions(+), 11 deletions(-) rename KCDTests/{BattleAPIsTest.swift => NormalBattleAPIsTest.swift} (99%) diff --git a/KCD.xcodeproj/project.pbxproj b/KCD.xcodeproj/project.pbxproj index 749d5f4e..161acca4 100644 --- a/KCD.xcodeproj/project.pbxproj +++ b/KCD.xcodeproj/project.pbxproj @@ -317,7 +317,7 @@ F4FC3E901E437E1F00E41228 /* JSONReciever.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4FC3E8F1E437E1F00E41228 /* JSONReciever.swift */; }; F4FC3E941E44A5D600E41228 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4FC3E931E44A5D600E41228 /* AppDelegate.swift */; }; F4FC3E961E46AC3000E41228 /* TSVSupport.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4FC3E951E46AC3000E41228 /* TSVSupport.swift */; }; - F4FF44C71F98DA6600039F21 /* BattleAPIsTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4FF44C61F98DA6600039F21 /* BattleAPIsTest.swift */; }; + F4FF44C71F98DA6600039F21 /* NormalBattleAPIsTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4FF44C61F98DA6600039F21 /* NormalBattleAPIsTest.swift */; }; F4FF44C81F98DB1D00039F21 /* SwiftyJSON.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F4EFBCA21E7D439A00DE4A58 /* SwiftyJSON.framework */; }; /* End PBXBuildFile section */ @@ -694,7 +694,7 @@ F4FC3E8F1E437E1F00E41228 /* JSONReciever.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JSONReciever.swift; sourceTree = ""; }; F4FC3E931E44A5D600E41228 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; F4FC3E951E46AC3000E41228 /* TSVSupport.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TSVSupport.swift; sourceTree = ""; }; - F4FF44C61F98DA6600039F21 /* BattleAPIsTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BattleAPIsTest.swift; sourceTree = ""; }; + F4FF44C61F98DA6600039F21 /* NormalBattleAPIsTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NormalBattleAPIsTest.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -1039,7 +1039,7 @@ isa = PBXGroup; children = ( F4BDEB6B187252F30069D0CE /* Supporting Files */, - F4FF44C61F98DA6600039F21 /* BattleAPIsTest.swift */, + F4FF44C61F98DA6600039F21 /* NormalBattleAPIsTest.swift */, ); path = KCDTests; sourceTree = ""; @@ -1778,7 +1778,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - F4FF44C71F98DA6600039F21 /* BattleAPIsTest.swift in Sources */, + F4FF44C71F98DA6600039F21 /* NormalBattleAPIsTest.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/KCDTests/BattleAPIsTest.swift b/KCDTests/NormalBattleAPIsTest.swift similarity index 99% rename from KCDTests/BattleAPIsTest.swift rename to KCDTests/NormalBattleAPIsTest.swift index cf545ee3..1f9d47eb 100644 --- a/KCDTests/BattleAPIsTest.swift +++ b/KCDTests/NormalBattleAPIsTest.swift @@ -1,5 +1,5 @@ // -// BattleAPIsTest.swift +// NormalBattleAPIsTest.swift // KCDTests // // Created by Hori,Masaki on 2017/10/19. @@ -12,7 +12,7 @@ import XCTest import SwiftyJSON -class BattleAPIsTest: XCTestCase { +class NormalBattleAPIsTest: XCTestCase { var savedShips: [Ship] = [] var shipsHp: [Int] = [] @@ -95,15 +95,14 @@ class BattleAPIsTest: XCTestCase { do { let store = ServerDataStore.oneTimeEditor() - guard let deck = store.deck(by: 1) else { return XCTFail("Can not get Deck.") } - savedShips.enumerated().forEach { deck.setShip(id: $0.element.id, for: $0.offset) } - - let ships = store.ships(byDeckId: 1) - + zip(ships, shipsHp).forEach { $0.nowhp = $1 } zip(ships, shipEquipments).forEach { $0.equippedItem = $1 } zip(ships, shipExSlot).forEach { $0.slot_ex = $1 } + + guard let deck = store.deck(by: 1) else { return XCTFail("Can not get Deck.") } + savedShips.enumerated().forEach { deck.setShip(id: $0.element.id, for: $0.offset) } } super.tearDown() } -- 2.11.0