fix(tests): clobbered tests from library-level exceptions

zino-hofmann · Oct 16, 2019 · f76e165 · f76e165
1 parent 9858886
commit f76e165
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 16 deletions.
diff --git a/...ples/starwars/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java b/...ples/starwars/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java
@@ -1,6 +1,7 @@
 package io.flutter.plugins;
 
 import io.flutter.plugin.common.PluginRegistry;
+import io.flutter.plugins.connectivity.ConnectivityPlugin;
 import io.flutter.plugins.pathprovider.PathProviderPlugin;
 
 /**
@@ -11,6 +12,7 @@ public static void registerWith(PluginRegistry registry) {
     if (alreadyRegisteredWith(registry)) {
       return;
     }
+    ConnectivityPlugin.registerWith(registry.registrarFor("io.flutter.plugins.connectivity.ConnectivityPlugin"));
     PathProviderPlugin.registerWith(registry.registrarFor("io.flutter.plugins.pathprovider.PathProviderPlugin"));
   }
 

diff --git a/examples/starwars/ios/Runner/GeneratedPluginRegistrant.m b/examples/starwars/ios/Runner/GeneratedPluginRegistrant.m
@@ -3,11 +3,13 @@
 //
 
 #import "GeneratedPluginRegistrant.h"
+#import <connectivity/ConnectivityPlugin.h>
 #import <path_provider/PathProviderPlugin.h>
 
 @implementation GeneratedPluginRegistrant
 
 + (void)registerWithRegistry:(NSObject<FlutterPluginRegistry>*)registry {
+  [FLTConnectivityPlugin registerWithRegistrar:[registry registrarForPlugin:@"FLTConnectivityPlugin"]];
   [FLTPathProviderPlugin registerWithRegistrar:[registry registrarForPlugin:@"FLTPathProviderPlugin"]];
 }
 

diff --git a/packages/graphql/lib/src/exceptions/io_network_exception.dart b/packages/graphql/lib/src/exceptions/io_network_exception.dart
@@ -2,22 +2,19 @@ import 'dart:io' show SocketException;
 import 'dart:io';
 import './network_exception_stub.dart' as stub;
 
-class NetworkException extends stub.NetworkException {
-  SocketException wrappedException;
+export './network_exception_stub.dart' show NetworkException;
 
-  Uri uri;
-
-  NetworkException.from(this.wrappedException)
-      : uri = Uri(
-          scheme: 'http',
-          host: wrappedException.address.host,
-          port: wrappedException.port,
-        );
-}
-
-NetworkException translateNetworkFailure(dynamic failure) {
+stub.NetworkException translateNetworkFailure(dynamic failure) {
   if (failure is SocketException) {
-    return NetworkException.from(failure);
+    return stub.NetworkException(
+      wrappedException: failure,
+      message: failure.message,
+      uri: Uri(
+        scheme: 'http',
+        host: failure.address.host,
+        port: failure.port,
+      ),
+    );
   }
   return stub.translateNetworkFailure(failure);
 }
diff --git a/packages/graphql/test/link/http/link_http_test.dart b/packages/graphql/test/link/http/link_http_test.dart
@@ -1,6 +1,7 @@
 import "dart:async";
 import "dart:convert";
 
+import 'package:graphql/client.dart';
 import 'package:graphql/internal.dart';
 import 'package:graphql/src/link/http/link_http.dart';
 import 'package:graphql/src/link/link.dart';
@@ -340,11 +341,17 @@ void main() {
 
       expect(
         exception,
+        const TypeMatcher<NetworkException>(),
+      );
+
+      expect(
+        (exception as NetworkException).wrappedException,
         const TypeMatcher<http.ClientException>(),
       );
+
       expect(
         exception.toString(),
-        'Invalid response body: {}',
+        'Failed to connect to /graphql-test: Invalid response body: {}',
       );
     });
 
@@ -375,11 +382,17 @@ void main() {
 
       expect(
         exception,
+        const TypeMatcher<NetworkException>(),
+      );
+
+      expect(
+        (exception as NetworkException).wrappedException,
         const TypeMatcher<http.ClientException>(),
       );
+
       expect(
         exception.toString(),
-        'Network Error: 400 {}',
+        'Failed to connect to /graphql-test: Network Error: 400 {}',
       );
     });
 
@@ -439,6 +452,11 @@ void main() {
 
       expect(
         exception,
+        const TypeMatcher<UnhandledFailureWrapper>(),
+      );
+
+      expect(
+        (exception as UnhandledFailureWrapper).failure,
         const TypeMatcher<FormatException>(),
       );
     });

diff --git a/packages/graphql_flutter/example/ios/Flutter/flutter_export_environment.sh b/packages/graphql_flutter/example/ios/Flutter/flutter_export_environment.sh
@@ -6,3 +6,5 @@ export "FLUTTER_TARGET=lib/main.dart"
 export "FLUTTER_BUILD_DIR=build"
 export "SYMROOT=${SOURCE_ROOT}/../build/ios"
 export "FLUTTER_FRAMEWORK_DIR=/Users/mjr/flutter/bin/cache/artifacts/engine/ios"
+export "FLUTTER_BUILD_NAME=1.0.0"
+export "FLUTTER_BUILD_NUMBER=1"