Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove 'useLegacy*' resources methods. #9071

Merged
merged 1 commit into from
May 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions robolectric/src/main/java/org/robolectric/Robolectric.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import static android.os.Build.VERSION_CODES.P;
import static com.google.common.base.Preconditions.checkState;
import static org.robolectric.shadows.ShadowAssetManager.useLegacy;

import android.annotation.IdRes;
import android.annotation.RequiresApi;
Expand All @@ -24,7 +23,6 @@
import javax.annotation.Nullable;
import org.robolectric.android.AttributeSetBuilderImpl;
import org.robolectric.android.AttributeSetBuilderImpl.ArscResourceResolver;
import org.robolectric.android.AttributeSetBuilderImpl.LegacyResourceResolver;
import org.robolectric.android.controller.ActivityController;
import org.robolectric.android.controller.BackupAgentController;
import org.robolectric.android.controller.ContentProviderController;
Expand Down Expand Up @@ -307,15 +305,10 @@ public static <T extends BackupAgent> T setupBackupAgent(Class<T> backupAgentCla
* Useful for testing {@link View} classes without the need for creating XML snippets.
*/
public static org.robolectric.android.AttributeSetBuilder buildAttributeSet() {
if (useLegacy()) {
return new AttributeSetBuilderImpl(
new LegacyResourceResolver(
RuntimeEnvironment.getApplication(),
RuntimeEnvironment.getCompileTimeResourceTable())) {};
} else {

return new AttributeSetBuilderImpl(
new ArscResourceResolver(RuntimeEnvironment.getApplication())) {};
}

}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
import com.google.common.base.Suppliers;
import java.lang.reflect.Method;
import java.nio.file.FileSystem;
import java.nio.file.Files;
import java.nio.file.Path;
import java.security.Security;
import java.security.cert.Certificate;
Expand Down Expand Up @@ -78,12 +77,10 @@
import org.robolectric.res.RoutingResourceTable;
import org.robolectric.shadow.api.Shadow;
import org.robolectric.shadows.ClassNameResolver;
import org.robolectric.shadows.LegacyManifestParser;
import org.robolectric.shadows.ShadowActivityThread;
import org.robolectric.shadows.ShadowActivityThread._ActivityThread_;
import org.robolectric.shadows.ShadowActivityThread._AppBindData_;
import org.robolectric.shadows.ShadowApplication;
import org.robolectric.shadows.ShadowAssetManager;
import org.robolectric.shadows.ShadowContextImpl._ContextImpl_;
import org.robolectric.shadows.ShadowInstrumentation;
import org.robolectric.shadows.ShadowInstrumentation._Instrumentation_;
Expand Down Expand Up @@ -385,10 +382,6 @@ private Application installAndCreateApplication(

appResources.updateConfiguration(androidConfiguration, Bootstrap.getDisplayMetrics());

if (ShadowAssetManager.useLegacy()) {
populateAssetPaths(appResources.getAssets(), appManifest);
}

// Circumvent the 'No Compatibility callbacks set!' log. See #8509
if (apiLevel >= AndroidVersions.V.SDK_INT) {
// Adds loggableChanges parameter.
Expand Down Expand Up @@ -420,35 +413,17 @@ private Package loadAppPackage(Config config, AndroidManifest appManifest) {
private Package loadAppPackage_measured(Config config, AndroidManifest appManifest) {

Package parsedPackage;
if (RuntimeEnvironment.useLegacyResources()) {
injectResourceStuffForLegacy(appManifest);

if (appManifest.getAndroidManifestFile() != null
&& Files.exists(appManifest.getAndroidManifestFile())) {
parsedPackage = LegacyManifestParser.createPackage(appManifest);
} else {
parsedPackage = new Package("org.robolectric.default");
parsedPackage.applicationInfo.targetSdkVersion = appManifest.getTargetSdkVersion();
}
// Support overriding the package name specified in the Manifest.
if (!Config.DEFAULT_PACKAGE_NAME.equals(config.packageName())) {
parsedPackage.packageName = config.packageName();
parsedPackage.applicationInfo.packageName = config.packageName();
} else {
parsedPackage.packageName = appManifest.getPackageName();
parsedPackage.applicationInfo.packageName = appManifest.getPackageName();
}
} else {
RuntimeEnvironment.compileTimeSystemResourcesFile = compileSdk.getJarPath();
RuntimeEnvironment.compileTimeSystemResourcesFile = compileSdk.getJarPath();

Path packageFile = appManifest.getApkFile();
if (packageFile != null) {
parsedPackage = ShadowPackageParser.callParsePackage(packageFile);
} else {
parsedPackage = new Package("org.robolectric.default");
parsedPackage.applicationInfo.targetSdkVersion = appManifest.getTargetSdkVersion();
}
Path packageFile = appManifest.getApkFile();
if (packageFile != null) {
parsedPackage = ShadowPackageParser.callParsePackage(packageFile);
} else {
parsedPackage = new Package("org.robolectric.default");
parsedPackage.applicationInfo.targetSdkVersion = appManifest.getTargetSdkVersion();
}

if (parsedPackage != null
&& parsedPackage.applicationInfo != null
&& RuntimeEnvironment.getApiLevel() >= P) {
Expand Down Expand Up @@ -696,14 +671,8 @@ private void setUpPackageStorage(
// packageInfo.setVolumeUuid(tempDirectory.createIfNotExists(packageInfo.packageName +
// "-dataDir").toAbsolutePath().toString());

if (RuntimeEnvironment.useLegacyResources()) {
applicationInfo.sourceDir = createTempDir(applicationInfo.packageName + "-sourceDir");
applicationInfo.publicSourceDir =
createTempDir(applicationInfo.packageName + "-publicSourceDir");
} else {
applicationInfo.publicSourceDir = parsedPackage.codePath;
applicationInfo.sourceDir = parsedPackage.codePath;
}
applicationInfo.publicSourceDir = parsedPackage.codePath;
applicationInfo.sourceDir = parsedPackage.codePath;

applicationInfo.dataDir = createTempDir(applicationInfo.packageName + "-dataDir");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,6 @@ public void shouldInitializeAndBindApplicationButNotCallOnCreate() {
assertWithMessage("onCreate called")
.that(((MyTestApplication) ApplicationProvider.getApplicationContext()).onCreateWasCalled)
.isTrue();
if (RuntimeEnvironment.useLegacyResources()) {
assertWithMessage("Application resource loader")
.that(RuntimeEnvironment.getAppResourceTable())
.isNotNull();
}
}

@Test
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Loading