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

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('rootPrefix', () {
+    expect(builder.rootPrefix(''), '');
+    expect(builder.rootPrefix('a'), '');
+    expect(builder.rootPrefix(r'a\b'), '');
+    expect(builder.rootPrefix(r'C:\a\c'), r'C:\');
+    expect(builder.rootPrefix('C:\\'), r'C:\');
+    expect(builder.rootPrefix('C:/'), 'C:/');
+
+    // 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\.'), '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'a/b\c'), 'a/b');
+    expect(builder.dirname(r'a\\'), r'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\.'), '.');
     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'a/b\c'), 'c');
+    expect(builder.basename(r'a\\'), '');
   });
 
   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\.'), '.');
@@ skipping 58 matching lines @@
       expect(builder.join('a/', 'b'), r'a/b');
       expect(builder.join('a', '/b'), 'a/b');
       expect(builder.join('a', r'\b'), r'a\b');
     });
 
     test('ignores parts before an absolute path', () {
       expect(builder.join('a', '/b', '/c', 'd'), r'a/b/c\d');
       expect(builder.join('a', r'c:\b', 'c', 'd'), r'c:\b\c\d');
       expect(builder.join('a', r'\\b', r'\\c', 'd'), r'\\c\d');
     });
+
+    test('ignores trailing nulls', () {
+      expect(builder.join('a', null), equals('a'));
+      expect(builder.join('a', 'b', 'c', null, null), equals(r'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(r'foo\bar'), equals(['foo', 'bar']));
+      expect(builder.split(r'foo\bar\baz'), equals(['foo', 'bar', 'baz']));
+      expect(builder.split(r'foo\..\bar\.\baz'),
+          equals(['foo', '..', 'bar', '.', 'baz']));
+      expect(builder.split(r'foo\\bar\\\baz'), equals(['foo', 'bar', 'baz']));
+      expect(builder.split(r'foo\/\baz'), equals(['foo', 'baz']));
+      expect(builder.split('.'), equals(['.']));
+      expect(builder.split(''), equals([]));
+      expect(builder.split('foo/'), equals(['foo']));
+      expect(builder.split(r'C:\'), equals([r'C:\']));
+    });
+
+    test('includes the root for absolute paths', () {
+      expect(builder.split(r'C:\foo\bar\baz'),
+          equals([r'C:\', 'foo', 'bar', 'baz']));
+      expect(builder.split(r'C:\\'), equals([r'C:\']));
+
+      // TODO(nweiz): enable these once issue 7323 is fixed.
+      // expect(builder.split(r'\\server\foo\bar\baz'),
+      //     equals([r'\\server\', 'foo', 'bar', 'baz']));
+      // expect(builder.split(r'\\server\'), equals([r'\\server\']));
+    });
   });
 
   group('normalize', () {
     test('simple cases', () {
       expect(builder.normalize(''), '');
       expect(builder.normalize('.'), '.');
       expect(builder.normalize('..'), '..');
       expect(builder.normalize('a'), 'a');
       expect(builder.normalize('C:/'), r'C:/');
       expect(builder.normalize(r'C:\'), r'C:\');
@@ skipping 82 matching lines @@
         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');
       });
     });
 
     group('from relative root', () {
       var r = new path.Builder(style: path.Style.windows, root: r'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.windows);
-          // TODO(rnystrom): Use a path method here to get the root prefix
-          // when one exists.
-          var drive = path.current.substring(0, 3);
-          expect(r.relative(drive), b.join(b.relative(drive), r'..\..'));
-          expect(r.relative(b.join(drive, r'a\b')),
-              b.join(b.relative(drive), r'..\..\a\b'));
-
-          // TODO(rnystrom): Test behavior when drive letters differ.
-        });
-      }
+      test('given absolute path', () {
+        expect(r.relative(r'C:\'), equals(r'C:\'));
+        expect(r.relative(r'C:\a\b'), equals(r'C:\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(r'a\b.txt'), r'a\b.txt');
         expect(r.relative(r'..\a/b.txt'), r'..\a\b.txt');
         expect(r.relative(r'a\./b\../c.txt'), r'a\c.txt');
       });
     });
 
     test('from a root with extension', () {
       var r = new path.Builder(style: path.Style.windows, root: r'C:\dir.ext');
       expect(r.relative(r'C:\dir.ext\file'), 'file');
     });
 
+    test('with a root parameter', () {
+      expect(builder.relative(r'C:\foo\bar\baz', from: r'C:\foo\bar'),
+          equals('baz'));
+      expect(builder.relative('..', from: r'C:\foo\bar'),
+          equals(r'..\..\root'));
+      expect(builder.relative('..', from: r'D:\foo\bar'), equals(r'C:\root'));
+      expect(builder.relative(r'C:\foo\bar\baz', from: r'foo\bar'),
+          equals(r'..\..\..\..\foo\bar\baz'));
+      expect(builder.relative('..', from: r'foo\bar'), equals(r'..\..\..'));
+    });
+
+    test('with a root parameter and a relative root', () {
+      var r = new path.Builder(style: path.Style.windows, root: r'relative\root');
+      expect(r.relative(r'C:\foo\bar\baz', from: r'C:\foo\bar'), equals('baz'));
+      expect(() => r.relative('..', from: r'C:\foo\bar'), throwsArgumentError);
+      expect(r.relative(r'C:\foo\bar\baz', from: r'foo\bar'),
+          equals(r'C:\foo\bar\baz'));
+      expect(r.relative('..', from: r'foo\bar'), equals(r'..\..\..'));
+    });
+
     test('given absolute with different root prefix', () {
       expect(builder.relative(r'D:\a\b'), r'D:\a\b');
       expect(builder.relative(r'\\a\b'), r'\\a\b');
     });
   });
 
   group('resolve', () {
     test('allows up to seven parts', () {
       expect(builder.resolve('a'), r'C:\root\path\a');
       expect(builder.resolve('a', 'b'), r'C:\root\path\a\b');
@@ skipping 30 matching lines @@
     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');
   });
 }