From 443944bb979ba25e2d67f488ac4b35dc3561665c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tolga=20=C3=87ak=C4=B1r?= Date: Tue, 9 Feb 2021 09:17:19 +0300 Subject: [PATCH] Update tests for OK results --- Sharp7.Tests/ClientTest.cs | 28 ++++++++++++++-------------- Sharp7.Tests/ServerClientTestBase.cs | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Sharp7.Tests/ClientTest.cs b/Sharp7.Tests/ClientTest.cs index 8d8be98..4656ec2 100644 --- a/Sharp7.Tests/ClientTest.cs +++ b/Sharp7.Tests/ClientTest.cs @@ -48,14 +48,14 @@ namespace Sharp7.Tests var rc = Client.DBRead(index, 0, bytes.Length, buffer); //test read - rc.ShouldBe(0); + rc.ShouldBe(Sharp7.S7Consts.ResultOK); buffer.ShouldBe(bytes); buffer = new byte[] { 3, 2, 1 }; rc = Client.DBWrite(index, 0, bytes.Length, buffer); //test write - rc.ShouldBe(0); + rc.ShouldBe(Sharp7.S7Consts.ResultOK); bytes.ShouldBe(buffer); } @@ -69,14 +69,14 @@ namespace Sharp7.Tests var rc = Client.ABRead(0, bytes.Length, buffer); //test read - rc.ShouldBe(0); + rc.ShouldBe(Sharp7.S7Consts.ResultOK); buffer.ShouldBe(bytes); buffer = new byte[] { 3, 2, 1 }; rc = Client.ABWrite(0, bytes.Length, buffer); //test write - rc.ShouldBe(0); + rc.ShouldBe(Sharp7.S7Consts.ResultOK); bytes.ShouldBe(buffer); } @@ -91,14 +91,14 @@ namespace Sharp7.Tests var rc = Client.CTRead(0, 2, buffer); //test read - rc.ShouldBe(0); + rc.ShouldBe(Sharp7.S7Consts.ResultOK); buffer.ShouldBe(new ushort[]{0x0100,0x0302}); buffer = new ushort[] {0x0403, 0x0201 }; rc = Client.CTWrite(0, 2, buffer); //test write - rc.ShouldBe(0); + rc.ShouldBe(Sharp7.S7Consts.ResultOK); bytes.ShouldBe(new byte[] { 3, 4, 1, 2, 4, 5, 6, 7, 8 }); } @@ -112,14 +112,14 @@ namespace Sharp7.Tests var rc = Client.MBRead(0,bytes.Length,buffer); //test read - rc.ShouldBe(0); + rc.ShouldBe(Sharp7.S7Consts.ResultOK); buffer.ShouldBe(bytes); buffer = new byte[] { 3, 2, 1 }; rc = Client.MBWrite(0, bytes.Length, buffer); //test write - rc.ShouldBe(0); + rc.ShouldBe(Sharp7.S7Consts.ResultOK); bytes.ShouldBe(buffer); } @@ -134,14 +134,14 @@ namespace Sharp7.Tests var rc = Client.TMRead(0, 2, buffer); //test read - rc.ShouldBe(0); + rc.ShouldBe(Sharp7.S7Consts.ResultOK); buffer.ShouldBe(new ushort[] { 0x0100, 0x0302 }); buffer = new ushort[] { 0x0403, 0x0201 }; rc = Client.TMWrite(0, 2, buffer); //test write - rc.ShouldBe(0); + rc.ShouldBe(Sharp7.S7Consts.ResultOK); bytes.ShouldBe(new byte[] {3, 4, 1, 2, 4, 5, 6, 7, 8, 9, 10, 11}); } @@ -155,14 +155,14 @@ namespace Sharp7.Tests var rc = Client.EBRead(0, bytes.Length, buffer); //test read - rc.ShouldBe(0); + rc.ShouldBe(Sharp7.S7Consts.ResultOK); buffer.ShouldBe(bytes); buffer = new byte[] { 3, 2, 1 }; rc = Client.EBWrite(0, bytes.Length, buffer); //test write - rc.ShouldBe(0); + rc.ShouldBe(Sharp7.S7Consts.ResultOK); bytes.ShouldBe(buffer); } @@ -179,10 +179,10 @@ namespace Sharp7.Tests multivar.Add(new Sharp7.S7Consts.S7Tag(){Area = (int)S7Area.DB, DBNumber = index, Elements = 2,Start = 0, WordLen = 2}, ref buffer).ShouldBe(true); - multivar.Read().ShouldBe(0); + multivar.Read().ShouldBe(Sharp7.S7Consts.ResultOK); multivar.Add(new Sharp7.S7Consts.S7Tag() { Area = (int)S7Area.DB, DBNumber = index, Elements = 2, Start = 0, WordLen = 2 }, ref buffer).ShouldBe(true); - multivar.Write().ShouldBe(0); + multivar.Write().ShouldBe(Sharp7.S7Consts.ResultOK); } } diff --git a/Sharp7.Tests/ServerClientTestBase.cs b/Sharp7.Tests/ServerClientTestBase.cs index 5666d5b..c8706d8 100644 --- a/Sharp7.Tests/ServerClientTestBase.cs +++ b/Sharp7.Tests/ServerClientTestBase.cs @@ -14,7 +14,7 @@ namespace Sharp7.Tests { client = new S7Client("Test Plc"); var rc = client.ConnectTo(Localhost, 0, 2); - rc.ShouldBe(0); + rc.ShouldBe(Sharp7.S7Consts.ResultOK); }