diff options
Diffstat (limited to 'vcl/qa')
| -rw-r--r-- | vcl/qa/cppunit/blocklistparsertest.cxx | 25 | ||||
| -rw-r--r-- | vcl/qa/cppunit/test_blocklist_evaluate.xml | 11 | ||||
| -rw-r--r-- | vcl/qa/cppunit/test_blocklist_parse.xml | 18 |
3 files changed, 2 insertions, 52 deletions
diff --git a/vcl/qa/cppunit/blocklistparsertest.cxx b/vcl/qa/cppunit/blocklistparsertest.cxx index f9a692585ca0..7d99e87f3750 100644 --- a/vcl/qa/cppunit/blocklistparsertest.cxx +++ b/vcl/qa/cppunit/blocklistparsertest.cxx @@ -40,7 +40,7 @@ void BlocklistParserTest::testParse() aBlocklistParser.parse(); size_t const n = aDriveInfos.size(); - CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(22), n); + CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(16), n); size_t i = 0; @@ -54,23 +54,6 @@ void BlocklistParserTest::testParse() aDriveInfo = aDriveInfos[i++]; CPPUNIT_ASSERT_EQUAL(bIsWhitelisted, aDriveInfo.mbWhitelisted); - CPPUNIT_ASSERT_EQUAL(WinOpenGLDeviceInfo::GetDeviceVendor(wgl::VendorIntel), aDriveInfo.maAdapterVendor); - CPPUNIT_ASSERT_EQUAL(wgl::VersionComparisonOp::DRIVER_LESS_THAN_OR_EQUAL, aDriveInfo.meComparisonOp); - CPPUNIT_ASSERT_EQUAL(wgl::V(11,21,31,41), aDriveInfo.mnDriverVersion); - - aDriveInfo = aDriveInfos[i++]; - CPPUNIT_ASSERT_EQUAL(bIsWhitelisted, aDriveInfo.mbWhitelisted); - CPPUNIT_ASSERT_EQUAL(WinOpenGLDeviceInfo::GetDeviceVendor(wgl::VendorATI), aDriveInfo.maAdapterVendor); - CPPUNIT_ASSERT_EQUAL(wgl::VersionComparisonOp::DRIVER_GREATER_THAN, aDriveInfo.meComparisonOp); - CPPUNIT_ASSERT_EQUAL(wgl::V(12,22,32,42), aDriveInfo.mnDriverVersion); - - aDriveInfo = aDriveInfos[i++]; - CPPUNIT_ASSERT_EQUAL(bIsWhitelisted, aDriveInfo.mbWhitelisted); - CPPUNIT_ASSERT_EQUAL(WinOpenGLDeviceInfo::GetDeviceVendor(wgl::VendorAMD), aDriveInfo.maAdapterVendor); - CPPUNIT_ASSERT_EQUAL(wgl::VersionComparisonOp::DRIVER_GREATER_THAN_OR_EQUAL, aDriveInfo.meComparisonOp); - - aDriveInfo = aDriveInfos[i++]; - CPPUNIT_ASSERT_EQUAL(bIsWhitelisted, aDriveInfo.mbWhitelisted); CPPUNIT_ASSERT_EQUAL(WinOpenGLDeviceInfo::GetDeviceVendor(wgl::VendorNVIDIA), aDriveInfo.maAdapterVendor); CPPUNIT_ASSERT_EQUAL(wgl::VersionComparisonOp::DRIVER_EQUAL, aDriveInfo.meComparisonOp); @@ -118,17 +101,11 @@ void BlocklistParserTest::testEvaluate() OUString vendorIntel = WinOpenGLDeviceInfo::GetDeviceVendor(wgl::VendorIntel); OUString vendorMicrosoft = WinOpenGLDeviceInfo::GetDeviceVendor(wgl::VendorMicrosoft); - uint32_t const osWindowsXP = 0x00050001; - uint32_t const osWindowsVista = 0x00060000; uint32_t const osWindows7 = 0x00060001; uint32_t const osWindows8 = 0x00060002; uint32_t const osWindows10 = 0x000A0000; // Check OS - CPPUNIT_ASSERT_EQUAL(true, WinOpenGLDeviceInfo::FindBlocklistedDeviceInList( - aDriveInfos, "10.20.30.40", vendorNVIDIA, "all", osWindowsXP)); - CPPUNIT_ASSERT_EQUAL(true, WinOpenGLDeviceInfo::FindBlocklistedDeviceInList( - aDriveInfos, "10.20.30.40", vendorNVIDIA, "all", osWindowsVista)); CPPUNIT_ASSERT_EQUAL(false, WinOpenGLDeviceInfo::FindBlocklistedDeviceInList( aDriveInfos, "10.20.30.40", vendorNVIDIA, "all", osWindows7)); CPPUNIT_ASSERT_EQUAL(false, WinOpenGLDeviceInfo::FindBlocklistedDeviceInList( diff --git a/vcl/qa/cppunit/test_blocklist_evaluate.xml b/vcl/qa/cppunit/test_blocklist_evaluate.xml index 7ffbe3a1b588..dbcee17a1b18 100644 --- a/vcl/qa/cppunit/test_blocklist_evaluate.xml +++ b/vcl/qa/cppunit/test_blocklist_evaluate.xml @@ -9,7 +9,7 @@ <!-- entry attributes: - os - "all", "xp", "server2003", "vista", "7", "8", "8_1", "10" + os - "all", "7", "8", "8_1", "10" vendor - "all", "intel", "ati", "amd", "nvidia", "microsoft" compare - "less", "less_equal", "greater", "greater_equal", "equal", "not_equal", "between_exclusive", "between_inclusive", "between_inclusive_start" version @@ -21,15 +21,6 @@ <whitelist> </whitelist> <blacklist> - <entry os="xp" vendor="all"> - <device id="all"/> - </entry> - <entry os="server2003" vendor="all"> - <device id="all"/> - </entry> - <entry os="vista" vendor="all"> - <device id="all"/> - </entry> <entry os="all" vendor="amd" compare="less" version="10.20.30.40"> <device id="all"/> diff --git a/vcl/qa/cppunit/test_blocklist_parse.xml b/vcl/qa/cppunit/test_blocklist_parse.xml index 72ba4059115a..f9af4cb5418e 100644 --- a/vcl/qa/cppunit/test_blocklist_parse.xml +++ b/vcl/qa/cppunit/test_blocklist_parse.xml @@ -12,15 +12,6 @@ <entry os="all" vendor="all" compare="less" version="10.20.30.40"> <device id="all"/> </entry> - <entry os="xp" vendor="intel" compare="less_equal" version="11.21.31.41"> - <device id="all"/> - </entry> - <entry os="server2003" vendor="ati" compare="greater" version="12.22.32.42"> - <device id="all"/> - </entry> - <entry os="vista" vendor="amd" compare="greater_equal" version="10.20.30.40"> - <device id="all"/> - </entry> <entry os="7" vendor="nvidia" compare="equal" version="10.20.30.40"> <device id="all"/> </entry> @@ -47,15 +38,6 @@ <entry os="all" vendor="all" compare="less" version="10.20.30.40"> <device id="all"/> </entry> - <entry os="xp" vendor="intel" compare="less_equal" version="11.21.31.41"> - <device id="all"/> - </entry> - <entry os="server2003" vendor="ati" compare="greater" version="12.22.32.42"> - <device id="all"/> - </entry> - <entry os="vista" vendor="amd" compare="greater_equal" version="10.20.30.40"> - <device id="all"/> - </entry> <entry os="7" vendor="nvidia" compare="equal" version="10.20.30.40"> <device id="all"/> </entry> |