From 79ba14b829ec1fb57f95377aa12276fa4656c599 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pawe=C5=82=20Szewczyk?= Date: Fri, 20 Sep 2019 12:17:42 +0200 Subject: [PATCH] [Usb][Non-ACR] Do not assume BusID and Address MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit We do not know which bus number our device will get. All we can do is to check if the BusID and Address parameters are valid. Change-Id: I76418c3d9fb5c49dec2d1cf8ae351ef986c28ef9 Signed-off-by: Paweł Szewczyk --- .../Tizen.Usb.Tests/testcase/TSUsbDevice.cs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/tct-suite-vs/Tizen.Usb.Tests/testcase/TSUsbDevice.cs b/tct-suite-vs/Tizen.Usb.Tests/testcase/TSUsbDevice.cs index 9a32237d6..b627be453 100755 --- a/tct-suite-vs/Tizen.Usb.Tests/testcase/TSUsbDevice.cs +++ b/tct-suite-vs/Tizen.Usb.Tests/testcase/TSUsbDevice.cs @@ -19,6 +19,7 @@ using NUnit.Framework.TUnit; using System; using System.Collections.Generic; using System.Linq; +using System.IO; namespace Tizen.System.Usb.Tests { @@ -134,15 +135,14 @@ namespace Tizen.System.Usb.Tests foreach (var testdata in Helper.GetDeviceTestData()) { var deviceUnderTest = testdata.Key; - var expectedTestData = testdata.Value; // PRECONDITION Assert.IsNotNull(deviceUnderTest, "Invalid device under test"); - Assert.IsNotNull(expectedTestData, "Unable to fetch test data for USB device"); + var path = $"/dev/bus/usb/{deviceUnderTest.BusId:D3}/"; // TEST CODE - Assert.IsTrue(expectedTestData.BusId == deviceUnderTest.BusId, - $"Wrong BusId value, Expected: {expectedTestData.BusId}, Actual: {deviceUnderTest.BusId}"); + Assert.IsTrue(Directory.Exists(path), + $"Wrong BusId value, there is no such bus"); } } catch (NotSupportedException) @@ -165,14 +165,13 @@ namespace Tizen.System.Usb.Tests foreach (var testdata in Helper.GetDeviceTestData()) { var deviceUnderTest = testdata.Key; - var expectedTestData = testdata.Value; // PRECONDITION Assert.IsNotNull(deviceUnderTest, "Invalid device under test"); - Assert.IsNotNull(expectedTestData, "Unable to fetch test data for USB device"); + var path = $"/dev/bus/usb/{deviceUnderTest.BusId:D3}/{deviceUnderTest.Address:D3}"; // TEST CODE - Assert.IsTrue(deviceUnderTest.Address > 0, $"Wrong non-zero Address value, Actual: {deviceUnderTest.Address}"); + Assert.IsTrue(File.Exists(path), $"Wrong Address value, device {deviceUnderTest.Address} does not exist"); } } catch (NotSupportedException) -- 2.34.1