commit c240b247062a4adb2ec99f6be77d883ee3360168
author Xiao Ma <xiaom@google.com> Wed Jan 20 01:40:02 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 20 01:40:02 2021 +0000
tree 39af6a4e60403e368dd0c3980eb806d0e04d0f6a
parent 6776ba075c2870b99941f94c13d26ed379c10c0c
parent 18006eb04e7ebd2272c20035af7eaebe7a5e0e6b

Merge "Cleanup testOverrideVendorId static member after running unittest."

tests/unit/src/android/net/dhcp/DhcpPacketTest.java

diff --git a/tests/unit/src/android/net/dhcp/DhcpPacketTest.java b/tests/unit/src/android/net/dhcp/DhcpPacketTest.java
index ff03a8d..d668691 100644
--- a/tests/unit/src/android/net/dhcp/DhcpPacketTest.java
+++ b/tests/unit/src/android/net/dhcp/DhcpPacketTest.java
@@ -55,6 +55,7 @@
 
 import com.android.internal.util.HexDump;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -98,6 +99,11 @@
         DhcpPacket.testOverrideVendorId = "android-dhcp-???";
     }
 
+    @After
+    public void tearDown() {
+        DhcpPacket.testOverrideVendorId = null;
+    }
+
     class TestDhcpPacket extends DhcpPacket {
         private byte mType;
         // TODO: Make this a map of option numbers to bytes instead.