Revise path library.

utils/tests/pub/path/path_windows_test.dart

 // Copyright (c) 2012, 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.
 
 library path_test;
 
 import 'dart:io' as io;
 
 import '../../../../pkg/unittest/lib/unittest.dart';
 import '../../../pub/path.dart' as path;
@@ skipping 17 matching lines @@
   test('extension', () {
     expect(builder.extension(''), '');
     expect(builder.extension('foo.dart'), '.dart');
     expect(builder.extension('foo.dart.js'), '.js');
     expect(builder.extension(r'a.b\c'), '');
     expect(builder.extension('a.b/c.d'), '.d');
     expect(builder.extension(r'~\.bashrc'), '');
     expect(builder.extension(r'a.b/c'), r'');
   });
 
-  test('filename', () {
-    expect(builder.filename(r''), '');
-    expect(builder.filename(r'a'), 'a');
-    expect(builder.filename(r'a\b'), 'b');
-    expect(builder.filename(r'a\b\c'), 'c');
-    expect(builder.filename(r'a\b.c'), 'b.c');
-    expect(builder.filename(r'a\'), '');
-    expect(builder.filename(r'a/'), '');
-    expect(builder.filename(r'a\.'), '.');
-    expect(builder.filename(r'a\b/c'), r'c');
+  test('basename', () {
+    expect(builder.basename(r''), '');
+    expect(builder.basename(r'a'), 'a');
+    expect(builder.basename(r'a\b'), 'b');
+    expect(builder.basename(r'a\b\c'), 'c');
+    expect(builder.basename(r'a\b.c'), 'b.c');
+    expect(builder.basename(r'a\'), '');
+    expect(builder.basename(r'a/'), '');
+    expect(builder.basename(r'a\.'), '.');
+    expect(builder.basename(r'a\b/c'), r'c');
   });
 
-  test('filenameWithoutExtension', () {
-    expect(builder.filenameWithoutExtension(''), '');
-    expect(builder.filenameWithoutExtension('a'), 'a');
-    expect(builder.filenameWithoutExtension(r'a\b'), 'b');
-    expect(builder.filenameWithoutExtension(r'a\b\c'), 'c');
-    expect(builder.filenameWithoutExtension(r'a\b.c'), 'b');
-    expect(builder.filenameWithoutExtension(r'a\'), '');
-    expect(builder.filenameWithoutExtension(r'a\.'), '.');
-    expect(builder.filenameWithoutExtension(r'a\b/c'), r'c');
-    expect(builder.filenameWithoutExtension(r'a\.bashrc'), '.bashrc');
-    expect(builder.filenameWithoutExtension(r'a\b\c.d.e'), 'c.d');
+  test('basenameWithoutExtension', () {
+    expect(builder.basenameWithoutExtension(''), '');
+    expect(builder.basenameWithoutExtension('a'), 'a');
+    expect(builder.basenameWithoutExtension(r'a\b'), 'b');
+    expect(builder.basenameWithoutExtension(r'a\b\c'), 'c');
+    expect(builder.basenameWithoutExtension(r'a\b.c'), 'b');
+    expect(builder.basenameWithoutExtension(r'a\'), '');
+    expect(builder.basenameWithoutExtension(r'a\.'), '.');
+    expect(builder.basenameWithoutExtension(r'a\b/c'), r'c');
+    expect(builder.basenameWithoutExtension(r'a\.bashrc'), '.bashrc');
+    expect(builder.basenameWithoutExtension(r'a\b\c.d.e'), 'c.d');
   });
 
   test('isAbsolute', () {
     expect(builder.isAbsolute(''), false);
     expect(builder.isAbsolute('a'), false);
     expect(builder.isAbsolute(r'a\b'), false);
     expect(builder.isAbsolute(r'\a'), false);
     expect(builder.isAbsolute(r'\a\b'), false);
     expect(builder.isAbsolute('~'), false);
     expect(builder.isAbsolute('.'), false);
@@ skipping 128 matching lines @@
         expect(builder.relative(r'C:\root\a\b.txt'), r'..\a\b.txt');
       });
 
       test('given absolute path outside of root', () {
         expect(builder.relative(r'C:\a\b'), r'..\..\a\b');
         expect(builder.relative(r'C:\root\path\a'), 'a');
         expect(builder.relative(r'C:\root\path\a\b.txt'), r'a\b.txt');
         expect(builder.relative(r'C:\root\a\b.txt'), r'..\a\b.txt');
       });
 
+      test('given absolute path on different drive', () {
+        expect(builder.relative(r'D:\a\b'), r'D:\a\b');
+      });
+
       test('given relative path', () {
         // The path is considered relative to the root, so it basically just
         // normalizes.
         expect(builder.relative(''), '.');
         expect(builder.relative('.'), '.');
         expect(builder.relative('a'), 'a');
         expect(builder.relative(r'a\b.txt'), r'a\b.txt');
         expect(builder.relative(r'..\a\b.txt'), r'..\a\b.txt');
         expect(builder.relative(r'a\.\b\..\c.txt'), r'a\c.txt');
       });
@@ skipping 63 matching lines @@
     expect(builder.withoutExtension('a'), 'a');
     expect(builder.withoutExtension('.a'), '.a');
     expect(builder.withoutExtension('a.b'), 'a');
     expect(builder.withoutExtension(r'a\b.c'), r'a\b');
     expect(builder.withoutExtension(r'a\b.c.d'), r'a\b.c');
     expect(builder.withoutExtension(r'a\'), r'a\');
     expect(builder.withoutExtension(r'a\b\'), r'a\b\');
     expect(builder.withoutExtension(r'a\.'), r'a\.');
     expect(builder.withoutExtension(r'a\.b'), r'a\.b');
     expect(builder.withoutExtension(r'a.b\c'), r'a.b\c');
+    expect(builder.withoutExtension(r'a/b.c/d'), r'a/b.c/d');
     expect(builder.withoutExtension(r'a\b/c'), r'a\b/c');
     expect(builder.withoutExtension(r'a\b/c.d'), r'a\b/c');
   });
 }