Update the testing API to take both types of DataResource
Change-Id: Iadfbff8fa5524e3baee10e08b8c139d3c9126ff3
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/AdaptResourceFileContentsTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/AdaptResourceFileContentsTest.java
index 93b8ab3..4fc1925 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/AdaptResourceFileContentsTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/AdaptResourceFileContentsTest.java
@@ -40,7 +40,7 @@
.addOptionsModification(options -> options.dataResourceConsumer = dataResourceConsumer)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .addDataEntryResources(
+ .addDataResources(
DataEntryResource.fromString(
"foo.txt", Origin.unknown(), A.class.getTypeName(), B.class.getTypeName()))
.addKeepRules("-adaptresourcefilecontents foo.txt")
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/AdaptVerticallyMergedResourceFileContentsTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/AdaptVerticallyMergedResourceFileContentsTest.java
index f84ce34..c9edbf8 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/AdaptVerticallyMergedResourceFileContentsTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/AdaptVerticallyMergedResourceFileContentsTest.java
@@ -35,7 +35,7 @@
.addOptionsModification(options -> options.dataResourceConsumer = dataResourceConsumer)
.enableInliningAnnotations()
.enableNeverClassInliningAnnotations()
- .addDataEntryResources(
+ .addDataResources(
DataEntryResource.fromString(
"foo.txt",
Origin.unknown(),
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ServiceLoaderParentTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/ServiceLoaderParentTest.java
index 08fcebb..cf3fe25 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/ServiceLoaderParentTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/ServiceLoaderParentTest.java
@@ -31,7 +31,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
- .addDataEntryResources(
+ .addDataResources(
DataEntryResource.fromBytes(
StringUtils.lines(serviceImplementations).getBytes(),
"META-INF/services/" + A.class.getTypeName(),
diff --git a/src/test/java/com/android/tools/r8/classmerging/horizontal/ServiceLoaderTest.java b/src/test/java/com/android/tools/r8/classmerging/horizontal/ServiceLoaderTest.java
index 3327619..c457680 100644
--- a/src/test/java/com/android/tools/r8/classmerging/horizontal/ServiceLoaderTest.java
+++ b/src/test/java/com/android/tools/r8/classmerging/horizontal/ServiceLoaderTest.java
@@ -30,7 +30,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
.addKeepMainRule(Main.class)
- .addDataEntryResources(
+ .addDataResources(
DataEntryResource.fromBytes(
StringUtils.lines(serviceImplementations).getBytes(),
"META-INF/services/" + A.class.getTypeName(),
diff --git a/src/test/java/com/android/tools/r8/dexsplitter/R8FeatureSplitServiceLoaderTest.java b/src/test/java/com/android/tools/r8/dexsplitter/R8FeatureSplitServiceLoaderTest.java
index be5fb9b..6378873 100644
--- a/src/test/java/com/android/tools/r8/dexsplitter/R8FeatureSplitServiceLoaderTest.java
+++ b/src/test/java/com/android/tools/r8/dexsplitter/R8FeatureSplitServiceLoaderTest.java
@@ -54,7 +54,7 @@
.addKeepMainRule(Base.class)
.addFeatureSplit(
builder -> simpleSplitProvider(builder, feature1Path, temp, Feature3Dummy.class))
- .addDataEntryResources(
+ .addDataResources(
DataEntryResource.fromBytes(
StringUtils.lines(Feature1I.class.getTypeName(), Feature2I.class.getTypeName())
.getBytes(),
@@ -81,7 +81,7 @@
builder -> simpleSplitProvider(builder, feature1Path, temp, Feature1I.class))
.addFeatureSplit(
builder -> simpleSplitProvider(builder, feature2Path, temp, Feature2I.class))
- .addDataEntryResources(
+ .addDataResources(
DataEntryResource.fromBytes(
StringUtils.lines(Feature1I.class.getTypeName(), Feature2I.class.getTypeName())
.getBytes(),
diff --git a/src/test/java/com/android/tools/r8/optimize/serviceloader/MissingServiceClassTest.java b/src/test/java/com/android/tools/r8/optimize/serviceloader/MissingServiceClassTest.java
index d0fb8cf..be9a7ea 100644
--- a/src/test/java/com/android/tools/r8/optimize/serviceloader/MissingServiceClassTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/serviceloader/MissingServiceClassTest.java
@@ -47,7 +47,7 @@
testForR8(parameters.getBackend())
.addProgramClasses(TestClass.class)
.addKeepMainRule(TestClass.class)
- .addDataEntryResources(
+ .addDataResources(
DataEntryResource.fromBytes(
StringUtils.lines(ServiceImpl.class.getTypeName()).getBytes(),
AppServices.SERVICE_DIRECTORY_NAME + Service.class.getTypeName(),
diff --git a/src/test/java/com/android/tools/r8/optimize/serviceloader/MissingServiceClassWithFeatureTest.java b/src/test/java/com/android/tools/r8/optimize/serviceloader/MissingServiceClassWithFeatureTest.java
index 30c0a11..02f30ad 100644
--- a/src/test/java/com/android/tools/r8/optimize/serviceloader/MissingServiceClassWithFeatureTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/serviceloader/MissingServiceClassWithFeatureTest.java
@@ -39,7 +39,7 @@
.addKeepMainRule(TestClass.class)
.addKeepClassAndMembersRules(FeatureClass.class)
.addDontWarn(Service.class.getTypeName())
- .addDataEntryResources(
+ .addDataResources(
DataEntryResource.fromBytes(
StringUtils.lines("java.lang.Object").getBytes(),
AppServices.SERVICE_DIRECTORY_NAME + Service.class.getTypeName(),
diff --git a/src/test/java/com/android/tools/r8/optimize/serviceloader/MissingServiceImplementationClassTest.java b/src/test/java/com/android/tools/r8/optimize/serviceloader/MissingServiceImplementationClassTest.java
index 3ce012a..1e0f761 100644
--- a/src/test/java/com/android/tools/r8/optimize/serviceloader/MissingServiceImplementationClassTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/serviceloader/MissingServiceImplementationClassTest.java
@@ -59,7 +59,7 @@
.addDontWarn(ServiceImpl.class)
.addKeepMainRule(TestClass.class)
.addKeepClassAndMembersRulesWithAllowObfuscation(Service.class)
- .addDataEntryResources(
+ .addDataResources(
DataEntryResource.fromBytes(
StringUtils.lines(ServiceImpl.class.getTypeName()).getBytes(),
AppServices.SERVICE_DIRECTORY_NAME + Service.class.getTypeName(),
diff --git a/src/test/java/com/android/tools/r8/optimize/serviceloader/MissingServiceImplementationClassWithFeatureTest.java b/src/test/java/com/android/tools/r8/optimize/serviceloader/MissingServiceImplementationClassWithFeatureTest.java
index 54a4887..9401a7d 100644
--- a/src/test/java/com/android/tools/r8/optimize/serviceloader/MissingServiceImplementationClassWithFeatureTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/serviceloader/MissingServiceImplementationClassWithFeatureTest.java
@@ -39,7 +39,7 @@
.addDontWarn("MissingClass")
.addKeepMainRule(TestClass.class)
.addKeepClassAndMembersRules(FeatureClass.class)
- .addDataEntryResources(
+ .addDataResources(
DataEntryResource.fromBytes(
StringUtils.lines("MissingClass").getBytes(),
AppServices.SERVICE_DIRECTORY_NAME + Service.class.getTypeName(),
diff --git a/src/test/java/com/android/tools/r8/optimize/serviceloader/ServiceLoaderDesugaredLibraryTest.java b/src/test/java/com/android/tools/r8/optimize/serviceloader/ServiceLoaderDesugaredLibraryTest.java
index 22389b4..09b18be 100644
--- a/src/test/java/com/android/tools/r8/optimize/serviceloader/ServiceLoaderDesugaredLibraryTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/serviceloader/ServiceLoaderDesugaredLibraryTest.java
@@ -81,7 +81,7 @@
private void configureR8(R8TestBuilder<?, ?, ?> builder) {
// When testing R8 add the META-INF/services to the input to apply rewriting.
builder
- .addDataEntryResources(
+ .addDataResources(
DataEntryResource.fromBytes(servicesFile.getBytes(), servicesPath, Origin.unknown()))
.addKeepClassAndMembersRulesWithAllowObfuscation(SimpleChronology.class);
}
diff --git a/src/test/java/com/android/tools/r8/optimize/serviceloader/ServiceLoaderRewritingLineSeparatorTest.java b/src/test/java/com/android/tools/r8/optimize/serviceloader/ServiceLoaderRewritingLineSeparatorTest.java
index c142442..0e39082 100644
--- a/src/test/java/com/android/tools/r8/optimize/serviceloader/ServiceLoaderRewritingLineSeparatorTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/serviceloader/ServiceLoaderRewritingLineSeparatorTest.java
@@ -60,7 +60,7 @@
serviceLoaderTest(null)
.addInnerClasses(ServiceLoaderRewritingTest.class)
.addKeepMainRule(ServiceLoaderRewritingTest.MainRunner.class)
- .addDataEntryResources(
+ .addDataResources(
DataEntryResource.fromBytes(
StringUtils.join(
lineSeparator.getSeparator(),
diff --git a/src/test/java/com/android/tools/r8/optimize/serviceloader/ServiceLoaderTest.java b/src/test/java/com/android/tools/r8/optimize/serviceloader/ServiceLoaderTest.java
index f8a8952..88fce62 100644
--- a/src/test/java/com/android/tools/r8/optimize/serviceloader/ServiceLoaderTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/serviceloader/ServiceLoaderTest.java
@@ -79,7 +79,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(ServiceLoaderTest.class)
.addKeepMainRule(TestClass.class)
- .addDataEntryResources(
+ .addDataResources(
DataEntryResource.fromBytes(
StringUtils.lines(serviceImplementations).getBytes(),
"META-INF/services/" + Greeter.class.getTypeName(),
@@ -180,7 +180,7 @@
testForR8(parameters.getBackend())
.addInnerClasses(ServiceLoaderTest.class)
.addKeepMainRule(OtherTestClass.class)
- .addDataEntryResources(
+ .addDataResources(
DataEntryResource.fromBytes(
StringUtils.lines(serviceImplementations).getBytes(),
"META-INF/services/" + Greeter.class.getTypeName(),
diff --git a/src/test/java/com/android/tools/r8/optimize/serviceloader/ServiceLoaderTestBase.java b/src/test/java/com/android/tools/r8/optimize/serviceloader/ServiceLoaderTestBase.java
index 9ce3ecd..54ba9f3 100644
--- a/src/test/java/com/android/tools/r8/optimize/serviceloader/ServiceLoaderTestBase.java
+++ b/src/test/java/com/android/tools/r8/optimize/serviceloader/ServiceLoaderTestBase.java
@@ -145,7 +145,7 @@
Arrays.stream(implClasses)
.map(c -> c.getTypeName() + "\n")
.collect(Collectors.joining(""));
- ret.addDataEntryResources(
+ ret.addDataResources(
DataEntryResource.fromBytes(
implLines.getBytes(),
AppServices.SERVICE_DIRECTORY_NAME + serviceClass.getTypeName(),
diff --git a/src/test/java/com/android/tools/r8/optimize/serviceloader/VerticalClassMergingServiceLoaderTest.java b/src/test/java/com/android/tools/r8/optimize/serviceloader/VerticalClassMergingServiceLoaderTest.java
index 7784452..6b6008f 100644
--- a/src/test/java/com/android/tools/r8/optimize/serviceloader/VerticalClassMergingServiceLoaderTest.java
+++ b/src/test/java/com/android/tools/r8/optimize/serviceloader/VerticalClassMergingServiceLoaderTest.java
@@ -65,7 +65,7 @@
.addInnerClasses(VerticalClassMergingServiceLoaderTest.class)
.addKeepClassRules(B.class)
.addKeepMainRule(C.class)
- .addDataEntryResources(
+ .addDataResources(
DataEntryResource.fromBytes(
StringUtils.lines(serviceImplementations).getBytes(),
"META-INF/services/" + A.class.getTypeName(),
diff --git a/src/test/java/com/android/tools/r8/repackage/RepackageWithServiceLoaderTest.java b/src/test/java/com/android/tools/r8/repackage/RepackageWithServiceLoaderTest.java
index 9c08021..117e954 100644
--- a/src/test/java/com/android/tools/r8/repackage/RepackageWithServiceLoaderTest.java
+++ b/src/test/java/com/android/tools/r8/repackage/RepackageWithServiceLoaderTest.java
@@ -40,7 +40,7 @@
R8TestRunResult runResult =
testForR8(parameters.getBackend())
.addInnerClasses(getClass())
- .addDataEntryResources(
+ .addDataResources(
DataEntryResource.fromBytes(
StringUtils.lines(ServiceImpl.class.getTypeName()).getBytes(),
"META-INF/services/" + Service.class.getTypeName(),
diff --git a/src/test/java/com/android/tools/r8/rewrite/ScriptEngineTest.java b/src/test/java/com/android/tools/r8/rewrite/ScriptEngineTest.java
index b7069e2..a8e80aa 100644
--- a/src/test/java/com/android/tools/r8/rewrite/ScriptEngineTest.java
+++ b/src/test/java/com/android/tools/r8/rewrite/ScriptEngineTest.java
@@ -68,12 +68,12 @@
.getOpenClosedInterfacesOptions()
.suppressAllOpenInterfacesDueToMissingClasses()))
.setMinApi(parameters)
- .addDataEntryResources(
+ .addDataResources(
DataEntryResource.fromBytes(
StringUtils.lines(MyScriptEngine1FactoryImpl.class.getTypeName()).getBytes(),
"META-INF/services/" + ScriptEngineFactory.class.getTypeName(),
Origin.unknown()))
- .addDataEntryResources(
+ .addDataResources(
DataEntryResource.fromBytes(
StringUtils.lines(MyScriptEngine2FactoryImpl.class.getTypeName()).getBytes(),
"META-INF/services/" + ScriptEngineFactory.class.getTypeName(),
diff --git a/src/test/testbase/java/com/android/tools/r8/ExternalR8TestBuilder.java b/src/test/testbase/java/com/android/tools/r8/ExternalR8TestBuilder.java
index d1a45c1..00a8c94 100644
--- a/src/test/testbase/java/com/android/tools/r8/ExternalR8TestBuilder.java
+++ b/src/test/testbase/java/com/android/tools/r8/ExternalR8TestBuilder.java
@@ -217,7 +217,7 @@
}
@Override
- public ExternalR8TestBuilder addDataEntryResources(DataEntryResource... resources) {
+ public ExternalR8TestBuilder addDataResources(List<? extends DataResource> resources) {
throw new Unimplemented("No support for adding data entry resources");
}
diff --git a/src/test/testbase/java/com/android/tools/r8/ProguardTestBuilder.java b/src/test/testbase/java/com/android/tools/r8/ProguardTestBuilder.java
index 275592f..b79558f 100644
--- a/src/test/testbase/java/com/android/tools/r8/ProguardTestBuilder.java
+++ b/src/test/testbase/java/com/android/tools/r8/ProguardTestBuilder.java
@@ -130,7 +130,7 @@
}
@Override
- public ProguardTestBuilder addDataEntryResources(DataEntryResource... resources) {
+ public ProguardTestBuilder addDataResources(List<? extends DataResource> resources) {
throw new Unimplemented("No support for adding data entry resources");
}
diff --git a/src/test/testbase/java/com/android/tools/r8/R8TestBuilder.java b/src/test/testbase/java/com/android/tools/r8/R8TestBuilder.java
index 51174be..b5da273 100644
--- a/src/test/testbase/java/com/android/tools/r8/R8TestBuilder.java
+++ b/src/test/testbase/java/com/android/tools/r8/R8TestBuilder.java
@@ -287,17 +287,12 @@
return self();
}
- public T addDataResources(List<DataEntryResource> resources) {
+ public T addDataResources(List<? extends DataResource> resources) {
resources.forEach(builder.getAppBuilder()::addDataResource);
return self();
}
@Override
- public T addDataEntryResources(DataEntryResource... resources) {
- return addDataResources(Arrays.asList(resources));
- }
-
- @Override
public T addKeepRuleFiles(List<Path> files) {
builder.addProguardConfigurationFiles(files);
return self();
diff --git a/src/test/testbase/java/com/android/tools/r8/TestShrinkerBuilder.java b/src/test/testbase/java/com/android/tools/r8/TestShrinkerBuilder.java
index 1097b5d..4b11d03 100644
--- a/src/test/testbase/java/com/android/tools/r8/TestShrinkerBuilder.java
+++ b/src/test/testbase/java/com/android/tools/r8/TestShrinkerBuilder.java
@@ -89,7 +89,11 @@
return addKeepRules("-classobfuscationdictionary " + path.toString());
}
- public abstract T addDataEntryResources(DataEntryResource... resources);
+ public abstract T addDataResources(List<? extends DataResource> resources);
+
+ public final T addDataResources(DataResource... resources) {
+ return addDataResources(Arrays.asList(resources));
+ }
public abstract T addKeepRuleFiles(List<Path> files);
