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

Commit 513207b1 authored by Neil Fuller's avatar Neil Fuller Committed by Android (Google) Code Review
Browse files

Merge "Tidy up test annotations and enable presubmit" into main

parents 24b89b4b d01bd8f0

core/tests/coretests/src/android/app/time/DetectorStatusTypesTest.java

+8 −0
Original line number Diff line number Diff line
@@ -26,9 +26,17 @@ import static org.junit.Assert.assertThrows; 


import android.app.time.DetectorStatusTypes.DetectionAlgorithmStatus;

import android.app.time.DetectorStatusTypes.DetectorStatus;

import android.platform.test.annotations.Presubmit;



import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import org.junit.Test;

import org.junit.runner.RunWith;



@RunWith(AndroidJUnit4.class)

@SmallTest

@Presubmit

public class DetectorStatusTypesTest {



    @Test

core/tests/coretests/src/android/app/time/ExternalTimeSuggestionTest.java

+8 −0
Original line number Diff line number Diff line
@@ -21,13 +21,21 @@ import static android.app.timezonedetector.ShellCommandTestSupport.createShellCo 
import static org.junit.Assert.assertEquals;



import android.os.ShellCommand;

import android.platform.test.annotations.Presubmit;



import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import org.junit.Test;

import org.junit.runner.RunWith;



/**

 * Tests for non-SDK methods on {@link ExternalTimeSuggestion}.

 * Also see {@link android.app.time.cts.ExternalTimeSuggestionTest}

 */

@RunWith(AndroidJUnit4.class)

@SmallTest

@Presubmit

public class ExternalTimeSuggestionTest {



    @Test(expected = IllegalArgumentException.class)

core/tests/coretests/src/android/app/time/LocationTimeZoneAlgorithmStatusTest.java

+8 −0
Original line number Diff line number Diff line
@@ -39,10 +39,18 @@ import static org.junit.Assert.assertThrows; 
import static org.junit.Assert.assertTrue;



import android.app.time.LocationTimeZoneAlgorithmStatus.ProviderStatus;

import android.platform.test.annotations.Presubmit;

import android.service.timezone.TimeZoneProviderStatus;



import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import org.junit.Test;

import org.junit.runner.RunWith;



@RunWith(AndroidJUnit4.class)

@SmallTest

@Presubmit

public class LocationTimeZoneAlgorithmStatusTest {



    private static final TimeZoneProviderStatus ARBITRARY_PROVIDER_RUNNING_STATUS =

core/tests/coretests/src/android/app/time/TelephonyTimeZoneAlgorithmStatusTest.java

+9 −0
Original line number Diff line number Diff line
@@ -23,8 +23,17 @@ import static android.app.time.ParcelableTestSupport.assertRoundTripParcelable; 


import static org.junit.Assert.assertNotEquals;



import android.platform.test.annotations.Presubmit;



import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import org.junit.Test;

import org.junit.runner.RunWith;



@RunWith(AndroidJUnit4.class)

@SmallTest

@Presubmit

public class TelephonyTimeZoneAlgorithmStatusTest {



    @Test

core/tests/coretests/src/android/app/time/TimeCapabilitiesTest.java

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import static org.junit.Assert.assertNull; 
import static org.junit.Assert.fail;



import android.os.UserHandle;

import android.platform.test.annotations.Presubmit;



import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;
@@ -41,6 +42,7 @@ import org.junit.runner.RunWith; 


@RunWith(AndroidJUnit4.class)

@SmallTest

@Presubmit

public class TimeCapabilitiesTest {



    private static final UserHandle TEST_USER_HANDLE = UserHandle.of(332211);