diff options
| author | Sarah Chin <sarahchin@google.com> | 2021-10-06 16:38:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-10-06 16:38:18 +0000 |
| commit | 35df10a4b166f64aa04a8939f7843ab9d0d511c2 (patch) | |
| tree | 2decf8ecb29e87ae656d7b419fa1338e87cb8e49 | |
| parent | 3a5c54ca0696ed9bd3de9316534e306b9db78cef (diff) | |
| parent | 7b861069e90ff3da40687166971769aea219521e (diff) | |
| download | cts-temp_sam_202323961.tar.gz | |
Merge "Update CTS tests for IRadioData classes" into stage-aosp-mastertemp_sam_202323961
| -rw-r--r-- | tests/tests/telephony/current/src/android/telephony/cts/RouteSelectionDescriptorTest.java | 6 | ||||
| -rw-r--r-- | tests/tests/telephony/current/src/android/telephony/cts/UrspRuleTest.java | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/tests/tests/telephony/current/src/android/telephony/cts/RouteSelectionDescriptorTest.java b/tests/tests/telephony/current/src/android/telephony/cts/RouteSelectionDescriptorTest.java index 7a7650293c6..0b12c465279 100644 --- a/tests/tests/telephony/current/src/android/telephony/cts/RouteSelectionDescriptorTest.java +++ b/tests/tests/telephony/current/src/android/telephony/cts/RouteSelectionDescriptorTest.java @@ -21,7 +21,7 @@ import static android.telephony.data.RouteSelectionDescriptor.SESSION_TYPE_IPV4; import static com.google.common.truth.Truth.assertThat; -import android.hardware.radio.V1_6.SliceInfo; +import android.telephony.data.NetworkSliceInfo; import android.telephony.data.RouteSelectionDescriptor; import org.junit.Test; @@ -36,8 +36,8 @@ public class RouteSelectionDescriptorTest { @Test public void testConstructorAndGetters() { - List<SliceInfo> si = new ArrayList<SliceInfo>(); - List<String> dnn = new ArrayList<String>(); + List<NetworkSliceInfo> si = new ArrayList<>(); + List<String> dnn = new ArrayList<>(); RouteSelectionDescriptor rsd = new RouteSelectionDescriptor( TEST_PRECEDENCE, TEST_SESSION_TYPE, TEST_SSC_MODE, si, dnn); assertThat(rsd.getPrecedence()).isEqualTo(TEST_PRECEDENCE); diff --git a/tests/tests/telephony/current/src/android/telephony/cts/UrspRuleTest.java b/tests/tests/telephony/current/src/android/telephony/cts/UrspRuleTest.java index 919fe82449b..3755968f073 100644 --- a/tests/tests/telephony/current/src/android/telephony/cts/UrspRuleTest.java +++ b/tests/tests/telephony/current/src/android/telephony/cts/UrspRuleTest.java @@ -18,8 +18,8 @@ package android.telephony.cts; import static com.google.common.truth.Truth.assertThat; -import android.hardware.radio.V1_6.RouteSelectionDescriptor; -import android.hardware.radio.V1_6.TrafficDescriptor; +import android.telephony.data.RouteSelectionDescriptor; +import android.telephony.data.TrafficDescriptor; import android.telephony.data.UrspRule; import org.junit.Test; @@ -32,8 +32,8 @@ public class UrspRuleTest { @Test public void testConstructorAndGetters() { - List<TrafficDescriptor> tds = new ArrayList<TrafficDescriptor>(); - List<RouteSelectionDescriptor> rsds = new ArrayList<RouteSelectionDescriptor>(); + List<TrafficDescriptor> tds = new ArrayList<>(); + List<RouteSelectionDescriptor> rsds = new ArrayList<>(); UrspRule ur = new UrspRule(TEST_PRECEDENCE, tds, rsds); assertThat(ur.getPrecedence()).isEqualTo(TEST_PRECEDENCE); assertThat(ur.getTrafficDescriptors()).isNotEqualTo(null); |