diff options
| author | 2021-04-01 14:34:02 +0000 | |
|---|---|---|
| committer | 2021-04-01 14:34:02 +0000 | |
| commit | 379f36b6e5710f33504d2609a11462643f423d46 (patch) | |
| tree | 2424d4954c527945877a2b5beb61bcc4eaff0f3c /java/sdk_test.go | |
| parent | 6f773143811e74bf8d1a2607399c211d9ca60817 (diff) | |
| parent | 79abe57f534771027ca77ea01a274d306a82f394 (diff) | |
Merge changes Idc01d3cc,I644db99c
* changes:
Remove FixturePreparer.Extend()
Remove FixtureFactory
Diffstat (limited to 'java/sdk_test.go')
| -rw-r--r-- | java/sdk_test.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/java/sdk_test.go b/java/sdk_test.go index e1ec41bdc..2b1846592 100644 --- a/java/sdk_test.go +++ b/java/sdk_test.go @@ -402,14 +402,16 @@ func TestClasspath(t *testing.T) { // Test again with PLATFORM_VERSION_CODENAME=REL, javac -source 8 -target 8 t.Run("REL + Java language level 8", func(t *testing.T) { - result := fixtureFactory.Extend(prepareWithPlatformVersionRel).RunTestWithBp(t, bpJava8) + result := android.GroupFixturePreparers( + fixtureFactory, prepareWithPlatformVersionRel).RunTestWithBp(t, bpJava8) checkClasspath(t, result, true /* isJava8 */) }) // Test again with PLATFORM_VERSION_CODENAME=REL, javac -source 9 -target 9 t.Run("REL + Java language level 9", func(t *testing.T) { - result := fixtureFactory.Extend(prepareWithPlatformVersionRel).RunTestWithBp(t, bp) + result := android.GroupFixturePreparers( + fixtureFactory, prepareWithPlatformVersionRel).RunTestWithBp(t, bp) checkClasspath(t, result, false /* isJava8 */) }) |