Commit 40a65e1f authored by Devon Carew's avatar Devon Carew Committed by GitHub

minor tweaks to the output for flutter_tools (#11115)

* minor tweaks to the output for flutter_tools

* update test expectations
parent 63d25006
......@@ -69,7 +69,7 @@ class NoAndroidStudioValidator extends DoctorValidator {
'but Android Studio not found at this location.'));
}
messages.add(new ValidationMessage(
'Android Studio not found. Download from https://developer.android.com/studio/index.html\n'
'Android Studio not found; download from https://developer.android.com/studio/index.html\n'
'(or visit https://flutter.io/setup/#android-setup for detailed instructions).'));
return new ValidationResult(ValidationType.missing, messages,
......
......@@ -132,7 +132,7 @@ Future<String> _ensureGradle() async {
// Note: Gradle may be bootstrapped and possibly downloaded as a side-effect
// of validating the Gradle executable. This may take several seconds.
Future<String> _initializeGradle() async {
final Status status = logger.startProgress('Initializing Gradle...', expectSlowOperation: true);
final Status status = logger.startProgress('Initializing gradle...', expectSlowOperation: true);
String gradle = _locateProjectGradlew();
if (gradle == null) {
_injectGradleWrapper();
......
......@@ -221,7 +221,7 @@ class VerboseLogger extends Logger {
stopwatch.reset();
String prefix;
const int prefixWidth = 12;
const int prefixWidth = 8;
if (millis == 0) {
prefix = ''.padLeft(prefixWidth);
} else {
......
......@@ -124,7 +124,7 @@ class Xcode {
final RegExp xcodeVersionRegex = new RegExp(r'Xcode ([0-9.]+)');
void _updateXcodeVersion() {
try {
_xcodeVersionText = processManager.runSync(<String>['/usr/bin/xcodebuild', '-version']).stdout.replaceAll('\n', ', ');
_xcodeVersionText = processManager.runSync(<String>['/usr/bin/xcodebuild', '-version']).stdout.trim().replaceAll('\n', ', ');
final Match match = xcodeVersionRegex.firstMatch(xcodeVersionText);
if (match == null)
return;
......
......@@ -16,10 +16,10 @@ void main() {
verboseLogger.printTrace('Oooh, I do I do I do');
verboseLogger.printError('Helpless!');
expect(mockLogger.statusText, matches(r'^\[ (?: {0,2}\+[0-9]{1,3} ms| )\] Hey Hey Hey Hey\n'
r'\[ (?: {0,2}\+[0-9]{1,3} ms| )\] Oooh, I do I do I do\n$'));
expect(mockLogger.statusText, matches(r'^\[ (?: {0,2}\+[0-9]{1,3} ms| )\] Hey Hey Hey Hey\n'
r'\[ (?: {0,2}\+[0-9]{1,3} ms| )\] Oooh, I do I do I do\n$'));
expect(mockLogger.traceText, '');
expect(mockLogger.errorText, matches(r'^\[ (?: {0,2}\+[0-9]{1,3} ms| )\] Helpless!\n$'));
expect(mockLogger.errorText, matches(r'^\[ (?: {0,2}\+[0-9]{1,3} ms| )\] Helpless!\n$'));
});
});
}
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