OSDN Git Service

要修復一覧に演習中の艦を表示しない
[kancollesniffer/KancolleSniffer.git] / KancolleSniffer.Test / SnifferTest.cs
index b8e5e7b..7e6e1c9 100644 (file)
@@ -25,6 +25,13 @@ namespace KancolleSniffer.Test
     [TestClass]\r
     public class SnifferTest\r
     {\r
+        [TestInitialize]\r
+        public void Intialize()\r
+        {\r
+            ExpressionToCodeConfiguration.GlobalAssertionConfiguration = ExpressionToCodeConfiguration\r
+                .GlobalAssertionConfiguration.WithPrintedListLengthLimit(200).WithMaximumValueLength(1000);\r
+        }\r
+\r
         public static StreamReader OpenLogFile(string name)\r
         {\r
             var dir = Path.GetDirectoryName(Path.GetDirectoryName(Environment.CurrentDirectory));\r
@@ -43,12 +50,14 @@ namespace KancolleSniffer.Test
                     var triple = new List<string>();\r
                     foreach (var s in new[] {"url: ", "request: ", "response: "})\r
                     {\r
-                        var line = stream.ReadLine();\r
-                        ln++;\r
-                        if (line == null)\r
-                            throw new Exception($"ログのurl, request, responseがそろっていません: {ln:d}行目");\r
-                        if (!line.StartsWith(s))\r
-                            throw new Exception($"ログに不正な行が含まれています: {ln:d}行目");\r
+                        string line;\r
+                        do\r
+                        {\r
+                            line = stream.ReadLine();\r
+                            ln++;\r
+                            if (line == null)\r
+                                throw new Exception($"ログの内容がそろっていません: {ln:d}行目");\r
+                        } while (!line.StartsWith(s));\r
                         triple.Add(line.Substring(s.Length));\r
                     }\r
                     var json = JsonParser.Parse(triple[2]);\r
@@ -59,298 +68,172 @@ namespace KancolleSniffer.Test
         }\r
 \r
         /// <summary>\r
-        ///  演習で受けたダメージが次の戦闘の結果に影響しない\r
+        /// 4-2-1で開幕対潜雷撃を含む戦闘を行う\r
         /// </summary>\r
         [TestMethod]\r
-        public void DamageInPracticeNotSpillIntoSortie()\r
+        public void NormalBattleWithVriousTypesOfAttack()\r
         {\r
-            var expected = new[] {31, 15, 15};\r
             var sniffer = new Sniffer();\r
             SniffLogFile(sniffer, "battle_001");\r
-            var result = sniffer.GetShipStatuses(0).Select(s => s.NowHp);\r
-            PAssert.That(() => (expected.SequenceEqual(result)));\r
-        }\r
-\r
-        /// <summary>\r
-        /// 演習では大破警告を出さない\r
-        /// </summary>\r
-        [TestMethod]\r
-        public void IgnoreDamagedShipsInPractice()\r
-        {\r
-            var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "practice_001");\r
-            PAssert.That(() => !sniffer.BadlyDamagedShips.Any());\r
-        }\r
-\r
-        /// <summary>\r
-        /// 夜戦のダメージを戦闘結果に反映する\r
-        /// </summary>\r
-        [TestMethod]\r
-        public void CaptureDamageInNightCombat()\r
-        {\r
-            var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "battle_002");\r
-            AssertEqualBattleResult(sniffer, new[] {28, 1, 13});\r
-            PAssert.That(() => sniffer.BadlyDamagedShips.Any());\r
-        }\r
-\r
-        private void AssertEqualBattleResult(Sniffer sniffer, IEnumerable<int> expected, string msg = null)\r
-        {\r
-            var result = sniffer.GetShipStatuses(0).Select(s => s.NowHp);\r
-            PAssert.That(() => (expected.SequenceEqual(result)), msg);\r
-        }\r
-\r
-        /// <summary>\r
-        /// 連合艦隊(水上打撃部隊)による戦闘のダメージを結果に反映する\r
-        /// </summary>\r
-        [TestMethod]\r
-        public void CombinedFleetSurface()\r
-        {\r
-            var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "combined_surface_001");\r
-            AssertEauqlCombinedResult(sniffer, new[] {40, 77, 77, 33, 51, 47}, new[] {39, 35, 11, 39, 37, 40});\r
-            PAssert.That(() => !sniffer.BadlyDamagedShips.Any());\r
-\r
-            SniffLogFile(sniffer, "combined_surface_002");\r
-            AssertEauqlCombinedResult(sniffer, new[] {40, 77, 77, 33, 15, 6}, new[] {39, 35, 4, 3, 14, 40});\r
-            PAssert.That(() => sniffer.BadlyDamagedShips.Any());\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 AssertEauqlCombinedResult(Sniffer sniffer, IEnumerable<int> expected0, IEnumerable<int> expected1,\r
+        private void AssertEqualBattleResult(Sniffer sniffer, IEnumerable<int> expected, IEnumerable<int> enemy,\r
             string msg = null)\r
         {\r
-            var result0 = sniffer.GetShipStatuses(0).Select(s => s.NowHp);\r
-            var result1 = sniffer.GetShipStatuses(1).Select(s => s.NowHp);\r
-            PAssert.That(() => (expected0.SequenceEqual(result0) && expected1.SequenceEqual(result1)), msg);\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
-        /// é\96\8bå¹\95å¤\9cæ\88¦ã\81®ã\83\80ã\83¡ã\83¼ã\82¸ã\82\92æ\88¦é\97\98çµ\90æ\9e\9cã\81«å\8f\8dæ\98 する\r
+        /// é\96\8bå¹\95å¤\9cæ\88¦ã\81§æ½\9cæ°´è\89¦å\90\8c士ã\81\8cã\81\8aè¦\8bå\90\88ã\81\84する\r
         /// </summary>\r
         [TestMethod]\r
-        public void SpMidnight()\r
+        public void SpMidnightWithoutBattle()\r
         {\r
             var sniffer = new Sniffer();\r
             SniffLogFile(sniffer, "sp_midnight_001");\r
-            AssertEqualBattleResult(sniffer, new[] {1});\r
-            PAssert.That(() => sniffer.BadlyDamagedShips.Any());\r
-        }\r
-\r
-        /// <summary>\r
-        /// 連合艦隊(空母機動部隊)による戦闘のダメージを結果に反映する\r
-        /// </summary>\r
-        [TestMethod]\r
-        public void CombinedFleetAir()\r
-        {\r
-            var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "combined_air_001");\r
-            AssertEauqlCombinedResult(sniffer, new[] {40, 98, 90, 66, 78, 86}, new[] {47, 41, 5, 42, 43, 29});\r
-            PAssert.That(() => sniffer.BadlyDamagedShips.Any());\r
-\r
-            SniffLogFile(sniffer, "combined_air_002");\r
-            AssertEauqlCombinedResult(sniffer, new[] {13, 87, 90, 59, 69, 86}, new[] {47, 41, 5, 20, 43, 29});\r
-        }\r
-\r
-        /// <summary>\r
-        /// 護衛退避を正しく処理する\r
-        /// </summary>\r
-        [TestMethod]\r
-        public void EscapeShip()\r
-        {\r
-            var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "combined_escape_001");\r
-            AssertEauqlCombinedResult(sniffer, new[] {37, 105, 106, 90, 66, 10}, new[] {41, 41, 37, 44, 43, 43},\r
-                "連合艦隊で2戦して大破が出るまで");\r
-            PAssert.That(() => sniffer.BadlyDamagedShips.Any());\r
-            SniffLogFile(sniffer, "combined_escape_002");\r
-            PAssert.That(() => sniffer.GetShipStatuses(0)[5].Escaped && sniffer.GetShipStatuses(1)[1].Escaped,\r
-                "続けて護衛退避を実行");\r
-            PAssert.That(() => !sniffer.BadlyDamagedShips.Any());\r
-            SniffLogFile(sniffer, "combined_escape_003");\r
-            AssertEauqlCombinedResult(sniffer, new[] {37, 105, 106, 90, 1, 10}, new[] {41, 41, 32, 44, 43, 43},\r
-                "もう一戦して大破が出るまで");\r
-            PAssert.That(() => sniffer.BadlyDamagedShips.Any());\r
-            SniffLogFile(sniffer, "combined_escape_004");\r
-            PAssert.That(() => sniffer.GetShipStatuses(0)[5].Escaped && sniffer.GetShipStatuses(1)[1].Escaped &&\r
-                               sniffer.GetShipStatuses(0)[4].Escaped && sniffer.GetShipStatuses(1)[2].Escaped,\r
-                "続けて護衛退避を実行");\r
-            PAssert.That(() => !sniffer.BadlyDamagedShips.Any());\r
-        }\r
-\r
-        /// <summary>\r
-        /// 護衛退避した空母を除いた制空値を計算する\r
-        /// </summary>\r
-        [TestMethod]\r
-        public void FighterPowerWithoutEscapedShip()\r
-        {\r
-            var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "combined_escape_001");\r
-            PAssert.That(() => sniffer.GetFighterPower(0)[0] == 187);\r
-            SniffLogFile(sniffer, "combined_escape_002");\r
-            PAssert.That(() => sniffer.GetFighterPower(0)[0] == 65);\r
-        }\r
-\r
-        /// <summary>\r
-        /// 護衛退避した艦娘を除いて勝利判定を計算する\r
-        /// </summary>\r
-        [TestMethod]\r
-        public void BattleResultRankWithEscapedShip()\r
-        {\r
-            var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "combined_escape_005");\r
             PAssert.That(() => sniffer.Battle.ResultRank == BattleResultRank.D);\r
         }\r
 \r
-\r
         /// <summary>\r
-        /// 夜戦の開始時に昼戦の結果を反映する\r
+        /// 夜戦で戦艦が攻撃すると一回で三発分のデータが来る\r
+        /// そのうち存在しない攻撃はターゲット、ダメージともに-1になる\r
         /// </summary>\r
         [TestMethod]\r
-        public void ResultOfDayBattleShowInNightBattle()\r
+        public void BattleShipAttackInMidnight()\r
         {\r
             var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "battle_003");\r
-            AssertEqualBattleResult(sniffer, new[] {28, 2, 13});\r
-            PAssert.That(() => !sniffer.BadlyDamagedShips.Any(), "夜戦の開始時は大破警告を出さない");\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 AirBattle()\r
+        public void Ship7Battle()\r
         {\r
             var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "airbattle_001");\r
-            AssertEqualBattleResult(sniffer, new[] {37, 36, 31, 37, 17, 63}, "夜戦あり");\r
-\r
-            sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "airbattle_002");\r
-            AssertEqualBattleResult(sniffer, new[] {66, 36, 16, 27, 35, 38}, "昼戦のみ");\r
+            SniffLogFile(sniffer, "ship7battle_001");\r
+            PAssert.That(() => sniffer.Battle.ResultRank == BattleResultRank.P);\r
         }\r
 \r
         /// <summary>\r
-        /// æ\94¯æ\8f´å°\84æ\92\83ã\81«ã\82\88ã\82\8bæ\95µã\81®æ\90\8då\82·ã\82\92å\8b\9då\88©å\88¤å®\9aã\81«å\8f\8dæ\98 ã\81\95ã\81\9bã\82\8b\r
+        /// æ¼\94ç¿\92ã\81®ã\81\82ã\81¨ã\81®portã\81§æ\88¦é\97\98çµ\90æ\9e\9cã\81®æ¤\9c証ã\82\92è¡\8cã\82\8fã\81ªã\81\84\r
         /// </summary>\r
         [TestMethod]\r
-        public void SupportShellingChangeResultRank()\r
+        public void NotVerifyBattleResultAfterPractice()\r
         {\r
             var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "support_001");\r
-            PAssert.That(() => sniffer.Battle.ResultRank == BattleResultRank.A);\r
+            SniffLogFile(sniffer, "practice_001");\r
+            PAssert.That(() => !sniffer.IsBattleResultStatusError);\r
         }\r
 \r
         /// <summary>\r
-        /// ダメコンの使用を戦闘結果に反映させる\r
+        /// 演習でダメコンを発動させない\r
         /// </summary>\r
         [TestMethod]\r
-        public void DamageControl()\r
+        public void NotTriggerDameconInPractice()\r
         {\r
             var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "damecon_001");\r
-            AssertEqualBattleResult(sniffer, new[] {30, 1, 3}, "戦闘前");\r
-            PAssert.That(() => sniffer.GetShipStatuses(0)[1].Slot.Select(item => item.Id).\r
-                SequenceEqual(new[] {2, 4593, -1, -1, -1}), "ダメコンを二つ装備");\r
-            PAssert.That(() => sniffer.Battle.ResultRank == BattleResultRank.P, "判定は完全勝利");\r
-            SniffLogFile(sniffer, "damecon_002");\r
-            AssertEqualBattleResult(sniffer, new[] {30, 1, 3}, "戦闘後");\r
-            PAssert.That(() => sniffer.GetShipStatuses(0)[1].Slot.Select(item => item.Id).\r
-                SequenceEqual(new[] {-1, 4593, -1, -1, -1}), "ダメコンを一つ消費");\r
+            SniffLogFile(sniffer, "practice_002");\r
+            PAssert.That(() => !sniffer.Battle.DisplayedResultRank.IsError);\r
         }\r
 \r
         /// <summary>\r
-        /// 補強装備スロットのダメコンの使用を反映する\r
+        /// 演習中の艦を要修復リストに載せない\r
         /// </summary>\r
         [TestMethod]\r
-        public void DamgeControlInSlotEx()\r
+        public void DamagedShipListNotShowShipInPractice()\r
         {\r
             var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "damecon_003");\r
-            PAssert.That(() => sniffer.GetShipStatuses(0)[5].SlotEx.Id == 10306, "戦闘前");\r
-            SniffLogFile(sniffer, "damecon_004");\r
-            PAssert.That(() => sniffer.GetShipStatuses(0)[5].SlotEx.Id == -1, "戦闘後");\r
+            SniffLogFile(sniffer, "practice_003");\r
+            PAssert.That(() => sniffer.RepairList.Select(s => s.Name).SequenceEqual(new[] {"飛龍改二", "翔鶴改二"}));\r
         }\r
 \r
         /// <summary>\r
-        /// 旗艦大破で女神を使った進撃を反映する\r
+        /// 連合艦隊が開幕雷撃で被弾する\r
         /// </summary>\r
         [TestMethod]\r
-        public void DamageControlForFlagShip()\r
+        public void OpeningTorpedoInCombinedBattle()\r
         {\r
             var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "damecon_005");\r
-            var fs = sniffer.GetShipStatuses(0)[0];\r
-            PAssert.That(() => fs.SlotEx.Id == -1);\r
-            PAssert.That(() => fs.NowHp == fs.MaxHp);\r
-            PAssert.That(() => sniffer.BadlyDamagedShips.Length == 0);\r
+            SniffLogFile(sniffer, "combined_battle_001");\r
+            PAssert.That(() => !sniffer.IsBattleResultStatusError);\r
         }\r
 \r
         /// <summary>\r
-        /// 戦闘開始時に大破艦がいても夜戦突入時に警告を出さない\r
+        /// 連合艦隊が閉幕雷撃で被弾する\r
         /// </summary>\r
         [TestMethod]\r
-        public void NotWarnDamagedShipOnRunIntoNightBattle()\r
+        public void ClosingTorpedoInCombinedBattle()\r
         {\r
             var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "damecon_006");\r
-            PAssert.That(() => sniffer.BadlyDamagedShips.Length == 0);\r
+            SniffLogFile(sniffer, "combined_battle_002");\r
+            PAssert.That(() => !sniffer.IsBattleResultStatusError);\r
         }\r
 \r
         /// <summary>\r
-        /// 連合艦隊(水上打撃部隊)で二回目の砲撃戦がない場合を正しく処理する\r
+        /// 第一が6隻未満の連合艦隊で戦闘する\r
         /// </summary>\r
         [TestMethod]\r
-        // ReSharper disable once InconsistentNaming\r
-        public void CombinedFleetSurfaceWithout2ndShelling()\r
+        public void SmallCombinedFleetBattle()\r
         {\r
             var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "combined_surface_003");\r
-            PAssert.That(() => sniffer.Battle.ResultRank == BattleResultRank.P);\r
+            SniffLogFile(sniffer, "combined_battle_003");\r
+            PAssert.That(() => !sniffer.IsBattleResultStatusError);\r
         }\r
 \r
         /// <summary>\r
-        /// 連合艦隊(水上打撃部隊)で開幕雷撃で戦闘が終わる場合を正しく処理する\r
+        /// 護衛退避する\r
         /// </summary>\r
         [TestMethod]\r
-        // ReSharper disable once InconsistentNaming\r
-        public void CombinedFleetSurfaceWithoutAnyShelling()\r
+        public void EscapeWithEscort()\r
         {\r
             var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "combined_surface_004");\r
-            PAssert.That(() => sniffer.Battle.ResultRank == BattleResultRank.P);\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
-        /// ship2に代わるship_deckを処理す\r
+        /// 開幕夜戦に支援が来\r
         /// </summary>\r
         [TestMethod]\r
-        public void ShipDeck()\r
+        public void SpMidnightSupportAttack()\r
         {\r
             var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "ship_deck_001");\r
-            PAssert.That(() => sniffer.GetShipStatuses(0)[0].Fuel == 36);\r
+            SniffLogFile(sniffer, "sp_midnight_002");\r
+            PAssert.That(() => !sniffer.Battle.DisplayedResultRank.IsError);\r
         }\r
 \r
         /// <summary>\r
-        /// 夜戦かどうかを選択する画面でリロードしても結果を次の戦闘に持ち越さない\r
+        /// 払暁戦を行う\r
         /// </summary>\r
         [TestMethod]\r
-        public void ReloadBeforeBattleResult()\r
+        public void NightToDay()\r
         {\r
             var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "reload_001");\r
-            PAssert.That(() => sniffer.GetShipStatuses(0)[0].NowHp == 41);\r
+            SniffLogFile(sniffer, "nighttoday_001");\r
+            PAssert.That(() => !sniffer.Battle.DisplayedResultRank.IsError && !sniffer.IsBattleResultStatusError);\r
         }\r
 \r
         /// <summary>\r
-        /// 航空戦のない演習を正しく処理する\r
+        /// 単艦退避する\r
         /// </summary>\r
         [TestMethod]\r
-        public void PracticeWithoutAirBattle()\r
+        public void EscapeWithoutEscort()\r
         {\r
             var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "practice_002");\r
-            PAssert.That(() => sniffer.Battle.AirControlLevel == -1);\r
+            SniffLogFile(sniffer, "escape_002");\r
+            PAssert.That(() => sniffer.Fleets[2].Ships[1].Escaped);\r
+            PAssert.That(() => !sniffer.IsBattleResultStatusError);\r
         }\r
 \r
         /// <summary>\r
@@ -376,28 +259,6 @@ namespace KancolleSniffer.Test
         }\r
 \r
         /// <summary>\r
-        /// 先制対潜攻撃を正しく処理する\r
-        /// </summary>\r
-        [TestMethod]\r
-        public void OpeningTaisen()\r
-        {\r
-            var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "opening_taisen_001");\r
-            PAssert.That(() => sniffer.Battle.ResultRank == BattleResultRank.P);\r
-        }\r
-\r
-        /// <summary>\r
-        /// 敵の空スロットの値が-1ではなく0のときにエラーにならない\r
-        /// </summary>\r
-        [TestMethod]\r
-        public void ZeroValueEmptySlot()\r
-        {\r
-            var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "battle_006");\r
-            PAssert.That(() => sniffer.Battle.EnemyFighterPower == "0");\r
-        }\r
-\r
-        /// <summary>\r
         /// 熟練度込みの制空値を正しく計算する\r
         /// </summary>\r
         [TestMethod]\r
@@ -405,9 +266,10 @@ namespace KancolleSniffer.Test
         {\r
             var sniffer = new Sniffer();\r
             SniffLogFile(sniffer, "fighterpower_001");\r
-            PAssert.That(() => sniffer.GetFighterPower(0).SequenceEqual(new[] {156, 159}));\r
+            var fleet = sniffer.Fleets[0];\r
+            PAssert.That(() => fleet.FighterPower.SequenceEqual(new[] {156, 159}));\r
             SniffLogFile(sniffer, "fighterpower_002");\r
-            PAssert.That(() => sniffer.GetFighterPower(0).SequenceEqual(new[] {140, 143}), "全滅したスロットがある");\r
+            PAssert.That(() => fleet.FighterPower.SequenceEqual(new[] {140, 143}), "全滅したスロットがある");\r
         }\r
 \r
         /// <summary>\r
@@ -418,7 +280,7 @@ namespace KancolleSniffer.Test
         {\r
             var sniffer = new Sniffer();\r
             SniffLogFile(sniffer, "fighterpower_003");\r
-            PAssert.That(() => sniffer.GetFighterPower(0).SequenceEqual(new [] {135, 135}));\r
+            PAssert.That(() => sniffer.Fleets[0].FighterPower.SequenceEqual(new[] {135, 135}));\r
         }\r
 \r
         /// <summary>\r
@@ -429,9 +291,9 @@ namespace KancolleSniffer.Test
         {\r
             var sniffer = new Sniffer();\r
             SniffLogFile(sniffer, "baseaircorps_001");\r
-            PAssert.That(() => sniffer.BaseAirCorps[0].AirCorps[0].FighterPower[1] == 301);\r
+            PAssert.That(() => sniffer.BaseAirCorps[0].AirCorps[0].FighterPower.AirCombat[1] == 301);\r
             sniffer.BaseAirCorps[0].AirCorps[0].Action = 2; // 防空\r
-            PAssert.That(()=>sniffer.BaseAirCorps[0].AirCorps[0].FighterPower[1] == 320);\r
+            PAssert.That(() => sniffer.BaseAirCorps[0].AirCorps[0].FighterPower.Interception[1] == 320);\r
         }\r
 \r
         /// <summary>\r
@@ -442,160 +304,139 @@ namespace KancolleSniffer.Test
         {\r
             var sniffer = new Sniffer();\r
             SniffLogFile(sniffer, "baseaircorps_002");\r
-            PAssert.That(() => sniffer.BaseAirCorps[0].AirCorps[2].FighterPower[0] == 353);\r
+            PAssert.That(() => sniffer.BaseAirCorps[0].AirCorps[2].FighterPower.Interception[0] == 353);\r
         }\r
 \r
         /// <summary>\r
-        /// マップ索敵の判定式(33)を正しく計算す\r
+        /// 陸上攻撃機の熟練度を制空値に反映させ\r
         /// </summary>\r
         [TestMethod]\r
-        public void LineOfSight()\r
+        public void FighterPowerOfLandBasedAttackAircraft()\r
         {\r
             var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "lineofsight_001");\r
-            PAssert.That(() => Math.Abs(sniffer.GetFleetLineOfSights(0) - 39.45) < 0.01);\r
-            SniffLogFile(sniffer, "lineofsight_002");\r
-            PAssert.That(() => Math.Abs(sniffer.GetFleetLineOfSights(0) - -25.10) < 0.01, "艦隊に空きがある");\r
+            SniffLogFile(sniffer, "baseaircorps_003");\r
+            PAssert.That(() => sniffer.BaseAirCorps[1].AirCorps[0].FighterPower.AirCombat[0] == 121);\r
         }\r
 \r
         /// <summary>\r
-        /// 触接開始率を正しく計算する\r
+        /// 基地航空隊の出撃コストを計算する\r
         /// </summary>\r
         [TestMethod]\r
-        public void ContactTriggerRage()\r
+        public void CostForSortieOfBaseAirCorps()\r
         {\r
             var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "contact_001");\r
-            PAssert.That(() => Math.Abs(sniffer.GetContactTriggerRate(0) - 1.8182) < 0.0001);\r
+            SniffLogFile(sniffer, "baseaircorps_003");\r
+            PAssert.That(() => sniffer.BaseAirCorps[1].AirCorps[0].CostForSortie.SequenceEqual(new[] {99, 47}));\r
         }\r
 \r
         /// <summary>\r
-        /// 空襲戦を正しく処理する\r
+        /// 陸上戦闘機の改修レベルを制空値に反映させる。\r
         /// </summary>\r
         [TestMethod]\r
-        public void LdAirBattle()\r
+        public void FighterPowerOfLandBAseFighter()\r
         {\r
             var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "ld_airbattle_001");\r
-            AssertEqualBattleResult(sniffer, new[] {31, 59, 62, 14, 36, 47});\r
-            PAssert.That(() => sniffer.Battle.ResultRank == BattleResultRank.A);\r
+            SniffLogFile(sniffer, "baseaircorps_004");\r
+            PAssert.That(() => sniffer.BaseAirCorps[1].AirCorps[0].FighterPower.AirCombat[0] == 328);\r
         }\r
 \r
         /// <summary>\r
-        /// 連合艦隊の空襲戦を正しく処理する\r
+        /// マップ索敵の判定式(33)を正しく計算する\r
         /// </summary>\r
         [TestMethod]\r
-        public void CombinedLdAirBattle()\r
+        public void LineOfSight()\r
         {\r
             var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "ld_airbattle_002");\r
-            AssertEauqlCombinedResult(sniffer, new[] {31, 77, 77, 37, 41, 39}, new[] {45, 59, 64, 35, 36, 10});\r
-            PAssert.That(() => sniffer.Battle.ResultRank == BattleResultRank.A);\r
+            SniffLogFile(sniffer, "lineofsight_001");\r
+            var fleet = sniffer.Fleets[0];\r
+            PAssert.That(() => Math.Abs(fleet.GetLineOfSights(1) - 39.45) < 0.01);\r
+            PAssert.That(() => Math.Abs(fleet.GetLineOfSights(3) - 115.19) < 0.01);\r
+            PAssert.That(() => Math.Abs(fleet.GetLineOfSights(4) - 153.06) < 0.01);\r
+            SniffLogFile(sniffer, "lineofsight_002");\r
+            PAssert.That(() => Math.Abs(fleet.GetLineOfSights(1) - -25.10) < 0.01, "艦隊に空きがある");\r
         }\r
 \r
         /// <summary>\r
-        /// TPを正しく計算する\r
+        /// 触接開始率を正しく計算する\r
         /// </summary>\r
         [TestMethod]\r
-        public void TransportPoint()\r
+        public void ContactTriggerRage()\r
         {\r
-            var sniffer1 = new Sniffer();\r
-            SniffLogFile(sniffer1, "transportpoint_001");\r
-            ItemSpec.IncreaceLandPowerTp = false;\r
-            PAssert.That(() => (int)sniffer1.GetShipStatuses(0).Sum(s => s.TransportPoint) == 27);\r
-            ItemSpec.IncreaceLandPowerTp = true;\r
-            PAssert.That(() => (int)sniffer1.GetShipStatuses(0).Sum(s => s.TransportPoint) == 37, "陸上戦力揚陸時");\r
-\r
-            var sniffer2 = new Sniffer();\r
-            SniffLogFile(sniffer2, "transportpoint_002");\r
-            PAssert.That(() => (int)sniffer2.GetShipStatuses(0).Sum(s => s.TransportPoint) == 19, "鬼怒改二+特大発+おにぎり");\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "contact_001");\r
+            PAssert.That(() => Math.Abs(sniffer.Fleets[0].ContactTriggerRate - 1.8182) < 0.0001);\r
         }\r
 \r
         /// <summary>\r
-        /// 敵の連合艦隊に対応する\r
+        /// TPを計算する\r
         /// </summary>\r
         [TestMethod]\r
-        public void EnemyCombinedBattle()\r
+        public void TransportPoint()\r
         {\r
-            var sniffer1 = new Sniffer();\r
-            SniffLogFile(sniffer1, "ec_battle_001");\r
-            PAssert.That(() => sniffer1.Battle.ResultRank == BattleResultRank.S, "昼戦のみ");\r
+            DataLoader.LoadTpSpec();\r
 \r
-            var sniffer2 = new Sniffer();\r
-            SniffLogFile(sniffer2, "ec_battle_002");\r
-            PAssert.That(() => sniffer2.Battle.ResultRank == BattleResultRank.S, "夜戦込み");\r
-\r
-            var sniffer3 = new Sniffer();\r
-            SniffLogFile(sniffer3, "ec_battle_003");\r
-            PAssert.That(() => sniffer3.Battle.ResultRank == BattleResultRank.A, "護衛を撃ちもらす");\r
+            var msgs = new[] {"", "鬼怒改二+特大発+おにぎり", "駆逐艦+士魂部隊", "補給艦"};\r
+            var results = new[] {47, 19, 13, 15};\r
+            for (var i = 0; i < msgs.Length; i++)\r
+            {\r
+                var sniffer = new Sniffer();\r
+                SniffLogFile(sniffer, "transportpoint_00" + (i + 1));\r
+                var j = i;\r
+                PAssert.That(() => (int)sniffer.Fleets[0].TransportPoint == results[j], msgs[j]);\r
+            }\r
         }\r
 \r
-\r
         /// <summary>\r
-        /// å\8f\8cæ\96¹é\80£å\90\88è\89¦é\9a\8aã\81®æ\88¦é\97\98ã\81«å¯¾å¿\9cする\r
+        /// å¯¾ç©ºç ²ç\81«ã\81®ã\83\91ã\83©ã\83¡ã\83¼ã\82¿ã\82\92è¨\88ç®\97する\r
         /// </summary>\r
         [TestMethod]\r
-        public void BothCombinedBattle()\r
+        public void AntiAirFire()\r
         {\r
-            var sniffer1 = new Sniffer();\r
-            SniffLogFile(sniffer1, "both_combined_water_001");\r
-            PAssert.That(() => sniffer1.Battle.ResultRank == BattleResultRank.A);\r
-\r
-            var sniffer2 = new Sniffer();\r
-            SniffLogFile(sniffer2, "both_combined_001");\r
-            PAssert.That(() => sniffer2.Battle.ResultRank == BattleResultRank.S);\r
-\r
-            // 護衛艦隊に雷撃を受ける場合\r
-            var sniffer3 = new Sniffer();\r
-            SniffLogFile(sniffer3, "both_combined_002");\r
-            PAssert.That(() => sniffer2.Battle.ResultRank == BattleResultRank.S);\r
-            PAssert.That(\r
-                () => sniffer3.GetShipStatuses(0).Select(s => s.NowHp).SequenceEqual(new[] {89, 86, 87, 78, 87, 57}));\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "antiairfire_001");\r
+            var ships = sniffer.Fleets[0].Ships;\r
+            PAssert.That(() => ships.Sum(ship => ship.EffectiveAntiAirForFleet) == 88);\r
             PAssert.That(\r
-                () => sniffer3.GetShipStatuses(1).Select(s => s.NowHp).SequenceEqual(new[] {46, 37, 14, 59, 49, 63}));\r
+                () =>\r
+                    ships.Select(ship => ship.EffectiveAntiAirForShip)\r
+                        .SequenceEqual(new[] {92, 90, 88, 228, 146, 226}));\r
         }\r
 \r
         /// <summary>\r
-        /// 噴式強襲に対応する\r
+        /// 空母の夜戦火力を計算する\r
         /// </summary>\r
         [TestMethod]\r
-        public void Injection()\r
+        public void CvNightBattlePower()\r
         {\r
             var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "injection_001");\r
-            PAssert.That(() => sniffer.Battle.ResultRank == BattleResultRank.P);\r
-        }\r
-\r
-        /// <summary>\r
-        /// 2-5をクリアしたときの特別戦果を反映する\r
-        /// </summary>\r
-        [TestMethod]\r
-        public void ExMapBattleResult()\r
-        {\r
-            var sniffer0 = new Sniffer();\r
-            sniffer0.ExMap.ClearClearStatus();\r
-            SniffLogFile(sniffer0, "eo_001");\r
-            PAssert.That(() => sniffer0.ExMap.Achievement == 100, "ほかのマップの情報なし");\r
-            var sniffer1 = new Sniffer();\r
-            SniffLogFile(sniffer1, "eo_001");\r
-            // すでに3-5をクリアしているので合計で250\r
-            PAssert.That(() => sniffer1.ExMap.Achievement == 250, "ほかのマップの情報あり");\r
+            SniffLogFile(sniffer, "nightbattlepower_001");\r
+            var ships = sniffer.Fleets[0].Ships;\r
+            PAssert.That(() =>\r
+                ships.Select(ship => (int)(ship.NightBattlePower * 100))\r
+                    .SequenceEqual(new[] {11202, 14985, 20092, 17354}));\r
+            // 夜間作戦航空要員を外す\r
+            ships[0].Slot[3] = ships[1].Slot[2] = ships[3].Slot[2] = new ItemStatus();\r
+            PAssert.That(() =>\r
+                ships.Select(ship => (int)(ship.NightBattlePower * 100))\r
+                    .SequenceEqual(new[] {6900, 7500, 20092, 0}));\r
+            // Ark RoyalからSwordfishを外す\r
+            ships[0].Slot[0] = new ItemStatus();\r
+            PAssert.That(() => (int)ships[0].NightBattlePower == 0);\r
         }\r
 \r
         /// <summary>\r
-        /// 1-6をクリアしたときの特別戦果を反映する\r
+        /// 副砲の改修レベルの効果を計算する\r
         /// </summary>\r
         [TestMethod]\r
-        public void ExMapMapNext()\r
+        public void SecondaryGunFirepowerLevelBonus()\r
         {\r
-            var sniffer0 = new Sniffer();\r
-            sniffer0.ExMap.ClearClearStatus();\r
-            SniffLogFile(sniffer0, "eo_002");\r
-            PAssert.That(() => sniffer0.ExMap.Achievement == 75, "ほかのマップの情報なし");\r
-            var sniffer1 = new Sniffer();\r
-            SniffLogFile(sniffer1, "eo_002");\r
-            // 5-5以外クリアしているので合計で400\r
-            PAssert.That(() => sniffer1.ExMap.Achievement == 400, "ほかのマップの情報あり");\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "firepower_001");\r
+            var fleet = sniffer.Fleets[0];\r
+            // ReSharper disable CompareOfFloatsByEqualityOperator\r
+            PAssert.That(() => fleet.Ships[0].EffectiveFirepower == 93.5);\r
+            PAssert.That(() => fleet.Ships[1].EffectiveFirepower == 82.5);\r
+            // ReSharper restore CompareOfFloatsByEqualityOperator\r
         }\r
 \r
         /// <summary>\r
@@ -606,7 +447,7 @@ namespace KancolleSniffer.Test
         {\r
             var sniffer = new Sniffer();\r
             SniffLogFile(sniffer, "deck_001");\r
-            var result = sniffer.GetDeck(0);\r
+            var result = sniffer.Fleets[0].Deck;\r
             PAssert.That(() => new[] {756, 17204, 6156, 28806, 1069, -1}.SequenceEqual(result));\r
         }\r
 \r
@@ -618,7 +459,7 @@ namespace KancolleSniffer.Test
         {\r
             var sniffer = new Sniffer();\r
             SniffLogFile(sniffer, "deck_005");\r
-            var result = sniffer.GetDeck(0);\r
+            var result = sniffer.Fleets[0].Deck;\r
             PAssert.That(() => new[] {57391, 50, 24475, 113, -1, -1}.SequenceEqual(result));\r
         }\r
 \r
@@ -631,18 +472,18 @@ namespace KancolleSniffer.Test
             var sniffer = new Sniffer();\r
 \r
             SniffLogFile(sniffer, "deck_002");\r
-            var result0 = sniffer.GetDeck(0);\r
+            var result0 = sniffer.Fleets[0].Deck;\r
             PAssert.That(() => new[] {1069, 6156, 756, 3223, -1, -1}.SequenceEqual(result0), "編成で艦隊内で艦娘と交換する");\r
 \r
             SniffLogFile(sniffer, "deck_003");\r
-            var result10 = sniffer.GetDeck(0);\r
-            var result11 = sniffer.GetDeck(1);\r
+            var result10 = sniffer.Fleets[0].Deck;\r
+            var result11 = sniffer.Fleets[1].Deck;\r
             PAssert.That(() => new[] {1069, 6156, 14258, 3223, -1, -1}.SequenceEqual(result10) &&\r
                                new[] {101, 4487, 756, 14613, 28806, -1}.SequenceEqual(result11), "002に続いて艦隊をまたがって交換する");\r
 \r
             SniffLogFile(sniffer, "deck_004");\r
-            var result20 = sniffer.GetDeck(0);\r
-            var result21 = sniffer.GetDeck(1);\r
+            var result20 = sniffer.Fleets[0].Deck;\r
+            var result21 = sniffer.Fleets[1].Deck;\r
             PAssert.That(() => new[] {1069, 6156, 14258, 3223, 756, -1}.SequenceEqual(result20) &&\r
                                new[] {101, 4487, 14613, 28806, -1, -1}.SequenceEqual(result21),\r
                 "003に続いて空き番号にほかの艦隊の艦娘を配置する");\r
@@ -656,7 +497,7 @@ namespace KancolleSniffer.Test
         {\r
             var sniffer = new Sniffer();\r
             SniffLogFile(sniffer, "preset_001");\r
-            var result = sniffer.GetDeck(0);\r
+            var result = sniffer.Fleets[0].Deck;\r
             PAssert.That(() => new[] {50510, 632, 39843, 113, 478, 47422}.SequenceEqual(result));\r
         }\r
 \r
@@ -678,7 +519,7 @@ namespace KancolleSniffer.Test
         {\r
             var sniffer = new Sniffer();\r
             SniffLogFile(sniffer, "slot_exchange_001");\r
-            var result = sniffer.GetShipStatuses(0)[0].Slot.Select(item => item.Id);\r
+            var result = sniffer.Fleets[0].Ships[0].Slot.Select(item => item.Id);\r
             PAssert.That(() => new[] {26096, 30571, 77694, 61383, -1}.SequenceEqual(result));\r
         }\r
 \r
@@ -690,7 +531,18 @@ namespace KancolleSniffer.Test
         {\r
             var sniffer = new Sniffer();\r
             SniffLogFile(sniffer, "powerup_001");\r
-            PAssert.That(() => Math.Abs(sniffer.GetShipStatuses(0)[0].EffectiveFirepower - 30) < 0.0001);\r
+            PAssert.That(() => Math.Abs(sniffer.Fleets[0].Ships[0].EffectiveFirepower - 30) < 0.0001);\r
+        }\r
+\r
+        /// <summary>\r
+        /// 近代化改修が二重に行われた場合に対応する\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void DuplicatedPowerup()\r
+        {\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "powerup_002");\r
+            PAssert.That(() => sniffer.Item.NowShips == 218);\r
         }\r
 \r
         /// <summary>\r
@@ -720,17 +572,6 @@ namespace KancolleSniffer.Test
         }\r
 \r
         /// <summary>\r
-        /// 解体された艦の装備数を全体の装備数から引く\r
-        /// </summary>\r
-        [TestMethod]\r
-        public void CountItemsOnDeletedShip()\r
-        {\r
-            var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "destroyship_001");\r
-            PAssert.That(() => sniffer.Item.NowEquips == 879, "ドロップしたばかりの艦娘を解体する場合");\r
-        }\r
-\r
-        /// <summary>\r
         /// 装備数の超過を警告する\r
         /// </summary>\r
         [TestMethod]\r
@@ -738,21 +579,10 @@ namespace KancolleSniffer.Test
         {\r
             var sniffer1 = new Sniffer();\r
             SniffLogFile(sniffer1, "item_count_001");\r
-            PAssert.That(() => sniffer1.Item.RingEquips, "出撃から母港に戻ったとき");\r
+            PAssert.That(() => sniffer1.Item.AlarmEquips, "出撃から母港に戻ったとき");\r
             var sniffer2 = new Sniffer();\r
             SniffLogFile(sniffer2, "item_count_002");\r
-            PAssert.That(() => sniffer2.Item.RingEquips, "ログインしたとき");\r
-        }\r
-\r
-        /// <summary>\r
-        /// ドロップ艦のいる出撃から戻ったときに、slot_itemを受信する前にItemListを取得しても例外を出さない\r
-        /// </summary>\r
-        [TestMethod]\r
-        public void GetItemListBeforeReceivingSlotItem()\r
-        {\r
-            var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "dropship_001");\r
-            PAssert.That(() => sniffer.ItemList[0].Holder.Id == 250);\r
+            PAssert.That(() => sniffer2.Item.AlarmEquips, "ログインしたとき");\r
         }\r
 \r
         /// <summary>\r
@@ -857,7 +687,7 @@ namespace KancolleSniffer.Test
                 new[] {0, 0, 0, 0, 0, 0, 0, 0},\r
                 new[] {288194, 282623, 299496, 295958, 3000, 2968, 2997, 7},\r
                 new[] {288185, 282623, 299496, 295943, 3000, 2968, 2997, 7},\r
-                new[] {288161, 282623, 299496, 295903, 3000, 2968, 2997, 7},\r
+                new[] {288161, 282623, 299496, 295903, 3000, 2968, 2997, 7}\r
             };\r
             PAssert.That(() => SequenceOfSequenceEqual(expected3, result3), "航空機の補充");\r
 \r
@@ -881,7 +711,7 @@ namespace KancolleSniffer.Test
                 new[] {0, 0, 0, 0, 0, 0, 0, 0},\r
                 new[] {261012, 252252, 298492, 279622, 3000, 2842, 3000, 22},\r
                 new[] {261012, 252252, 298492, 279538, 3000, 2842, 3000, 22},\r
-                new[] {261012, 252252, 298492, 279454, 3000, 2842, 3000, 22},\r
+                new[] {261012, 252252, 298492, 279454, 3000, 2842, 3000, 22}\r
             };\r
             PAssert.That(() => SequenceOfSequenceEqual(expected4, result4), "航空機の配備");\r
         }\r
@@ -896,45 +726,113 @@ namespace KancolleSniffer.Test
         }\r
 \r
         /// <summary>\r
-        /// 海域ゲージ情報を作成する\r
+        /// 修復時間が1分以内の艦娘が入渠する\r
         /// </summary>\r
         [TestMethod]\r
-        public void MapInfo()\r
+        public void NyukyoLessThanOrEqualTo1Min()\r
         {\r
             var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "mapinfo_001");\r
-            PAssert.That(() => sniffer.MiscText ==\r
-                               "[海域ゲージ]\r\n" +\r
-                               "1-6 : 撃破 3/7\r\n5-5 : 撃破 0/5\r\n6-3 : 撃破 0/4\r\n" +\r
-                               "31-1 : HP 0/750\r\n31-2 : HP 0/1050\r\n31-3 : HP 0/2100\r\n31-4 : HP 0/3500\r\n31-5 : HP 1/2450\r\n",\r
-                "最初の海域ゲージ情報");\r
-            SniffLogFile(sniffer, "mapinfo_002");\r
-            PAssert.That(() => sniffer.MiscText ==\r
-                               "[海域ゲージ情報]\r\n 海域選択画面に進むと表示します。\r\n[演習情報]\r\n 演習相手を選ぶと表示します。",\r
-                "戦闘から戻ったら案内を表示");\r
-            SniffLogFile(sniffer, "mapinfo_003");\r
-            PAssert.That(() => sniffer.MiscText ==\r
-                               "[海域ゲージ]\r\n" +\r
-                               "1-6 : 撃破 4/7\r\n5-5 : 撃破 0/5\r\n6-3 : 撃破 0/4\r\n" +\r
-                               "31-1 : HP 0/750\r\n31-2 : HP 0/1050\r\n31-3 : HP 0/2100\r\n31-4 : HP 0/3500\r\n31-5 : HP 1/2450\r\n",\r
-                "更新された海域ゲージ情報");\r
+            SniffLogFile(sniffer, "nyukyo_001");\r
+            PAssert.That(() => sniffer.RepairList.Length == 1);\r
+        }\r
+\r
+        /// <summary>\r
+        /// 一括解体する(装備保管なしとあり)\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void DestroyShip()\r
+        {\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "destroyship_001");\r
+            PAssert.That(() => sniffer.Item.NowShips == 250);\r
+            PAssert.That(() => sniffer.Item.NowEquips == 1118);\r
+            PAssert.That(() => sniffer.Material.Current.Take(4).SequenceEqual(new[] {285615, 286250, 291010, 284744}));\r
+        }\r
+\r
+        /// <summary>\r
+        /// 第2艦隊までしか解放していなくてもエラーにならないようにする\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void TwoFleets()\r
+        {\r
+            var sniffer = new Sniffer(true);\r
+            SniffLogFile(sniffer, "twofleets_001");\r
+            var expected = Enumerable.Repeat(new ChargeStatus(5, 5), ShipInfo.FleetCount);\r
+            PAssert.That(() => expected.SequenceEqual(sniffer.Fleets.Select(f => f.ChargeStatus)));\r
+        }\r
+\r
+        /// <summary>\r
+        /// ship2がリクエストで指定した艦娘のデータしか返さない\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void Ship2ReturnShipSpecifiedByRequest()\r
+        {\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "ship2_001");\r
+            PAssert.That(() => sniffer.Item.NowShips == 243);\r
         }\r
 \r
         /// <summary>\r
-        /// 演習相手の情報を作成する\r
+        /// 出撃中にアイテムを取得する\r
         /// </summary>\r
         [TestMethod]\r
-        public void PractiveEnemyInfo()\r
+        public void ItemGetInSortie()\r
         {\r
             var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "practice_enemyinfo_001");\r
+            SniffLogFile(sniffer, "itemget_001");\r
             PAssert.That(() => sniffer.MiscText ==\r
-                               "[演習情報]\r\n敵艦隊名 : 大銀河地球連邦 第7艦隊\r\n獲得経験値 : 570\r\nS勝利 : 684",\r
-                "演習相手の情報");\r
-            SniffLogFile(sniffer, "practice_enemyinfo_002");\r
+                               "[獲得アイテム]\r\n" +\r
+                               "燃料: 1115\r\n" +\r
+                               "弾薬: 25\r\n" +\r
+                               "鋼材: 70\r\n" +\r
+                               "家具箱(大): 1\r\n" +\r
+                               "給糧艦「間宮」: 1\r\n" +\r
+                               "勲章: 1\r\n" +\r
+                               "給糧艦「伊良湖」: 3\r\n" +\r
+                               "プレゼント箱: 1\r\n" +\r
+                               "補強増設: 2\r\n" +\r
+                               "戦闘詳報: 1\r\n" +\r
+                               "瑞雲(六三一空): 1\r\n" +\r
+                               "夜間作戦航空要員: 1\r\n" +\r
+                               "130mm B-13連装砲: 1\r\n" +\r
+                               "潜水空母な桐箪笥: 1\r\n" +\r
+                               "Gambier Bay: 1");\r
+        }\r
+\r
+        /// <summary>\r
+        /// 出撃直後に資源を獲得する\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void ItemGetAtStart()\r
+        {\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "itemget_002");\r
             PAssert.That(() => sniffer.MiscText ==\r
-                               "[海域ゲージ情報]\r\n 海域選択画面に進むと表示します。\r\n[演習情報]\r\n 演習相手を選ぶと表示します。",\r
-                "演習から戻ったら案内を表示");\r
+                               "[獲得アイテム]\r\n" +\r
+                               "燃料: 65");\r
+        }\r
+\r
+        /// <summary>\r
+        /// 航空偵察でアイテムを取得する\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void ItemGetInAirRecon()\r
+        {\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "airrecon_001");\r
+            PAssert.That(() =>\r
+                sniffer.MiscText ==\r
+                "[海域ゲージ情報]\r\n 海域選択画面に進むと表示します。\r\n" +\r
+                "[演習情報]\r\n 演習相手を選ぶと表示します。\r\n" +\r
+                "[獲得アイテム]\r\n 帰投したときに表示します。", "失敗の場合");\r
+\r
+            SniffLogFile(sniffer, "airrecon_002");\r
+            PAssert.That(() =>\r
+                sniffer.MiscText == "[獲得アイテム]\r\n弾薬: 150\r\n開発資材: 1", "成功");\r
+\r
+            SniffLogFile(sniffer, "airrecon_003");\r
+            PAssert.That(() =>\r
+                sniffer.MiscText == "[獲得アイテム]\r\n弾薬: 150\r\n開発資材: 1", "途中でリロードして再出撃");\r
         }\r
     }\r
 }
\ No newline at end of file