Merge "Remove core-libart-for-host from ravenwood-runtime" into main (6ea2913b) · Commits · e / os / android_frameworks_base

Ravenwood.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -97,7 +97,6 @@ android_ravenwood_libgroup {
		"framework-minus-apex.ravenwood",
		"hoststubgen-helper-runtime.ravenwood",
		"hoststubgen-helper-framework-runtime.ravenwood",
		"core-libart-for-host",
		"all-updatable-modules-system-stubs",
		"junit",
		"truth",

core/tests/coretests/src/com/android/internal/os/BinderDeathDispatcherTest.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -31,10 +31,13 @@ import android.os.Parcel;
		import android.os.RemoteException;
		import android.os.ResultReceiver;
		import android.os.ShellCallback;
		import android.platform.test.annotations.DisabledOnRavenwood;
		import android.platform.test.ravenwood.RavenwoodRule;

		import androidx.test.filters.SmallTest;
		import androidx.test.runner.AndroidJUnit4;

		import org.junit.Rule;
		import org.junit.Test;
		import org.junit.runner.RunWith;

		@@ -43,6 +46,9 @@ import java.io.FileDescriptor;
		@SmallTest
		@RunWith(AndroidJUnit4.class)
		public class BinderDeathDispatcherTest {
		@Rule
		public RavenwoodRule mRavenwood = new RavenwoodRule.Builder().build();

		private static class MyTarget implements IInterface, IBinder {
		public boolean isAlive = true;
		public DeathRecipient mRecipient;
		@@ -195,6 +201,7 @@ public class BinderDeathDispatcherTest {
		}

		@Test
		@DisabledOnRavenwood(reason = "b/324433654 -- depends on unsupported classes")
		public void testRegisterAndKill() {
		BinderDeathDispatcher<MyTarget> d = new BinderDeathDispatcher<>();

		@@ -265,6 +272,7 @@ public class BinderDeathDispatcherTest {
		}

		@Test
		@DisabledOnRavenwood(reason = "b/324433654 -- depends on unsupported classes")
		public void duplicateRegistrations() {
		BinderDeathDispatcher<MyTarget> d = new BinderDeathDispatcher<>();

core/tests/coretests/src/com/android/internal/os/StoragedUidIoStatsReaderTest.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -20,12 +20,15 @@ import static org.mockito.Mockito.verify;
		import static org.mockito.Mockito.verifyNoMoreInteractions;

		import android.os.FileUtils;
		import android.platform.test.annotations.DisabledOnRavenwood;
		import android.platform.test.ravenwood.RavenwoodRule;

		import androidx.test.filters.SmallTest;
		import androidx.test.runner.AndroidJUnit4;

		import org.junit.After;
		import org.junit.Before;
		import org.junit.Rule;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mockito.Mock;
		@@ -44,6 +47,8 @@ import java.nio.file.Files;
		@SmallTest
		@RunWith(AndroidJUnit4.class)
		public class StoragedUidIoStatsReaderTest {
		@Rule
		public RavenwoodRule mRavenwood = new RavenwoodRule.Builder().build();

		private File mTestDir;
		private File mTestFile;
		@@ -79,6 +84,7 @@ public class StoragedUidIoStatsReaderTest {
		* Tests that reading a file with 3 uids works as expected.
		*/
		@Test
		@DisabledOnRavenwood(reason = "b/324433654 -- depends on unsupported classes")
		public void testReadExpected() throws Exception {
		BufferedWriter bufferedWriter = Files.newBufferedWriter(mTestFile.toPath());
		int[] uids = {0, 100, 200};
		@@ -116,6 +122,7 @@ public class StoragedUidIoStatsReaderTest {
		* Tests that a line with less than 11 items is passed over.
		*/
		@Test
		@DisabledOnRavenwood(reason = "b/324433654 -- depends on unsupported classes")
		public void testLineDoesNotElevenEntries() throws Exception {
		BufferedWriter bufferedWriter = Files.newBufferedWriter(mTestFile.toPath());

		@@ -139,6 +146,7 @@ public class StoragedUidIoStatsReaderTest {
		* Tests that a line that is malformed is passed over.
		*/
		@Test
		@DisabledOnRavenwood(reason = "b/324433654 -- depends on unsupported classes")
		public void testLineIsMalformed() throws Exception {
		BufferedWriter bufferedWriter = Files.newBufferedWriter(mTestFile.toPath());

ravenwood/junit-src/android/platform/test/annotations/DisabledOnRavenwood.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -42,4 +42,13 @@ import java.lang.annotation.Target;
		@Target({ElementType.METHOD, ElementType.TYPE})
		@Retention(RetentionPolicy.RUNTIME)
		public @interface DisabledOnRavenwood {
		/**
		* One or more classes that aren't yet supported by Ravenwood, which this test depends on.
		*/
		Class<?>[] blockedBy() default {};

		/**
		* General free-form description of why this test is being ignored.
		*/
		String reason() default "";
		}

ravenwood/junit-src/android/platform/test/annotations/IgnoreUnderRavenwood.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -35,9 +35,12 @@ import java.lang.annotation.Target;
		* to be enabled.
		*
		* @hide
		*
		* @deprecated Use {@link DisabledOnRavenwood} instead.
		*/
		@Target({ElementType.METHOD, ElementType.TYPE})
		@Retention(RetentionPolicy.RUNTIME)
		@Deprecated
		public @interface IgnoreUnderRavenwood {
		/**
		* One or more classes that aren't yet supported by Ravenwood, which this test depends on.