Unverified Commit 3a5e4540 authored by Daniel Edrisian's avatar Daniel Edrisian Committed by GitHub

Updated androidMissingSdkInstructions error message (#65964)

parent 1f627769
...@@ -167,7 +167,7 @@ class AndroidValidator extends DoctorValidator { ...@@ -167,7 +167,7 @@ class AndroidValidator extends DoctorValidator {
} else { } else {
// Instruct user to set [kAndroidSdkRoot] and not deprecated [kAndroidHome] // Instruct user to set [kAndroidSdkRoot] and not deprecated [kAndroidHome]
// See https://github.com/flutter/flutter/issues/39301 // See https://github.com/flutter/flutter/issues/39301
messages.add(ValidationMessage.error(_userMessages.androidMissingSdkInstructions(kAndroidSdkRoot, _platform))); messages.add(ValidationMessage.error(_userMessages.androidMissingSdkInstructions(_platform)));
} }
return ValidationResult(ValidationType.missing, messages); return ValidationResult(ValidationType.missing, messages);
} }
...@@ -198,7 +198,7 @@ class AndroidValidator extends DoctorValidator { ...@@ -198,7 +198,7 @@ class AndroidValidator extends DoctorValidator {
_androidSdk.latestVersion.platformName, _androidSdk.latestVersion.platformName,
_androidSdk.latestVersion.buildToolsVersionName))); _androidSdk.latestVersion.buildToolsVersionName)));
} else { } else {
messages.add(ValidationMessage.error(_userMessages.androidMissingSdkInstructions(kAndroidHome, _platform))); messages.add(ValidationMessage.error(_userMessages.androidMissingSdkInstructions(_platform)));
} }
if (_platform.environment.containsKey(kAndroidHome)) { if (_platform.environment.containsKey(kAndroidHome)) {
......
...@@ -69,13 +69,13 @@ class UserMessages { ...@@ -69,13 +69,13 @@ class UserMessages {
String androidBadSdkDir(String envKey, String homeDir) => String androidBadSdkDir(String envKey, String homeDir) =>
'$envKey = $homeDir\n' '$envKey = $homeDir\n'
'but Android SDK not found at this location.'; 'but Android SDK not found at this location.';
String androidMissingSdkInstructions(String envKey, Platform platform) => String androidMissingSdkInstructions(Platform platform) =>
'Unable to locate Android SDK.\n' 'Unable to locate Android SDK.\n'
'Install Android Studio from: https://developer.android.com/studio/index.html\n' 'Install Android Studio from: https://developer.android.com/studio/index.html\n'
'On first launch it will assist you in installing the Android SDK components.\n' 'On first launch it will assist you in installing the Android SDK components.\n'
'(or visit ${_androidSdkInstallUrl(platform)} for detailed instructions).\n' '(or visit ${_androidSdkInstallUrl(platform)} for detailed instructions).\n'
'If the Android SDK has been installed to a custom location, set $envKey to that location.\n' 'If the Android SDK has been installed to a custom location, please use\n'
'You may also want to add it to your PATH environment variable.\n'; '`flutter config --android-sdk` to update to that location.\n';
String androidSdkLocation(String directory) => 'Android SDK at $directory'; String androidSdkLocation(String directory) => 'Android SDK at $directory';
String androidSdkPlatformToolsVersion(String platform, String tools) => String androidSdkPlatformToolsVersion(String platform, String tools) =>
'Platform $platform, build-tools $tools'; 'Platform $platform, build-tools $tools';
......
...@@ -329,9 +329,15 @@ void main() { ...@@ -329,9 +329,15 @@ void main() {
validationResult.messages.last.message, validationResult.messages.last.message,
errorMessage, errorMessage,
); );
expect(
validationResult.messages.any(
(ValidationMessage message) => message.message.contains('Unable to locate Android SDK')
),
false,
);
}); });
testWithoutContext('Mentions `kAndroidSdkRoot if user has no AndroidSdk`', () async { testWithoutContext('Mentions `flutter config --android-sdk if user has no AndroidSdk`', () async {
final ValidationResult validationResult = await AndroidValidator( final ValidationResult validationResult = await AndroidValidator(
androidSdk: null, androidSdk: null,
androidStudio: null, androidStudio: null,
...@@ -343,7 +349,7 @@ void main() { ...@@ -343,7 +349,7 @@ void main() {
).validate(); ).validate();
expect( expect(
validationResult.messages.any( validationResult.messages.any(
(ValidationMessage message) => message.message.contains(kAndroidSdkRoot) (ValidationMessage message) => message.message.contains('flutter config --android-sdk')
), ),
true, true,
); );
......
...@@ -23,7 +23,7 @@ void main() { ...@@ -23,7 +23,7 @@ void main() {
testWithoutContext('Android installation instructions', () { testWithoutContext('Android installation instructions', () {
final UserMessages userMessages = UserMessages(); final UserMessages userMessages = UserMessages();
_checkInstallationURL((Platform platform) => userMessages.androidMissingSdkInstructions('ANDROID_SDK_ROOT', platform)); _checkInstallationURL((Platform platform) => userMessages.androidMissingSdkInstructions(platform));
_checkInstallationURL((Platform platform) => userMessages.androidSdkInstallHelp(platform)); _checkInstallationURL((Platform platform) => userMessages.androidSdkInstallHelp(platform));
_checkInstallationURL((Platform platform) => userMessages.androidMissingSdkManager('/', platform)); _checkInstallationURL((Platform platform) => userMessages.androidMissingSdkManager('/', platform));
_checkInstallationURL((Platform platform) => userMessages.androidCannotRunSdkManager('/', '', platform)); _checkInstallationURL((Platform platform) => userMessages.androidCannotRunSdkManager('/', '', platform));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment