Revert "Unit test against local backend. (#3278)" (#3280)

This reverts commit 16e82bb.

Author: johnpryan

.github/workflows/dartpad_ui.yml

@@ -35,9 +35,6 @@ jobs:
       - run: flutter pub get
       - run: flutter analyze
       - run: dart format --set-exit-if-changed .
-      - name: Create template projects and populate the custom pub cache
-        run: dart run grinder build-project-templates
-        working-directory: pkgs/dart_services/
       - run: flutter build web
       - run: flutter test test/presubmit
       - run: sh ./tool/check_cycles.sh

pkgs/dart_services/lib/server.dart

@@ -6,10 +6,7 @@ import 'dart:async';
 import 'dart:io';
 
 import 'package:args/args.dart';
-import 'package:dartpad_shared/services.dart';
-import 'package:http/http.dart' as http;
 import 'package:logging/logging.dart';
-import 'package:meta/meta.dart';
 import 'package:shelf/shelf.dart';
 import 'package:shelf/shelf_io.dart' as shelf;
 import 'package:shelf_gzip/shelf_gzip.dart';
@@ -178,38 +175,3 @@ Middleware exceptionResponse() {
     };
   };
 }
-
-@visibleForTesting
-Future<TestServerRunner> startTestServer() async {
-  final runner = TestServerRunner();
-  await runner.start();
-  return runner;
-}
-
-@visibleForTesting
-class TestServerRunner {
-  late final ServicesClient client;
-  late final EndpointsServer _server;
-  final sdk = Sdk.fromLocalFlutter();
-
-  Completer<void>? _started;
-
-  Future<ServicesClient> start() async {
-    assert(_started == null, 'Server should not be started');
-    _started = Completer<void>();
-    _server = await EndpointsServer.serve(8080, sdk, null, 'nnbd_artifacts');
-    client = ServicesClient(
-      http.Client(),
-      rootUrl: 'http://localhost:${_server.port}/',
-    );
-    _started!.complete();
-    return client;
-  }
-
-  Future<void> stop() async {
-    assert(_started != null, 'Server should be started before stopping');
-    await _started!.future;
-    client.dispose();
-    await _server.close();
-  }
-}

pkgs/dart_services/lib/src/analysis.dart

@@ -283,7 +283,7 @@ class AnalysisServerWrapper {
         errors.map((error) {
           final issue = api.AnalysisIssue(
             kind: error.severity.toLowerCase(),
-            message: utils.normalizeImports(error.message),
+            message: utils.normalizeFilePaths(error.message),
             code: error.code.toLowerCase(),
             location: api.Location(
               charStart: error.location.offset,
@@ -294,12 +294,12 @@ class AnalysisServerWrapper {
             correction:
                 error.correction == null
                     ? null
-                    : utils.normalizeImports(error.correction!),
+                    : utils.normalizeFilePaths(error.correction!),
             url: error.url,
             contextMessages:
                 error.contextMessages?.map((m) {
                   return api.DiagnosticMessage(
-                    message: utils.normalizeImports(m.message),
+                    message: utils.normalizeFilePaths(m.message),
                     location: api.Location(
                       charStart: m.location.offset,
                       charLength: m.location.length,

pkgs/dart_services/lib/src/project_templates.dart

@@ -8,8 +8,6 @@ import 'package:analyzer/dart/ast/ast.dart';
 import 'package:meta/meta.dart';
 import 'package:path/path.dart' as path;
 
-import 'utils.dart';
-
 /// Sets of project template directory paths.
 class ProjectTemplates {
   ProjectTemplates._({
@@ -39,16 +37,8 @@ class ProjectTemplates {
 
   static ProjectTemplates projectTemplates = ProjectTemplates();
 
-  static String _baseTemplateProject() {
-    final dir = path.join(
-      Directory.current.path,
-      '..',
-      'dart_services',
-      'project_templates',
-    );
-
-    return normalizeFilePath(dir);
-  }
+  static String _baseTemplateProject() =>
+      path.join(Directory.current.path, 'project_templates');
 }
 
 /// The set of supported Flutter-oriented packages.

pkgs/dart_services/lib/src/utils.dart

@@ -21,7 +21,7 @@ import 'package:path/path.dart' as path;
 ///
 /// "Unused import: 'package:flutter/material.dart'" ->
 /// "Unused import: 'package:flutter/material.dart'"
-String normalizeImports(String text) {
+String normalizeFilePaths(String text) {
   return text.replaceAllMapped(_possiblePathPattern, (match) {
     final possiblePath = match.group(0)!;
 
@@ -45,35 +45,6 @@ String normalizeImports(String text) {
   });
 }
 
-/// Normalizes an absolute file path by removing all occurrences of "..".
-String normalizeFilePath(String filePath) {
-  const parent = '..';
-  final parts = path.split(filePath);
-  assert(parts[0] == Platform.pathSeparator);
-  parts.removeAt(0);
-  assert(parts[0] != Platform.pathSeparator);
-
-  String? atOrNull(int index) {
-    if (index < 0) return null;
-    return parts.elementAtOrNull(index);
-  }
-
-  while (true) {
-    var index = parts.lastIndexOf(parent);
-
-    while (atOrNull(index - 1) == parent) {
-      index = index - 1;
-    }
-
-    if (index == -1 || index == 0) break;
-
-    parts.removeAt(index);
-    parts.removeAt(index - 1);
-  }
-
-  return '${Platform.pathSeparator}${path.joinAll(parts)}';
-}
-
 Future<Process> runWithLogging(
   String executable, {
   List<String> arguments = const [],

pkgs/dart_services/test/server_test.dart

@@ -4,7 +4,9 @@
 
 import 'package:collection/collection.dart';
 import 'package:dart_services/server.dart';
+import 'package:dart_services/src/sdk.dart';
 import 'package:dartpad_shared/services.dart';
+import 'package:http/http.dart';
 import 'package:test/test.dart';
 
 import 'src/sample_code.dart';
@@ -13,16 +15,24 @@ void main() => defineTests();
 
 void defineTests() {
   group('server', () {
-    final runner = TestServerRunner();
+    final sdk = Sdk.fromLocalFlutter();
+    late final EndpointsServer server;
+    late final Client httpClient;
     late final ServicesClient client;
 
     setUpAll(() async {
-      await runner.start();
-      client = runner.client;
+      server = await EndpointsServer.serve(0, sdk, null, 'nnbd_artifacts');
+
+      httpClient = Client();
+      client = ServicesClient(
+        httpClient,
+        rootUrl: 'http://localhost:${server.port}/',
+      );
     });
 
     tearDownAll(() async {
-      await runner.stop();
+      client.dispose();
+      await server.close();
     });
 
     test('version', () async {
@@ -334,7 +344,7 @@ void main() {
       (request) => client.compileDDC(request),
       expectDeltaDill: false,
     );
-    if (runner.sdk.dartMajorVersion >= 3 && runner.sdk.dartMinorVersion >= 8) {
+    if (sdk.dartMajorVersion >= 3 && sdk.dartMinorVersion >= 8) {
       testDDCEndpoint(
         'compileNewDDC',
         (request) => client.compileNewDDC(request),

pkgs/dart_services/test/utils_test.dart

@@ -8,52 +8,52 @@ import 'package:test/test.dart';
 void main() => defineTests();
 
 void defineTests() {
-  void expectNormalizeImports(String input, String output) {
-    expect(normalizeImports(input), equals(output));
+  void expectNormalizeFilePaths(String input, String output) {
+    expect(normalizeFilePaths(input), equals(output));
   }
 
-  group('expectNormalizeImports', () {
+  group('expectNormalizeFilePaths', () {
     test('strips a temporary directory path', () {
-      expectNormalizeImports(
+      expectNormalizeFilePaths(
         'List is defined in /var/folders/4p/y54w9nqj0_n6ryqwn7lxqz6800m6cw/T/DartAnalysisWrapperintLAw/main.dart',
         'List is defined in main.dart',
       );
     });
 
     test('replaces a SDK path with "dart:core"', () {
-      expectNormalizeImports(
+      expectNormalizeFilePaths(
         'List is defined in /path/dart/dart/sdk/lib/core/list.dart',
         'List is defined in dart:core/list.dart',
       );
     });
 
     test('replaces a specific SDK path with "dart:core"', () {
-      expectNormalizeImports(
+      expectNormalizeFilePaths(
         "The argument type 'List<int> (where List is defined in /Users/username/sdk/dart/2.10.5/lib/core/list.dart)' can't be assigned to the parameter type 'List<int> (where List is defined in /var/folders/4p/tmp/T/DartAnalysisWrapperintLAw/main.dart)'.",
         "The argument type 'List<int> (where List is defined in dart:core/list.dart)' can't be assigned to the parameter type 'List<int> (where List is defined in main.dart)'.",
       );
     });
 
     test('keeps a "package:" path intact', () {
-      expectNormalizeImports(
+      expectNormalizeFilePaths(
         "Unused import: 'package:flutter/material.dart'.",
         "Unused import: 'package:flutter/material.dart'.",
       );
     });
 
     test('keeps a "dart:core" path intact', () {
-      expectNormalizeImports('dart:core/foo.dart', 'dart:core/foo.dart');
+      expectNormalizeFilePaths('dart:core/foo.dart', 'dart:core/foo.dart');
     });
 
     test('keeps a web URL intact', () {
-      expectNormalizeImports(
+      expectNormalizeFilePaths(
         'See http://dart.dev/go/non-promo-property',
         'See http://dart.dev/go/non-promo-property',
       );
     });
 
     test('strips a Flutter SDK path', () {
-      expectNormalizeImports(
+      expectNormalizeFilePaths(
         "The argument type 'StatelessWidget (where StatelessWidget is defined in /Users/username/path/to/dart-services/project_templates/flutter_project/main.dart)' can't be assigned to the parameter type 'StatelessWidget (where StatelessWidget is defined in /Users/username/path/to/dart-services/flutter-sdk/packages/flutter/lib/src/widgets/framework.dart)'.",
         "The argument type 'StatelessWidget (where StatelessWidget is defined in main.dart)' can't be assigned to the parameter type 'StatelessWidget (where StatelessWidget is defined in package:flutter/framework.dart)'.",
       );
@@ -97,16 +97,4 @@ void defineTests() {
       expect(lines.columnForOffset(3), 4);
     });
   });
-
-  group('normalizeFilePath', () {
-    test('removes ".." from the path', () {
-      expect(normalizeFilePath('/path/to/../file.dart'), '/path/file.dart');
-      expect(normalizeFilePath('/path/../to/file.dart'), '/to/file.dart');
-      expect(normalizeFilePath('/path/to/../../file.dart'), '/file.dart');
-      expect(normalizeFilePath('/path/../../to/file.dart'), '/../to/file.dart');
-      expect(normalizeFilePath('/path/../to/../../file.dart'), '/../file.dart');
-      expect(normalizeFilePath('/path/../../to/../file.dart'), '/../file.dart');
-      expect(normalizeFilePath('/../path/../to/file.dart'), '/../to/file.dart');
-    });
-  });
 }

pkgs/dartpad_shared/lib/services.dart

@@ -16,12 +16,8 @@ class ServicesClient {
 
   ServicesClient(this.client, {required this.rootUrl});
 
-  Future<VersionResponse> version() async {
-    print('Fetching version from $rootUrl');
-    final result = await _requestGet('version', VersionResponse.fromJson);
-    print('Version: $result');
-    return result;
-  }
+  Future<VersionResponse> version() =>
+      _requestGet('version', VersionResponse.fromJson);
 
   Future<AnalysisResponse> analyze(SourceRequest request) =>
       _requestPost('analyze', request.toJson(), AnalysisResponse.fromJson);

pkgs/dartpad_ui/lib/main.dart

@@ -47,11 +47,7 @@ void main() async {
 }
 
 class DartPadApp extends StatefulWidget {
-  const DartPadApp({super.key, this.channel});
-
-  /// If initialized, will override URL parameter for channel.
-  @visibleForTesting
-  final String? channel;
+  const DartPadApp({super.key});
 
   @override
   State<DartPadApp> createState() => _DartPadAppState();
@@ -132,7 +128,7 @@ class _DartPadAppState extends State<DartPadApp> {
     final gistId = gist ?? state.uri.queryParameters['id'];
     final builtinSampleId = state.uri.queryParameters['sample'];
     final flutterSampleId = state.uri.queryParameters['sample_id'];
-    final channelParam = widget.channel ?? state.uri.queryParameters['channel'];
+    final channelParam = state.uri.queryParameters['channel'];
     final embedMode = state.uri.queryParameters['embed'] == 'true';
     final runOnLoad = state.uri.queryParameters['run'] == 'true';
     useGenUI = state.uri.queryParameters['genui'] == 'true';

pkgs/dartpad_ui/lib/model.dart

@@ -261,7 +261,11 @@ class AppServices {
     });
   }
 
-  Future<VersionResponse> populateVersions() => services.version();
+  Future<VersionResponse> populateVersions() async {
+    final version = await services.version();
+    appModel.runtimeVersions.value = version;
+    return version;
+  }
 
   Future<void> performInitialLoad({
     String? gistId,
@@ -594,7 +598,7 @@ enum Channel {
   beta('Beta', 'https://beta.api.dartpad.dev/'),
   main('Main', 'https://master.api.dartpad.dev/'),
   // This channel is only used for local development.
-  localhost('Localhost', 'http://127.0.0.1:8080/');
+  localhost('Localhost', 'http://localhost:8080/');
 
   final String displayName;
   final String url;

pkgs/dartpad_ui/pubspec.yaml

@@ -40,8 +40,6 @@ dev_dependencies:
     sdk: flutter
   flutter_lints: ^5.0.0
   test: ^1.25.7
-  dart_services:
-    path: ../dart_services
 
 flutter:
   uses-material-design: true