Revert "Revert "Roll engine to fed2ea458ed49088d33eddabc546ba56d600c717 (includes dart roll) again (#19277)" (#19295)" (#19322)
This reverts commit cc122f1672d4b7e0c0734be34a155997463e3b56.
diff --git a/packages/flutter_tools/test/version_test.dart b/packages/flutter_tools/test/version_test.dart
index 61ec9f6..f64b34b 100644
--- a/packages/flutter_tools/test/version_test.dart
+++ b/packages/flutter_tools/test/version_test.dart
@@ -31,32 +31,6 @@
setUp(() {
mockProcessManager = new MockProcessManager();
mockCache = new MockCache();
-
- when(mockProcessManager.runSync(
- <String>['git', 'rev-parse', '--abbrev-ref', '--symbolic', '@{u}'],
- workingDirectory: anyNamed('workingDirectory'),
- environment: anyNamed('environment'),
- )).thenReturn(new ProcessResult(101, 0, 'master', ''));
- when(mockProcessManager.runSync(
- <String>['git', 'rev-parse', '--abbrev-ref', 'HEAD'],
- workingDirectory: anyNamed('workingDirectory'),
- environment: anyNamed('environment'),
- )).thenReturn(new ProcessResult(102, 0, 'branch', ''));
- when(mockProcessManager.runSync(
- <String>['git', 'log', '-n', '1', '--pretty=format:%H'],
- workingDirectory: anyNamed('workingDirectory'),
- environment: anyNamed('environment'),
- )).thenReturn(new ProcessResult(103, 0, '1234abcd', ''));
- when(mockProcessManager.runSync(
- <String>['git', 'log', '-n', '1', '--pretty=format:%ar'],
- workingDirectory: anyNamed('workingDirectory'),
- environment: anyNamed('environment'),
- )).thenReturn(new ProcessResult(104, 0, '1 second ago', ''));
- when(mockProcessManager.runSync(
- <String>['git', 'describe', '--match', 'v*.*.*', '--first-parent', '--long', '--tags'],
- workingDirectory: anyNamed('workingDirectory'),
- environment: anyNamed('environment'),
- )).thenReturn(new ProcessResult(105, 0, 'v0.1.2-3-1234abcd', ''));
});
group('$FlutterVersion', () {
@@ -83,8 +57,6 @@
});
testUsingContext('prints nothing when Flutter installation looks out-of-date by is actually up-to-date', () async {
- final FlutterVersion version = FlutterVersion.instance;
-
fakeData(
mockProcessManager,
mockCache,
@@ -97,6 +69,7 @@
expectSetStamp: true,
expectServerPing: true,
);
+ final FlutterVersion version = FlutterVersion.instance;
await version.checkFlutterVersionFreshness();
_expectVersionMessage('');
@@ -107,8 +80,6 @@
});
testUsingContext('does not ping server when version stamp is up-to-date', () async {
- final FlutterVersion version = FlutterVersion.instance;
-
fakeData(
mockProcessManager,
mockCache,
@@ -120,6 +91,7 @@
expectSetStamp: true,
);
+ final FlutterVersion version = FlutterVersion.instance;
await version.checkFlutterVersionFreshness();
_expectVersionMessage(FlutterVersion.newVersionAvailableMessage());
}, overrides: <Type, Generator>{
@@ -129,8 +101,6 @@
});
testUsingContext('does not print warning if printed recently', () async {
- final FlutterVersion version = FlutterVersion.instance;
-
fakeData(
mockProcessManager,
mockCache,
@@ -142,6 +112,7 @@
expectSetStamp: true,
);
+ final FlutterVersion version = FlutterVersion.instance;
await version.checkFlutterVersionFreshness();
_expectVersionMessage(FlutterVersion.newVersionAvailableMessage());
expect((await VersionCheckStamp.load()).lastTimeWarningWasPrinted, _testClock.now());
@@ -155,8 +126,6 @@
});
testUsingContext('pings server when version stamp is missing then does not', () async {
- final FlutterVersion version = FlutterVersion.instance;
-
fakeData(
mockProcessManager,
mockCache,
@@ -165,6 +134,7 @@
expectSetStamp: true,
expectServerPing: true,
);
+ final FlutterVersion version = FlutterVersion.instance;
await version.checkFlutterVersionFreshness();
_expectVersionMessage(FlutterVersion.newVersionAvailableMessage());
@@ -185,8 +155,6 @@
});
testUsingContext('pings server when version stamp is out-of-date', () async {
- final FlutterVersion version = FlutterVersion.instance;
-
fakeData(
mockProcessManager,
mockCache,
@@ -199,6 +167,7 @@
expectSetStamp: true,
expectServerPing: true,
);
+ final FlutterVersion version = FlutterVersion.instance;
await version.checkFlutterVersionFreshness();
_expectVersionMessage(FlutterVersion.newVersionAvailableMessage());
@@ -209,8 +178,6 @@
});
testUsingContext('does not print warning when unable to connect to server if not out of date', () async {
- final FlutterVersion version = FlutterVersion.instance;
-
fakeData(
mockProcessManager,
mockCache,
@@ -219,6 +186,7 @@
expectServerPing: true,
expectSetStamp: true,
);
+ final FlutterVersion version = FlutterVersion.instance;
await version.checkFlutterVersionFreshness();
_expectVersionMessage('');
@@ -229,8 +197,6 @@
});
testUsingContext('prints warning when unable to connect to server if really out of date', () async {
- final FlutterVersion version = FlutterVersion.instance;
-
fakeData(
mockProcessManager,
mockCache,
@@ -239,6 +205,7 @@
expectServerPing: true,
expectSetStamp: true
);
+ final FlutterVersion version = FlutterVersion.instance;
await version.checkFlutterVersionFreshness();
_expectVersionMessage(FlutterVersion.versionOutOfDateMessage(_testClock.now().difference(_outOfDateVersion)));
@@ -249,13 +216,23 @@
});
testUsingContext('versions comparison', () async {
+ fakeData(
+ mockProcessManager,
+ mockCache,
+ localCommitDate: _outOfDateVersion,
+ errorOnFetch: true,
+ expectServerPing: true,
+ expectSetStamp: true
+ );
+ final FlutterVersion version = FlutterVersion.instance;
+
when(mockProcessManager.runSync(
<String>['git', 'merge-base', '--is-ancestor', 'abcdef', '123456'],
workingDirectory: anyNamed('workingDirectory'),
)).thenReturn(new ProcessResult(1, 0, '', ''));
expect(
- FlutterVersion.instance.checkRevisionAncestry(
+ version.checkRevisionAncestry(
tentativeDescendantRevision: '123456',
tentativeAncestorRevision: 'abcdef',
),
@@ -456,6 +433,32 @@
when(pm.run(any, workingDirectory: anyNamed('workingDirectory'))).thenAnswer((Invocation invocation) async {
return syncAnswer(invocation);
});
+
+ when(pm.runSync(
+ <String>['git', 'rev-parse', '--abbrev-ref', '--symbolic', '@{u}'],
+ workingDirectory: anyNamed('workingDirectory'),
+ environment: anyNamed('environment'),
+ )).thenReturn(new ProcessResult(101, 0, 'master', ''));
+ when(pm.runSync(
+ <String>['git', 'rev-parse', '--abbrev-ref', 'HEAD'],
+ workingDirectory: anyNamed('workingDirectory'),
+ environment: anyNamed('environment'),
+ )).thenReturn(new ProcessResult(102, 0, 'branch', ''));
+ when(pm.runSync(
+ <String>['git', 'log', '-n', '1', '--pretty=format:%H'],
+ workingDirectory: anyNamed('workingDirectory'),
+ environment: anyNamed('environment'),
+ )).thenReturn(new ProcessResult(103, 0, '1234abcd', ''));
+ when(pm.runSync(
+ <String>['git', 'log', '-n', '1', '--pretty=format:%ar'],
+ workingDirectory: anyNamed('workingDirectory'),
+ environment: anyNamed('environment'),
+ )).thenReturn(new ProcessResult(104, 0, '1 second ago', ''));
+ when(pm.runSync(
+ <String>['git', 'describe', '--match', 'v*.*.*', '--first-parent', '--long', '--tags'],
+ workingDirectory: anyNamed('workingDirectory'),
+ environment: anyNamed('environment'),
+ )).thenReturn(new ProcessResult(105, 0, 'v0.1.2-3-1234abcd', ''));
}
class MockProcessManager extends Mock implements ProcessManager {}
