Skip to content
Snippets Groups Projects
Commit 92b56383 authored by Makoto Onuki's avatar Makoto Onuki
Browse files

Set ENABLE_PROBE_IGNORED from $RAVENWOOD_RUN_DISABLED_TESTS

Test: RAVENWOOD_RUN_DISABLED_TESTS=1 atest RavenwoodMockitoTest
Without removing @IgnoreUnderRavenwood

Bug: 319646274
Change-Id: Ibd80ca5931f500498a1aaa2c18b6209586a82653
parent ed6f93a3
No related branches found
No related tags found
No related merge requests found
......@@ -19,8 +19,8 @@ package android.platform.test.ravenwood;
import static org.junit.Assert.fail;
import android.platform.test.annotations.DisabledOnRavenwood;
import android.platform.test.annotations.IgnoreUnderRavenwood;
import android.platform.test.annotations.EnabledOnRavenwood;
import android.platform.test.annotations.IgnoreUnderRavenwood;
import org.junit.Assume;
import org.junit.rules.TestRule;
......@@ -52,7 +52,8 @@ public class RavenwoodRule implements TestRule {
* This is typically helpful for internal maintainers discovering tests that had previously
* been ignored, but now have enough Ravenwood-supported functionality to be enabled.
*/
static final boolean ENABLE_PROBE_IGNORED = false; // DO NOT SUBMIT WITH TRUE
static final boolean ENABLE_PROBE_IGNORED = "1".equals(
System.getenv("RAVENWOOD_RUN_DISABLED_TESTS"));
private static final int SYSTEM_UID = 1000;
private static final int NOBODY_UID = 9999;
......
......@@ -22,7 +22,6 @@ import static org.mockito.Mockito.when;
import android.content.Context;
import android.content.Intent;
import android.platform.test.annotations.IgnoreUnderRavenwood;
import android.platform.test.ravenwood.RavenwoodRule;
import org.junit.Rule;
......@@ -62,31 +61,7 @@ public class RavenwoodMockitoTest {
assertThat(object.exitValue()).isEqualTo(42);
}
/*
- Intent can't be mocked because of the dependency to `org.xmlpull.v1.XmlPullParser`.
(The error says "Mockito can only mock non-private & non-final classes", but that's likely a
red-herring.)
STACKTRACE:
org.mockito.exceptions.base.MockitoException:
Mockito cannot mock this class: class android.content.Intent.
:
Underlying exception : java.lang.IllegalArgumentException: Could not create type
at com.android.ravenwood.mockito.RavenwoodMockitoTest.testMockAndroidClass1
at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
:
Caused by: java.lang.ClassNotFoundException: org.xmlpull.v1.XmlPullParser
at java.base/jdk.internal.loader.BuiltinClassLoader.loadClass(BuiltinClassLoader.java:641)
at java.base/jdk.internal.loader.ClassLoaders$AppClassLoader.loadClass(ClassLoaders.java:188)
at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:520)
... 54 more
*/
@Test
@IgnoreUnderRavenwood
public void testMockAndroidClass1() {
Intent object = mock(Intent.class);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment