From 9a8823011705f10ddd882f3963b8429b0f01b720 Mon Sep 17 00:00:00 2001
From: David Iglesias Teixeira <ditman@gmail.com>
Date: Wed, 3 Mar 2021 17:02:47 -0800
Subject: [PATCH 1/2] Move integration_tests to example. Add docs. Adjust
 pubspec.

---
 .../google_maps_flutter_web/example/README.md | 21 +++++++++++++++++++
 .../google_maps_controller_test.dart}         |  0
 .../google_maps_plugin_test.dart}             |  0
 .../integration_test/marker_test.dart}        |  0
 .../integration_test/markers_test.dart}       |  2 +-
 .../resources/icon_image_base64.dart          |  0
 .../integration_test/shape_test.dart}         |  0
 .../integration_test/shapes_test.dart}        |  0
 .../{test => example}/lib/main.dart           |  0
 .../{test => example}/pubspec.yaml            | 16 +++++++-------
 .../{test/run_test => example/run_test.sh}    |  5 +++--
 .../test_driver/integration_driver.dart}      |  0
 .../{test => example}/web/index.html          |  0
 .../google_maps_flutter_web/test/README.md    | 17 ---------------
 .../google_maps_plugin_integration_test.dart  |  7 -------
 .../test_driver/marker_integration_test.dart  |  7 -------
 .../test_driver/markers_integration_test.dart |  7 -------
 .../test_driver/shape_integration_test.dart   |  7 -------
 .../test_driver/shapes_integration_test.dart  |  7 -------
 19 files changed, 33 insertions(+), 63 deletions(-)
 create mode 100644 packages/google_maps_flutter/google_maps_flutter_web/example/README.md
 rename packages/google_maps_flutter/google_maps_flutter_web/{test/test_driver/google_maps_controller_integration.dart => example/integration_test/google_maps_controller_test.dart} (100%)
 rename packages/google_maps_flutter/google_maps_flutter_web/{test/test_driver/google_maps_plugin_integration.dart => example/integration_test/google_maps_plugin_test.dart} (100%)
 rename packages/google_maps_flutter/google_maps_flutter_web/{test/test_driver/marker_integration.dart => example/integration_test/marker_test.dart} (100%)
 rename packages/google_maps_flutter/google_maps_flutter_web/{test/test_driver/markers_integration.dart => example/integration_test/markers_test.dart} (99%)
 rename packages/google_maps_flutter/google_maps_flutter_web/{test/test_driver => example/integration_test}/resources/icon_image_base64.dart (100%)
 rename packages/google_maps_flutter/google_maps_flutter_web/{test/test_driver/shape_integration.dart => example/integration_test/shape_test.dart} (100%)
 rename packages/google_maps_flutter/google_maps_flutter_web/{test/test_driver/shapes_integration.dart => example/integration_test/shapes_test.dart} (100%)
 rename packages/google_maps_flutter/google_maps_flutter_web/{test => example}/lib/main.dart (100%)
 rename packages/google_maps_flutter/google_maps_flutter_web/{test => example}/pubspec.yaml (52%)
 rename packages/google_maps_flutter/google_maps_flutter_web/{test/run_test => example/run_test.sh} (51%)
 rename packages/google_maps_flutter/google_maps_flutter_web/{test/test_driver/google_maps_controller_integration_test.dart => example/test_driver/integration_driver.dart} (100%)
 rename packages/google_maps_flutter/google_maps_flutter_web/{test => example}/web/index.html (100%)
 delete mode 100644 packages/google_maps_flutter/google_maps_flutter_web/test/README.md
 delete mode 100644 packages/google_maps_flutter/google_maps_flutter_web/test/test_driver/google_maps_plugin_integration_test.dart
 delete mode 100644 packages/google_maps_flutter/google_maps_flutter_web/test/test_driver/marker_integration_test.dart
 delete mode 100644 packages/google_maps_flutter/google_maps_flutter_web/test/test_driver/markers_integration_test.dart
 delete mode 100644 packages/google_maps_flutter/google_maps_flutter_web/test/test_driver/shape_integration_test.dart
 delete mode 100644 packages/google_maps_flutter/google_maps_flutter_web/test/test_driver/shapes_integration_test.dart

diff --git a/packages/google_maps_flutter/google_maps_flutter_web/example/README.md b/packages/google_maps_flutter/google_maps_flutter_web/example/README.md
new file mode 100644
index 000000000000..0ec01e025570
--- /dev/null
+++ b/packages/google_maps_flutter/google_maps_flutter_web/example/README.md
@@ -0,0 +1,21 @@
+# Testing
+
+This package utilizes the `integration_test` package to run its tests in a web browser.
+
+See [flutter.dev > Integration testing](https://flutter.dev/docs/testing/integration-tests) for more info.
+
+## Running the tests
+
+Make sure you have updated to the latest Flutter master.
+
+1. Check what version of Chrome is running on the machine you're running tests on.
+
+2. Download and install driver for that version from here:
+    * <https://chromedriver.chromium.org/downloads>
+
+3. Start the driver using `chromedriver --port=4444`
+
+4. Run tests: `flutter drive -d web-server --browser-name=chrome --driver=test_driver/integration_driver.dart --target=integration_test/TEST_NAME.dart`, or (in Linux):
+
+    * Single: `./run_test.sh integration_test/TEST_NAME.dart`
+    * All: `./run_test.sh`
diff --git a/packages/google_maps_flutter/google_maps_flutter_web/test/test_driver/google_maps_controller_integration.dart b/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/google_maps_controller_test.dart
similarity index 100%
rename from packages/google_maps_flutter/google_maps_flutter_web/test/test_driver/google_maps_controller_integration.dart
rename to packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/google_maps_controller_test.dart
diff --git a/packages/google_maps_flutter/google_maps_flutter_web/test/test_driver/google_maps_plugin_integration.dart b/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/google_maps_plugin_test.dart
similarity index 100%
rename from packages/google_maps_flutter/google_maps_flutter_web/test/test_driver/google_maps_plugin_integration.dart
rename to packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/google_maps_plugin_test.dart
diff --git a/packages/google_maps_flutter/google_maps_flutter_web/test/test_driver/marker_integration.dart b/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/marker_test.dart
similarity index 100%
rename from packages/google_maps_flutter/google_maps_flutter_web/test/test_driver/marker_integration.dart
rename to packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/marker_test.dart
diff --git a/packages/google_maps_flutter/google_maps_flutter_web/test/test_driver/markers_integration.dart b/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/markers_test.dart
similarity index 99%
rename from packages/google_maps_flutter/google_maps_flutter_web/test/test_driver/markers_integration.dart
rename to packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/markers_test.dart
index 9c3ed8ea3860..71cf41522d67 100644
--- a/packages/google_maps_flutter/google_maps_flutter_web/test/test_driver/markers_integration.dart
+++ b/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/markers_test.dart
@@ -164,7 +164,7 @@ void main() {
           startsWith('blob:'));
 
       final blobUrl = controller.markers[MarkerId('1')].marker.icon.url;
-      final response = await http.get(blobUrl);
+      final response = await http.get(Uri.parse(blobUrl));
 
       expect(response.bodyBytes, bytes,
           reason:
diff --git a/packages/google_maps_flutter/google_maps_flutter_web/test/test_driver/resources/icon_image_base64.dart b/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/resources/icon_image_base64.dart
similarity index 100%
rename from packages/google_maps_flutter/google_maps_flutter_web/test/test_driver/resources/icon_image_base64.dart
rename to packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/resources/icon_image_base64.dart
diff --git a/packages/google_maps_flutter/google_maps_flutter_web/test/test_driver/shape_integration.dart b/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/shape_test.dart
similarity index 100%
rename from packages/google_maps_flutter/google_maps_flutter_web/test/test_driver/shape_integration.dart
rename to packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/shape_test.dart
diff --git a/packages/google_maps_flutter/google_maps_flutter_web/test/test_driver/shapes_integration.dart b/packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/shapes_test.dart
similarity index 100%
rename from packages/google_maps_flutter/google_maps_flutter_web/test/test_driver/shapes_integration.dart
rename to packages/google_maps_flutter/google_maps_flutter_web/example/integration_test/shapes_test.dart
diff --git a/packages/google_maps_flutter/google_maps_flutter_web/test/lib/main.dart b/packages/google_maps_flutter/google_maps_flutter_web/example/lib/main.dart
similarity index 100%
rename from packages/google_maps_flutter/google_maps_flutter_web/test/lib/main.dart
rename to packages/google_maps_flutter/google_maps_flutter_web/example/lib/main.dart
diff --git a/packages/google_maps_flutter/google_maps_flutter_web/test/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml
similarity index 52%
rename from packages/google_maps_flutter/google_maps_flutter_web/test/pubspec.yaml
rename to packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml
index 008cc0350430..96da8ab90d82 100644
--- a/packages/google_maps_flutter/google_maps_flutter_web/test/pubspec.yaml
+++ b/packages/google_maps_flutter/google_maps_flutter_web/example/pubspec.yaml
@@ -1,23 +1,23 @@
-name: regular_integration_tests
+name: google_maps_flutter_web_integration_tests
 publish_to: none
 
 environment:
-  sdk: ">=2.2.2 <3.0.0"
+  sdk: ">=2.2.2 <3.0.0" # Bump this to 2.12 when migrating to nnbd.
+  flutter: ">=1.27.0-0" # For integration_test from sdk
 
 dependencies:
+  google_maps_flutter_web:
+    path: ../
   flutter:
     sdk: flutter
 
 dev_dependencies:
   google_maps: ^3.4.4
+  http: ^0.13.0
+  mockito: ^5.0.0
   flutter_driver:
     sdk: flutter
   flutter_test:
     sdk: flutter
-  http: ^0.12.2
-  mockito: ^4.1.1
-  google_maps_flutter_web:
-    path: ../
   integration_test:
-    path: ../../../integration_test
-
+    sdk: flutter
diff --git a/packages/google_maps_flutter/google_maps_flutter_web/test/run_test b/packages/google_maps_flutter/google_maps_flutter_web/example/run_test.sh
similarity index 51%
rename from packages/google_maps_flutter/google_maps_flutter_web/test/run_test
rename to packages/google_maps_flutter/google_maps_flutter_web/example/run_test.sh
index 74a8526a0fa3..8e6f149358c9 100755
--- a/packages/google_maps_flutter/google_maps_flutter_web/test/run_test
+++ b/packages/google_maps_flutter/google_maps_flutter_web/example/run_test.sh
@@ -4,14 +4,15 @@ if pgrep -lf chromedriver > /dev/null; then
 
   if [ $# -eq 0 ]; then
     echo "No target specified, running all tests..."
-    find test_driver/ -iname *_integration.dart | xargs -n1 -i -t flutter drive -d web-server --web-port=7357 --browser-name=chrome --target='{}'
+    find integration_test/ -iname *_test.dart | xargs -n1 -i -t flutter drive -d web-server --web-port=7357 --browser-name=chrome --driver=test_driver/integration_driver.dart --target='{}'
   else
     echo "Running test target: $1..."
     set -x
-    flutter drive -d web-server --web-port=7357 --browser-name=chrome --target=$1
+    flutter drive -d web-server --web-port=7357 --browser-name=chrome --driver=test_driver/integration_driver.dart --target=$1
   fi
 
   else
     echo "chromedriver is not running."
+    echo "Please, check the README.md for instructions on how to use run_test.sh"
 fi
 
diff --git a/packages/google_maps_flutter/google_maps_flutter_web/test/test_driver/google_maps_controller_integration_test.dart b/packages/google_maps_flutter/google_maps_flutter_web/example/test_driver/integration_driver.dart
similarity index 100%
rename from packages/google_maps_flutter/google_maps_flutter_web/test/test_driver/google_maps_controller_integration_test.dart
rename to packages/google_maps_flutter/google_maps_flutter_web/example/test_driver/integration_driver.dart
diff --git a/packages/google_maps_flutter/google_maps_flutter_web/test/web/index.html b/packages/google_maps_flutter/google_maps_flutter_web/example/web/index.html
similarity index 100%
rename from packages/google_maps_flutter/google_maps_flutter_web/test/web/index.html
rename to packages/google_maps_flutter/google_maps_flutter_web/example/web/index.html
diff --git a/packages/google_maps_flutter/google_maps_flutter_web/test/README.md b/packages/google_maps_flutter/google_maps_flutter_web/test/README.md
deleted file mode 100644
index 7c48d024ba57..000000000000
--- a/packages/google_maps_flutter/google_maps_flutter_web/test/README.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Running browser_tests
-
-Make sure you have updated to the latest Flutter master.
-
-1. Check what version of Chrome is running on the machine you're running tests on.
-
-2. Download and install driver for that version from here:
-    * <https://chromedriver.chromium.org/downloads>
-
-3. Start the driver using `chromedriver --port=4444`
-
-4. Change into the `test` directory of your clone.
-
-5. Run tests: `flutter drive -d web-server --browser-name=chrome --target=test_driver/TEST_NAME_integration.dart`, or (in Linux):
-
-    * Single: `./run_test test_driver/TEST_NAME_integration.dart`
-    * All: `./run_test`
diff --git a/packages/google_maps_flutter/google_maps_flutter_web/test/test_driver/google_maps_plugin_integration_test.dart b/packages/google_maps_flutter/google_maps_flutter_web/test/test_driver/google_maps_plugin_integration_test.dart
deleted file mode 100644
index 39444c0daa24..000000000000
--- a/packages/google_maps_flutter/google_maps_flutter_web/test/test_driver/google_maps_plugin_integration_test.dart
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2017 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'package:integration_test/integration_test_driver.dart';
-
-Future<void> main() async => integrationDriver();
diff --git a/packages/google_maps_flutter/google_maps_flutter_web/test/test_driver/marker_integration_test.dart b/packages/google_maps_flutter/google_maps_flutter_web/test/test_driver/marker_integration_test.dart
deleted file mode 100644
index 39444c0daa24..000000000000
--- a/packages/google_maps_flutter/google_maps_flutter_web/test/test_driver/marker_integration_test.dart
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2017 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'package:integration_test/integration_test_driver.dart';
-
-Future<void> main() async => integrationDriver();
diff --git a/packages/google_maps_flutter/google_maps_flutter_web/test/test_driver/markers_integration_test.dart b/packages/google_maps_flutter/google_maps_flutter_web/test/test_driver/markers_integration_test.dart
deleted file mode 100644
index 39444c0daa24..000000000000
--- a/packages/google_maps_flutter/google_maps_flutter_web/test/test_driver/markers_integration_test.dart
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2017 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'package:integration_test/integration_test_driver.dart';
-
-Future<void> main() async => integrationDriver();
diff --git a/packages/google_maps_flutter/google_maps_flutter_web/test/test_driver/shape_integration_test.dart b/packages/google_maps_flutter/google_maps_flutter_web/test/test_driver/shape_integration_test.dart
deleted file mode 100644
index 39444c0daa24..000000000000
--- a/packages/google_maps_flutter/google_maps_flutter_web/test/test_driver/shape_integration_test.dart
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2017 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'package:integration_test/integration_test_driver.dart';
-
-Future<void> main() async => integrationDriver();
diff --git a/packages/google_maps_flutter/google_maps_flutter_web/test/test_driver/shapes_integration_test.dart b/packages/google_maps_flutter/google_maps_flutter_web/test/test_driver/shapes_integration_test.dart
deleted file mode 100644
index 39444c0daa24..000000000000
--- a/packages/google_maps_flutter/google_maps_flutter_web/test/test_driver/shapes_integration_test.dart
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2017 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'package:integration_test/integration_test_driver.dart';
-
-Future<void> main() async => integrationDriver();

From 6bb73dbd547e1a8c7128154470213ed92f472d0e Mon Sep 17 00:00:00 2001
From: David Iglesias Teixeira <ditman@gmail.com>
Date: Wed, 3 Mar 2021 17:07:45 -0800
Subject: [PATCH 2/2] Add stub tests. Document. Clean pubspec.

---
 .../google_maps_flutter_web/CHANGELOG.md               |  5 +++++
 .../google_maps_flutter_web/pubspec.yaml               |  9 ++-------
 .../google_maps_flutter_web/test/README.md             |  5 +++++
 .../test/tests_exist_elsewhere_test.dart               | 10 ++++++++++
 4 files changed, 22 insertions(+), 7 deletions(-)
 create mode 100644 packages/google_maps_flutter/google_maps_flutter_web/test/README.md
 create mode 100644 packages/google_maps_flutter/google_maps_flutter_web/test/tests_exist_elsewhere_test.dart

diff --git a/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md b/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md
index 826f1ea53023..29e9287a14fb 100644
--- a/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md
+++ b/packages/google_maps_flutter/google_maps_flutter_web/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.2.1
+
+* Move integration tests to `example`.
+* Tweak pubspec dependencies for main package.
+
 ## 0.2.0
 
 * Make this plugin compatible with the rest of null-safe plugins.
diff --git a/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml b/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml
index 20d078284742..22df1b24afe0 100644
--- a/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml
+++ b/packages/google_maps_flutter/google_maps_flutter_web/pubspec.yaml
@@ -1,7 +1,7 @@
 name: google_maps_flutter_web
 description: Web platform implementation of google_maps_flutter
 homepage: https://github.com/flutter/plugins/tree/master/packages/google_maps_flutter
-version: 0.2.0
+version: 0.2.1
 
 flutter:
   plugin:
@@ -24,12 +24,7 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  http: ^0.13.0
-  url_launcher: ^6.0.2
-  pedantic: ^1.8.0
-  mockito: ^5.0.0
-  integration_test:
-    path: ../../integration_test
+  pedantic: ^1.10.0
 
 environment:
   sdk: ">=2.3.0 <3.0.0"
diff --git a/packages/google_maps_flutter/google_maps_flutter_web/test/README.md b/packages/google_maps_flutter/google_maps_flutter_web/test/README.md
new file mode 100644
index 000000000000..7c5b4ad682ba
--- /dev/null
+++ b/packages/google_maps_flutter/google_maps_flutter_web/test/README.md
@@ -0,0 +1,5 @@
+## test
+
+This package uses integration tests for testing.
+
+See `example/README.md` for more info.
diff --git a/packages/google_maps_flutter/google_maps_flutter_web/test/tests_exist_elsewhere_test.dart b/packages/google_maps_flutter/google_maps_flutter_web/test/tests_exist_elsewhere_test.dart
new file mode 100644
index 000000000000..334f52186d9d
--- /dev/null
+++ b/packages/google_maps_flutter/google_maps_flutter_web/test/tests_exist_elsewhere_test.dart
@@ -0,0 +1,10 @@
+import 'package:flutter_test/flutter_test.dart';
+
+void main() {
+  test('Tell the user where to find the real tests', () {
+    print('---');
+    print('This package uses integration_test for its tests.');
+    print('See `example/README.md` for more info.');
+    print('---');
+  });
+}