summaryrefslogtreecommitdiff
path: root/tests/unit/java/android/net/IpSecAlgorithmTest.java
diff options
context:
space:
mode:
authorRemi NGUYEN VAN <reminv@google.com>2021-08-25 18:00:20 +0900
committerRemi NGUYEN VAN <reminv@google.com>2021-08-25 18:10:22 +0900
commitae7508f9b5807b846b1afbd8d2fbe0c601dbaafa (patch)
tree0a3c5f89270a05a63ed0ac87d7b48ce9e142e947 /tests/unit/java/android/net/IpSecAlgorithmTest.java
parent77992bbfbb898284d669034ed4d3de540e90f036 (diff)
Fix IpSecAlgorithmTest on S
The test may be run on S builds older than itself, in which case the resource ID may not match. Query the resource ID dynamically instead of using the constant. IpSecAlgorithm is not updatable in S, which is why it can use hidden/unstable platform resources, so the test could also be skipped altogether on S. But considering that keeping it around is not very costly yet, this change fixes it for running on S. Bug: 197489543 Test: atest IpSecAlgorithmTest Change-Id: I533eede3a360a8db9089e65e017b9d7453b35539
Diffstat (limited to 'tests/unit/java/android/net/IpSecAlgorithmTest.java')
-rw-r--r--tests/unit/java/android/net/IpSecAlgorithmTest.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/unit/java/android/net/IpSecAlgorithmTest.java b/tests/unit/java/android/net/IpSecAlgorithmTest.java
index c2a759b83a..c473e82945 100644
--- a/tests/unit/java/android/net/IpSecAlgorithmTest.java
+++ b/tests/unit/java/android/net/IpSecAlgorithmTest.java
@@ -217,8 +217,11 @@ public class IpSecAlgorithmTest {
final Set<String> optionalAlgoSet = getOptionalAlgos();
final String[] optionalAlgos = optionalAlgoSet.toArray(new String[0]);
- doReturn(optionalAlgos).when(mMockResources)
- .getStringArray(com.android.internal.R.array.config_optionalIpSecAlgorithms);
+ // Query the identifier instead of using the R.array constant, as the test may be built
+ // separately from the platform and they may not match.
+ final int resId = Resources.getSystem().getIdentifier("config_optionalIpSecAlgorithms",
+ "array", "android");
+ doReturn(optionalAlgos).when(mMockResources).getStringArray(resId);
final Set<String> enabledAlgos = new HashSet<>(IpSecAlgorithm.loadAlgos(mMockResources));
final Set<String> expectedAlgos = ALGO_TO_REQUIRED_FIRST_SDK.keySet();