Revize 26ecc756

re #8962 Adding reading of file to string to CsvDataLoader

Server/TestProject/ParserTests/TestingParser.cs

@@ -1268 +1268 @@
             string data = SetBasicData();
 
             Mock<DataDownloader> dl = new Mock<DataDownloader>("", "", "");
-            dl.Setup(m => m.DownloadWeatherPrediction()).Returns(data);
+            dl.Setup(m => m.DownloadWeatherPrediction()).Returns("test");
 
-            JsonParser target = new JsonParser(dl.Object);
+            Mock<IDataLoader> l = new Mock<IDataLoader>();
+            l.Setup(m => m.LoadPredictionFile("test")).Returns(data);
+
+            JsonParser target = new JsonParser(dl.Object, l.Object);
 
             target.ParsePrediction();
             WeatherInfo current = target.Current;
@@ -1284 +1287 @@
             string data = SetBasicData();
 
             Mock<DataDownloader> dl = new Mock<DataDownloader>("", "", "");
-            dl.Setup(m => m.DownloadWeatherPrediction()).Returns(data);
+            dl.Setup(m => m.DownloadWeatherPrediction()).Returns("test");
+
+            Mock<IDataLoader> l = new Mock<IDataLoader>();
+            l.Setup(m => m.LoadPredictionFile("test")).Returns(data);
 
-            JsonParser target = new JsonParser(dl.Object);
+            JsonParser target = new JsonParser(dl.Object, l.Object);
 
             target.ParsePrediction();
             List<WeatherInfo> retVal = target.Predictions;
@@ -1306 +1312 @@
             string data = SetAstronomyData();
 
             Mock<DataDownloader> dl = new Mock<DataDownloader>("", "", "");
-            dl.Setup(m => m.DownloadWeatherPrediction()).Returns(data);
+            dl.Setup(m => m.DownloadWeatherPrediction()).Returns("test");
 
-            JsonParser target = new JsonParser(dl.Object);
+            Mock<IDataLoader> l = new Mock<IDataLoader>();
+            l.Setup(m => m.LoadPredictionFile("test")).Returns(data);
+
+            JsonParser target = new JsonParser(dl.Object, l.Object);
 
             target.ParsePrediction();
             List<WeatherInfo> retVal = target.Predictions;
@@ -1333 +1342 @@
         {
             string data = "";
             Mock<DataDownloader> dl = new Mock<DataDownloader>("", "", "");
-            dl.Setup(m => m.DownloadWeatherPrediction()).Returns(data);
+            dl.Setup(m => m.DownloadWeatherPrediction()).Returns("test");
+
+            Mock<IDataLoader> l = new Mock<IDataLoader>();
+            l.Setup(m => m.LoadPredictionFile("test")).Returns(data);
 
-            JsonParser target = new JsonParser(dl.Object);
+            JsonParser target = new JsonParser(dl.Object, l.Object);
 
             List<WeatherInfo> pred = new List<WeatherInfo>();
             pred.Add(new WeatherInfo(new DateTime(2000, 1, 1, 0, 0, 0), 8, 1, 2, 60_000, 3));
@@ -1367 +1379 @@
         {
             string data = "";
             Mock<DataDownloader> dl = new Mock<DataDownloader>("", "", "");
-            dl.Setup(m => m.DownloadWeatherPrediction()).Returns(data);
+            dl.Setup(m => m.DownloadWeatherPrediction()).Returns("test");
 
-            JsonParser target = new JsonParser(dl.Object);
+            Mock<IDataLoader> l = new Mock<IDataLoader>();
+            l.Setup(m => m.LoadPredictionFile("test")).Returns(data);
+
+            JsonParser target = new JsonParser(dl.Object, l.Object);
 
             List<WeatherInfo> pred = new List<WeatherInfo>();
             pred.Add(new WeatherInfo(new DateTime(2000, 1, 1, 0, 0, 0), 8, 1, 2, 60_000, 3));
@@ -1394 +1409 @@
         {
             string data = "";
             Mock<DataDownloader> dl = new Mock<DataDownloader>("", "", "");
-            dl.Setup(m => m.DownloadWeatherPrediction()).Returns(data);
+            dl.Setup(m => m.DownloadWeatherPrediction()).Returns("test");
+
+            Mock<IDataLoader> l = new Mock<IDataLoader>();
+            l.Setup(m => m.LoadPredictionFile("test")).Returns(data);
 
-            JsonParser target = new JsonParser(dl.Object);
+            JsonParser target = new JsonParser(dl.Object, l.Object);
 
             List<WeatherInfo> pred = new List<WeatherInfo>();
             pred.Add(new WeatherInfo(new DateTime(2000, 1, 1, 0, 0, 0), 8, 1, 2, 60_000, 3));
@@ -1426 +1444 @@
         {
             string data = "";
             Mock<DataDownloader> dl = new Mock<DataDownloader>("", "", "");
-            dl.Setup(m => m.DownloadWeatherPrediction()).Returns(data);
+            dl.Setup(m => m.DownloadWeatherPrediction()).Returns("test");
 
-            JsonParser target = new JsonParser(dl.Object);
+            Mock<IDataLoader> l = new Mock<IDataLoader>();
+            l.Setup(m => m.LoadPredictionFile("test")).Returns(data);
+
+            JsonParser target = new JsonParser(dl.Object, l.Object);
 
             List<WeatherInfo> pred = new List<WeatherInfo>();
             pred.Add(new WeatherInfo(new DateTime(2000, 1, 1, 0, 0, 0), 8, 1, 2, 60_000, 3));
@@ -1455 +1476 @@
             // TODO make an input file
             string data = "";
             Mock<DataDownloader> dl = new Mock<DataDownloader>("", "", "");
-            dl.Setup(m => m.DownloadWeatherPrediction()).Returns(data);
+            dl.Setup(m => m.DownloadWeatherPrediction()).Returns("test");
+
+            Mock<IDataLoader> l = new Mock<IDataLoader>();
+            l.Setup(m => m.LoadPredictionFile("test")).Returns(data);
 
-            JsonParser target = new JsonParser(dl.Object);
+            JsonParser target = new JsonParser(dl.Object, l.Object);
 
             List<WeatherInfo> pred = new List<WeatherInfo>();
             pred.Add(new WeatherInfo(new DateTime(2000, 1, 1, 0, 0, 0), 8, 1, 2, 60_000, 3));