Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
7e60a65f
Unverified
Commit
7e60a65f
authored
Oct 29, 2019
by
Emmanuel Garcia
Committed by
GitHub
Oct 29, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't read AndroidManifest.xml if it doesn't exit (#43669)
parent
53dcf92f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
435 additions
and
415 deletions
+435
-415
plugins.dart
packages/flutter_tools/lib/src/plugins.dart
+4
-1
plugins_test.dart
packages/flutter_tools/test/general.shard/plugins_test.dart
+431
-414
No files found.
packages/flutter_tools/lib/src/plugins.dart
View file @
7e60a65f
...
...
@@ -361,8 +361,11 @@ List<Map<String, dynamic>> _extractPlatformMaps(List<Plugin> plugins, String typ
/// [project] is using.
String
_getAndroidEmbeddingVersion
(
FlutterProject
project
)
{
assert
(
project
.
android
!=
null
);
final
File
androidManifest
=
project
.
android
.
appManifestFile
;
assert
(
androidManifest
.
existsSync
());
if
(
androidManifest
==
null
||
!
androidManifest
.
existsSync
())
{
return
'1'
;
}
xml
.
XmlDocument
document
;
try
{
document
=
xml
.
parse
(
androidManifest
.
readAsStringSync
());
...
...
packages/flutter_tools/test/general.shard/plugins_test.dart
View file @
7e60a65f
...
...
@@ -16,434 +16,450 @@ import '../src/common.dart';
import
'../src/context.dart'
;
void
main
(
)
{
FileSystem
fs
;
MockFlutterProject
flutterProject
;
MockIosProject
iosProject
;
MockMacOSProject
macosProject
;
MockAndroidProject
androidProject
;
MockWebProject
webProject
;
File
packagesFile
;
Directory
dummyPackageDirectory
;
setUp
(()
async
{
fs
=
MemoryFileSystem
();
// Add basic properties to the Flutter project and subprojects
flutterProject
=
MockFlutterProject
();
when
(
flutterProject
.
directory
).
thenReturn
(
fs
.
directory
(
'/'
));
when
(
flutterProject
.
flutterPluginsFile
).
thenReturn
(
flutterProject
.
directory
.
childFile
(
'.plugins'
));
iosProject
=
MockIosProject
();
when
(
flutterProject
.
ios
).
thenReturn
(
iosProject
);
when
(
iosProject
.
pluginRegistrantHost
).
thenReturn
(
flutterProject
.
directory
.
childDirectory
(
'Runner'
));
when
(
iosProject
.
podfile
).
thenReturn
(
flutterProject
.
directory
.
childDirectory
(
'ios'
).
childFile
(
'Podfile'
));
when
(
iosProject
.
podManifestLock
).
thenReturn
(
flutterProject
.
directory
.
childDirectory
(
'ios'
).
childFile
(
'Podfile.lock'
));
macosProject
=
MockMacOSProject
();
when
(
flutterProject
.
macos
).
thenReturn
(
macosProject
);
when
(
macosProject
.
podfile
).
thenReturn
(
flutterProject
.
directory
.
childDirectory
(
'macos'
).
childFile
(
'Podfile'
));
when
(
macosProject
.
podManifestLock
).
thenReturn
(
flutterProject
.
directory
.
childDirectory
(
'macos'
).
childFile
(
'Podfile.lock'
));
androidProject
=
MockAndroidProject
();
when
(
flutterProject
.
android
).
thenReturn
(
androidProject
);
when
(
androidProject
.
pluginRegistrantHost
).
thenReturn
(
flutterProject
.
directory
.
childDirectory
(
'android'
).
childDirectory
(
'app'
));
when
(
androidProject
.
hostAppGradleRoot
).
thenReturn
(
flutterProject
.
directory
.
childDirectory
(
'android'
));
webProject
=
MockWebProject
();
when
(
flutterProject
.
web
).
thenReturn
(
webProject
);
when
(
webProject
.
libDirectory
).
thenReturn
(
flutterProject
.
directory
.
childDirectory
(
'lib'
));
when
(
webProject
.
existsSync
()).
thenReturn
(
true
);
// Set up a simple .packages file for all the tests to use, pointing to one package.
dummyPackageDirectory
=
fs
.
directory
(
'/pubcache/apackage/lib/'
);
packagesFile
=
fs
.
file
(
fs
.
path
.
join
(
flutterProject
.
directory
.
path
,
PackageMap
.
globalPackagesPath
));
packagesFile
..
createSync
(
recursive:
true
)
..
writeAsStringSync
(
'apackage:file://
${dummyPackageDirectory.path}
'
);
});
// Makes the dummy package pointed to by packagesFile look like a plugin.
void
configureDummyPackageAsPlugin
()
{
dummyPackageDirectory
.
parent
.
childFile
(
'pubspec.yaml'
)..
createSync
(
recursive:
true
)..
writeAsStringSync
(
'''
flutter:
plugin:
platforms:
ios:
pluginClass: FLESomePlugin
'''
);
}
// Creates the files that would indicate that pod install has run for the
// given project.
void
simulatePodInstallRun
(
XcodeBasedProject
project
)
{
project
.
podManifestLock
.
createSync
(
recursive:
true
);
}
group
(
'refreshPlugins'
,
()
{
testUsingContext
(
'Refreshing the plugin list is a no-op when the plugins list stays empty'
,
()
{
refreshPluginsList
(
flutterProject
);
expect
(
flutterProject
.
flutterPluginsFile
.
existsSync
(),
false
);
},
overrides:
<
Type
,
Generator
>{
FileSystem:
()
=>
fs
,
ProcessManager:
()
=>
FakeProcessManager
.
any
(),
});
testUsingContext
(
'Refreshing the plugin list deletes the plugin file when there were plugins but no longer are'
,
()
{
flutterProject
.
flutterPluginsFile
.
createSync
();
when
(
iosProject
.
existsSync
()).
thenReturn
(
false
);
when
(
macosProject
.
existsSync
()).
thenReturn
(
false
);
refreshPluginsList
(
flutterProject
);
expect
(
flutterProject
.
flutterPluginsFile
.
existsSync
(),
false
);
},
overrides:
<
Type
,
Generator
>{
FileSystem:
()
=>
fs
,
ProcessManager:
()
=>
FakeProcessManager
.
any
(),
group
(
'plugins'
,
()
{
FileSystem
fs
;
MockFlutterProject
flutterProject
;
MockIosProject
iosProject
;
MockMacOSProject
macosProject
;
MockAndroidProject
androidProject
;
MockWebProject
webProject
;
File
packagesFile
;
Directory
dummyPackageDirectory
;
setUp
(()
async
{
fs
=
MemoryFileSystem
();
// Add basic properties to the Flutter project and subprojects
flutterProject
=
MockFlutterProject
();
when
(
flutterProject
.
directory
).
thenReturn
(
fs
.
directory
(
'/'
));
when
(
flutterProject
.
flutterPluginsFile
).
thenReturn
(
flutterProject
.
directory
.
childFile
(
'.plugins'
));
iosProject
=
MockIosProject
();
when
(
flutterProject
.
ios
).
thenReturn
(
iosProject
);
when
(
iosProject
.
pluginRegistrantHost
).
thenReturn
(
flutterProject
.
directory
.
childDirectory
(
'Runner'
));
when
(
iosProject
.
podfile
).
thenReturn
(
flutterProject
.
directory
.
childDirectory
(
'ios'
).
childFile
(
'Podfile'
));
when
(
iosProject
.
podManifestLock
).
thenReturn
(
flutterProject
.
directory
.
childDirectory
(
'ios'
).
childFile
(
'Podfile.lock'
));
macosProject
=
MockMacOSProject
();
when
(
flutterProject
.
macos
).
thenReturn
(
macosProject
);
when
(
macosProject
.
podfile
).
thenReturn
(
flutterProject
.
directory
.
childDirectory
(
'macos'
).
childFile
(
'Podfile'
));
when
(
macosProject
.
podManifestLock
).
thenReturn
(
flutterProject
.
directory
.
childDirectory
(
'macos'
).
childFile
(
'Podfile.lock'
));
androidProject
=
MockAndroidProject
();
when
(
flutterProject
.
android
).
thenReturn
(
androidProject
);
when
(
androidProject
.
pluginRegistrantHost
).
thenReturn
(
flutterProject
.
directory
.
childDirectory
(
'android'
).
childDirectory
(
'app'
));
when
(
androidProject
.
hostAppGradleRoot
).
thenReturn
(
flutterProject
.
directory
.
childDirectory
(
'android'
));
webProject
=
MockWebProject
();
when
(
flutterProject
.
web
).
thenReturn
(
webProject
);
when
(
webProject
.
libDirectory
).
thenReturn
(
flutterProject
.
directory
.
childDirectory
(
'lib'
));
when
(
webProject
.
existsSync
()).
thenReturn
(
true
);
// Set up a simple .packages file for all the tests to use, pointing to one package.
dummyPackageDirectory
=
fs
.
directory
(
'/pubcache/apackage/lib/'
);
packagesFile
=
fs
.
file
(
fs
.
path
.
join
(
flutterProject
.
directory
.
path
,
PackageMap
.
globalPackagesPath
));
packagesFile
..
createSync
(
recursive:
true
)
..
writeAsStringSync
(
'apackage:file://
${dummyPackageDirectory.path}
'
);
});
testUsingContext
(
'Refreshing the plugin list creates a plugin directory when there are plugins'
,
()
{
configureDummyPackageAsPlugin
();
when
(
iosProject
.
existsSync
()).
thenReturn
(
false
);
when
(
macosProject
.
existsSync
()).
thenReturn
(
false
);
refreshPluginsList
(
flutterProject
);
expect
(
flutterProject
.
flutterPluginsFile
.
existsSync
(),
true
);
},
overrides:
<
Type
,
Generator
>{
FileSystem:
()
=>
fs
,
ProcessManager:
()
=>
FakeProcessManager
.
any
(),
// Makes the dummy package pointed to by packagesFile look like a plugin.
void
configureDummyPackageAsPlugin
()
{
dummyPackageDirectory
.
parent
.
childFile
(
'pubspec.yaml'
)..
createSync
(
recursive:
true
)..
writeAsStringSync
(
'''
flutter:
plugin:
platforms:
ios:
pluginClass: FLESomePlugin
'''
);
}
// Creates the files that would indicate that pod install has run for the
// given project.
void
simulatePodInstallRun
(
XcodeBasedProject
project
)
{
project
.
podManifestLock
.
createSync
(
recursive:
true
);
}
group
(
'refreshPlugins'
,
()
{
testUsingContext
(
'Refreshing the plugin list is a no-op when the plugins list stays empty'
,
()
{
refreshPluginsList
(
flutterProject
);
expect
(
flutterProject
.
flutterPluginsFile
.
existsSync
(),
false
);
},
overrides:
<
Type
,
Generator
>{
FileSystem:
()
=>
fs
,
ProcessManager:
()
=>
FakeProcessManager
.
any
(),
});
testUsingContext
(
'Refreshing the plugin list deletes the plugin file when there were plugins but no longer are'
,
()
{
flutterProject
.
flutterPluginsFile
.
createSync
();
when
(
iosProject
.
existsSync
()).
thenReturn
(
false
);
when
(
macosProject
.
existsSync
()).
thenReturn
(
false
);
refreshPluginsList
(
flutterProject
);
expect
(
flutterProject
.
flutterPluginsFile
.
existsSync
(),
false
);
},
overrides:
<
Type
,
Generator
>{
FileSystem:
()
=>
fs
,
ProcessManager:
()
=>
FakeProcessManager
.
any
(),
});
testUsingContext
(
'Refreshing the plugin list creates a plugin directory when there are plugins'
,
()
{
configureDummyPackageAsPlugin
();
when
(
iosProject
.
existsSync
()).
thenReturn
(
false
);
when
(
macosProject
.
existsSync
()).
thenReturn
(
false
);
refreshPluginsList
(
flutterProject
);
expect
(
flutterProject
.
flutterPluginsFile
.
existsSync
(),
true
);
},
overrides:
<
Type
,
Generator
>{
FileSystem:
()
=>
fs
,
ProcessManager:
()
=>
FakeProcessManager
.
any
(),
});
testUsingContext
(
'Changes to the plugin list invalidates the Cocoapod lockfiles'
,
()
{
simulatePodInstallRun
(
iosProject
);
simulatePodInstallRun
(
macosProject
);
configureDummyPackageAsPlugin
();
when
(
iosProject
.
existsSync
()).
thenReturn
(
true
);
when
(
macosProject
.
existsSync
()).
thenReturn
(
true
);
refreshPluginsList
(
flutterProject
);
expect
(
iosProject
.
podManifestLock
.
existsSync
(),
false
);
expect
(
macosProject
.
podManifestLock
.
existsSync
(),
false
);
},
overrides:
<
Type
,
Generator
>{
FileSystem:
()
=>
fs
,
ProcessManager:
()
=>
FakeProcessManager
.
any
(),
});
});
testUsingContext
(
'Changes to the plugin list invalidates the Cocoapod lockfiles'
,
()
{
simulatePodInstallRun
(
iosProject
);
simulatePodInstallRun
(
macosProject
);
configureDummyPackageAsPlugin
();
when
(
iosProject
.
existsSync
()).
thenReturn
(
true
);
when
(
macosProject
.
existsSync
()).
thenReturn
(
true
);
refreshPluginsList
(
flutterProject
);
expect
(
iosProject
.
podManifestLock
.
existsSync
(),
false
);
expect
(
macosProject
.
podManifestLock
.
existsSync
(),
false
);
},
overrides:
<
Type
,
Generator
>{
FileSystem:
()
=>
fs
,
ProcessManager:
()
=>
FakeProcessManager
.
any
(),
});
});
group
(
'injectPlugins'
,
()
{
MockFeatureFlags
featureFlags
;
MockXcodeProjectInterpreter
xcodeProjectInterpreter
;
const
String
kAndroidManifestUsingOldEmbedding
=
'''
<manifest>
<application>
</application>
</manifest>
'''
;
const
String
kAndroidManifestUsingNewEmbedding
=
'''
<manifest>
<application>
<meta-data
android:name="flutterEmbedding"
android:value="2" />
</application>
</manifest>
'''
;
setUp
(()
{
featureFlags
=
MockFeatureFlags
();
when
(
featureFlags
.
isLinuxEnabled
).
thenReturn
(
false
);
when
(
featureFlags
.
isMacOSEnabled
).
thenReturn
(
false
);
when
(
featureFlags
.
isWindowsEnabled
).
thenReturn
(
false
);
when
(
featureFlags
.
isWebEnabled
).
thenReturn
(
false
);
xcodeProjectInterpreter
=
MockXcodeProjectInterpreter
();
when
(
xcodeProjectInterpreter
.
isInstalled
).
thenReturn
(
false
);
});
testUsingContext
(
'Registrant uses old embedding in app project'
,
()
async
{
when
(
flutterProject
.
isModule
).
thenReturn
(
false
);
final
File
androidManifest
=
flutterProject
.
directory
.
childDirectory
(
'android'
)
.
childFile
(
'AndroidManifest.xml'
)
..
createSync
(
recursive:
true
)
..
writeAsStringSync
(
kAndroidManifestUsingOldEmbedding
);
when
(
androidProject
.
appManifestFile
).
thenReturn
(
androidManifest
);
await
injectPlugins
(
flutterProject
);
final
File
registrant
=
flutterProject
.
directory
.
childDirectory
(
fs
.
path
.
join
(
'android'
,
'app'
,
'src'
,
'main'
,
'java'
,
'io'
,
'flutter'
,
'plugins'
))
.
childFile
(
'GeneratedPluginRegistrant.java'
);
expect
(
registrant
.
existsSync
(),
isTrue
);
expect
(
registrant
.
readAsStringSync
(),
contains
(
'package io.flutter.plugins'
));
expect
(
registrant
.
readAsStringSync
(),
contains
(
'class GeneratedPluginRegistrant'
));
},
overrides:
<
Type
,
Generator
>{
FileSystem:
()
=>
fs
,
ProcessManager:
()
=>
FakeProcessManager
.
any
(),
FeatureFlags:
()
=>
featureFlags
,
});
testUsingContext
(
'Registrant uses new embedding if app uses new embedding'
,
()
async
{
when
(
flutterProject
.
isModule
).
thenReturn
(
false
);
final
File
androidManifest
=
flutterProject
.
directory
.
childDirectory
(
'android'
)
.
childFile
(
'AndroidManifest.xml'
)
..
createSync
(
recursive:
true
)
..
writeAsStringSync
(
kAndroidManifestUsingNewEmbedding
);
when
(
androidProject
.
appManifestFile
).
thenReturn
(
androidManifest
);
await
injectPlugins
(
flutterProject
);
final
File
registrant
=
flutterProject
.
directory
.
childDirectory
(
fs
.
path
.
join
(
'android'
,
'app'
,
'src'
,
'main'
,
'java'
,
'dev'
,
'flutter'
,
'plugins'
))
.
childFile
(
'GeneratedPluginRegistrant.java'
);
expect
(
registrant
.
existsSync
(),
isTrue
);
expect
(
registrant
.
readAsStringSync
(),
contains
(
'package dev.flutter.plugins'
));
expect
(
registrant
.
readAsStringSync
(),
contains
(
'class GeneratedPluginRegistrant'
));
},
overrides:
<
Type
,
Generator
>{
FileSystem:
()
=>
fs
,
ProcessManager:
()
=>
FakeProcessManager
.
any
(),
FeatureFlags:
()
=>
featureFlags
,
});
testUsingContext
(
'Registrant uses shim for plugins using old embedding if app uses new embedding'
,
()
async
{
when
(
flutterProject
.
isModule
).
thenReturn
(
false
);
final
File
androidManifest
=
flutterProject
.
directory
.
childDirectory
(
'android'
)
.
childFile
(
'AndroidManifest.xml'
)
..
createSync
(
recursive:
true
)
..
writeAsStringSync
(
kAndroidManifestUsingNewEmbedding
);
when
(
androidProject
.
appManifestFile
).
thenReturn
(
androidManifest
);
final
Directory
pluginUsingJavaAndNewEmbeddingDir
=
fs
.
systemTempDirectory
.
createTempSync
(
'flutter_plugin_using_java_and_new_embedding_dir.'
);
pluginUsingJavaAndNewEmbeddingDir
.
childFile
(
'pubspec.yaml'
)
.
writeAsStringSync
(
'''
flutter:
plugin:
androidPackage: plugin1
pluginClass: UseNewEmbedding
'''
);
pluginUsingJavaAndNewEmbeddingDir
.
childDirectory
(
'android'
)
.
childDirectory
(
'src'
)
.
childDirectory
(
'main'
)
.
childDirectory
(
'java'
)
.
childDirectory
(
'plugin1'
)
.
childFile
(
'UseNewEmbedding.java'
)
..
createSync
(
recursive:
true
)
..
writeAsStringSync
(
'import io.flutter.embedding.engine.plugins.FlutterPlugin;'
);
final
Directory
pluginUsingKotlinAndNewEmbeddingDir
=
fs
.
systemTempDirectory
.
createTempSync
(
'flutter_plugin_using_kotlin_and_new_embedding_dir.'
);
pluginUsingKotlinAndNewEmbeddingDir
.
childFile
(
'pubspec.yaml'
)
.
writeAsStringSync
(
'''
flutter:
plugin:
androidPackage: plugin2
pluginClass: UseNewEmbedding
'''
);
pluginUsingKotlinAndNewEmbeddingDir
.
childDirectory
(
'android'
)
.
childDirectory
(
'src'
)
.
childDirectory
(
'main'
)
.
childDirectory
(
'kotlin'
)
.
childDirectory
(
'plugin2'
)
.
childFile
(
'UseNewEmbedding.kt'
)
..
createSync
(
recursive:
true
)
..
writeAsStringSync
(
'import io.flutter.embedding.engine.plugins.FlutterPlugin'
);
final
Directory
pluginUsingOldEmbeddingDir
=
fs
.
systemTempDirectory
.
createTempSync
(
'flutter_plugin_using_old_embedding_dir.'
);
pluginUsingOldEmbeddingDir
.
childFile
(
'pubspec.yaml'
)
.
writeAsStringSync
(
'''
flutter:
plugin:
androidPackage: plugin3
pluginClass: UseOldEmbedding
'''
);
pluginUsingOldEmbeddingDir
.
childDirectory
(
'android'
)
.
childDirectory
(
'src'
)
.
childDirectory
(
'main'
)
.
childDirectory
(
'java'
)
.
childDirectory
(
'plugin3'
)
.
childFile
(
'UseOldEmbedding.java'
)
..
createSync
(
recursive:
true
);
flutterProject
.
directory
.
childFile
(
'.packages'
)
.
writeAsStringSync
(
'''
group
(
'injectPlugins'
,
()
{
MockFeatureFlags
featureFlags
;
MockXcodeProjectInterpreter
xcodeProjectInterpreter
;
const
String
kAndroidManifestUsingOldEmbedding
=
'''
<manifest>
<application>
</application>
</manifest>
'''
;
const
String
kAndroidManifestUsingNewEmbedding
=
'''
<manifest>
<application>
<meta-data
android:name="flutterEmbedding"
android:value="2" />
</application>
</manifest>
'''
;
setUp
(()
{
featureFlags
=
MockFeatureFlags
();
when
(
featureFlags
.
isLinuxEnabled
).
thenReturn
(
false
);
when
(
featureFlags
.
isMacOSEnabled
).
thenReturn
(
false
);
when
(
featureFlags
.
isWindowsEnabled
).
thenReturn
(
false
);
when
(
featureFlags
.
isWebEnabled
).
thenReturn
(
false
);
xcodeProjectInterpreter
=
MockXcodeProjectInterpreter
();
when
(
xcodeProjectInterpreter
.
isInstalled
).
thenReturn
(
false
);
});
testUsingContext
(
'Registrant uses old embedding in app project'
,
()
async
{
when
(
flutterProject
.
isModule
).
thenReturn
(
false
);
final
File
androidManifest
=
flutterProject
.
directory
.
childDirectory
(
'android'
)
.
childFile
(
'AndroidManifest.xml'
)
..
createSync
(
recursive:
true
)
..
writeAsStringSync
(
kAndroidManifestUsingOldEmbedding
);
when
(
androidProject
.
appManifestFile
).
thenReturn
(
androidManifest
);
await
injectPlugins
(
flutterProject
);
final
File
registrant
=
flutterProject
.
directory
.
childDirectory
(
fs
.
path
.
join
(
'android'
,
'app'
,
'src'
,
'main'
,
'java'
,
'io'
,
'flutter'
,
'plugins'
))
.
childFile
(
'GeneratedPluginRegistrant.java'
);
expect
(
registrant
.
existsSync
(),
isTrue
);
expect
(
registrant
.
readAsStringSync
(),
contains
(
'package io.flutter.plugins'
));
expect
(
registrant
.
readAsStringSync
(),
contains
(
'class GeneratedPluginRegistrant'
));
},
overrides:
<
Type
,
Generator
>{
FileSystem:
()
=>
fs
,
ProcessManager:
()
=>
FakeProcessManager
.
any
(),
FeatureFlags:
()
=>
featureFlags
,
});
testUsingContext
(
'Registrant uses new embedding if app uses new embedding'
,
()
async
{
when
(
flutterProject
.
isModule
).
thenReturn
(
false
);
final
File
androidManifest
=
flutterProject
.
directory
.
childDirectory
(
'android'
)
.
childFile
(
'AndroidManifest.xml'
)
..
createSync
(
recursive:
true
)
..
writeAsStringSync
(
kAndroidManifestUsingNewEmbedding
);
when
(
androidProject
.
appManifestFile
).
thenReturn
(
androidManifest
);
await
injectPlugins
(
flutterProject
);
final
File
registrant
=
flutterProject
.
directory
.
childDirectory
(
fs
.
path
.
join
(
'android'
,
'app'
,
'src'
,
'main'
,
'java'
,
'dev'
,
'flutter'
,
'plugins'
))
.
childFile
(
'GeneratedPluginRegistrant.java'
);
expect
(
registrant
.
existsSync
(),
isTrue
);
expect
(
registrant
.
readAsStringSync
(),
contains
(
'package dev.flutter.plugins'
));
expect
(
registrant
.
readAsStringSync
(),
contains
(
'class GeneratedPluginRegistrant'
));
},
overrides:
<
Type
,
Generator
>{
FileSystem:
()
=>
fs
,
ProcessManager:
()
=>
FakeProcessManager
.
any
(),
FeatureFlags:
()
=>
featureFlags
,
});
testUsingContext
(
'Registrant uses shim for plugins using old embedding if app uses new embedding'
,
()
async
{
when
(
flutterProject
.
isModule
).
thenReturn
(
false
);
final
File
androidManifest
=
flutterProject
.
directory
.
childDirectory
(
'android'
)
.
childFile
(
'AndroidManifest.xml'
)
..
createSync
(
recursive:
true
)
..
writeAsStringSync
(
kAndroidManifestUsingNewEmbedding
);
when
(
androidProject
.
appManifestFile
).
thenReturn
(
androidManifest
);
final
Directory
pluginUsingJavaAndNewEmbeddingDir
=
fs
.
systemTempDirectory
.
createTempSync
(
'flutter_plugin_using_java_and_new_embedding_dir.'
);
pluginUsingJavaAndNewEmbeddingDir
.
childFile
(
'pubspec.yaml'
)
.
writeAsStringSync
(
'''
flutter:
plugin:
androidPackage: plugin1
pluginClass: UseNewEmbedding
'''
);
pluginUsingJavaAndNewEmbeddingDir
.
childDirectory
(
'android'
)
.
childDirectory
(
'src'
)
.
childDirectory
(
'main'
)
.
childDirectory
(
'java'
)
.
childDirectory
(
'plugin1'
)
.
childFile
(
'UseNewEmbedding.java'
)
..
createSync
(
recursive:
true
)
..
writeAsStringSync
(
'import io.flutter.embedding.engine.plugins.FlutterPlugin;'
);
final
Directory
pluginUsingKotlinAndNewEmbeddingDir
=
fs
.
systemTempDirectory
.
createTempSync
(
'flutter_plugin_using_kotlin_and_new_embedding_dir.'
);
pluginUsingKotlinAndNewEmbeddingDir
.
childFile
(
'pubspec.yaml'
)
.
writeAsStringSync
(
'''
flutter:
plugin:
androidPackage: plugin2
pluginClass: UseNewEmbedding
'''
);
pluginUsingKotlinAndNewEmbeddingDir
.
childDirectory
(
'android'
)
.
childDirectory
(
'src'
)
.
childDirectory
(
'main'
)
.
childDirectory
(
'kotlin'
)
.
childDirectory
(
'plugin2'
)
.
childFile
(
'UseNewEmbedding.kt'
)
..
createSync
(
recursive:
true
)
..
writeAsStringSync
(
'import io.flutter.embedding.engine.plugins.FlutterPlugin'
);
final
Directory
pluginUsingOldEmbeddingDir
=
fs
.
systemTempDirectory
.
createTempSync
(
'flutter_plugin_using_old_embedding_dir.'
);
pluginUsingOldEmbeddingDir
.
childFile
(
'pubspec.yaml'
)
.
writeAsStringSync
(
'''
flutter:
plugin:
androidPackage: plugin3
pluginClass: UseOldEmbedding
'''
);
pluginUsingOldEmbeddingDir
.
childDirectory
(
'android'
)
.
childDirectory
(
'src'
)
.
childDirectory
(
'main'
)
.
childDirectory
(
'java'
)
.
childDirectory
(
'plugin3'
)
.
childFile
(
'UseOldEmbedding.java'
)
..
createSync
(
recursive:
true
);
flutterProject
.
directory
.
childFile
(
'.packages'
)
.
writeAsStringSync
(
'''
plugin1:
${pluginUsingJavaAndNewEmbeddingDir.childDirectory('lib').uri.toString()}
plugin2:
${pluginUsingKotlinAndNewEmbeddingDir.childDirectory('lib').uri.toString()}
plugin3:
${pluginUsingOldEmbeddingDir.childDirectory('lib').uri.toString()}
'''
);
await
injectPlugins
(
flutterProject
);
final
File
registrant
=
flutterProject
.
directory
.
childDirectory
(
fs
.
path
.
join
(
'android'
,
'app'
,
'src'
,
'main'
,
'java'
,
'dev'
,
'flutter'
,
'plugins'
))
.
childFile
(
'GeneratedPluginRegistrant.java'
);
expect
(
registrant
.
readAsStringSync
(),
contains
(
'flutterEngine.getPlugins().add(new plugin1.UseNewEmbedding());'
));
expect
(
registrant
.
readAsStringSync
(),
contains
(
'flutterEngine.getPlugins().add(new plugin2.UseNewEmbedding());'
));
expect
(
registrant
.
readAsStringSync
(),
contains
(
'plugin3.UseOldEmbedding.registerWith(shimPluginRegistry.registrarFor("plugin3.UseOldEmbedding"));'
));
},
overrides:
<
Type
,
Generator
>{
FileSystem:
()
=>
fs
,
ProcessManager:
()
=>
FakeProcessManager
.
any
(),
FeatureFlags:
()
=>
featureFlags
,
XcodeProjectInterpreter:
()
=>
xcodeProjectInterpreter
,
});
testUsingContext
(
'Registrant doesn
\'
t use new embedding if app doesn
\'
t use new embedding'
,
()
async
{
when
(
flutterProject
.
isModule
).
thenReturn
(
false
);
final
File
androidManifest
=
flutterProject
.
directory
.
childDirectory
(
'android'
)
.
childFile
(
'AndroidManifest.xml'
)
..
createSync
(
recursive:
true
)
..
writeAsStringSync
(
kAndroidManifestUsingOldEmbedding
);
when
(
androidProject
.
appManifestFile
).
thenReturn
(
androidManifest
);
await
injectPlugins
(
flutterProject
);
final
File
registrant
=
flutterProject
.
directory
.
childDirectory
(
fs
.
path
.
join
(
'android'
,
'app'
,
'src'
,
'main'
,
'java'
,
'io'
,
'flutter'
,
'plugins'
))
.
childFile
(
'GeneratedPluginRegistrant.java'
);
expect
(
registrant
.
existsSync
(),
isTrue
);
expect
(
registrant
.
readAsStringSync
(),
contains
(
'package io.flutter.plugins'
));
expect
(
registrant
.
readAsStringSync
(),
contains
(
'class GeneratedPluginRegistrant'
));
},
overrides:
<
Type
,
Generator
>{
FileSystem:
()
=>
fs
,
ProcessManager:
()
=>
FakeProcessManager
.
any
(),
FeatureFlags:
()
=>
featureFlags
,
});
testUsingContext
(
'Registrant uses old embedding in module project'
,
()
async
{
when
(
flutterProject
.
isModule
).
thenReturn
(
true
);
final
File
androidManifest
=
flutterProject
.
directory
.
childDirectory
(
'android'
)
.
childFile
(
'AndroidManifest.xml'
)
..
createSync
(
recursive:
true
)
..
writeAsStringSync
(
kAndroidManifestUsingOldEmbedding
);
when
(
androidProject
.
appManifestFile
).
thenReturn
(
androidManifest
);
await
injectPlugins
(
flutterProject
);
final
File
registrant
=
flutterProject
.
directory
.
childDirectory
(
fs
.
path
.
join
(
'android'
,
'app'
,
'src'
,
'main'
,
'java'
,
'io'
,
'flutter'
,
'plugins'
))
.
childFile
(
'GeneratedPluginRegistrant.java'
);
expect
(
registrant
.
existsSync
(),
isTrue
);
expect
(
registrant
.
readAsStringSync
(),
contains
(
'package io.flutter.plugins'
));
expect
(
registrant
.
readAsStringSync
(),
contains
(
'class GeneratedPluginRegistrant'
));
},
overrides:
<
Type
,
Generator
>{
FileSystem:
()
=>
fs
,
ProcessManager:
()
=>
FakeProcessManager
.
any
(),
FeatureFlags:
()
=>
featureFlags
,
});
testUsingContext
(
'Registrant uses new embedding if module uses new embedding'
,
()
async
{
when
(
flutterProject
.
isModule
).
thenReturn
(
true
);
final
File
androidManifest
=
flutterProject
.
directory
.
childDirectory
(
'android'
)
.
childFile
(
'AndroidManifest.xml'
)
..
createSync
(
recursive:
true
)
..
writeAsStringSync
(
kAndroidManifestUsingNewEmbedding
);
when
(
androidProject
.
appManifestFile
).
thenReturn
(
androidManifest
);
await
injectPlugins
(
flutterProject
);
final
File
registrant
=
flutterProject
.
directory
.
childDirectory
(
fs
.
path
.
join
(
'android'
,
'app'
,
'src'
,
'main'
,
'java'
,
'dev'
,
'flutter'
,
'plugins'
))
.
childFile
(
'GeneratedPluginRegistrant.java'
);
expect
(
registrant
.
existsSync
(),
isTrue
);
expect
(
registrant
.
readAsStringSync
(),
contains
(
'package dev.flutter.plugins'
));
expect
(
registrant
.
readAsStringSync
(),
contains
(
'class GeneratedPluginRegistrant'
));
},
overrides:
<
Type
,
Generator
>{
FileSystem:
()
=>
fs
,
ProcessManager:
()
=>
FakeProcessManager
.
any
(),
FeatureFlags:
()
=>
featureFlags
,
});
testUsingContext
(
'Registrant doesn
\'
t use new embedding if module doesn
\'
t use new embedding'
,
()
async
{
when
(
flutterProject
.
isModule
).
thenReturn
(
true
);
final
File
androidManifest
=
flutterProject
.
directory
.
childDirectory
(
'android'
)
.
childFile
(
'AndroidManifest.xml'
)
..
createSync
(
recursive:
true
)
..
writeAsStringSync
(
kAndroidManifestUsingOldEmbedding
);
when
(
androidProject
.
appManifestFile
).
thenReturn
(
androidManifest
);
await
injectPlugins
(
flutterProject
);
final
File
registrant
=
flutterProject
.
directory
.
childDirectory
(
fs
.
path
.
join
(
'android'
,
'app'
,
'src'
,
'main'
,
'java'
,
'io'
,
'flutter'
,
'plugins'
))
.
childFile
(
'GeneratedPluginRegistrant.java'
);
expect
(
registrant
.
existsSync
(),
isTrue
);
expect
(
registrant
.
readAsStringSync
(),
contains
(
'package io.flutter.plugins'
));
expect
(
registrant
.
readAsStringSync
(),
contains
(
'class GeneratedPluginRegistrant'
));
},
overrides:
<
Type
,
Generator
>{
FileSystem:
()
=>
fs
,
ProcessManager:
()
=>
FakeProcessManager
.
any
(),
FeatureFlags:
()
=>
featureFlags
,
});
await
injectPlugins
(
flutterProject
);
final
File
registrant
=
flutterProject
.
directory
.
childDirectory
(
fs
.
path
.
join
(
'android'
,
'app'
,
'src'
,
'main'
,
'java'
,
'dev'
,
'flutter'
,
'plugins'
))
.
childFile
(
'GeneratedPluginRegistrant.java'
);
expect
(
registrant
.
readAsStringSync
(),
contains
(
'flutterEngine.getPlugins().add(new plugin1.UseNewEmbedding());'
));
expect
(
registrant
.
readAsStringSync
(),
contains
(
'flutterEngine.getPlugins().add(new plugin2.UseNewEmbedding());'
));
expect
(
registrant
.
readAsStringSync
(),
contains
(
'plugin3.UseOldEmbedding.registerWith(shimPluginRegistry.registrarFor("plugin3.UseOldEmbedding"));'
));
},
overrides:
<
Type
,
Generator
>{
FileSystem:
()
=>
fs
,
ProcessManager:
()
=>
FakeProcessManager
.
any
(),
FeatureFlags:
()
=>
featureFlags
,
XcodeProjectInterpreter:
()
=>
xcodeProjectInterpreter
,
});
testUsingContext
(
'Registrant doesn
\'
t use new embedding if app doesn
\'
t use new embedding'
,
()
async
{
when
(
flutterProject
.
isModule
).
thenReturn
(
false
);
final
File
androidManifest
=
flutterProject
.
directory
.
childDirectory
(
'android'
)
.
childFile
(
'AndroidManifest.xml'
)
..
createSync
(
recursive:
true
)
..
writeAsStringSync
(
kAndroidManifestUsingOldEmbedding
);
when
(
androidProject
.
appManifestFile
).
thenReturn
(
androidManifest
);
await
injectPlugins
(
flutterProject
);
final
File
registrant
=
flutterProject
.
directory
.
childDirectory
(
fs
.
path
.
join
(
'android'
,
'app'
,
'src'
,
'main'
,
'java'
,
'io'
,
'flutter'
,
'plugins'
))
.
childFile
(
'GeneratedPluginRegistrant.java'
);
expect
(
registrant
.
existsSync
(),
isTrue
);
expect
(
registrant
.
readAsStringSync
(),
contains
(
'package io.flutter.plugins'
));
expect
(
registrant
.
readAsStringSync
(),
contains
(
'class GeneratedPluginRegistrant'
));
},
overrides:
<
Type
,
Generator
>{
FileSystem:
()
=>
fs
,
ProcessManager:
()
=>
FakeProcessManager
.
any
(),
FeatureFlags:
()
=>
featureFlags
,
});
testUsingContext
(
'Registrant uses old embedding in module project'
,
()
async
{
when
(
flutterProject
.
isModule
).
thenReturn
(
true
);
final
File
androidManifest
=
flutterProject
.
directory
.
childDirectory
(
'android'
)
.
childFile
(
'AndroidManifest.xml'
)
..
createSync
(
recursive:
true
)
..
writeAsStringSync
(
kAndroidManifestUsingOldEmbedding
);
when
(
androidProject
.
appManifestFile
).
thenReturn
(
androidManifest
);
await
injectPlugins
(
flutterProject
);
final
File
registrant
=
flutterProject
.
directory
.
childDirectory
(
fs
.
path
.
join
(
'android'
,
'app'
,
'src'
,
'main'
,
'java'
,
'io'
,
'flutter'
,
'plugins'
))
.
childFile
(
'GeneratedPluginRegistrant.java'
);
expect
(
registrant
.
existsSync
(),
isTrue
);
expect
(
registrant
.
readAsStringSync
(),
contains
(
'package io.flutter.plugins'
));
expect
(
registrant
.
readAsStringSync
(),
contains
(
'class GeneratedPluginRegistrant'
));
},
overrides:
<
Type
,
Generator
>{
FileSystem:
()
=>
fs
,
ProcessManager:
()
=>
FakeProcessManager
.
any
(),
FeatureFlags:
()
=>
featureFlags
,
});
testUsingContext
(
'Registrant uses new embedding if module uses new embedding'
,
()
async
{
when
(
flutterProject
.
isModule
).
thenReturn
(
true
);
final
File
androidManifest
=
flutterProject
.
directory
.
childDirectory
(
'android'
)
.
childFile
(
'AndroidManifest.xml'
)
..
createSync
(
recursive:
true
)
..
writeAsStringSync
(
kAndroidManifestUsingNewEmbedding
);
when
(
androidProject
.
appManifestFile
).
thenReturn
(
androidManifest
);
await
injectPlugins
(
flutterProject
);
final
File
registrant
=
flutterProject
.
directory
.
childDirectory
(
fs
.
path
.
join
(
'android'
,
'app'
,
'src'
,
'main'
,
'java'
,
'dev'
,
'flutter'
,
'plugins'
))
.
childFile
(
'GeneratedPluginRegistrant.java'
);
expect
(
registrant
.
existsSync
(),
isTrue
);
expect
(
registrant
.
readAsStringSync
(),
contains
(
'package dev.flutter.plugins'
));
expect
(
registrant
.
readAsStringSync
(),
contains
(
'class GeneratedPluginRegistrant'
));
},
overrides:
<
Type
,
Generator
>{
FileSystem:
()
=>
fs
,
ProcessManager:
()
=>
FakeProcessManager
.
any
(),
FeatureFlags:
()
=>
featureFlags
,
});
testUsingContext
(
'Registrant doesn
\'
t use new embedding if module doesn
\'
t use new embedding'
,
()
async
{
when
(
flutterProject
.
isModule
).
thenReturn
(
true
);
final
File
androidManifest
=
flutterProject
.
directory
.
childDirectory
(
'android'
)
.
childFile
(
'AndroidManifest.xml'
)
..
createSync
(
recursive:
true
)
..
writeAsStringSync
(
kAndroidManifestUsingOldEmbedding
);
when
(
androidProject
.
appManifestFile
).
thenReturn
(
androidManifest
);
await
injectPlugins
(
flutterProject
);
final
File
registrant
=
flutterProject
.
directory
.
childDirectory
(
fs
.
path
.
join
(
'android'
,
'app'
,
'src'
,
'main'
,
'java'
,
'io'
,
'flutter'
,
'plugins'
))
.
childFile
(
'GeneratedPluginRegistrant.java'
);
expect
(
registrant
.
existsSync
(),
isTrue
);
expect
(
registrant
.
readAsStringSync
(),
contains
(
'package io.flutter.plugins'
));
expect
(
registrant
.
readAsStringSync
(),
contains
(
'class GeneratedPluginRegistrant'
));
},
overrides:
<
Type
,
Generator
>{
FileSystem:
()
=>
fs
,
ProcessManager:
()
=>
FakeProcessManager
.
any
(),
FeatureFlags:
()
=>
featureFlags
,
});
testUsingContext
(
'Does not throw when AndroidManifest.xml is not found'
,
()
async
{
when
(
flutterProject
.
isModule
).
thenReturn
(
false
);
final
File
manifest
=
MockFile
();
when
(
manifest
.
existsSync
()).
thenReturn
(
false
);
when
(
androidProject
.
appManifestFile
).
thenReturn
(
manifest
);
await
injectPlugins
(
flutterProject
);
},
overrides:
<
Type
,
Generator
>{
FileSystem:
()
=>
fs
,
ProcessManager:
()
=>
FakeProcessManager
.
any
(),
});
testUsingContext
(
'Registrant for web doesn
\'
t escape slashes in imports'
,
()
async
{
when
(
flutterProject
.
isModule
).
thenReturn
(
true
);
when
(
featureFlags
.
isWebEnabled
).
thenReturn
(
true
);
// injectPlugins will crash if there is no AndroidManifest
final
File
androidManifest
=
flutterProject
.
directory
.
childDirectory
(
'android'
)
.
childFile
(
'AndroidManifest.xml'
)
..
createSync
(
recursive:
true
)
..
writeAsStringSync
(
kAndroidManifestUsingOldEmbedding
);
when
(
androidProject
.
appManifestFile
).
thenReturn
(
androidManifest
);
final
Directory
webPluginWithNestedFile
=
fs
.
systemTempDirectory
.
createTempSync
(
'web_plugin_with_nested'
);
webPluginWithNestedFile
.
childFile
(
'pubspec.yaml'
).
writeAsStringSync
(
'''
flutter:
plugin:
platforms:
web:
pluginClass: WebPlugin
fileName: src/web_plugin.dart
'''
);
webPluginWithNestedFile
.
childDirectory
(
'lib'
)
.
childDirectory
(
'src'
)
.
childFile
(
'web_plugin.dart'
)
..
createSync
(
recursive:
true
);
testUsingContext
(
'Registrant for web doesn
\'
t escape slashes in imports'
,
()
async
{
when
(
flutterProject
.
isModule
).
thenReturn
(
true
);
when
(
featureFlags
.
isWebEnabled
).
thenReturn
(
true
);
// injectPlugins will crash if there is no AndroidManifest
final
File
androidManifest
=
flutterProject
.
directory
.
childDirectory
(
'android'
)
.
childFile
(
'AndroidManifest.xml'
)
..
createSync
(
recursive:
true
)
..
writeAsStringSync
(
kAndroidManifestUsingOldEmbedding
);
when
(
androidProject
.
appManifestFile
).
thenReturn
(
androidManifest
);
final
Directory
webPluginWithNestedFile
=
fs
.
systemTempDirectory
.
createTempSync
(
'web_plugin_with_nested'
);
webPluginWithNestedFile
.
childFile
(
'pubspec.yaml'
).
writeAsStringSync
(
'''
flutter:
plugin:
platforms:
web:
pluginClass: WebPlugin
fileName: src/web_plugin.dart
'''
);
webPluginWithNestedFile
.
childDirectory
(
'lib'
)
.
childDirectory
(
'src'
)
.
childFile
(
'web_plugin.dart'
)
..
createSync
(
recursive:
true
);
flutterProject
.
directory
.
childFile
(
'.packages'
)
.
writeAsStringSync
(
'''
flutterProject
.
directory
.
childFile
(
'.packages'
)
.
writeAsStringSync
(
'''
web_plugin_with_nested:
${webPluginWithNestedFile.childDirectory('lib').uri.toString()}
'''
);
await
injectPlugins
(
flutterProject
);
await
injectPlugins
(
flutterProject
);
final
File
registrant
=
flutterProject
.
directory
.
childDirectory
(
'lib'
)
.
childFile
(
'generated_plugin_registrant.dart'
);
expect
(
registrant
.
existsSync
(),
isTrue
);
expect
(
registrant
.
readAsStringSync
(),
contains
(
"import 'package:web_plugin_with_nested/src/web_plugin.dart';"
));
},
overrides:
<
Type
,
Generator
>{
FileSystem:
()
=>
fs
,
ProcessManager:
()
=>
FakeProcessManager
.
any
(),
FeatureFlags:
()
=>
featureFlags
,
final
File
registrant
=
flutterProject
.
directory
.
childDirectory
(
'lib'
)
.
childFile
(
'generated_plugin_registrant.dart'
);
expect
(
registrant
.
existsSync
(),
isTrue
);
expect
(
registrant
.
readAsStringSync
(),
contains
(
"import 'package:web_plugin_with_nested/src/web_plugin.dart';"
));
},
overrides:
<
Type
,
Generator
>{
FileSystem:
()
=>
fs
,
ProcessManager:
()
=>
FakeProcessManager
.
any
(),
FeatureFlags:
()
=>
featureFlags
,
});
});
});
}
...
...
@@ -451,6 +467,7 @@ web_plugin_with_nested:${webPluginWithNestedFile.childDirectory('lib').uri.toStr
class
MockAndroidProject
extends
Mock
implements
AndroidProject
{}
class
MockFeatureFlags
extends
Mock
implements
FeatureFlags
{}
class
MockFlutterProject
extends
Mock
implements
FlutterProject
{}
class
MockFile
extends
Mock
implements
File
{}
class
MockIosProject
extends
Mock
implements
IosProject
{}
class
MockMacOSProject
extends
Mock
implements
MacOSProject
{}
class
MockXcodeProjectInterpreter
extends
Mock
implements
XcodeProjectInterpreter
{}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment