Merge branch 'master' of https://github.com/danielklecha/SharpIppNext

Author: danielklecha

SharpIpp/Protocol/Extensions/BinaryReaderExtensions.cs

@@ -1,27 +1,28 @@
-using System.IO;
+using System;
+using System.IO;
 
 namespace SharpIpp.Protocol.Extensions
 {
     internal static class BinaryReaderExtensions
     {
         public static short ReadInt16BigEndian(this BinaryReader reader)
         {
-            return Bytes.Reverse(reader.ReadInt16());
+            var value = reader.ReadInt16();
+
+            if (BitConverter.IsLittleEndian)
+                value = Bytes.Reverse(value);
+
+            return value;
         }
 
         public static int ReadInt32BigEndian(this BinaryReader reader)
         {
-            return Bytes.Reverse(reader.ReadInt32());
-        }
+            var value = reader.ReadInt32();
 
-        public static short ReadInt16BigEndianAsync( this BinaryReader reader )
-        {
-            return Bytes.Reverse( reader.ReadInt16() );
-        }
+            if (BitConverter.IsLittleEndian)
+                value = Bytes.Reverse(value);
 
-        public static int ReadInt32BigEndianAsync( this BinaryReader reader )
-        {
-            return Bytes.Reverse( reader.ReadInt32() );
+            return value;
         }
     }
 }

SharpIpp/Protocol/Extensions/BinaryWriterExtensions.cs

@@ -1,17 +1,24 @@
-using System.IO;
+using System;
+using System.IO;
 
 namespace SharpIpp.Protocol.Extensions
 {
     internal static class BinaryWriterExtensions
     {
         public static void WriteBigEndian(this BinaryWriter writer, short value)
         {
-            writer.Write(Bytes.Reverse(value));
+            if (BitConverter.IsLittleEndian)
+                value = Bytes.Reverse(value);
+
+            writer.Write(value);
         }
 
         public static void WriteBigEndian(this BinaryWriter writer, int value)
         {
-            writer.Write(Bytes.Reverse(value));
+            if (BitConverter.IsLittleEndian)
+                value = Bytes.Reverse(value);
+
+            writer.Write(value);
         }
     }
 }

SharpIpp/Protocol/Models/MediaSize.cs

@@ -32,7 +32,7 @@ public static MediaSize Create(Dictionary<string, IppAttribute[]> dict, IMapperA
         return new MediaSize
         {
             XDimension = mapper.MapFromDic<int?>(dict, nameof(XDimension).ConvertCamelCaseToDash()),
-            YDimension = mapper.MapFromDic<int?>(dict, nameof(XDimension).ConvertCamelCaseToDash())
+            YDimension = mapper.MapFromDic<int?>(dict, nameof(YDimension).ConvertCamelCaseToDash())
         };
     }
 }

SharpIppTests/RawIppResponses/GetJobAttributes_HP_Color_LaserJet_MFP_M476dn.bin

@@ -938,5 +938,29 @@ public async Task Construct_ReadBinFileWithGetPrinterAttributes_ShouldBeMapped(s
         using SharpIppClient client = new(new HttpClient(), protocol);
         var mapped = client.Construct<GetPrinterAttributesResponse>(ippResponse);
         Assert.IsNotNull(mapped);
+    }
+
+    [DataTestMethod]
+    [DataRow("RawIppResponses/PrintJob_HP_Color_LaserJet_MFP_M476dn.bin")]
+    public async Task Construct_ReadBinFileWithPrintJob_ShouldBeMapped(string path)
+    {
+        var protocol = new IppProtocol();
+        await using var stream = new FileStream(path, FileMode.Open, FileAccess.Read);
+        var ippResponse = await protocol.ReadIppResponseAsync(stream);
+        using SharpIppClient client = new(new HttpClient(), protocol);
+        var mapped = client.Construct<PrintJobResponse>(ippResponse);
+        Assert.IsNotNull(mapped);
+    }
+
+    [DataTestMethod]
+    [DataRow("RawIppResponses/GetJobAttributes_HP_Color_LaserJet_MFP_M476dn.bin")]
+    public async Task Construct_ReadBinFileWithGetJobAttributes_ShouldBeMapped(string path)
+    {
+        var protocol = new IppProtocol();
+        await using var stream = new FileStream(path, FileMode.Open, FileAccess.Read);
+        var ippResponse = await protocol.ReadIppResponseAsync(stream);
+        using SharpIppClient client = new(new HttpClient(), protocol);
+        var mapped = client.Construct<GetJobAttributesResponse>(ippResponse);
+        Assert.IsNotNull(mapped);
     }
 }