ボス撃破が条件の任務カウンタにボスではない場合のテストを加える

diff --git a/KancolleSniffer.Test/QuestInfoTest.cs b/KancolleSniffer.Test/QuestInfoTest.cs
index 95de1dd..947a2b0 100644 (file)
--- a/KancolleSniffer.Test/QuestInfoTest.cs
+++ b/KancolleSniffer.Test/QuestInfoTest.cs
@@ -383,9 +383,8 @@ namespace KancolleSniffer.Test
                 api_event_id = 4\r
             }));\r
             questInfo.InspectBattleResult(Js(new {api_win_rank = "S"}));\r
-            PAssert.That(() =>\r
-                questInfo.Quests.Select(q => new {q.Id, q.Count.Now})\r
-                    .SequenceEqual(new[] {new {Id = 226, Now = 0}}));\r
+            PAssert.That(() => questInfo.Quests[0].Count.Now == 0);\r
+\r
             questInfo.InspectMapNext(Js(new\r
             {\r
                 api_maparea_id = 2,\r
@@ -393,19 +392,9 @@ namespace KancolleSniffer.Test
                 api_event_id = 5\r
             }));\r
             questInfo.InspectBattleResult(Js(new {api_win_rank = "S"}));\r
-            PAssert.That(() =>\r
-                questInfo.Quests.Select(q => new {q.Id, q.Count.Now})\r
-                    .SequenceEqual(new[] {new {Id = 226, Now = 1}}));\r
-            questInfo.InspectMapStart(Js(new\r
-            {\r
-                api_maparea_id = 2,\r
-                api_mapinfo_no = 1,\r
-                api_event_id = 4\r
-            }));\r
-            questInfo.InspectBattleResult(Js(new {api_win_rank = "S"}));\r
-            PAssert.That(() =>\r
-                questInfo.Quests.Select(q => new {q.Id, q.Count.Now})\r
-                    .SequenceEqual(new[] {new {Id = 226, Now = 1}}));\r
+            PAssert.That(() => questInfo.Quests[0].Count.Now == 1);\r
+            questInfo.InspectBattleResult(Js(new { api_win_rank = "B" }));\r
+            PAssert.That(() => questInfo.Quests[0].Count.Now == 2);\r
         }\r
 \r
         /// <summary>\r
@@ -421,23 +410,21 @@ namespace KancolleSniffer.Test
             {\r
                 api_maparea_id = 5,\r
                 api_mapinfo_no = 2,\r
-                api_event_id = 5\r
+                api_event_id = 4\r
             }));\r
-            questInfo.InspectBattleResult(Js(new {api_win_rank = "A"}));\r
-            PAssert.That(() =>\r
-                questInfo.Quests.Select(q => new {q.Id, q.Count.Now})\r
-                    .SequenceEqual(new[] {new {Id = 243, Now = 0}}));\r
+            questInfo.InspectBattleResult(Js(new { api_win_rank = "S" }));\r
+            PAssert.That(() => questInfo.Quests[0].Count.Now == 0);\r
 \r
-            questInfo.InspectMapNext(Js(new\r
+            questInfo.InspectMapStart(Js(new\r
             {\r
                 api_maparea_id = 5,\r
                 api_mapinfo_no = 2,\r
                 api_event_id = 5\r
             }));\r
+            questInfo.InspectBattleResult(Js(new {api_win_rank = "A"}));\r
+            PAssert.That(() => questInfo.Quests[0].Count.Now == 0);\r
             questInfo.InspectBattleResult(Js(new {api_win_rank = "S"}));\r
-            PAssert.That(() =>\r
-                questInfo.Quests.Select(q => new {q.Id, q.Count.Now})\r
-                    .SequenceEqual(new[] {new {Id = 243, Now = 1}}));\r
+            PAssert.That(() => questInfo.Quests[0].Count.Now == 1);\r
         }\r
 \r
         private ShipStatus ShipStatus(int shipType, int specId = 0) =>\r
@@ -459,6 +446,7 @@ namespace KancolleSniffer.Test
                 ShipStatus(5, 319), ShipStatus(5, 192), ShipStatus(5, 194),\r
                 ShipStatus(5, 193), ShipStatus(6, 189), ShipStatus(6, 188)\r
             }, new ShipStatus[0], new ShipStatus[0], new ShipStatus[0]);\r
+\r
             questInfo.InspectMapNext(Js(new\r
             {\r
                 api_maparea_id = 2,\r
@@ -466,6 +454,8 @@ namespace KancolleSniffer.Test
                 api_event_id = 4\r
             }));\r
             questInfo.InspectBattleResult(Js(new {api_win_rank = "S"}));\r
+            PAssert.That(() => questInfo.Quests[0].Count.Now == 0);\r
+\r
             questInfo.InspectMapNext(Js(new\r
             {\r
                 api_maparea_id = 2,\r
@@ -498,6 +488,7 @@ namespace KancolleSniffer.Test
                 ShipStatus(3), ShipStatus(2), ShipStatus(2),\r
                 ShipStatus(2), ShipStatus(2), ShipStatus(2)\r
             }, new ShipStatus[0], new ShipStatus[0], new ShipStatus[0]);\r
+\r
             questInfo.InspectMapNext(Js(new\r
             {\r
                 api_maparea_id = 1,\r
@@ -505,6 +496,8 @@ namespace KancolleSniffer.Test
                 api_event_id = 4\r
             }));\r
             questInfo.InspectBattleResult(Js(new {api_win_rank = "S"}));\r
+            PAssert.That(() => questInfo.Quests[0].Count.Now == 0);\r
+\r
             questInfo.InspectMapNext(Js(new\r
             {\r
                 api_maparea_id = 1,\r
@@ -560,6 +553,7 @@ namespace KancolleSniffer.Test
             battleInfo.InjectResultStatus(\r
                 org.ToArray(), new ShipStatus[0],\r
                 new ShipStatus[0], new ShipStatus[0]);\r
+\r
             questInfo.InspectMapNext(Js(new\r
             {\r
                 api_maparea_id = 5,\r
@@ -567,6 +561,8 @@ namespace KancolleSniffer.Test
                 api_event_id = 4\r
             }));\r
             questInfo.InspectBattleResult(Js(new {api_win_rank = "S"}));\r
+            PAssert.That(() => questInfo.Quests[0].Count.Now == 0);\r
+\r
             questInfo.InspectMapNext(Js(new\r
             {\r
                 api_maparea_id = 5,\r
@@ -614,6 +610,7 @@ namespace KancolleSniffer.Test
                 ShipStatus(7), ShipStatus(11), ShipStatus(3),\r
                 ShipStatus(3), ShipStatus(2), ShipStatus(2)\r
             }, new ShipStatus[0], new ShipStatus[0], new ShipStatus[0]);\r
+\r
             questInfo.InspectMapNext(Js(new\r
             {\r
                 api_maparea_id = 4,\r
@@ -621,6 +618,8 @@ namespace KancolleSniffer.Test
                 api_event_id = 4\r
             }));\r
             questInfo.InspectBattleResult(Js(new {api_win_rank = "S"}));\r
+            PAssert.That(() => questInfo.Quests[0].Count.Now == 0);\r
+\r
             questInfo.InspectMapNext(Js(new\r
             {\r
                 api_maparea_id = 4,\r
@@ -652,6 +651,7 @@ namespace KancolleSniffer.Test
                 ShipStatus(2), ShipStatus(5), ShipStatus(3),\r
                 ShipStatus(2), ShipStatus(2), ShipStatus(2)\r
             }, new ShipStatus[0], new ShipStatus[0], new ShipStatus[0]);\r
+\r
             questInfo.InspectMapNext(Js(new\r
             {\r
                 api_maparea_id = 2,\r
@@ -659,6 +659,8 @@ namespace KancolleSniffer.Test
                 api_event_id = 4\r
             }));\r
             questInfo.InspectBattleResult(Js(new {api_win_rank = "S"}));\r
+            PAssert.That(() => questInfo.Quests[0].Count.Now == 0);\r
+\r
             questInfo.InspectMapNext(Js(new\r
             {\r
                 api_maparea_id = 2,\r
@@ -701,6 +703,16 @@ namespace KancolleSniffer.Test
             {\r
                 api_maparea_id = 2,\r
                 api_mapinfo_no = 4,\r
+                api_event_id = 4\r
+            }));\r
+            questInfo.InspectBattleResult(Js(new { api_win_rank = "S" }));\r
+            PAssert.That(() => questInfo.Quests[1].Count.NowArray.SequenceEqual(new[] { 0, 0, 0, 0 }));\r
+            PAssert.That(() => questInfo.Quests[0].Count.Now == 0);\r
+\r
+            questInfo.InspectMapNext(Js(new\r
+            {\r
+                api_maparea_id = 2,\r
+                api_mapinfo_no = 4,\r
                 api_event_id = 5\r
             }));\r
             questInfo.InspectBattleResult(Js(new {api_win_rank = "A"}));\r
@@ -760,6 +772,8 @@ namespace KancolleSniffer.Test
                 api_mapinfo_no = 6,\r
                 api_event_id = 4\r
             }));\r
+            PAssert.That(() => questInfo.Quests[0].Count.Now == 0);\r
+\r
             questInfo.InspectMapNext(Js(new\r
             {\r
                 api_maparea_id = 1,\r
@@ -803,6 +817,7 @@ namespace KancolleSniffer.Test
                 ShipStatus(2), ShipStatus(3), ShipStatus(3),\r
                 ShipStatus(2), ShipStatus(2), ShipStatus(16)\r
             }, new ShipStatus[0], new ShipStatus[0], new ShipStatus[0]);\r
+\r
             questInfo.InspectMapNext(Js(new\r
             {\r
                 api_maparea_id = 6,\r
@@ -810,6 +825,8 @@ namespace KancolleSniffer.Test
                 api_event_id = 4\r
             }));\r
             questInfo.InspectBattleResult(Js(new {api_win_rank = "A"}));\r
+            PAssert.That(() => questInfo.Quests[0].Count.Now == 0);\r
+\r
             questInfo.InspectMapNext(Js(new\r
             {\r
                 api_maparea_id = 6,\r
@@ -847,6 +864,7 @@ namespace KancolleSniffer.Test
                 ShipStatus(3), ShipStatus(2), ShipStatus(2),\r
                 ShipStatus(2), ShipStatus(2), ShipStatus(2)\r
             }, new ShipStatus[0], new ShipStatus[0], new ShipStatus[0]);\r
+\r
             questInfo.InspectMapNext(Js(new\r
             {\r
                 api_maparea_id = 3,\r
@@ -854,6 +872,8 @@ namespace KancolleSniffer.Test
                 api_event_id = 4\r
             }));\r
             questInfo.InspectBattleResult(Js(new {api_win_rank = "A"}));\r
+            PAssert.That(() => questInfo.Quests[0].Count.NowArray[0] == 0);\r
+\r
             questInfo.InspectMapNext(Js(new\r
             {\r
                 api_maparea_id = 3,\r
@@ -902,6 +922,7 @@ namespace KancolleSniffer.Test
                 ShipStatus(2, 543), ShipStatus(8, 360), ShipStatus(11, 545),\r
                 ShipStatus(18, 467), ShipStatus(11, 261), ShipStatus(2, 344)\r
             }, new ShipStatus[0], new ShipStatus[0], new ShipStatus[0]);\r
+\r
             questInfo.InspectMapNext(Js(new\r
             {\r
                 api_maparea_id = 5,\r
@@ -909,6 +930,8 @@ namespace KancolleSniffer.Test
                 api_event_id = 4\r
             }));\r
             questInfo.InspectBattleResult(Js(new {api_win_rank = "S"}));\r
+            PAssert.That(() => questInfo.Quests[0].Count.Now == 0);\r
+\r
             questInfo.InspectMapNext(Js(new\r
             {\r
                 api_maparea_id = 5,\r
@@ -954,6 +977,7 @@ namespace KancolleSniffer.Test
                 ShipStatus(5, 427), ShipStatus(5, 264), ShipStatus(5, 142),\r
                 ShipStatus(5, 417), ShipStatus(2, 144), ShipStatus(2, 195)\r
             }, new ShipStatus[0], new ShipStatus[0], new ShipStatus[0]);\r
+\r
             questInfo.InspectMapNext(Js(new\r
             {\r
                 api_maparea_id = 5,\r
@@ -961,6 +985,8 @@ namespace KancolleSniffer.Test
                 api_event_id = 4\r
             }));\r
             questInfo.InspectBattleResult(Js(new {api_win_rank = "S"}));\r
+            PAssert.That(() => count.NowArray[0] == 0);\r
+\r
             questInfo.InspectMapNext(Js(new\r
             {\r
                 api_maparea_id = 5,\r
@@ -1015,6 +1041,15 @@ namespace KancolleSniffer.Test
             {\r
                 api_maparea_id = 1,\r
                 api_mapinfo_no = 5,\r
+                api_event_id = 4\r
+            }));\r
+            questInfo.InspectBattleResult(Js(new { api_win_rank = "S" }));\r
+            PAssert.That(() => count.NowArray[0] == 0, "1-5");\r
+\r
+            questInfo.InspectMapNext(Js(new\r
+            {\r
+                api_maparea_id = 1,\r
+                api_mapinfo_no = 5,\r
                 api_event_id = 5\r
             }));\r
             questInfo.InspectBattleResult(Js(new {api_win_rank = "A"}));\r
@@ -1088,6 +1123,15 @@ namespace KancolleSniffer.Test
             {\r
                 api_maparea_id = 1,\r
                 api_mapinfo_no = 4,\r
+                api_event_id = 4\r
+            }));\r
+            questInfo.InspectBattleResult(Js(new { api_win_rank = "S" }));\r
+            PAssert.That(() => count.NowArray[1] == 0, "1-4");\r
+\r
+            questInfo.InspectMapNext(Js(new\r
+            {\r
+                api_maparea_id = 1,\r
+                api_mapinfo_no = 4,\r
                 api_event_id = 5\r
             }));\r
             questInfo.InspectBattleResult(Js(new {api_win_rank = "S"}));\r