Make dirname and basename ignore trailing separators and double slashes.

pkg/path/test/path_posix_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 30 matching lines @@
     expect(builder.rootPrefix('/a/c'), '/');
     expect(builder.rootPrefix('/'), '/');
   });
 
   test('dirname', () {
     expect(builder.dirname(''), '.');
     expect(builder.dirname('a'), '.');
     expect(builder.dirname('a/b'), 'a');
     expect(builder.dirname('a/b/c'), 'a/b');
     expect(builder.dirname('a/b.c'), 'a');
-    expect(builder.dirname('a/'), 'a');
+    expect(builder.dirname('a/'), '.');
     expect(builder.dirname('a/.'), 'a');
     expect(builder.dirname(r'a\b/c'), r'a\b');
     expect(builder.dirname('/a'), '/');
+    expect(builder.dirname('///a'), '/');
     expect(builder.dirname('/'), '/');
-    expect(builder.dirname('a/b/'), 'a/b');
+    expect(builder.dirname('///'), '/');
+    expect(builder.dirname('a/b/'), 'a');
     expect(builder.dirname(r'a/b\c'), 'a');
-    expect(builder.dirname('a//'), 'a/');
+    expect(builder.dirname('a//'), '.');
+    expect(builder.dirname('a/b//'), 'a');
+    expect(builder.dirname('a//b'), 'a');
   });
 
   test('basename', () {
     expect(builder.basename(''), '');
     expect(builder.basename('a'), 'a');
     expect(builder.basename('a/b'), 'b');
     expect(builder.basename('a/b/c'), 'c');
     expect(builder.basename('a/b.c'), 'b.c');
-    expect(builder.basename('a/'), '');
+    expect(builder.basename('a/'), 'a');
     expect(builder.basename('a/.'), '.');
     expect(builder.basename(r'a\b/c'), 'c');
     expect(builder.basename('/a'), 'a');
-    // TODO(nweiz): this should actually return '/'
-    expect(builder.basename('/'), '');
-    expect(builder.basename('a/b/'), '');
+    expect(builder.basename('/'), '/');
+    expect(builder.basename('a/b/'), 'b');
     expect(builder.basename(r'a/b\c'), r'b\c');
-    expect(builder.basename('a//'), '');
+    expect(builder.basename('a//'), 'a');
+    expect(builder.basename('a/b//'), 'b');
+    expect(builder.basename('a//b'), 'b');
   });
 
   test('basenameWithoutExtension', () {
     expect(builder.basenameWithoutExtension(''), '');
     expect(builder.basenameWithoutExtension('a'), 'a');
     expect(builder.basenameWithoutExtension('a/b'), 'b');
     expect(builder.basenameWithoutExtension('a/b/c'), 'c');
     expect(builder.basenameWithoutExtension('a/b.c'), 'b');
-    expect(builder.basenameWithoutExtension('a/'), '');
+    expect(builder.basenameWithoutExtension('a/'), 'a');
     expect(builder.basenameWithoutExtension('a/.'), '.');
     expect(builder.basenameWithoutExtension(r'a/b\c'), r'b\c');
     expect(builder.basenameWithoutExtension('a/.bashrc'), '.bashrc');
     expect(builder.basenameWithoutExtension('a/b/c.d.e'), 'c.d');
+    expect(builder.basenameWithoutExtension('a//'), 'a');
+    expect(builder.basenameWithoutExtension('a/b//'), 'b');
+    expect(builder.basenameWithoutExtension('a//b'), 'b');
+    expect(builder.basenameWithoutExtension('a/b.c/'), 'b');
+    expect(builder.basenameWithoutExtension('a/b.c//'), 'b');
   });
 
   test('isAbsolute', () {
     expect(builder.isAbsolute(''), false);
     expect(builder.isAbsolute('a'), false);
     expect(builder.isAbsolute('a/b'), false);
     expect(builder.isAbsolute('/a'), true);
     expect(builder.isAbsolute('/a/b'), true);
     expect(builder.isAbsolute('~'), false);
     expect(builder.isAbsolute('.'), false);
@@ skipping 252 matching lines @@
     expect(builder.withoutExtension('a/b.c'), 'a/b');
     expect(builder.withoutExtension('a/b.c.d'), 'a/b.c');
     expect(builder.withoutExtension('a/'), 'a/');
     expect(builder.withoutExtension('a/b/'), 'a/b/');
     expect(builder.withoutExtension('a/.'), 'a/.');
     expect(builder.withoutExtension('a/.b'), 'a/.b');
     expect(builder.withoutExtension('a.b/c'), 'a.b/c');
     expect(builder.withoutExtension(r'a.b\c'), r'a');
     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('a/b.c/'), 'a/b/');
+    expect(builder.withoutExtension('a/b.c//'), 'a/b//');

[Bob Nystrom, 2012/12/20 02:27:28]

Nice.

[nweiz, 2012/12/20 20:54:49]

Just for you.

   });
 }