Skip to content

Commit

Permalink
Reorganise flutter driver implementation sources (flutter#13163)
Browse files Browse the repository at this point in the history
This patch reorganises flutter_driver's lib/src directory into three
subdirectories:

* driver: sources transitively imported/exported by flutter_driver.dart,
  which defines the API used by driver tests executed on the host machine.

* extension: sources transitively imported/exported by
  driver_extension.dart, which defines the API used to instrument a
  Flutter app running on the target device for use with a driver test.

* common: sources common to both driver and extension code.

This makes rolling Flutter into repositories that use Bazel (or
Bazel-like build systems) significantly more robust, due to the simpler
glob patterns involved.
  • Loading branch information
cbracken authored Nov 23, 2017
1 parent 8a63a0f commit 9e95c82
Show file tree
Hide file tree
Showing 21 changed files with 44 additions and 44 deletions.
2 changes: 1 addition & 1 deletion packages/flutter_driver/lib/driver_extension.dart
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@
/// }
library flutter_driver_extension;

export 'src/extension.dart' show enableFlutterDriverExtension, DataHandler;
export 'src/extension/extension.dart' show enableFlutterDriverExtension, DataHandler;
30 changes: 15 additions & 15 deletions packages/flutter_driver/lib/flutter_driver.dart
Original file line number Diff line number Diff line change
Expand Up @@ -11,32 +11,32 @@
/// Protractor (Angular), Espresso (Android) or Earl Gray (iOS).
library flutter_driver;

export 'src/common.dart' show
testOutputsDirectory;
export 'src/driver.dart' show
find,
CommonFinders,
EvaluatorFunction,
FlutterDriver,
TimelineStream;
export 'src/error.dart' show
export 'src/common/error.dart' show
DriverError,
LogLevel,
LogRecord,
flutterDriverLog;
export 'src/find.dart' show
export 'src/common/find.dart' show
SerializableFinder;
export 'src/health.dart' show
export 'src/common/health.dart' show
Health,
HealthStatus;
export 'src/message.dart' show
export 'src/common/message.dart' show
Command,
Result;
export 'src/render_tree.dart' show
export 'src/common/render_tree.dart' show
RenderTree;
export 'src/timeline.dart' show
export 'src/driver/common.dart' show
testOutputsDirectory;
export 'src/driver/driver.dart' show
find,
CommonFinders,
EvaluatorFunction,
FlutterDriver,
TimelineStream;
export 'src/driver/timeline.dart' show
Timeline,
TimelineEvent;
export 'src/timeline_summary.dart' show
export 'src/driver/timeline_summary.dart' show
TimelineSummary,
kBuildBudget;
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ import 'package:path/path.dart' as p;
import 'package:vm_service_client/vm_service_client.dart';
import 'package:web_socket_channel/io.dart';

import '../common/error.dart';
import '../common/find.dart';
import '../common/frame_sync.dart';
import '../common/gesture.dart';
import '../common/health.dart';
import '../common/message.dart';
import '../common/render_tree.dart';
import '../common/request_data.dart';
import '../common/semantics.dart';
import 'common.dart';
import 'error.dart';
import 'find.dart';
import 'frame_sync.dart';
import 'gesture.dart';
import 'health.dart';
import 'message.dart';
import 'render_tree.dart';
import 'request_data.dart';
import 'semantics.dart';
import 'timeline.dart';

/// Timeline stream identifier.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ import 'package:flutter/services.dart';
import 'package:flutter/widgets.dart';
import 'package:flutter_test/flutter_test.dart';

import 'error.dart';
import 'find.dart';
import 'frame_sync.dart';
import 'gesture.dart';
import 'health.dart';
import 'message.dart';
import 'render_tree.dart';
import 'request_data.dart';
import 'semantics.dart';
import '../common/error.dart';
import '../common/find.dart';
import '../common/frame_sync.dart';
import '../common/gesture.dart';
import '../common/health.dart';
import '../common/message.dart';
import '../common/render_tree.dart';
import '../common/request_data.dart';
import '../common/semantics.dart';

const String _extensionMethodName = 'driver';
const String _extensionMethod = 'ext.flutter.$_extensionMethodName';
Expand Down
8 changes: 4 additions & 4 deletions packages/flutter_driver/test/flutter_driver_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

import 'dart:async';

import 'package:flutter_driver/src/driver.dart';
import 'package:flutter_driver/src/error.dart';
import 'package:flutter_driver/src/health.dart';
import 'package:flutter_driver/src/timeline.dart';
import 'package:flutter_driver/src/common/error.dart';
import 'package:flutter_driver/src/common/health.dart';
import 'package:flutter_driver/src/driver/driver.dart';
import 'package:flutter_driver/src/driver/timeline.dart';
import 'package:json_rpc_2/json_rpc_2.dart' as rpc;
import 'package:mockito/mockito.dart';
import 'package:test/test.dart';
Expand Down
6 changes: 3 additions & 3 deletions packages/flutter_driver/test/src/extension_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
// found in the LICENSE file.

import 'package:flutter/scheduler.dart';
import 'package:flutter_driver/src/extension.dart';
import 'package:flutter_driver/src/find.dart';
import 'package:flutter_driver/src/request_data.dart';
import 'package:flutter_driver/src/common/find.dart';
import 'package:flutter_driver/src/common/request_data.dart';
import 'package:flutter_driver/src/extension/extension.dart';
import 'package:flutter_test/flutter_test.dart';

void main() {
Expand Down
4 changes: 2 additions & 2 deletions packages/flutter_driver/test/src/timeline_summary_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
import 'dart:convert' show JSON;

import 'package:file/file.dart';
import 'package:flutter_driver/flutter_driver.dart';
import 'package:flutter_driver/src/driver/common.dart';
import 'package:path/path.dart' as path;
import 'package:test/test.dart';
import 'package:flutter_driver/src/common.dart';
import 'package:flutter_driver/flutter_driver.dart';

void main() {
group('TimelineSummary', () {
Expand Down
2 changes: 1 addition & 1 deletion packages/flutter_driver/test/src/timeline_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// found in the LICENSE file.

import 'package:test/test.dart';
import 'package:flutter_driver/src/timeline.dart';
import 'package:flutter_driver/src/driver/timeline.dart';

void main() {
group('Timeline', () {
Expand Down

0 comments on commit 9e95c82

Please sign in to comment.