diff options
| author | satayev <satayev@google.com> | 2021-05-20 21:35:06 +0100 |
|---|---|---|
| committer | satayev <satayev@google.com> | 2021-05-24 13:38:45 +0100 |
| commit | 53d0678b576c5a732424c2ff89329af8f22eca01 (patch) | |
| tree | 9b5c9797f8ce9a4f4b1b9e200d10dea23cd7d482 /java/systemserver_classpath_fragment_test.go | |
| parent | b40610ad00c64c2d68647cce1bd27e8627c3e43d (diff) | |
Rename generate proto config file to match classpath type.
There is no need to leak soong module names.
Bug: 180105615
Test: m && launch_cvd; atest CtsClasspathsTestCases
Change-Id: I04f4e181d2f42b9d71641980a2c7c4e8cbc8e426
Merged-In: I04f4e181d2f42b9d71641980a2c7c4e8cbc8e426
Diffstat (limited to 'java/systemserver_classpath_fragment_test.go')
| -rw-r--r-- | java/systemserver_classpath_fragment_test.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/java/systemserver_classpath_fragment_test.go b/java/systemserver_classpath_fragment_test.go index 5272f271d..9ad50dd4a 100644 --- a/java/systemserver_classpath_fragment_test.go +++ b/java/systemserver_classpath_fragment_test.go @@ -24,7 +24,7 @@ var prepareForTestWithSystemServerClasspath = android.GroupFixturePreparers( PrepareForTestWithJavaDefaultModules, ) -func TestPlatformSystemserverClasspathVariant(t *testing.T) { +func TestPlatformSystemServerClasspathVariant(t *testing.T) { result := android.GroupFixturePreparers( prepareForTestWithSystemServerClasspath, android.FixtureWithRootAndroidBp(` @@ -38,7 +38,7 @@ func TestPlatformSystemserverClasspathVariant(t *testing.T) { android.AssertIntEquals(t, "expect 1 variant", 1, len(variants)) } -func TestPlatformSystemserverClasspath_ClasspathFragmentPaths(t *testing.T) { +func TestPlatformSystemServerClasspath_ClasspathFragmentPaths(t *testing.T) { result := android.GroupFixturePreparers( prepareForTestWithSystemServerClasspath, android.FixtureWithRootAndroidBp(` @@ -49,11 +49,11 @@ func TestPlatformSystemserverClasspath_ClasspathFragmentPaths(t *testing.T) { ).RunTest(t) p := result.Module("platform-systemserverclasspath", "android_common").(*platformSystemServerClasspathModule) - android.AssertStringEquals(t, "output filepath", p.Name()+".pb", p.ClasspathFragmentBase.outputFilepath.Base()) + android.AssertStringEquals(t, "output filepath", "systemserverclasspath.pb", p.ClasspathFragmentBase.outputFilepath.Base()) android.AssertPathRelativeToTopEquals(t, "install filepath", "out/soong/target/product/test_device/system/etc/classpaths", p.ClasspathFragmentBase.installDirPath) } -func TestPlatformSystemserverClasspathModule_AndroidMkEntries(t *testing.T) { +func TestPlatformSystemServerClasspathModule_AndroidMkEntries(t *testing.T) { preparer := android.GroupFixturePreparers( prepareForTestWithSystemServerClasspath, android.FixtureWithRootAndroidBp(` @@ -78,8 +78,8 @@ func TestPlatformSystemserverClasspathModule_AndroidMkEntries(t *testing.T) { want := map[string][]string{ "LOCAL_MODULE": {"platform-systemserverclasspath"}, "LOCAL_MODULE_CLASS": {"ETC"}, - "LOCAL_INSTALLED_MODULE_STEM": {"platform-systemserverclasspath.pb"}, - // Output and Install paths are tested separately in TestSystemserverClasspath_ClasspathFragmentPaths + "LOCAL_INSTALLED_MODULE_STEM": {"systemserverclasspath.pb"}, + // Output and Install paths are tested separately in TestPlatformSystemServerClasspath_ClasspathFragmentPaths } p := result.Module("platform-systemserverclasspath", "android_common").(*platformSystemServerClasspathModule) @@ -96,7 +96,7 @@ func TestPlatformSystemserverClasspathModule_AndroidMkEntries(t *testing.T) { }) } -func TestSystemserverclasspathFragmentWithoutContents(t *testing.T) { +func TestSystemServerClasspathFragmentWithoutContents(t *testing.T) { prepareForTestWithSystemServerClasspath. ExtendWithErrorHandler(android.FixtureExpectsAtLeastOneErrorMatchingPattern( `\Qempty contents are not allowed\E`)). |