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.

Sign up for GitHub

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

Jump to bottom

Remove deprecated method #8810

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove deprecated method #8810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
152 changes: 0 additions & 152 deletions robolectric/src/main/java/org/robolectric/ConfigMerger.java
View file
Open in desktop

This file was deleted.

32 changes: 6 additions & 26 deletions robolectric/src/main/java/org/robolectric/RobolectricTestRunner.java
View file
Open in desktop
Expand Up @@ -62,7 +62,11 @@
@SuppressWarnings("NewApi")
public class RobolectricTestRunner extends SandboxTestRunner {

public static final String CONFIG_PROPERTIES = "robolectric.properties";
/**
* @deprecated No longer used. This constant will be removed in a future version of Robolectric.
*/
@Deprecated public static final String CONFIG_PROPERTIES = "robolectric.properties";

private static final Injector DEFAULT_INJECTOR = defaultInjector().build();
private static final Map<ManifestIdentifier, AndroidManifest> appManifestsCache = new HashMap<>();

Expand Down Expand Up @@ -106,7 +110,7 @@ protected RobolectricTestRunner(final Class<?> testClass, Injector injector)
super(testClass, injector);

if (DeprecatedTestRunnerDefaultConfigProvider.globalConfig == null) {
DeprecatedTestRunnerDefaultConfigProvider.globalConfig = buildGlobalConfig();
DeprecatedTestRunnerDefaultConfigProvider.globalConfig = new Config.Builder().build();
}

this.sandboxManager = injector.getInstance(SandboxManager.class);
Expand Down Expand Up @@ -415,30 +419,6 @@ private Configuration getConfiguration(Method method) {
return configurationStrategy.getConfig(getTestClass().getJavaClass(), method);
}

/**
* Provides the base Robolectric configuration {@link Config} used for all tests.
*
* <p>Configuration provided for specific packages, test classes, and test method configurations
* will override values provided here.
*
* <p>Custom TestRunner subclasses may wish to override this method to provide alternate
* configuration. Consider using a {@link Config.Builder}.
*
* <p>The default implementation has appropriate values for most use cases.
*
* @return global {@link Config} object
* @deprecated Provide a service implementation of {@link GlobalConfigProvider} instead. This
* method will be removed in Robolectric 4.3.
* @since 3.1.3
* @see <a href="http://robolectric.org/migrating/#migrating-to-40">Migration Notes</a> for more
* details.
*/
@Deprecated
@SuppressWarnings("InlineMeSuggester")
protected Config buildGlobalConfig() {
return new Config.Builder().build();
}

@AutoService(GlobalConfigProvider.class)
@Priority(Integer.MIN_VALUE)
@Deprecated
Expand Down
11 changes: 0 additions & 11 deletions shadows/framework/src/main/java/org/robolectric/android/controller/ServiceController.java
View file
Open in desktop
Expand Up @@ -91,15 +91,4 @@ public ServiceController<T> unbind() {
shadowMainLooper.idleIfPaused();
return this;
}

/**
* @deprecated Use the appropriate builder in {@link org.robolectric.Robolectric} instead.
*
* This method will be removed in Robolectric 3.6.
*/
@Deprecated
public ServiceController<T> withIntent(Intent intent) {
this.intent = intent;
return this;
}
}