Refactor bp2build tests (78cfdaa5) · Commits · e / os / android_build_soong

bp2build/android_app_certificate_conversion_test.go

+5 −4

Original line number	Diff line number	Diff line
		@@ -42,8 +42,9 @@ android_app_certificate {
		certificate: "chamber_of_secrets_dir",
		}
		`,
		expectedBazelTargets: []string{`android_app_certificate(
		name = "com.android.apogee.cert",
		certificate = "chamber_of_secrets_dir",
		)`}})
		expectedBazelTargets: []string{
		makeBazelTarget("android_app_certificate", "com.android.apogee.cert", attrNameToString{
		"certificate": `"chamber_of_secrets_dir"`,
		}),
		}})
		}

bp2build/apex_conversion_test.go

+26 −25

Original line number	Diff line number	Diff line
		@@ -113,29 +113,30 @@ apex {
		],
		}
		`,
		expectedBazelTargets: []string{`apex(
		name = "com.android.apogee",
		android_manifest = "ApogeeAndroidManifest.xml",
		binaries = [
		expectedBazelTargets: []string{
		makeBazelTarget("apex", "com.android.apogee", attrNameToString{
		"android_manifest": `"ApogeeAndroidManifest.xml"`,
		"binaries": `[
		"binary_1",
		"binary_2",
		],
		certificate = ":com.android.apogee.certificate",
		file_contexts = ":com.android.apogee-file_contexts",
		installable = False,
		key = ":com.android.apogee.key",
		manifest = "apogee_manifest.json",
		min_sdk_version = "29",
		native_shared_libs = [
		]`,
		"certificate": `":com.android.apogee.certificate"`,
		"file_contexts": `":com.android.apogee-file_contexts"`,
		"installable": "False",
		"key": `":com.android.apogee.key"`,
		"manifest": `"apogee_manifest.json"`,
		"min_sdk_version": `"29"`,
		"native_shared_libs": `[
		":native_shared_lib_1",
		":native_shared_lib_2",
		],
		prebuilts = [
		]`,
		"prebuilts": `[
		":pretend_prebuilt_1",
		":pretend_prebuilt_2",
		],
		updatable = False,
		)`}})
		]`,
		"updatable": "False",
		}),
		}})
		}

		func TestApexBundleDefaultPropertyValues(t *testing.T) {
		@@ -151,10 +152,10 @@ apex {
		manifest: "apogee_manifest.json",
		}
		`,
		expectedBazelTargets: []string{`apex(
		name = "com.android.apogee",
		manifest = "apogee_manifest.json",
		)`}})
		expectedBazelTargets: []string{makeBazelTarget("apex", "com.android.apogee", attrNameToString{
		"manifest": `"apogee_manifest.json"`,
		}),
		}})
		}

		func TestApexBundleHasBazelModuleProps(t *testing.T) {
		@@ -171,8 +172,8 @@ apex {
		bazel_module: { bp2build_available: true },
		}
		`,
		expectedBazelTargets: []string{`apex(
		name = "apogee",
		manifest = "manifest.json",
		)`}})
		expectedBazelTargets: []string{makeBazelTarget("apex", "apogee", attrNameToString{
		"manifest": `"manifest.json"`,
		}),
		}})
		}

bp2build/apex_key_conversion_test.go

+5 −5

Original line number	Diff line number	Diff line
		@@ -43,9 +43,9 @@ apex_key {
		private_key: "com.android.apogee.pem",
		}
		`,
		expectedBazelTargets: []string{`apex_key(
		name = "com.android.apogee.key",
		private_key = "com.android.apogee.pem",
		public_key = "com.android.apogee.avbpubkey",
		)`}})
		expectedBazelTargets: []string{makeBazelTarget("apex_key", "com.android.apogee.key", attrNameToString{
		"private_key": `"com.android.apogee.pem"`,
		"public_key": `"com.android.apogee.avbpubkey"`,
		}),
		}})
		}

bp2build/build_conversion_test.go

+141 −227

Original line number	Diff line number	Diff line
		@@ -230,32 +230,32 @@ func TestGenerateBazelTargetModules(t *testing.T) {
		string_prop: "a",
		bazel_module: { bp2build_available: true },
		}`,
		expectedBazelTargets: []string{`custom(
		name = "foo",
		string_list_prop = [
		expectedBazelTargets: []string{
		makeBazelTarget("custom", "foo", attrNameToString{
		"string_list_prop": `[
		"a",
		"b",
		],
		string_prop = "a",
		)`,
		]`,
		"string_prop": `"a"`,
		}),
		},
		},
		{
		description: "control characters",
		blueprint: `custom {
		name: "control_characters",
		name: "foo",
		string_list_prop: ["\t", "\n"],
		string_prop: "a\t\n\r",
		bazel_module: { bp2build_available: true },
		}`,
		expectedBazelTargets: []string{`custom(
		name = "control_characters",
		string_list_prop = [
		expectedBazelTargets: []string{
		makeBazelTarget("custom", "foo", attrNameToString{
		"string_list_prop": `[
		"\t",
		"\n",
		],
		string_prop = "a\t\n\r",
		)`,
		]`,
		"string_prop": `"a\t\n\r"`,
		}),
		},
		},
		{
		@@ -271,14 +271,13 @@ custom {
		arch_paths: ["abc"],
		bazel_module: { bp2build_available: true },
		}`,
		expectedBazelTargets: []string{`custom(
		name = "dep",
		arch_paths = ["abc"],
		)`,
		`custom(
		name = "has_dep",
		arch_paths = [":dep"],
		)`,
		expectedBazelTargets: []string{
		makeBazelTarget("custom", "dep", attrNameToString{
		"arch_paths": `["abc"]`,
		}),
		makeBazelTarget("custom", "has_dep", attrNameToString{
		"arch_paths": `[":dep"]`,
		}),
		},
		},
		{
		@@ -311,9 +310,9 @@ custom {
		},
		bazel_module: { bp2build_available: true },
		}`,
		expectedBazelTargets: []string{`custom(
		name = "arch_paths",
		arch_paths = select({
		expectedBazelTargets: []string{
		makeBazelTarget("custom", "arch_paths", attrNameToString{
		"arch_paths": `select({
		"//build/bazel/platforms/arch:arm": [
		"arm.txt",
		"lib32.txt",
		@@ -368,8 +367,8 @@ custom {
		"windows.txt",
		],
		"//conditions:default": [],
		})`,
		}),
		)`,
		},
		},
		{
		@@ -389,17 +388,16 @@ custom {
		arch_paths: ["abc"],
		bazel_module: { bp2build_available: true },
		}`,
		expectedBazelTargets: []string{`custom(
		name = "dep",
		arch_paths = ["abc"],
		)`,
		`custom(
		name = "has_dep",
		arch_paths = select({
		expectedBazelTargets: []string{
		makeBazelTarget("custom", "dep", attrNameToString{
		"arch_paths": `["abc"]`,
		}),
		makeBazelTarget("custom", "has_dep", attrNameToString{
		"arch_paths": `select({
		"//build/bazel/platforms/arch:x86": [":dep"],
		"//conditions:default": [],
		})`,
		}),
		)`,
		},
		},
		{
		@@ -409,10 +407,10 @@ custom {
		embedded_prop: "abc",
		bazel_module: { bp2build_available: true },
		}`,
		expectedBazelTargets: []string{`custom(
		name = "embedded_props",
		embedded_attr = "abc",
		)`,
		expectedBazelTargets: []string{
		makeBazelTarget("custom", "embedded_props", attrNameToString{
		"embedded_attr": `"abc"`,
		}),
		},
		},
		{
		@@ -422,10 +420,10 @@ custom {
		other_embedded_prop: "abc",
		bazel_module: { bp2build_available: true },
		}`,
		expectedBazelTargets: []string{`custom(
		name = "ptr_to_embedded_props",
		other_embedded_attr = "abc",
		)`,
		expectedBazelTargets: []string{
		makeBazelTarget("custom", "ptr_to_embedded_props", attrNameToString{
		"other_embedded_attr": `"abc"`,
		}),
		},
		},
		}
		@@ -649,9 +647,7 @@ func TestModuleTypeBp2Build(t *testing.T) {
		bazel_module: { bp2build_available: true },
		}`,
		expectedBazelTargets: []string{
		`filegroup(
		name = "fg_foo",
		)`,
		makeBazelTarget("filegroup", "fg_foo", map[string]string{}),
		},
		},
		{
		@@ -665,9 +661,7 @@ func TestModuleTypeBp2Build(t *testing.T) {
		bazel_module: { bp2build_available: true },
		}`,
		expectedBazelTargets: []string{
		`filegroup(
		name = "fg_foo",
		)`,
		makeBazelTarget("filegroup", "fg_foo", map[string]string{}),
		},
		},
		{
		@@ -680,13 +674,13 @@ func TestModuleTypeBp2Build(t *testing.T) {
		srcs: ["a", "b"],
		bazel_module: { bp2build_available: true },
		}`,
		expectedBazelTargets: []string{`filegroup(
		name = "fg_foo",
		srcs = [
		expectedBazelTargets: []string{
		makeBazelTarget("filegroup", "fg_foo", map[string]string{
		"srcs": `[
		"a",
		"b",
		],
		)`,
		]`,
		}),
		},
		},
		{
		@@ -700,10 +694,10 @@ func TestModuleTypeBp2Build(t *testing.T) {
		exclude_srcs: ["a"],
		bazel_module: { bp2build_available: true },
		}`,
		expectedBazelTargets: []string{`filegroup(
		name = "fg_foo",
		srcs = ["b"],
		)`,
		expectedBazelTargets: []string{
		makeBazelTarget("filegroup", "fg_foo", map[string]string{
		"srcs": `["b"]`,
		}),
		},
		},
		{
		@@ -712,18 +706,18 @@ func TestModuleTypeBp2Build(t *testing.T) {
		moduleTypeUnderTestFactory: android.FileGroupFactory,
		moduleTypeUnderTestBp2BuildMutator: android.FilegroupBp2Build,
		blueprint: `filegroup {
		name: "foo",
		name: "fg_foo",
		srcs: ["*/.txt"],
		bazel_module: { bp2build_available: true },
		}`,
		expectedBazelTargets: []string{`filegroup(
		name = "foo",
		srcs = [
		expectedBazelTargets: []string{
		makeBazelTarget("filegroup", "fg_foo", map[string]string{
		"srcs": `[
		"other/a.txt",
		"other/b.txt",
		"other/subdir/a.txt",
		],
		)`,
		]`,
		}),
		},
		filesystem: map[string]string{
		"other/a.txt": "",
		@@ -737,21 +731,8 @@ func TestModuleTypeBp2Build(t *testing.T) {
		moduleTypeUnderTest: "filegroup",
		moduleTypeUnderTestFactory: android.FileGroupFactory,
		moduleTypeUnderTestBp2BuildMutator: android.FilegroupBp2Build,
		blueprint: `filegroup {
		name: "foo",
		srcs: ["a.txt"],
		bazel_module: { bp2build_available: true },
		}`,
		blueprint: ``,
		dir: "other",
		expectedBazelTargets: []string{`filegroup(
		name = "fg_foo",
		srcs = [
		"a.txt",
		"b.txt",
		"subdir/a.txt",
		],
		)`,
		},
		filesystem: map[string]string{
		"other/Android.bp": `filegroup {
		name: "fg_foo",
		@@ -763,6 +744,15 @@ func TestModuleTypeBp2Build(t *testing.T) {
		"other/subdir/a.txt": "",
		"other/file": "",
		},
		expectedBazelTargets: []string{
		makeBazelTarget("filegroup", "fg_foo", map[string]string{
		"srcs": `[
		"a.txt",
		"b.txt",
		"subdir/a.txt",
		]`,
		}),
		},
		},
		{
		description: "depends_on_other_dir_module",
		@@ -770,21 +760,13 @@ func TestModuleTypeBp2Build(t *testing.T) {
		moduleTypeUnderTestFactory: android.FileGroupFactory,
		moduleTypeUnderTestBp2BuildMutator: android.FilegroupBp2Build,
		blueprint: `filegroup {
		name: "foobar",
		name: "fg_foo",
		srcs: [
		":foo",
		"c",
		],
		bazel_module: { bp2build_available: true },
		}`,
		expectedBazelTargets: []string{`filegroup(
		name = "foobar",
		srcs = [
		"//other:foo",
		"c",
		],
		)`,
		},
		filesystem: map[string]string{
		"other/Android.bp": `filegroup {
		name: "foo",
		@@ -792,6 +774,14 @@ func TestModuleTypeBp2Build(t *testing.T) {
		bazel_module: { bp2build_available: true },
		}`,
		},
		expectedBazelTargets: []string{
		makeBazelTarget("filegroup", "fg_foo", map[string]string{
		"srcs": `[
		"//other:foo",
		"c",
		]`,
		}),
		},
		},
		{
		description: "depends_on_other_unconverted_module_error",
		@@ -799,21 +789,21 @@ func TestModuleTypeBp2Build(t *testing.T) {
		moduleTypeUnderTestFactory: android.FileGroupFactory,
		moduleTypeUnderTestBp2BuildMutator: android.FilegroupBp2Build,
		unconvertedDepsMode: errorModulesUnconvertedDeps,
		filesystem: map[string]string{
		"other/Android.bp": `filegroup {
		name: "foo",
		srcs: ["a", "b"],
		}`,
		},
		blueprint: `filegroup {
		name: "foobar",
		name: "fg_foo",
		srcs: [
		":foo",
		"c",
		],
		bazel_module: { bp2build_available: true },
		}`,
		expectedErr: fmt.Errorf(`"foobar" depends on unconverted modules: foo`),
		filesystem: map[string]string{
		"other/Android.bp": `filegroup {
		name: "foo",
		srcs: ["a", "b"],
		}`,
		},
		expectedErr: fmt.Errorf(`"fg_foo" depends on unconverted modules: foo`),
		},
		}

		@@ -1088,9 +1078,8 @@ func TestCombineBuildFilesBp2buildTargets(t *testing.T) {
		"other/BUILD.bazel": `// definition for fg_bar`,
		},
		expectedBazelTargets: []string{
		`filegroup(
		name = "fg_foo",
		)`, `// definition for fg_bar`,
		makeBazelTarget("filegroup", "fg_foo", map[string]string{}),
		`// definition for fg_bar`,
		},
		},
		{
		@@ -1098,6 +1087,9 @@ func TestCombineBuildFilesBp2buildTargets(t *testing.T) {
		moduleTypeUnderTest: "filegroup",
		moduleTypeUnderTestFactory: android.FileGroupFactory,
		moduleTypeUnderTestBp2BuildMutator: android.FilegroupBp2Build,
		filesystem: map[string]string{
		"other/BUILD.bazel": `// BUILD file`,
		},
		blueprint: `filegroup {
		name: "fg_foo",
		bazel_module: {
		@@ -1112,14 +1104,9 @@ func TestCombineBuildFilesBp2buildTargets(t *testing.T) {
		},
		}`,
		expectedBazelTargets: []string{
		`filegroup(
		name = "fg_bar",
		)`,
		makeBazelTarget("filegroup", "fg_bar", map[string]string{}),
		`// BUILD file`,
		},
		filesystem: map[string]string{
		"other/BUILD.bazel": `// BUILD file`,
		},
		},
		}

		@@ -1195,16 +1182,6 @@ func TestGlobExcludeSrcs(t *testing.T) {
		exclude_srcs: ["c.txt"],
		bazel_module: { bp2build_available: true },
		}`,
		expectedBazelTargets: []string{`filegroup(
		name = "fg_foo",
		srcs = [
		"a.txt",
		"b.txt",
		"//dir:e.txt",
		"//dir:f.txt",
		],
		)`,
		},
		filesystem: map[string]string{
		"a.txt": "",
		"b.txt": "",
		@@ -1213,6 +1190,16 @@ func TestGlobExcludeSrcs(t *testing.T) {
		"dir/e.txt": "",
		"dir/f.txt": "",
		},
		expectedBazelTargets: []string{
		makeBazelTarget("filegroup", "fg_foo", map[string]string{
		"srcs": `[
		"a.txt",
		"b.txt",
		"//dir:e.txt",
		"//dir:f.txt",
		]`,
		}),
		},
		},
		{
		description: "filegroup in subdir exclude_srcs",
		@@ -1235,66 +1222,22 @@ func TestGlobExcludeSrcs(t *testing.T) {
		"dir/subdir/e.txt": "",
		"dir/subdir/f.txt": "",
		},
		expectedBazelTargets: []string{`filegroup(
		name = "fg_foo",
		srcs = [
		expectedBazelTargets: []string{
		makeBazelTarget("filegroup", "fg_foo", map[string]string{
		"srcs": `[
		"a.txt",
		"//dir/subdir:e.txt",
		"//dir/subdir:f.txt",
		],
		)`,
		]`,
		}),
		},
		},
		}

		dir := "."
		for _, testCase := range testCases {
		fs := make(map[string][]byte)
		toParse := []string{
		"Android.bp",
		}
		for f, content := range testCase.filesystem {
		if strings.HasSuffix(f, "Android.bp") {
		toParse = append(toParse, f)
		}
		fs[f] = []byte(content)
		}
		config := android.TestConfig(buildDir, nil, testCase.blueprint, fs)
		ctx := android.NewTestContext(config)
		ctx.RegisterModuleType(testCase.moduleTypeUnderTest, testCase.moduleTypeUnderTestFactory)
		ctx.RegisterBp2BuildMutator(testCase.moduleTypeUnderTest, testCase.moduleTypeUnderTestBp2BuildMutator)
		ctx.RegisterForBazelConversion()

		_, errs := ctx.ParseFileList(dir, toParse)
		if errored(t, testCase, errs) {
		continue
		}
		_, errs = ctx.ResolveDependencies(config)
		if errored(t, testCase, errs) {
		continue
		}

		checkDir := dir
		if testCase.dir != "" {
		checkDir = testCase.dir
		}
		codegenCtx := NewCodegenContext(config, *ctx.Context, Bp2Build)
		bazelTargets, err := generateBazelTargetsForDir(codegenCtx, checkDir)
		android.FailIfErrored(t, err)
		if actualCount, expectedCount := len(bazelTargets), len(testCase.expectedBazelTargets); actualCount != expectedCount {
		t.Errorf("%s: Expected %d bazel target, got %d\n%s", testCase.description, expectedCount, actualCount, bazelTargets)
		} else {
		for i, target := range bazelTargets {
		if w, g := testCase.expectedBazelTargets[i], target.content; w != g {
		t.Errorf(
		"%s: Expected generated Bazel target to be '%s', got '%s'",
		testCase.description,
		w,
		g,
		)
		}
		}
		}
		t.Run(testCase.description, func(t *testing.T) {
		runBp2BuildTestCaseSimple(t, testCase)
		})
		}
		}

		@@ -1305,22 +1248,16 @@ func TestCommonBp2BuildModuleAttrs(t *testing.T) {
		moduleTypeUnderTest: "filegroup",
		moduleTypeUnderTestFactory: android.FileGroupFactory,
		moduleTypeUnderTestBp2BuildMutator: android.FilegroupBp2Build,
		blueprint: `filegroup {
		name: "reqd",
		}

		blueprint: simpleModuleDoNotConvertBp2build("filegroup", "reqd") + `
		filegroup {
		name: "fg_foo",
		required: ["reqd"],
		bazel_module: { bp2build_available: true },
		}`,
		expectedBazelTargets: []string{`filegroup(
		name = "fg_foo",
		data = [":reqd"],
		)`,
		`filegroup(
		name = "reqd",
		)`,
		expectedBazelTargets: []string{
		makeBazelTarget("filegroup", "fg_foo", map[string]string{
		"data": `[":reqd"]`,
		}),
		},
		},
		{
		@@ -1328,16 +1265,8 @@ filegroup {
		moduleTypeUnderTest: "python_library",
		moduleTypeUnderTestFactory: python.PythonLibraryFactory,
		moduleTypeUnderTestBp2BuildMutator: python.PythonLibraryBp2Build,
		blueprint: `python_library {
		name: "reqdx86",
		bazel_module: { bp2build_available: false, },
		}

		python_library {
		name: "reqdarm",
		bazel_module: { bp2build_available: false, },
		}

		blueprint: simpleModuleDoNotConvertBp2build("python_library", "reqdx86") +
		simpleModuleDoNotConvertBp2build("python_library", "reqdarm") + `
		python_library {
		name: "fg_foo",
		arch: {
		@@ -1350,15 +1279,15 @@ python_library {
		},
		bazel_module: { bp2build_available: true },
		}`,
		expectedBazelTargets: []string{`py_library(
		name = "fg_foo",
		data = select({
		expectedBazelTargets: []string{
		makeBazelTarget("py_library", "fg_foo", map[string]string{
		"data": `select({
		"//build/bazel/platforms/arch:arm": [":reqdarm"],
		"//build/bazel/platforms/arch:x86": [":reqdx86"],
		"//conditions:default": [],
		})`,
		"srcs_version": `"PY3"`,
		}),
		srcs_version = "PY3",
		)`,
		},
		},
		{
		@@ -1366,11 +1295,11 @@ python_library {
		moduleTypeUnderTest: "python_library",
		moduleTypeUnderTestFactory: python.PythonLibraryFactory,
		moduleTypeUnderTestBp2BuildMutator: python.PythonLibraryBp2Build,
		blueprint: `python_library {
		name: "reqd",
		srcs: ["src.py"],
		}

		filesystem: map[string]string{
		"data.bin": "",
		"src.py": "",
		},
		blueprint: simpleModuleDoNotConvertBp2build("python_library", "reqd") + `
		python_library {
		name: "fg_foo",
		data: ["data.bin"],
		@@ -1378,23 +1307,13 @@ python_library {
		bazel_module: { bp2build_available: true },
		}`,
		expectedBazelTargets: []string{
		`py_library(
		name = "fg_foo",
		data = [
		makeBazelTarget("py_library", "fg_foo", map[string]string{
		"data": `[
		"data.bin",
		":reqd",
		],
		srcs_version = "PY3",
		)`,
		`py_library(
		name = "reqd",
		srcs = ["src.py"],
		srcs_version = "PY3",
		)`,
		},
		filesystem: map[string]string{
		"data.bin": "",
		"src.py": "",
		]`,
		"srcs_version": `"PY3"`,
		}),
		},
		},
		{
		@@ -1402,28 +1321,23 @@ python_library {
		moduleTypeUnderTest: "filegroup",
		moduleTypeUnderTestFactory: android.FileGroupFactory,
		moduleTypeUnderTestBp2BuildMutator: android.FilegroupBp2Build,
		blueprint: `filegroup {
		name: "reqd"
		}
		blueprint: simpleModuleDoNotConvertBp2build("filegroup", "reqd") + `
		filegroup {
		name: "fg_foo",
		required: ["reqd"],
		bazel_module: { bp2build_available: true },
		}`,
		expectedBazelTargets: []string{
		`filegroup(
		name = "fg_foo",
		data = [":reqd"],
		)`,
		`filegroup(
		name = "reqd",
		)`,
		makeBazelTarget("filegroup", "fg_foo", map[string]string{
		"data": `[":reqd"]`,
		}),
		},
		filesystem: map[string]string{},
		},
		}

		for _, test := range testCases {
		runBp2BuildTestCaseSimple(t, test)
		for _, tc := range testCases {
		t.Run(tc.description, func(t *testing.T) {
		runBp2BuildTestCaseSimple(t, tc)
		})
		}
		}

bp2build/cc_binary_conversion_test.go

+139 −124

File changed.

Preview size limit exceeded, changes collapsed.