diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2021-06-11 08:52:51 +0900 |
|---|---|---|
| committer | Remi NGUYEN VAN <reminv@google.com> | 2021-06-14 18:13:39 +0900 |
| commit | b397b5645a2e5727bee5d548959b341e6fc95ce2 (patch) | |
| tree | 1dd20ce1fb60efec56b9aec03b11e025af0a668b /tests/unit/java/android/net/KeepalivePacketDataUtilTest.java | |
| parent | a6c06af0fae69feef184662b674f18b34f2f3195 (diff) | |
Fix KeepalivePacketDataUtilTest crash on eng build
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
Diffstat (limited to 'tests/unit/java/android/net/KeepalivePacketDataUtilTest.java')
| -rw-r--r-- | tests/unit/java/android/net/KeepalivePacketDataUtilTest.java | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/tests/unit/java/android/net/KeepalivePacketDataUtilTest.java b/tests/unit/java/android/net/KeepalivePacketDataUtilTest.java index fc739fbfac..bc6dbf21d5 100644 --- a/tests/unit/java/android/net/KeepalivePacketDataUtilTest.java +++ b/tests/unit/java/android/net/KeepalivePacketDataUtilTest.java @@ -24,7 +24,9 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import android.net.util.KeepalivePacketDataUtil; +import android.util.Log; +import org.junit.After; import org.junit.Before; import org.junit.Test; 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_DST_ADDR = {10, 0, 0, 5}; + private Log.TerribleFailureHandler mOriginalHandler; + @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 public void testFromTcpKeepaliveStableParcelable() throws Exception { |
