Skip to content

Commit

Permalink
Nearly fixed #96.
Browse files Browse the repository at this point in the history
  • Loading branch information
@SeppPenner
SeppPenner committed Jul 2, 2024
1 parent 5ebde44 commit d3ff29b
Show file tree
Hide file tree
Showing 3 changed files with 160 additions and 7 deletions.
120 changes: 114 additions & 6 deletions src/SparkplugNet.Tests/Payloads/SparkplugPayloadConverterTestVersionB.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1909,7 +1909,10 @@ public void TestPropertySetConversion()
[TestMethod]
public void TestConvertVersionBPayloadFromProtoWithNegativeValues()
{
var value = -2;
var value1 = -1;
var value2 = -2;
var value3 = -3;
var value4 = -4;
var timestamp = new DateTimeOffset(2019, 1, 1, 0, 0, 0, TimeSpan.Zero);
var bodyData = new byte[] { 1, 2, 3, 4 };
var metrics = new List<VersionBProtoBufPayload.Metric>
Expand All @@ -1922,17 +1925,68 @@ public void TestConvertVersionBPayloadFromProtoWithNegativeValues()
IsHistorical = true,
IsTransient = true,
IsNull = false,
DataType = (uint?)VersionBData.DataType.Int8,
IntValue = unchecked((uint)value1)
},
new()
{
Name = "Test2",
Timestamp = (ulong)timestamp.ToUnixTimeMilliseconds(),
Alias = 3,
IsHistorical = true,
IsTransient = true,
IsNull = false,
DataType = (uint?)VersionBData.DataType.Int16,
IntValue = unchecked((uint)value)
IntValue = unchecked((uint)value2)
},
new()
{
Name = "Test3",
Timestamp = (ulong)timestamp.ToUnixTimeMilliseconds(),
Alias = 4,
IsHistorical = true,
IsTransient = true,
IsNull = false,
DataType = (uint?)VersionBData.DataType.Int32,
IntValue = unchecked((uint)value3)
},
new()
{
Name = "Test4",
Timestamp = (ulong)timestamp.ToUnixTimeMilliseconds(),
Alias = 5,
IsHistorical = true,
IsTransient = true,
IsNull = false,
DataType = (uint?)VersionBData.DataType.Int64,
LongValue = unchecked((ulong)value4)
}
};
var convertedMetrics = new List<VersionBData.Metric>
{
new("Test1", VersionBData.DataType.Int16, (short)-2, timestamp)
new("Test1", VersionBData.DataType.Int8, (sbyte)value1, timestamp)
{
Alias = 2,
IsHistorical = true,
IsTransient = true
},
new("Test2", VersionBData.DataType.Int16, (short)value2, timestamp)
{
Alias = 3,
IsHistorical = true,
IsTransient = true
},
new("Test3", VersionBData.DataType.Int32, (int)value3, timestamp)
{
Alias = 4,
IsHistorical = true,
IsTransient = true
},
new("Test4", VersionBData.DataType.Int64, (long)value4, timestamp)
{
Alias = 5,
IsHistorical = true,
IsTransient = true
}
};
var oldPayload = new VersionBProtoBufPayload
Expand Down Expand Up @@ -1965,17 +2019,38 @@ public void TestConvertVersionBPayloadFromProtoWithNegativeValues()
[TestMethod]
public void TestConvertVersionBPayloadToProtoWithNegativeValues()
{
var value = -1;
var value1 = -1;
var value2 = -2;
var value3 = -3;
var value4 = -4;
var timestamp = new DateTimeOffset(2019, 1, 1, 0, 0, 0, TimeSpan.Zero);
var bodyData = new byte[] { 1, 2, 3, 4 };

var metrics = new List<VersionBData.Metric>
{
new("Test1", VersionBData.DataType.Int8, (sbyte)-1, timestamp)
new("Test1", VersionBData.DataType.Int8, (sbyte)value1, timestamp)
{
Alias = 1,
IsHistorical = true,
IsTransient = true
},
new("Test2", VersionBData.DataType.Int16, (short)value2, timestamp)
{
Alias = 2,
IsHistorical = true,
IsTransient = true
},
new("Test3", VersionBData.DataType.Int32, (int)value3, timestamp)
{
Alias = 3,
IsHistorical = true,
IsTransient = true
},
new("Test4", VersionBData.DataType.Int64, (long)value4, timestamp)
{
Alias = 4,
IsHistorical = true,
IsTransient = true
}
};
var convertedMetrics = new List<VersionBProtoBufPayload.Metric>
Expand All @@ -1989,7 +2064,40 @@ public void TestConvertVersionBPayloadToProtoWithNegativeValues()
IsTransient = true,
IsNull = false,
DataType = (uint?)VersionBProtoBuf.DataType.Int8,
IntValue = unchecked((uint)value)
IntValue = unchecked((uint)value1)
},
new()
{
Name = "Test2",
Timestamp = (ulong)timestamp.ToUnixTimeMilliseconds(),
Alias = 2,
IsHistorical = true,
IsTransient = true,
IsNull = false,
DataType = (uint?)VersionBProtoBuf.DataType.Int16,
IntValue = unchecked((uint)value2)
},
new()
{
Name = "Test3",
Timestamp = (ulong)timestamp.ToUnixTimeMilliseconds(),
Alias = 3,
IsHistorical = true,
IsTransient = true,
IsNull = false,
DataType = (uint?)VersionBProtoBuf.DataType.Int32,
IntValue = unchecked((uint)value3)
},
new()
{
Name = "Test4",
Timestamp = (ulong)timestamp.ToUnixTimeMilliseconds(),
Alias = 4,
IsHistorical = true,
IsTransient = true,
IsNull = false,
DataType = (uint?)VersionBProtoBuf.DataType.Int64,
LongValue = unchecked((ulong)value4)
}
};
var oldPayload = new VersionBData.Payload
Expand Down
45 changes: 45 additions & 0 deletions src/SparkplugNet/Core/Extensions/DataTypeExtensions.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,51 @@ internal static class DataTypeExtensions
return default;
}

// Check whether we need to convert from signed to unsigned.
var needToConvertFromSignedToUnsigned =
(objValue is sbyte sbyteVal && sbyteVal < 0) ||
(objValue is short shortVal && shortVal < 0) ||
(objValue is int intVal && intVal < 0) ||
(objValue is long longVal && longVal < 0);

if (needToConvertFromSignedToUnsigned)
{
return unchecked((T)objValue);
}

// Check whether we need to convert from unsigned to signed.
// Check for uint values first.
if (objValue is uint uintVal)
{
var needToConvertFromUnsignedIntToSigned =
(uintVal > sbyte.MaxValue && typeof(T) == typeof(sbyte)) ||
(uintVal > short.MaxValue && typeof(T) == typeof(short)) ||
(uintVal > int.MaxValue && typeof(T) == typeof(int));

if (needToConvertFromUnsignedIntToSigned)
{
var intValue = unchecked((int)uintVal);
return (T)Convert.ChangeType(intValue, typeof(T));
}
}

// Check for ulong values second.
if (objValue is ulong ulongVal)
{
var needToConvertFromUnsignedLongToSigned =
(ulongVal > (ulong)sbyte.MaxValue && typeof(T) == typeof(sbyte)) ||
(ulongVal > (ulong)short.MaxValue && typeof(T) == typeof(short)) ||
(ulongVal > int.MaxValue && typeof(T) == typeof(int)) ||
(ulongVal > long.MaxValue && typeof(T) == typeof(long));

if (needToConvertFromUnsignedLongToSigned)
{
var intValue = unchecked((long)ulongVal);
return (T)Convert.ChangeType(intValue, typeof(T));
}
}

// Regular case.
return objValue is T valueAsT
? valueAsT
: (T)Convert.ChangeType(objValue, typeof(T));
Expand Down
2 changes: 1 addition & 1 deletion src/SparkplugNet/VersionB/PayloadConverter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ public static VersionBProtoBuf.ProtoBufPayload.Metric ConvertVersionBMetric(Metr
case VersionBDataTypeEnum.Int64:
case VersionBDataTypeEnum.UInt32:
case VersionBDataTypeEnum.UInt64:
protoMetric.LongValue = metric.Value is not null ? metric.Value.ConvertOrDefaultTo<ulong>() : default;
protoMetric.LongValue = metric.Value.ConvertOrDefaultTo<ulong>();
break;
case VersionBDataTypeEnum.DateTime:
if (metric.Value is null)
Expand Down

0 comments on commit d3ff29b

Please sign in to comment.