Update CTS tests for IRadioData classes
Test: atest RouteSelectionDescriptorTest, UrspRuleTest
Bug: 198331673
Change-Id: I03b93de8589ba8ff5a32385ec49ae07ba5e8ee7a
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 7a76502..0b12c46 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 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 @@
@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 919fe82..3755968 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 @@
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 @@
@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);
