装備について矛盾があるのでログを差し替える

diff --git a/KancolleSniffer.Test/LoggerTest.cs b/KancolleSniffer.Test/LoggerTest.cs
index cf2f301..b2fc423 100644 (file)
--- a/KancolleSniffer.Test/LoggerTest.cs
+++ b/KancolleSniffer.Test/LoggerTest.cs
@@ -272,7 +272,7 @@ namespace KancolleSniffer.Test
             sniffer.SetLogWriter((path, s, h) => { result += s + "|"; }, () => new DateTime(2015, 1, 1));\r
             sniffer.EnableLog(LogType.Material);\r
             SnifferTest.SniffLogFile(sniffer, "battle_001");\r
-            PAssert.That(() => "2015-01-01 00:00:00,39636,36912,43064,47519,1329,1424,2030,19|"+\r
+            PAssert.That(() => "2015-01-01 00:00:00,39636,36912,43064,47519,1329,1424,2030,19|" +\r
                                "2015-01-01 00:00:00,39636,36912,43064,47519,1329,1424,2030,19|"\r
                                == result);\r
         }\r
@@ -285,8 +285,8 @@ namespace KancolleSniffer.Test
             sniffer.SetLogWriter((path, s, h) => { result += s + "|"; }, () => new DateTime(2015, 1, 1));\r
             sniffer.EnableLog(LogType.CreateItem);\r
             SnifferTest.SniffLogFile(sniffer, "createitem_001");\r
-            PAssert.That(() => "2015-01-01 00:00:00,7.7mm機銃,対空機銃,10,20,20,10,天津風改(127),114|" +\r
-                               "2015-01-01 00:00:00,失敗,,10,20,20,10,天津風改(127),114|"\r
+            PAssert.That(() => "2015-01-01 00:00:00,12cm単装砲,小口径主砲,10,10,30,10,綾波改二(145),120|" +\r
+                               "2015-01-01 00:00:00,失敗,,10,10,30,10,綾波改二(145),120|"\r
                                == result);\r
         }\r
 \r
@@ -298,8 +298,8 @@ namespace KancolleSniffer.Test
             sniffer.SetLogWriter((path, s, h) => { result += s + "|"; }, () => new DateTime(2015, 1, 1));\r
             sniffer.EnableLog(LogType.CreateShip);\r
             SnifferTest.SniffLogFile(sniffer, "createship_001");\r
-            PAssert.That(() => "2015-01-01 00:00:00,通常艦建造,球磨,軽巡洋艦,30,30,30,30,1,1,明石改(50),116|" +\r
-                               "2015-01-01 00:00:00,大型艦建造,筑摩,重巡洋艦,1500,1500,2000,1000,1,0,明石改(50),116|"\r
+            PAssert.That(() => "2015-01-01 00:00:00,通常艦建造,雷,駆逐艦,30,30,30,30,1,1,綾波改二(145),120|" +\r
+                               "2015-01-01 00:00:00,大型艦建造,霧島,高速戦艦,1500,1500,2000,1000,1,0,綾波改二(145),120|"\r
                                == result);\r
         }\r
 \r

diff --git a/KancolleSniffer.Test/SnifferTest.cs b/KancolleSniffer.Test/SnifferTest.cs
index 89ddbeb..8895f8f 100644 (file)
--- a/KancolleSniffer.Test/SnifferTest.cs
+++ b/KancolleSniffer.Test/SnifferTest.cs
@@ -572,7 +572,7 @@ namespace KancolleSniffer.Test
         {\r
             var sniffer = new Sniffer();\r
             SniffLogFile(sniffer, "createitem_001");\r
-            PAssert.That(() => sniffer.Item.NowEquips == 606);\r
+            PAssert.That(() => sniffer.Item.NowEquips == 900);\r
         }\r
 \r
         /// <summary>\r

diff --git a/KancolleSniffer.Test/logs b/KancolleSniffer.Test/logs
index 48dbfae..57c0fb0 160000 (submodule)
--- a/KancolleSniffer.Test/logs
+++ b/KancolleSniffer.Test/logs
@@ -1 +1 @@
-Subproject commit 48dbfae75e7584b5ab9488e49d26d2dab5f51e13
+Subproject commit 57c0fb0663cb2c5d83f39f16c4487c9929572ef3