From c48e396e819bee6b6f92c54749ec5383bde5d523 Mon Sep 17 00:00:00 2001 From: Logophilist Date: Wed, 28 Oct 2020 12:01:20 +0100 Subject: [PATCH 1/7] UnitTest Push --- ProftaakRH/ProftaakRH.sln | 13 +++++++++++++ UnitTestRH/UnitTest1.cs | 15 +++++++++++++++ UnitTestRH/UnitTestRH.csproj | 16 ++++++++++++++++ 3 files changed, 44 insertions(+) create mode 100644 UnitTestRH/UnitTest1.cs create mode 100644 UnitTestRH/UnitTestRH.csproj diff --git a/ProftaakRH/ProftaakRH.sln b/ProftaakRH/ProftaakRH.sln index 4d66ee3..ee32b8f 100644 --- a/ProftaakRH/ProftaakRH.sln +++ b/ProftaakRH/ProftaakRH.sln @@ -15,6 +15,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Server", "..\Server\Server. EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DoctorApp", "..\DoctorApp\DoctorApp.csproj", "{A232F2D5-AF98-4777-BF3A-FBDDFBC02994}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTestRH", "..\UnitTestRH\UnitTestRH.csproj", "{0B6CCC1D-5E76-420E-B54D-EB3E5FFEA6CB}" + ProjectSection(ProjectDependencies) = postProject + {BECC2E56-E65C-42A0-AF80-DDE32DCD5E0B} = {BECC2E56-E65C-42A0-AF80-DDE32DCD5E0B} + {7D751284-17E8-434C-A7F6-2EB37572E7AE} = {7D751284-17E8-434C-A7F6-2EB37572E7AE} + {7EF854C1-73EB-4099-A7D7-057CCEEE6F8F} = {7EF854C1-73EB-4099-A7D7-057CCEEE6F8F} + {A232F2D5-AF98-4777-BF3A-FBDDFBC02994} = {A232F2D5-AF98-4777-BF3A-FBDDFBC02994} + {C1A3CCE4-5FBB-4655-BFE1-7AF2B7D58CA3} = {C1A3CCE4-5FBB-4655-BFE1-7AF2B7D58CA3} + EndProjectSection +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution ..\Hashing\Hashing.projitems*{70277749-d423-4871-b692-2efc5a6ed932}*SharedItemsImports = 13 @@ -47,6 +56,10 @@ Global {A232F2D5-AF98-4777-BF3A-FBDDFBC02994}.Debug|Any CPU.Build.0 = Debug|Any CPU {A232F2D5-AF98-4777-BF3A-FBDDFBC02994}.Release|Any CPU.ActiveCfg = Release|Any CPU {A232F2D5-AF98-4777-BF3A-FBDDFBC02994}.Release|Any CPU.Build.0 = Release|Any CPU + {0B6CCC1D-5E76-420E-B54D-EB3E5FFEA6CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0B6CCC1D-5E76-420E-B54D-EB3E5FFEA6CB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0B6CCC1D-5E76-420E-B54D-EB3E5FFEA6CB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0B6CCC1D-5E76-420E-B54D-EB3E5FFEA6CB}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/UnitTestRH/UnitTest1.cs b/UnitTestRH/UnitTest1.cs new file mode 100644 index 0000000..ed2dd12 --- /dev/null +++ b/UnitTestRH/UnitTest1.cs @@ -0,0 +1,15 @@ +using Microsoft.VisualStudio.TestTools.UnitTesting; +using RH_Engine; + +namespace UnitTestRH +{ + [TestClass] + public class UnitTest1 + { + [TestMethod] + public void TestMethod1() + { + Command command = new Command(""); + } + } +} diff --git a/UnitTestRH/UnitTestRH.csproj b/UnitTestRH/UnitTestRH.csproj new file mode 100644 index 0000000..8dc9555 --- /dev/null +++ b/UnitTestRH/UnitTestRH.csproj @@ -0,0 +1,16 @@ + + + + netcoreapp3.1 + + false + + + + + + + + + + From a333d6cd8d600527528c9547230032c2006cc5ba Mon Sep 17 00:00:00 2001 From: Logophilist Date: Thu, 29 Oct 2020 22:04:02 +0100 Subject: [PATCH 2/7] UnitTesting set up completed --- UnitTestRH/CommandTest.cs | 47 ++++++++++++++++++++++++++++++++++++ UnitTestRH/UnitTest1.cs | 15 ------------ UnitTestRH/UnitTestRH.csproj | 8 ++++++ 3 files changed, 55 insertions(+), 15 deletions(-) create mode 100644 UnitTestRH/CommandTest.cs delete mode 100644 UnitTestRH/UnitTest1.cs diff --git a/UnitTestRH/CommandTest.cs b/UnitTestRH/CommandTest.cs new file mode 100644 index 0000000..4118ac1 --- /dev/null +++ b/UnitTestRH/CommandTest.cs @@ -0,0 +1,47 @@ +using Microsoft.VisualStudio.TestTools.UnitTesting; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; +using ProftaakRH; +using RH_Engine; +using System; +using System.Linq; + +namespace UnitTestRH +{ + [TestClass] + public class CommandTest + { + [TestMethod] + public void TerrainAdd_TestMethod() + { + string testTunnelID = "dummyTunnelID"; + string testSerial = "dummySerialCode"; + + string payloadId = "tunnel/send"; + string terrainId = "scene/terrain/add"; + + Command command = new Command(testTunnelID); + + + + int[] terrainSizeArray = new int[2] { 4, 4 }; + float[] terrainHeightsArray = new float[16] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; + string terrainAddCommand = command.TerrainAdd(terrainSizeArray, terrainHeightsArray, testSerial); + + dynamic json = JsonConvert.DeserializeObject(terrainAddCommand); + + //Test payload + Assert.AreEqual(payloadId, (string)json.id); + Assert.AreEqual(testTunnelID, (string)json.data.dest); + + //Test terrain + Assert.AreEqual(terrainId, (string)json.data.data.id); + Assert.AreEqual(testSerial, (string)json.data.data.serial); + + //Test terrain settings + JArray jArrayTerrainSize = (JArray)json.data.data.data.size; + Assert.AreEqual(terrainSizeArray, jArrayTerrainSize.ToObject()); + //Assert.AreEqual(terrainHeightsArray, (float[])json.data.data.data.heights); + } + } +} diff --git a/UnitTestRH/UnitTest1.cs b/UnitTestRH/UnitTest1.cs deleted file mode 100644 index ed2dd12..0000000 --- a/UnitTestRH/UnitTest1.cs +++ /dev/null @@ -1,15 +0,0 @@ -using Microsoft.VisualStudio.TestTools.UnitTesting; -using RH_Engine; - -namespace UnitTestRH -{ - [TestClass] - public class UnitTest1 - { - [TestMethod] - public void TestMethod1() - { - Command command = new Command(""); - } - } -} diff --git a/UnitTestRH/UnitTestRH.csproj b/UnitTestRH/UnitTestRH.csproj index 8dc9555..4fae143 100644 --- a/UnitTestRH/UnitTestRH.csproj +++ b/UnitTestRH/UnitTestRH.csproj @@ -13,4 +13,12 @@ + + + + + + + + From acc2fddf82ecc612477a98fc35a1dfe337325fe4 Mon Sep 17 00:00:00 2001 From: Logophilist Date: Thu, 29 Oct 2020 22:51:47 +0100 Subject: [PATCH 3/7] TerrainAdd, AddLayer, UpdateTerrain and renderTerrain tests done --- UnitTestRH/CommandTest.cs | 158 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 152 insertions(+), 6 deletions(-) diff --git a/UnitTestRH/CommandTest.cs b/UnitTestRH/CommandTest.cs index 4118ac1..09ecacd 100644 --- a/UnitTestRH/CommandTest.cs +++ b/UnitTestRH/CommandTest.cs @@ -18,7 +18,7 @@ namespace UnitTestRH string testSerial = "dummySerialCode"; string payloadId = "tunnel/send"; - string terrainId = "scene/terrain/add"; + string messageId = "scene/terrain/add"; Command command = new Command(testTunnelID); @@ -34,14 +34,160 @@ namespace UnitTestRH Assert.AreEqual(payloadId, (string)json.id); Assert.AreEqual(testTunnelID, (string)json.data.dest); - //Test terrain - Assert.AreEqual(terrainId, (string)json.data.data.id); + //Test message + Assert.AreEqual(messageId, (string)json.data.data.id); Assert.AreEqual(testSerial, (string)json.data.data.serial); - //Test terrain settings + //Test terrain JArray jArrayTerrainSize = (JArray)json.data.data.data.size; - Assert.AreEqual(terrainSizeArray, jArrayTerrainSize.ToObject()); - //Assert.AreEqual(terrainHeightsArray, (float[])json.data.data.data.heights); + JArray jArrayTerrainHeights = (JArray)json.data.data.data.heights; + + int[] outSizeArray = jArrayTerrainSize.Select(ja => (int)ja).ToArray(); + float[] outHeightsArray = jArrayTerrainHeights.Select(ja => (float)ja).ToArray(); + + CollectionAssert.AreEqual(terrainSizeArray, outSizeArray); + CollectionAssert.AreEqual(terrainHeightsArray, json.data.data.data.heights.ToObject()); + } + + [TestMethod] + public void AddLayer_TestMethod() + { + string testTunnelID = "dummyTunnelID"; + string testSerial = "dummySerialCode"; + + string payloadId = "tunnel/send"; + string messageId = "scene/node/addlayer"; + + + string testUuid = "dummyUuid"; + string diffuseExpected = @"data\NetworkEngine\textures\terrain\grass_green_d.jpg"; + string normalExpected = @"data\NetworkEngine\textures\terrain\grass_green_n.jpg"; + int minHeightExpected = 0; + int maxHeightExpected = 10; + int fadeDistExpected = 1; + + + Command command = new Command(testTunnelID); + + string terrainAddCommand = command.AddLayer(testUuid, testSerial); + + dynamic json = JsonConvert.DeserializeObject(terrainAddCommand); + + //Test payload + Assert.AreEqual(payloadId, (string)json.id); + Assert.AreEqual(testTunnelID, (string)json.data.dest); + + //Test message + Assert.AreEqual(messageId, (string)json.data.data.id); + Assert.AreEqual(testSerial, (string)json.data.data.serial); + + //Test AddLayer + Assert.AreEqual(testUuid, (string)json.data.data.data.id); + Assert.AreEqual(diffuseExpected, (string)json.data.data.data.diffuse); + Assert.AreEqual(normalExpected, (string)json.data.data.data.normal); + Assert.AreEqual(minHeightExpected, (int)json.data.data.data.minHeight); + Assert.AreEqual(maxHeightExpected, (int)json.data.data.data.maxHeight); + Assert.AreEqual(fadeDistExpected, (int)json.data.data.data.fadeDist); + } + + [TestMethod] + public void UpdateTerrain_TestMethod() + { + string testTunnelID = "dummyTunnelID"; + + string payloadId = "tunnel/send"; + string messageId = "scene/terrain/update"; + + Command command = new Command(testTunnelID); + + string terrainAddCommand = command.UpdateTerrain(); + + dynamic json = JsonConvert.DeserializeObject(terrainAddCommand); + + //Test payload + Assert.AreEqual(payloadId, (string)json.id); + Assert.AreEqual(testTunnelID, (string)json.data.dest); + + //Test message + Assert.AreEqual(messageId, (string)json.data.data.id); + } + + [TestMethod] + public void renderTerrain_TestMethod() + { + string testTunnelID = "dummyTunnelID"; + string testSerial = "dummySerialCode"; + + string payloadId = "tunnel/send"; + string messageId = "scene/node/add"; + + + string nameExpected = "newNode"; + int[] positionExpected = new int[] { -80, 0, -80 }; + float scaleExpected = 1f; + int[] rotationExpected = new int[] { 0, 0, 0 }; + + bool smoothnormalsExpected = true; + + + Command command = new Command(testTunnelID); + + string terrainAddCommand = command.renderTerrain(testSerial); + + dynamic json = JsonConvert.DeserializeObject(terrainAddCommand); + + + //Test payload + Assert.AreEqual(payloadId, (string)json.id); + Assert.AreEqual(testTunnelID, (string)json.data.dest); + + //Test message + Assert.AreEqual(messageId, (string)json.data.data.id); + Assert.AreEqual(testSerial, (string)json.data.data.serial); + + //Test data + Assert.AreEqual(nameExpected, (string)json.data.data.data.name); + + //Test data components + + //Test transform + JArray jArrayPosition = (JArray)json.data.data.data.components.transform.position; + JArray jArrayRotation = (JArray)json.data.data.data.components.transform.rotation; + + int[] outPositionArray = jArrayPosition.Select(ja => (int)ja).ToArray(); + int[] outRotationArray = jArrayRotation.Select(ja => (int)ja).ToArray(); + + CollectionAssert.AreEqual(positionExpected, outPositionArray); + CollectionAssert.AreEqual(rotationExpected, outRotationArray); + + + //Test terrain + Assert.AreEqual(smoothnormalsExpected, (bool)json.data.data.data.components.terrain.smoothnormals); + + } + + [TestMethod] + public void Dummy() + { + string testTunnelID = "dummyTunnelID"; + string testSerial = "dummySerialCode"; + + string payloadId = "tunnel/send"; + string messageId = "scene/node/addlayer"; + + Command command = new Command(testTunnelID); + + string terrainAddCommand = command.AddLayer("Dum", testSerial); + + dynamic json = JsonConvert.DeserializeObject(terrainAddCommand); + + //Test payload + Assert.AreEqual(payloadId, (string)json.id); + Assert.AreEqual(testTunnelID, (string)json.data.dest); + + //Test terrain + Assert.AreEqual(messageId, (string)json.data.data.id); + Assert.AreEqual(testSerial, (string)json.data.data.serial); } } } From c1ee84fd2e168a0a4d637bb57a9d25a3bbc863f8 Mon Sep 17 00:00:00 2001 From: Sem van der Hoeven Date: Thu, 29 Oct 2020 23:31:56 +0100 Subject: [PATCH 4/7] [ADD] added test methods for bools --- ProftaakRH/ProftaakRH.sln | 1 + UnitTestRH/UnitTestRH.csproj | 2 ++ 2 files changed, 3 insertions(+) diff --git a/ProftaakRH/ProftaakRH.sln b/ProftaakRH/ProftaakRH.sln index ee32b8f..69a3946 100644 --- a/ProftaakRH/ProftaakRH.sln +++ b/ProftaakRH/ProftaakRH.sln @@ -26,6 +26,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTestRH", "..\UnitTestRH EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution + ..\Hashing\Hashing.projitems*{0b6ccc1d-5e76-420e-b54d-eb3e5ffea6cb}*SharedItemsImports = 5 ..\Hashing\Hashing.projitems*{70277749-d423-4871-b692-2efc5a6ed932}*SharedItemsImports = 13 ..\Hashing\Hashing.projitems*{7d751284-17e8-434c-a7f6-2eb37572e7ae}*SharedItemsImports = 5 ..\Hashing\Hashing.projitems*{7ef854c1-73eb-4099-a7d7-057cceee6f8f}*SharedItemsImports = 5 diff --git a/UnitTestRH/UnitTestRH.csproj b/UnitTestRH/UnitTestRH.csproj index 4fae143..ebb0afd 100644 --- a/UnitTestRH/UnitTestRH.csproj +++ b/UnitTestRH/UnitTestRH.csproj @@ -21,4 +21,6 @@ + + From 7c98aa65367d21195eccc0187fdd74eabc75bd91 Mon Sep 17 00:00:00 2001 From: Logophilist Date: Thu, 29 Oct 2020 23:40:11 +0100 Subject: [PATCH 5/7] CommandTest Update --- RH-Engine/Command.cs | 2 +- UnitTestRH/CommandTest.cs | 197 +++++++++++++++++++++++++++++++++++++- 2 files changed, 196 insertions(+), 3 deletions(-) diff --git a/RH-Engine/Command.cs b/RH-Engine/Command.cs index 065647a..a7e621e 100644 --- a/RH-Engine/Command.cs +++ b/RH-Engine/Command.cs @@ -174,7 +174,7 @@ namespace RH_Engine return JsonConvert.SerializeObject(Payload(payload)); } - private string showOnPanel(string uuidPanel, string serialCode, string mText, int index) + public string showOnPanel(string uuidPanel, string serialCode, string mText, int index) { dynamic payload = new { diff --git a/UnitTestRH/CommandTest.cs b/UnitTestRH/CommandTest.cs index 09ecacd..5e55429 100644 --- a/UnitTestRH/CommandTest.cs +++ b/UnitTestRH/CommandTest.cs @@ -163,11 +163,204 @@ namespace UnitTestRH //Test terrain Assert.AreEqual(smoothnormalsExpected, (bool)json.data.data.data.components.terrain.smoothnormals); - } [TestMethod] - public void Dummy() + public void DeleteNode_TestMethod() + { + string testTunnelID = "dummyTunnelID"; + string testSerial = "dummySerialCode"; + + string payloadId = "tunnel/send"; + string messageId = "scene/node/delete"; + + string uuid = "dummyUuid"; + + + Command command = new Command(testTunnelID); + + string terrainAddCommand = command.DeleteNode(uuid, testSerial); + + dynamic json = JsonConvert.DeserializeObject(terrainAddCommand); + + //Test payload + Assert.AreEqual(payloadId, (string)json.id); + Assert.AreEqual(testTunnelID, (string)json.data.dest); + + //Test message + Assert.AreEqual(messageId, (string)json.data.data.id); + Assert.AreEqual(testSerial, (string)json.data.data.serial); + + //Test data + Assert.AreEqual(uuid, (string)json.data.data.data.id); + } + + [TestMethod] + public void addPanel_TestMethod() + { + string testTunnelID = "dummyTunnelID"; + string testSerial = "dummySerialCode"; + + string payloadId = "tunnel/send"; + string messageId = "scene/node/add"; + + string uuidBike = "dummyUuidBike"; + + string nameExpected = "dashboard"; + + //components + //transform + float[] positionExpected = new float[] { -1.5f, 1f, 0f }; + int scaleExpected = 1; + int[] rotationExpected = new int[] { -30, 90, 0 }; + + //panel + int[] sizeExpected = new int[] { 1, 1 }; + int[] resolutionExpected = new int[] { 512, 512 }; + int[] backgroundExpected = new int[] { 1, 1, 1, 1 }; + bool castShadowExpected = false; + + Command command = new Command(testTunnelID); + + string terrainAddCommand = command.addPanel(testSerial, uuidBike); + + dynamic json = JsonConvert.DeserializeObject(terrainAddCommand); + + //Test payload + Assert.AreEqual(payloadId, (string)json.id); + Assert.AreEqual(testTunnelID, (string)json.data.dest); + + //Test message + Assert.AreEqual(messageId, (string)json.data.data.id); + Assert.AreEqual(testSerial, (string)json.data.data.serial); + + //Test data + Assert.AreEqual(nameExpected, (string)json.data.data.data.name); + Assert.AreEqual(uuidBike, (string)json.data.data.data.parent); + + //Test components + + //Test transform + JArray jArrayPosition = (JArray)json.data.data.data.components.transform.position; + JArray jArrayRotation = (JArray)json.data.data.data.components.transform.rotation; + + float[] outPositionArray = jArrayPosition.Select(ja => (float)ja).ToArray(); + int[] outRotationArray = jArrayRotation.Select(ja => (int)ja).ToArray(); + + CollectionAssert.AreEqual(positionExpected, outPositionArray); + CollectionAssert.AreEqual(rotationExpected, outRotationArray); + + Assert.AreEqual(scaleExpected, (int)json.data.data.data.components.transform.scale); + + //Test panel + CollectionAssert.AreEqual(sizeExpected, ((JArray)json.data.data.data.components.panel.size).Select(ja => (int)ja).ToArray()); + CollectionAssert.AreEqual(resolutionExpected, ((JArray)json.data.data.data.components.panel.resolution).Select(ja => (int)ja).ToArray()); + CollectionAssert.AreEqual(backgroundExpected, ((JArray)json.data.data.data.components.panel.background).Select(ja => (int)ja).ToArray()); + Assert.AreEqual(castShadowExpected, (bool)json.data.data.data.components.panel.castShadow); + } + + [TestMethod] + public void ColorPanel_TestMethod() + { + string testTunnelID = "dummyTunnelID"; + + string payloadId = "tunnel/send"; + string messageId = "scene/panel/setclearcolor"; + + string uuidPanel = "dummyUuidPanel"; + + float[] colorExpected = new float[] { 0f, 0f, 0f, 0f }; + + + Command command = new Command(testTunnelID); + + string terrainAddCommand = command.ColorPanel(uuidPanel); + + dynamic json = JsonConvert.DeserializeObject(terrainAddCommand); + + //Test payload + Assert.AreEqual(payloadId, (string)json.id); + Assert.AreEqual(testTunnelID, (string)json.data.dest); + + //Test message + Assert.AreEqual(messageId, (string)json.data.data.id); + + //Test data + Assert.AreEqual(uuidPanel, (string)json.data.data.data.id); + CollectionAssert.AreEqual(colorExpected, ((JArray)json.data.data.data.color).Select(ja => (float)ja).ToArray()); + } + + [TestMethod] + public void SwapPanel_TestMethod() + { + string testTunnelID = "dummyTunnelID"; + + string payloadId = "tunnel/send"; + string messageId = "scene/panel/swap"; + + string uuid = "dummyUuid"; + + + Command command = new Command(testTunnelID); + + string terrainAddCommand = command.SwapPanel(uuid); + + dynamic json = JsonConvert.DeserializeObject(terrainAddCommand); + + //Test payload + Assert.AreEqual(payloadId, (string)json.id); + Assert.AreEqual(testTunnelID, (string)json.data.dest); + + //Test message + Assert.AreEqual(messageId, (string)json.data.data.id); + + //Test data + Assert.AreEqual(uuid, (string)json.data.data.data.id); + } + + [TestMethod] + public void showOnPanel_TestMethod() + { + string testTunnelID = "dummyTunnelID"; + string testSerial = "dummySerialCode"; + + string payloadId = "tunnel/send"; + string messageId = "scene/panel/drawtext"; + + string uuidPanel = "dummyUuidPanel"; + string text = "dummyText"; + int index = 3; + int[] positionExpected = new int[] { 4, 24 + index * 32 }; + double sizeExpected = 32.0; + int[] colorExpected = new int[] { 0, 0, 0, 1 }; + string fontExpected = "segoeui"; + + + Command command = new Command(testTunnelID); + + string terrainAddCommand = command.showOnPanel(uuidPanel, testSerial, text, index); + + dynamic json = JsonConvert.DeserializeObject(terrainAddCommand); + + //Test payload + Assert.AreEqual(payloadId, (string)json.id); + Assert.AreEqual(testTunnelID, (string)json.data.dest); + + //Test message + Assert.AreEqual(messageId, (string)json.data.data.id); + Assert.AreEqual(testSerial, (string)json.data.data.serial); + + //Test data + Assert.AreEqual(uuidPanel, (string)json.data.data.data.id); + Assert.AreEqual(text, (string)json.data.data.data.text); + CollectionAssert.AreEqual(positionExpected, ((JArray)json.data.data.data.position).Select(ja => (int)ja).ToArray()); + Assert.AreEqual(sizeExpected, (double)json.data.data.data.size); + CollectionAssert.AreEqual(colorExpected, ((JArray)json.data.data.data.color).Select(ja => (int)ja).ToArray()); + Assert.AreEqual(fontExpected, (string)json.data.data.data.font); + } + + [TestMethod] + public void zzzDummy() { string testTunnelID = "dummyTunnelID"; string testSerial = "dummySerialCode"; From 06e1d1edee006c191a13a01156f5d3dd3382dfb6 Mon Sep 17 00:00:00 2001 From: Logophilist Date: Thu, 29 Oct 2020 23:47:18 +0100 Subject: [PATCH 6/7] Last command tests --- UnitTestRH/CommandTest.cs | 42 ++++++++++++++++++++++++++++++++++----- 1 file changed, 37 insertions(+), 5 deletions(-) diff --git a/UnitTestRH/CommandTest.cs b/UnitTestRH/CommandTest.cs index 5e55429..a26b57c 100644 --- a/UnitTestRH/CommandTest.cs +++ b/UnitTestRH/CommandTest.cs @@ -360,17 +360,47 @@ namespace UnitTestRH } [TestMethod] - public void zzzDummy() + public void SwapPanelCommand_TestMethod() { string testTunnelID = "dummyTunnelID"; - string testSerial = "dummySerialCode"; string payloadId = "tunnel/send"; - string messageId = "scene/node/addlayer"; + string messageId = "scene/panel/swap"; + + string uuid = "dummyUuid"; + Command command = new Command(testTunnelID); - string terrainAddCommand = command.AddLayer("Dum", testSerial); + string terrainAddCommand = command.SwapPanelCommand(uuid); + + dynamic json = JsonConvert.DeserializeObject(terrainAddCommand); + + //Test payload + Assert.AreEqual(payloadId, (string)json.id); + Assert.AreEqual(testTunnelID, (string)json.data.dest); + + //Test message + Assert.AreEqual(messageId, (string)json.data.data.id); + + //Test data + Assert.AreEqual(uuid, (string)json.data.data.data.id); + } + + [TestMethod] + public void ClearPanel_TestMethod() + { + string testTunnelID = "dummyTunnelID"; + + string payloadId = "tunnel/send"; + string messageId = "scene/panel/clear"; + + string uuid = "dummyUuid"; + + + Command command = new Command(testTunnelID); + + string terrainAddCommand = command.ClearPanel(uuid); dynamic json = JsonConvert.DeserializeObject(terrainAddCommand); @@ -380,7 +410,9 @@ namespace UnitTestRH //Test terrain Assert.AreEqual(messageId, (string)json.data.data.id); - Assert.AreEqual(testSerial, (string)json.data.data.serial); + + //Test data + Assert.AreEqual(uuid, (string)json.data.data.data.id); } } } From cad1a508e68da0df190560e6cd31099dee79d98f Mon Sep 17 00:00:00 2001 From: Sem van der Hoeven Date: Thu, 29 Oct 2020 23:48:20 +0100 Subject: [PATCH 7/7] tests --- UnitTestRH/DataParserTest.cs | 74 ++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 UnitTestRH/DataParserTest.cs diff --git a/UnitTestRH/DataParserTest.cs b/UnitTestRH/DataParserTest.cs new file mode 100644 index 0000000..746442b --- /dev/null +++ b/UnitTestRH/DataParserTest.cs @@ -0,0 +1,74 @@ +using Microsoft.VisualStudio.TestTools.UnitTesting; +using Newtonsoft.Json; +using RH_Engine; +using System; +using System.Collections.Generic; +using System.Text; +using Util; + +namespace UnitTestRH +{ + [TestClass] + public class DataParserTest + { + + public byte[] GetPayload(byte[] message) + { + byte[] payload = new byte[message.Length - 5]; + Array.Copy(message, 5, payload, 0, message.Length - 5); + return payload; + } + + + [TestMethod] + public void TestGetMessageToSend() + { + byte[] toTest = DataParser.GetMessageToSend("test"); + + dynamic res = JsonConvert.DeserializeObject(Encoding.ASCII.GetString((toTest))); + Assert.AreEqual("MESSAGE", (string)res.identifier); + Assert.AreEqual("test", (string)res.data.message); + } + + [TestMethod] + public void TestIsRawDataBikeServer() + { + byte[] testArr = { 0x34,0x00,0x00,0x00,0x02}; + byte[] testArr2 = { 0x34, 0x00, 0x00, 0x00, 0x02,0x49,0x65 }; + Assert.ThrowsException(() => DataParser.isRawDataBikeServer(testArr)); + Assert.IsTrue(DataParser.isRawDataBikeServer(testArr2)); + } + [TestMethod] + public void TestIsRawDataBikeDoctor() + { + byte[] testArr = { 0x34, 0x00, 0x00, 0x00, 0x04 }; + byte[] testArr2 = { 0x34, 0x00, 0x00, 0x00, 0x04, 0x49, 0x65 }; + Assert.ThrowsException(() => DataParser.isRawDataBikeDoctor(testArr)); + Assert.IsTrue(DataParser.isRawDataBikeDoctor(testArr2)); + } + + [TestMethod] + public void TestIsRawDataBPMServer() + { + byte[] testArr = { 0x34, 0x00, 0x00, 0x00, 0x03}; + byte[] testArr2 = { 0x34, 0x00, 0x00, 0x00, 0x03, 0x49, 0x65 }; + Assert.ThrowsException(() => DataParser.isRawDataBPMServer(testArr)); + Assert.IsTrue(DataParser.isRawDataBPMServer(testArr2)); + } + + [TestMethod] + public void TestIsRawDataBPMDoctor() + { + byte[] testArr = { 0x34, 0x00, 0x00, 0x00, 0x05 }; + byte[] testArr2 = { 0x34, 0x00, 0x00, 0x00, 0x05, 0x49, 0x65 }; + Assert.ThrowsException(() => DataParser.isRawDataBPMDoctor(testArr)); + Assert.IsTrue(DataParser.isRawDataBPMDoctor(testArr2)); + } + + + + + + + } +}