From 4696669b958d15d6f7fe7c4f6c92739ea5fc2bb4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pawe=C5=82=20Szewczyk?= Date: Mon, 9 Sep 2019 10:54:06 +0200 Subject: [PATCH] [Usb][Non-ACR] Do not test devices existing in the system MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Some devices may be unavailable to the testing framework and we should not consider them a target of our tests. Change-Id: Ie59bd0661c6e1ae7efa9e680146cf2c2a5a02fdd Signed-off-by: Paweł Szewczyk --- tct-suite-vs/Tizen.Usb.Tests/testcase/TSUsbConfiguration.cs | 4 ++-- tct-suite-vs/Tizen.Usb.Tests/testcase/TSUsbDeviceStrings.cs | 6 +++--- tct-suite-vs/Tizen.Usb.Tests/testcase/support/Helper.cs | 9 +++++++++ 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/tct-suite-vs/Tizen.Usb.Tests/testcase/TSUsbConfiguration.cs b/tct-suite-vs/Tizen.Usb.Tests/testcase/TSUsbConfiguration.cs index 076cd91..e0a0428 100755 --- a/tct-suite-vs/Tizen.Usb.Tests/testcase/TSUsbConfiguration.cs +++ b/tct-suite-vs/Tizen.Usb.Tests/testcase/TSUsbConfiguration.cs @@ -65,7 +65,7 @@ namespace Tizen.System.Usb.Tests { try { - var testUsbDevice = Helper.Manager.AvailableDevices.FirstOrDefault(); + var testUsbDevice = Helper.GetTestDevices().FirstOrDefault(); var testConfiguration = testUsbDevice?.Configurations.FirstOrDefault().Value; // PRECONDITION @@ -99,7 +99,7 @@ namespace Tizen.System.Usb.Tests { try { - var testUsbDevice = Helper.Manager.AvailableDevices.FirstOrDefault(); + var testUsbDevice = Helper.GetTestDevices().FirstOrDefault(); var testConfiguration = testUsbDevice?.Configurations.FirstOrDefault().Value; // PRECONDITION diff --git a/tct-suite-vs/Tizen.Usb.Tests/testcase/TSUsbDeviceStrings.cs b/tct-suite-vs/Tizen.Usb.Tests/testcase/TSUsbDeviceStrings.cs index 5a31d18..27e6cf0 100755 --- a/tct-suite-vs/Tizen.Usb.Tests/testcase/TSUsbDeviceStrings.cs +++ b/tct-suite-vs/Tizen.Usb.Tests/testcase/TSUsbDeviceStrings.cs @@ -72,7 +72,7 @@ namespace Tizen.System.Usb.Tests { try { - foreach (var testUsbDevice in Helper.Manager.AvailableDevices) + foreach (var testUsbDevice in Helper.GetTestDevices()) { // PRECONDITION Assert.IsNotNull(testUsbDevice, "Invalid USB Device for test"); @@ -111,7 +111,7 @@ namespace Tizen.System.Usb.Tests { try { - foreach (var testUsbDevice in Helper.Manager.AvailableDevices) + foreach (var testUsbDevice in Helper.GetTestDevices()) { // PRECONDITION Assert.IsNotNull(testUsbDevice, "Invalid USB Device for test"); @@ -151,7 +151,7 @@ namespace Tizen.System.Usb.Tests { try { - foreach (var testUsbDevice in Helper.Manager.AvailableDevices) + foreach (var testUsbDevice in Helper.GetTestDevices()) { // PRECONDITION Assert.IsNotNull(testUsbDevice, "Invalid USB Device for test"); diff --git a/tct-suite-vs/Tizen.Usb.Tests/testcase/support/Helper.cs b/tct-suite-vs/Tizen.Usb.Tests/testcase/support/Helper.cs index b4608ee..8f58345 100755 --- a/tct-suite-vs/Tizen.Usb.Tests/testcase/support/Helper.cs +++ b/tct-suite-vs/Tizen.Usb.Tests/testcase/support/Helper.cs @@ -153,8 +153,12 @@ namespace Tizen.System.Usb.Tests // This is a special device generated by dummy_hcd, not for testing if (testUsbDevice.DeviceInformation.ProductId == 0x0002 && testUsbDevice.DeviceInformation.VendorId == 0x1d6b) continue; + var info = testUsbDevice.DeviceInformation; var testDeviceData = TestDevices.Where(d => d.DeviceInformation.ProductId == info.ProductId).FirstOrDefault(); + if (testDeviceData == null) + continue; + testData.Add(testUsbDevice, testDeviceData); } return testData; @@ -206,6 +210,11 @@ namespace Tizen.System.Usb.Tests return testData; } + internal static IEnumerable GetTestDevices() + { + return Manager.AvailableDevices.Where(d => d.DeviceInformation.VendorId == 0x1d6b && d.DeviceInformation.ProductId == 0x0104); + } + internal static void ListUsb() { foreach (var testUsbDevice in Manager.AvailableDevices) Print(testUsbDevice, ""); -- 2.7.4