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

Commit e06d75be authored by Alix's avatar Alix Committed by Alix Espino
Browse files

Exporting MakeBazelTarget() in testing.go 

Since we are putting conversion tests in the same
package as the module being converted from now on

Test: m bp2build
Change-Id: Ied53589d497fef70bfa11d8f6067459c9a50cd72
parent bf9c26c3

bp2build/aar_conversion_test.go

+2 −2
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ android_library { 
}

`,

		ExpectedBazelTargets: []string{

			makeBazelTarget(

			MakeBazelTarget(

				"android_library",

				"TestLib",

				AttrNameToString{
@@ -120,7 +120,7 @@ android_library_import { 
}

`,

			ExpectedBazelTargets: []string{

				makeBazelTarget(

				MakeBazelTarget(

					"aar_import",

					"TestImport",

					AttrNameToString{

bp2build/android_app_conversion_test.go

+3 −3
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ android_app { 
}

`,

		ExpectedBazelTargets: []string{

			makeBazelTarget("android_binary", "TestApp", AttrNameToString{

			MakeBazelTarget("android_binary", "TestApp", AttrNameToString{

				"srcs":           `["app.java"]`,

				"manifest":       `"AndroidManifest.xml"`,

				"resource_files": `["res/res.png"]`,
@@ -79,7 +79,7 @@ android_app { 
}

`,

		ExpectedBazelTargets: []string{

			makeBazelTarget("android_binary", "TestApp", AttrNameToString{

			MakeBazelTarget("android_binary", "TestApp", AttrNameToString{

				"srcs":     `["app.java"]`,

				"manifest": `"manifest/AndroidManifest.xml"`,

				"resource_files": `[
@@ -119,7 +119,7 @@ android_app { 
}

`,

		ExpectedBazelTargets: []string{

			makeBazelTarget("android_binary", "TestApp", AttrNameToString{

			MakeBazelTarget("android_binary", "TestApp", AttrNameToString{

				"srcs": `select({

        "//build/bazel/platforms/arch:arm": ["arm.java"],

        "//build/bazel/platforms/arch:x86": ["x86.java"],

bp2build/apex_conversion_test.go

+21 −21
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ apex { 
}

`,

		ExpectedBazelTargets: []string{

			makeBazelTarget("apex", "com.android.apogee", AttrNameToString{

			MakeBazelTarget("apex", "com.android.apogee", AttrNameToString{

				"android_manifest": `"ApogeeAndroidManifest.xml"`,

				"binaries": `[

        ":cc_binary_1",
@@ -203,7 +203,7 @@ apex { 
}

`,

		ExpectedBazelTargets: []string{

			makeBazelTarget("apex", "com.android.apogee", AttrNameToString{

			MakeBazelTarget("apex", "com.android.apogee", AttrNameToString{

				"file_contexts": `"//a/b:com.android.apogee-file_contexts"`,

				"manifest":      `"apex_manifest.json"`,

			}),
@@ -223,7 +223,7 @@ apex { 
}

`,

		ExpectedBazelTargets: []string{

			makeBazelTarget("apex", "com.android.apogee", AttrNameToString{

			MakeBazelTarget("apex", "com.android.apogee", AttrNameToString{

				"file_contexts": `"file_contexts_file"`,

				"manifest":      `"apex_manifest.json"`,

			}),
@@ -252,7 +252,7 @@ apex { 
}

`,

		ExpectedBazelTargets: []string{

			makeBazelTarget("apex", "com.android.apogee", AttrNameToString{

			MakeBazelTarget("apex", "com.android.apogee", AttrNameToString{

				"file_contexts": `"//system/sepolicy/apex:com.android.apogee-file_contexts"`,

				"manifest":      `"apex_manifest.json"`,

			}),
@@ -275,7 +275,7 @@ filegroup { 
		},

		Blueprint: createMultilibBlueprint("both"),

		ExpectedBazelTargets: []string{

			makeBazelTarget("apex", "com.android.apogee", AttrNameToString{

			MakeBazelTarget("apex", "com.android.apogee", AttrNameToString{

				"native_shared_libs_32": `[

        ":native_shared_lib_1",

        ":native_shared_lib_3",
@@ -319,7 +319,7 @@ filegroup { 
		},

		Blueprint: createMultilibBlueprint("first"),

		ExpectedBazelTargets: []string{

			makeBazelTarget("apex", "com.android.apogee", AttrNameToString{

			MakeBazelTarget("apex", "com.android.apogee", AttrNameToString{

				"native_shared_libs_32": `select({

        "//build/bazel/platforms/arch:arm": [

            ":native_shared_lib_1",
@@ -368,7 +368,7 @@ filegroup { 
		},

		Blueprint: createMultilibBlueprint("32"),

		ExpectedBazelTargets: []string{

			makeBazelTarget("apex", "com.android.apogee", AttrNameToString{

			MakeBazelTarget("apex", "com.android.apogee", AttrNameToString{

				"native_shared_libs_32": `[

        ":native_shared_lib_1",

        ":native_shared_lib_3",
@@ -399,7 +399,7 @@ filegroup { 
		},

		Blueprint: createMultilibBlueprint("64"),

		ExpectedBazelTargets: []string{

			makeBazelTarget("apex", "com.android.apogee", AttrNameToString{

			MakeBazelTarget("apex", "com.android.apogee", AttrNameToString{

				"native_shared_libs_64": `select({

        "//build/bazel/platforms/arch:arm64": [

            ":native_shared_lib_1",
@@ -439,7 +439,7 @@ apex { 
	manifest: "apogee_manifest.json",

}

`,

		ExpectedBazelTargets: []string{makeBazelTarget("apex", "com.android.apogee", AttrNameToString{

		ExpectedBazelTargets: []string{MakeBazelTarget("apex", "com.android.apogee", AttrNameToString{

			"manifest":      `"apogee_manifest.json"`,

			"file_contexts": `"//system/sepolicy/apex:com.android.apogee-file_contexts"`,

		}),
@@ -467,7 +467,7 @@ apex { 
	bazel_module: { bp2build_available: true },

}

`,

		ExpectedBazelTargets: []string{makeBazelTarget("apex", "apogee", AttrNameToString{

		ExpectedBazelTargets: []string{MakeBazelTarget("apex", "apogee", AttrNameToString{

			"manifest":      `"manifest.json"`,

			"file_contexts": `"//system/sepolicy/apex:apogee-file_contexts"`,

		}),
@@ -624,7 +624,7 @@ override_apex { 
}

`,

		ExpectedBazelTargets: []string{

			makeBazelTarget("apex", "com.google.android.apogee", AttrNameToString{

			MakeBazelTarget("apex", "com.google.android.apogee", AttrNameToString{

				"android_manifest": `"ApogeeAndroidManifest.xml"`,

				"binaries": `[

        ":cc_binary_1",
@@ -684,7 +684,7 @@ override_apex { 
}

`,

		ExpectedBazelTargets: []string{

			makeBazelTarget("apex", "com.google.android.apogee", AttrNameToString{

			MakeBazelTarget("apex", "com.google.android.apogee", AttrNameToString{

				"file_contexts": `"//system/sepolicy/apex:com.android.apogee-file_contexts"`,

				"manifest":      `"//a/b:apex_manifest.json"`,

			}),
@@ -718,7 +718,7 @@ override_apex { 
}

`,

		ExpectedBazelTargets: []string{

			makeBazelTarget("apex", "com.google.android.apogee", AttrNameToString{

			MakeBazelTarget("apex", "com.google.android.apogee", AttrNameToString{

				"file_contexts": `"//system/sepolicy/apex:com.android.apogee-file_contexts"`,

				"manifest":      `"//a/b:apogee_manifest.json"`,

			}),
@@ -750,7 +750,7 @@ override_apex { 
}

`,

		ExpectedBazelTargets: []string{

			makeBazelTarget("apex", "com.google.android.apogee", AttrNameToString{

			MakeBazelTarget("apex", "com.google.android.apogee", AttrNameToString{

				"file_contexts": `"//system/sepolicy/apex:com.android.apogee-file_contexts"`,

				"manifest":      `"apex_manifest.json"`,

			}),
@@ -783,7 +783,7 @@ override_apex { 
}

`,

		ExpectedBazelTargets: []string{

			makeBazelTarget("apex", "com.google.android.apogee", AttrNameToString{

			MakeBazelTarget("apex", "com.google.android.apogee", AttrNameToString{

				"file_contexts": `"//system/sepolicy/apex:com.android.apogee-file_contexts"`,

				"manifest":      `"apogee_manifest.json"`,

			}),
@@ -816,7 +816,7 @@ override_apex { 
}

`,

		ExpectedBazelTargets: []string{

			makeBazelTarget("apex", "com.google.android.apogee", AttrNameToString{

			MakeBazelTarget("apex", "com.google.android.apogee", AttrNameToString{

				"file_contexts": `"//system/sepolicy/apex:com.android.apogee-file_contexts"`,

				"manifest":      `"apex_manifest.json"`,

				"package_name":  `"com.google.android.apogee"`,
@@ -855,7 +855,7 @@ override_apex { 
}

`,

		ExpectedBazelTargets: []string{

			makeBazelTarget("apex", "com.google.android.apogee", AttrNameToString{

			MakeBazelTarget("apex", "com.google.android.apogee", AttrNameToString{

				"file_contexts": `"//system/sepolicy/apex:com.android.apogee-file_contexts"`,

				"manifest":      `"apex_manifest.json"`,

				"prebuilts":     `[":prebuilt_file"]`,
@@ -900,7 +900,7 @@ override_apex { 
}

`,

		ExpectedBazelTargets: []string{

			makeBazelTarget("apex", "com.google.android.apogee", AttrNameToString{

			MakeBazelTarget("apex", "com.google.android.apogee", AttrNameToString{

				"file_contexts": `"//system/sepolicy/apex:com.android.apogee-file_contexts"`,

				"manifest":      `"apex_manifest.json"`,

				"prebuilts":     `[":prebuilt_file2"]`,
@@ -940,7 +940,7 @@ override_apex { 
}

`,

		ExpectedBazelTargets: []string{

			makeBazelTarget("apex", "com.google.android.apogee", AttrNameToString{

			MakeBazelTarget("apex", "com.google.android.apogee", AttrNameToString{

				"file_contexts": `"//system/sepolicy/apex:com.android.apogee-file_contexts"`,

				"manifest":      `"apex_manifest.json"`,

				"prebuilts":     `[]`,
@@ -974,7 +974,7 @@ override_apex { 
}

`,

		ExpectedBazelTargets: []string{

			makeBazelTarget("apex", "com.google.android.apogee", AttrNameToString{

			MakeBazelTarget("apex", "com.google.android.apogee", AttrNameToString{

				"file_contexts":  `"//system/sepolicy/apex:com.android.apogee-file_contexts"`,

				"manifest":       `"apex_manifest.json"`,

				"logging_parent": `"foo.bar.baz"`,
@@ -1009,7 +1009,7 @@ override_apex { 
}

`,

		ExpectedBazelTargets: []string{

			makeBazelTarget("apex", "com.google.android.apogee", AttrNameToString{

			MakeBazelTarget("apex", "com.google.android.apogee", AttrNameToString{

				"file_contexts":  `"//system/sepolicy/apex:com.android.apogee-file_contexts"`,

				"manifest":       `"apex_manifest.json"`,

				"logging_parent": `"foo.bar.baz.override"`,

bp2build/build_conversion_test.go

+16 −16
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ func TestGenerateBazelTargetModules(t *testing.T) { 
    bazel_module: { bp2build_available: true },

}`,

			ExpectedBazelTargets: []string{

				makeBazelTarget("custom", "foo", AttrNameToString{

				MakeBazelTarget("custom", "foo", AttrNameToString{

					"string_literal_prop": `""`,

				}),

			},
@@ -251,7 +251,7 @@ func TestGenerateBazelTargetModules(t *testing.T) { 
    bazel_module: { bp2build_available: true },

}`,

			ExpectedBazelTargets: []string{

				makeBazelTarget("custom", "foo", AttrNameToString{

				MakeBazelTarget("custom", "foo", AttrNameToString{

					"string_literal_prop": `"PROP"`,

				}),

			},
@@ -267,7 +267,7 @@ func TestGenerateBazelTargetModules(t *testing.T) { 
    bazel_module: { bp2build_available: true },

}`,

			ExpectedBazelTargets: []string{

				makeBazelTarget("custom", "foo", AttrNameToString{

				MakeBazelTarget("custom", "foo", AttrNameToString{

					"string_literal_prop": `select({

        "//build/bazel/platforms/arch:arm": "ARM",

        "//build/bazel/platforms/arch:arm64": "ARM64",
@@ -284,7 +284,7 @@ func TestGenerateBazelTargetModules(t *testing.T) { 
    bazel_module: { bp2build_available: true },

}`,

			ExpectedBazelTargets: []string{

				makeBazelTarget("custom", "foo", AttrNameToString{

				MakeBazelTarget("custom", "foo", AttrNameToString{

					"string_ptr_prop": `""`,

				}),

			},
@@ -298,7 +298,7 @@ func TestGenerateBazelTargetModules(t *testing.T) { 
    bazel_module: { bp2build_available: true },

}`,

			ExpectedBazelTargets: []string{

				makeBazelTarget("custom", "foo", AttrNameToString{

				MakeBazelTarget("custom", "foo", AttrNameToString{

					"string_list_prop": `[

        "a",

        "b",
@@ -316,7 +316,7 @@ func TestGenerateBazelTargetModules(t *testing.T) { 
    bazel_module: { bp2build_available: true },

}`,

			ExpectedBazelTargets: []string{

				makeBazelTarget("custom", "foo", AttrNameToString{

				MakeBazelTarget("custom", "foo", AttrNameToString{

					"string_list_prop": `[

        "\t",

        "\n",
@@ -339,10 +339,10 @@ custom { 
  bazel_module: { bp2build_available: true },

}`,

			ExpectedBazelTargets: []string{

				makeBazelTarget("custom", "dep", AttrNameToString{

				MakeBazelTarget("custom", "dep", AttrNameToString{

					"arch_paths": `["abc"]`,

				}),

				makeBazelTarget("custom", "has_dep", AttrNameToString{

				MakeBazelTarget("custom", "has_dep", AttrNameToString{

					"arch_paths": `[":dep"]`,

				}),

			},
@@ -355,7 +355,7 @@ custom { 
  bazel_module: { bp2build_available: true },

}`,

			ExpectedBazelTargets: []string{

				makeBazelTarget("custom", "has_dep", AttrNameToString{

				MakeBazelTarget("custom", "has_dep", AttrNameToString{

					"arch_paths": `[":dep__BP2BUILD__MISSING__DEP"]`,

				}),

			},
@@ -391,7 +391,7 @@ custom { 
    bazel_module: { bp2build_available: true },

}`,

			ExpectedBazelTargets: []string{

				makeBazelTarget("custom", "arch_paths", AttrNameToString{

				MakeBazelTarget("custom", "arch_paths", AttrNameToString{

					"arch_paths": `select({

        "//build/bazel/platforms/arch:arm": [

            "arm.txt",
@@ -469,10 +469,10 @@ custom { 
    bazel_module: { bp2build_available: true },

}`,

			ExpectedBazelTargets: []string{

				makeBazelTarget("custom", "dep", AttrNameToString{

				MakeBazelTarget("custom", "dep", AttrNameToString{

					"arch_paths": `["abc"]`,

				}),

				makeBazelTarget("custom", "has_dep", AttrNameToString{

				MakeBazelTarget("custom", "has_dep", AttrNameToString{

					"arch_paths": `select({

        "//build/bazel/platforms/arch:x86": [":dep"],

        "//conditions:default": [],
@@ -488,7 +488,7 @@ custom { 
    bazel_module: { bp2build_available: true },

}`,

			ExpectedBazelTargets: []string{

				makeBazelTarget("custom", "embedded_props", AttrNameToString{

				MakeBazelTarget("custom", "embedded_props", AttrNameToString{

					"embedded_attr": `"abc"`,

				}),

			},
@@ -501,7 +501,7 @@ custom { 
    bazel_module: { bp2build_available: true },

}`,

			ExpectedBazelTargets: []string{

				makeBazelTarget("custom", "ptr_to_embedded_props", AttrNameToString{

				MakeBazelTarget("custom", "ptr_to_embedded_props", AttrNameToString{

					"other_embedded_attr": `"abc"`,

				}),

			},
@@ -1536,7 +1536,7 @@ python_library { 
    bazel_module: { bp2build_available: true },

}`,

			ExpectedBazelTargets: []string{

				makeBazelTarget("py_library", "fg_foo", map[string]string{

				MakeBazelTarget("py_library", "fg_foo", map[string]string{

					"data": `select({

        "//build/bazel/platforms/arch:arm": [":reqdarm"],

        "//build/bazel/platforms/arch:x86": [":reqdx86"],
@@ -1563,7 +1563,7 @@ python_library { 
    bazel_module: { bp2build_available: true },

}`,

			ExpectedBazelTargets: []string{

				makeBazelTarget("py_library", "fg_foo", map[string]string{

				MakeBazelTarget("py_library", "fg_foo", map[string]string{

					"data": `[

        "data.bin",

        ":reqd",

bp2build/cc_library_conversion_test.go

+85 −85

File changed.

Preview size limit exceeded, changes collapsed.