X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=KancolleSniffer.Test%2FSnifferTest.cs;h=ec3c5ef5aa9a895f9f4632cd4d099be87ba9f963;hb=29f7c97d3b67bcd3fe7f4d6e779ebe1760828ea4;hp=76d8010898b7f798b887af6ce3839770ec4e94f5;hpb=18bd104466d3f7a81d5ae7aa66986bc37e3ca54b;p=kancollesniffer%2FKancolleSniffer.git

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