Revert "Extend file-system abstraction with a couple methods, remove context."

pkg/front_end/test/memory_file_system_test.dart

 // Copyright (c) 2016, 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.
 // SharedOptions=--supermixin
 
 library front_end.test.memory_file_system_test;
 
 import 'dart:convert';
 import 'dart:io' as io;
 
@@ skipping 28 matching lines @@
 
   test_equals_samePath() {
     expect(file == entityForPath(join(tempPath, 'file.txt')), isTrue);
   }
 
   test_hashCode_samePath() {
     expect(file.hashCode, entityForPath(join(tempPath, 'file.txt')).hashCode);
   }
 
   test_path() {
-    expect(file.uri, context.toUri(path));
+    expect(file.uri, fileSystem.context.toUri(path));
   }
 
   test_readAsBytes_badUtf8() async {
     // A file containing invalid UTF-8 can still be read as raw bytes.
     List<int> bytes = [0xc0, 0x40]; // Invalid UTF-8
     file.writeAsBytesSync(bytes);
     expect(await file.readAsBytes(), bytes);
   }
 
   test_readAsBytes_doesNotExist() {
@@ skipping 19 matching lines @@
     var s = 'contents';
     file.writeAsStringSync(s);
     expect(await file.readAsString(), s);
   }
 
   test_readAsString_utf8() async {
     file.writeAsBytesSync([0xe2, 0x82, 0xac]); // Unicode € symbol, in UTF-8
     expect(await file.readAsString(), '\u20ac');
   }
 
-  test_exists_doesNotExist() async {
-    expect(await file.exists(), false);
-  }
-
-  test_exists_exists() async {
-    file.writeAsStringSync('x');
-    expect(await file.exists(), true);
-  }
-
-  test_lastModified_doesNotExist() async {
-    expect(file.lastModified(), throwsException);
-  }
-
-  test_lastModified_increasesOnEachChange() async {
-    file.writeAsStringSync('x');
-    var mod1 = await file.lastModified();
-    file.writeAsStringSync('y');
-    var mod2 = await file.lastModified();
-    expect(mod2.isAfter(mod1), isTrue);
-
-    var file2 = entityForPath(join(tempPath, 'file2.txt'));
-    file2.writeAsStringSync('z');
-    var mod3 = await file2.lastModified();
-    expect(mod3.isAfter(mod2), isTrue);
-  }
-
   test_writeAsBytesSync_modifyAfterRead() async {
     file.writeAsBytesSync([1]);
     (await file.readAsBytes())[0] = 2;
     expect(await file.readAsBytes(), [1]);
   }
 
   test_writeAsBytesSync_modifyAfterWrite() async {
     var bytes = [1];
     file.writeAsBytesSync(bytes);
     bytes[0] = 2;
@@ skipping 16 matching lines @@
     file.writeAsStringSync('\u20ac'); // Unicode € symbol
     expect(await file.readAsBytes(), [0xe2, 0x82, 0xac]);
   }
 }
 
 abstract class MemoryFileSystemTestMixin extends _BaseTest {
   Uri tempUri;
 
   setUp() {
     super.setUp();
-    tempUri = context.toUri(tempPath);
+    tempUri = fileSystem.context.toUri(tempPath);
   }
 
   test_currentDirectory_trailingSlash() {
     // The currentDirectory should already end in a trailing slash.
     expect(fileSystem.currentDirectory.path, endsWith('/'));
     // A trailing slash should automatically be appended when creating a
     // MemoryFileSystem.
     var path = fileSystem.currentDirectory.path;
     var currentDirectoryWithoutSlash = fileSystem.currentDirectory
         .replace(path: path.substring(0, path.length - 1));
-    expect(new MemoryFileSystem(currentDirectoryWithoutSlash).currentDirectory,
+    expect(
+        new MemoryFileSystem(fileSystem.context, currentDirectoryWithoutSlash)
+            .currentDirectory,
         fileSystem.currentDirectory);
     // If the currentDirectory supplied to the MemoryFileSystem constructor
     // already has a trailing slash, no further trailing slash should be added.
-    expect(new MemoryFileSystem(fileSystem.currentDirectory).currentDirectory,
+    expect(
+        new MemoryFileSystem(fileSystem.context, fileSystem.currentDirectory)
+            .currentDirectory,
         fileSystem.currentDirectory);
   }
 
   test_entityForPath_absolutize() {
     expect(entityForPath('file.txt').uri,
         fileSystem.currentDirectory.resolve('file.txt'));
   }
 
   test_entityForPath_normalize_dot() {
     expect(entityForPath(join(tempPath, '.', 'file.txt')).uri,
@@ skipping 51 matching lines @@
 
 @reflectiveTest
 class MemoryFileSystemTestPosix extends _BaseTestPosix
     with MemoryFileSystemTestMixin {}
 
 @reflectiveTest
 class MemoryFileSystemTestWindows extends _BaseTestWindows
     with MemoryFileSystemTestMixin {}
 
 abstract class _BaseTest {
-  pathos.Context get context;
   MemoryFileSystem get fileSystem;
 
   String get tempPath;
 
   MemoryFileSystemEntity entityForPath(String path) =>
-      fileSystem.entityForUri(context.toUri(path));
+      fileSystem.entityForUri(fileSystem.context.toUri(path));
 
   String join(String path1, String path2, [String path3, String path4]);
 
   void setUp();
 }
 
 class _BaseTestNative extends _BaseTest {
-  final pathos.Context context = pathos.context;
   MemoryFileSystem fileSystem;
   String tempPath;
 
   String join(String path1, String path2, [String path3, String path4]) =>
       pathos.join(path1, path2, path3, path4);
 
   setUp() {
     tempPath = pathos.join(io.Directory.systemTemp.path, 'test_file_system');
-    fileSystem = new MemoryFileSystem(pathos.toUri(io.Directory.current.path));
+    fileSystem = new MemoryFileSystem(
+        pathos.context, pathos.toUri(io.Directory.current.path));
   }
 }
 
 class _BaseTestPosix extends _BaseTest {
-  final pathos.Context context = pathos.posix;
   MemoryFileSystem fileSystem;
   String tempPath;
 
   String join(String path1, String path2, [String path3, String path4]) =>
       pathos.posix.join(path1, path2, path3, path4);
 
   void setUp() {
     tempPath = '/test_file_system';
-    fileSystem = new MemoryFileSystem(Uri.parse('file:///cwd'));
+    fileSystem = new MemoryFileSystem(pathos.posix, Uri.parse('file:///cwd'));
   }
 }
 
 class _BaseTestWindows extends _BaseTest {
-  final pathos.Context context = pathos.windows;
   MemoryFileSystem fileSystem;
   String tempPath;
 
   String join(String path1, String path2, [String path3, String path4]) =>
       pathos.windows.join(path1, path2, path3, path4);
 
   void setUp() {
     tempPath = r'c:\test_file_system';
-    fileSystem = new MemoryFileSystem(Uri.parse('file:///c:/cwd'));
+    fileSystem =
+        new MemoryFileSystem(pathos.windows, Uri.parse('file:///c:/cwd'));
   }
 }