StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stop sdk package depending on testing.T being embedded in TestResult

Browse Source 
This change is in preparation for removing testing.T from TestResult.

Bug: 181070625
Test: m nothing
Change-Id: I67535aff0d894e6e3d8456b75540f340af853355
This commit is contained in:
Paul Duffin
2021-03-12 12:19:43 +00:00
parent e84b1338c5
commit 36474d322b
7 changed files with 103 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
sdk/java_sdk_test.go
View File

@@ -128,7 +128,7 @@ func TestSdkDependsOnSourceEvenWhenPrebuiltPreferred(t *testing.T) {
// Make sure that the mysdk module depends on "sdkmember" and not "prebuilt_sdkmember".
java.CheckModuleDependencies(t, result.TestContext, "mysdk", "android_common", []string{"sdkmember"})
CheckSnapshot(result, "mysdk", "",
CheckSnapshot(t, result, "mysdk", "",
checkAndroidBpContents(`// This is auto-generated. DO NOT EDIT.
java_import {
@@ -256,7 +256,7 @@ func TestSnapshotWithJavaHeaderLibrary(t *testing.T) {
}
`)
CheckSnapshot(result, "mysdk", "",
CheckSnapshot(t, result, "mysdk", "",
checkAndroidBpContents(`
// This is auto-generated. DO NOT EDIT.
@@ -313,7 +313,7 @@ func TestHostSnapshotWithJavaHeaderLibrary(t *testing.T) {
}
`)
CheckSnapshot(result, "mysdk", "",
CheckSnapshot(t, result, "mysdk", "",
checkAndroidBpContents(`
// This is auto-generated. DO NOT EDIT.
@@ -370,7 +370,7 @@ func TestDeviceAndHostSnapshotWithJavaHeaderLibrary(t *testing.T) {
}
`)
CheckSnapshot(result, "mysdk", "",
CheckSnapshot(t, result, "mysdk", "",
checkAndroidBpContents(`
// This is auto-generated. DO NOT EDIT.
@@ -441,7 +441,7 @@ func TestSnapshotWithJavaImplLibrary(t *testing.T) {
}
`)
CheckSnapshot(result, "myexports", "",
CheckSnapshot(t, result, "myexports", "",
checkAndroidBpContents(`
// This is auto-generated. DO NOT EDIT.
@@ -497,7 +497,7 @@ func TestSnapshotWithJavaBootLibrary(t *testing.T) {
}
`)
CheckSnapshot(result, "myexports", "",
CheckSnapshot(t, result, "myexports", "",
checkAndroidBpContents(`
// This is auto-generated. DO NOT EDIT.
@@ -552,7 +552,7 @@ func TestHostSnapshotWithJavaImplLibrary(t *testing.T) {
}
`)
CheckSnapshot(result, "myexports", "",
CheckSnapshot(t, result, "myexports", "",
checkAndroidBpContents(`
// This is auto-generated. DO NOT EDIT.
@@ -608,7 +608,7 @@ func TestSnapshotWithJavaTest(t *testing.T) {
}
`)
CheckSnapshot(result, "myexports", "",
CheckSnapshot(t, result, "myexports", "",
checkAndroidBpContents(`
// This is auto-generated. DO NOT EDIT.
@@ -663,7 +663,7 @@ func TestHostSnapshotWithJavaTest(t *testing.T) {
}
`)
CheckSnapshot(result, "myexports", "",
CheckSnapshot(t, result, "myexports", "",
checkAndroidBpContents(`
// This is auto-generated. DO NOT EDIT.
@@ -732,7 +732,7 @@ func TestSnapshotWithJavaSystemModules(t *testing.T) {
}
`)
CheckSnapshot(result, "mysdk", "",
CheckSnapshot(t, result, "mysdk", "",
checkAndroidBpContents(`
// This is auto-generated. DO NOT EDIT.
@@ -828,7 +828,7 @@ func TestHostSnapshotWithJavaSystemModules(t *testing.T) {
}
`)
CheckSnapshot(result, "mysdk", "",
CheckSnapshot(t, result, "mysdk", "",
checkAndroidBpContents(`
// This is auto-generated. DO NOT EDIT.
@@ -919,7 +919,7 @@ func TestDeviceAndHostSnapshotWithOsSpecificMembers(t *testing.T) {
}
`)
CheckSnapshot(result, "myexports", "",
CheckSnapshot(t, result, "myexports", "",
checkAndroidBpContents(`
// This is auto-generated. DO NOT EDIT.
@@ -1033,7 +1033,7 @@ func TestSnapshotWithJavaSdkLibrary(t *testing.T) {
}
`)
CheckSnapshot(result, "mysdk", "",
CheckSnapshot(t, result, "mysdk", "",
checkAndroidBpContents(`
// This is auto-generated. DO NOT EDIT.
@@ -1134,7 +1134,7 @@ func TestSnapshotWithJavaSdkLibrary_SdkVersion_None(t *testing.T) {
}
`)
CheckSnapshot(result, "mysdk", "",
CheckSnapshot(t, result, "mysdk", "",
checkAndroidBpContents(`
// This is auto-generated. DO NOT EDIT.
@@ -1203,7 +1203,7 @@ func TestSnapshotWithJavaSdkLibrary_SdkVersion_ForScope(t *testing.T) {
}
`)
CheckSnapshot(result, "mysdk", "",
CheckSnapshot(t, result, "mysdk", "",
checkAndroidBpContents(`
// This is auto-generated. DO NOT EDIT.
@@ -1275,7 +1275,7 @@ func TestSnapshotWithJavaSdkLibrary_ApiScopes(t *testing.T) {
}
`)
CheckSnapshot(result, "mysdk", "",
CheckSnapshot(t, result, "mysdk", "",
checkAndroidBpContents(`
// This is auto-generated. DO NOT EDIT.
@@ -1368,7 +1368,7 @@ func TestSnapshotWithJavaSdkLibrary_ModuleLib(t *testing.T) {
}
`)
CheckSnapshot(result, "mysdk", "",
CheckSnapshot(t, result, "mysdk", "",
checkAndroidBpContents(`
// This is auto-generated. DO NOT EDIT.
@@ -1476,7 +1476,7 @@ func TestSnapshotWithJavaSdkLibrary_SystemServer(t *testing.T) {
}
`)
CheckSnapshot(result, "mysdk", "",
CheckSnapshot(t, result, "mysdk", "",
checkAndroidBpContents(`
// This is auto-generated. DO NOT EDIT.
@@ -1564,7 +1564,7 @@ func TestSnapshotWithJavaSdkLibrary_NamingScheme(t *testing.T) {
}
`)
CheckSnapshot(result, "mysdk", "",
CheckSnapshot(t, result, "mysdk", "",
checkAndroidBpContents(`
// This is auto-generated. DO NOT EDIT.
@@ -1640,7 +1640,7 @@ func TestSnapshotWithJavaSdkLibrary_DoctagFiles(t *testing.T) {
}
`)
CheckSnapshot(result, "mysdk", "",
CheckSnapshot(t, result, "mysdk", "",
checkAndroidBpContents(`
// This is auto-generated. DO NOT EDIT.