Move path-manipulation code from io.dart into path.dart.

utils/tests/pub/path/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;
 
 import '../../../../pkg/unittest/lib/unittest.dart';
 import '../../../pub/path.dart' as path;
@@ skipping 15 matching lines @@
   test('extension', () {
     expect(builder.extension(''), '');
     expect(builder.extension('foo.dart'), '.dart');
     expect(builder.extension('foo.dart.js'), '.js');
     expect(builder.extension('a.b/c'), '');
     expect(builder.extension('a.b/c.d'), '.d');
     expect(builder.extension('~/.bashrc'), '');
     expect(builder.extension(r'a.b\c'), r'.b\c');
   });
 
+  test('rootPrefix', () {
+    expect(builder.rootPrefix(''), '');
+    expect(builder.rootPrefix('a'), '');
+    expect(builder.rootPrefix('a/b'), '');
+    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/.'), 'a');
+    expect(builder.dirname(r'a\b/c'), r'a\b');
+    expect(builder.dirname('/a'), '/');
+    expect(builder.dirname('/'), '/');
+    expect(builder.dirname('a/b/'), 'a/b');
+    expect(builder.dirname(r'a/b\c'), 'a');
+    expect(builder.dirname('a//'), '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/.'), '.');
+    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(r'a/b\c'), r'b\c');
+    expect(builder.basename('a//'), '');
   });
 
   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/.'), '.');
@@ skipping 42 matching lines @@
       expect(builder.join('a', 'b', 'c', 'd', 'e', 'f', 'g', 'h'),
           'a/b/c/d/e/f/g/h');
     });
 
     test('does not add separator if a part ends in one', () {
       expect(builder.join('a/', 'b', 'c/', 'd'), 'a/b/c/d');
       expect(builder.join('a\\', 'b'), r'a\/b');
     });
 
     test('ignores parts before an absolute path', () {
+      expect(builder.join('a', '/', 'b', 'c'), '/b/c');
       expect(builder.join('a', '/b', '/c', 'd'), '/c/d');
       expect(builder.join('a', r'c:\b', 'c', 'd'), r'a/c:\b/c/d');
       expect(builder.join('a', r'\\b', 'c', 'd'), r'a/\\b/c/d');
     });
+
+    test('ignores trailing nulls', () {
+      expect(builder.join('a', null), equals('a'));
+      expect(builder.join('a', 'b', 'c', null, null), equals('a/b/c'));
+    });
+
+    test('disallows intermediate nulls', () {
+      expect(() => builder.join('a', null, 'b'), throwsArgumentError);
+      expect(() => builder.join(null, 'a'), throwsArgumentError);
+    });
+  });
+
+  group('split', () {
+    test('simple cases', () {
+      expect(builder.split('foo'), equals(['foo']));
+      expect(builder.split('foo/bar'), equals(['foo', 'bar']));
+      expect(builder.split('foo/bar/baz'), equals(['foo', 'bar', 'baz']));
+      expect(builder.split('foo/../bar/./baz'),
+          equals(['foo', '..', 'bar', '.', 'baz']));
+      expect(builder.split('foo//bar///baz'), equals(['foo', 'bar', 'baz']));
+      expect(builder.split('foo/\\/baz'), equals(['foo', '\\', 'baz']));
+      expect(builder.split('.'), equals(['.']));
+      expect(builder.split(''), equals([]));
+      expect(builder.split('foo/'), equals(['foo']));
+      expect(builder.split('//'), equals(['/']));
+    });
+
+    test('includes the root for absolute paths', () {
+      expect(builder.split('/foo/bar/baz'), equals(['/', 'foo', 'bar', 'baz']));
+      expect(builder.split('/'), equals(['/']));
+    });
   });
 
   group('normalize', () {
     test('simple cases', () {
       expect(builder.normalize(''), '');
       expect(builder.normalize('.'), '.');
       expect(builder.normalize('..'), '..');
       expect(builder.normalize('a'), 'a');
       expect(builder.normalize('/'), '/');
       expect(builder.normalize(r'\'), r'\');
@@ skipping 83 matching lines @@
         expect(builder.relative('a'), 'a');
         expect(builder.relative('a/b.txt'), 'a/b.txt');
         expect(builder.relative('../a/b.txt'), '../a/b.txt');
         expect(builder.relative('a/./b/../c.txt'), 'a/c.txt');
       });
     });
 
     group('from relative root', () {
       var r = new path.Builder(style: path.Style.posix, root: 'foo/bar');
 
-      // These tests rely on the current working directory, so don't do the
-      // right thing if you run them on the wrong platform.
-      if (io.Platform.operatingSystem != 'windows') {
-        test('given absolute path', () {
-          var b = new path.Builder(style: path.Style.posix);
-          expect(r.relative('/'), b.join(b.relative('/'), '../..'));
-          expect(r.relative('/a/b'), b.join(b.relative('/'), '../../a/b'));
-        });
-      }
+      test('given absolute path', () {
+        expect(r.relative('/'), equals('/'));
+        expect(r.relative('/a/b'), equals('/a/b'));
+      });
 
       test('given relative path', () {
         // The path is considered relative to the root, so it basically just
         // normalizes.
         expect(r.relative(''), '.');
         expect(r.relative('.'), '.');
         expect(r.relative('..'), '..');
         expect(r.relative('a'), 'a');
         expect(r.relative('a/b.txt'), 'a/b.txt');
         expect(r.relative('../a/b.txt'), '../a/b.txt');
         expect(r.relative('a/./b/../c.txt'), 'a/c.txt');
       });
     });
 
     test('from a root with extension', () {
       var r = new path.Builder(style: path.Style.posix, root: '/dir.ext');
       expect(r.relative('/dir.ext/file'), 'file');
     });
+
+    test('with a root parameter', () {
+      expect(builder.relative('/foo/bar/baz', from: '/foo/bar'), equals('baz'));
+      expect(builder.relative('..', from: '/foo/bar'), equals('../../root'));
+      expect(builder.relative('/foo/bar/baz', from: 'foo/bar'),
+          equals('../../../../foo/bar/baz'));
+      expect(builder.relative('..', from: 'foo/bar'), equals('../../..'));
+    });
+
+    test('with a root parameter and a relative root', () {
+      var r = new path.Builder(style: path.Style.posix, root: 'relative/root');
+      expect(r.relative('/foo/bar/baz', from: '/foo/bar'), equals('baz'));
+      expect(() => r.relative('..', from: '/foo/bar'), throwsArgumentError);
+      expect(r.relative('/foo/bar/baz', from: 'foo/bar'),
+          equals('/foo/bar/baz'));
+      expect(r.relative('..', from: 'foo/bar'), equals('../../..'));
+    });
   });
 
   group('resolve', () {
     test('allows up to seven parts', () {
       expect(builder.resolve('a'), '/root/path/a');
       expect(builder.resolve('a', 'b'), '/root/path/a/b');
       expect(builder.resolve('a', 'b', 'c'), '/root/path/a/b/c');
       expect(builder.resolve('a', 'b', 'c', 'd'), '/root/path/a/b/c/d');
       expect(builder.resolve('a', 'b', 'c', 'd', 'e'), '/root/path/a/b/c/d/e');
       expect(builder.resolve('a', 'b', 'c', 'd', 'e', 'f'),
@@ skipping 24 matching lines @@
     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');
   });
 }