Revize 27aa66b5

re #9037 Fixing json parser tests to work w/ IDataDownloader

Server/ServerApp/DataDownload/IDataDownloader.cs

@@ -6 +6 @@
 
 namespace ServerApp.DataDownload
 {
-	interface IDataDownloader
+	public interface IDataDownloader
 	{
 		/// <summary>
 		/// Downloads json file - returns contents of said file

Server/ServerApp/Program.cs

@@ -35 +35 @@
         static void Main(string[] args)
         {
             XmlConfigurator.Configure();
-            // SETUP FOLDERS
-            Config config = FillConfigInfo(args);
+
+			// SETUP FOLDERS
+			Config config = FillConfigInfo(args);
 			if (config == null)
 			{
 				Console.ReadLine();
@@ -46 +47 @@
 			// data download test
 			DataDownloader dd = DataDownloadAndRetrievalTest(config);
 
+
 			// xml building test
 			//XMLTest();
 
@@ -68 +70 @@
 			inputThread.Start();
 
 			// connection test
-			ConnectionTest(controller, config);
+			//ConnectionTest(controller, config);
 
 			Console.ReadLine();
         }

Server/ServerApp/Properties/launchSettings.json

@@ -2 +2 @@
   "profiles": {
     "ServerApp": {
       "commandName": "Project",
-      "commandLineArgs": "C:\\Users\\kalivoda\\University\\KIV-ASWI\\aswi2021tri-musketyri\\Server\\ServerApp\\server_config"
+      "commandLineArgs": ".\\server_config"
     }
   }
 }

Server/ServerApp/WeatherPredictionParser/JsonParser.cs

@@ -22 +22 @@
     public class JsonParser : IJsonParser
     {
         /// <summary> Data downloader </summary>
-        DataDownloader downloader;
+        IDataDownloader downloader;
         /// <summary> Data loader </summary>
         IDataLoader loader;
         /// <summary> Currently parsed day </summary>
@@ -36 +36 @@
         /// Constructor
         /// </summary>
         /// <param name="downloader"></param>
-        public JsonParser(DataDownloader downloader, IDataLoader loader)
+        public JsonParser(IDataDownloader downloader, IDataLoader loader)
         {
             this.downloader = downloader;
             this.loader = loader;
@@ -111 +111 @@
             sunsetTime = new List<DateTime>();
 
             // get file
-            string file = downloader.DownloadWeatherPrediction();
-            string data = loader.LoadPredictionFile(file);
+            //string file = downloader.DownloadWeatherPrediction();
+            //string data = loader.LoadPredictionFile(file);
 
-            if (data == null)
-                return;
+            // get data
+            string data = downloader.DownloadWeatherPrediction();
 
             DateTime now = DateTime.Now;
 
             Current = new WeatherInfo();
             Predictions = new List<WeatherInfo>();
 
-            // parse
-            JsonDocument doc = JsonDocument.Parse(data);
-            JsonElement root = doc.RootElement;
-            var weatherP = root.EnumerateObject();
+            if (data == null || data.Length == 0)
+                return;
 
-            while (weatherP.MoveNext())
+            // parse
+            try
             {
-                string name = weatherP.Current.Name;
-                Console.WriteLine(name);
+                JsonDocument doc = JsonDocument.Parse(data);
+                JsonElement root = doc.RootElement;
+                var weatherP = root.EnumerateObject();
 
-                switch (name)
+                while (weatherP.MoveNext())
                 {
-                    // current weather
-                    case "current_condition":
-                        {
-                            ArrayEnumerator currentWeather = weatherP.Current.Value.EnumerateArray();
-                            Current = ParseCurrentWeather(currentWeather);
-
-                            break;
-                        }
-                    // weather prediction
-                    case "weather":
-                        {
-                            ArrayEnumerator weather = weatherP.Current.Value.EnumerateArray();
-                            ParseWeatherPredict(weather);
-
-                            break;
-                        }
+                    string name = weatherP.Current.Name;
+                    Console.WriteLine(name);
+
+                    switch (name)
+                    {
+                        // current weather
+                        case "current_condition":
+                            {
+                                ArrayEnumerator currentWeather = weatherP.Current.Value.EnumerateArray();
+                                Current = ParseCurrentWeather(currentWeather);
+
+                                break;
+                            }
+                        // weather prediction
+                        case "weather":
+                            {
+                                ArrayEnumerator weather = weatherP.Current.Value.EnumerateArray();
+                                ParseWeatherPredict(weather);
+
+                                break;
+                            }
+                    }
                 }
-            }
 
-            // sunrise + sunset into data
-            EncompassSunRiseSetTimes();
+                // sunrise + sunset into data
+                EncompassSunRiseSetTimes();
+            } catch
+            {
+                Console.WriteLine("Weather prediction file in incorrect format");
+            }
 
             //TestConsoleOutput();
         }

Server/ServerAppFunctionalTests/ParserTests/JsonParserTesting.cs

@@ -270 +270 @@
 }";
         }
 
+        string SetIncorrectInput()
+        {
+            // TODO
+            return "data";
+        }
+
         [TestMethod]
         public void JsonParserTestCurrent()
         {
@@ -277 +283 @@
 
             string data = SetBasicData();
 
-            Mock<DataDownloader> dl = new Mock<DataDownloader>("", "", "");
-            dl.Setup(m => m.DownloadWeatherPrediction()).Returns("test");
+            Mock<IDataDownloader> dl = new Mock<IDataDownloader>();
+            dl.Setup(m => m.DownloadWeatherPrediction()).Returns(data);
 
             Mock<IDataLoader> l = new Mock<IDataLoader>();
-            l.Setup(m => m.LoadPredictionFile("test")).Returns(data);
 
             JsonParser target = new JsonParser(dl.Object, l.Object);
 
@@ -291 +296 @@
             Assert.AreEqual(new WeatherInfo(new DateTime(2021, 5, 25, 13, 29, 0), 4, 0, 3.611, ValueToConditions.CloudCoverToConditions(100), 0), current);
         }
 
+        [TestMethod]
+        public void JsonParserNoneInput()
+        {
+            TagInfo.CreateDictionaries();
+
+            string data = "";
+
+            Mock<IDataDownloader> dl = new Mock<IDataDownloader>();
+            dl.Setup(m => m.DownloadWeatherPrediction()).Returns(data);
+
+            Mock<IDataLoader> l = new Mock<IDataLoader>();
+
+            JsonParser target = new JsonParser(dl.Object, l.Object);
+
+            target.ParsePrediction();
+            WeatherInfo current = target.Current;
+            List<WeatherInfo> res = target.Predictions;
+
+            Assert.AreEqual(0, res.Count);
+            Assert.AreEqual(new WeatherInfo(new DateTime(), 0, 0, 0, WeatherConditions.Dark, 0), current);
+        }
+
+        [TestMethod]
+        public void JsonParserNullInput()
+        {
+            TagInfo.CreateDictionaries();
+
+            string data = null;
+
+            Mock<IDataDownloader> dl = new Mock<IDataDownloader>();
+            dl.Setup(m => m.DownloadWeatherPrediction()).Returns(data);
+
+            Mock<IDataLoader> l = new Mock<IDataLoader>();
+
+            JsonParser target = new JsonParser(dl.Object, l.Object);
+
+            target.ParsePrediction();
+            WeatherInfo current = target.Current;
+            List<WeatherInfo> res = target.Predictions;
+
+            Assert.AreEqual(0, res.Count);
+            Assert.AreEqual(new WeatherInfo(new DateTime(), 0, 0, 0, WeatherConditions.Dark, 0), current);
+        }
+
+        [TestMethod]
+        public void JsonParserIncorrectInput()
+        {
+            TagInfo.CreateDictionaries();
+
+            string data = SetIncorrectInput();
+
+            Mock<IDataDownloader> dl = new Mock<IDataDownloader>();
+            dl.Setup(m => m.DownloadWeatherPrediction()).Returns(data);
+
+            Mock<IDataLoader> l = new Mock<IDataLoader>();
+
+            JsonParser target = new JsonParser(dl.Object, l.Object);
+
+            target.ParsePrediction();
+            WeatherInfo current = target.Current;
+            List<WeatherInfo> res = target.Predictions;
+
+            Assert.AreEqual(0, res.Count);
+            Assert.AreEqual(new WeatherInfo(new DateTime(), 0, 0, 0, WeatherConditions.Dark, 0), current);
+        }
+
         [TestMethod]
         public void JsonParserTestPrediction()
         {
             string data = SetBasicData();
 
-            Mock<DataDownloader> dl = new Mock<DataDownloader>("", "", "");
-            dl.Setup(m => m.DownloadWeatherPrediction()).Returns("test");
+            Mock<IDataDownloader> dl = new Mock<IDataDownloader>();
+            dl.Setup(m => m.DownloadWeatherPrediction()).Returns(data);
 
             Mock<IDataLoader> l = new Mock<IDataLoader>();
-            l.Setup(m => m.LoadPredictionFile("test")).Returns(data);
 
             JsonParser target = new JsonParser(dl.Object, l.Object);
 
@@ -321 +391 @@
         {
             string data = SetAstronomyData();
 
-            Mock<DataDownloader> dl = new Mock<DataDownloader>("", "", "");
-            dl.Setup(m => m.DownloadWeatherPrediction()).Returns("test");
+            Mock<IDataDownloader> dl = new Mock<IDataDownloader>();
+            dl.Setup(m => m.DownloadWeatherPrediction()).Returns(data);
 
             Mock<IDataLoader> l = new Mock<IDataLoader>();
-            l.Setup(m => m.LoadPredictionFile("test")).Returns(data);
 
             JsonParser target = new JsonParser(dl.Object, l.Object);
 
@@ -351 +420 @@
         public void GetPredictionForTimeFilter()
         {
             string data = "";
-            Mock<DataDownloader> dl = new Mock<DataDownloader>("", "", "");
-            dl.Setup(m => m.DownloadWeatherPrediction()).Returns("test");
+
+            Mock<IDataDownloader> dl = new Mock<IDataDownloader>();
+            dl.Setup(m => m.DownloadWeatherPrediction()).Returns(data);
 
             Mock<IDataLoader> l = new Mock<IDataLoader>();
-            l.Setup(m => m.LoadPredictionFile("test")).Returns(data);
 
             JsonParser target = new JsonParser(dl.Object, l.Object);
 
@@ -388 +457 @@
         public void GetPredictionForTimeInvalidInput()
         {
             string data = "";
-            Mock<DataDownloader> dl = new Mock<DataDownloader>("", "", "");
-            dl.Setup(m => m.DownloadWeatherPrediction()).Returns("test");
+
+            Mock<IDataDownloader> dl = new Mock<IDataDownloader>();
+            dl.Setup(m => m.DownloadWeatherPrediction()).Returns(data);
 
             Mock<IDataLoader> l = new Mock<IDataLoader>();
-            l.Setup(m => m.LoadPredictionFile("test")).Returns(data);
 
             JsonParser target = new JsonParser(dl.Object, l.Object);
 
@@ -418 +487 @@
         public void GetPredictionForTimeAllTo()
         {
             string data = "";
-            Mock<DataDownloader> dl = new Mock<DataDownloader>("", "", "");
-            dl.Setup(m => m.DownloadWeatherPrediction()).Returns("test");
+
+            Mock<IDataDownloader> dl = new Mock<IDataDownloader>();
+            dl.Setup(m => m.DownloadWeatherPrediction()).Returns(data);
 
             Mock<IDataLoader> l = new Mock<IDataLoader>();
-            l.Setup(m => m.LoadPredictionFile("test")).Returns(data);
 
             JsonParser target = new JsonParser(dl.Object, l.Object);
 
@@ -453 +522 @@
         public void GetPredictionForTimeAllFrom()
         {
             string data = "";
-            Mock<DataDownloader> dl = new Mock<DataDownloader>("", "", "");
-            dl.Setup(m => m.DownloadWeatherPrediction()).Returns("test");
+
+            Mock<IDataDownloader> dl = new Mock<IDataDownloader>();
+            dl.Setup(m => m.DownloadWeatherPrediction()).Returns(data);
 
             Mock<IDataLoader> l = new Mock<IDataLoader>();
-            l.Setup(m => m.LoadPredictionFile("test")).Returns(data);
 
             JsonParser target = new JsonParser(dl.Object, l.Object);
 
@@ -485 +554 @@
 
             // TODO make an input file
             string data = "";
-            Mock<DataDownloader> dl = new Mock<DataDownloader>("", "", "");
-            dl.Setup(m => m.DownloadWeatherPrediction()).Returns("test");
+
+            Mock<IDataDownloader> dl = new Mock<IDataDownloader>();
+            dl.Setup(m => m.DownloadWeatherPrediction()).Returns(data);
 
             Mock<IDataLoader> l = new Mock<IDataLoader>();
-            l.Setup(m => m.LoadPredictionFile("test")).Returns(data);
 
             JsonParser target = new JsonParser(dl.Object, l.Object);
 

Server/ServerAppFunctionalTests/ParserTests/WeatherParserTesting.cs

@@ -197 +197 @@
             Assert.AreEqual(new WeatherInfo(new DateTime(2000, 2, 1, 11, 0, 0), 5, 0, 2, 60_000, 2), retVal[2]);
             Assert.AreEqual(new WeatherInfo(new DateTime(2000, 2, 1, 13, 0, 0), 10, 25, 2, 10_000, 2), retVal[3]);
             Assert.AreEqual(new WeatherInfo(new DateTime(2000, 2, 1, 15, 0, 0), 15, 40, 2, 10_000, 2), retVal[4]);
+
+            retVal = (List<WeatherInfo>)obj.Invoke("ProcessOneWeatherFileAsIntervals", path, 3, new DateTime(2000, 1, 1, 8, 0, 0), new DateTime(2001, 1, 1, 11, 0, 0));
+
+            Assert.AreEqual(5, retVal.Count);
+            Assert.AreEqual(new DateTime(2000, 1, 1, 7, 0, 0), retVal[0].startTime);
+            Assert.AreEqual(new DateTime(2000, 1, 1, 10, 0, 0), retVal[1].startTime);
+            Assert.AreEqual(new DateTime(2000, 2, 1, 10, 0, 0), retVal[2].startTime);
+            Assert.AreEqual(new DateTime(2000, 2, 1, 13, 0, 0), retVal[3].startTime);
+            Assert.AreEqual(new DateTime(2000, 2, 1, 16, 0, 0), retVal[4].startTime);
         }