OSDN Git Service

索敵に航空偵察スコアを表示する
[kancollesniffer/KancolleSniffer.git] / KancolleSniffer.Test / SnifferTest.cs
index 76d8010..ec3c5ef 100644 (file)
@@ -17,8 +17,11 @@ using System.Collections.Generic;
 using System.IO;\r
 using System.IO.Compression;\r
 using System.Linq;\r
+using DynaJson;\r
 using ExpressionToCodeLib;\r
+using KancolleSniffer.Model;\r
 using Microsoft.VisualStudio.TestTools.UnitTesting;\r
+using static System.Math;\r
 \r
 namespace KancolleSniffer.Test\r
 {\r
@@ -28,7 +31,7 @@ namespace KancolleSniffer.Test
     public class SnifferTest\r
     {\r
         [ClassInitialize]\r
-        public static void Intialize(TestContext context)\r
+        public static void Initialize(TestContext context)\r
         {\r
             ExpressionToCodeConfiguration.GlobalAssertionConfiguration = ExpressionToCodeConfiguration\r
                 .GlobalAssertionConfiguration.WithPrintedListLengthLimit(200).WithMaximumValueLength(1000);\r
@@ -70,7 +73,7 @@ namespace KancolleSniffer.Test
                         } while (!line.StartsWith(s));\r
                         triple.Add(line.Substring(s.Length));\r
                     }\r
-                    var json = JsonParser.Parse(triple[2]);\r
+                    var json = JsonObject.Parse(triple[2]);\r
                     sniffer.Sniff(triple[0], triple[1], json);\r
                     action?.Invoke(sniffer);\r
                 }\r
@@ -78,194 +81,25 @@ namespace KancolleSniffer.Test
         }\r
 \r
         /// <summary>\r
-        /// 4-2-1で開幕対潜雷撃を含む戦闘を行う\r
+        /// 一つもアイテムがない場合のrequire_info\r
         /// </summary>\r
         [TestMethod]\r
-        public void NormalBattleWithVriousTypesOfAttack()\r
+        public void NoUseItemRequireInfo()\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
-        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
+            var sniffer = new Sniffer(true);\r
+            SniffLogFile(sniffer, "require_info_001");\r
+            Assert.IsTrue(true);\r
         }\r
 \r
         /// <summary>\r
-        /// 連合艦隊に大破艦がいる状態で第3艦隊が出撃したときに警告しない\r
+        /// 一つもアイテムがない場合のuseitem\r
         /// </summary>\r
         [TestMethod]\r
-        public void NotWarnDamagedShipInCombinedFleetOnMapStart()\r
+        public void NoUseItem()\r
         {\r
-            var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "mapstart_002");\r
-            PAssert.That(() => !sniffer.BadlyDamagedShips.Any());\r
+            var sniffer = new Sniffer(true);\r
+            SniffLogFile(sniffer, "useitem_001");\r
+            Assert.IsTrue(true);\r
         }\r
 \r
         /// <summary>\r
@@ -277,9 +111,9 @@ namespace KancolleSniffer.Test
             var sniffer = new Sniffer();\r
             SniffLogFile(sniffer, "fighterpower_001");\r
             var fleet = sniffer.Fleets[0];\r
-            PAssert.That(() => fleet.FighterPower.SequenceEqual(new[] {156, 159}));\r
+            PAssert.That(() => fleet.FighterPower == new Range(156, 159));\r
             SniffLogFile(sniffer, "fighterpower_002");\r
-            PAssert.That(() => fleet.FighterPower.SequenceEqual(new[] {140, 143}), "全滅したスロットがある");\r
+            PAssert.That(() => fleet.FighterPower == new Range(140, 143), "全滅したスロットがある");\r
         }\r
 \r
         /// <summary>\r
@@ -290,20 +124,20 @@ namespace KancolleSniffer.Test
         {\r
             var sniffer = new Sniffer();\r
             SniffLogFile(sniffer, "fighterpower_003");\r
-            PAssert.That(() => sniffer.Fleets[0].FighterPower.SequenceEqual(new[] {135, 135}));\r
+            PAssert.That(() => sniffer.Fleets[0].FighterPower == new Range(135, 135));\r
         }\r
 \r
         /// <summary>\r
         /// 基地航空隊の制空値を正しく計算する\r
         /// </summary>\r
         [TestMethod]\r
-        public void FighterPowerOfBaseAirCorps()\r
+        public void FighterPowerOfAirBase()\r
         {\r
             var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "baseaircorps_001");\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.Interception[1] == 320);\r
+            SniffLogFile(sniffer, "airbase_001");\r
+            PAssert.That(() => sniffer.AirBase[0].AirCorps[0].CalcFighterPower().AirCombat.Max == 301);\r
+            sniffer.AirBase[0].AirCorps[0].Action = 2; // 防空\r
+            PAssert.That(() => sniffer.AirBase[0].AirCorps[0].CalcFighterPower().Interception.Max == 320);\r
         }\r
 \r
         /// <summary>\r
@@ -313,8 +147,8 @@ namespace KancolleSniffer.Test
         public void FighterPowerWithReconBonus()\r
         {\r
             var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "baseaircorps_002");\r
-            PAssert.That(() => sniffer.BaseAirCorps[0].AirCorps[2].FighterPower.Interception[0] == 353);\r
+            SniffLogFile(sniffer, "airbase_002");\r
+            PAssert.That(() => sniffer.AirBase[0].AirCorps[2].CalcFighterPower().Interception.Min == 353);\r
         }\r
 \r
         /// <summary>\r
@@ -324,19 +158,19 @@ namespace KancolleSniffer.Test
         public void FighterPowerOfLandBasedAttackAircraft()\r
         {\r
             var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "baseaircorps_003");\r
-            PAssert.That(() => sniffer.BaseAirCorps[1].AirCorps[0].FighterPower.AirCombat[0] == 121);\r
+            SniffLogFile(sniffer, "airbase_003");\r
+            PAssert.That(() => sniffer.AirBase[1].AirCorps[0].CalcFighterPower().AirCombat.Min == 121);\r
         }\r
 \r
         /// <summary>\r
         /// 基地航空隊の出撃コストを計算する\r
         /// </summary>\r
         [TestMethod]\r
-        public void CostForSortieOfBaseAirCorps()\r
+        public void CostForSortieOfAirBase()\r
         {\r
             var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "baseaircorps_003");\r
-            PAssert.That(() => sniffer.BaseAirCorps[1].AirCorps[0].CostForSortie.SequenceEqual(new[] {99, 47}));\r
+            SniffLogFile(sniffer, "airbase_003");\r
+            PAssert.That(() => sniffer.AirBase[1].AirCorps[0].CostForSortie.SequenceEqual(new[] {99, 47}));\r
         }\r
 \r
         /// <summary>\r
@@ -346,8 +180,28 @@ namespace KancolleSniffer.Test
         public void FighterPowerOfLandBAseFighter()\r
         {\r
             var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "baseaircorps_004");\r
-            PAssert.That(() => sniffer.BaseAirCorps[1].AirCorps[0].FighterPower.AirCombat[0] == 328);\r
+            SniffLogFile(sniffer, "airbase_004");\r
+            PAssert.That(() => sniffer.AirBase[1].AirCorps[0].CalcFighterPower().AirCombat.Min == 328);\r
+        }\r
+\r
+        /// <summary>\r
+        /// 陸上偵察機の効果を反映した制空値を計算する\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void FighterPowerWithLandBaseReconBonus()\r
+        {\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "airbase_005");\r
+\r
+            // 二式陸上偵察機(熟練)\r
+            var fp1 = sniffer.AirBase[0].AirCorps[0].CalcFighterPower();\r
+            PAssert.That(() => fp1.AirCombat.Min == 274);\r
+            PAssert.That(() => fp1.Interception.Min == 302);\r
+\r
+            // 二式陸上偵察機\r
+            var fp3 = sniffer.AirBase[0].AirCorps[2].CalcFighterPower();\r
+            PAssert.That(() => fp3.AirCombat.Min == 206);\r
+            PAssert.That(() => fp3.Interception.Min == 310);\r
         }\r
 \r
         /// <summary>\r
@@ -359,11 +213,23 @@ namespace KancolleSniffer.Test
             var sniffer = new Sniffer();\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
+            PAssert.That(() => Abs(fleet.GetLineOfSights(1) - 39.45) < 0.01);\r
+            PAssert.That(() => Abs(fleet.GetLineOfSights(3) - 115.19) < 0.01);\r
+            PAssert.That(() => 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
+            PAssert.That(() => Abs(fleet.GetLineOfSights(1) - -25.10) < 0.01, "艦隊に空きがある");\r
+        }\r
+\r
+        /// <summary>\r
+        /// 補強増設スロットに見張り員を装備した場合の判定式(33)\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void LineOfSightWithExSlot()\r
+        {\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "lineofsight_003");\r
+            var fleet = sniffer.Fleets[0];\r
+            PAssert.That(() => Abs(fleet.GetLineOfSights(1) - -28.8) < 0.01);\r
         }\r
 \r
         /// <summary>\r
@@ -374,7 +240,7 @@ namespace KancolleSniffer.Test
         {\r
             var sniffer = new Sniffer();\r
             SniffLogFile(sniffer, "contact_001");\r
-            PAssert.That(() => Math.Abs(sniffer.Fleets[0].ContactTriggerRate - 1.8182) < 0.0001);\r
+            PAssert.That(() => Abs(sniffer.Fleets[0].ContactTriggerRate - 1.8182) < 0.0001);\r
         }\r
 \r
         /// <summary>\r
@@ -418,17 +284,19 @@ namespace KancolleSniffer.Test
         {\r
             var sniffer = new Sniffer();\r
             SniffLogFile(sniffer, "nightbattlepower_001");\r
-            var ships = sniffer.Fleets[0].Ships;\r
+            var ships = sniffer.Fleets[0].ActualShips;\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
+            ships[0].FreeSlot(3);\r
+            ships[1].FreeSlot(2);\r
+            ships[3].FreeSlot(2);\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
+            ships[0].FreeSlot(0);\r
             PAssert.That(() => (int)ships[0].NightBattlePower == 0);\r
         }\r
 \r
@@ -462,6 +330,50 @@ namespace KancolleSniffer.Test
         }\r
 \r
         /// <summary>\r
+        /// 対潜攻撃力を計算する\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void AntiSubmarine()\r
+        {\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "antisubmarine_001");\r
+            PAssert.That(() => Abs(sniffer.Fleets[0].Ships[0].EffectiveAntiSubmarine - 92.16) < 0.01);\r
+            PAssert.That(() => Abs(sniffer.Fleets[0].Ships[1].EffectiveAntiSubmarine - 84.49) < 0.01);\r
+            PAssert.That(() => Abs(sniffer.Fleets[0].Ships[2].EffectiveAntiSubmarine - 57.84) < 0.01);\r
+            PAssert.That(() => Abs(sniffer.Fleets[0].Ships[3].EffectiveAntiSubmarine - 61.37) < 0.01);\r
+        }\r
+\r
+        /// <summary>\r
+        /// 夜戦発動率を計算する\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void NightContactTriggerRate()\r
+        {\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "nightrecon_001");\r
+            PAssert.That(() => Abs(sniffer.Fleets[0].NightContactTriggerRate - 84.64) < 0.01);\r
+            var ship = sniffer.Fleets[0].Ships[0];\r
+            var empty = Enumerable.Repeat(new ItemStatus(), 5).ToArray();\r
+            var orig = ship.Slot;\r
+            ship.Slot = empty;\r
+            PAssert.That(() => Abs(sniffer.Fleets[0].NightContactTriggerRate - 52) < 0.01);\r
+            ship.Slot = orig;\r
+            sniffer.Fleets[0].Ships[1].Slot = empty;\r
+            PAssert.That(() => Abs(sniffer.Fleets[0].NightContactTriggerRate - 68) < 0.01);\r
+        }\r
+\r
+        /// <summary>\r
+        /// 航空偵察スコアを計算する\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void AirReconScore()\r
+        {\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "airrecon_score_001");\r
+            PAssert.That(() => Abs(sniffer.Fleets[0].AirReconScore - 26.88) < 0.01);\r
+        }\r
+\r
+        /// <summary>\r
         /// 編成で空き番号を使ったローテートを正しく反映する\r
         /// </summary>\r
         [TestMethod]\r
@@ -512,6 +424,18 @@ namespace KancolleSniffer.Test
         }\r
 \r
         /// <summary>\r
+        /// 随伴艦一括解除を実行する\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void WithdrawAccompanyingShipsAtOnce()\r
+        {\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "deck_006");\r
+            var result = sniffer.Fleets[0].Deck;\r
+            PAssert.That(() => new[] {135, -1, -1, -1, -1, -1}.SequenceEqual(result));\r
+        }\r
+\r
+        /// <summary>\r
         /// 編成展開を正しく反映する\r
         /// </summary>\r
         [TestMethod]\r
@@ -534,37 +458,72 @@ namespace KancolleSniffer.Test
         }\r
 \r
         /// <summary>\r
-        /// 装備の交換を正しく反映する\r
+        /// 装備交換のAPIの仕様変更に対応する\r
         /// </summary>\r
         [TestMethod]\r
-        public void SlotExchange()\r
+        public void SlotExchangeVersion2()\r
         {\r
             var sniffer = new Sniffer();\r
-            SniffLogFile(sniffer, "slot_exchange_001");\r
+            SniffLogFile(sniffer, "slot_exchange_002");\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
+            PAssert.That(() => new[] {157798, 59001, 157804, -1, -1}.SequenceEqual(result));\r
         }\r
 \r
         /// <summary>\r
         /// 近代化改修の結果をすぐに反映する\r
         /// </summary>\r
         [TestMethod]\r
-        public void PowerupResult()\r
+        public void PowerUpResult()\r
         {\r
             var sniffer = new Sniffer();\r
             SniffLogFile(sniffer, "powerup_001");\r
-            PAssert.That(() => Math.Abs(sniffer.Fleets[0].Ships[0].EffectiveFirepower - 30) < 0.0001);\r
+            PAssert.That(() => Abs(sniffer.Fleets[0].Ships[0].EffectiveFirepower - 30) < 0.0001);\r
+        }\r
+\r
+        /// <summary>\r
+        /// 近代化改修による艦娘数と装備数の変化\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void PowerUpCount()\r
+        {\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "powerup_001");\r
+            PAssert.That(() => sniffer.ShipCounter.Now == 204);\r
+            PAssert.That(() => sniffer.ItemCounter.Now == 932);\r
         }\r
 \r
         /// <summary>\r
         /// 近代化改修が二重に行われた場合に対応する\r
         /// </summary>\r
         [TestMethod]\r
-        public void DuplicatedPowerup()\r
+        public void DuplicatedPowerUp()\r
         {\r
             var sniffer = new Sniffer();\r
             SniffLogFile(sniffer, "powerup_002");\r
-            PAssert.That(() => sniffer.Item.NowShips == 218);\r
+            PAssert.That(() => sniffer.ShipCounter.Now == 218);\r
+        }\r
+\r
+        /// <summary>\r
+        /// 装備解除後の近代化改修\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void PowerUpDetachItem()\r
+        {\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "powerup_003");\r
+            PAssert.That(() => sniffer.ShipCounter.Now == 317);\r
+            PAssert.That(() => sniffer.ItemCounter.Now == 1390);\r
+        }\r
+\r
+        /// <summary>\r
+        /// ship2を待たずにケッコンの結果を反映する\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void MarriageResult()\r
+        {\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "marriage_001");\r
+            PAssert.That(() => sniffer.Fleets[0].Ships[2].Level == 100);\r
         }\r
 \r
         /// <summary>\r
@@ -585,12 +544,16 @@ namespace KancolleSniffer.Test
         [TestMethod]\r
         public void CountItem()\r
         {\r
-            var sniffer1 = new Sniffer();\r
-            SniffLogFile(sniffer1, "createitem_001");\r
-            PAssert.That(() => sniffer1.Item.NowEquips == 900);\r
-            var sniffer2 = new Sniffer();\r
-            SniffLogFile(sniffer2, "createship_001");\r
-            PAssert.That(() => sniffer2.Item.NowEquips == 904);\r
+            var createItems = new Sniffer();\r
+            SniffLogFile(createItems, "createitem_001");\r
+            Assert.AreEqual(900, createItems.ItemCounter.Now);\r
+            PAssert.That(() => createItems.ItemCounter.Now == 900);\r
+            var createShips = new Sniffer();\r
+            SniffLogFile(createShips, "createship_001");\r
+            Assert.AreEqual(904, createShips.ItemCounter.Now);\r
+            var multiItems = new Sniffer();\r
+            SniffLogFile(multiItems, "createitem_002");\r
+            Assert.AreEqual(1307, multiItems.ItemCounter.Now);\r
         }\r
 \r
         /// <summary>\r
@@ -599,12 +562,15 @@ namespace KancolleSniffer.Test
         [TestMethod]\r
         public void WarnItemCount()\r
         {\r
+            Action<int> func = i => { };\r
             var sniffer1 = new Sniffer();\r
             SniffLogFile(sniffer1, "item_count_001");\r
-            PAssert.That(() => sniffer1.Item.AlarmEquips, "出撃から母港に戻ったとき");\r
+            func.Invoke(sniffer1.ItemCounter.Now); // Nowを読まないとAlarmが立たない\r
+            PAssert.That(() => sniffer1.ItemCounter.Alarm, "出撃から母港に戻ったとき");\r
             var sniffer2 = new Sniffer();\r
             SniffLogFile(sniffer2, "item_count_002");\r
-            PAssert.That(() => sniffer2.Item.AlarmEquips, "ログインしたとき");\r
+            func.Invoke(sniffer2.ItemCounter.Now);\r
+            PAssert.That(() => sniffer2.ItemCounter.Alarm, "ログインしたとき");\r
         }\r
 \r
         /// <summary>\r
@@ -766,8 +732,8 @@ namespace KancolleSniffer.Test
         {\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.ShipCounter.Now == 250);\r
+            PAssert.That(() => sniffer.ItemCounter.Now == 1118);\r
             PAssert.That(() => sniffer.Material.Current.Take(4).SequenceEqual(new[] {285615, 286250, 291010, 284744}));\r
         }\r
 \r
@@ -779,8 +745,7 @@ namespace KancolleSniffer.Test
         {\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
+            PAssert.That(() => new[]{5, 5, 0, 0}.SequenceEqual(sniffer.Fleets.Select(f => f.ChargeStatus.Fuel)));\r
         }\r
 \r
         /// <summary>\r
@@ -791,7 +756,7 @@ namespace KancolleSniffer.Test
         {\r
             var sniffer = new Sniffer();\r
             SniffLogFile(sniffer, "ship2_001");\r
-            PAssert.That(() => sniffer.Item.NowShips == 243);\r
+            PAssert.That(() => sniffer.ShipCounter.Now == 243);\r
         }\r
 \r
         /// <summary>\r
@@ -858,10 +823,76 @@ namespace KancolleSniffer.Test
         }\r
 \r
         /// <summary>\r
+        /// 海域ゲージの情報を生成する\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void AreaGauge()\r
+        {\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "mapgauge_001");\r
+            PAssert.That(() =>\r
+                sniffer.MiscText ==\r
+                "[海域ゲージ]\r\n" +\r
+                "1-6 : 残り 5/7\r\n" +\r
+                "2-5 : 残り 4/4\r\n" +\r
+                "3-5 : 残り 4/4\r\n" +\r
+                "4-4 : 残り 4/4\r\n");\r
+        }\r
+\r
+        /// <summary>\r
+        /// 7-2の2本目の海域ゲージを正しく表示する\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void SecondAreaGauge()\r
+        {\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "mapgauge_002");\r
+            PAssert.That(() =>\r
+                sniffer.MiscText ==\r
+                "[海域ゲージ]\r\n" +\r
+                "1-6 : 残り 5/7\r\n" +\r
+                "2-5 : 残り 2/4\r\n" +\r
+                "5-5 : 残り 5/5\r\n" +\r
+                "6-5 : 残り 6/6\r\n" +\r
+                "7-2 : 残り 1/4\r\n");\r
+        }\r
+\r
+        /// <summary>\r
+        /// 2019冬イベからクリア済みマップのゲージ情報がない\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void ClearedExMapGage()\r
+        {\r
+            var miscTextInfo = new MiscTextInfo(null, null);\r
+            using (var stream = OpenLogFile("mapgauge_003"))\r
+            {\r
+                miscTextInfo.InspectMapInfo(JsonObject.Parse(stream.ReadToEnd()));\r
+            }\r
+            PAssert.That(() =>\r
+                miscTextInfo.Text ==\r
+                "[海域ゲージ]\r\n" +\r
+                "1-6 : 残り 5/7\r\n" +\r
+                "5-5 : 残り 5/5\r\n" +\r
+                "7-2 : 残り 1/4\r\n" +\r
+                "43-2 : HP 1050/1400\r\n");\r
+        }\r
+\r
+        /// <summary>\r
+        /// 演習の獲得経験値を計算する\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void PracticeExpPoint()\r
+        {\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "practice_004");\r
+            PAssert.That(() => sniffer.MiscText == "[演習情報]\r\n敵艦隊名 : 第一艦隊\r\n獲得経験値 : 878\r\nS勝利 : 1053");\r
+        }\r
+\r
+        /// <summary>\r
         /// 新規のドロップ艦の初期装備数を登録する\r
         /// </summary>\r
         [TestMethod]\r
-        public void RecordNumEqipsOfNewDropShip()\r
+        public void RecordNumEquipsOfNewDropShip()\r
         {\r
             var sniffer = new Sniffer();\r
             SniffLogFile(sniffer, "dropship_001");\r
@@ -878,8 +909,23 @@ namespace KancolleSniffer.Test
             var sniffer = new Sniffer();\r
             sniffer.AdditionalData.RecordNumEquips(11, "", 1);\r
             SniffLogFile(sniffer, "dropship_002");\r
-            PAssert.That(() => sniffer.Item.NowShips == 250);\r
-            PAssert.That(() => sniffer.Item.NowEquips == 1159);\r
+            PAssert.That(() => sniffer.ShipCounter.Now == 250);\r
+            PAssert.That(() => sniffer.ItemCounter.Now == 1159);\r
+        }\r
+\r
+        /// <summary>\r
+        /// 艦娘数を数える\r
+        /// </summary>\r
+        [TestMethod]\r
+        public void CountShips()\r
+        {\r
+            var sniffer = new Sniffer();\r
+            SniffLogFile(sniffer, "ship_count_001");\r
+            PAssert.That(() => sniffer.ShipCounter.Now == 267 && sniffer.ShipCounter.Alarm, "ログイン");\r
+            SniffLogFile(sniffer, "ship_count_002");\r
+            PAssert.That(() => sniffer.ShipCounter.Now == 266 && sniffer.ShipCounter.Alarm, "建造");\r
+            SniffLogFile(sniffer, "ship_count_003");\r
+            PAssert.That(() => sniffer.ShipCounter.Now == 266 && sniffer.ShipCounter.Alarm, "ドロップ");\r
         }\r
     }\r
 }
\ No newline at end of file