Run VDM unit tests on presubmit.

Test: atest VirtualAudioControllerTest
Test: atest VirtualDeviceTest
Test: atest CameraAccessControllerTest
Test: atest VirtualDeviceParamsTest
Test: atest VirtualCameraOutputTest
Test: atest VirtualSensorConfigTest
Test: atest VirtualSensorEventTest
Bug: 265155142

Change-Id: I9c7e05e3ee743e411030e450bc9b8d91efb0a5cd
This commit is contained in:
Vladimir Komsiyski
2023-01-11 12:14:37 +01:00
parent b63c0f8689
commit 98fac97963
7 changed files with 19 additions and 0 deletions

View File

@@ -23,13 +23,16 @@ import static org.junit.Assert.fail;
import android.graphics.PixelFormat;
import android.hardware.camera2.params.InputConfiguration;
import android.os.ParcelFileDescriptor;
import android.platform.test.annotations.Presubmit;
import android.util.Log;
import androidx.annotation.NonNull;
import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import java.io.ByteArrayInputStream;
import java.io.FileInputStream;
@@ -38,6 +41,8 @@ import java.io.InputStream;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@Presubmit
@RunWith(AndroidJUnit4.class)
public class VirtualCameraOutputTest {
private static final String TAG = "VirtualCameraOutputTest";

View File

@@ -26,6 +26,7 @@ import static org.mockito.Mockito.verify;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import android.os.Parcel;
import android.platform.test.annotations.Presubmit;
import androidx.test.runner.AndroidJUnit4;
@@ -42,6 +43,7 @@ import org.mockito.junit.MockitoRule;
import java.time.Duration;
@Presubmit
@RunWith(AndroidJUnit4.class)
public class VirtualSensorConfigTest {

View File

@@ -22,12 +22,14 @@ import static org.testng.Assert.assertThrows;
import android.os.Parcel;
import android.os.SystemClock;
import android.platform.test.annotations.Presubmit;
import androidx.test.runner.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
@Presubmit
@RunWith(AndroidJUnit4.class)
public class VirtualSensorEventTest {

View File

@@ -39,6 +39,7 @@ import android.hardware.camera2.CameraInjectionSession;
import android.hardware.camera2.CameraManager;
import android.os.Process;
import android.os.UserManager;
import android.platform.test.annotations.Presubmit;
import android.testing.TestableContext;
import android.util.ArraySet;
@@ -59,6 +60,7 @@ import org.mockito.MockitoAnnotations;
import java.util.ArrayList;
import java.util.List;
@Presubmit
@RunWith(AndroidJUnit4.class)
public class CameraAccessControllerTest {
private static final String FRONT_CAMERA = "0";

View File

@@ -27,6 +27,7 @@ import android.companion.virtual.VirtualDeviceParams;
import android.companion.virtual.sensor.VirtualSensorConfig;
import android.os.Parcel;
import android.os.UserHandle;
import android.platform.test.annotations.Presubmit;
import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -36,6 +37,7 @@ import org.junit.runner.RunWith;
import java.util.List;
import java.util.Set;
@Presubmit
@RunWith(AndroidJUnit4.class)
public class VirtualDeviceParamsTest {

View File

@@ -25,12 +25,14 @@ import static org.junit.Assert.assertThrows;
import android.companion.virtual.VirtualDevice;
import android.os.Parcel;
import android.platform.test.annotations.Presubmit;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import org.junit.Test;
import org.junit.runner.RunWith;
@Presubmit
@RunWith(AndroidJUnit4.class)
public class VirtualDeviceTest {

View File

@@ -36,9 +36,11 @@ import android.media.MediaRecorder;
import android.media.PlayerBase;
import android.os.Parcel;
import android.os.RemoteException;
import android.platform.test.annotations.Presubmit;
import android.util.ArraySet;
import androidx.test.InstrumentationRegistry;
import androidx.test.filters.FlakyTest;
import androidx.test.runner.AndroidJUnit4;
import com.android.server.companion.virtual.GenericWindowPolicyController;
@@ -53,6 +55,7 @@ import org.mockito.MockitoAnnotations;
import java.util.ArrayList;
import java.util.List;
@Presubmit
@RunWith(AndroidJUnit4.class)
public class VirtualAudioControllerTest {
private static final int APP1_UID = 100;
@@ -92,6 +95,7 @@ public class VirtualAudioControllerTest {
}
@FlakyTest(bugId = 265155135)
@Test
public void startListening_receivesCallback() throws RemoteException {
ArraySet<Integer> runningUids = new ArraySet<>();