Develop #10

Merged
SemvdH merged 229 commits from develop into master 2020-10-29 22:50:49 +00:00
5 changed files with 533 additions and 1 deletions
Showing only changes of commit 28dc2c2f9c - Show all commits

View File

@@ -15,8 +15,18 @@ 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*{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
@@ -47,6 +57,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

View File

@@ -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
{

418
UnitTestRH/CommandTest.cs Normal file
View File

@@ -0,0 +1,418 @@
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 messageId = "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 message
Assert.AreEqual(messageId, (string)json.data.data.id);
Assert.AreEqual(testSerial, (string)json.data.data.serial);
//Test terrain
JArray jArrayTerrainSize = (JArray)json.data.data.data.size;
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<float[]>());
}
[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 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 SwapPanelCommand_TestMethod()
{
string testTunnelID = "dummyTunnelID";
string payloadId = "tunnel/send";
string messageId = "scene/panel/swap";
string uuid = "dummyUuid";
Command command = new Command(testTunnelID);
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);
//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);
//Test data
Assert.AreEqual(uuid, (string)json.data.data.data.id);
}
}
}

View File

@@ -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<ArgumentException>(() => 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<ArgumentException>(() => 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<ArgumentException>(() => 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<ArgumentException>(() => DataParser.isRawDataBPMDoctor(testArr));
Assert.IsTrue(DataParser.isRawDataBPMDoctor(testArr2));
}
}
}

View File

@@ -0,0 +1,26 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
<PackageReference Include="MSTest.TestAdapter" Version="2.1.0" />
<PackageReference Include="MSTest.TestFramework" Version="2.1.0" />
<PackageReference Include="coverlet.collector" Version="1.2.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ClientApp\ClientApp.csproj" />
<ProjectReference Include="..\DoctorApp\DoctorApp.csproj" />
<ProjectReference Include="..\ProftaakRH\ProftaakRH.csproj" />
<ProjectReference Include="..\RH-Engine\RH-Engine.csproj" />
<ProjectReference Include="..\Server\Server.csproj" />
</ItemGroup>
<Import Project="..\Hashing\Hashing.projitems" Label="Shared" />
</Project>