Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98fac979 authored by Vladimir Komsiyski's avatar Vladimir Komsiyski
Browse files

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
parent b63c0f86

core/tests/coretests/src/android/companion/virtual/camera/VirtualCameraOutputTest.java

+5 −0
Original line number Original line Diff line number Diff line
@@ -23,13 +23,16 @@ import static org.junit.Assert.fail; 
import android.graphics.PixelFormat;

import android.graphics.PixelFormat;

import android.hardware.camera2.params.InputConfiguration;

import android.hardware.camera2.params.InputConfiguration;

import android.os.ParcelFileDescriptor;

import android.os.ParcelFileDescriptor;

import android.platform.test.annotations.Presubmit;

import android.util.Log;

import android.util.Log;





import androidx.annotation.NonNull;

import androidx.annotation.NonNull;

import androidx.test.runner.AndroidJUnit4;





import org.junit.After;

import org.junit.After;

import org.junit.Before;

import org.junit.Before;

import org.junit.Test;

import org.junit.Test;

import org.junit.runner.RunWith;





import java.io.ByteArrayInputStream;

import java.io.ByteArrayInputStream;

import java.io.FileInputStream;

import java.io.FileInputStream;
@@ -38,6 +41,8 @@ import java.io.InputStream; 
import java.util.concurrent.ExecutorService;

import java.util.concurrent.ExecutorService;

import java.util.concurrent.Executors;

import java.util.concurrent.Executors;





@Presubmit

@RunWith(AndroidJUnit4.class)

public class VirtualCameraOutputTest {

public class VirtualCameraOutputTest {





    private static final String TAG = "VirtualCameraOutputTest";

    private static final String TAG = "VirtualCameraOutputTest";

core/tests/coretests/src/android/companion/virtual/sensor/VirtualSensorConfigTest.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -26,6 +26,7 @@ import static org.mockito.Mockito.verify; 
import static java.util.concurrent.TimeUnit.MILLISECONDS;

import static java.util.concurrent.TimeUnit.MILLISECONDS;





import android.os.Parcel;

import android.os.Parcel;

import android.platform.test.annotations.Presubmit;





import androidx.test.runner.AndroidJUnit4;

import androidx.test.runner.AndroidJUnit4;
@@ -42,6 +43,7 @@ import org.mockito.junit.MockitoRule; 




import java.time.Duration;

import java.time.Duration;





@Presubmit

@RunWith(AndroidJUnit4.class)

@RunWith(AndroidJUnit4.class)

public class VirtualSensorConfigTest {

public class VirtualSensorConfigTest {

core/tests/coretests/src/android/companion/virtual/sensor/VirtualSensorEventTest.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -22,12 +22,14 @@ import static org.testng.Assert.assertThrows; 




import android.os.Parcel;

import android.os.Parcel;

import android.os.SystemClock;

import android.os.SystemClock;

import android.platform.test.annotations.Presubmit;





import androidx.test.runner.AndroidJUnit4;

import androidx.test.runner.AndroidJUnit4;





import org.junit.Test;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.junit.runner.RunWith;





@Presubmit

@RunWith(AndroidJUnit4.class)

@RunWith(AndroidJUnit4.class)

public class VirtualSensorEventTest {

public class VirtualSensorEventTest {

services/tests/mockingservicestests/src/com/android/server/companion/virtual/CameraAccessControllerTest.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -39,6 +39,7 @@ import android.hardware.camera2.CameraInjectionSession; 
import android.hardware.camera2.CameraManager;

import android.hardware.camera2.CameraManager;

import android.os.Process;

import android.os.Process;

import android.os.UserManager;

import android.os.UserManager;

import android.platform.test.annotations.Presubmit;

import android.testing.TestableContext;

import android.testing.TestableContext;

import android.util.ArraySet;

import android.util.ArraySet;
@@ -59,6 +60,7 @@ import org.mockito.MockitoAnnotations; 
import java.util.ArrayList;

import java.util.ArrayList;

import java.util.List;

import java.util.List;





@Presubmit

@RunWith(AndroidJUnit4.class)

@RunWith(AndroidJUnit4.class)

public class CameraAccessControllerTest {

public class CameraAccessControllerTest {

    private static final String FRONT_CAMERA = "0";

    private static final String FRONT_CAMERA = "0";

services/tests/servicestests/src/com/android/server/companion/virtual/VirtualDeviceParamsTest.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -27,6 +27,7 @@ import android.companion.virtual.VirtualDeviceParams; 
import android.companion.virtual.sensor.VirtualSensorConfig;

import android.companion.virtual.sensor.VirtualSensorConfig;

import android.os.Parcel;

import android.os.Parcel;

import android.os.UserHandle;

import android.os.UserHandle;

import android.platform.test.annotations.Presubmit;





import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -36,6 +37,7 @@ import org.junit.runner.RunWith; 
import java.util.List;

import java.util.List;

import java.util.Set;

import java.util.Set;





@Presubmit

@RunWith(AndroidJUnit4.class)

@RunWith(AndroidJUnit4.class)

public class VirtualDeviceParamsTest {

public class VirtualDeviceParamsTest {