| OLD | NEW | 
|---|
| 1 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file | 1 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file | 
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a | 
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. | 
| 4 | 4 | 
| 5 import 'package:scheduled_test/scheduled_test.dart'; | 5 import 'package:scheduled_test/scheduled_test.dart'; | 
| 6 | 6 | 
| 7 import 'descriptor.dart' as d; | 7 import 'descriptor.dart' as d; | 
| 8 import 'test_pub.dart'; | 8 import 'test_pub.dart'; | 
| 9 | 9 | 
| 10 main() { | 10 main() { | 
| 11   initConfig(); | 11   initConfig(); | 
| 12 | 12 | 
| 13   setUp(() { | 13   setUp(() { | 
| 14     servePackages((builder) { | 14     servePackages((builder) { | 
| 15       builder.serve("normal", "1.2.3", deps: { | 15       builder.serve("normal", "1.2.3", deps: { | 
| 16         "transitive": "any", | 16         "transitive": "any", | 
| 17         "circular_a": "any" | 17         "circular_a": "any" | 
| 18       }); | 18       }); | 
| 19       builder.serve("transitive", "1.2.3", deps: {"shared": "any"}); | 19       builder.serve("transitive", "1.2.3", deps: { | 
| 20       builder.serve("shared", "1.2.3", deps: {"other": "any"}); | 20         "shared": "any" | 
| 21       builder.serve("unittest", "1.2.3", deps: {"shared": "any"}); | 21       }); | 
|  | 22       builder.serve("shared", "1.2.3", deps: { | 
|  | 23         "other": "any" | 
|  | 24       }); | 
|  | 25       builder.serve("unittest", "1.2.3", deps: { | 
|  | 26         "shared": "any" | 
|  | 27       }); | 
| 22       builder.serve("other", "1.0.0"); | 28       builder.serve("other", "1.0.0"); | 
| 23       builder.serve("overridden", "1.0.0"); | 29       builder.serve("overridden", "1.0.0"); | 
| 24       builder.serve("overridden", "2.0.0"); | 30       builder.serve("overridden", "2.0.0"); | 
| 25       builder.serve("override_only", "1.2.3"); | 31       builder.serve("override_only", "1.2.3"); | 
| 26       builder.serve("circular_a", "1.2.3", deps: {"circular_b": "any"}); | 32       builder.serve("circular_a", "1.2.3", deps: { | 
| 27       builder.serve("circular_b", "1.2.3", deps: {"circular_a": "any"}); | 33         "circular_b": "any" | 
|  | 34       }); | 
|  | 35       builder.serve("circular_b", "1.2.3", deps: { | 
|  | 36         "circular_a": "any" | 
|  | 37       }); | 
| 28     }); | 38     }); | 
| 29 | 39 | 
| 30     d.dir("from_path", [ | 40     d.dir( | 
| 31       d.libDir("from_path"), | 41         "from_path", | 
| 32       d.libPubspec("from_path", "1.2.3") | 42         [d.libDir("from_path"), d.libPubspec("from_path", "1.2.3")]).create(); | 
| 33     ]).create(); |  | 
| 34 | 43 | 
| 35     d.dir(appPath, [ | 44     d.dir(appPath, [d.pubspec({ | 
| 36       d.pubspec({ |  | 
| 37         "name": "myapp", | 45         "name": "myapp", | 
| 38         "dependencies": { | 46         "dependencies": { | 
| 39           "normal": "any", | 47           "normal": "any", | 
| 40           "overridden": "1.0.0", | 48           "overridden": "1.0.0", | 
| 41           "from_path": {"path": "../from_path"} | 49           "from_path": { | 
|  | 50             "path": "../from_path" | 
|  | 51           } | 
| 42         }, | 52         }, | 
| 43         "dev_dependencies": { | 53         "dev_dependencies": { | 
| 44           "unittest": "any" | 54           "unittest": "any" | 
| 45         }, | 55         }, | 
| 46         "dependency_overrides": { | 56         "dependency_overrides": { | 
| 47           "overridden": "2.0.0", | 57           "overridden": "2.0.0", | 
| 48           "override_only": "any" | 58           "override_only": "any" | 
| 49         } | 59         } | 
| 50       }) | 60       })]).create(); | 
| 51     ]).create(); |  | 
| 52   }); | 61   }); | 
| 53 | 62 | 
| 54   integration("lists dependencies in compact form", () { | 63   integration("lists dependencies in compact form", () { | 
| 55     pubGet(); | 64     pubGet(); | 
| 56     schedulePub(args: ['deps', '-s', 'compact'], output: ''' | 65     schedulePub(args: ['deps', '-s', 'compact'], output: ''' | 
| 57         myapp 0.0.0 | 66         myapp 0.0.0 | 
| 58 | 67 | 
| 59         dependencies: | 68         dependencies: | 
| 60         - from_path 1.2.3 | 69         - from_path 1.2.3 | 
| 61         - normal 1.2.3 [transitive circular_a] | 70         - normal 1.2.3 [transitive circular_a] | 
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 121         |   |       '-- circular_a... | 130         |   |       '-- circular_a... | 
| 122         |   '-- transitive 1.2.3 | 131         |   '-- transitive 1.2.3 | 
| 123         |       '-- shared... | 132         |       '-- shared... | 
| 124         |-- overridden 2.0.0 | 133         |-- overridden 2.0.0 | 
| 125         |-- override_only 1.2.3 | 134         |-- override_only 1.2.3 | 
| 126         '-- unittest 1.2.3 | 135         '-- unittest 1.2.3 | 
| 127             '-- shared 1.2.3 | 136             '-- shared 1.2.3 | 
| 128                 '-- other 1.0.0 | 137                 '-- other 1.0.0 | 
| 129         '''); | 138         '''); | 
| 130   }); | 139   }); | 
| 131 } | 140 } | 
| OLD | NEW | 
|---|