summaryrefslogtreecommitdiff
path: root/android/paths_test.go
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2019-11-22 15:25:03 -0800
committer Colin Cross <ccross@android.com> 2019-11-25 10:59:44 -0800
commit4b49b768a2cb7d455aea5347d27d9045b8c481fa (patch)
treea8b5167209d668a3c4d97357e00528982d24cc31 /android/paths_test.go
parent62835fd85fc175f71a9512eedbc0e27cbe2ff30b (diff)
Make TestContext.RegisterModuleType take an android.ModuleFactory
Avoid having to pass ModuleFactoryAdaptor to every call to RegisterModuleType in a test by wrapping RegisterModuleType. Test: all soong tests Change-Id: If8847d16487de0479cc3020b728256922b3cadba
Diffstat (limited to 'android/paths_test.go')
-rw-r--r--android/paths_test.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/android/paths_test.go b/android/paths_test.go
index 2e67272e0..1d8afa9c1 100644
--- a/android/paths_test.go
+++ b/android/paths_test.go
@@ -865,9 +865,9 @@ func testPathForModuleSrc(t *testing.T, buildDir string, tests []pathForModuleSr
config := TestConfig(buildDir, nil)
ctx := NewTestContext()
- ctx.RegisterModuleType("test", ModuleFactoryAdaptor(pathForModuleSrcTestModuleFactory))
- ctx.RegisterModuleType("output_file_provider", ModuleFactoryAdaptor(pathForModuleSrcOutputFileProviderModuleFactory))
- ctx.RegisterModuleType("filegroup", ModuleFactoryAdaptor(FileGroupFactory))
+ ctx.RegisterModuleType("test", pathForModuleSrcTestModuleFactory)
+ ctx.RegisterModuleType("output_file_provider", pathForModuleSrcOutputFileProviderModuleFactory)
+ ctx.RegisterModuleType("filegroup", FileGroupFactory)
fgBp := `
filegroup {
@@ -1079,7 +1079,7 @@ func TestPathsForModuleSrc_AllowMissingDependencies(t *testing.T) {
ctx := NewTestContext()
ctx.SetAllowMissingDependencies(true)
- ctx.RegisterModuleType("test", ModuleFactoryAdaptor(pathForModuleSrcTestModuleFactory))
+ ctx.RegisterModuleType("test", pathForModuleSrcTestModuleFactory)
bp := `
test {