コンストラクタでファイルパスを与えて読み書きする機能を追加，メソッドの整理

[karinto/karinto.git] / KarintoTest / CsvReaderTest.cs

diff --git a/KarintoTest/CsvReaderTest.cs b/KarintoTest/CsvReaderTest.cs
index e6ca2c7..1c6eaf7 100755 (executable)
--- a/KarintoTest/CsvReaderTest.cs
+++ b/KarintoTest/CsvReaderTest.cs
@@ -25,7 +25,8 @@ namespace KarintoTest
         {\r
             CsvReader<Data.XY2ChDataTable> reader = \r
                                         new CsvReader<Data.XY2ChDataTable>();\r
-            Data.XY2ChDataTable table = reader.Read("Resources/d_d_d.csv");\r
+            Data.XY2ChDataTable table = \r
+                                reader.ReadWithCaption("Resources/d_d_d.csv");\r
 \r
             Assert.AreEqual("Header1", table.XColumn.Caption);\r
             Assert.AreEqual("Header2", table.Y1Column.Caption);\r
@@ -49,7 +50,8 @@ namespace KarintoTest
         {\r
             CsvReader<Data.XY1ChDataTable> reader =\r
                                         new CsvReader<Data.XY1ChDataTable>();\r
-            Data.XY1ChDataTable table = reader.Read("Resources/d_d_d.csv");\r
+            Data.XY1ChDataTable table = \r
+                                reader.ReadWithCaption("Resources/d_d_d.csv");\r
 \r
             Assert.AreEqual("Header1", table.XColumn.Caption);\r
             Assert.AreEqual("Header2", table.YColumn.Caption);\r
@@ -74,7 +76,7 @@ namespace KarintoTest
             CsvReader reader = new CsvReader(prototype);\r
             prototype = null;\r
 \r
-            DataTable table = reader.Read("Resources/d_d_d.csv");\r
+            DataTable table = reader.ReadWithCaption("Resources/d_d_d.csv");\r
 \r
             Assert.AreEqual("Header1", table.Columns["X"].Caption);\r
             Assert.AreEqual("Header2", table.Columns["Y1"].Caption);\r