X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=KancolleSniffer.Test%2FSnifferTest.cs;h=480ac46a8cc5ff7a881289d0f74e1514a0668ec7;hb=7adeba32af9cf19c7174215aadc2f8fce8f4bbb4;hp=74261223390aaf535f73f2982dd7c2f0f35cb391;hpb=79e17b570268377e8d757d97062545d5eccd1288;p=kancollesniffer%2FKancolleSniffer.git

diff --git a/KancolleSniffer.Test/SnifferTest.cs b/KancolleSniffer.Test/SnifferTest.cs
index 7426122..480ac46 100644
--- a/KancolleSniffer.Test/SnifferTest.cs
+++ b/KancolleSniffer.Test/SnifferTest.cs
@@ -43,12 +43,14 @@ namespace KancolleSniffer.Test
                     var triple = new List<string>();
                     foreach (var s in new[] {"url: ", "request: ", "response: "})
                     {
-                        var line = stream.ReadLine();
-                        ln++;
-                        if (line == null)
-                            throw new Exception($"ログのurl, request, responseがそろっていません: {ln:d}行目");
-                        if (!line.StartsWith(s))
-                            throw new Exception($"ログに不正な行が含まれています: {ln:d}行目");
+                        string line;
+                        do
+                        {
+                            line = stream.ReadLine();
+                            ln++;
+                            if (line == null)
+                                throw new Exception($"ログの内容がそろっていません: {ln:d}行目");
+                        } while (!line.StartsWith(s));
                         triple.Add(line.Substring(s.Length));
                     }
                     var json = JsonParser.Parse(triple[2]);
@@ -59,309 +61,149 @@ namespace KancolleSniffer.Test
         }
 
         /// <summary>
-        ///  演習で受けたダメージが次の戦闘の結果に影響しない
+        /// 4-2-1で開幕対潜雷撃を含む戦闘を行う
         /// </summary>
         [TestMethod]
-        public void DamageInPracticeNotSpillIntoSortie()
+        public void NormalBattleWithVriousTypesOfAttack()
         {
-            var expected = new[] {31, 15, 15};
             var sniffer = new Sniffer();
             SniffLogFile(sniffer, "battle_001");
-            var result = sniffer.GetShipStatuses(0).Select(s => s.NowHp);
-            PAssert.That(() => (expected.SequenceEqual(result)));
-        }
-
-        /// <summary>
-        /// 演習では大破警告を出さない
-        /// </summary>
-        [TestMethod]
-        public void IgnoreDamagedShipsInPractice()
-        {
-            var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "practice_001");
-            PAssert.That(() => !sniffer.BadlyDamagedShips.Any());
-        }
-
-        /// <summary>
-        /// 夜戦のダメージを戦闘結果に反映する
-        /// </summary>
-        [TestMethod]
-        public void CaptureDamageInNightCombat()
-        {
-            var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "battle_002");
-            AssertEqualBattleResult(sniffer, new[] {28, 1, 13});
-            PAssert.That(() => sniffer.BadlyDamagedShips.Any());
-        }
-
-        private void AssertEqualBattleResult(Sniffer sniffer, IEnumerable<int> expected, string msg = null)
-        {
-            var result = sniffer.GetShipStatuses(0).Select(s => s.NowHp);
-            PAssert.That(() => (expected.SequenceEqual(result)), msg);
-        }
-
-        /// <summary>
-        /// 連合艦隊(水上打撃部隊)による戦闘のダメージを結果に反映する
-        /// </summary>
-        [TestMethod]
-        public void CombinedFleetSurface()
-        {
-            var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "combined_surface_001");
-            AssertEauqlCombinedResult(sniffer, new[] {40, 77, 77, 33, 51, 47}, new[] {39, 35, 11, 39, 37, 40});
-            PAssert.That(() => !sniffer.BadlyDamagedShips.Any());
-
-            SniffLogFile(sniffer, "combined_surface_002");
-            AssertEauqlCombinedResult(sniffer, new[] {40, 77, 77, 33, 15, 6}, new[] {39, 35, 4, 3, 14, 40});
-            PAssert.That(() => sniffer.BadlyDamagedShips.Any());
+            PAssert.That(() => sniffer.Battle.ResultRank == BattleResultRank.A);
+            AssertEqualBattleResult(sniffer,
+                new[] {57, 66, 50, 65, 40, 42}, new[] {34, 5, 0, 0, 0, 0});
         }
 
-        private void AssertEauqlCombinedResult(Sniffer sniffer, IEnumerable<int> expected0, IEnumerable<int> expected1,
+        private void AssertEqualBattleResult(Sniffer sniffer, IEnumerable<int> expected, IEnumerable<int> enemy,
             string msg = null)
         {
-            var result0 = sniffer.GetShipStatuses(0).Select(s => s.NowHp);
-            var result1 = sniffer.GetShipStatuses(1).Select(s => s.NowHp);
-            PAssert.That(() => (expected0.SequenceEqual(result0) && expected1.SequenceEqual(result1)), msg);
+            var result = sniffer.GetShipStatuses(0).Select(s => s.NowHp);
+            PAssert.That(() => expected.SequenceEqual(result), msg);
+            var enemyResult = sniffer.Battle.EnemyResultStatus.Select(s => s.NowHp);
+            PAssert.That(() => enemy.SequenceEqual(enemyResult), msg);
         }
 
         /// <summary>
-        /// 開幕夜戦のダメージを戦闘結果に反映する
+        /// 開幕夜戦で潜水艦同士がお見合いする
         /// </summary>
         [TestMethod]
-        public void SpMidnight()
+        public void SpMidnightWithoutBattle()
         {
             var sniffer = new Sniffer();
             SniffLogFile(sniffer, "sp_midnight_001");
-            AssertEqualBattleResult(sniffer, new[] {1});
-            PAssert.That(() => sniffer.BadlyDamagedShips.Any());
-        }
-
-        /// <summary>
-        /// 連合艦隊(空母機動部隊)による戦闘のダメージを結果に反映する
-        /// </summary>
-        [TestMethod]
-        public void CombinedFleetAir()
-        {
-            var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "combined_air_001");
-            AssertEauqlCombinedResult(sniffer, new[] {40, 98, 90, 66, 78, 86}, new[] {47, 41, 5, 42, 43, 29});
-            PAssert.That(() => sniffer.BadlyDamagedShips.Any());
-
-            SniffLogFile(sniffer, "combined_air_002");
-            AssertEauqlCombinedResult(sniffer, new[] {13, 87, 90, 59, 69, 86}, new[] {47, 41, 5, 20, 43, 29});
-        }
-
-        /// <summary>
-        /// 護衛退避を正しく処理する
-        /// </summary>
-        [TestMethod]
-        public void EscapeShip()
-        {
-            var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "combined_escape_001");
-            AssertEauqlCombinedResult(sniffer, new[] {37, 105, 106, 90, 66, 10}, new[] {41, 41, 37, 44, 43, 43},
-                "連合艦隊で2戦して大破が出るまで");
-            PAssert.That(() => sniffer.BadlyDamagedShips.Any());
-            SniffLogFile(sniffer, "combined_escape_002");
-            PAssert.That(() => sniffer.GetShipStatuses(0)[5].Escaped && sniffer.GetShipStatuses(1)[1].Escaped,
-                "続けて護衛退避を実行");
-            PAssert.That(() => !sniffer.BadlyDamagedShips.Any());
-            SniffLogFile(sniffer, "combined_escape_003");
-            AssertEauqlCombinedResult(sniffer, new[] {37, 105, 106, 90, 1, 10}, new[] {41, 41, 32, 44, 43, 43},
-                "もう一戦して大破が出るまで");
-            PAssert.That(() => sniffer.BadlyDamagedShips.Any());
-            SniffLogFile(sniffer, "combined_escape_004");
-            PAssert.That(() => sniffer.GetShipStatuses(0)[5].Escaped && sniffer.GetShipStatuses(1)[1].Escaped &&
-                               sniffer.GetShipStatuses(0)[4].Escaped && sniffer.GetShipStatuses(1)[2].Escaped,
-                "続けて護衛退避を実行");
-            PAssert.That(() => !sniffer.BadlyDamagedShips.Any());
-        }
-
-        /// <summary>
-        /// 護衛退避した空母を除いた制空値を計算する
-        /// </summary>
-        [TestMethod]
-        public void FighterPowerWithoutEscapedShip()
-        {
-            var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "combined_escape_001");
-            PAssert.That(() => sniffer.GetFighterPower(0)[0] == 187);
-            SniffLogFile(sniffer, "combined_escape_002");
-            PAssert.That(() => sniffer.GetFighterPower(0)[0] == 65);
-        }
-
-        /// <summary>
-        /// 護衛退避した艦娘を除いて勝利判定を計算する
-        /// </summary>
-        [TestMethod]
-        public void BattleResultRankWithEscapedShip()
-        {
-            var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "combined_escape_005");
             PAssert.That(() => sniffer.Battle.ResultRank == BattleResultRank.D);
         }
 
-
-        /// <summary>
-        /// 夜戦の開始時に昼戦の結果を反映する
-        /// </summary>
-        [TestMethod]
-        public void ResultOfDayBattleShowInNightBattle()
-        {
-            var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "battle_003");
-            AssertEqualBattleResult(sniffer, new[] {28, 2, 13});
-            PAssert.That(() => !sniffer.BadlyDamagedShips.Any(), "夜戦の開始時は大破警告を出さない");
-        }
-
-        /// <summary>
-        /// 通常艦隊の航空戦のダメージを結果に反映する
-        /// </summary>
-        [TestMethod]
-        public void AirBattle()
-        {
-            var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "airbattle_001");
-            AssertEqualBattleResult(sniffer, new[] {37, 36, 31, 37, 17, 63}, "夜戦あり");
-
-            sniffer = new Sniffer();
-            SniffLogFile(sniffer, "airbattle_002");
-            AssertEqualBattleResult(sniffer, new[] {66, 36, 16, 27, 35, 38}, "昼戦のみ");
-        }
-
         /// <summary>
-        /// 支援射撃による敵の損傷を勝利判定に反映させる
+        /// 夜戦で戦艦が攻撃すると一回で三発分のデータが来る
+        /// そのうち存在しない攻撃はターゲット、ダメージともに-1になる
         /// </summary>
         [TestMethod]
-        public void SupportShellingChangeResultRank()
+        public void BattleShipAttackInMidnight()
         {
             var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "support_001");
-            PAssert.That(() => sniffer.Battle.ResultRank == BattleResultRank.A);
+            SniffLogFile(sniffer, "midnight_001");
+            PAssert.That(() => sniffer.Battle.ResultRank == BattleResultRank.S);
         }
 
         /// <summary>
-        /// ダメコンの使用を戦闘結果に反映させる
+        /// 7隻編成の戦闘で7隻目が攻撃される
         /// </summary>
         [TestMethod]
-        public void DamageControl()
+        public void Ship7Battle()
         {
             var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "damecon_001");
-            AssertEqualBattleResult(sniffer, new[] {30, 1, 3}, "戦闘前");
-            PAssert.That(() => sniffer.GetShipStatuses(0)[1].Slot.Select(item => item.Id).
-                SequenceEqual(new[] {2, 4593, -1, -1, -1}), "ダメコンを二つ装備");
-            PAssert.That(() => sniffer.Battle.ResultRank == BattleResultRank.P, "判定は完全勝利");
-            SniffLogFile(sniffer, "damecon_002");
-            AssertEqualBattleResult(sniffer, new[] {30, 1, 3}, "戦闘後");
-            PAssert.That(() => sniffer.GetShipStatuses(0)[1].Slot.Select(item => item.Id).
-                SequenceEqual(new[] {-1, 4593, -1, -1, -1}), "ダメコンを一つ消費");
-        }
-
-        /// <summary>
-        /// 補強装備スロットのダメコンの使用を反映する
-        /// </summary>
-        [TestMethod]
-        public void DamgeControlInSlotEx()
-        {
-            var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "damecon_003");
-            PAssert.That(() => sniffer.GetShipStatuses(0)[5].SlotEx.Id == 10306, "戦闘前");
-            SniffLogFile(sniffer, "damecon_004");
-            PAssert.That(() => sniffer.GetShipStatuses(0)[5].SlotEx.Id == -1, "戦闘後");
+            SniffLogFile(sniffer, "ship7battle_001");
+            PAssert.That(() => sniffer.Battle.ResultRank == BattleResultRank.P);
         }
 
         /// <summary>
-        /// 旗艦大破で女神を使った進撃を反映する
+        /// 演習のあとのportで戦闘結果の検証を行わない
         /// </summary>
         [TestMethod]
-        public void DamageControlForFlagShip()
+        public void NotVerifyBattleResultAfterPractice()
         {
             var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "damecon_005");
-            var fs = sniffer.GetShipStatuses(0)[0];
-            PAssert.That(() => fs.SlotEx.Id == -1);
-            PAssert.That(() => fs.NowHp == fs.MaxHp);
-            PAssert.That(() => sniffer.BadlyDamagedShips.Length == 0);
+            SniffLogFile(sniffer, "practice_001");
+            PAssert.That(() => !sniffer.IsBattleResultStatusError);
         }
 
         /// <summary>
-        /// 戦闘開始時に大破艦がいても夜戦突入時に警告を出さない
+        /// 連合艦隊が開幕雷撃で被弾する
         /// </summary>
         [TestMethod]
-        public void NotWarnDamagedShipOnRunIntoNightBattle()
+        public void OpeningTorpedoInCombinedBattle()
         {
             var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "damecon_006");
-            PAssert.That(() => sniffer.BadlyDamagedShips.Length == 0);
+            SniffLogFile(sniffer, "combined_battle_001");
+            PAssert.That(() => !sniffer.IsBattleResultStatusError);
         }
 
         /// <summary>
-        /// 轟沈した艦娘に大破警告を出さない
+        /// 連合艦隊が閉幕雷撃で被弾する
         /// </summary>
         [TestMethod]
-        public void NotWarnToSunkShip()
+        public void ClosingTorpedoInCombinedBattle()
         {
             var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "sunk_001");
-            PAssert.That(() => sniffer.BadlyDamagedShips.SequenceEqual(new [] {"磯波"}));
+            SniffLogFile(sniffer, "combined_battle_002");
+            PAssert.That(() => !sniffer.IsBattleResultStatusError);
         }
 
         /// <summary>
-        /// 連合艦隊(水上打撃部隊)で二回目の砲撃戦がない場合を正しく処理する
+        /// 第一が6隻未満の連合艦隊で戦闘する
         /// </summary>
         [TestMethod]
-        // ReSharper disable once InconsistentNaming
-        public void CombinedFleetSurfaceWithout2ndShelling()
+        public void SmallCombinedFleetBattle()
         {
             var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "combined_surface_003");
-            PAssert.That(() => sniffer.Battle.ResultRank == BattleResultRank.P);
+            SniffLogFile(sniffer, "combined_battle_003");
+            PAssert.That(() => !sniffer.IsBattleResultStatusError);
         }
 
         /// <summary>
-        /// 連合艦隊(水上打撃部隊)で開幕雷撃で戦闘が終わる場合を正しく処理する
+        /// 護衛退避する
         /// </summary>
         [TestMethod]
-        // ReSharper disable once InconsistentNaming
-        public void CombinedFleetSurfaceWithoutAnyShelling()
+        public void EscapeWithEscort()
         {
             var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "combined_surface_004");
-            PAssert.That(() => sniffer.Battle.ResultRank == BattleResultRank.P);
+            SniffLogFile(sniffer, "escape_001");
+            PAssert.That(() => sniffer.GetShipStatuses(0)[5].Escaped &&
+                               sniffer.GetShipStatuses(1)[2].Escaped);
         }
 
         /// <summary>
-        /// ship2に代わるship_deckを処理する
+        /// 開幕夜戦に支援が来る
         /// </summary>
         [TestMethod]
-        public void ShipDeck()
+        public void SpMidnightSupportAttack()
         {
             var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "ship_deck_001");
-            PAssert.That(() => sniffer.GetShipStatuses(0)[0].Fuel == 36);
+            SniffLogFile(sniffer, "sp_midnight_002");
+            PAssert.That(() => !sniffer.Battle.DisplayedResultRank.IsError);
         }
 
         /// <summary>
-        /// 夜戦かどうかを選択する画面でリロードしても結果を次の戦闘に持ち越さない
+        /// 払暁戦を行う
         /// </summary>
         [TestMethod]
-        public void ReloadBeforeBattleResult()
+        public void NightToDay()
         {
             var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "reload_001");
-            PAssert.That(() => sniffer.GetShipStatuses(0)[0].NowHp == 41);
+            SniffLogFile(sniffer, "nighttoday_001");
+            PAssert.That(() => !sniffer.Battle.DisplayedResultRank.IsError && !sniffer.IsBattleResultStatusError);
         }
 
         /// <summary>
-        /// 航空戦のない演習を正しく処理する
+        /// 単艦退避する
         /// </summary>
         [TestMethod]
-        public void PracticeWithoutAirBattle()
+        public void EscapeWithoutEscort()
         {
             var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "practice_002");
-            PAssert.That(() => sniffer.Battle.AirControlLevel == -1);
+            SniffLogFile(sniffer, "escape_002");
+            PAssert.That(() => sniffer.GetShipStatuses(2)[1].Escaped);
+            PAssert.That(() => !sniffer.IsBattleResultStatusError);
         }
 
         /// <summary>
@@ -387,28 +229,6 @@ namespace KancolleSniffer.Test
         }
 
         /// <summary>
-        /// 先制対潜攻撃を正しく処理する
-        /// </summary>
-        [TestMethod]
-        public void OpeningTaisen()
-        {
-            var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "opening_taisen_001");
-            PAssert.That(() => sniffer.Battle.ResultRank == BattleResultRank.P);
-        }
-
-        /// <summary>
-        /// 敵の空スロットの値が-1ではなく0のときにエラーにならない
-        /// </summary>
-        [TestMethod]
-        public void ZeroValueEmptySlot()
-        {
-            var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "battle_006");
-            PAssert.That(() => sniffer.Battle.EnemyFighterPower == "0");
-        }
-
-        /// <summary>
         /// 熟練度込みの制空値を正しく計算する
         /// </summary>
         [TestMethod]
@@ -429,7 +249,7 @@ namespace KancolleSniffer.Test
         {
             var sniffer = new Sniffer();
             SniffLogFile(sniffer, "fighterpower_003");
-            PAssert.That(() => sniffer.GetFighterPower(0).SequenceEqual(new [] {135, 135}));
+            PAssert.That(() => sniffer.GetFighterPower(0).SequenceEqual(new[] {135, 135}));
         }
 
         /// <summary>
@@ -440,9 +260,9 @@ namespace KancolleSniffer.Test
         {
             var sniffer = new Sniffer();
             SniffLogFile(sniffer, "baseaircorps_001");
-            PAssert.That(() => sniffer.BaseAirCorps[0].AirCorps[0].FighterPower[1] == 301);
+            PAssert.That(() => sniffer.BaseAirCorps[0].AirCorps[0].FighterPower.AirCombat[1] == 301);
             sniffer.BaseAirCorps[0].AirCorps[0].Action = 2; // 防空
-            PAssert.That(()=>sniffer.BaseAirCorps[0].AirCorps[0].FighterPower[1] == 320);
+            PAssert.That(() => sniffer.BaseAirCorps[0].AirCorps[0].FighterPower.Interception[1] == 320);
         }
 
         /// <summary>
@@ -453,7 +273,18 @@ namespace KancolleSniffer.Test
         {
             var sniffer = new Sniffer();
             SniffLogFile(sniffer, "baseaircorps_002");
-            PAssert.That(() => sniffer.BaseAirCorps[0].AirCorps[2].FighterPower[0] == 353);
+            PAssert.That(() => sniffer.BaseAirCorps[0].AirCorps[2].FighterPower.Interception[0] == 353);
+        }
+
+        /// <summary>
+        /// 陸上攻撃機の熟練度を制空値に反映させる
+        /// </summary>
+        [TestMethod]
+        public void FighterPowerOfLandBasedAttackAircraft()
+        {
+            var sniffer = new Sniffer();
+            SniffLogFile(sniffer, "baseaircorps_003");
+            PAssert.That(() => sniffer.BaseAirCorps[1].AirCorps[0].FighterPower.AirCombat[0] == 121);
         }
 
         /// <summary>
@@ -483,30 +314,6 @@ namespace KancolleSniffer.Test
         }
 
         /// <summary>
-        /// 空襲戦を正しく処理する
-        /// </summary>
-        [TestMethod]
-        public void LdAirBattle()
-        {
-            var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "ld_airbattle_001");
-            AssertEqualBattleResult(sniffer, new[] {31, 59, 62, 14, 36, 47});
-            PAssert.That(() => sniffer.Battle.ResultRank == BattleResultRank.A);
-        }
-
-        /// <summary>
-        /// 連合艦隊の空襲戦を正しく処理する
-        /// </summary>
-        [TestMethod]
-        public void CombinedLdAirBattle()
-        {
-            var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "ld_airbattle_002");
-            AssertEauqlCombinedResult(sniffer, new[] {31, 77, 77, 37, 41, 39}, new[] {45, 59, 64, 35, 36, 10});
-            PAssert.That(() => sniffer.Battle.ResultRank == BattleResultRank.A);
-        }
-
-        /// <summary>
         /// TPを正しく計算する
         /// </summary>
         [TestMethod]
@@ -522,61 +329,10 @@ namespace KancolleSniffer.Test
             var sniffer2 = new Sniffer();
             SniffLogFile(sniffer2, "transportpoint_002");
             PAssert.That(() => (int)sniffer2.GetShipStatuses(0).Sum(s => s.TransportPoint) == 19, "鬼怒改二+特大発+おにぎり");
-        }
 
-        /// <summary>
-        /// 敵の連合艦隊に対応する
-        /// </summary>
-        [TestMethod]
-        public void EnemyCombinedBattle()
-        {
-            var sniffer1 = new Sniffer();
-            SniffLogFile(sniffer1, "ec_battle_001");
-            PAssert.That(() => sniffer1.Battle.ResultRank == BattleResultRank.S, "昼戦のみ");
-
-            var sniffer2 = new Sniffer();
-            SniffLogFile(sniffer2, "ec_battle_002");
-            PAssert.That(() => sniffer2.Battle.ResultRank == BattleResultRank.S, "夜戦込み");
-
-            var sniffer3 = new Sniffer();
-            SniffLogFile(sniffer3, "ec_battle_003");
-            PAssert.That(() => sniffer3.Battle.ResultRank == BattleResultRank.A, "護衛を撃ちもらす");
-        }
-
-
-        /// <summary>
-        /// 双方連合艦隊の戦闘に対応する
-        /// </summary>
-        [TestMethod]
-        public void BothCombinedBattle()
-        {
-            var sniffer1 = new Sniffer();
-            SniffLogFile(sniffer1, "both_combined_water_001");
-            PAssert.That(() => sniffer1.Battle.ResultRank == BattleResultRank.A);
-
-            var sniffer2 = new Sniffer();
-            SniffLogFile(sniffer2, "both_combined_001");
-            PAssert.That(() => sniffer2.Battle.ResultRank == BattleResultRank.S);
-
-            // 護衛艦隊に雷撃を受ける場合
             var sniffer3 = new Sniffer();
-            SniffLogFile(sniffer3, "both_combined_002");
-            PAssert.That(() => sniffer2.Battle.ResultRank == BattleResultRank.S);
-            PAssert.That(
-                () => sniffer3.GetShipStatuses(0).Select(s => s.NowHp).SequenceEqual(new[] {89, 86, 87, 78, 87, 57}));
-            PAssert.That(
-                () => sniffer3.GetShipStatuses(1).Select(s => s.NowHp).SequenceEqual(new[] {46, 37, 14, 59, 49, 63}));
-        }
-
-        /// <summary>
-        /// 噴式強襲に対応する
-        /// </summary>
-        [TestMethod]
-        public void Injection()
-        {
-            var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "injection_001");
-            PAssert.That(() => sniffer.Battle.ResultRank == BattleResultRank.P);
+            SniffLogFile(sniffer3, "transportpoint_003");
+            PAssert.That(() => (int)sniffer3.GetShipStatuses(0).Sum(s => s.TransportPoint) == 13, "駆逐艦+士魂部隊");
         }
 
         /// <summary>
@@ -596,57 +352,6 @@ namespace KancolleSniffer.Test
         }
 
         /// <summary>
-        /// 航空戦の結果を処理する
-        /// </summary>
-        [TestMethod]
-        public void AirBattleResult()
-        {
-            var sniffer1 = new Sniffer();
-            SniffLogFile(sniffer1, "battle_001");
-            PAssert.That(() => sniffer1.Battle.AirBattleResults.Count == 0);
-
-            var sniffer2 = new Sniffer();
-            SniffLogFile(sniffer2, "ec_battle_001");
-            PAssert.That(() => sniffer2.Battle.AirBattleResults.Count == 4);
-
-            var sniffer3 = new Sniffer();
-            SniffLogFile(sniffer3, "battle_007");
-            PAssert.That(() => sniffer3.Battle.AirBattleResults.Count == 1, "stage2がない場合");
-        }
-
-        /// <summary>
-        /// 2-5をクリアしたときの特別戦果を反映する
-        /// </summary>
-        [TestMethod]
-        public void ExMapBattleResult()
-        {
-            var sniffer0 = new Sniffer();
-            sniffer0.ExMap.ClearClearStatus();
-            SniffLogFile(sniffer0, "eo_001");
-            PAssert.That(() => sniffer0.ExMap.Achievement == 100, "ほかのマップの情報なし");
-            var sniffer1 = new Sniffer();
-            SniffLogFile(sniffer1, "eo_001");
-            // すでに3-5をクリアしているので合計で250
-            PAssert.That(() => sniffer1.ExMap.Achievement == 250, "ほかのマップの情報あり");
-        }
-
-        /// <summary>
-        /// 1-6をクリアしたときの特別戦果を反映する
-        /// </summary>
-        [TestMethod]
-        public void ExMapMapNext()
-        {
-            var sniffer0 = new Sniffer();
-            sniffer0.ExMap.ClearClearStatus();
-            SniffLogFile(sniffer0, "eo_002");
-            PAssert.That(() => sniffer0.ExMap.Achievement == 75, "ほかのマップの情報なし");
-            var sniffer1 = new Sniffer();
-            SniffLogFile(sniffer1, "eo_002");
-            // 5-5以外クリアしているので合計で400
-            PAssert.That(() => sniffer1.ExMap.Achievement == 400, "ほかのマップの情報あり");
-        }
-
-        /// <summary>
         /// 編成で空き番号を使ったローテートを正しく反映する
         /// </summary>
         [TestMethod]
@@ -742,6 +447,17 @@ namespace KancolleSniffer.Test
         }
 
         /// <summary>
+        /// 近代化改修が二重に行われた場合に対応する
+        /// </summary>
+        [TestMethod]
+        public void DuplicatedPowerup()
+        {
+            var sniffer = new Sniffer();
+            SniffLogFile(sniffer, "powerup_002");
+            PAssert.That(() => sniffer.Item.NowShips == 218);
+        }
+
+        /// <summary>
         /// 改修による資材の減少をすぐに反映する
         /// </summary>
         [TestMethod]
@@ -768,17 +484,6 @@ namespace KancolleSniffer.Test
         }
 
         /// <summary>
-        /// 解体された艦の装備数を全体の装備数から引く
-        /// </summary>
-        [TestMethod]
-        public void CountItemsOnDeletedShip()
-        {
-            var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "destroyship_001");
-            PAssert.That(() => sniffer.Item.NowEquips == 879, "ドロップしたばかりの艦娘を解体する場合");
-        }
-
-        /// <summary>
         /// 装備数の超過を警告する
         /// </summary>
         [TestMethod]
@@ -793,17 +498,6 @@ namespace KancolleSniffer.Test
         }
 
         /// <summary>
-        /// ドロップ艦のいる出撃から戻ったときに、slot_itemを受信する前にItemListを取得しても例外を出さない
-        /// </summary>
-        [TestMethod]
-        public void GetItemListBeforeReceivingSlotItem()
-        {
-            var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "dropship_001");
-            PAssert.That(() => sniffer.ItemList[0].Holder.Id == 250);
-        }
-
-        /// <summary>
         /// 装備の所持者を設定する
         /// </summary>
         [TestMethod]
@@ -905,7 +599,7 @@ namespace KancolleSniffer.Test
                 new[] {0, 0, 0, 0, 0, 0, 0, 0},
                 new[] {288194, 282623, 299496, 295958, 3000, 2968, 2997, 7},
                 new[] {288185, 282623, 299496, 295943, 3000, 2968, 2997, 7},
-                new[] {288161, 282623, 299496, 295903, 3000, 2968, 2997, 7},
+                new[] {288161, 282623, 299496, 295903, 3000, 2968, 2997, 7}
             };
             PAssert.That(() => SequenceOfSequenceEqual(expected3, result3), "航空機の補充");
 
@@ -929,7 +623,7 @@ namespace KancolleSniffer.Test
                 new[] {0, 0, 0, 0, 0, 0, 0, 0},
                 new[] {261012, 252252, 298492, 279622, 3000, 2842, 3000, 22},
                 new[] {261012, 252252, 298492, 279538, 3000, 2842, 3000, 22},
-                new[] {261012, 252252, 298492, 279454, 3000, 2842, 3000, 22},
+                new[] {261012, 252252, 298492, 279454, 3000, 2842, 3000, 22}
             };
             PAssert.That(() => SequenceOfSequenceEqual(expected4, result4), "航空機の配備");
         }
@@ -944,45 +638,27 @@ namespace KancolleSniffer.Test
         }
 
         /// <summary>
-        /// 海域ゲージ情報を作成する
+        /// 修復時間が1分以内の艦娘が入渠する
         /// </summary>
         [TestMethod]
-        public void MapInfo()
+        public void NyukyoLessThanOrEqualTo1Min()
         {
             var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "mapinfo_001");
-            PAssert.That(() => sniffer.MiscText ==
-                               "[海域ゲージ]\r\n" +
-                               "1-6 : 撃破 3/7\r\n5-5 : 撃破 0/5\r\n6-3 : 撃破 0/4\r\n" +
-                               "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",
-                "最初の海域ゲージ情報");
-            SniffLogFile(sniffer, "mapinfo_002");
-            PAssert.That(() => sniffer.MiscText ==
-                               "[海域ゲージ情報]\r\n 海域選択画面に進むと表示します。\r\n[演習情報]\r\n 演習相手を選ぶと表示します。",
-                "戦闘から戻ったら案内を表示");
-            SniffLogFile(sniffer, "mapinfo_003");
-            PAssert.That(() => sniffer.MiscText ==
-                               "[海域ゲージ]\r\n" +
-                               "1-6 : 撃破 4/7\r\n5-5 : 撃破 0/5\r\n6-3 : 撃破 0/4\r\n" +
-                               "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",
-                "更新された海域ゲージ情報");
+            SniffLogFile(sniffer, "nyukyo_001");
+            PAssert.That(() => sniffer.RepairList.Length == 1);
         }
 
         /// <summary>
-        /// 演習相手の情報を作成する
+        /// 一括解体する(装備保管なしとあり)
         /// </summary>
         [TestMethod]
-        public void PractiveEnemyInfo()
+        public void DestroyShip()
         {
             var sniffer = new Sniffer();
-            SniffLogFile(sniffer, "practice_enemyinfo_001");
-            PAssert.That(() => sniffer.MiscText ==
-                               "[演習情報]\r\n敵艦隊名 : 大銀河地球連邦　第7艦隊\r\n獲得経験値 : 570\r\nS勝利 : 684",
-                "演習相手の情報");
-            SniffLogFile(sniffer, "practice_enemyinfo_002");
-            PAssert.That(() => sniffer.MiscText ==
-                               "[海域ゲージ情報]\r\n 海域選択画面に進むと表示します。\r\n[演習情報]\r\n 演習相手を選ぶと表示します。",
-                "演習から戻ったら案内を表示");
+            SniffLogFile(sniffer, "destroyship_001");
+            PAssert.That(() => sniffer.Item.NowShips == 250);
+            PAssert.That(() => sniffer.Item.NowEquips == 1118);
+            PAssert.That(() => sniffer.Material.Current.Take(4).SequenceEqual(new[] {285615, 286250, 291010, 284744}));
         }
     }
 }
\ No newline at end of file