カウンターのテストでなるべくAssert.AreEqualを使う

diff --git a/KancolleSniffer.Test/QuestCounterTest.cs b/KancolleSniffer.Test/QuestCounterTest.cs
index 90c7b01..9776671 100644 (file)
--- a/KancolleSniffer.Test/QuestCounterTest.cs
+++ b/KancolleSniffer.Test/QuestCounterTest.cs
@@ -33,22 +33,22 @@ namespace KancolleSniffer.Test
                 Now = 3\r
             };\r
             count.AdjustCount(0);\r
-            Assert.IsTrue(count.Now == 3);\r
+            Assert.AreEqual(3, count.Now);\r
             count.AdjustCount(50);\r
-            Assert.IsTrue(count.Now == 4);\r
+            Assert.AreEqual(4, count.Now);\r
             count.AdjustCount(80);\r
-            Assert.IsTrue(count.Now == 6);\r
+            Assert.AreEqual(6, count.Now);\r
             count.AdjustCount(100);\r
-            Assert.IsTrue(count.Now == 7);\r
+            Assert.AreEqual(7, count.Now);\r
             count.Now = 14;\r
             count.AdjustCount(100);\r
-            Assert.IsTrue(count.Now == 14);\r
+            Assert.AreEqual(14, count.Now);\r
             count.AdjustCount(80);\r
-            Assert.IsTrue(count.Now == 6);\r
+            Assert.AreEqual(6, count.Now);\r
             count.AdjustCount(50);\r
-            Assert.IsTrue(count.Now == 5);\r
+            Assert.AreEqual(5, count.Now);\r
             count.AdjustCount(0);\r
-            Assert.IsTrue(count.Now == 3);\r
+            Assert.AreEqual(3, count.Now);\r
         }\r
 \r
         [TestMethod]\r
@@ -60,22 +60,22 @@ namespace KancolleSniffer.Test
                 Now = 3\r
             };\r
             count.AdjustCount(0);\r
-            Assert.IsTrue(count.Now == 2);\r
+            Assert.AreEqual(2, count.Now);\r
             count.AdjustCount(50);\r
-            Assert.IsTrue(count.Now == 3);\r
+            Assert.AreEqual(3, count.Now);\r
             count.AdjustCount(80);\r
-            Assert.IsTrue(count.Now == 6);\r
+            Assert.AreEqual(6, count.Now);\r
             count.AdjustCount(100);\r
-            Assert.IsTrue(count.Now == 7);\r
+            Assert.AreEqual(7, count.Now);\r
             count.Now = 14;\r
             count.AdjustCount(100);\r
-            Assert.IsTrue(count.Now == 14);\r
+            Assert.AreEqual(14, count.Now);\r
             count.AdjustCount(80);\r
-            Assert.IsTrue(count.Now == 6);\r
+            Assert.AreEqual(6, count.Now);\r
             count.AdjustCount(50);\r
-            Assert.IsTrue(count.Now == 5);\r
+            Assert.AreEqual(5, count.Now);\r
             count.AdjustCount(0);\r
-            Assert.IsTrue(count.Now == 2);\r
+            Assert.AreEqual(2, count.Now);\r
         }\r
 \r
         [TestMethod]\r
@@ -93,7 +93,7 @@ namespace KancolleSniffer.Test
                     count.Spec.Shift = shift;\r
                     count.Now = 1;\r
                     count.AdjustCount(80);\r
-                    Assert.IsTrue(count.Now == count.Spec.Max - 1);\r
+                    Assert.AreEqual(count.Spec.Max - 1, count.Now);\r
                 }\r
             }\r
         }\r
@@ -141,42 +141,42 @@ namespace KancolleSniffer.Test
                 }\r
             };\r
             new QuestInfo().LoadState(status);\r
-            Assert.IsTrue(status.QuestCountList[0].ToString() == "2/3");\r
-            Assert.IsTrue(status.QuestCountList[1].ToString() == "20/36 7/6 10/24 8/12");\r
+            Assert.AreEqual("2/3", status.QuestCountList[0].ToString());\r
+            Assert.AreEqual("20/36 7/6 10/24 8/12", status.QuestCountList[1].ToString());\r
             var z = status.QuestCountList[2];\r
-            Assert.IsTrue(z.ToString() == "4/4");\r
-            Assert.IsTrue(z.ToToolTip() == "2-4 6-1 6-3 6-4");\r
+            Assert.AreEqual("4/4", z.ToString());\r
+            Assert.AreEqual("2-4 6-1 6-3 6-4", z.ToToolTip());\r
             z.NowArray = new[] {0, 0, 0, 0};\r
-            Assert.IsTrue(z.ToToolTip() == "");\r
+            Assert.AreEqual("", z.ToToolTip());\r
             var q426 = status.QuestCountList[3];\r
-            Assert.IsTrue(q426.ToString() == "4/4");\r
-            Assert.IsTrue(q426.ToToolTip() == "警備任務 対潜警戒任務 海上護衛任務 強硬偵察任務");\r
+            Assert.AreEqual("4/4", q426.ToString());\r
+            Assert.AreEqual("警備任務 対潜警戒任務 海上護衛任務 強硬偵察任務", q426.ToToolTip());\r
             var q428 = status.QuestCountList[4];\r
-            Assert.IsTrue(q428.ToToolTip() == "対潜警戒任務1 海峡警備行動1 長時間対潜警戒1");\r
+            Assert.AreEqual("対潜警戒任務1 海峡警備行動1 長時間対潜警戒1", q428.ToToolTip());\r
             q428.NowArray = new[] {0, 1, 0};\r
-            Assert.IsTrue(q428.ToToolTip() == "海峡警備行動1");\r
+            Assert.AreEqual("海峡警備行動1", q428.ToToolTip());\r
             var q873 = status.QuestCountList[5];\r
-            Assert.IsTrue(q873.ToString() == "3/3");\r
-            Assert.IsTrue(q873.ToToolTip() == "3-1 3-2 3-3");\r
+            Assert.AreEqual("3/3", q873.ToString());\r
+            Assert.AreEqual("3-1 3-2 3-3", q873.ToToolTip());\r
             var q888 = status.QuestCountList[6];\r
-            Assert.IsTrue(q888.ToString() == "3/3");\r
-            Assert.IsTrue(q888.ToToolTip() == "5-1 5-3 5-4");\r
+            Assert.AreEqual("3/3", q888.ToString());\r
+            Assert.AreEqual("5-1 5-3 5-4", q888.ToToolTip());\r
             var q688 = status.QuestCountList[7];\r
-            Assert.IsTrue(q688.ToToolTip() == "艦戦2 艦爆1 艦攻2 水偵1");\r
+            Assert.AreEqual("艦戦2 艦爆1 艦攻2 水偵1", q688.ToToolTip());\r
             var q893 = status.QuestCountList[8];\r
-            Assert.IsTrue(q893.ToToolTip() == "1-5:1 7-1:1 7-2G:1 7-2M:1");\r
+            Assert.AreEqual("1-5:1 7-1:1 7-2G:1 7-2M:1", q893.ToToolTip());\r
             var q894 = status.QuestCountList[9];\r
-            Assert.IsTrue(q894.ToString() == "5/5");\r
-            Assert.IsTrue(q894.ToToolTip() == "1-3 1-4 2-1 2-2 2-3");\r
+            Assert.AreEqual("5/5", q894.ToString());\r
+            Assert.AreEqual("1-3 1-4 2-1 2-2 2-3", q894.ToToolTip());\r
             var q280 = status.QuestCountList[10];\r
-            Assert.IsTrue(q280.ToString() == "4/4");\r
-            Assert.IsTrue(q280.ToToolTip() == "1-2 1-3 1-4 2-1");\r
+            Assert.AreEqual("4/4", q280.ToString());\r
+            Assert.AreEqual("1-2 1-3 1-4 2-1", q280.ToToolTip());\r
             var q872 = status.QuestCountList.First(q => q.Id == 872);\r
-            Assert.IsTrue(q872.ToString() == "4/4");\r
-            Assert.IsTrue(q872.ToToolTip() == "7-2M 5-5 6-2 6-5");\r
+            Assert.AreEqual("4/4", q872.ToString());\r
+            Assert.AreEqual("7-2M 5-5 6-2 6-5", q872.ToToolTip());\r
             var q284 = status.QuestCountList.First(q => q.Id == 284);\r
-            Assert.IsTrue(q284.ToString() == "4/4");\r
-            Assert.IsTrue(q284.ToToolTip() == "1-4 2-1 2-2 2-3");\r
+            Assert.AreEqual("4/4", q284.ToString());\r
+            Assert.AreEqual("1-4 2-1 2-2 2-3", q284.ToToolTip());\r
         }\r
     }\r
 \r
@@ -201,10 +201,10 @@ namespace KancolleSniffer.Test
                 })\r
         });\r
 \r
-        private QuestStatus InjectQuest(int id)\r
+        private QuestCount InjectQuest(int id)\r
         {\r
             _questInfo.InspectQuestList(CreateQuestList(new[] {id}));\r
-            return _questInfo.Quests[0];\r
+            return _questInfo.Quests[0].Count;\r
         }\r
 \r
         private void InjectMapStart(int map, int eventId)\r
@@ -237,16 +237,6 @@ namespace KancolleSniffer.Test
             _questCounter.InspectPracticeResult(Js(new {api_win_rank = result}));\r
         }\r
 \r
-        private bool CheckCount(QuestStatus quest, int number)\r
-        {\r
-            return quest.Count.Now == number;\r
-        }\r
-\r
-        private bool CheckCount(QuestStatus quest, int[] array)\r
-        {\r
-            return quest.Count.NowArray.SequenceEqual(array);\r
-        }\r
-\r
         private ShipStatus[] ShipStatusList(params int[] shipTypes)\r
         {\r
             return shipTypes.Select(sType => ShipStatus(sType)).ToArray();\r
@@ -283,35 +273,36 @@ namespace KancolleSniffer.Test
             _questInfo.InspectQuestList(CreateQuestList(new[] {201, 216, 210, 214}));\r
 \r
             InjectMapStart(11, 4);\r
-            var quests = _questInfo.Quests;\r
+            var counts = _questInfo.Quests.Select(q => q.Count).ToArray();\r
             // 出撃カウント\r
-            PAssert.That(() => quests[2].Id == 214 && quests[2].Count.NowArray[0] == 1);\r
+            Assert.AreEqual(214, counts[2].Id);\r
+            Assert.AreEqual(1, counts[2].NowArray[0]);\r
             InjectBattleResult("S");\r
             // 道中S勝利\r
-            PAssert.That(() => quests.Select(q => new {q.Id, q.Count.Now}).SequenceEqual(new[]\r
+            PAssert.That(() => counts.Select(c => new {c.Id, c.Now}).SequenceEqual(new[]\r
             {\r
                 new {Id = 201, Now = 1}, new {Id = 210, Now = 1},\r
                 new {Id = 214, Now = 0}, new {Id = 216, Now = 1}\r
             }));\r
-            PAssert.That(() => quests[2].Id == 214 && CheckCount(quests[2], new[] {1, 1, 0, 0}));\r
+            PAssert.That(() => counts[2].NowArray.SequenceEqual(new[] {1, 1, 0, 0}));\r
 \r
             InjectMapNext(11, 5);\r
             // ボスB勝利\r
             InjectBattleResult("B");\r
-            PAssert.That(() => quests.Select(q => new {q.Id, q.Count.Now}).SequenceEqual(new[]\r
+            PAssert.That(() => counts.Select(c => new {c.Id, c.Now}).SequenceEqual(new[]\r
             {\r
                 new {Id = 201, Now = 2}, new {Id = 210, Now = 2},\r
                 new {Id = 214, Now = 0}, new {Id = 216, Now = 2}\r
             }));\r
             // ボス敗北\r
-            PAssert.That(() => quests[2].Id == 214 && CheckCount(quests[2], new[] {1, 1, 1, 1}));\r
+            PAssert.That(() => counts[2].NowArray.SequenceEqual(new[] {1, 1, 1, 1}));\r
             InjectBattleResult("C");\r
-            PAssert.That(() => quests.Select(q => new {q.Id, q.Count.Now}).SequenceEqual(new[]\r
+            PAssert.That(() => counts.Select(c => new {c.Id, c.Now}).SequenceEqual(new[]\r
             {\r
                 new {Id = 201, Now = 2}, new {Id = 210, Now = 3},\r
                 new {Id = 214, Now = 0}, new {Id = 216, Now = 2}\r
             }));\r
-            PAssert.That(() => quests[2].Id == 214 && CheckCount(quests[2], new[] {1, 1, 2, 1}));\r
+            PAssert.That(() => counts[2].NowArray.SequenceEqual(new[] {1, 1, 2, 1}));\r
         }\r
 \r
         /// <summary>\r
@@ -374,17 +365,17 @@ namespace KancolleSniffer.Test
         [TestMethod]\r
         public void BattleResult_226()\r
         {\r
-            var quest = InjectQuest(226);\r
+            var count = InjectQuest(226);\r
 \r
             InjectMapStart(21, 4);\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, 0));\r
+            Assert.AreEqual(0, count.Now);\r
 \r
             InjectMapNext(21, 5);\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, 1));\r
+            Assert.AreEqual(1, count.Now);\r
             InjectBattleResult("B");\r
-            Assert.IsTrue(CheckCount(quest, 2));\r
+            Assert.AreEqual(2, count.Now);\r
         }\r
 \r
         /// <summary>\r
@@ -393,17 +384,17 @@ namespace KancolleSniffer.Test
         [TestMethod]\r
         public void BattleResult_243()\r
         {\r
-            var quest = InjectQuest(243);\r
+            var count = InjectQuest(243);\r
 \r
             InjectMapNext(52, 4);\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, 0));\r
+            Assert.AreEqual(0, count.Now);\r
 \r
             InjectMapNext(52, 5);\r
             InjectBattleResult("A");\r
-            Assert.IsTrue(CheckCount(quest, 0));\r
+            Assert.AreEqual(0, count.Now);\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, 1));\r
+            Assert.AreEqual(1, count.Now);\r
         }\r
 \r
         /// <summary>\r
@@ -412,7 +403,7 @@ namespace KancolleSniffer.Test
         [TestMethod]\r
         public void BattleResult_249()\r
         {\r
-            var quest = InjectQuest(249);\r
+            var count = InjectQuest(249);\r
 \r
             _battleInfo.InjectResultStatus(new[]\r
             {\r
@@ -422,18 +413,18 @@ namespace KancolleSniffer.Test
 \r
             InjectMapNext(25, 4);\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, 0));\r
+            Assert.AreEqual(0, count.Now);\r
 \r
             InjectMapNext(25, 5);\r
             InjectBattleResult("A");\r
-            Assert.IsTrue(CheckCount(quest, 0));\r
+            Assert.AreEqual(0, count.Now);\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, 1));\r
+            Assert.AreEqual(1, count.Now);\r
             _questInfo.Quests[0].Count.Now = 0;\r
 \r
             _battleInfo.Result.Friend.Main[1].NowHp = 0;\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, 0), "那智改二轟沈");\r
+            Assert.AreEqual(0, count.Now, "那智改二轟沈");\r
         }\r
 \r
         /// <summary>\r
@@ -442,7 +433,7 @@ namespace KancolleSniffer.Test
         [TestMethod]\r
         public void BattleResult_257()\r
         {\r
-            var quest = InjectQuest(257);\r
+            var count = InjectQuest(257);\r
 \r
             _battleInfo.InjectResultStatus(\r
                 ShipStatusList(3, 2, 2, 2, 2, 2), new ShipStatus[0],\r
@@ -450,35 +441,35 @@ namespace KancolleSniffer.Test
 \r
             InjectMapNext(14, 4);\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, 0));\r
+            Assert.AreEqual(0, count.Now);\r
 \r
             InjectMapNext(14, 5);\r
             InjectBattleResult("A");\r
-            Assert.IsTrue(CheckCount(quest, 0));\r
+            Assert.AreEqual(0, count.Now);\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, 1));\r
+            Assert.AreEqual(1, count.Now);\r
             _questInfo.Quests[0].Count.Now = 0;\r
 \r
             _battleInfo.Result.Friend.Main[0].NowHp = 0;\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, 0), "軽巡轟沈");\r
+            Assert.AreEqual(0, count.Now, "軽巡轟沈");\r
             _battleInfo.Result.Friend.Main[0].NowHp = 1;\r
 \r
             _battleInfo.Result.Friend.Main[0].Spec.ShipType = 2;\r
             _battleInfo.Result.Friend.Main[1].Spec.ShipType = 3;\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, 0), "旗艦が駆逐");\r
+            Assert.AreEqual(0, count.Now, "旗艦が駆逐");\r
             _battleInfo.Result.Friend.Main[0].Spec.ShipType = 3;\r
 \r
             _battleInfo.Result.Friend.Main[2].Spec.ShipType = 3;\r
             _battleInfo.Result.Friend.Main[3].Spec.ShipType = 3;\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, 0), "軽巡が4隻");\r
+            Assert.AreEqual(0, count.Now, "軽巡が4隻");\r
 \r
             _battleInfo.Result.Friend.Main[0].Spec.ShipType = 3;\r
             _battleInfo.Result.Friend.Main[3].Spec.ShipType = 4;\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, 0), "駆逐軽巡以外");\r
+            Assert.AreEqual(0, count.Now, "駆逐軽巡以外");\r
         }\r
 \r
         private ShipStatus ShipStatus(int shipType, int shipClass, int specId) =>\r
@@ -490,7 +481,7 @@ namespace KancolleSniffer.Test
         [TestMethod]\r
         public void BattleResult_259()\r
         {\r
-            var quest = InjectQuest(259);\r
+            var count = InjectQuest(259);\r
 \r
             var org = new[]\r
             {\r
@@ -503,33 +494,33 @@ namespace KancolleSniffer.Test
 \r
             InjectMapNext(51, 4);\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, 0));\r
+            Assert.AreEqual(0, count.Now);\r
 \r
             InjectMapNext(51, 5);\r
             InjectBattleResult("A");\r
-            Assert.IsTrue(CheckCount(quest, 0));\r
+            Assert.AreEqual(0, count.Now);\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, 1));\r
+            Assert.AreEqual(1, count.Now);\r
             _questInfo.Quests[0].Count.Now = 0;\r
 \r
             _battleInfo.Result.Friend.Main[0].NowHp = 0;\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, 0), "軽巡轟沈");\r
+            Assert.AreEqual(0, count.Now, "軽巡轟沈");\r
             _battleInfo.Result.Friend.Main[0].NowHp = 1;\r
 \r
             _battleInfo.Result.Friend.Main[4] = ShipStatus(9, 37, 136);\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, 0), "戦艦4隻");\r
+            Assert.AreEqual(0, count.Now, "戦艦4隻");\r
             _battleInfo.Result.Friend.Main[4] = org[4];\r
 \r
             _battleInfo.Result.Friend.Main[0] = ShipStatus(4, 4, 58);\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, 0), "軽巡なし");\r
+            Assert.AreEqual(0, count.Now, "軽巡なし");\r
             _battleInfo.Result.Friend.Main[0] = org[0];\r
 \r
             _battleInfo.Result.Friend.Main[2] = ShipStatus(10, 2, 553);\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, 1), "伊勢改二");\r
+            Assert.AreEqual(1, count.Now, "伊勢改二");\r
         }\r
 \r
         /// <summary>\r
@@ -538,7 +529,7 @@ namespace KancolleSniffer.Test
         [TestMethod]\r
         public void BattleResult_264()\r
         {\r
-            var quest = InjectQuest(264);\r
+            var count = InjectQuest(264);\r
 \r
             _battleInfo.InjectResultStatus(\r
                 ShipStatusList(7, 11, 3, 3, 2, 2), new ShipStatus[0],\r
@@ -546,17 +537,17 @@ namespace KancolleSniffer.Test
 \r
             InjectMapNext(42, 4);\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, 0));\r
+            Assert.AreEqual(0, count.Now);\r
 \r
             InjectMapNext(42, 5);\r
             InjectBattleResult("A");\r
-            Assert.IsTrue(CheckCount(quest, 0));\r
+            Assert.AreEqual(0, count.Now);\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, 1));\r
+            Assert.AreEqual(1, count.Now);\r
 \r
             _battleInfo.Result.Friend.Main[0].NowHp = 0;\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, 1), "轟沈あり");\r
+            Assert.AreEqual(1, count.Now, "轟沈あり");\r
         }\r
 \r
         /// <summary>\r
@@ -565,7 +556,7 @@ namespace KancolleSniffer.Test
         [TestMethod]\r
         public void BattleResult_266()\r
         {\r
-            var quest = InjectQuest(266);\r
+            var count = InjectQuest(266);\r
 \r
             _battleInfo.InjectResultStatus(\r
                 ShipStatusList(2, 5, 3, 2, 2, 2), new ShipStatus[0],\r
@@ -573,29 +564,29 @@ namespace KancolleSniffer.Test
 \r
             InjectMapNext(25, 4);\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, 0));\r
+            Assert.AreEqual(0, count.Now);\r
 \r
             InjectMapNext(25, 5);\r
             InjectBattleResult("A");\r
-            Assert.IsTrue(CheckCount(quest, 0));\r
+            Assert.AreEqual(0, count.Now);\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, 1));\r
+            Assert.AreEqual(1, count.Now);\r
 \r
             _battleInfo.Result.Friend.Main[1].NowHp = 0;\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, 1), "轟沈あり");\r
+            Assert.AreEqual(1, count.Now, "轟沈あり");\r
             _battleInfo.Result.Friend.Main[1].NowHp = 1;\r
 \r
             _battleInfo.Result.Friend.Main[0].Spec.ShipType = 3;\r
             _battleInfo.Result.Friend.Main[2].Spec.ShipType = 2;\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, 1), "旗艦が軽巡");\r
+            Assert.AreEqual(1, count.Now, "旗艦が軽巡");\r
             _battleInfo.Result.Friend.Main[0].Spec.ShipType = 2;\r
             _battleInfo.Result.Friend.Main[2].Spec.ShipType = 3;\r
 \r
             _battleInfo.Result.Friend.Main[3].Spec.ShipType = 3;\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, 1), "軽巡が2隻");\r
+            Assert.AreEqual(1, count.Now, "軽巡が2隻");\r
         }\r
 \r
         /// <summary>\r
@@ -604,7 +595,7 @@ namespace KancolleSniffer.Test
         [TestMethod]\r
         public void BattleResult_280()\r
         {\r
-            var quest = InjectQuest(280);\r
+            var count = InjectQuest(280);\r
 \r
             _battleInfo.InjectResultStatus(\r
                 ShipStatusList(7, 2, 1, 1, 8, 8), new ShipStatus[0],\r
@@ -614,7 +605,7 @@ namespace KancolleSniffer.Test
             InjectBattleResult("S");\r
             InjectMapNext(12, 5);\r
             InjectBattleResult("A");\r
-            Assert.IsTrue(CheckCount(quest, new[] {0, 0, 0, 0}));\r
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {0, 0, 0, 0}));\r
 \r
             InjectBattleResult("S");\r
             InjectMapNext(13, 5);\r
@@ -623,27 +614,27 @@ namespace KancolleSniffer.Test
             InjectBattleResult("S");\r
             InjectMapNext(21, 5);\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, new[] {1, 1, 1, 1}));\r
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 1, 1, 1}));\r
 \r
             _battleInfo.Result.Friend.Main = ShipStatusList(7, 1, 1, 8, 8, 8);\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, new[] {1, 1, 1, 1}));\r
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 1, 1, 1}));\r
 \r
             _battleInfo.Result.Friend.Main = ShipStatusList(8, 1, 1, 1, 8, 8);\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, new[] {1, 1, 1, 1}));\r
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 1, 1, 1}));\r
 \r
             _battleInfo.Result.Friend.Main = ShipStatusList(3, 2, 1, 1, 8, 8);\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, new[] {1, 1, 1, 2}));\r
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 1, 1, 2}));\r
 \r
             _battleInfo.Result.Friend.Main = ShipStatusList(2, 4, 2, 1, 8, 8);\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, new[] {1, 1, 1, 3}));\r
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 1, 1, 3}));\r
 \r
             _battleInfo.Result.Friend.Main = ShipStatusList(2, 2, 21, 2, 8, 8);\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, new[] {1, 1, 1, 4}));\r
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 1, 1, 4}));\r
         }\r
 \r
         /// <summary>\r
@@ -652,7 +643,7 @@ namespace KancolleSniffer.Test
         [TestMethod]\r
         public void BattleResult_284()\r
         {\r
-            var quest = InjectQuest(284);\r
+            var count = InjectQuest(284);\r
 \r
             _battleInfo.InjectResultStatus(\r
                 ShipStatusList(7, 2, 1, 1, 8, 8), new ShipStatus[0],\r
@@ -662,7 +653,7 @@ namespace KancolleSniffer.Test
             InjectBattleResult("S");\r
             InjectMapNext(14, 5);\r
             InjectBattleResult("A");\r
-            Assert.IsTrue(CheckCount(quest, new[] {0, 0, 0, 0}));\r
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {0, 0, 0, 0}));\r
 \r
             InjectBattleResult("S");\r
             InjectMapNext(21, 5);\r
@@ -671,7 +662,7 @@ namespace KancolleSniffer.Test
             InjectBattleResult("S");\r
             InjectMapNext(23, 5);\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, new[] {1, 1, 1, 1}));\r
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 1, 1, 1}));\r
 \r
             // 艦種チェックは280と共通\r
         }\r
@@ -684,13 +675,14 @@ namespace KancolleSniffer.Test
         public void BattleResult_822_854()\r
         {\r
             _questInfo.InspectQuestList(CreateQuestList(new[] {822, 854}));\r
-            var q822 = _questInfo.Quests[0];\r
-            var q854 = _questInfo.Quests[1];\r
+            var c822 = _questInfo.Quests[0].Count;\r
+            var c854 = _questInfo.Quests[1].Count;\r
 \r
             InjectMapNext(24, 4);\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(q854, new[] {0, 0, 0, 0}));\r
-            Assert.IsTrue(CheckCount(q822, 0));\r
+\r
+            PAssert.That(() => c854.NowArray.SequenceEqual(new[] {0, 0, 0, 0}));\r
+            Assert.AreEqual(0, c822.Now);\r
 \r
             InjectMapNext(24, 5);\r
             InjectBattleResult("A");\r
@@ -700,12 +692,12 @@ namespace KancolleSniffer.Test
             InjectBattleResult("A");\r
             InjectMapNext(64, 5);\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(q854, new[] {1, 1, 1, 1}));\r
-            Assert.IsTrue(CheckCount(q822, 0));\r
+            PAssert.That(() => c854.NowArray.SequenceEqual(new[] {1, 1, 1, 1}));\r
+            Assert.AreEqual(0, c822.Now);\r
             InjectMapNext(24, 5);\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(q854, new[] {2, 1, 1, 1}));\r
-            Assert.IsTrue(CheckCount(q822, 1));\r
+            PAssert.That(() => c854.NowArray.SequenceEqual(new[] {2, 1, 1, 1}));\r
+            Assert.AreEqual(1, c822.Now);\r
         }\r
 \r
         /// <summary>\r
@@ -714,13 +706,13 @@ namespace KancolleSniffer.Test
         [TestMethod]\r
         public void BattleResult_845()\r
         {\r
-            var quest = InjectQuest(845);\r
+            var count = InjectQuest(845);\r
 \r
             InjectMapNext(41, 4);\r
             InjectBattleResult("S");\r
             InjectMapNext(41, 5);\r
             InjectBattleResult("A");\r
-            Assert.IsTrue(CheckCount(quest, new[] {0, 0, 0, 0, 0}));\r
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {0, 0, 0, 0, 0}));\r
 \r
             InjectMapNext(41, 5);\r
             InjectBattleResult("S");\r
@@ -732,7 +724,7 @@ namespace KancolleSniffer.Test
             InjectBattleResult("S");\r
             InjectMapNext(45, 5);\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, new[] {1, 1, 1, 1, 1}));\r
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 1, 1, 1, 1}));\r
         }\r
 \r
         /// <summary>\r
@@ -741,27 +733,26 @@ namespace KancolleSniffer.Test
         [TestMethod]\r
         public void MapNext_861()\r
         {\r
-            _questInfo.InspectQuestList(CreateQuestList(new[] {861}));\r
-            var quest = _questInfo.Quests[0];\r
+            var count = InjectQuest(861);\r
 \r
             _battleInfo.InjectResultStatus(\r
                 ShipStatusList(10, 22, 2, 2, 2, 2), new ShipStatus[0],\r
                 new ShipStatus[0], new ShipStatus[0]);\r
 \r
             InjectMapNext(16, 4);\r
-            Assert.IsTrue(CheckCount(quest, 0));\r
+            Assert.AreEqual(0, count.Now);\r
 \r
             InjectMapNext(16, 8);\r
-            Assert.IsTrue(CheckCount(quest, 1));\r
+            Assert.AreEqual(1, count.Now);\r
 \r
             _battleInfo.Result.Friend.Main[1].NowHp = 0;\r
             InjectMapNext(16, 8);\r
-            Assert.IsTrue(CheckCount(quest, 1), "轟沈あり");\r
+            Assert.AreEqual(1, count.Now, "轟沈あり");\r
             _battleInfo.Result.Friend.Main[1].NowHp = 1;\r
 \r
             _battleInfo.Result.Friend.Main[2].Spec.ShipType = 10;\r
             InjectMapNext(16, 8);\r
-            Assert.IsTrue(CheckCount(quest, 1), "補給・航戦が3隻");\r
+            Assert.AreEqual(1, count.Now, "補給・航戦が3隻");\r
         }\r
 \r
         /// <summary>\r
@@ -770,8 +761,7 @@ namespace KancolleSniffer.Test
         [TestMethod]\r
         public void BattleResult_862()\r
         {\r
-            _questInfo.InspectQuestList(CreateQuestList(new[] {862}));\r
-            var quest = _questInfo.Quests[0];\r
+            var count = InjectQuest(862);\r
 \r
             _battleInfo.InjectResultStatus(\r
                 ShipStatusList(2, 3, 3, 2, 2, 16), new ShipStatus[0],\r
@@ -779,23 +769,23 @@ namespace KancolleSniffer.Test
 \r
             InjectMapNext(63, 4);\r
             InjectBattleResult("A");\r
-            Assert.IsTrue(CheckCount(quest, 0));\r
+            Assert.AreEqual(0, count.Now);\r
 \r
             InjectMapNext(63, 5);\r
             InjectBattleResult("B");\r
-            Assert.IsTrue(CheckCount(quest, 0));\r
+            Assert.AreEqual(0, count.Now);\r
             InjectBattleResult("A");\r
-            Assert.IsTrue(CheckCount(quest, 1));\r
+            Assert.AreEqual(1, count.Now);\r
 \r
             _battleInfo.Result.Friend.Main[1].NowHp = 0;\r
             InjectBattleResult("A");\r
-            Assert.IsTrue(CheckCount(quest, 1), "轟沈あり");\r
+            Assert.AreEqual(1, count.Now, "轟沈あり");\r
             _battleInfo.Result.Friend.Main[1].NowHp = 1;\r
 \r
             _battleInfo.Result.Friend.Main[3].Spec.ShipType = 3;\r
             _battleInfo.Result.Friend.Main[4].Spec.ShipType = 16;\r
             InjectBattleResult("A");\r
-            Assert.IsTrue(CheckCount(quest, 2), "軽巡3隻水母2隻");\r
+            Assert.AreEqual(2, count.Now, "軽巡3隻水母2隻");\r
         }\r
 \r
         /// <summary>\r
@@ -804,23 +794,23 @@ namespace KancolleSniffer.Test
         [TestMethod]\r
         public void BattleResult_872()\r
         {\r
-            var quest = InjectQuest(872);\r
+            var count = InjectQuest(872);\r
 \r
             InjectMapNext(55, 4);\r
             InjectBattleResult("A");\r
-            Assert.IsTrue(CheckCount(quest, new[] {0, 0, 0, 0}));\r
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {0, 0, 0, 0}));\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, new[] {0, 0, 0, 0}));\r
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {0, 0, 0, 0}));\r
             InjectMapNext(55, 5);\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, new[] {0, 1, 0, 0}));\r
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {0, 1, 0, 0}));\r
 \r
             InjectMapNext(62, 5);\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, new[] {0, 1, 1, 0}));\r
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {0, 1, 1, 0}));\r
             InjectMapNext(65, 5);\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, new[] {0, 1, 1, 1}));\r
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {0, 1, 1, 1}));\r
             _questCounter.InspectMapNext(Js(new\r
             {\r
                 api_maparea_id = 7,\r
@@ -829,7 +819,7 @@ namespace KancolleSniffer.Test
                 api_event_id = 5\r
             }));\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, new[] {1, 1, 1, 1}), "7-2M");\r
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 1, 1, 1}), "7-2M");\r
         }\r
 \r
         /// <summary>\r
@@ -838,7 +828,7 @@ namespace KancolleSniffer.Test
         [TestMethod]\r
         public void BattleResult_873()\r
         {\r
-            var quest = InjectQuest(873);\r
+            var count = InjectQuest(873);\r
 \r
             _battleInfo.InjectResultStatus(\r
                 ShipStatusList(3, 2, 2, 2, 2, 2), new ShipStatus[0],\r
@@ -846,17 +836,17 @@ namespace KancolleSniffer.Test
 \r
             InjectMapNext(31, 4);\r
             InjectBattleResult("A");\r
-            Assert.IsTrue(CheckCount(quest, new[] {0, 0, 0}));\r
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {0, 0, 0}));\r
 \r
             InjectMapNext(31, 5);\r
             InjectBattleResult("B");\r
-            Assert.IsTrue(CheckCount(quest, new[] {0, 0, 0}));\r
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {0, 0, 0}));\r
             InjectBattleResult("A");\r
-            Assert.IsTrue(CheckCount(quest, new[] {1, 0, 0}));\r
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 0, 0}));\r
 \r
             _battleInfo.Result.Friend.Main[0].Spec.ShipType = 2;\r
             InjectBattleResult("A");\r
-            Assert.IsTrue(_questInfo.Quests[0].Count.NowArray[0] == 1, "軽巡なし");\r
+            Assert.AreEqual(1, _questInfo.Quests[0].Count.NowArray[0], "軽巡なし");\r
             _battleInfo.Result.Friend.Main[0].Spec.ShipType = 3;\r
 \r
             InjectMapNext(32, 5);\r
@@ -872,7 +862,7 @@ namespace KancolleSniffer.Test
         [TestMethod]\r
         public void BattleResult_875()\r
         {\r
-            var quest = InjectQuest(875);\r
+            var count = InjectQuest(875);\r
 \r
             _battleInfo.InjectResultStatus(new[]\r
             {\r
@@ -882,33 +872,33 @@ namespace KancolleSniffer.Test
 \r
             InjectMapNext(54, 4);\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, 0));\r
+            Assert.AreEqual(0, count.Now);\r
 \r
             InjectMapNext(54, 5);\r
             InjectBattleResult("A");\r
-            Assert.IsTrue(CheckCount(quest, 0));\r
+            Assert.AreEqual(0, count.Now);\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, 1));\r
+            Assert.AreEqual(1, count.Now);\r
 \r
             _battleInfo.Result.Friend.Main[5].NowHp = 0;\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, 1), "朝霜改轟沈");\r
+            Assert.AreEqual(1, count.Now, "朝霜改轟沈");\r
             _battleInfo.Result.Friend.Main[5].NowHp = 1;\r
 \r
             _battleInfo.Result.Friend.Main[0].Spec.Id = 345;\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, 1), "長波改二なし");\r
+            Assert.AreEqual(1, count.Now, "長波改二なし");\r
             _battleInfo.Result.Friend.Main[0].Spec.Id = 543;\r
 \r
             _battleInfo.Result.Friend.Main[5].Spec.Id = 345;\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, 2), "高波改");\r
+            Assert.AreEqual(2, count.Now, "高波改");\r
             _battleInfo.Result.Friend.Main[5].Spec.Id = 359;\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, 3), "沖波改");\r
+            Assert.AreEqual(3, count.Now, "沖波改");\r
             _battleInfo.Result.Friend.Main[5].Spec.Id = 578;\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, 4), "朝霜改二");\r
+            Assert.AreEqual(4, count.Now, "朝霜改二");\r
         }\r
 \r
         /// <summary>\r
@@ -917,7 +907,7 @@ namespace KancolleSniffer.Test
         [TestMethod]\r
         public void BattleResult_888()\r
         {\r
-            var quest = InjectQuest(888);\r
+            var count = InjectQuest(888);\r
 \r
             _battleInfo.InjectResultStatus(new[]\r
             {\r
@@ -927,30 +917,30 @@ namespace KancolleSniffer.Test
 \r
             InjectMapNext(51, 4);\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, new[] {0, 0, 0}));\r
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {0, 0, 0}));\r
 \r
             InjectMapNext(51, 5);\r
             InjectBattleResult("A");\r
-            Assert.IsTrue(CheckCount(quest, new[] {0, 0, 0}));\r
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {0, 0, 0}));\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, new[] {1, 0, 0}));\r
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 0, 0}));\r
             _battleInfo.Result.Friend.Main[0].NowHp = 0;\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, new[] {1, 0, 0}), "轟沈あり");\r
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 0, 0}), "轟沈あり");\r
             _battleInfo.Result.Friend.Main[0].NowHp = 1;\r
 \r
             _battleInfo.Result.Friend.Main[0].Spec.Id = 319;\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, new[] {1, 0, 0}), "三川艦隊3隻");\r
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 0, 0}), "三川艦隊3隻");\r
             _battleInfo.Result.Friend.Main[0].Spec.Id = 427;\r
 \r
             InjectMapNext(53, 5);\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, new[] {1, 1, 0}));\r
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 1, 0}));\r
 \r
             InjectMapNext(54, 5);\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, new[] {1, 1, 1}));\r
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 1, 1}));\r
         }\r
 \r
         /// <summary>\r
@@ -959,21 +949,21 @@ namespace KancolleSniffer.Test
         [TestMethod]\r
         public void BattleResult_893()\r
         {\r
-            var quest = InjectQuest(893);\r
+            var count = InjectQuest(893);\r
 \r
             InjectMapNext(15, 4);\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, new[] {0, 0, 0, 0}));\r
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {0, 0, 0, 0}));\r
 \r
             InjectMapNext(15, 5);\r
             InjectBattleResult("A");\r
-            Assert.IsTrue(CheckCount(quest, new[] {0, 0, 0, 0}), "A勝利はカウントしない");\r
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {0, 0, 0, 0}), "A勝利はカウントしない");\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, new[] {1, 0, 0, 0}), "1-5");\r
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 0, 0, 0}), "1-5");\r
 \r
             InjectMapNext(71, 5);\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, new[] {1, 1, 0, 0}), "7-1");\r
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 1, 0, 0}), "7-1");\r
 \r
             _questCounter.InspectMapNext(Js(new\r
             {\r
@@ -983,7 +973,7 @@ namespace KancolleSniffer.Test
                 api_event_id = 5\r
             }));\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, new[] {1, 1, 1, 0}), "7-2G");\r
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 1, 1, 0}), "7-2G");\r
 \r
             _questCounter.InspectMapNext(Js(new\r
             {\r
@@ -993,7 +983,7 @@ namespace KancolleSniffer.Test
                 api_event_id = 5\r
             }));\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, new[] {1, 1, 1, 1}), "7-2M");\r
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 1, 1, 1}), "7-2M");\r
         }\r
 \r
         /// <summary>\r
@@ -1002,41 +992,41 @@ namespace KancolleSniffer.Test
         [TestMethod]\r
         public void BattleResult_894()\r
         {\r
-            var quest = InjectQuest(894);\r
+            var count = InjectQuest(894);\r
             _battleInfo.InjectResultStatus(\r
                 ShipStatusList(2, 2, 2, 2, 2, 2),\r
                 new ShipStatus[0], new ShipStatus[0], new ShipStatus[0]);\r
 \r
             InjectMapNext(13, 5);\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, new[] {0, 0, 0, 0, 0}), "空母なしはカウントしない");\r
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {0, 0, 0, 0, 0}), "空母なしはカウントしない");\r
 \r
             _battleInfo.Result.Friend.Main[0].Spec.ShipType = 7;\r
             InjectBattleResult("A");\r
-            Assert.IsTrue(CheckCount(quest, new[] {0, 0, 0, 0, 0}), "A勝利はカウントしない");\r
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {0, 0, 0, 0, 0}), "A勝利はカウントしない");\r
 \r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, new[] {1, 0, 0, 0, 0}), "1-3");\r
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 0, 0, 0, 0}), "1-3");\r
 \r
             InjectMapNext(14, 4);\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, new[] {1, 0, 0, 0, 0}), "1-4");\r
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 0, 0, 0, 0}), "1-4");\r
 \r
             InjectMapNext(14, 5);\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, new[] {1, 1, 0, 0, 0}), "1-4");\r
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 1, 0, 0, 0}), "1-4");\r
 \r
             InjectMapNext(21, 5);\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, new[] {1, 1, 1, 0, 0}), "2-1");\r
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 1, 1, 0, 0}), "2-1");\r
 \r
             InjectMapNext(22, 5);\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, new[] {1, 1, 1, 1, 0}), "2-2");\r
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 1, 1, 1, 0}), "2-2");\r
 \r
             InjectMapNext(23, 5);\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(CheckCount(quest, new[] {1, 1, 1, 1, 1}), "2-3");\r
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 1, 1, 1, 1}), "2-3");\r
         }\r
 \r
         /// <summary>\r
@@ -1053,7 +1043,7 @@ namespace KancolleSniffer.Test
 \r
             InjectMapNext(24, 5);\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(_questInfo.Quests[1].Count.NowArray[0] == 1);\r
+            Assert.AreEqual(1, _questInfo.Quests[1].Count.NowArray[0]);\r
         }\r
 \r
         /// <summary>\r
@@ -1070,7 +1060,7 @@ namespace KancolleSniffer.Test
 \r
             InjectMapNext(71, 5);\r
             InjectBattleResult("S");\r
-            Assert.IsTrue(_questInfo.Quests[1].Count.NowArray[1] == 1);\r
+            Assert.AreEqual(1, _questInfo.Quests[1].Count.NowArray[1]);\r
         }\r
 \r
         /// <summary>\r
@@ -1106,7 +1096,7 @@ namespace KancolleSniffer.Test
         [TestMethod]\r
         public void PracticeResult_318()\r
         {\r
-            var quest = InjectQuest(318);\r
+            var count = InjectQuest(318);\r
 \r
             _battleInfo.InjectResultStatus(new[]\r
             {\r
@@ -1114,20 +1104,20 @@ namespace KancolleSniffer.Test
             }, new ShipStatus[0], new ShipStatus[0], new ShipStatus[0]);\r
 \r
             InjectPracticeResult("B");\r
-            Assert.IsTrue(quest.Count.Now == 0, "軽巡1隻");\r
+            Assert.AreEqual(0, count.Now, "軽巡1隻");\r
             _battleInfo.Result.Friend.Main[0] = ShipStatus(3, 200);\r
             _questCounter.StartPractice("api%5Fdeck%5Fid=2");\r
             InjectPracticeResult("B");\r
-            Assert.IsTrue(quest.Count.Now == 0, "第2艦隊");\r
+            Assert.AreEqual(0, count.Now, "第2艦隊");\r
             _questCounter.StartPractice("api%5Fdeck%5Fid=1"); // 第一艦隊\r
             InjectPracticeResult("C");\r
-            Assert.IsTrue(quest.Count.Now == 0, "敗北");\r
+            Assert.AreEqual(0, count.Now, "敗北");\r
             InjectPracticeResult("B");\r
-            Assert.IsTrue(quest.Count.Now == 1);\r
+            Assert.AreEqual(1, count.Now);\r
 \r
-            quest.Count.Now = 2;\r
+            count.Now = 2;\r
             _questInfo.InspectQuestList(CreateQuestList(new[] {318}));\r
-            Assert.IsTrue(quest.Count.Now == 2, "進捗調節しない");\r
+            Assert.AreEqual(2, count.Now, "進捗調節しない");\r
         }\r
 \r
         /// <summary>\r
@@ -1136,33 +1126,33 @@ namespace KancolleSniffer.Test
         [TestMethod]\r
         public void PracticeResult_330()\r
         {\r
-            var quest = InjectQuest(330);\r
+            var count = InjectQuest(330);\r
 \r
             _battleInfo.InjectResultStatus(\r
                 ShipStatusList(18, 7, 2, 2),\r
                 new ShipStatus[0], new ShipStatus[0], new ShipStatus[0]);\r
             InjectPracticeResult("B");\r
-            Assert.AreEqual(1, quest.Count.Now, "装甲空母、軽空母");\r
+            Assert.AreEqual(1, count.Now, "装甲空母、軽空母");\r
 \r
             _battleInfo.Result.Friend.Main = ShipStatusList(11, 7, 2, 2);\r
             InjectPracticeResult("B");\r
-            Assert.AreEqual(2, quest.Count.Now, "正規空母、軽空母");\r
+            Assert.AreEqual(2, count.Now, "正規空母、軽空母");\r
 \r
-            quest.Count.Now = 0;\r
+            count.Now = 0;\r
             InjectPracticeResult("C");\r
-            Assert.AreEqual(0, quest.Count.Now, "敗北");\r
+            Assert.AreEqual(0, count.Now, "敗北");\r
 \r
             _battleInfo.Result.Friend.Main = ShipStatusList(2, 7, 11, 2);\r
             InjectPracticeResult("B");\r
-            Assert.AreEqual(0, quest.Count.Now, "旗艦空母以外");\r
+            Assert.AreEqual(0, count.Now, "旗艦空母以外");\r
 \r
             _battleInfo.Result.Friend.Main = ShipStatusList(11, 2, 2, 2);\r
             InjectPracticeResult("B");\r
-            Assert.AreEqual(0, quest.Count.Now, "空母一隻");\r
+            Assert.AreEqual(0, count.Now, "空母一隻");\r
 \r
             _battleInfo.Result.Friend.Main = ShipStatusList(11, 7, 3, 2);\r
             InjectPracticeResult("B");\r
-            Assert.AreEqual(0, quest.Count.Now, "駆逐一隻");\r
+            Assert.AreEqual(0, count.Now, "駆逐一隻");\r
         }\r
 \r
         /// <summary>\r
@@ -1171,7 +1161,7 @@ namespace KancolleSniffer.Test
         [TestMethod]\r
         public void PracticeResult_337()\r
         {\r
-            var quest = InjectQuest(337);\r
+            var count = InjectQuest(337);\r
 \r
             _battleInfo.InjectResultStatus(new []\r
             {\r
@@ -1180,15 +1170,15 @@ namespace KancolleSniffer.Test
                 ShipStatus(2, 19)\r
             }, new ShipStatus[0], new ShipStatus[0], new ShipStatus[0]);\r
             InjectPracticeResult("A");\r
-            Assert.AreEqual(0, quest.Count.Now, "A");\r
+            Assert.AreEqual(0, count.Now, "A");\r
             InjectPracticeResult("S");\r
-            Assert.AreEqual(1, quest.Count.Now);\r
+            Assert.AreEqual(1, count.Now);\r
             _battleInfo.Result.Friend.Main[0] = ShipStatus(2, 47);\r
             InjectPracticeResult("S");\r
-            Assert.AreEqual(1, quest.Count.Now, "霰→涼風");\r
+            Assert.AreEqual(1, count.Now, "霰→涼風");\r
             _battleInfo.Result.Friend.Main[4] = ShipStatus(2, 464);\r
             InjectPracticeResult("S");\r
-            Assert.AreEqual(2, quest.Count.Now, "黒潮→霞改二");\r
+            Assert.AreEqual(2, count.Now, "黒潮→霞改二");\r
         }\r
 \r
         /// <summary>\r
@@ -1228,7 +1218,7 @@ namespace KancolleSniffer.Test
         [TestMethod]\r
         public void MissionResult_426()\r
         {\r
-            var quest = InjectQuest(426);\r
+            var count = InjectQuest(426);\r
 \r
             _questCounter.InspectDeck(Js(\r
                 new[]\r
@@ -1240,14 +1230,14 @@ namespace KancolleSniffer.Test
             _questCounter.InspectMissionResult("api%5Fdeck%5Fid=2", Js(new {api_clear_result = 1}));\r
             _questCounter.InspectMissionResult("api%5Fdeck%5Fid=3", Js(new {api_clear_result = 1}));\r
             _questCounter.InspectMissionResult("api%5Fdeck%5Fid=4", Js(new {api_clear_result = 1}));\r
-            Assert.IsTrue(CheckCount(quest, new[] {1, 1, 1, 0}));\r
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 1, 1, 0}));\r
             _questCounter.InspectDeck(Js(\r
                 new[]\r
                 {\r
                     new {api_id = 2, api_mission = new[] {2, 10}}\r
                 }));\r
             _questCounter.InspectMissionResult("api%5Fdeck%5Fid=2", Js(new {api_clear_result = 1}));\r
-            Assert.IsTrue(CheckCount(quest, new[] {1, 1, 1, 1}));\r
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 1, 1, 1}));\r
         }\r
 \r
         /// <summary>\r
@@ -1256,7 +1246,7 @@ namespace KancolleSniffer.Test
         [TestMethod]\r
         public void MissionResult_428()\r
         {\r
-            var quest = InjectQuest(428);\r
+            var count = InjectQuest(428);\r
 \r
             _questCounter.InspectDeck(Js(\r
                 new[]\r
@@ -1268,7 +1258,7 @@ namespace KancolleSniffer.Test
             _questCounter.InspectMissionResult("api%5Fdeck%5Fid=2", Js(new {api_clear_result = 1}));\r
             _questCounter.InspectMissionResult("api%5Fdeck%5Fid=3", Js(new {api_clear_result = 1}));\r
             _questCounter.InspectMissionResult("api%5Fdeck%5Fid=4", Js(new {api_clear_result = 1}));\r
-            Assert.IsTrue(CheckCount(quest, new[] {1, 1, 1}));\r
+            PAssert.That(() => count.NowArray.SequenceEqual(new[] {1, 1, 1}));\r
         }\r
 \r
         /// <summary>\r
@@ -1370,7 +1360,8 @@ namespace KancolleSniffer.Test
             foreach (var e in scalar)\r
             {\r
                 var c = Array.Find(_questInfo.Quests, q => q.Id == e.Id).Count;\r
-                Assert.IsTrue(c.Id == e.Id && c.Now == e.Now, $"{c.Id}");\r
+                Assert.AreEqual(e.Id, c.Id);\r
+                Assert.AreEqual(e.Now, c.Now, $"{c.Id}");\r
             }\r
             var array = new[]\r
             {\r
@@ -1382,7 +1373,8 @@ namespace KancolleSniffer.Test
             foreach (var e in array)\r
             {\r
                 var c = Array.Find(_questInfo.Quests, q => q.Id == e.Id).Count;\r
-                Assert.IsTrue(c.Id == e.Id && c.NowArray.SequenceEqual(e.NowArray), $"{c.Id}");\r
+                Assert.AreEqual(e.Id, c.Id);\r
+                PAssert.That(() => c.NowArray.SequenceEqual(e.NowArray), $"{c.Id}");\r
             }\r
         }\r
 \r