LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Add test coverage for ConnectivityService.dump with arguments" am: c0b2b37faa

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2112804

Change-Id: I469b7fcdad43022ea0efda39d50bd1c99f1e3f78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Chiachang Wang
2022-06-01 05:45:44 +00:00
committed by Automerger Merge Worker
parent d0a31d8e08 c0b2b37faa
commit 5e2a2a0a73
1 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
tests/unit/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -11704,6 +11704,12 @@ public class ConnectivityServiceTest {
mCm.unregisterNetworkCallback(networkCallback); mCm.unregisterNetworkCallback(networkCallback);
} }
private void verifyDump(String[] args) {
final StringWriter stringWriter = new StringWriter();
mService.dump(new FileDescriptor(), new PrintWriter(stringWriter), args);
assertFalse(stringWriter.toString().isEmpty());
}
@Test @Test
public void testDumpDoesNotCrash() { public void testDumpDoesNotCrash() {
mServiceContext.setPermission(DUMP, PERMISSION_GRANTED); mServiceContext.setPermission(DUMP, PERMISSION_GRANTED);
@@ -11716,11 +11722,26 @@ public class ConnectivityServiceTest {
.addTransportType(TRANSPORT_WIFI).build(); .addTransportType(TRANSPORT_WIFI).build();
mCm.registerNetworkCallback(genericRequest, genericNetworkCallback); mCm.registerNetworkCallback(genericRequest, genericNetworkCallback);
mCm.registerNetworkCallback(wifiRequest, wifiNetworkCallback); mCm.registerNetworkCallback(wifiRequest, wifiNetworkCallback);
final StringWriter stringWriter = new StringWriter();
mService.dump(new FileDescriptor(), new PrintWriter(stringWriter), new String[0]); verifyDump(new String[0]);
assertFalse(stringWriter.toString().isEmpty()); // Verify dump with arguments.
final String dumpPrio = "--dump-priority";
final String[] dumpArgs = {dumpPrio};
verifyDump(dumpArgs);
final String[] highDumpArgs = {dumpPrio, "HIGH"};
verifyDump(highDumpArgs);
final String[] normalDumpArgs = {dumpPrio, "NORMAL"};
verifyDump(normalDumpArgs);
// Invalid args should do dumpNormal w/o exception
final String[] unknownDumpArgs = {dumpPrio, "UNKNOWN"};
verifyDump(unknownDumpArgs);
final String[] invalidDumpArgs = {"UNKNOWN"};
verifyDump(invalidDumpArgs);
} }
@Test @Test