テストを追加

diff --git a/src/test/Python/TestDataReader.py b/src/test/Python/TestDataReader.py
index b8db3aa..aabad4a 100644 (file)
--- a/src/test/Python/TestDataReader.py
+++ b/src/test/Python/TestDataReader.py
@@ -5,10 +5,23 @@ import os
 class TestDataReader(unittest.TestCase):
     def testReadData1(self):
         print("データ読み込みパス："+os.path.dirname(os.path.abspath(__file__)))
-        dataReader = DataReader.DataReader()
-        res = dataReader.read(os.path.abspath("..\\resources\\data\\2007\\USDJPY_1D_10B_2007_0001.txt"))
+        print("データファイル:"+os.path.abspath("..\\resources\\data\\2007\\USDJPY_1D_10B_2007_0001.txt"))
+        data_reader = DataReader.DataReader()
+        res = data_reader.read(os.path.abspath("..\\resources\\data\\2007\\USDJPY_1D_10B_2007_0001.txt"))
         assert len(res.getData()) == 10,"データサイズが不正です"
-        assert res.getLable() == 3 ,res.getLength()+"は期待通りの値ではありません。"
-        print(res.getData())
+        assert res.getLable() == 3 ,res.getLable() + "は期待通りの値ではありません。"
+
+    def test_walk_data_directory(self):
+        data_reader = DataReader.DataReader()
+        data_reader.walkDataDirectory(os.path.abspath("..\\resources\\data\\2007"))
+
+    def test_create_learning_data(self):
+        data_reader = DataReader.DataReader()
+        result=data_reader.createLearningData()
+        print(result[0].getData())
+
+        assert len(result) == 3, str(len(result))+"データ個数が不正です"
+        assert result[0].getLable() == 3
+
 if __name__=="__main__":
     unittest.main()
\ No newline at end of file