Commit 37581f94 authored by Devon Carew's avatar Devon Carew

Merge pull request #2997 from devoncarew/nits

rev mockito; remove deprecated uses
parents 89143313 d5cccf5c
......@@ -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);
}
}
......
......@@ -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'
......@@ -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
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';
......
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 {
......
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