From b1b03e136da5bf25cc10001e8ef5e872bd6173fe Mon Sep 17 00:00:00 2001 From: Lars Date: Fri, 23 Oct 2020 23:26:31 +0200 Subject: [PATCH 1/2] Some tests --- .../Tests/JSONConvertCanvasMessages.cs | 187 ++++++++++++++++++ 1 file changed, 187 insertions(+) create mode 100644 Eindproject/Tests/JSONConvertCanvasMessages.cs diff --git a/Eindproject/Tests/JSONConvertCanvasMessages.cs b/Eindproject/Tests/JSONConvertCanvasMessages.cs new file mode 100644 index 0000000..02f6da2 --- /dev/null +++ b/Eindproject/Tests/JSONConvertCanvasMessages.cs @@ -0,0 +1,187 @@ +using Microsoft.VisualStudio.TestTools.UnitTesting; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; +using SharedClientServer; +using System; +using System.Collections.Generic; +using System.Runtime.CompilerServices; +using System.Text; +using System.Windows.Media; + +namespace Tests +{ + [TestClass] + public class JSONConvertCanvasMessages + { + //Helper method for the tests + public byte[] GetPayload(byte[] message) + { + byte[] payload = new byte[message.Length - 5]; + Array.Copy(message, 5, payload, 0, message.Length - 5); + return payload; + } + + public dynamic GetDynamic(byte[] payload) + { + dynamic json = JsonConvert.DeserializeObject(Encoding.UTF8.GetString(payload)); + return json; + } + + [TestMethod] + public void TestConstructCanvasDataSend() + { + int type = JSONConvert.CANVAS_WRITING; + double[][] coordinateInfo = new double[2][]; + double[] coordinatesOne = { 10.0, 10.0, 3.0, 3.0 }; + double[] coordinatesTwo = { 10.0, 10.0, 3.0, 3.0 }; + coordinateInfo[0] = coordinatesOne; + coordinateInfo[1] = coordinatesTwo; + Color color = Color.FromRgb(0, 0, 0); + + byte[] message = JSONConvert.ConstructCanvasDataSend(type, coordinateInfo, color); + byte[] payload = GetPayload(message); + dynamic json = GetDynamic(payload); + int ID = json.canvasType; + JArray coorArray = json.coords; + double[][] coordinates = coorArray.ToObject(); + Color colorResult = json.color; + + Assert.AreEqual(0x04, message[4]); + Assert.AreEqual(type, ID, "The canvas type message is not correct on the ConstructDrawingCanvasData"); + for (int i = 0; i < coordinateInfo.Length; i++) + { + CollectionAssert.AreEqual(coordinateInfo[i], coordinates[i], "Coordinates are not correct on the ConstructDrawingCanvasData"); + } + Assert.AreEqual(color, colorResult, "color is not correct on the ConstructDrawingCanvasData"); + } + + [TestMethod] + public void TestConstructDrawingCanvasData() + { + double[][] coordinateInfo = new double[2][]; + double[] coordinatesOne = {10.0, 10.0, 3.0, 3.0 }; + double[] coordinatesTwo = { 10.0, 10.0, 3.0, 3.0 }; + coordinateInfo[0] = coordinatesOne; + coordinateInfo[1] = coordinatesTwo; + Color color = Color.FromRgb(0, 0, 0); + + byte[] message = JSONConvert.ConstructDrawingCanvasData(coordinateInfo, color); + byte[] payload = GetPayload(message); + dynamic json = GetDynamic(payload); + int ID = json.canvasType; + JArray coorArray = json.coords; + double[][] coordinates = coorArray.ToObject(); + Color colorResult = json.color; + + Assert.AreEqual(0x04, message[4]); + Assert.AreEqual(JSONConvert.CANVAS_WRITING, ID, "The canvas type message is not correct on the ConstructDrawingCanvasData"); + for (int i = 0; i < coordinateInfo.Length; i++) + { + CollectionAssert.AreEqual(coordinateInfo[i], coordinates[i], "Coordinates are not correct on the ConstructDrawingCanvasData"); + } + Assert.AreEqual(color, colorResult, "color is not correct on the ConstructDrawingCanvasData"); + } + + [TestMethod] + public void TestConstructCanvasReset() + { + + dynamic payload = new + { + + }; + + } + + [TestMethod] + public void TestConstructCanvasResetMessage() + { + byte identifier = 0x04; + dynamic payload = new + { + + }; + + } + + [TestMethod] + public void TestGetCanvasMessageType() + { + byte identifier = 0x04; + dynamic payload = new + { + + }; + + } + + [TestMethod] + public void TestgetCoordinates() + { + byte identifier = 0x04; + dynamic payload = new + { + + }; + + } + + [TestMethod] + public void TestGetCanvasDrawingColor() + { + byte identifier = 0x04; + dynamic payload = new + { + + }; + + } + + [TestMethod] + public void TestConstructGameStartData() + { + byte identifier = 0x05; + dynamic payload = new + { + + }; + + } + + [TestMethod] + public void TestConstructGameTimerElapsedMessage() + { + byte identifier = 0x05; + dynamic payload = new + { + + }; + + } + + [TestMethod] + public void TestGetGameCommand() + { + byte identifier = 0x05; + dynamic payload = new + { + + }; + + } + + [TestMethod] + public void TestGetStartGameLobbyID() + { + byte identifier = 0x05; + dynamic payload = new + { + + }; + + } + + + + } +} From 9199265eb69f2f4ae1f41a5247d4226aea676ac3 Mon Sep 17 00:00:00 2001 From: Lars Date: Fri, 23 Oct 2020 23:45:52 +0200 Subject: [PATCH 2/2] [TESTS] tests for the canvas --- .../Tests/JSONConvertCanvasMessages.cs | 113 +++++++----------- 1 file changed, 42 insertions(+), 71 deletions(-) diff --git a/Eindproject/Tests/JSONConvertCanvasMessages.cs b/Eindproject/Tests/JSONConvertCanvasMessages.cs index 02f6da2..7336494 100644 --- a/Eindproject/Tests/JSONConvertCanvasMessages.cs +++ b/Eindproject/Tests/JSONConvertCanvasMessages.cs @@ -85,103 +85,74 @@ namespace Tests [TestMethod] public void TestConstructCanvasReset() { - - dynamic payload = new - { - - }; - - } - - [TestMethod] - public void TestConstructCanvasResetMessage() - { - byte identifier = 0x04; - dynamic payload = new - { - - }; + byte[] canvasReset = JSONConvert.ConstructCanvasReset(); + dynamic json = GetDynamic(GetPayload(canvasReset)); + int ID = json.canvasType; + Assert.AreEqual(JSONConvert.CANVAS_RESET, ID, $"Canvas type should be reset(1)! Not, {ID}"); } [TestMethod] public void TestGetCanvasMessageType() { - byte identifier = 0x04; - dynamic payload = new + int type = JSONConvert.CANVAS_WRITING; + byte IDsend = JSONConvert.CANVAS; + + dynamic payloadSend = new { - + canvasType = type }; + byte[] message = JSONConvert.GetMessageToSend(IDsend, payloadSend); + byte[] payload = GetPayload(message); + int resultID = JSONConvert.GetCanvasMessageType(payload); + Assert.AreEqual(type, resultID, $"Canvas type should be {IDsend}! Not, {resultID}"); } [TestMethod] public void TestgetCoordinates() { - byte identifier = 0x04; - dynamic payload = new + int type = JSONConvert.CANVAS_WRITING; + byte IDsend = JSONConvert.CANVAS; + double[][] coordinateInfo = new double[2][]; + double[] coordinatesOne = { 10.0, 10.0, 3.0, 3.0 }; + double[] coordinatesTwo = { 10.0, 10.0, 3.0, 3.0 }; + coordinateInfo[0] = coordinatesOne; + coordinateInfo[1] = coordinatesTwo; + dynamic payloadSend = new { - + canvasType = type, + coords = coordinateInfo }; + byte[] message = JSONConvert.GetMessageToSend(IDsend, payloadSend); + byte[] payload = GetPayload(message); + double[][] coordinates = JSONConvert.getCoordinates(payload); + + for (int i = 0; i < coordinateInfo.Length; i++) + { + CollectionAssert.AreEqual(coordinateInfo[i], coordinates[i], "Coordinates are not correct on the ConstructDrawingCanvasData"); + } } [TestMethod] public void TestGetCanvasDrawingColor() { - byte identifier = 0x04; - dynamic payload = new + int type = JSONConvert.CANVAS_WRITING; + byte IDsend = JSONConvert.CANVAS; + Color colorSend = Color.FromRgb(0, 0, 0); + dynamic payloadSend = new { - + canvasType = type, + color = colorSend }; + byte[] message = JSONConvert.GetMessageToSend(IDsend, payloadSend); + byte[] payload = GetPayload(message); + Color colorResult = JSONConvert.getCanvasDrawingColor(payload); + + Assert.AreEqual(colorSend, colorResult, "Colors are not equal!"); } - [TestMethod] - public void TestConstructGameStartData() - { - byte identifier = 0x05; - dynamic payload = new - { - - }; - - } - - [TestMethod] - public void TestConstructGameTimerElapsedMessage() - { - byte identifier = 0x05; - dynamic payload = new - { - - }; - - } - - [TestMethod] - public void TestGetGameCommand() - { - byte identifier = 0x05; - dynamic payload = new - { - - }; - - } - - [TestMethod] - public void TestGetStartGameLobbyID() - { - byte identifier = 0x05; - dynamic payload = new - { - - }; - - } - - - } }