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

Commit 132c3e61 authored by Paul Duffin's avatar Paul Duffin
Browse files

Run TestClasspath test cases with Always_use_prebuilt_sdks=true/false 

Previously, the TestClasspath test cases were only run with the default
setting of Always_use_prebuilt_sdks=false. That meant that some of the
code under test that depended on the setting of that variable was not
tested properly.

This change runs the test cases m with Always_use_prebuilt_sdks=true as
well. Those test cases whose behavior depends on the setting of that
variable are split into two separate test cases, each of which only
runs with the appropriate setting of that variable. All other test
cases are run for both settings of the variable.

That revealed a slight issue with the test setup (a missing
prebuilts/sdk/public/core/android.jar file) which broke the
core_current test when run with Always_use_prebuilt_sdks=true which has
also been fixed.

Bug: 204189791
Test: m nothing
Change-Id: If2ea3fde40c7573262e93691af0b5a57e4d54469
parent 0b3b36a4

java/sdk_test.go

+113 −4
Original line number Diff line number Diff line
@@ -43,6 +43,13 @@ type classpathTestCase struct { 
	forces8 bool // if set, javac will always be called with java 8 arguments



	aidl string



	// Indicates how this test case is affected by the setting of Always_use_prebuilt_sdks.

	//

	// If this is nil then the test case is unaffected by the setting of Always_use_prebuilt_sdks.

	// Otherwise, the test case can only be used when

	// Always_use_prebuilt_sdks=*forAlwaysUsePrebuiltSdks.

	forAlwaysUsePrebuiltSdks *bool

}



func TestClasspath(t *testing.T) {
@@ -93,6 +100,8 @@ func TestClasspath(t *testing.T) { 
			aidl:           "-pprebuilts/sdk/30/public/framework.aidl",

		},

		{

			// Test case only applies when Always_use_prebuilt_sdks=false (the default).

			forAlwaysUsePrebuiltSdks: proptools.BoolPtr(false),



			name:           "current",

			properties:     `sdk_version: "current",`,
@@ -102,6 +111,20 @@ func TestClasspath(t *testing.T) { 
			aidl:           "-pout/soong/framework.aidl",

		},

		{

			// Test case only applies when Always_use_prebuilt_sdks=true.

			forAlwaysUsePrebuiltSdks: proptools.BoolPtr(true),



			name:           "current",

			properties:     `sdk_version: "current",`,

			bootclasspath:  []string{`""`},

			system:         "sdk_public_current_system_modules",

			java8classpath: []string{"prebuilts/sdk/current/public/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"},

			java9classpath: []string{"prebuilts/sdk/current/public/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"},

			aidl:           "-pprebuilts/sdk/current/public/framework.aidl",

		},

		{

			// Test case only applies when Always_use_prebuilt_sdks=false (the default).

			forAlwaysUsePrebuiltSdks: proptools.BoolPtr(false),



			name:           "system_current",

			properties:     `sdk_version: "system_current",`,
@@ -111,7 +134,18 @@ func TestClasspath(t *testing.T) { 
			aidl:           "-pout/soong/framework.aidl",

		},

		{

			// Test case only applies when Always_use_prebuilt_sdks=true.

			forAlwaysUsePrebuiltSdks: proptools.BoolPtr(true),



			name:           "system_current",

			properties:     `sdk_version: "system_current",`,

			bootclasspath:  []string{`""`},

			system:         "sdk_public_current_system_modules",

			java8classpath: []string{"prebuilts/sdk/current/system/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"},

			java9classpath: []string{"prebuilts/sdk/current/system/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"},

			aidl:           "-pprebuilts/sdk/current/public/framework.aidl",

		},

		{

			name:           "system_29",

			properties:     `sdk_version: "system_29",`,

			bootclasspath:  []string{`""`},
@@ -120,7 +154,6 @@ func TestClasspath(t *testing.T) { 
			aidl:           "-pprebuilts/sdk/29/public/framework.aidl",

		},

		{



			name:           "system_30",

			properties:     `sdk_version: "system_30",`,

			bootclasspath:  []string{`""`},
@@ -130,6 +163,9 @@ func TestClasspath(t *testing.T) { 
			aidl:           "-pprebuilts/sdk/30/public/framework.aidl",

		},

		{

			// Test case only applies when Always_use_prebuilt_sdks=false (the default).

			forAlwaysUsePrebuiltSdks: proptools.BoolPtr(false),



			name:           "test_current",

			properties:     `sdk_version: "test_current",`,

			bootclasspath:  []string{"android_test_stubs_current", "core-lambda-stubs"},
@@ -137,6 +173,18 @@ func TestClasspath(t *testing.T) { 
			java9classpath: []string{"android_test_stubs_current"},

			aidl:           "-pout/soong/framework.aidl",

		},

		{

			// Test case only applies when Always_use_prebuilt_sdks=true.

			forAlwaysUsePrebuiltSdks: proptools.BoolPtr(true),



			name:           "test_current",

			properties:     `sdk_version: "test_current",`,

			bootclasspath:  []string{`""`},

			system:         "sdk_public_current_system_modules",

			java8classpath: []string{"prebuilts/sdk/current/test/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"},

			java9classpath: []string{"prebuilts/sdk/current/test/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"},

			aidl:           "-pprebuilts/sdk/current/public/framework.aidl",

		},

		{

			name:           "test_30",

			properties:     `sdk_version: "test_30",`,
@@ -147,12 +195,26 @@ func TestClasspath(t *testing.T) { 
			aidl:           "-pprebuilts/sdk/30/public/framework.aidl",

		},

		{

			// Test case only applies when Always_use_prebuilt_sdks=false (the default).

			forAlwaysUsePrebuiltSdks: proptools.BoolPtr(false),



			name:          "core_current",

			properties:    `sdk_version: "core_current",`,

			bootclasspath: []string{"core.current.stubs", "core-lambda-stubs"},

			system:        "core-current-stubs-system-modules",

		},

		{

			// Test case only applies when Always_use_prebuilt_sdks=true.

			forAlwaysUsePrebuiltSdks: proptools.BoolPtr(true),



			name:           "core_current",

			properties:     `sdk_version: "core_current",`,

			bootclasspath:  []string{`""`},

			system:         "sdk_public_current_system_modules",

			java8classpath: []string{"prebuilts/sdk/current/core/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"},

			java9classpath: []string{"prebuilts/sdk/current/core/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"},

			aidl:           "-pprebuilts/sdk/current/public/framework.aidl",

		},

		{



			name:           "nostdlib",
@@ -224,8 +286,10 @@ func TestClasspath(t *testing.T) { 
			java9classpath: []string{"prebuilts/sdk/current/public/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"},

			aidl:           "-pprebuilts/sdk/current/public/framework.aidl",

		},



		{

			// Test case only applies when Always_use_prebuilt_sdks=false (the default).

			forAlwaysUsePrebuiltSdks: proptools.BoolPtr(false),



			name:           "module_current",

			properties:     `sdk_version: "module_current",`,

			bootclasspath:  []string{"android_module_lib_stubs_current", "core-lambda-stubs"},
@@ -233,6 +297,18 @@ func TestClasspath(t *testing.T) { 
			java9classpath: []string{"android_module_lib_stubs_current"},

			aidl:           "-pout/soong/framework_non_updatable.aidl",

		},

		{

			// Test case only applies when Always_use_prebuilt_sdks=true.

			forAlwaysUsePrebuiltSdks: proptools.BoolPtr(true),



			name:           "module_current",

			properties:     `sdk_version: "module_current",`,

			bootclasspath:  []string{`""`},

			system:         "sdk_public_current_system_modules",

			java8classpath: []string{"prebuilts/sdk/current/module-lib/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"},

			java9classpath: []string{"prebuilts/sdk/current/module-lib/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"},

			aidl:           "-pprebuilts/sdk/current/public/framework.aidl",

		},

		{

			name:           "module_30",

			properties:     `sdk_version: "module_30",`,
@@ -261,6 +337,9 @@ func TestClasspath(t *testing.T) { 
			aidl:           "-pprebuilts/sdk/32/public/framework.aidl",

		},

		{

			// Test case only applies when Always_use_prebuilt_sdks=false (the default).

			forAlwaysUsePrebuiltSdks: proptools.BoolPtr(false),



			name:           "system_server_current",

			properties:     `sdk_version: "system_server_current",`,

			bootclasspath:  []string{"android_system_server_stubs_current", "core-lambda-stubs"},
@@ -268,6 +347,18 @@ func TestClasspath(t *testing.T) { 
			java9classpath: []string{"android_system_server_stubs_current"},

			aidl:           "-pout/soong/framework.aidl",

		},

		{

			// Test case only applies when Always_use_prebuilt_sdks=true.

			forAlwaysUsePrebuiltSdks: proptools.BoolPtr(true),



			name:           "system_server_current",

			properties:     `sdk_version: "system_server_current",`,

			bootclasspath:  []string{`""`},

			system:         "sdk_public_current_system_modules",

			java8classpath: []string{"prebuilts/sdk/current/system-server/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"},

			java9classpath: []string{"prebuilts/sdk/current/system-server/android.jar", "prebuilts/sdk/tools/core-lambda-stubs.jar"},

			aidl:           "-pprebuilts/sdk/current/public/framework.aidl",

		},

		{

			name:           "system_server_30",

			properties:     `sdk_version: "system_server_30",`,
@@ -297,11 +388,21 @@ func TestClasspath(t *testing.T) { 
		},

	}



	testClasspathTestCases(t, classpathTestcases)

	t.Run("basic", func(t *testing.T) {

		testClasspathTestCases(t, classpathTestcases, false)

	})



	t.Run("Always_use_prebuilt_sdks=true", func(t *testing.T) {

		testClasspathTestCases(t, classpathTestcases, true)

	})

}



func testClasspathTestCases(t *testing.T, classpathTestcases []classpathTestCase) {

func testClasspathTestCases(t *testing.T, classpathTestcases []classpathTestCase, alwaysUsePrebuiltSdks bool) {

	for _, testcase := range classpathTestcases {

		if testcase.forAlwaysUsePrebuiltSdks != nil && *testcase.forAlwaysUsePrebuiltSdks != alwaysUsePrebuiltSdks {

			continue

		}



		t.Run(testcase.name, func(t *testing.T) {

			moduleType := "java_library"

			if testcase.moduleType != "" {
@@ -421,6 +522,13 @@ func testClasspathTestCases(t *testing.T, classpathTestcases []classpathTestCase 
				android.AssertPathsRelativeToTopEquals(t, "implicits", deps, javac.Implicits)

			}



			preparer := android.NullFixturePreparer

			if alwaysUsePrebuiltSdks {

				preparer = android.FixtureModifyProductVariables(func(variables android.FixtureProductVariables) {

					variables.Always_use_prebuilt_sdks = proptools.BoolPtr(true)

				})

			}



			fixtureFactory := android.GroupFixturePreparers(

				prepareForJavaTest,

				FixtureWithPrebuiltApis(map[string][]string{
@@ -441,6 +549,7 @@ func testClasspathTestCases(t *testing.T, classpathTestcases []classpathTestCase 
						env["ANDROID_JAVA8_HOME"] = "jdk8"

					}

				}),

				preparer,

			)



			// Test with legacy javac -source 1.8 -target 1.8

java/testing.go

+3 −0
Original line number Diff line number Diff line
@@ -181,6 +181,9 @@ func prebuiltApisFilesForLibs(apiLevels []string, sdkLibs []string) map[string][ 
				}

			}

		}

		if level == "current" {

			fs["prebuilts/sdk/current/core/android.jar"] = nil

		}

		fs[fmt.Sprintf("prebuilts/sdk/%s/public/framework.aidl", level)] = nil

	}

	return fs