summaryrefslogtreecommitdiff
path: root/tests/unit/java/android/net/KeepalivePacketDataUtilTest.java
diff options
context:
space:
mode:
authorRemi NGUYEN VAN <reminv@google.com>2021-06-15 07:17:28 +0000
committerRemi NGUYEN VAN <reminv@google.com>2021-07-02 01:59:40 +0000
commit8f260383f74d62bcafcd1820acdeefcaf4f3e083 (patch)
tree2e6b2f52a489ec36e38a814fe4f24734903e0851 /tests/unit/java/android/net/KeepalivePacketDataUtilTest.java
parent0e2dbf31060a898ed4b350c715f99aff6ed9a42f (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 Bug: 187935317 Original-Change: https://android-review.googlesource.com/1736261 Merged-In: Ic06a0db7fefb4acf38b66feba9b47e21f9927b1c Change-Id: Ic06a0db7fefb4acf38b66feba9b47e21f9927b1c
Diffstat (limited to 'tests/unit/java/android/net/KeepalivePacketDataUtilTest.java')
-rw-r--r--tests/unit/java/android/net/KeepalivePacketDataUtilTest.java15
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 {