commit 2b93b273fbfb5dbc0831253044513d3419846336
author Miguel Aranda <miguelaranda@google.com> Mon Oct 23 08:55:34 2023 +0000
committer Miguel Aranda <miguelaranda@google.com> Mon Oct 23 09:05:10 2023 +0000
tree 426b625bf3183bb9721ea7ded4b37149c6a37c11
parent e7041ab6ac17baed8a45a18a61bc064680b6df55

Add non MTS marking to NoIV tests.

Change-Id: I32d27b658bf44a361acff27d3f42b5d911ac4b61
Test: atest test_PBKDF2WITHHMACSHA1_SKFactory_and_PBEAESCBC_Cipher_noIV
Bug: 306151427

luni/src/test/java/libcore/javax/crypto/CipherTest.java

diff --git a/luni/src/test/java/libcore/javax/crypto/CipherTest.java b/luni/src/test/java/libcore/javax/crypto/CipherTest.java
index 69b8efc..87bc94e 100644
--- a/luni/src/test/java/libcore/javax/crypto/CipherTest.java
+++ b/luni/src/test/java/libcore/javax/crypto/CipherTest.java
@@ -24,6 +24,7 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import dalvik.annotation.compat.VersionCodes;
 import java.nio.charset.StandardCharsets;
 import java.security.AlgorithmParameters;
 import java.security.InvalidAlgorithmParameterException;
@@ -44,7 +45,9 @@
 import junit.framework.TestCase;
 import libcore.java.security.StandardNames;
 import libcore.test.annotation.NonCts;
+import libcore.test.annotation.NonMts;
 import libcore.test.reasons.NonCtsReasons;
+import libcore.test.reasons.NonMtsReasons;
 import org.junit.Assume;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -617,6 +620,8 @@
      * mixing them is not recommended.
      */
     @NonCts(bug = 290912610, reason = NonCtsReasons.NON_BREAKING_BEHAVIOR_FIX)
+    @NonMts(reason = NonMtsReasons.ICU_VERSION_DEPENDENCY,
+            disabledUntilSdk = VersionCodes.UPSIDE_DOWN_CAKE)
     @Test
     public void test_PBKDF2WITHHMACSHA1_SKFactory_and_PBEAESCBC_Cipher_noIV() throws Exception {
         Assume.assumeNotNull(Security.getProvider("BC"));