From a8b36c7da41f8a89c109c1ecc24164c9a37cf332 Mon Sep 17 00:00:00 2001 From: "Jason C.H" Date: Wed, 7 Dec 2022 01:41:09 +0800 Subject: [PATCH] Fix windows version validator under Chinese (#116282) * Fix windows version validator under Chinese * Update authors * Update RegExp to reduce groups * Add a trailing newline --- AUTHORS | 1 + .../windows/windows_version_validator.dart | 4 +- .../windows_version_validator_test.dart | 84 +++++++++++++++++-- 3 files changed, 82 insertions(+), 7 deletions(-) diff --git a/AUTHORS b/AUTHORS index 109246ce0d..33f57815e7 100644 --- a/AUTHORS +++ b/AUTHORS @@ -99,3 +99,4 @@ Nguyễn Phúc Lợi Jingyi Chen Junhua Lin <1075209054@qq.com> Tomasz Gucio +Jason C.H diff --git a/packages/flutter_tools/lib/src/windows/windows_version_validator.dart b/packages/flutter_tools/lib/src/windows/windows_version_validator.dart index bc43193e3e..4e69cd37da 100644 --- a/packages/flutter_tools/lib/src/windows/windows_version_validator.dart +++ b/packages/flutter_tools/lib/src/windows/windows_version_validator.dart @@ -17,7 +17,7 @@ const List kUnsupportedVersions = [ /// Regex pattern for identifying line from systeminfo stdout with windows version /// (ie. 10.5.4123) const String kWindowsOSVersionSemVerPattern = - r'^(OS Version:\s*)([0-9]+\.[0-9]+\.[0-9]+)(.*)$'; + r'^(OS )([^:]*:\s*)([0-9]+\.[0-9]+\.[0-9]+)(.*)$'; /// Validator for supported Windows host machine operating system version. class WindowsVersionValidator extends DoctorValidator { @@ -52,7 +52,7 @@ class WindowsVersionValidator extends DoctorValidator { final String statusInfo; if (matches.length == 1 && !kUnsupportedVersions - .contains(matches.elementAt(0).group(2)?.split('.').elementAt(0))) { + .contains(matches.elementAt(0).group(3)?.split('.').elementAt(0))) { windowsVersionStatus = ValidationType.installed; statusInfo = 'Installed version of Windows is version 10 or higher'; } else { diff --git a/packages/flutter_tools/test/general.shard/windows_version_validator_test.dart b/packages/flutter_tools/test/general.shard/windows_version_validator_test.dart index 0b5fa3b780..c6b4e6fa4a 100644 --- a/packages/flutter_tools/test/general.shard/windows_version_validator_test.dart +++ b/packages/flutter_tools/test/general.shard/windows_version_validator_test.dart @@ -52,6 +52,45 @@ Hotfix(s): 7 Hotfix(s) Installed. Hyper-V Requirements: A hypervisor has been detected. Features required for Hyper-V will not be displayed. '''; +const String validWindows11CnStdOut = r''' +主机名: XXXXXXXXXXXX +OS 名称: Microsoft Windows 11 专业版 +OS 版本: 10.0.22621 暂缺 Build 22621 +OS 制造商: Microsoft Corporation +OS 配置: 独立工作站 +OS 构建类型: Multiprocessor Free +注册的所有人: 暂缺 +注册的组织: 暂缺 +产品 ID: XXXXXXXXXXXX +初始安装日期: 2022/11/9, 13:33:50 +系统启动时间: 2022/11/30, 13:36:47 +系统制造商: ASUS +系统型号: System Product Name +系统类型: x64-based PC +处理器: 安装了 1 个处理器。 + [01]: Intel64 Family 6 Model 151 Stepping 2 GenuineIntel ~3600 Mhz +BIOS 版本: American Megatrends Inc. 2103, 2022/9/30 +Windows 目录: C:\WINDOWS +系统目录: C:\WINDOWS\system32 +启动设备: \Device\HarddiskVolume1 +系统区域设置: zh-cn;中文(中国) +输入法区域设置: zh-cn;中文(中国) +时区: (UTC+08:00) 北京，重庆，香港特别行政区，乌鲁木齐 +物理内存总量: 65,277 MB +可用的物理内存: 55,333 MB +虚拟内存: 最大值: 75,005 MB +虚拟内存: 可用: 61,781 MB +虚拟内存: 使用中: 13,224 MB +页面文件位置: C:\pagefile.sys +域: WORKGROUP +登录服务器: \\XXXXXXXXXXXX +修补程序: 安装了 3 个修补程序。 + [01]: KB5020622 + [02]: KB5019980 + [03]: KB5019304 +Hyper-V 要求: 已检测到虚拟机监控程序。将不显示 Hyper-V 所需的功能。 +'''; + /// Example output from `systeminfo` from version != 10 const String invalidWindowsStdOut = r''' Host Name: XXXXXXXXXXXX @@ -151,6 +190,36 @@ void main() { reason: 'The ValidationResult statusInfo messages should be the same'); }); + testWithoutContext( + 'Successfully running windows version check on windows 11 CN', + () async { + final WindowsVersionValidator windowsVersionValidator = + WindowsVersionValidator( + processManager: FakeProcessManager.list( + [ + const FakeCommand( + command: ['systeminfo'], + stdout: validWindows11CnStdOut, + ), + ], + ), + ); + + final ValidationResult result = await windowsVersionValidator.validate(); + + expect( + result.type, + validWindows10ValidationResult.type, + reason: 'The ValidationResult type should be the same (installed)', + ); + expect( + result.statusInfo, + validWindows10ValidationResult.statusInfo, + reason: 'The ValidationResult statusInfo messages should be the same', + ); + }, + ); + testWithoutContext('Failing to invoke the `systeminfo` command', () async { final WindowsVersionValidator windowsVersionValidator = WindowsVersionValidator( @@ -217,19 +286,24 @@ void main() { const String testStr = r''' OS Version: 10.0.19044 N/A Build 19044 OSz Version: 10.0.19044 N/A Build 19044 -OS 6Version: 10.0.19044 N/A Build 19044 OxS Version: 10.0.19044 N/A Build 19044 OS Version: 10.19044 N/A Build 19044 OS Version: 10.x.19044 N/A Build 19044 OS Version: 10.0.19044 N/A Build 19044 OS Version: .0.19044 N/A Build 19044 +OS 版本: 10.0.22621 暂缺 Build 22621 '''; - final RegExp regex = - RegExp(kWindowsOSVersionSemVerPattern, multiLine: true); + final RegExp regex = RegExp( + kWindowsOSVersionSemVerPattern, + multiLine: true, + ); final Iterable matches = regex.allMatches(testStr); - expect(matches.length, 2, - reason: 'There should be only two matches for the pattern provided'); + expect( + matches.length, + 3, + reason: 'There should be only two matches for the pattern provided', + ); }); }