OSDN Git Service

SnifferTestから戦闘関連をBattleTestに移動する
authorKazuhiro Fujieda <fujieda@users.osdn.me>
Sat, 20 Oct 2018 13:43:11 +0000 (22:43 +0900)
committerKazuhiro Fujieda <fujieda@users.osdn.me>
Fri, 26 Oct 2018 14:12:52 +0000 (23:12 +0900)
KancolleSniffer.Test/BattleBriefTest.cs [new file with mode: 0644]
KancolleSniffer.Test/BattleTest.cs
KancolleSniffer.Test/KancolleSniffer.Test.csproj
KancolleSniffer.Test/SnifferTest.cs

diff --git a/KancolleSniffer.Test/BattleBriefTest.cs b/KancolleSniffer.Test/BattleBriefTest.cs
new file mode 100644 (file)
index 0000000..a5eb122
--- /dev/null
@@ -0,0 +1,193 @@
+// Copyright (C) 2017 Kazuhiro Fujieda <fujieda@users.osdn.me>\r
+//\r
+// Licensed under the Apache License, Version 2.0 (the "License");\r
+// you may not use this file except in compliance with the License.\r
+// You may obtain a copy of the License at\r
+//\r
+//    http://www.apache.org/licenses/LICENSE-2.0\r
+//\r
+// Unless required by applicable law or agreed to in writing, software\r
+// distribukted under the License is distributed on an "AS IS" BASIS,\r
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+// See the License for the specific language governing permissions and\r
+// limitations under the License.\r
+\r
+using System;\r
+using System.Linq;\r
+using ExpressionToCodeLib;\r
+using KancolleSniffer.Model;\r
+using KancolleSniffer.Util;\r
+using Microsoft.VisualStudio.TestTools.UnitTesting;\r
+\r
+namespace KancolleSniffer.Test\r
+{\r
+    [TestClass]\r
+    public class BattleBriefTest\r
+    {\r
+        private ItemMaster _itemMaster;\r
+        private ItemInventory _itemInventory;\r
+        private ItemInfo _itemInfo;\r
+        private ShipMaster _shipMaster;\r
+        private ShipInventory _shipInventory;\r
+        private ShipInfo _shipInfo;\r
+        private BattleInfo _battleInfo;\r
+\r
+        private string[] ReadAllLines(string log)\r
+        {\r
+            using (var logfile = SnifferTest.OpenLogFile(log))\r
+                return logfile.ReadToEnd().Split(new[] {"\r\n"}, StringSplitOptions.None);\r
+        }\r
+\r
+        public void InjectShips(dynamic battle, dynamic item)\r
+        {\r
+            var deck = (int)battle.api_deck_id - 1;\r
+            InjectShips(deck, (int[])battle.api_f_nowhps, (int[])battle.api_f_maxhps, (int[][])item[0]);\r
+            if (battle.api_f_nowhps_combined())\r
+                InjectShips(1, (int[])battle.api_f_nowhps_combined, (int[])battle.api_f_maxhps_combined,\r
+                    (int[][])item[1]);\r
+            foreach (var enemy in (int[])battle.api_ship_ke)\r
+                _shipMaster.InjectSpec(enemy);\r
+            if (battle.api_ship_ke_combined())\r
+            {\r
+                foreach (var enemy in (int[])battle.api_ship_ke_combined)\r
+                    _shipMaster.InjectSpec(enemy);\r
+            }\r
+            _itemInfo.InjectItems(((int[][])battle.api_eSlot).SelectMany(x => x));\r
+            if (battle.api_eSlot_combined())\r
+                _itemInfo.InjectItems(((int[][])battle.api_eSlot_combined).SelectMany(x => x));\r
+        }\r
+\r
+        private void InjectShips(int deck, int[] nowHps, int[] maxHps, int[][] slots)\r
+        {\r
+            var id = _shipInventory.MaxId + 1;\r
+            var ships = nowHps.Zip(maxHps,\r
+                (now, max) => new ShipStatus {Id = id++, NowHp = now, MaxHp = max}).ToArray();\r
+            _shipInventory.Add(ships);\r
+            _shipInfo.Fleets[deck].Deck = (from ship in ships select ship.Id).ToArray();\r
+            foreach (var entry in ships.Zip(slots, (ship, slot) => new {ship, slot}))\r
+            {\r
+                entry.ship.Slot = _itemInfo.InjectItems(entry.slot.Take(5));\r
+                if (entry.slot.Length >= 6)\r
+                    entry.ship.SlotEx = _itemInfo.InjectItems(entry.slot.Skip(5)).First();\r
+            }\r
+        }\r
+\r
+        [TestInitialize]\r
+        public void Initialize()\r
+        {\r
+            _itemMaster = new ItemMaster();\r
+            _itemInventory = new ItemInventory();\r
+            _itemInfo = new ItemInfo(_itemMaster, _itemInventory);\r
+            _shipInventory = new ShipInventory();\r
+            _shipMaster = new ShipMaster();\r
+            _shipInfo = new ShipInfo(_shipMaster, _shipInventory, _itemInventory);\r
+            _battleInfo = new BattleInfo(_shipInfo, _itemInfo);\r
+        }\r
+\r
+        /// <summary>\r
+        /// 連撃を受けて女神が発動する\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void CauseRepairGoddessByDoubleAttack()\r
+        {\r
+            var logs = ReadAllLines("damecon_001");\r
+            var items = JsonParser.Parse("[[[],[],[],[],[43]]]");\r
+            dynamic battle = JsonParser.Parse(logs[2]);\r
+            InjectShips(battle, items);\r
+            _battleInfo.InspectBattle(logs[0], logs[1], battle);\r
+            dynamic result = JsonParser.Parse(logs[5]);\r
+            _battleInfo.InspectBattleResult(result);\r
+            PAssert.That(() => _shipInfo.Fleets[2].Ships[4].NowHp == 31);\r
+        }\r
+\r
+        /// <summary>\r
+        /// 夜戦で戦艦の攻撃を受ける\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void AttackedByBattleShipInMidnight()\r
+        {\r
+            var logs = ReadAllLines("midnight_002");\r
+            var battle = JsonParser.Parse(logs[3]);\r
+            InjectShips(battle, JsonParser.Parse(logs[0]));\r
+            _battleInfo.InspectBattle(logs[1], logs[2], battle);\r
+            _battleInfo.InspectBattleResult(JsonParser.Parse(logs[6]));\r
+            PAssert.That(() => _shipInfo.Fleets[0].Ships[3].NowHp == 12);\r
+        }\r
+\r
+        private dynamic Data(string json) => ((dynamic)JsonParser.Parse(json)).api_data;\r
+\r
+        /// <summary>\r
+        /// NPC友軍の支援攻撃がある\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void NpcFriendFleetAttack()\r
+        {\r
+            var logs = ReadAllLines("friendfleet_001");\r
+            var battle = Data(logs[3]);\r
+            InjectShips(battle, JsonParser.Parse(logs[0]));\r
+            _battleInfo.InspectBattle(logs[1], logs[2], battle);\r
+            _battleInfo.InspectBattle(logs[4], logs[5], Data(logs[6]));\r
+            _battleInfo.InspectBattleResult(Data(logs[9]));\r
+            PAssert.That(() => !_battleInfo.DisplayedResultRank.IsError);\r
+        }\r
+\r
+        /// <summary>\r
+        /// 空襲戦で轟沈する\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void LdAirBattleHaveSunkenShip()\r
+        {\r
+            var logs = ReadAllLines("ld_airbattle_001");\r
+            var battle = Data(logs[3]);\r
+            InjectShips(battle, JsonParser.Parse(logs[0]));\r
+            _battleInfo.InspectBattle(logs[1], logs[2], battle);\r
+            _battleInfo.InspectBattleResult(Data(logs[6]));\r
+            PAssert.That(() => !_battleInfo.DisplayedResultRank.IsError);\r
+        }\r
+\r
+        /// <summary>\r
+        /// 空襲戦で女神が発動して復活する\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void LdAirBattleHaveRevivedShip()\r
+        {\r
+            var logs = ReadAllLines("ld_airbattle_002");\r
+            var battle = Data(logs[3]);\r
+            InjectShips(battle, JsonParser.Parse(logs[0]));\r
+            _battleInfo.InspectBattle(logs[1], logs[2], battle);\r
+            _battleInfo.InspectBattleResult(Data(logs[6]));\r
+            PAssert.That(() => !_battleInfo.DisplayedResultRank.IsError);\r
+        }\r
+\r
+        /// <summary>\r
+        /// 機動対敵連合の雷撃戦でダメコンが発動する\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void TriggerDameConInCombinedBattle()\r
+        {\r
+            var logs = ReadAllLines("damecon_002");\r
+            var battle = Data(logs[3]);\r
+            InjectShips(battle, JsonParser.Parse(logs[0]));\r
+            _battleInfo.InspectBattle(logs[1], logs[2], battle);\r
+            _battleInfo.InspectBattle(logs[4], logs[5], Data(logs[6]));\r
+            _battleInfo.InspectBattleResult(Data(logs[9]));\r
+            PAssert.That(() => !_battleInfo.DisplayedResultRank.IsError);\r
+        }\r
+\r
+        /// <summary>\r
+        /// Nelson Touchに対応する        \r
+        /// </summary>\r
+        [TestMethod]\r
+        public void NelsonTouch()\r
+        {\r
+            var logs = ReadAllLines("nelsontouch_001");\r
+            var battle = Data(logs[3]);\r
+            InjectShips(battle, JsonParser.Parse(logs[0]));\r
+            _battleInfo.InspectBattle(logs[1], logs[2], battle);\r
+            _battleInfo.InspectBattleResult(Data(logs[6]));\r
+            PAssert.That(() => !_battleInfo.DisplayedResultRank.IsError);\r
+            PAssert.That(() => _battleInfo.Result.Friend.Main[0].SpecialAttack == ShipStatus.Attack.Fire);\r
+            PAssert.That(() => _shipInfo.Fleets[1].Ships[0].SpecialAttack == ShipStatus.Attack.Fired);\r
+        }\r
+    }\r
+}
\ No newline at end of file
index fa2bfab..70aea03 100644 (file)
@@ -1,4 +1,4 @@
-// Copyright (C) 2017 Kazuhiro Fujieda <fujieda@users.osdn.me>\r
+// Copyright (C) 2018 Kazuhiro Fujieda <fujieda@users.osdn.me>\r
 //\r
 // Licensed under the Apache License, Version 2.0 (the "License");\r
 // you may not use this file except in compliance with the License.\r
 // See the License for the specific language governing permissions and\r
 // limitations under the License.\r
 \r
-using System;\r
+using System.Collections.Generic;\r
 using System.Linq;\r
-using ExpressionToCodeLib;\r
 using KancolleSniffer.Model;\r
-using KancolleSniffer.Util;\r
+using ExpressionToCodeLib;\r
 using Microsoft.VisualStudio.TestTools.UnitTesting;\r
 \r
 namespace KancolleSniffer.Test\r
 {\r
+    using Sniffer = SnifferTest.TestingSniffer;\r
+    using static SnifferTest;\r
+\r
     [TestClass]\r
     public class BattleTest\r
     {\r
-        private ItemMaster _itemMaster;\r
-        private ItemInventory _itemInventory;\r
-        private ItemInfo _itemInfo;\r
-        private ShipMaster _shipMaster;\r
-        private ShipInventory _shipInventory;\r
-        private ShipInfo _shipInfo;\r
-        private BattleInfo _battleInfo;\r
+        [ClassInitialize]\r
+        public static void Initialize(TestContext context)\r
+        {\r
+            ExpressionToCodeConfiguration.GlobalAssertionConfiguration = ExpressionToCodeConfiguration\r
+                .GlobalAssertionConfiguration.WithPrintedListLengthLimit(200).WithMaximumValueLength(1000);\r
+        }\r
 \r
-        private string[] ReadAllLines(string log)\r
+        /// <summary>\r
+        /// 4-2-1で開幕対潜雷撃を含む戦闘を行う\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void NormalBattleWithVariousTypesOfAttack()\r
         {\r
-            using (var logfile = SnifferTest.OpenLogFile(log))\r
-                return logfile.ReadToEnd().Split(new[] {"\r\n"}, StringSplitOptions.None);\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "battle_001");\r
+            PAssert.That(() => sniffer.Battle.ResultRank == BattleResultRank.A);\r
+            AssertEqualBattleResult(sniffer,\r
+                new[] {57, 66, 50, 65, 40, 42}, new[] {34, 5, 0, 0, 0, 0});\r
         }\r
 \r
-        public void InjectShips(dynamic battle, dynamic item)\r
+        private void AssertEqualBattleResult(Sniffer sniffer, IEnumerable<int> expected, IEnumerable<int> enemy,\r
+            string msg = null)\r
         {\r
-            var deck = (int)battle.api_deck_id - 1;\r
-            InjectShips(deck, (int[])battle.api_f_nowhps, (int[])battle.api_f_maxhps, (int[][])item[0]);\r
-            if (battle.api_f_nowhps_combined())\r
-                InjectShips(1, (int[])battle.api_f_nowhps_combined, (int[])battle.api_f_maxhps_combined,\r
-                    (int[][])item[1]);\r
-            foreach (var enemy in (int[])battle.api_ship_ke)\r
-                _shipMaster.InjectSpec(enemy);\r
-            if (battle.api_ship_ke_combined())\r
-            {\r
-                foreach (var enemy in (int[])battle.api_ship_ke_combined)\r
-                    _shipMaster.InjectSpec(enemy);\r
-            }\r
-            _itemInfo.InjectItems(((int[][])battle.api_eSlot).SelectMany(x => x));\r
-            if (battle.api_eSlot_combined())\r
-                _itemInfo.InjectItems(((int[][])battle.api_eSlot_combined).SelectMany(x => x));\r
+            var result = sniffer.Fleets[0].Ships.Select(s => s.NowHp);\r
+            PAssert.That(() => expected.SequenceEqual(result), msg);\r
+            var enemyResult = sniffer.Battle.Result.Enemy.Main.Select(s => s.NowHp);\r
+            PAssert.That(() => enemy.SequenceEqual(enemyResult), msg);\r
         }\r
 \r
-        private void InjectShips(int deck, int[] nowHps, int[] maxHps, int[][] slots)\r
+        /// <summary>\r
+        /// 開幕夜戦で潜水艦同士がお見合いする\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void SpMidnightWithoutBattle()\r
         {\r
-            var id = _shipInventory.MaxId + 1;\r
-            var ships = nowHps.Zip(maxHps,\r
-                (now, max) => new ShipStatus {Id = id++, NowHp = now, MaxHp = max}).ToArray();\r
-            _shipInventory.Add(ships);\r
-            _shipInfo.Fleets[deck].Deck = (from ship in ships select ship.Id).ToArray();\r
-            foreach (var entry in ships.Zip(slots, (ship, slot) => new {ship, slot}))\r
-            {\r
-                entry.ship.Slot = _itemInfo.InjectItems(entry.slot.Take(5));\r
-                if (entry.slot.Length >= 6)\r
-                    entry.ship.SlotEx = _itemInfo.InjectItems(entry.slot.Skip(5)).First();\r
-            }\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "sp_midnight_001");\r
+            PAssert.That(() => sniffer.Battle.ResultRank == BattleResultRank.D);\r
         }\r
 \r
-        [TestInitialize]\r
-        public void Initialize()\r
+        /// <summary>\r
+        /// 夜戦で戦艦が攻撃すると一回で三発分のデータが来る\r
+        /// そのうち存在しない攻撃はターゲット、ダメージともに-1になる\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void BattleShipAttackInMidnight()\r
         {\r
-            _itemMaster = new ItemMaster();\r
-            _itemInventory = new ItemInventory();\r
-            _itemInfo = new ItemInfo(_itemMaster, _itemInventory);\r
-            _shipInventory = new ShipInventory();\r
-            _shipMaster = new ShipMaster();\r
-            _shipInfo = new ShipInfo(_shipMaster, _shipInventory, _itemInventory);\r
-            _battleInfo = new BattleInfo(_shipInfo, _itemInfo);\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "midnight_001");\r
+            PAssert.That(() => sniffer.Battle.ResultRank == BattleResultRank.S);\r
         }\r
 \r
         /// <summary>\r
-        /// 連撃を受けて女神が発動す\r
+        /// 7隻編成の戦闘で7隻目が攻撃され\r
         /// </summary>\r
         [TestMethod]\r
-        public void CauseRepairGoddessByDoubleAttack()\r
+        public void Ship7Battle()\r
         {\r
-            var logs = ReadAllLines("damecon_001");\r
-            var items = JsonParser.Parse("[[[],[],[],[],[43]]]");\r
-            dynamic battle = JsonParser.Parse(logs[2]);\r
-            InjectShips(battle, items);\r
-            _battleInfo.InspectBattle(logs[0], logs[1], battle);\r
-            dynamic result = JsonParser.Parse(logs[5]);\r
-            _battleInfo.InspectBattleResult(result);\r
-            PAssert.That(() => _shipInfo.Fleets[2].Ships[4].NowHp == 31);\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "ship7battle_001");\r
+            PAssert.That(() => sniffer.Battle.ResultRank == BattleResultRank.P);\r
         }\r
 \r
         /// <summary>\r
-        /// 夜戦で戦艦の攻撃を受ける\r
+        /// 演習のあとのportで戦闘結果の検証を行わない\r
         /// </summary>\r
         [TestMethod]\r
-        public void AttackedByBattleShipInMidnight()\r
+        public void NotVerifyBattleResultAfterPractice()\r
         {\r
-            var logs = ReadAllLines("midnight_002");\r
-            var battle = JsonParser.Parse(logs[3]);\r
-            InjectShips(battle, JsonParser.Parse(logs[0]));\r
-            _battleInfo.InspectBattle(logs[1], logs[2], battle);\r
-            _battleInfo.InspectBattleResult(JsonParser.Parse(logs[6]));\r
-            PAssert.That(() => _shipInfo.Fleets[0].Ships[3].NowHp == 12);\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "practice_001");\r
+            PAssert.That(() => !sniffer.IsBattleResultStatusError);\r
         }\r
 \r
-        private dynamic Data(string json) => ((dynamic)JsonParser.Parse(json)).api_data;\r
+        /// <summary>\r
+        /// 演習でダメコンを発動させない\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void NotTriggerDameConInPractice()\r
+        {\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "practice_002");\r
+            PAssert.That(() => !sniffer.Battle.DisplayedResultRank.IsError);\r
+        }\r
+\r
+        /// <summary>\r
+        /// 演習中の艦を要修復リストに載せない\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void DamagedShipListNotShowShipInPractice()\r
+        {\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "practice_003");\r
+            PAssert.That(() => sniffer.RepairList.Select(s => s.Name).SequenceEqual(new[] {"飛龍改二", "翔鶴改二"}));\r
+        }\r
+\r
+        /// <summary>\r
+        /// 連合艦隊が開幕雷撃で被弾する\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void OpeningTorpedoInCombinedBattle()\r
+        {\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "combined_battle_001");\r
+            PAssert.That(() => !sniffer.IsBattleResultStatusError);\r
+        }\r
+\r
+        /// <summary>\r
+        /// 連合艦隊が閉幕雷撃で被弾する\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void ClosingTorpedoInCombinedBattle()\r
+        {\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "combined_battle_002");\r
+            PAssert.That(() => !sniffer.IsBattleResultStatusError);\r
+        }\r
+\r
+        /// <summary>\r
+        /// 第一が6隻未満の連合艦隊で戦闘する\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void SmallCombinedFleetBattle()\r
+        {\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "combined_battle_003");\r
+            PAssert.That(() => !sniffer.IsBattleResultStatusError);\r
+        }\r
+\r
+        /// <summary>\r
+        /// 護衛退避する\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void EscapeWithEscort()\r
+        {\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "escape_001");\r
+            var fleets = sniffer.Fleets;\r
+            PAssert.That(() => fleets[0].Ships[5].Escaped &&\r
+                               fleets[1].Ships[2].Escaped);\r
+        }\r
+\r
+        /// <summary>\r
+        /// 開幕夜戦に支援が来る\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void SpMidnightSupportAttack()\r
+        {\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "sp_midnight_002");\r
+            PAssert.That(() => !sniffer.Battle.DisplayedResultRank.IsError);\r
+        }\r
+\r
+        /// <summary>\r
+        /// 払暁戦を行う\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void NightToDay()\r
+        {\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "nighttoday_001");\r
+            PAssert.That(() => !sniffer.Battle.DisplayedResultRank.IsError && !sniffer.IsBattleResultStatusError);\r
+        }\r
 \r
         /// <summary>\r
-        /// NPC友軍の支援攻撃があ\r
+        /// 第二期の開幕夜戦のセル情報を表示す\r
         /// </summary>\r
         [TestMethod]\r
-        public void NpcFriendFleetAttack()\r
+        // ReSharper disable once InconsistentNaming\r
+        public void SpMidnightIn2ndSequence()\r
         {\r
-            var logs = ReadAllLines("friendfleet_001");\r
-            var battle = Data(logs[3]);\r
-            InjectShips(battle, JsonParser.Parse(logs[0]));\r
-            _battleInfo.InspectBattle(logs[1], logs[2], battle);\r
-            _battleInfo.InspectBattle(logs[4], logs[5], Data(logs[6]));\r
-            _battleInfo.InspectBattleResult(Data(logs[9]));\r
-            PAssert.That(() => !_battleInfo.DisplayedResultRank.IsError);\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "sp_midnight_003");\r
+            PAssert.That(() => sniffer.CellInfo.Current == "1戦目(夜戦)");\r
         }\r
 \r
         /// <summary>\r
-        /// 空襲戦で轟沈する\r
+        /// 単艦退避する\r
         /// </summary>\r
         [TestMethod]\r
-        public void LdAirBattleHaveSunkenShip()\r
+        public void EscapeWithoutEscort()\r
         {\r
-            var logs = ReadAllLines("ld_airbattle_001");\r
-            var battle = Data(logs[3]);\r
-            InjectShips(battle, JsonParser.Parse(logs[0]));\r
-            _battleInfo.InspectBattle(logs[1], logs[2], battle);\r
-            _battleInfo.InspectBattleResult(Data(logs[6]));\r
-            PAssert.That(() => !_battleInfo.DisplayedResultRank.IsError);\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "escape_002");\r
+            PAssert.That(() => sniffer.Fleets[2].Ships[1].Escaped);\r
+            PAssert.That(() => !sniffer.IsBattleResultStatusError);\r
         }\r
 \r
         /// <summary>\r
-        /// 空襲戦で女神が発動して復活する\r
+        /// 出撃時に大破している艦娘がいたら警告する\r
         /// </summary>\r
         [TestMethod]\r
-        public void LdAirBattleHaveRevivedShip()\r
+        public void DamagedShipWarningOnMapStart()\r
         {\r
-            var logs = ReadAllLines("ld_airbattle_002");\r
-            var battle = Data(logs[3]);\r
-            InjectShips(battle, JsonParser.Parse(logs[0]));\r
-            _battleInfo.InspectBattle(logs[1], logs[2], battle);\r
-            _battleInfo.InspectBattleResult(Data(logs[6]));\r
-            PAssert.That(() => !_battleInfo.DisplayedResultRank.IsError);\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "mapstart_001");\r
+            PAssert.That(() => sniffer.BadlyDamagedShips.SequenceEqual(new[] {"大潮"}));\r
         }\r
 \r
         /// <summary>\r
-        /// 機動対敵連合の雷撃戦でダメコンが発動する\r
+        /// 連合艦隊に大破艦がいる状態で第3艦隊が出撃したときに警告しない\r
         /// </summary>\r
         [TestMethod]\r
-        public void TriggerDameConInCombinedBattle()\r
+        public void NotWarnDamagedShipInCombinedFleetOnMapStart()\r
         {\r
-            var logs = ReadAllLines("damecon_002");\r
-            var battle = Data(logs[3]);\r
-            InjectShips(battle, JsonParser.Parse(logs[0]));\r
-            _battleInfo.InspectBattle(logs[1], logs[2], battle);\r
-            _battleInfo.InspectBattle(logs[4], logs[5], Data(logs[6]));\r
-            _battleInfo.InspectBattleResult(Data(logs[9]));\r
-            PAssert.That(() => !_battleInfo.DisplayedResultRank.IsError);\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "mapstart_002");\r
+            PAssert.That(() => !sniffer.BadlyDamagedShips.Any());\r
         }\r
 \r
         /// <summary>\r
-        /// Nelson Touchに対応する\r
+        /// 連合艦隊の第二旗艦の大破を警告しない\r
         /// </summary>\r
         [TestMethod]\r
-        public void NelsonTouch()\r
+        public void NotWarnDamaged1StShipInGuardFleet()\r
         {\r
-            var logs = ReadAllLines("nelsontouch_001");\r
-            var battle = Data(logs[3]);\r
-            InjectShips(battle, JsonParser.Parse(logs[0]));\r
-            _battleInfo.InspectBattle(logs[1], logs[2], battle);\r
-            _battleInfo.InspectBattleResult(Data(logs[6]));\r
-            PAssert.That(() => !_battleInfo.DisplayedResultRank.IsError);\r
-            PAssert.That(() => _battleInfo.Result.Friend.Main[0].SpecialAttack == ShipStatus.Attack.Fire);\r
-            PAssert.That(() => _shipInfo.Fleets[1].Ships[0].SpecialAttack == ShipStatus.Attack.Fired);\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "combined_battle_004");\r
+            PAssert.That(() => !sniffer.BadlyDamagedShips.Any());\r
         }\r
     }\r
 }
\ No newline at end of file
index 1d189b5..70cdf0f 100644 (file)
@@ -76,6 +76,7 @@
     <Compile Include="AkashiTimerTest.cs" />\r
     <Compile Include="Ascii85Test.cs" />\r
     <Compile Include="BattleLogProcessorTest.cs" />\r
+    <Compile Include="BattleBriefTest.cs" />\r
     <Compile Include="BattleTest.cs" />\r
     <Compile Include="ErrorLogTest.cs" />\r
     <Compile Include="FleetPanelTest.cs" />\r
index 0392d3c..fa7050f 100644 (file)
@@ -81,220 +81,6 @@ namespace KancolleSniffer.Test
         }\r
 \r
         /// <summary>\r
-        /// 4-2-1で開幕対潜雷撃を含む戦闘を行う\r
-        /// </summary>\r
-        [TestMethod]\r
-        public void NormalBattleWithVariousTypesOfAttack()\r
-        {\r
-            var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "battle_001");\r
-            PAssert.That(() => sniffer.Battle.ResultRank == BattleResultRank.A);\r
-            AssertEqualBattleResult(sniffer,\r
-                new[] {57, 66, 50, 65, 40, 42}, new[] {34, 5, 0, 0, 0, 0});\r
-        }\r
-\r
-        private void AssertEqualBattleResult(Sniffer sniffer, IEnumerable<int> expected, IEnumerable<int> enemy,\r
-            string msg = null)\r
-        {\r
-            var result = sniffer.Fleets[0].Ships.Select(s => s.NowHp);\r
-            PAssert.That(() => expected.SequenceEqual(result), msg);\r
-            var enemyResult = sniffer.Battle.Result.Enemy.Main.Select(s => s.NowHp);\r
-            PAssert.That(() => enemy.SequenceEqual(enemyResult), msg);\r
-        }\r
-\r
-        /// <summary>\r
-        /// 開幕夜戦で潜水艦同士がお見合いする\r
-        /// </summary>\r
-        [TestMethod]\r
-        public void SpMidnightWithoutBattle()\r
-        {\r
-            var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "sp_midnight_001");\r
-            PAssert.That(() => sniffer.Battle.ResultRank == BattleResultRank.D);\r
-        }\r
-\r
-        /// <summary>\r
-        /// 夜戦で戦艦が攻撃すると一回で三発分のデータが来る\r
-        /// そのうち存在しない攻撃はターゲット、ダメージともに-1になる\r
-        /// </summary>\r
-        [TestMethod]\r
-        public void BattleShipAttackInMidnight()\r
-        {\r
-            var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "midnight_001");\r
-            PAssert.That(() => sniffer.Battle.ResultRank == BattleResultRank.S);\r
-        }\r
-\r
-        /// <summary>\r
-        /// 7隻編成の戦闘で7隻目が攻撃される\r
-        /// </summary>\r
-        [TestMethod]\r
-        public void Ship7Battle()\r
-        {\r
-            var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "ship7battle_001");\r
-            PAssert.That(() => sniffer.Battle.ResultRank == BattleResultRank.P);\r
-        }\r
-\r
-        /// <summary>\r
-        /// 演習のあとのportで戦闘結果の検証を行わない\r
-        /// </summary>\r
-        [TestMethod]\r
-        public void NotVerifyBattleResultAfterPractice()\r
-        {\r
-            var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "practice_001");\r
-            PAssert.That(() => !sniffer.IsBattleResultStatusError);\r
-        }\r
-\r
-        /// <summary>\r
-        /// 演習でダメコンを発動させない\r
-        /// </summary>\r
-        [TestMethod]\r
-        public void NotTriggerDameConInPractice()\r
-        {\r
-            var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "practice_002");\r
-            PAssert.That(() => !sniffer.Battle.DisplayedResultRank.IsError);\r
-        }\r
-\r
-        /// <summary>\r
-        /// 演習中の艦を要修復リストに載せない\r
-        /// </summary>\r
-        [TestMethod]\r
-        public void DamagedShipListNotShowShipInPractice()\r
-        {\r
-            var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "practice_003");\r
-            PAssert.That(() => sniffer.RepairList.Select(s => s.Name).SequenceEqual(new[] {"飛龍改二", "翔鶴改二"}));\r
-        }\r
-\r
-        /// <summary>\r
-        /// 連合艦隊が開幕雷撃で被弾する\r
-        /// </summary>\r
-        [TestMethod]\r
-        public void OpeningTorpedoInCombinedBattle()\r
-        {\r
-            var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "combined_battle_001");\r
-            PAssert.That(() => !sniffer.IsBattleResultStatusError);\r
-        }\r
-\r
-        /// <summary>\r
-        /// 連合艦隊が閉幕雷撃で被弾する\r
-        /// </summary>\r
-        [TestMethod]\r
-        public void ClosingTorpedoInCombinedBattle()\r
-        {\r
-            var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "combined_battle_002");\r
-            PAssert.That(() => !sniffer.IsBattleResultStatusError);\r
-        }\r
-\r
-        /// <summary>\r
-        /// 第一が6隻未満の連合艦隊で戦闘する\r
-        /// </summary>\r
-        [TestMethod]\r
-        public void SmallCombinedFleetBattle()\r
-        {\r
-            var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "combined_battle_003");\r
-            PAssert.That(() => !sniffer.IsBattleResultStatusError);\r
-        }\r
-\r
-        /// <summary>\r
-        /// 護衛退避する\r
-        /// </summary>\r
-        [TestMethod]\r
-        public void EscapeWithEscort()\r
-        {\r
-            var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "escape_001");\r
-            var fleets = sniffer.Fleets;\r
-            PAssert.That(() => fleets[0].Ships[5].Escaped &&\r
-                               fleets[1].Ships[2].Escaped);\r
-        }\r
-\r
-        /// <summary>\r
-        /// 開幕夜戦に支援が来る\r
-        /// </summary>\r
-        [TestMethod]\r
-        public void SpMidnightSupportAttack()\r
-        {\r
-            var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "sp_midnight_002");\r
-            PAssert.That(() => !sniffer.Battle.DisplayedResultRank.IsError);\r
-        }\r
-\r
-        /// <summary>\r
-        /// 払暁戦を行う\r
-        /// </summary>\r
-        [TestMethod]\r
-        public void NightToDay()\r
-        {\r
-            var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "nighttoday_001");\r
-            PAssert.That(() => !sniffer.Battle.DisplayedResultRank.IsError && !sniffer.IsBattleResultStatusError);\r
-        }\r
-\r
-        /// <summary>\r
-        /// 第二期の開幕夜戦のセル情報を表示する\r
-        /// </summary>\r
-        [TestMethod]\r
-        // ReSharper disable once InconsistentNaming\r
-        public void SpMidnightIn2ndSequence()\r
-        {\r
-            var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "sp_midnight_003");\r
-            PAssert.That(() => sniffer.CellInfo.Current == "1戦目(夜戦)");\r
-        }\r
-\r
-        /// <summary>\r
-        /// 単艦退避する\r
-        /// </summary>\r
-        [TestMethod]\r
-        public void EscapeWithoutEscort()\r
-        {\r
-            var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "escape_002");\r
-            PAssert.That(() => sniffer.Fleets[2].Ships[1].Escaped);\r
-            PAssert.That(() => !sniffer.IsBattleResultStatusError);\r
-        }\r
-\r
-        /// <summary>\r
-        /// 出撃時に大破している艦娘がいたら警告する\r
-        /// </summary>\r
-        [TestMethod]\r
-        public void DamagedShipWarningOnMapStart()\r
-        {\r
-            var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "mapstart_001");\r
-            PAssert.That(() => sniffer.BadlyDamagedShips.SequenceEqual(new[] {"大潮"}));\r
-        }\r
-\r
-        /// <summary>\r
-        /// 連合艦隊に大破艦がいる状態で第3艦隊が出撃したときに警告しない\r
-        /// </summary>\r
-        [TestMethod]\r
-        public void NotWarnDamagedShipInCombinedFleetOnMapStart()\r
-        {\r
-            var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "mapstart_002");\r
-            PAssert.That(() => !sniffer.BadlyDamagedShips.Any());\r
-        }\r
-\r
-        /// <summary>\r
-        /// 連合艦隊の第二旗艦の大破を警告しない\r
-        /// </summary>\r
-        [TestMethod]\r
-        public void NotWarnDamaged1StShipInGuardFleet()\r
-        {\r
-            var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "combined_battle_004");\r
-            PAssert.That(() => !sniffer.BadlyDamagedShips.Any());\r
-        }\r
-\r
-        /// <summary>\r
         /// 熟練度込みの制空値を正しく計算する\r
         /// </summary>\r
         [TestMethod]\r