X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=KancolleSniffer.Test%2FSnifferTest.cs;h=480ac46a8cc5ff7a881289d0f74e1514a0668ec7;hb=7adeba32af9cf19c7174215aadc2f8fce8f4bbb4;hp=493403bc0282f07dd4f581765eec181c4f59445b;hpb=8b5b8dbf9a23c34066ef5bacc6a0a69d55d4d0d5;p=kancollesniffer%2FKancolleSniffer.git

diff --git a/KancolleSniffer.Test/SnifferTest.cs b/KancolleSniffer.Test/SnifferTest.cs
index 493403b..480ac46 100644
--- a/KancolleSniffer.Test/SnifferTest.cs
+++ b/KancolleSniffer.Test/SnifferTest.cs
@@ -60,7 +60,6 @@ namespace KancolleSniffer.Test
             }
         }
 
-
         /// <summary>
         /// 4-2-1で開幕対潜雷撃を含む戦闘を行う
         /// </summary>
@@ -125,7 +124,7 @@ namespace KancolleSniffer.Test
         {
             var sniffer = new Sniffer();
             SniffLogFile(sniffer, "practice_001");
-            PAssert.That(() => sniffer.WrongBattleResult.Count == 0);
+            PAssert.That(() => !sniffer.IsBattleResultStatusError);
         }
 
         /// <summary>
@@ -136,7 +135,7 @@ namespace KancolleSniffer.Test
         {
             var sniffer = new Sniffer();
             SniffLogFile(sniffer, "combined_battle_001");
-            PAssert.That(() => sniffer.WrongBattleResult.Count == 0);
+            PAssert.That(() => !sniffer.IsBattleResultStatusError);
         }
 
         /// <summary>
@@ -147,7 +146,7 @@ namespace KancolleSniffer.Test
         {
             var sniffer = new Sniffer();
             SniffLogFile(sniffer, "combined_battle_002");
-            PAssert.That(() => sniffer.WrongBattleResult.Count == 0);
+            PAssert.That(() => !sniffer.IsBattleResultStatusError);
         }
 
         /// <summary>
@@ -158,7 +157,7 @@ namespace KancolleSniffer.Test
         {
             var sniffer = new Sniffer();
             SniffLogFile(sniffer, "combined_battle_003");
-            PAssert.That(() => sniffer.WrongBattleResult.Count == 0);
+            PAssert.That(() => !sniffer.IsBattleResultStatusError);
         }
 
         /// <summary>
@@ -181,7 +180,7 @@ namespace KancolleSniffer.Test
         {
             var sniffer = new Sniffer();
             SniffLogFile(sniffer, "sp_midnight_002");
-            PAssert.That(() => sniffer.Battle.WrongResultRank.Count == 0);
+            PAssert.That(() => !sniffer.Battle.DisplayedResultRank.IsError);
         }
 
         /// <summary>
@@ -192,7 +191,19 @@ namespace KancolleSniffer.Test
         {
             var sniffer = new Sniffer();
             SniffLogFile(sniffer, "nighttoday_001");
-            PAssert.That(() => sniffer.Battle.WrongResultRank.Count == 0 && sniffer.WrongBattleResult.Count == 0);
+            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.GetShipStatuses(2)[1].Escaped);
+            PAssert.That(() => !sniffer.IsBattleResultStatusError);
         }
 
         /// <summary>
@@ -249,9 +260,9 @@ namespace KancolleSniffer.Test
         {
             var sniffer = new Sniffer();
             SniffLogFile(sniffer, "baseaircorps_001");
-            PAssert.That(() => sniffer.BaseAirCorps[0].AirCorps[0].FighterPower[1] == 301);
+            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[1] == 320);
+            PAssert.That(() => sniffer.BaseAirCorps[0].AirCorps[0].FighterPower.Interception[1] == 320);
         }
 
         /// <summary>
@@ -262,7 +273,7 @@ namespace KancolleSniffer.Test
         {
             var sniffer = new Sniffer();
             SniffLogFile(sniffer, "baseaircorps_002");
-            PAssert.That(() => sniffer.BaseAirCorps[0].AirCorps[2].FighterPower[0] == 353);
+            PAssert.That(() => sniffer.BaseAirCorps[0].AirCorps[2].FighterPower.Interception[0] == 353);
         }
 
         /// <summary>
@@ -273,7 +284,7 @@ namespace KancolleSniffer.Test
         {
             var sniffer = new Sniffer();
             SniffLogFile(sniffer, "baseaircorps_003");
-            PAssert.That(() => sniffer.BaseAirCorps[1].AirCorps[0].FighterPower[0] == 121);
+            PAssert.That(() => sniffer.BaseAirCorps[1].AirCorps[0].FighterPower.AirCombat[0] == 121);
         }
 
         /// <summary>
@@ -636,5 +647,18 @@ namespace KancolleSniffer.Test
             SniffLogFile(sniffer, "nyukyo_001");
             PAssert.That(() => sniffer.RepairList.Length == 1);
         }
+
+        /// <summary>
+        /// 一括解体する(装備保管なしとあり)
+        /// </summary>
+        [TestMethod]
+        public void DestroyShip()
+        {
+            var sniffer = new Sniffer();
+            SniffLogFile(sniffer, "destroyship_001");
+            PAssert.That(() => sniffer.Item.NowShips == 250);
+            PAssert.That(() => sniffer.Item.NowEquips == 1118);
+            PAssert.That(() => sniffer.Material.Current.Take(4).SequenceEqual(new[] {285615, 286250, 291010, 284744}));
+        }
     }
 }
\ No newline at end of file