maier_st/Sharp7Reactive
1
0
Fork 0
mirror of https://github.com/evopro-ag/Sharp7Reactive.git synced 2026-02-04 07:42:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Implement MatchesType

Browse Source
This commit is contained in:
Peter Butzhammer
2024-02-08 17:54:15 +01:00
parent fdc25d2817
commit 829dee14af
4 changed files with 77 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Sharp7.Rx.Tests/S7ValueConverterTests/ConverterTestBase.cs
View File

@@ -59,8 +59,6 @@ internal abstract class ConverterTestBase
yield return new ConverterTestCase((short) -3532, "DB99.INT0", [0xF2, 0x34]);
yield return new ConverterTestCase(305419879, "DB99.DINT0", [0x12, 0x34, 0x56, 0x67]);
yield return new ConverterTestCase(-231451033, "DB99.DINT0", [0xF2, 0x34, 0x56, 0x67]);
yield return new ConverterTestCase(1311768394163015151L, "DB99.dul0", [0x12, 0x34, 0x56, 0x67, 0x89, 0xAB, 0xCD, 0xEF]);
yield return new ConverterTestCase(-994074615050678801L, "DB99.dul0", [0xF2, 0x34, 0x56, 0x67, 0x89, 0xAB, 0xCD, 0xEF]);
yield return new ConverterTestCase(1311768394163015151uL, "DB99.dul0", [0x12, 0x34, 0x56, 0x67, 0x89, 0xAB, 0xCD, 0xEF]);
yield return new ConverterTestCase(17452669458658872815uL, "DB99.dul0", [0xF2, 0x34, 0x56, 0x67, 0x89, 0xAB, 0xCD, 0xEF]);
yield return new ConverterTestCase(new byte[] {0x12, 0x34, 0x56, 0x67}, "DB99.DBB0.4", [0x12, 0x34, 0x56, 0x67]);

69
Sharp7.Rx.Tests/S7VariableAddressTests/MatchesType.cs
View File

@@ -1,7 +1,7 @@
using System.Reflection;
using NUnit.Framework;
using NUnit.Framework;
using Sharp7.Rx.Extensions;
using Sharp7.Rx.Interfaces;
using Sharp7.Rx.Tests.S7ValueConverterTests;
using Shouldly;
namespace Sharp7.Rx.Tests.S7VariableAddressTests;
@@ -11,19 +11,61 @@ public class MatchesType
{
static readonly IS7VariableNameParser parser = new S7VariableNameParser();
public void Supported(Type type, string address)
private static readonly IReadOnlyList<Type> typeList = new[]
{
Check(type, address, true);
typeof(byte),
typeof(byte[]),
typeof(bool),
typeof(short),
typeof(ushort),
typeof(int),
typeof(uint),
typeof(long),
typeof(ulong),
typeof(float),
typeof(double),
typeof(string),
typeof(int[]),
typeof(float[]),
typeof(DateTime[]),
typeof(object),
};
[TestCaseSource(nameof(GetValid))]
public void Supported(TestCase tc) => Check(tc.Type, tc.Address, true);
[TestCaseSource(nameof(GetInvalid))]
public void Unsupported(TestCase tc) => Check(tc.Type, tc.Address, false);
public static IEnumerable<TestCase> GetValid()
{
return
ConverterTestBase.GetValidTestCases()
.Select(tc => new TestCase(tc.Value.GetType(), tc.Address));
}
public IEnumerable<TestCase> GetValid()
public static IEnumerable<TestCase> GetInvalid()
{
yield return new TestCase(typeof(bool), "DB0.DBx0.0");
yield return new TestCase(typeof(short), "DB0.INT0");
yield return new TestCase(typeof(int), "DB0.DINT0");
yield return new TestCase(typeof(long), "DB0.DUL0");
yield return new TestCase(typeof(ulong), "DB0.DUL0");
return
ConverterTestBase.GetValidTestCases()
.DistinctBy(tc => tc.Value.GetType())
.SelectMany(tc =>
typeList.Where(type => type != tc.Value.GetType())
.Select(type => new TestCase(type, tc.Address))
)
// Explicitly remove some valid combinations
.Where(tc => !(
(tc.Type == typeof(string) && tc.Address == "DB99.Byte5") ||
(tc.Type == typeof(string) && tc.Address == "DB99.Byte5.4") ||
(tc.Type == typeof(byte[]) && tc.Address == "DB99.Byte5")
))
;
}
@@ -36,5 +78,8 @@ public class MatchesType
variableAddress.MatchesType(type).ShouldBe(expected);
}
public record TestCase(Type Type, string Address);
public record TestCase(Type Type, string Address)
{
public override string ToString() => $"{Type.Name} {Address}";
}
}