索敵に航空偵察スコアを表示する

[kancollesniffer/KancolleSniffer.git] / KancolleSniffer.Test / SnifferTest.cs

diff --git a/KancolleSniffer.Test/SnifferTest.cs b/KancolleSniffer.Test/SnifferTest.cs
index 5e0ee29..ec3c5ef 100644 (file)
--- a/KancolleSniffer.Test/SnifferTest.cs
+++ b/KancolleSniffer.Test/SnifferTest.cs
@@ -17,9 +17,9 @@ 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 KancolleSniffer.Util;\r
 using Microsoft.VisualStudio.TestTools.UnitTesting;\r
 using static System.Math;\r
 \r
@@ -73,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
@@ -221,6 +221,18 @@ namespace KancolleSniffer.Test
         }\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
         /// 触接開始率を正しく計算する\r
         /// </summary>\r
         [TestMethod]\r
@@ -351,6 +363,17 @@ namespace KancolleSniffer.Test
         }\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
@@ -843,7 +866,7 @@ namespace KancolleSniffer.Test
             var miscTextInfo = new MiscTextInfo(null, null);\r
             using (var stream = OpenLogFile("mapgauge_003"))\r
             {\r
-                miscTextInfo.InspectMapInfo(JsonParser.Parse(stream.ReadToEnd()));\r
+                miscTextInfo.InspectMapInfo(JsonObject.Parse(stream.ReadToEnd()));\r
             }\r
             PAssert.That(() =>\r
                 miscTextInfo.Text ==\r