Fixed broken tests - DC

Author: ChopinDavid

packages/go_router/lib/src/configuration.dart

@@ -292,24 +292,11 @@ class RouteConfiguration {
 
   /// Finds the routes that matched the given URL.
   RouteMatchList findMatch(String location, {Object? extra}) {
-    final Uri uri = Uri.parse(location);
-    // Remove the host and scheme from the uri to match
-    // TODO(ChopinDavid): Do we want to expose this as a getter on `Uri` itself? Or use an extension/helper method?
-    final Uri uriToMatch = Uri.parse(
-      canonicalUri(
-        location.substring(
-          uri.host.isNotEmpty
-              ? uri.toString().indexOf(uri.host) + uri.host.length
-              : uri.hasScheme
-                  ? uri.toString().indexOf(uri.scheme) + uri.scheme.length
-                  : 0,
-        ),
-      ),
-    );
+    final Uri uri = Uri.parse(canonicalUri(location));
 
     final Map<String, String> pathParameters = <String, String>{};
     final List<RouteMatchBase> matches =
-        _getLocRouteMatches(uriToMatch, pathParameters);
+        _getLocRouteMatches(uri, pathParameters);
 
     if (matches.isEmpty) {
       return _errorRouteMatchList(

packages/go_router/lib/src/path_utils.dart

@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'misc/errors.dart';
 import 'route.dart';
 
 final RegExp _parameterRegExp = RegExp(r':(\w+)(\((?:\\.|[^\\()])+\))?');
@@ -120,6 +121,9 @@ String concatenatePaths(String parentPath, String childPath) {
 
 /// Normalizes the location string.
 String canonicalUri(String loc) {
+  if (loc.isEmpty) {
+    throw GoException('Location cannot be empty.');
+  }
   String canon = Uri.parse(loc).toString();
   canon = canon.endsWith('?') ? canon.substring(0, canon.length - 1) : canon;
 
@@ -131,9 +135,18 @@ String canonicalUri(String loc) {
       ? canon.substring(0, canon.length - 1)
       : canon;
 
+  // replace '/?', except for first occurrence, from path only
   // /login/?from=/ => /login?from=/
   // /?from=/ => /?from=/
-  canon = canon.replaceFirst('/?', '?', 1);
+  final Uri uri = Uri.parse(canon);
+  final int pathStartIndex = uri.host.isNotEmpty
+      ? uri.toString().indexOf(uri.host) + uri.host.length
+      : uri.hasScheme
+          ? uri.toString().indexOf(uri.scheme) + uri.scheme.length
+          : 0;
+  if (pathStartIndex < canon.length) {
+    canon = canon.replaceFirst('/?', '?', pathStartIndex + 1);
+  }
 
   return canon;
 }