Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

[google_maps_flutter] Clean Java test, consolidate Marker example. #4400

Merged
merged 5 commits into from
Oct 20, 2021
Merged

[google_maps_flutter] Clean Java test, consolidate Marker example. #4400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0056a93
Improve usage of mock
JamesMcIntosh Oct 1, 2021
96b274b
Merge google map marker examples
JamesMcIntosh Oct 1, 2021
be49498
Make marker current position disappear after dragging
ditman Oct 15, 2021
ae3bcc8
Merge branch 'master' into googl-maps-flutter-testfix
ditman Oct 15, 2021
2afb9c4
Merge branch 'master' into googl-maps-flutter-testfix
ditman Oct 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions ...ps_flutter/android/src/test/java/io/flutter/plugins/googlemaps/MarkersControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;

import com.google.android.gms.internal.maps.zzt;
import com.google.android.gms.maps.GoogleMap;
import com.google.android.gms.maps.model.LatLng;
import com.google.android.gms.maps.model.Marker;
Expand All @@ -35,8 +34,7 @@ public void controller_OnMarkerDragStart() {
final GoogleMap googleMap = mock(GoogleMap.class);
controller.setGoogleMap(googleMap);

final zzt z = mock(zzt.class);
final Marker marker = new Marker(z);
final Marker marker = mock(Marker.class);

final String googleMarkerId = "abc123";

Expand Down Expand Up @@ -69,8 +67,7 @@ public void controller_OnMarkerDragEnd() {
final GoogleMap googleMap = mock(GoogleMap.class);
controller.setGoogleMap(googleMap);

final zzt z = mock(zzt.class);
final Marker marker = new Marker(z);
final Marker marker = mock(Marker.class);

final String googleMarkerId = "abc123";

Expand Down Expand Up @@ -103,8 +100,7 @@ public void controller_OnMarkerDrag() {
final GoogleMap googleMap = mock(GoogleMap.class);
controller.setGoogleMap(googleMap);

final zzt z = mock(zzt.class);
final Marker marker = new Marker(z);
final Marker marker = mock(Marker.class);

final String googleMarkerId = "abc123";

Expand Down
156 changes: 0 additions & 156 deletions packages/google_maps_flutter/google_maps_flutter/example/lib/drag_marker.dart
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions packages/google_maps_flutter/google_maps_flutter/example/lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
// ignore_for_file: public_member_api_docs

import 'package:flutter/material.dart';
import 'package:google_maps_flutter_example/drag_marker.dart';
import 'package:google_maps_flutter_example/lite_mode.dart';
import 'animate_camera.dart';
import 'map_click.dart';
Expand Down Expand Up @@ -35,7 +34,6 @@ final List<GoogleMapExampleAppPage> _allPages = <GoogleMapExampleAppPage>[
PlacePolylinePage(),
PlacePolygonPage(),
PlaceCirclePage(),
DragMarkerPage(),
PaddingPage(),
SnapshotPage(),
LiteModePage(),
Expand Down
Loading