diff options
| author | Paul Duffin <paulduffin@google.com> | 2021-03-12 11:59:43 +0000 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2021-03-12 22:24:51 +0000 |
| commit | e84b1338c567fa13c54235366fd94640ce7f23e6 (patch) | |
| tree | dd0467a9f54c66d3a1806e475179858096ec7091 /java/system_modules_test.go | |
| parent | bf6dcccfc486d03762d90196515a2705e212a3ab (diff) | |
Migrate from result methods to function Asserts
Bug: 181070625
Test: m nothing
Change-Id: Iadb85270290acb52c55f2ad70c9f145f1c34b611
Diffstat (limited to 'java/system_modules_test.go')
| -rw-r--r-- | java/system_modules_test.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/java/system_modules_test.go b/java/system_modules_test.go index abcd186f1..3d9f398ce 100644 --- a/java/system_modules_test.go +++ b/java/system_modules_test.go @@ -58,7 +58,7 @@ func TestJavaSystemModules(t *testing.T) { // The expected paths are the header jars from the source input modules. expectedSourcePaths := getModuleHeaderJarsAsNormalizedPaths(result, "system-module1", "system-module2") - result.AssertArrayString("source system modules inputs", expectedSourcePaths, result.NormalizePathsForTesting(sourceInputs)) + android.AssertArrayString(t, "source system modules inputs", expectedSourcePaths, result.NormalizePathsForTesting(sourceInputs)) } var addPrebuiltSystemModules = android.FixtureAddTextFile("prebuilts/Android.bp", ` @@ -85,7 +85,7 @@ func TestJavaSystemModulesImport(t *testing.T) { // The expected paths are the header jars from the renamed prebuilt input modules. expectedPrebuiltPaths := getModuleHeaderJarsAsNormalizedPaths(result, "system-module1", "system-module2") - result.AssertArrayString("renamed prebuilt system modules inputs", expectedPrebuiltPaths, result.NormalizePathsForTesting(prebuiltInputs)) + android.AssertArrayString(t, "renamed prebuilt system modules inputs", expectedPrebuiltPaths, result.NormalizePathsForTesting(prebuiltInputs)) } func TestJavaSystemModulesMixSourceAndPrebuilt(t *testing.T) { @@ -100,7 +100,7 @@ func TestJavaSystemModulesMixSourceAndPrebuilt(t *testing.T) { // The expected paths are the header jars from the source input modules. expectedSourcePaths := getModuleHeaderJarsAsNormalizedPaths(result, "system-module1", "system-module2") - result.AssertArrayString("source system modules inputs", expectedSourcePaths, result.NormalizePathsForTesting(sourceInputs)) + android.AssertArrayString(t, "source system modules inputs", expectedSourcePaths, result.NormalizePathsForTesting(sourceInputs)) // check the existence of the renamed prebuilt module prebuiltSystemModules := result.ModuleForTests("prebuilt_system-modules", "android_common") @@ -108,5 +108,5 @@ func TestJavaSystemModulesMixSourceAndPrebuilt(t *testing.T) { // The expected paths are the header jars from the renamed prebuilt input modules. expectedPrebuiltPaths := getModuleHeaderJarsAsNormalizedPaths(result, "prebuilt_system-module1", "prebuilt_system-module2") - result.AssertArrayString("prebuilt system modules inputs", expectedPrebuiltPaths, result.NormalizePathsForTesting(prebuiltInputs)) + android.AssertArrayString(t, "prebuilt system modules inputs", expectedPrebuiltPaths, result.NormalizePathsForTesting(prebuiltInputs)) } |