diff options
| -rw-r--r-- | expectations/taggedtests.txt | 2 | ||||
| -rw-r--r-- | luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/DHPublicKeyTest.java | 12 |
2 files changed, 6 insertions, 8 deletions
diff --git a/expectations/taggedtests.txt b/expectations/taggedtests.txt index 20825fa170..cc2a4d62b8 100644 --- a/expectations/taggedtests.txt +++ b/expectations/taggedtests.txt @@ -9,6 +9,8 @@ names: [ /* libcore tests that take over 15 minutes on device because of DHParametersHelper.generateSafePrimes */ "org.apache.harmony.crypto.tests.javax.crypto.func.KeyAgreementFunctionalTest", + "org.apache.harmony.crypto.tests.javax.crypto.interfaces.DHPrivateKeyTest", + "org.apache.harmony.crypto.tests.javax.crypto.interfaces.DHPublicKeyTest", /* non-AOSP tests http://b/8027066 */ "java.util.EnumSet.EnumSetBash", "java.io.PipedInputStream.CloseAndAvailableRC", diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/DHPublicKeyTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/DHPublicKeyTest.java index 61680fe963..bc7b3386c4 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/DHPublicKeyTest.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/DHPublicKeyTest.java @@ -22,29 +22,26 @@ package org.apache.harmony.crypto.tests.javax.crypto.interfaces; -import org.junit.Test; +import junit.framework.TestCase; import java.math.BigInteger; import java.security.KeyPair; import java.security.KeyPairGenerator; + +import javax.crypto.interfaces.DHKey; import javax.crypto.interfaces.DHPublicKey; import javax.crypto.spec.DHParameterSpec; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - /** * Tests for <code>DHPublicKey</code> class field * */ -public class DHPublicKeyTest { +public class DHPublicKeyTest extends TestCase { /** * Test for <code>serialVersionUID</code> field */ - @Test public void testField() { checkDHPublicKey key = new checkDHPublicKey(); assertEquals("Incorrect serialVersionUID", @@ -52,7 +49,6 @@ public class DHPublicKeyTest { -6628103563352519193L); } - @Test(timeout = 30 * 60 * 1000) // http://b/30741591 public void test_getParams() throws Exception { KeyPairGenerator kg = KeyPairGenerator.getInstance("DH"); kg.initialize(1024); |