summaryrefslogtreecommitdiff
path: root/java/java_test.go
diff options
context:
space:
mode:
authorPete Gillin <peteg@google.com>2019-05-10 05:22:48 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-05-10 05:22:48 -0700
commit2c18ebd83cc0ab0a0e42b468fe195e2b9352f830 (patch)
treefd84ff4948bfa46cb20a115cee4c02d65b168603 /java/java_test.go
parentf8eb90728ab41f188c8b6970e0d20a21a95b2a3a (diff)
parent350f0987bf6cd23519fd620f454f0286da25a16f (diff)
Merge "Rename EXPERIMENTAL_USE_OPENJDK9 to EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9." am: 42e862c56d
am: 350f0987bf Change-Id: Ibfc75aa4c4356d86cf7ce80becff0cf92cf98e14
Diffstat (limited to 'java/java_test.go')
-rw-r--r--java/java_test.go10
1 files changed, 5 insertions, 5 deletions
diff --git a/java/java_test.go b/java/java_test.go
index faf6abf6b..ae2e68ed1 100644
--- a/java/java_test.go
+++ b/java/java_test.go
@@ -1007,8 +1007,8 @@ func TestPatchModule(t *testing.T) {
}
`
- t.Run("1.8", func(t *testing.T) {
- // Test default javac 1.8
+ t.Run("Java language level 8", func(t *testing.T) {
+ // Test default javac -source 1.8 -target 1.8
ctx := testJava(t, bp)
checkPatchModuleFlag(t, ctx, "foo", "")
@@ -1016,9 +1016,9 @@ func TestPatchModule(t *testing.T) {
checkPatchModuleFlag(t, ctx, "baz", "")
})
- t.Run("1.9", func(t *testing.T) {
- // Test again with javac 1.9
- config := testConfig(map[string]string{"EXPERIMENTAL_USE_OPENJDK9": "true"})
+ t.Run("Java language level 9", func(t *testing.T) {
+ // Test again with javac -source 9 -target 9
+ config := testConfig(map[string]string{"EXPERIMENTAL_JAVA_LANGUAGE_LEVEL_9": "true"})
ctx := testContext(config, bp, nil)
run(t, ctx, config)