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

Fix KeepalivePacketDataUtilTest crash on eng build

Browse Source 
The test causes a Log.wtf to be logged, because it tests a method that
should not be used after R. Mock the terrible failure handler to avoid
crashes on eng builds.

Test: atest KeepalivePacketDataUtilTest

Change-Id: Ic06a0db7fefb4acf38b66feba9b47e21f9927b1c
This commit is contained in:
Remi NGUYEN VAN
2021-06-11 08:52:51 +09:00
parent a6c06af0fa
commit b397b5645a
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/unit/java/android/net/KeepalivePacketDataUtilTest.java
View File

@@ -24,7 +24,9 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
import android.net.util.KeepalivePacketDataUtil; import android.net.util.KeepalivePacketDataUtil;
import android.util.Log;
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 org.junit.runner.RunWith;
@@ -38,8 +40,19 @@ public final class KeepalivePacketDataUtilTest {
private static final byte[] IPV4_KEEPALIVE_SRC_ADDR = {10, 0, 0, 1}; private static final byte[] IPV4_KEEPALIVE_SRC_ADDR = {10, 0, 0, 1};
private static final byte[] IPV4_KEEPALIVE_DST_ADDR = {10, 0, 0, 5}; private static final byte[] IPV4_KEEPALIVE_DST_ADDR = {10, 0, 0, 5};
private Log.TerribleFailureHandler mOriginalHandler;
@Before @Before
public void setUp() {} public void setUp() {
// Terrible failures are logged when using deprecated methods on newer platforms
mOriginalHandler = Log.setWtfHandler((tag, what, sys) ->
Log.e(tag, "Terrible failure in test", what));
}
@After
public void tearDown() {
Log.setWtfHandler(mOriginalHandler);
}
@Test @Test
public void testFromTcpKeepaliveStableParcelable() throws Exception { public void testFromTcpKeepaliveStableParcelable() throws Exception {