Unverified Commit d5d82650 authored by Dan Field's avatar Dan Field Committed by GitHub

Revert "Write timelines to separate files (#88473)" (#88594)

This reverts commit fa83fefa.
parent a7f8687d
...@@ -297,19 +297,12 @@ https://flutter.dev/docs/testing/integration-tests#testing-on-firebase-test-lab ...@@ -297,19 +297,12 @@ https://flutter.dev/docs/testing/integration-tests#testing-on-firebase-test-lab
/// ///
/// The `streams` and `retainPriorEvents` parameters are passed as-is to /// The `streams` and `retainPriorEvents` parameters are passed as-is to
/// [traceTimeline]. /// [traceTimeline].
///
/// The `reportKey` must not be `'screenshots'`, which is reserved for
/// screenshots created by
/// [IntegrationTestWidgetsFlutterBinding.takeScreenshot].
Future<void> traceAction( Future<void> traceAction(
Future<dynamic> Function() action, { Future<dynamic> Function() action, {
List<String> streams = const <String>['all'], List<String> streams = const <String>['all'],
bool retainPriorEvents = false, bool retainPriorEvents = false,
String reportKey = 'timeline', String reportKey = 'timeline',
}) async { }) async {
if (reportKey == 'screenshots') {
throw ArgumentError('The "screenshots" reportKey is reserved.');
}
final vm.Timeline timeline = await traceTimeline( final vm.Timeline timeline = await traceTimeline(
action, action,
streams: streams, streams: streams,
......
...@@ -24,8 +24,7 @@ String testOutputsDirectory = ...@@ -24,8 +24,7 @@ String testOutputsDirectory =
typedef ResponseDataCallback = FutureOr<void> Function(Map<String, dynamic>?); typedef ResponseDataCallback = FutureOr<void> Function(Map<String, dynamic>?);
/// Writes a json-serializable data to /// Writes a json-serializable data to
/// [testOutputsDirectory]/`testOutputFilename_<key>.json`, where key is the /// [testOutputsDirectory]/`testOutputFilename.json`.
/// name provided as the report key for the response data.
/// ///
/// This is the default `responseDataCallback` in [integrationDriver]. /// This is the default `responseDataCallback` in [integrationDriver].
Future<void> writeResponseData( Future<void> writeResponseData(
...@@ -33,20 +32,15 @@ Future<void> writeResponseData( ...@@ -33,20 +32,15 @@ Future<void> writeResponseData(
String testOutputFilename = 'integration_response_data', String testOutputFilename = 'integration_response_data',
String? destinationDirectory, String? destinationDirectory,
}) async { }) async {
if (data == null) {
return;
}
assert(testOutputFilename != null); assert(testOutputFilename != null);
destinationDirectory ??= testOutputsDirectory; destinationDirectory ??= testOutputsDirectory;
await fs.directory(destinationDirectory).create(recursive: true); await fs.directory(destinationDirectory).create(recursive: true);
for (final String key in data.keys.where((String key) => key != 'screenshots')) {
final File file = fs.file(path.join( final File file = fs.file(path.join(
destinationDirectory, destinationDirectory,
'${testOutputFilename}_$key.json', '$testOutputFilename.json',
)); ));
final String resultString = _encodeJson(data[key], true); final String resultString = _encodeJson(data, true);
await file.writeAsString(resultString); await file.writeAsString(resultString);
}
} }
/// Adaptor to run an integration test using `flutter drive`. /// Adaptor to run an integration test using `flutter drive`.
...@@ -101,6 +95,6 @@ Future<void> integrationDriver({ ...@@ -101,6 +95,6 @@ Future<void> integrationDriver({
const JsonEncoder _prettyEncoder = JsonEncoder.withIndent(' '); const JsonEncoder _prettyEncoder = JsonEncoder.withIndent(' ');
String _encodeJson(Object? jsonObject, bool pretty) { String _encodeJson(Map<String, dynamic>? jsonObject, bool pretty) {
return pretty ? _prettyEncoder.convert(jsonObject) : json.encode(jsonObject); return pretty ? _prettyEncoder.convert(jsonObject) : json.encode(jsonObject);
} }
// Copyright 2014 The Flutter Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import 'package:flutter_driver/flutter_driver.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:integration_test/integration_test_driver.dart';
import 'package:path/path.dart' as path;
void main() {
useMemoryFileSystemForTesting();
test('Writes multiple files for each timeline', () async {
final String outDir = fs.systemTempDirectory.path;
await writeResponseData(
<String, dynamic>{
'timeline_a': <String, dynamic>{},
'timeline_b': <String, dynamic>{},
'screenshots': <String, dynamic>{},
},
destinationDirectory: outDir,
);
expect(fs.file(path.join(outDir, 'integration_response_data_timeline_a.json')).existsSync(), true);
expect(fs.file(path.join(outDir, 'integration_response_data_timeline_b.json')).existsSync(), true);
expect(fs.file(path.join(outDir, 'integration_response_data_screenshots.json')).existsSync(), false);
});
}
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