Skip to content

Commit 69b2b71

Browse files
cushonError Prone Team
authored andcommitted
Fix another refaster test on JDK 9+
Use a package other than `java.util` to avoid compilation errors for a split module declaration. PiperOrigin-RevId: 386136580
1 parent c9e9bd6 commit 69b2b71

File tree

3 files changed

+12
-18
lines changed

3 files changed

+12
-18
lines changed

core/src/test/java/com/google/errorprone/refaster/testdata/input/SamePackageImportsTemplateExample.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,14 @@
1414
* limitations under the License.
1515
*/
1616

17-
package java.util;
18-
19-
import com.google.common.collect.Maps;
17+
package com.google.common.collect;
2018

2119
/**
2220
* Test data for {@code SamePackageImportsTemplate}.
2321
*/
2422
public class SamePackageImportsTemplateExample {
2523
public void example() {
26-
Map.Entry<String, Integer> entry = Maps.immutableEntry("foo", 3);
27-
System.out.println(entry);
24+
ImmutableMap.Builder<String, Integer> builder = ImmutableMap.builder();
25+
System.out.println(builder.build());
2826
}
2927
}

core/src/test/java/com/google/errorprone/refaster/testdata/output/SamePackageImportsTemplateExample.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,16 @@
1414
* limitations under the License.
1515
*/
1616

17-
package java.util;
17+
package com.google.common.collect;
1818

19-
import com.google.common.collect.Maps;
20-
21-
import java.util.AbstractMap.SimpleImmutableEntry;
19+
import com.google.common.collect.ImmutableMap.Builder;
2220

2321
/**
2422
* Test data for {@code SamePackageImportsTemplate}.
2523
*/
2624
public class SamePackageImportsTemplateExample {
2725
public void example() {
28-
Map.Entry<String, Integer> entry = new SimpleImmutableEntry<>("foo", 3);
29-
System.out.println(entry);
26+
ImmutableMap.Builder<String, Integer> builder = new Builder<>();
27+
System.out.println(builder.build());
3028
}
3129
}

core/src/test/java/com/google/errorprone/refaster/testdata/template/SamePackageImportsTemplate.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,22 @@
1616

1717
package com.google.errorprone.refaster.testdata.template;
1818

19-
import com.google.common.collect.Maps;
19+
import com.google.common.collect.ImmutableMap;
2020
import com.google.errorprone.refaster.ImportPolicy;
2121
import com.google.errorprone.refaster.annotation.AfterTemplate;
2222
import com.google.errorprone.refaster.annotation.BeforeTemplate;
2323
import com.google.errorprone.refaster.annotation.UseImportPolicy;
24-
import java.util.AbstractMap;
25-
import java.util.Map;
2624

2725
/** Sample template generating references to nested classes in java.util. */
2826
public class SamePackageImportsTemplate<K, V> {
2927
@BeforeTemplate
30-
Map.Entry<K, V> immutableEntry(K k, V v) {
31-
return Maps.immutableEntry(k, v);
28+
ImmutableMap.Builder<K, V> builderFactory() {
29+
return ImmutableMap.builder();
3230
}
3331

3432
@AfterTemplate
3533
@UseImportPolicy(ImportPolicy.IMPORT_CLASS_DIRECTLY)
36-
Map.Entry<K, V> abstractMapEntry(K k, V v) {
37-
return new AbstractMap.SimpleImmutableEntry<>(k, v);
34+
ImmutableMap.Builder<K, V> builderConstructor() {
35+
return new ImmutableMap.Builder<>();
3836
}
3937
}

0 commit comments

Comments
 (0)