Make dirname and basename ignore trailing separators and double slashes.

pkg/path/test/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;
 
 // TODO(rnystrom): Use "package:" path when #7491 is fixed.
 import '../../unittest/lib/unittest.dart';
@@ skipping 36 matching lines @@
     // TODO(nweiz): enable this once issue 7323 is fixed.
     // expect(builder.rootPrefix(r'\\server\a\b'), r'\\server\');
   });
 
   test('dirname', () {
     expect(builder.dirname(r''), '.');
     expect(builder.dirname(r'a'), '.');
     expect(builder.dirname(r'a\b'), 'a');
     expect(builder.dirname(r'a\b\c'), r'a\b');
     expect(builder.dirname(r'a\b.c'), 'a');
-    expect(builder.dirname(r'a\'), 'a');
-    expect(builder.dirname('a/'), 'a');
+    expect(builder.dirname(r'a\'), '.');
+    expect(builder.dirname('a/'), '.');
     expect(builder.dirname(r'a\.'), 'a');
     expect(builder.dirname(r'a\b/c'), r'a\b');
     expect(builder.dirname(r'C:\a'), r'C:\');
-    expect(builder.dirname('C:\\'), r'C:\');
-    expect(builder.dirname(r'a\b\'), r'a\b');
+    expect(builder.dirname(r'C:\\\a'), r'C:\');
+    expect(builder.dirname(r'C:\'), r'C:\');
+    expect(builder.dirname(r'C:\\\'), r'C:\');
+    expect(builder.dirname(r'a\b\'), r'a');
     expect(builder.dirname(r'a/b\c'), 'a/b');
-    expect(builder.dirname(r'a\\'), r'a\');
+    expect(builder.dirname(r'a\\'), r'.');
+    expect(builder.dirname(r'a\b\\'), 'a');
+    expect(builder.dirname(r'a\\b'), 'a');
   });
 
   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\'), 'a');
+    expect(builder.basename(r'a/'), 'a');
     expect(builder.basename(r'a\.'), '.');
     expect(builder.basename(r'a\b/c'), r'c');
     expect(builder.basename(r'C:\a'), 'a');
-    // TODO(nweiz): this should actually return 'C:\'
-    expect(builder.basename(r'C:\'), '');
-    expect(builder.basename(r'a\b\'), '');
+    expect(builder.basename(r'C:\'), r'C:\');
+    expect(builder.basename(r'a\b\'), 'b');
     expect(builder.basename(r'a/b\c'), 'c');
-    expect(builder.basename(r'a\\'), '');
+    expect(builder.basename(r'a\\'), 'a');
+    expect(builder.basename(r'a\b\\'), 'b');
+    expect(builder.basename(r'a\\b'), 'b');
   });
 
   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\'), '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');
+    expect(builder.basenameWithoutExtension(r'a\\'), 'a');
+    expect(builder.basenameWithoutExtension(r'a\b\\'), 'b');
+    expect(builder.basenameWithoutExtension(r'a\\b'), 'b');
+    expect(builder.basenameWithoutExtension(r'a\b.c\'), 'b');
+    expect(builder.basenameWithoutExtension(r'a\b.c\\'), 'b');
   });
 
   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 278 matching lines @@
     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');
     expect(builder.withoutExtension(r'a.b/c'), r'a.b/c');
+    expect(builder.withoutExtension(r'a\b.c\'), r'a\b\');
   });
 }