Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add a test for suggestNetworkTime()"

Browse Source
This commit is contained in:
Neil Fuller
2022-07-13 09:31:06 +00:00
committed by Android (Google) Code Review
parent 665c55a4d6 4ffa234e67
commit 28709ca6ea
2 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
services/tests/servicestests/src/com/android/server/timedetector/TimeDetectorInternalImplTest.java
View File

@@ -20,6 +20,7 @@ import static org.mockito.Mockito.mock;
import android.content.Context;
import android.os.HandlerThread;
import android.os.TimestampedValue;
import androidx.test.runner.AndroidJUnit4;
@@ -55,14 +56,25 @@ public class TimeDetectorInternalImplTest {
mMockContext, mTestHandler, mFakeTimeDetectorStrategy);
}
@Test
public void placeholder() {
// A placeholder test until there are real methods to test.
}
@After
public void tearDown() throws Exception {
mHandlerThread.quit();
mHandlerThread.join();
}
@Test
public void testSuggestNetworkTime() throws Exception {
NetworkTimeSuggestion networkTimeSuggestion = createNetworkTimeSuggestion();
mTimeDetectorInternal.suggestNetworkTime(networkTimeSuggestion);
mTestHandler.assertTotalMessagesEnqueued(1);
mTestHandler.waitForMessagesToBeProcessed();
mFakeTimeDetectorStrategy.verifySuggestNetworkTimeCalled(networkTimeSuggestion);
}
private static NetworkTimeSuggestion createNetworkTimeSuggestion() {
TimestampedValue<Long> timeValue = new TimestampedValue<>(100L, 1_000_000L);
return new NetworkTimeSuggestion(timeValue, 123);
}
}

10
services/tests/servicestests/src/com/android/server/timedetector/TimeDetectorServiceTest.java
View File

@@ -318,10 +318,10 @@ public class TimeDetectorServiceTest {
public void testSuggestNetworkTime_withoutPermission() {
doThrow(new SecurityException("Mock"))
.when(mMockContext).enforceCallingOrSelfPermission(anyString(), any());
NetworkTimeSuggestion NetworkTimeSuggestion = createNetworkTimeSuggestion();
NetworkTimeSuggestion networkTimeSuggestion = createNetworkTimeSuggestion();
try {
mTimeDetectorService.suggestNetworkTime(NetworkTimeSuggestion);
mTimeDetectorService.suggestNetworkTime(networkTimeSuggestion);
fail();
} finally {
verify(mMockContext).enforceCallingOrSelfPermission(
@@ -333,15 +333,15 @@ public class TimeDetectorServiceTest {
public void testSuggestNetworkTime() throws Exception {
doNothing().when(mMockContext).enforceCallingOrSelfPermission(anyString(), any());
NetworkTimeSuggestion NetworkTimeSuggestion = createNetworkTimeSuggestion();
mTimeDetectorService.suggestNetworkTime(NetworkTimeSuggestion);
NetworkTimeSuggestion networkTimeSuggestion = createNetworkTimeSuggestion();
mTimeDetectorService.suggestNetworkTime(networkTimeSuggestion);
mTestHandler.assertTotalMessagesEnqueued(1);
verify(mMockContext).enforceCallingOrSelfPermission(
eq(android.Manifest.permission.SET_TIME), anyString());
mTestHandler.waitForMessagesToBeProcessed();
mFakeTimeDetectorStrategy.verifySuggestNetworkTimeCalled(NetworkTimeSuggestion);
mFakeTimeDetectorStrategy.verifySuggestNetworkTimeCalled(networkTimeSuggestion);
}
@Test(expected = SecurityException.class)