Tidy

Author: srawlins

test/package_test.dart

@@ -23,8 +23,20 @@ void main() {
   FakePackageConfigProvider packageConfigProvider;
   PackageGraph packageGraph;
 
+  /// Dartdoc has a few indicator files it uses to verify that a directory
+  /// represents a Dart SDK. These include "bin/dart" and "bin/pub".
+  void writeSdkBinFiles(Folder root) {
+    var sdkBinFolder = root.getChildAssumingFolder('bin')..create();
+    sdkBinFolder.getChildAssumingFile('dart').writeAsStringSync('');
+    sdkBinFolder.getChildAssumingFile('pub').writeAsStringSync('');
+  }
+
   void writeSdk() {
     mockSdk = MockSdk(resourceProvider: resourceProvider);
+    // The [MockSdk] only works in non-canonicalized paths, which include
+    // "C:\sdk", on Windows. Howerver, dartdoc works almost exclusively with
+    // canonical paths ("c:\sdk"). Copy all MockSdk files to the canonicalized
+    // path.
     for (var l in mockSdk.sdkLibraries) {
       var p = l.path;
       resourceProvider
@@ -35,17 +47,18 @@ void main() {
         .canonicalize(resourceProvider.convertPath(sdkRoot)))
       ..create();
     sdkFolder.getChildAssumingFile('version').writeAsStringSync('2.9.0');
-    var sdkBinFolder = sdkFolder.getChildAssumingFolder('bin')..create();
-    sdkBinFolder.getChildAssumingFile('dart').writeAsStringSync('');
-    sdkBinFolder.getChildAssumingFile('pub').writeAsStringSync('');
 
-    var sdkFolderNonCanon = resourceProvider
+    writeSdkBinFiles(sdkFolder);
+    writeSdkBinFiles(
+        resourceProvider.getFolder(resourceProvider.convertPath(sdkRoot)));
+
+    /*var sdkFolderNonCanon = resourceProvider
         .getFolder(resourceProvider.convertPath(sdkRoot))
           ..create();
     var sdkBinFolderNonCanon = sdkFolderNonCanon.getChildAssumingFolder('bin')
       ..create();
     sdkBinFolderNonCanon.getChildAssumingFile('dart').writeAsStringSync('');
-    sdkBinFolderNonCanon.getChildAssumingFile('pub').writeAsStringSync('');
+    sdkBinFolderNonCanon.getChildAssumingFile('pub').writeAsStringSync('');*/
   }
 
   void writePackage() {
@@ -60,7 +73,6 @@ void main() {
 name: $packageName
 version: 0.0.1
 ''');
-    projectFolder.getChildAssumingFolder('.dart_tool').create();
     projectFolder
         .getChildAssumingFolder('.dart_tool')
         .getChildAssumingFile('package_config.json')