From a1db1e92ec3d0a72645be892042ac39d09d96857 Mon Sep 17 00:00:00 2001 From: Pierre Champion Date: Thu, 22 Aug 2019 16:07:12 +0200 Subject: [PATCH] Revert "Custom error codes on the plugin side" --- .../go-plugin-example/complex/main.go | 5 -- plugin_tutorial/lib/main_desktop.dart | 46 +++++++------------ 2 files changed, 17 insertions(+), 34 deletions(-) diff --git a/plugin_tutorial/go-plugin-example/complex/main.go b/plugin_tutorial/go-plugin-example/complex/main.go index 914d22c..34cc90e 100644 --- a/plugin_tutorial/go-plugin-example/complex/main.go +++ b/plugin_tutorial/go-plugin-example/complex/main.go @@ -21,7 +21,6 @@ func (p *Example) InitPlugin(messenger plugin.BinaryMessenger) error { p.channel = plugin.NewMethodChannel(messenger, "instance.id/go/data", plugin.StandardMethodCodec{}) p.channel.HandleFunc("getData", getRemotesFunc) - p.channel.HandleFunc("getError", getErrorFunc) p.channel.CatchAllHandleFunc(p.catchAllTest) return nil @@ -65,7 +64,3 @@ func getRemotesFunc(arguments interface{}) (reply interface{}, err error) { return sectionList, nil } - -func getErrorFunc(arguments interface{}) (reply interface{}, err error) { - return nil, plugin.NewError("customErrorCode", errors.New("Some error")) -} diff --git a/plugin_tutorial/lib/main_desktop.dart b/plugin_tutorial/lib/main_desktop.dart index 7103e40..979b40b 100644 --- a/plugin_tutorial/lib/main_desktop.dart +++ b/plugin_tutorial/lib/main_desktop.dart @@ -21,38 +21,26 @@ void main() async { print(batteryLevel); }); - group('Complex plugin', () { + // A more complicated plugin + // + test('Test StandardMethodCodec array of map', () async { const platform_complex_structure = const MethodChannel('instance.id/go/data'); - // A more complicated plugin - test('Test StandardMethodCodec array of map', () async { - final List result = - await platform_complex_structure.invokeMethod('getData', - "HelloFromDart"); // passing "HelloFromDart" as an argument - expect(result, [ - {"instanceid": 1023, "pcbackup": "test", "brbackup": "test2"}, - {"instanceid": 1024, "pcbackup": "test", "brbackup": "test2"}, - {"instanceid": 1056, "pcbackup": "coucou", "brbackup": "coucou2"}, - {"instanceid": 3322, "pcbackup": "finaly", "brbackup": "finaly2"} - ]); - - // golang can return the random methodName - final String methodName = - 'test/' + new Random().nextInt(100000).toString(); - final String resultPathPrefix = - await platform_complex_structure.invokeMethod(methodName); - expect(resultPathPrefix, methodName); - }); - - test('Custom errors', () async { - var matcher = predicate( - (e) => e is PlatformException && e.code == "customErrorCode"); - expect( - platform_complex_structure.invokeMethod('getError'), - throwsA(matcher), - ); - }); + final List result = await platform_complex_structure.invokeMethod( + 'getData', "HelloFromDart"); // passing "HelloFromDart" as an argument + expect(result, [ + {"instanceid": 1023, "pcbackup": "test", "brbackup": "test2"}, + {"instanceid": 1024, "pcbackup": "test", "brbackup": "test2"}, + {"instanceid": 1056, "pcbackup": "coucou", "brbackup": "coucou2"}, + {"instanceid": 3322, "pcbackup": "finaly", "brbackup": "finaly2"} + ]); + + // golang can return the random methodName + final String methodName = 'test/' + new Random().nextInt(100000).toString(); + final String resultPathPrefix = + await platform_complex_structure.invokeMethod(methodName); + expect(resultPathPrefix, methodName); }); tearDownAll(() async {