Unverified Commit c11f1749 authored by Todd Volkert's avatar Todd Volkert Committed by GitHub

Mark FlutterManifest.createFromString() as visible for testing only. (#14276)

parent 014a2255
......@@ -5,6 +5,7 @@
import 'dart:async';
import 'package:json_schema/json_schema.dart';
import 'package:meta/meta.dart';
import 'package:yaml/yaml.dart';
import 'base/file_system.dart';
......@@ -15,11 +16,16 @@ import 'globals.dart';
class FlutterManifest {
FlutterManifest._();
/// Returns null on missing or invalid manifest
/// Returns null on invalid manifest. Returns empty manifest on missing file.
static Future<FlutterManifest> createFromPath(String path) async {
return _createFromYaml(await _loadFlutterManifest(path));
if (path == null || !fs.isFileSync(path))
return _createFromYaml(null);
final String manifest = await fs.file(path).readAsString();
return createFromString(manifest);
}
/// Returns null on missing or invalid manifest
@visibleForTesting
static Future<FlutterManifest> createFromString(String manifest) async {
return _createFromYaml(loadYaml(manifest));
}
......@@ -145,13 +151,6 @@ class FontAsset {
String toString() => '$runtimeType(asset: ${assetUri.path}, weight; $weight, style: $style)';
}
Future<dynamic> _loadFlutterManifest(String manifestPath) async {
if (manifestPath == null || !fs.isFileSync(manifestPath))
return null;
final String manifestDescriptor = await fs.file(manifestPath).readAsString();
return loadYaml(manifestDescriptor);
}
Future<bool> _validate(Object manifest) async {
final String schemaPath = fs.path.join(
fs.path.absolute(Cache.flutterRoot), 'packages', 'flutter_tools', 'schema',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment