firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rev mockito; remove deprecated uses

Browse Source
This commit is contained in:
Devon Carew 2016-03-30 09:10:50 -07:00
parent 89143313cb
commit d5cccf5cd6
5 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/flutter_driver/lib/src/extension.dart
View File

@ -85,7 +85,7 @@ class FlutterDriverExtension {
if (commandHandler == null || commandDeserializer == null) {
return new ServiceExtensionResponse.error(
ServiceExtensionResponse.kInvalidParams,
ServiceExtensionResponse.invalidParams,
'Extension $_extensionMethod does not support command $commandKind'
);
}
@ -95,13 +95,13 @@ class FlutterDriverExtension {
return new ServiceExtensionResponse.result(JSON.encode(result.toJson()));
}, onError: (e, s) {
_log.warning('$e:\n$s');
return new ServiceExtensionResponse.error(ServiceExtensionResponse.kExtensionError, '$e');
return new ServiceExtensionResponse.error(ServiceExtensionResponse.extensionError, '$e');
});
} catch(error, stackTrace) {
String message = 'Uncaught extension error: $error\n$stackTrace';
_log.error(message);
return new ServiceExtensionResponse.error(
ServiceExtensionResponse.kExtensionError, message);
ServiceExtensionResponse.extensionError, message);
}
}

2
packages/flutter_driver/pubspec.yaml
View File

@ -18,5 +18,5 @@ dependencies:
dev_dependencies:
test: '>=0.12.6 <1.0.0'
mockito: ^0.10.1
mockito: ^0.11.0
quiver: '>=0.21.4 <0.22.0'

2
packages/flutter_tools/pubspec.yaml
View File

@ -41,4 +41,4 @@ dependencies:
# See also https://github.com/dart-lang/pub/issues/1356
dev_dependencies:
mockito: ^0.10.1
mockito: ^0.11.0

3
packages/flx/test/bundle_test.dart
View File

@ -1,9 +1,8 @@
import 'dart:async';
import 'dart:convert' hide BASE64;
import 'dart:convert';
import 'dart:io';
import 'dart:typed_data';
import 'package:crypto/crypto.dart';
import 'package:flx/bundle.dart';
import 'package:flx/signing.dart';
import 'package:test/test.dart';

5
packages/flx/test/signing_test.dart
View File

@ -1,11 +1,10 @@
import 'dart:async';
import 'dart:convert' hide BASE64;
import 'dart:convert';
import 'dart:typed_data';
import 'package:bignum/bignum.dart';
import 'package:pointycastle/pointycastle.dart' hide CipherParameters;
import 'package:crypto/crypto.dart';
import 'package:flx/signing.dart';
import 'package:pointycastle/pointycastle.dart' hide CipherParameters;
import 'package:test/test.dart';
Future<Null> main() async {