fixed broken test - decoded response body to match source and renamed stack property

jyameo · jyameo · commit db9abfb86e25 · 2025-01-15T16:14:46.000-05:00
diff --git a/dwds/lib/src/debugging/dart_scope.dart b/dwds/lib/src/debugging/dart_scope.dart
@@ -60,6 +60,16 @@ Future<List<Property>> visibleVariables({
     final objectId = scope.object.objectId;
     if (objectId != null) {
       final properties = await inspector.getProperties(objectId);
+      for (final property in properties) {
+        if (property.name == '_\$35wc2\$35formal') {
+          final newProperty = Property({
+            'name': '_',
+            'value': property.value,
+          });
+          properties.remove(property);
+          properties.add(newProperty);
+        }
+      }
       allProperties.addAll(properties);
     }
   }
diff --git a/dwds/test/chrome_proxy_service_amd_test.dart b/dwds/test/chrome_proxy_service_amd_test.dart
@@ -1,4 +1,4 @@
-// Copyright (c) 2019, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2025, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
diff --git a/dwds/test/common/chrome_proxy_service_common.dart b/dwds/test/common/chrome_proxy_service_common.dart
@@ -739,10 +739,18 @@ void runTests({
         for (final scriptRef in scripts.scripts!) {
           final script =
               await service.getObject(isolate.id!, scriptRef.id!) as Script;
-          final serverPath = DartUri(script.uri!, 'hello_world/').serverPath;
+          var serverPath = DartUri(script.uri!, 'hello_world/').serverPath;
+          if (serverPath.startsWith('hello_world/packages/')) {
+            serverPath = serverPath.replaceFirst('hello_world/', '');
+          }
           final result = await http
               .get(Uri.parse('http://localhost:${context.port}/$serverPath'));
-          expect(script.source, result.body);
+          // TODO: Figure out if we can encode the sript as utf8 and avoid this
+          final body =
+              (moduleFormat == ModuleFormat.ddc && canaryFeatures == true)
+                  ? utf8.decode(result.body.codeUnits)
+                  : result.body;
+          expect(script.source, body);
           expect(scriptRef.uri, endsWith('.dart'));
           expect(script.tokenPosTable, isNotEmpty);
         }
diff --git a/fixtures/_testSound/example/hello_world/index.html b/fixtures/_testSound/example/hello_world/index.html
@@ -1,6 +1,7 @@
 <html>
 
 <head>
+  <meta charset='utf-8'>
   <script defer src="main.dart.js"></script>
 </head>
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright (c) 2019, the Dart project authors. Please see the AUTHORS file`
	`1`	`+// Copyright (c) 2025, the Dart project authors. Please see the AUTHORS file`
`2`	`2`	`// for details. All rights reserved. Use of this source code is governed by a`
`3`	`3`	`// BSD-style license that can be found in the LICENSE file.`
`4`	`4`
-Original file line number
+Diff line change
@@ @@ -1,6 +1,7 @@ @@
 <html>
 <head>
 +  <meta charset='utf-8'>
   <script defer src="main.dart.js"></script>
 </head>