Skip to content

Commit 8aff2cb

Browse files
jogibear9988jogibear9988
committed
switch tests to net8
1 parent e5ce2d8 commit 8aff2cb

File tree

7 files changed

+125
-118
lines changed

7 files changed

+125
-118
lines changed

‎ToolBoxLibUnitTests/TestCRC.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using DotNetSiemensPLCToolBoxLibrary.General;
22
using NUnit.Framework;
3+
using NUnit.Framework.Legacy;
34

45
namespace ToolBoxLibUnitTests
56
{
@@ -12,7 +13,7 @@ public void TestCRC16BlockSum()
1213
//see: https://www.sps-forum.de/hochsprachen-opc/56412-upload-von-block-zur-s7-2.html
1314
var bytes = new byte[] { 0x0C, 0x00, 0x0E, 0xC0, 0x00, 0xC1, 0x00, 0xC3, 0x00, 0xC4, 0x00, 0xC5, 0x00, 0xD8, 0x80, 0x65, 0x00 };
1415
var crc = CrcHelper.GetCrc16(bytes);
15-
Assert.AreEqual(crc, 0x7822);
16+
ClassicAssert.AreEqual(crc, 0x7822);
1617
}
1718
}
1819
}

‎ToolBoxLibUnitTests/TestDataBlockReading.cs‎

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
using DotNetSiemensPLCToolBoxLibrary.DataTypes.Blocks.Step7V5;
44
using DotNetSiemensPLCToolBoxLibrary.DataTypes.Projectfolders.Step7V5;
55
using DotNetSiemensPLCToolBoxLibrary.DataTypes.AWL.Step7V5;
6-
using NUnit.Framework;
6+
using NUnit.Framework;
7+
using NUnit.Framework.Legacy;
78

89
namespace ToolBoxLibUnitTests
910
{
@@ -25,14 +26,14 @@ public void TestDB1()
2526
.DB,
2627
false,
2728
fld, blk, new S7ConvertingOptions());
28-
Assert.AreEqual(test.Children[0].Name, "DB_VAR");
29-
Assert.AreEqual(test.Children[1].Name, "aa");
30-
Assert.AreEqual(test.Children[2].Name, "bb");
31-
Assert.AreEqual(test.Children[3].Name, "aa1");
32-
Assert.AreEqual(((S7DataRow)test.Children[0]).BlockAddress.ByteAddress, 0);
33-
Assert.AreEqual(((S7DataRow)test.Children[1]).BlockAddress.ByteAddress, 2);
34-
Assert.AreEqual(((S7DataRow)test.Children[2]).BlockAddress.ByteAddress, 10);
35-
Assert.AreEqual(((S7DataRow)test.Children[3]).BlockAddress.ByteAddress, 12);
29+
ClassicAssert.AreEqual(test.Children[0].Name, "DB_VAR");
30+
ClassicAssert.AreEqual(test.Children[1].Name, "aa");
31+
ClassicAssert.AreEqual(test.Children[2].Name, "bb");
32+
ClassicAssert.AreEqual(test.Children[3].Name, "aa1");
33+
ClassicAssert.AreEqual(((S7DataRow)test.Children[0]).BlockAddress.ByteAddress, 0);
34+
ClassicAssert.AreEqual(((S7DataRow)test.Children[1]).BlockAddress.ByteAddress, 2);
35+
ClassicAssert.AreEqual(((S7DataRow)test.Children[2]).BlockAddress.ByteAddress, 10);
36+
ClassicAssert.AreEqual(((S7DataRow)test.Children[3]).BlockAddress.ByteAddress, 12);
3637
}
3738

3839
[Test]
@@ -49,12 +50,12 @@ public void TestDB2()
4950
.DB,
5051
false,
5152
fld, blk, new S7ConvertingOptions());
52-
Assert.AreEqual(test.Children[0].Name, "Fachkoordinate");
53-
Assert.AreEqual(((S7DataRow)test.Children[0]).ArrayStart[0], 0);
54-
Assert.AreEqual(((S7DataRow)test.Children[0]).ArrayStart[1], 1);
55-
Assert.AreEqual(((S7DataRow)test.Children[0]).ArrayStop[0], 67);
56-
Assert.AreEqual(((S7DataRow)test.Children[0]).ArrayStop[1], 2);
57-
Assert.AreEqual(((S7DataRow)test.Children[0]).ByteLength, 544);
53+
ClassicAssert.AreEqual(test.Children[0].Name, "Fachkoordinate");
54+
ClassicAssert.AreEqual(((S7DataRow)test.Children[0]).ArrayStart[0], 0);
55+
ClassicAssert.AreEqual(((S7DataRow)test.Children[0]).ArrayStart[1], 1);
56+
ClassicAssert.AreEqual(((S7DataRow)test.Children[0]).ArrayStop[0], 67);
57+
ClassicAssert.AreEqual(((S7DataRow)test.Children[0]).ArrayStop[1], 2);
58+
ClassicAssert.AreEqual(((S7DataRow)test.Children[0]).ByteLength, 544);
5859
}
5960

6061
[Test]
@@ -71,14 +72,14 @@ public void TestDB3()
7172
.DB,
7273
false,
7374
fld, blk, new S7ConvertingOptions());
74-
Assert.AreEqual(test.Children[0].Name, "X_KOORDINATE");
75-
Assert.AreEqual(((S7DataRow)test.Children[0]).ArrayStart[0], 0);
76-
Assert.AreEqual(((S7DataRow)test.Children[0]).ArrayStart[1], 0);
77-
Assert.AreEqual(((S7DataRow)test.Children[0]).ArrayStart[2], 1);
78-
Assert.AreEqual(((S7DataRow)test.Children[0]).ArrayStop[0], 67);
79-
Assert.AreEqual(((S7DataRow)test.Children[0]).ArrayStop[1], 16);
80-
Assert.AreEqual(((S7DataRow)test.Children[0]).ArrayStop[2], 2);
81-
Assert.AreEqual(((S7DataRow)test.Children[0]).ByteLength, 4624);
75+
ClassicAssert.AreEqual(test.Children[0].Name, "X_KOORDINATE");
76+
ClassicAssert.AreEqual(((S7DataRow)test.Children[0]).ArrayStart[0], 0);
77+
ClassicAssert.AreEqual(((S7DataRow)test.Children[0]).ArrayStart[1], 0);
78+
ClassicAssert.AreEqual(((S7DataRow)test.Children[0]).ArrayStart[2], 1);
79+
ClassicAssert.AreEqual(((S7DataRow)test.Children[0]).ArrayStop[0], 67);
80+
ClassicAssert.AreEqual(((S7DataRow)test.Children[0]).ArrayStop[1], 16);
81+
ClassicAssert.AreEqual(((S7DataRow)test.Children[0]).ArrayStop[2], 2);
82+
ClassicAssert.AreEqual(((S7DataRow)test.Children[0]).ByteLength, 4624);
8283
}
8384

8485
[Test]

‎ToolBoxLibUnitTests/TestLibNoDaveReading.cs‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
using System;
33
using System.Collections.Generic;
44
using DotNetSiemensPLCToolBoxLibrary.Communication.LibNoDave;
5-
using NUnit.Framework;
5+
using NUnit.Framework;
6+
using NUnit.Framework.Legacy;
67

78
namespace ToolBoxLibUnitTests
89
{
@@ -23,7 +24,7 @@ public void TestReading()
2324
string t =
2425
@"READ Area:132, DBnum:10, Start:10, Bytes:300
2526
READ Area:132, DBnum:60, Start:0, Bytes:300";
26-
Assert.AreEqual(req.Replace("\r\n", "\n"), t.Replace("\r\n", "\n"));
27+
ClassicAssert.AreEqual(req.Replace("\r\n", "\n"), t.Replace("\r\n", "\n"));
2728

2829
//var wrapper2 = new ConnectionWrapper(480);
2930
//var conn2 = new PLCConnection(new PLCConnectionConfiguration(), wrapper2);
@@ -34,7 +35,7 @@ public void TestReading()
3435
//var pdus2 = wrapper2.PDUs;
3536
//string req2 = string.Join(Environment.NewLine, pdus2);
3637
//string t2 = "READ Area:132, DBnum:10, Start:10, Bytes:300\r\nREAD Area:132, DBnum:60, Start:0, Bytes:300";
37-
//Assert.AreEqual(req2, t2);
38+
//ClassicAssert.AreEqual(req2, t2);
3839

3940
var wrapper3 = new ConnectionWrapper(480);
4041
var conn3 = new PLCConnection(new PLCConnectionConfiguration(), wrapper3);
@@ -45,7 +46,7 @@ public void TestReading()
4546
var pdus3 = wrapper3.PDUs;
4647
string req3 = string.Join(Environment.NewLine, pdus3);
4748
string t3 = "READ Area:132, DBnum:10, Start:10, Bytes:300\r\nREAD Area:132, DBnum:60, Start:0, Bytes:140\r\nREAD Area:132, DBnum:60, Start:140, Bytes:160";
48-
Assert.AreEqual(req3.Replace("\r\n", "\n"), t3.Replace("\r\n", "\n"));
49+
ClassicAssert.AreEqual(req3.Replace("\r\n", "\n"), t3.Replace("\r\n", "\n"));
4950

5051
var wrapper4 = new ConnectionWrapper(480);
5152
var conn4 = new PLCConnection(new PLCConnectionConfiguration(), wrapper4);
@@ -60,7 +61,7 @@ public void TestReading()
6061
var pdus4 = wrapper4.PDUs;
6162
string req4 = string.Join(Environment.NewLine, pdus4);
6263
string t4 = "READ Area:132, DBnum:1, Start:0, Bytes:14\r\nREAD Area:132, DBnum:1, Start:30, Bytes:4\r\nREAD Area:132, DBnum:1, Start:50, Bytes:4\r\nREAD Area:132, DBnum:1, Start:80, Bytes:4";
63-
Assert.AreEqual(req4.Replace("\r\n", "\n"), t4.Replace("\r\n", "\n"));
64+
ClassicAssert.AreEqual(req4.Replace("\r\n", "\n"), t4.Replace("\r\n", "\n"));
6465

6566
var wrapper5 = new ConnectionWrapper(240);
6667
var conn5 = new PLCConnection(new PLCConnectionConfiguration(), wrapper5);
@@ -85,7 +86,7 @@ public void TestReading()
8586
var pdus5 = wrapper5.PDUs;
8687
string req5 = string.Join(Environment.NewLine, pdus5);
8788
string t5 = "READ Area:132, DBnum:1, Start:0, Bytes:14\r\nREAD Area:132, DBnum:1, Start:30, Bytes:4\r\nREAD Area:132, DBnum:1, Start:50, Bytes:4\r\nREAD Area:132, DBnum:1, Start:80, Bytes:4\r\nREAD Area:132, DBnum:1, Start:90, Bytes:30\r\nREAD Area:132, DBnum:1, Start:140, Bytes:4\r\nREAD Area:132, DBnum:1, Start:160, Bytes:4\r\nREAD Area:132, DBnum:1, Start:180, Bytes:44\r\nREAD Area:132, DBnum:1, Start:230, Bytes:24\r\nREAD Area:132, DBnum:1, Start:260, Bytes:4\r\nREAD Area:132, DBnum:1, Start:270, Bytes:4";
88-
Assert.AreEqual(req5.Replace("\r\n", "\n"), t5.Replace("\r\n", "\n"));
89+
ClassicAssert.AreEqual(req5.Replace("\r\n", "\n"), t5.Replace("\r\n", "\n"));
8990

9091
//var tag=new PLCNckTag() { TagDataType = TagDataType.Float, NckArea = 0xa, NckUnit = 0x8,NckColumn = 0x23, NckLine = 0x1,NckModule = 0x1a,NckLinecount = 0x1};
9192
}
@@ -103,7 +104,7 @@ public void TestReading2()
103104
var pdus = wrapper.PDUs;
104105
string req = string.Join(Environment.NewLine, pdus);
105106
string t = "READ Area:132, DBnum:2, Start:0, Bytes:3";
106-
Assert.AreEqual(req, t);
107+
ClassicAssert.AreEqual(req, t);
107108
}
108109

109110
[Test]
@@ -134,7 +135,7 @@ public void TestReading3()
134135
var pdus = wrapper.PDUs;
135136
string req = string.Join(Environment.NewLine, pdus);
136137
string t = "READ Area:132, DBnum:781, Start:3, Bytes:11";
137-
Assert.AreEqual(req, t);
138+
ClassicAssert.AreEqual(req, t);
138139
}
139140

140141
[Test]
@@ -151,7 +152,7 @@ public void TestReading4()
151152
var pdus = wrapper.PDUs;
152153
string req = string.Join(Environment.NewLine, pdus);
153154
string t = "READ Area:132, DBnum:781, Start:5, Bytes:6";
154-
Assert.AreEqual(req, t);
155+
ClassicAssert.AreEqual(req, t);
155156
}
156157

157158
[Test]
@@ -169,7 +170,7 @@ public void TestReading5()
169170
var pdus = wrapper.PDUs;
170171
string req = string.Join(Environment.NewLine, pdus);
171172
string t = "READ Area:132, DBnum:781, Start:5, Bytes:11";
172-
Assert.AreEqual(req, t);
173+
ClassicAssert.AreEqual(req, t);
173174
}
174175

175176
[Test]
@@ -187,7 +188,7 @@ public void TestReading6()
187188
var pdus = wrapper.PDUs;
188189
string req = string.Join(Environment.NewLine, pdus);
189190
string t = "READ Area:132, DBnum:781, Start:5, Bytes:11";
190-
Assert.AreEqual(req, t);
191+
ClassicAssert.AreEqual(req, t);
191192
}
192193

193194
class ConnectionWrapperResult : ConnectionWrapper
@@ -243,7 +244,7 @@ public void TestReading7()
243244
var pdus = wrapper.PDUs;
244245
string req = string.Join(Environment.NewLine, pdus);
245246
string t = "READ Area:132, DBnum:781, Start:0, Bytes:6";
246-
Assert.AreEqual(req, t);
247+
ClassicAssert.AreEqual(req, t);
247248

248249
}
249250
}

0 commit comments

Comments
 (0)