[ADD] finished writing historic data to documents

ClientApp/Utils/Client.cs

@@ -184,7 +184,7 @@ namespace ClientApp.Utils
                 else if (DataParser.isRawDataBikeServer(messageBytes))
                 {
                     Console.WriteLine($"Received data: {BitConverter.ToString(payloadbytes)}");
-                }
+                } 
 
                 totalBufferReceived -= expectedMessageLength;
                 expectedMessageLength = BitConverter.ToInt32(totalBuffer, 0);

ClientApp/ViewModels/LoginViewModel.cs

@@ -16,7 +16,7 @@ namespace ClientApp.ViewModels
         public string Username { get; set; }
         public ICommand LoginCommand { get; set; }
 
-        public bool LoginStatus { get; set; }
+        public bool LoginStatus { get; set; } = false;
 
         public bool InvertedLoginStatus { get; set; }
 

ClientApp/Views/LoginView.xaml

@@ -19,9 +19,7 @@
             <Label Content="Password" HorizontalContentAlignment="Center"/>
             <PasswordBox x:Name="Password" Width="120" Util:FocusAdvancement.AdvancesByEnterKey="True"/>
             <Button x:Name="Login" Content="Login" Command="{Binding LoginCommand}" CommandParameter="{Binding ElementName=Password}" Margin="0,20,0,0" Width="120"/>
-            <Popup IsOpen="{Binding InvertedLoginStatus}" PopupAnimation = "Slide" HorizontalAlignment="Center">
-                <Label Content="Login failed" Foreground="Red" HorizontalAlignment="Center" HorizontalContentAlignment="Center" Background="Transparent"/>
-            </Popup>
+            <Label Content="Login failed" Foreground="Red" HorizontalAlignment="Center" HorizontalContentAlignment="Center" Background="Transparent" IsEnabled="{Binding InvertedLoginStatus}"/>
         </StackPanel>
     </DockPanel>
 </Page>

DoctorApp/DoctorApp.csproj

@@ -25,6 +25,7 @@
 		<PackageReference Include="AsyncAwaitBestPractices.MVVM" Version="4.3.0" />
 		<PackageReference Include="LiveCharts.Wpf" Version="0.9.7" />
 		<PackageReference Include="MvvmLightLibsStd10" Version="5.4.1.1" />
+		<PackageReference Include="Prism.Wpf" Version="8.0.0.1909" />
 		<PackageReference Include="PropertyChanged.Fody" Version="3.2.9" />
 	</ItemGroup>
 

DoctorApp/Utils/Client.cs

@@ -1,9 +1,11 @@
 using System;
 using System.Diagnostics;
+using System.IO;
 using System.Linq;
 using System.Net.Sockets;
 using System.Text;
 using DoctorApp.ViewModels;
+using Microsoft.Win32;
 using ProftaakRH;
 using Util;
 
@@ -129,6 +131,23 @@ namespace DoctorApp.Utils
                 {
                     MainViewModel.TransferDataToClientBPM(payloadbytes);
                 }
+                else if (DataParser.IsHistoricBikeData(messageBytes))
+                {
+
+
+                    // todo change to name of patient
+                    string name = MainViewModel.Tabs[0].PatientInfo.Username;
+                    string result = "PATIENT INFO FOR " + name + "\n\n";
+                    for (int i = 0; i < payloadbytes.Length; i += 8)
+                    {
+                        byte[] res = new byte[8];
+                        Array.Copy(payloadbytes, i, res, 0, 8);
+                        result += handleBikeHistory(res);
+                    }
+
+                    string path = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + "/" + name + ".txt";
+                    File.WriteAllText(path,result);
+                }
                 Array.Copy(totalBuffer, expectedMessageLength, totalBuffer, 0, (totalBufferReceived - expectedMessageLength)); //maybe unsafe idk
                 totalBufferReceived -= expectedMessageLength;
                 expectedMessageLength = BitConverter.ToInt32(totalBuffer, 0);
@@ -140,11 +159,40 @@ namespace DoctorApp.Utils
 
         }
 
-        /// <summary>
-        /// starts sending a message to the server
-        /// </summary>
-        /// <param name="message">the message to send</param>
-        public void sendMessage(byte[] message)
+        private string handleBikeHistory(byte[] bytes)
+        {
+            string res = string.Empty;
+            switch (bytes[0])
+            {
+                case 0x10:
+                    res += "Time elapsed: " + bytes[2] / 4 + "s\n";
+                    res += "Distance traveled: " + bytes[3] + "\n";
+                    int input = bytes[4] | (bytes[5] << 8);
+                    res += $"Speed {input * 0.01}m/s\n";
+                    res += $"Heart rate: { Convert.ToString(bytes[6], 10)}";
+                    break;
+                case 0x19:
+                    res += $"RPM: {bytes[2]}\n";
+                    int accumPower = bytes[3] | (bytes[4] << 8);
+                    res += $"Accumulated power: {accumPower} watt\n";
+                    int instantPower = (bytes[5]) | (bytes[6] & 0b00001111) << 8;
+                    if (instantPower != 0xFFF)
+                    {
+                        res += $"Instant power: {instantPower} watt\n"; 
+                    }
+                    break;
+
+            }
+            return res + "\n";
+            
+            
+        }
+
+            /// <summary>
+            /// starts sending a message to the server
+            /// </summary>
+            /// <param name="message">the message to send</param>
+            public void sendMessage(byte[] message)
         {
             stream.BeginWrite(message, 0, message.Length, new AsyncCallback(OnWrite), null);
         }

DoctorApp/ViewModels/ClientInfoViewModel.cs

@@ -41,6 +41,8 @@ namespace DoctorApp.ViewModels
 
         public ICommand SetResistance { get; set; }
 
+        public ICommand SaveHistoricData { get; set; }
+
         public MainWindowViewModel MainWindowViewModel { get; set; }
         private Client client;
 
@@ -81,13 +83,23 @@ namespace DoctorApp.ViewModels
                 PatientInfo.Resistance = float.Parse(((TextBox)parameter).Text);
             });
 
+            // request the historic data from the server
+            this.SaveHistoricData = new RelayCommand<object>((parameter) =>
+            {
+                this.client.sendMessage(DataParser.GetGetFileMessage(PatientInfo.Username));
+                // data is stored on the server
+                // send request to server that we want to get the current historic data from the patient
+                // server sends this back
+                // we parse it
+            });
+
         }
 
-        public void BPMData(byte [] bytes)
+        public void BPMData(byte[] bytes)
         {
             //TODO
             //Parsen van de data you fuck
-            if(bytes[0] == 0x00)
+            if (bytes[0] == 0x00)
             {
 
             }
@@ -95,13 +107,13 @@ namespace DoctorApp.ViewModels
             {
                 PatientInfo.BPM = bytes[1];
                 if (MySelectedItem == "BPM")
-                    {
+                {
                     Chart.NewValue(PatientInfo.BPM);
                 }
 
             }
-            
-            
+
+
         }
 
         public void BikeData(byte[] bytes)

DoctorApp/Views/ClientInfoView.xaml

@@ -18,16 +18,20 @@
             <RowDefinition Height="180*"/>
             <RowDefinition Height="180*"/>
         </Grid.RowDefinitions>
-        <StackPanel Orientation="Horizontal" Grid.RowSpan="2" Margin="0,0,0,22">
-            <StackPanel.Resources>
-                <Style TargetType="{x:Type Label}">
-                    <Setter Property="Margin" Value="0,0,20,0"/>
-                </Style>
-            </StackPanel.Resources>
-            <Label Content="{Binding Path=PatientInfo.Username}"/>
-            <Label Content="{Binding Path=PatientInfo.Status}"/>
-        </StackPanel>
-        <StackPanel Margin="0,10,0,0" Grid.RowSpan="2" Grid.Row="1">
+
+        <Grid Grid.RowSpan="2" Margin="0,0,0,22">
+            <StackPanel Orientation="Horizontal" >
+                <StackPanel.Resources>
+                    <Style TargetType="{x:Type Label}">
+                        <Setter Property="Margin" Value="0,0,20,0"/>
+                    </Style>
+                </StackPanel.Resources>
+                <Label Content="{Binding Path=PatientInfo.Username}"/>
+                <Label Content="{Binding Path=PatientInfo.Status}"/>
+            </StackPanel>
+            <Button Content="Save Historic Data" HorizontalAlignment="Right" VerticalAlignment="Center" Padding="5" Command="{Binding SaveHistoricData}"/>
+        </Grid>
+        <StackPanel Margin="0,10,0,0"  Grid.Row="2">
             <StackPanel.Resources>
                 <Style TargetType="{x:Type DockPanel}">
                     <Setter Property="Margin" Value="0,20,0,0"/>

DoctorApp/Views/MainWindow.xaml

@@ -10,7 +10,7 @@
         AllowsTransparency="True"
          MinHeight="{Binding MinimumHeight}"
         MinWidth="{Binding MinimumWidth}"
-        Title="MainWindow" Height="500" Width="900">
+        Title="MainWindow" Height="800" Width="1500">
     <Window.Resources>
         <Style TargetType="{x:Type local:MainWindow}">
             <Setter Property="Template">

Hashing/DataParser.cs

@@ -23,6 +23,7 @@ namespace Util
         public const string DISCONNECT = "DISCONNECT";
         public const string LOGIN_DOCTOR = "LOGIN DOCTOR";
         public const string MESSAGE = "MESSAGE";
+        public const string GET_FILE = "GET FILE";
         /// <summary>
         /// makes the json object with LOGIN identifier and username and password
         /// </summary>
@@ -72,7 +73,7 @@ namespace Util
             return getName(bytes, 2, bytes.Length - 2);
         }
 
-        private static string getName(byte[] bytes , int offset, int lenght)
+        private static string getName(byte[] bytes, int offset, int lenght)
         {
             byte[] nameArray = new byte[lenght];
             Array.Copy(bytes, offset, nameArray, 0, lenght);
@@ -242,6 +243,12 @@ namespace Util
             return bytes[4] == 0x05;
         }
 
+        public static bool IsHistoricBikeData(byte[] bytes)
+        {
+            if (bytes.Length <= 5) throw new ArgumentException("bytes too short");
+            return bytes[4] == 0x06;
+        }
+
 
         /// <summary>
         /// constructs a message with the payload, messageId and clientId
@@ -286,7 +293,7 @@ namespace Util
 
         public static byte[] GetRawBPMDataDoctor(byte[] payload, string username)
         {
-            return GetRawDataDoctor(payload,username,0x05);
+            return GetRawDataDoctor(payload, username, 0x05);
         }
 
         private static byte[] GetRawDataDoctor(byte[] payload, string username, byte messageID)
@@ -295,8 +302,8 @@ namespace Util
             byte[] nameArray = Encoding.ASCII.GetBytes(username);
             byte[] total = new byte[nameArray.Length + payload.Length];
             Array.Copy(payload, 0, total, 0, payload.Length);
-            Array.Copy(nameArray,0,total,payload.Length,nameArray.Length);
-            return getMessage(total,messageID);
+            Array.Copy(nameArray, 0, total, payload.Length, nameArray.Length);
+            return getMessage(total, messageID);
 
         }
         /// <summary>
@@ -337,14 +344,14 @@ namespace Util
             };
             return getJsonMessage(STOP_SESSION, data);
         }
-        
+
         /// <summary>
         /// gets the message to set the resistance of the given user with the given resistance.
         /// </summary>
         /// <param name="user">the username to set the resistance of.</param>
         /// <param name="mResistance">the resistance value to set</param>
         /// <returns>a byte array containing a json messsage to set the user's resistance, using our protocol.</returns>
-        public static byte[] getSetResistanceJson(string user,float mResistance)
+        public static byte[] getSetResistanceJson(string user, float mResistance)
         {
             dynamic data = new
             {
@@ -436,7 +443,7 @@ namespace Util
         /// <returns>the chat message in the json message</returns>
         public static string getChatMessageFromJson(byte[] json)
         {
-            return ((dynamic)JsonConvert.DeserializeObject(Encoding.ASCII.GetString(json))).data.chat;           
+            return ((dynamic)JsonConvert.DeserializeObject(Encoding.ASCII.GetString(json))).data.chat;
         }
 
         /// <summary>
@@ -472,6 +479,32 @@ namespace Util
             return data;
         }
 
+        public static byte[] GetGetFileMessage(string mUsername)
+        {
+            if (mUsername == null)
+            {
+                throw new ArgumentNullException("username null");
+            }
+            dynamic data = new
+            {
+                username = mUsername,
+            };
+            return getJsonMessage(GET_FILE, data);
+        }
 
+        public static string GetUsernameFromGetFileBytes(byte[] json)
+        {
+            return ((dynamic)JsonConvert.DeserializeObject(Encoding.ASCII.GetString(json))).data.username;
+        }
+
+        public static string GetDateFromGetFileBytes(byte[] json)
+        {
+            return ((string)((dynamic)JsonConvert.DeserializeObject(Encoding.ASCII.GetString(json))).data.dateTime);
+        }
+
+        public static byte[] GetFileMessage(byte[] file)
+        {
+            return getMessage(file, 0x06);
+        }
     }
 }

ProftaakRH/ProftaakRH.sln

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

RH-Engine/Command.cs

@@ -174,7 +174,7 @@ namespace RH_Engine
             return JsonConvert.SerializeObject(Payload(payload));
         }
 
-        public string showOnPanel(string uuidPanel, string serialCode, string mText, int index)
+        private string showOnPanel(string uuidPanel, string serialCode, string mText, int index)
         {
             dynamic payload = new
             {

Server/Client.cs

@@ -147,6 +147,9 @@ namespace Server
                     case DataParser.MESSAGE:
                         communication.SendMessageToClient(DataParser.getUsernameFromJson(payloadbytes), message);
                         break;
+                    case DataParser.GET_FILE:
+                        getClientBikeData(payloadbytes);
+                        break;
                     default:
                         Console.WriteLine($"Received json with identifier {identifier}:\n{Encoding.ASCII.GetString(payloadbytes)}");
                         break;
@@ -177,8 +180,35 @@ namespace Server
                     Array.Copy(payloadbytes, 0, this.BPMDataBuffer, 0, 2);
                 }
                 //this.communication.Doctor?.sendMessage(DataParser.GetRawBPMDataDoctor(payloadbytes, this.username));
+            } 
+
+        }
+
+        private void getClientBikeData(byte[] payloadbytes)
+        {
+            //ugly
+            //get the raw bike data of the user with the specified username
+            string username = DataParser.GetUsernameFromGetFileBytes(payloadbytes);
+            string path = Directory.GetCurrentDirectory() + "/" + username + "/";
+            string bytes = string.Empty;
+            StringBuilder sb = new StringBuilder(bytes);
+            try
+            {
+                DirectoryInfo dirInf = new DirectoryInfo(Directory.GetCurrentDirectory() + "/" + username + "/");
+                DirectoryInfo[] directoryInfos = dirInf.GetDirectories();
+                DirectoryInfo latest = directoryInfos[directoryInfos.Length - 1];
+                path = path + latest.Name + "/rawBike.bin";
+                FileInfo fi = new FileInfo(path);
+
+                if ((int)fi.Length >= 1024) return;
+            }
+            catch (Exception e)
+            {
+                Debug.WriteLine("[SERVER CLIENT] excetion while trying to get raw bike data: " + e.Message);
             }
 
+            Debug.WriteLine("[SERVER CLIENT] about to send " +sb.ToString());
+            communication.Doctor.sendMessage(DataParser.GetFileMessage(File.ReadAllBytes(path)));
         }
 
         private bool handleLogin(byte[] payloadbytes)

UnitTestRH/CommandTest.cs

@@ -1,418 +0,0 @@
-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);
-        }
-    }
-}

UnitTestRH/DataParserTest.cs

@@ -1,74 +0,0 @@
-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));
-        }
-
-
-
-
-
-
-    }
-}

UnitTestRH/UnitTestRH.csproj

@@ -1,26 +0,0 @@
-<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>