Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1381887 authored by Paul Duffin's avatar Paul Duffin
Browse files

Migrate sdk tests away from checkAndroidBpContents 

Replaces a single call to checkAndroidBpContents(...) with separate
calls to check the versioned and unversioned Android.bp files.

Test: m nothing
Bug: 179354495
Change-Id: I270bf73909958d97b2f298e8d7f6d10a1f75ae71
parent 27b5e614

sdk/exports_test.go

+10 −6
Original line number Diff line number Diff line
@@ -43,20 +43,23 @@ func TestModuleExportsSnapshot(t *testing.T) { 
		})



	CheckSnapshot(t, result, "myexports", "package",

		checkAndroidBpContents(`

		checkUnversionedAndroidBpContents(`

// This is auto-generated. DO NOT EDIT.



java_import {

    name: "myexports_myjavalib@current",

    sdk_member_name: "myjavalib",

    name: "myjavalib",

    prefer: false,

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    jars: ["java/myjavalib.jar"],

}

`),

		checkVersionedAndroidBpContents(`

// This is auto-generated. DO NOT EDIT.



java_import {

    name: "myjavalib",

    prefer: false,

    name: "myexports_myjavalib@current",

    sdk_member_name: "myjavalib",

    visibility: ["//visibility:public"],

    apex_available: ["//apex_available:platform"],

    jars: ["java/myjavalib.jar"],
@@ -67,5 +70,6 @@ module_exports_snapshot { 
    visibility: ["//visibility:public"],

    java_libs: ["myexports_myjavalib@current"],

}

`))

`),

	)

}

sdk/java_sdk_test.go

+196 −141

File changed.

Preview size limit exceeded, changes collapsed.