diff options
| author | Brian Carlstrom <bdc@google.com> | 2011-03-02 23:34:29 -0800 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2011-03-02 23:34:29 -0800 |
| commit | 229e34b182b98e1dba15d3dc6341954986ae2b7a (patch) | |
| tree | 56a6fc1f8e680e9225ce4942f739b146473aeac4 | |
| parent | 062d37bcc1a5e29ff4d9f20556973dbd82ce98e2 (diff) | |
| download | libcore-229e34b182b98e1dba15d3dc6341954986ae2b7a.zip libcore-229e34b182b98e1dba15d3dc6341954986ae2b7a.tar.gz libcore-229e34b182b98e1dba15d3dc6341954986ae2b7a.tar.bz2 | |
Removing use of @tests and @Test.* annotations
Change-Id: I89243efdeebe22543c45a2166b634f40c3e78cf8
554 files changed, 2353 insertions, 30239 deletions
diff --git a/luni/src/test/java/libcore/java/io/OldCharArrayReaderTest.java b/luni/src/test/java/libcore/java/io/OldCharArrayReaderTest.java index 31277e0..a28b84f 100644 --- a/luni/src/test/java/libcore/java/io/OldCharArrayReaderTest.java +++ b/luni/src/test/java/libcore/java/io/OldCharArrayReaderTest.java @@ -27,7 +27,7 @@ public class OldCharArrayReaderTest extends junit.framework.TestCase { CharArrayReader cr; /** - * @tests java.io.CharArrayReader#CharArrayReader(char[]) + * java.io.CharArrayReader#CharArrayReader(char[]) */ public void test_Constructor$C() { // Test for method java.io.CharArrayReader(char []) @@ -41,7 +41,7 @@ public class OldCharArrayReaderTest extends junit.framework.TestCase { } /** - * @tests java.io.CharArrayReader#CharArrayReader(char[], int, int) + * java.io.CharArrayReader#CharArrayReader(char[], int, int) */ public void test_Constructor$CII() throws IOException { try { @@ -76,7 +76,7 @@ public class OldCharArrayReaderTest extends junit.framework.TestCase { } /** - * @tests java.io.CharArrayReader#close() + * java.io.CharArrayReader#close() */ public void test_close() { cr = new CharArrayReader(hw); @@ -91,7 +91,7 @@ public class OldCharArrayReaderTest extends junit.framework.TestCase { } /** - * @tests java.io.CharArrayReader#mark(int) + * java.io.CharArrayReader#mark(int) */ public void test_markI() throws IOException { cr = new CharArrayReader(hw); @@ -112,7 +112,7 @@ public class OldCharArrayReaderTest extends junit.framework.TestCase { } /** - * @tests java.io.CharArrayReader#markSupported() + * java.io.CharArrayReader#markSupported() */ public void test_markSupported() { cr = new CharArrayReader(hw); @@ -120,7 +120,7 @@ public class OldCharArrayReaderTest extends junit.framework.TestCase { } /** - * @tests java.io.CharArrayReader#read() + * java.io.CharArrayReader#read() */ public void test_read() throws IOException { cr = new CharArrayReader(hw); @@ -140,7 +140,7 @@ public class OldCharArrayReaderTest extends junit.framework.TestCase { } /** - * @tests java.io.CharArrayReader#read(char[], int, int) + * java.io.CharArrayReader#read(char[], int, int) */ public void test_read$CII() throws IOException { // Test for method int java.io.CharArrayReader.read(char [], int, int) @@ -214,7 +214,7 @@ public class OldCharArrayReaderTest extends junit.framework.TestCase { } /** - * @tests java.io.CharArrayReader#reset() + * java.io.CharArrayReader#reset() */ public void test_reset() throws IOException { cr = new CharArrayReader(hw); diff --git a/luni/src/test/java/libcore/java/io/OldLineNumberReaderTest.java b/luni/src/test/java/libcore/java/io/OldLineNumberReaderTest.java index 7e27698..71c7bbe 100644 --- a/luni/src/test/java/libcore/java/io/OldLineNumberReaderTest.java +++ b/luni/src/test/java/libcore/java/io/OldLineNumberReaderTest.java @@ -50,7 +50,7 @@ public class OldLineNumberReaderTest extends TestCase { } /** - * @tests java.io.LineNumberReader#read() + * java.io.LineNumberReader#read() */ public void test_read() throws IOException { lnr = new LineNumberReader(new StringReader(text)); @@ -72,7 +72,7 @@ public class OldLineNumberReaderTest extends TestCase { } /** - * @tests java.io.LineNumberReader#read(char[], int, int) + * java.io.LineNumberReader#read(char[], int, int) */ public void test_read$CII() throws IOException { lnr = new LineNumberReader(new StringReader(text)); diff --git a/luni/src/test/java/libcore/java/io/OldObjectOutputStreamTest.java b/luni/src/test/java/libcore/java/io/OldObjectOutputStreamTest.java index cf01d9d..f05da69 100644 --- a/luni/src/test/java/libcore/java/io/OldObjectOutputStreamTest.java +++ b/luni/src/test/java/libcore/java/io/OldObjectOutputStreamTest.java @@ -148,7 +148,7 @@ public class OldObjectOutputStreamTest extends TestCase implements Serializable static final String INIT_STR_VALUE = "a string that is blortz"; /** - * @tests java.io.ObjectOutputStream#ObjectOutputStream(java.io.OutputStream) + * java.io.ObjectOutputStream#ObjectOutputStream(java.io.OutputStream) */ public void test_ConstructorLjava_io_OutputStream() throws IOException { oos.close(); diff --git a/luni/src/test/java/libcore/java/io/OldPushbackReaderTest.java b/luni/src/test/java/libcore/java/io/OldPushbackReaderTest.java index 31d921b..b4f5ab6 100644 --- a/luni/src/test/java/libcore/java/io/OldPushbackReaderTest.java +++ b/luni/src/test/java/libcore/java/io/OldPushbackReaderTest.java @@ -30,7 +30,7 @@ public class OldPushbackReaderTest extends junit.framework.TestCase { String pbString = "Hello World"; /** - * @tests java.io.PushbackReader#PushbackReader(java.io.Reader) + * java.io.PushbackReader#PushbackReader(java.io.Reader) */ public void test_ConstructorLjava_io_Reader() { // Test for method java.io.PushbackReader(java.io.Reader) @@ -53,7 +53,7 @@ public class OldPushbackReaderTest extends junit.framework.TestCase { } /** - * @tests java.io.PushbackReader#PushbackReader(java.io.Reader, int) + * java.io.PushbackReader#PushbackReader(java.io.Reader, int) */ public void test_ConstructorLjava_io_ReaderI() throws IOException { PushbackReader tobj; @@ -78,7 +78,7 @@ public class OldPushbackReaderTest extends junit.framework.TestCase { } /** - * @tests java.io.PushbackReader#close() + * java.io.PushbackReader#close() */ public void test_close() throws IOException { PushbackReader tobj; @@ -97,7 +97,7 @@ public class OldPushbackReaderTest extends junit.framework.TestCase { } /** - * @tests java.io.PushbackReader#markSupported() + * java.io.PushbackReader#markSupported() */ public void test_markSupported() { assertFalse("Test 1: markSupported() must return false.", @@ -105,7 +105,7 @@ public class OldPushbackReaderTest extends junit.framework.TestCase { } /** - * @tests java.io.PushbackReader#read() + * java.io.PushbackReader#read() */ public void test_read() throws IOException { PushbackReader tobj; @@ -122,7 +122,7 @@ public class OldPushbackReaderTest extends junit.framework.TestCase { } /** - * @tests java.io.PushbackReader#read(char[], int, int) + * java.io.PushbackReader#read(char[], int, int) */ public void test_read$CII() throws IOException { PushbackReader tobj; @@ -156,7 +156,7 @@ public class OldPushbackReaderTest extends junit.framework.TestCase { } /** - * @tests java.io.PushbackReader#read(char[], int, int) + * java.io.PushbackReader#read(char[], int, int) */ public void test_read_$CII_Exception() throws IOException { pbr = new PushbackReader(new StringReader(pbString), 10); @@ -224,7 +224,7 @@ public class OldPushbackReaderTest extends junit.framework.TestCase { } /** - * @tests java.io.PushbackReader#ready() + * java.io.PushbackReader#ready() */ public void test_ready() throws IOException { PushbackReader tobj; @@ -240,7 +240,7 @@ public class OldPushbackReaderTest extends junit.framework.TestCase { } } /** - * @tests java.io.PushbackReader#unread(char[]) + * java.io.PushbackReader#unread(char[]) */ public void test_unread$C() throws IOException { PushbackReader tobj; @@ -281,7 +281,7 @@ public class OldPushbackReaderTest extends junit.framework.TestCase { /** * @throws IOException - * @tests java.io.PushbackReader#skip(long) + * java.io.PushbackReader#skip(long) */ public void test_skip$J() throws IOException { PushbackReader tobj; @@ -300,7 +300,7 @@ public class OldPushbackReaderTest extends junit.framework.TestCase { } /** - * @tests java.io.PushbackReader#unread(char[], int, int) + * java.io.PushbackReader#unread(char[], int, int) */ public void test_unread$CII() throws IOException { PushbackReader tobj; @@ -345,7 +345,7 @@ public class OldPushbackReaderTest extends junit.framework.TestCase { } /** - * @tests java.io.PushbackReader#unread(int) + * java.io.PushbackReader#unread(int) */ public void test_unreadI() throws IOException { PushbackReader tobj; diff --git a/luni/src/test/java/libcore/java/io/OldRandomAccessFileTest.java b/luni/src/test/java/libcore/java/io/OldRandomAccessFileTest.java index c63cd7e..5e360cc 100644 --- a/luni/src/test/java/libcore/java/io/OldRandomAccessFileTest.java +++ b/luni/src/test/java/libcore/java/io/OldRandomAccessFileTest.java @@ -46,7 +46,7 @@ public class OldRandomAccessFileTest extends junit.framework.TestCase { static final int testLength = testString.length(); /** - * @tests java.io.RandomAccessFile#RandomAccessFile(java.io.File, + * java.io.RandomAccessFile#RandomAccessFile(java.io.File, * java.lang.String) */ public void test_ConstructorLjava_io_FileLjava_lang_String() throws Exception { @@ -99,7 +99,7 @@ public class OldRandomAccessFileTest extends junit.framework.TestCase { } /** - * @tests java.io.RandomAccessFile#RandomAccessFile(java.lang.String, + * java.io.RandomAccessFile#RandomAccessFile(java.lang.String, * java.lang.String) */ public void test_ConstructorLjava_lang_StringLjava_lang_String() @@ -163,7 +163,7 @@ public class OldRandomAccessFileTest extends junit.framework.TestCase { } /** - * @tests java.io.RandomAccessFile#close() + * java.io.RandomAccessFile#close() */ public void test_close() { // Test for method void java.io.RandomAccessFile.close() @@ -176,7 +176,7 @@ public class OldRandomAccessFileTest extends junit.framework.TestCase { } /** - * @tests java.io.RandomAccessFile#getChannel() + * java.io.RandomAccessFile#getChannel() */ public void test_getChannel() throws IOException { @@ -196,7 +196,7 @@ public class OldRandomAccessFileTest extends junit.framework.TestCase { } /** - * @tests java.io.RandomAccessFile#getFD() + * java.io.RandomAccessFile#getFD() */ public void test_getFD() throws IOException { // Test for method java.io.FileDescriptor @@ -210,7 +210,7 @@ public class OldRandomAccessFileTest extends junit.framework.TestCase { } /** - * @tests java.io.RandomAccessFile#getFilePointer() + * java.io.RandomAccessFile#getFilePointer() */ public void test_getFilePointer() throws IOException { // Test for method long java.io.RandomAccessFile.getFilePointer() @@ -228,7 +228,7 @@ public class OldRandomAccessFileTest extends junit.framework.TestCase { } /** - * @tests java.io.RandomAccessFile#length() + * java.io.RandomAccessFile#length() */ public void test_length() throws IOException { // Test for method long java.io.RandomAccessFile.length() @@ -246,7 +246,7 @@ public class OldRandomAccessFileTest extends junit.framework.TestCase { } /** - * @tests java.io.RandomAccessFile#read() + * java.io.RandomAccessFile#read() */ public void test_read_write() throws IOException { int i; @@ -286,7 +286,7 @@ public class OldRandomAccessFileTest extends junit.framework.TestCase { } /** - * @tests java.io.RandomAccessFile#read(byte[]) + * java.io.RandomAccessFile#read(byte[]) */ public void test_read$B() throws IOException { FileOutputStream fos = new java.io.FileOutputStream(fileName); @@ -315,7 +315,7 @@ public class OldRandomAccessFileTest extends junit.framework.TestCase { } /** - * @tests java.io.RandomAccessFile#read(byte[], int, int) + * java.io.RandomAccessFile#read(byte[], int, int) */ public void test_read$BII() throws IOException { int bytesRead; @@ -377,8 +377,8 @@ public class OldRandomAccessFileTest extends junit.framework.TestCase { } /** - * @tests java.io.RandomAccessFile#readBoolean() - * @tests java.io.RandomAccessFile#writeBoolean(boolean) + * java.io.RandomAccessFile#readBoolean() + * java.io.RandomAccessFile#writeBoolean(boolean) */ public void test_read_writeBoolean() throws IOException { RandomAccessFile raf = new java.io.RandomAccessFile(fileName, "rw"); @@ -414,8 +414,8 @@ public class OldRandomAccessFileTest extends junit.framework.TestCase { } /** - * @tests java.io.RandomAccessFile#readByte() - * @tests java.io.RandomAccessFile#writeByte(byte) + * java.io.RandomAccessFile#readByte() + * java.io.RandomAccessFile#writeByte(byte) */ public void test_read_writeByte() throws IOException { RandomAccessFile raf = new java.io.RandomAccessFile(fileName, "rw"); @@ -460,8 +460,8 @@ public class OldRandomAccessFileTest extends junit.framework.TestCase { } /** - * @tests java.io.RandomAccessFile#readChar() - * @tests java.io.RandomAccessFile#writeChar(char) + * java.io.RandomAccessFile#readChar() + * java.io.RandomAccessFile#writeChar(char) */ public void test_read_writeChar() throws IOException { RandomAccessFile raf = new java.io.RandomAccessFile(fileName, "rw"); @@ -506,8 +506,8 @@ public class OldRandomAccessFileTest extends junit.framework.TestCase { } /** - * @tests java.io.RandomAccessFile#readDouble() - * @tests java.io.RandomAccessFile#writeDouble(double) + * java.io.RandomAccessFile#readDouble() + * java.io.RandomAccessFile#writeDouble(double) */ public void test_read_writeDouble() throws IOException { RandomAccessFile raf = new java.io.RandomAccessFile(fileName, "rw"); @@ -543,8 +543,8 @@ public class OldRandomAccessFileTest extends junit.framework.TestCase { } /** - * @tests java.io.RandomAccessFile#readFloat() - * @tests java.io.RandomAccessFile#writeFloat(double) + * java.io.RandomAccessFile#readFloat() + * java.io.RandomAccessFile#writeFloat(double) */ public void test_read_writeFloat() throws IOException { RandomAccessFile raf = new java.io.RandomAccessFile(fileName, "rw"); @@ -580,8 +580,8 @@ public class OldRandomAccessFileTest extends junit.framework.TestCase { } /** - * @tests java.io.RandomAccessFile#readInt() - * @tests java.io.RandomAccessFile#writeInt(char) + * java.io.RandomAccessFile#readInt() + * java.io.RandomAccessFile#writeInt(char) */ public void test_read_writeInt() throws IOException { RandomAccessFile raf = new java.io.RandomAccessFile(fileName, "rw"); @@ -626,8 +626,8 @@ public class OldRandomAccessFileTest extends junit.framework.TestCase { } /** - * @tests java.io.RandomAccessFile#readLong() - * @tests java.io.RandomAccessFile#writeLong(char) + * java.io.RandomAccessFile#readLong() + * java.io.RandomAccessFile#writeLong(char) */ public void test_read_writeLong() throws IOException { RandomAccessFile raf = new java.io.RandomAccessFile(fileName, "rw"); @@ -672,8 +672,8 @@ public class OldRandomAccessFileTest extends junit.framework.TestCase { } /** - * @tests java.io.RandomAccessFile#readShort() - * @tests java.io.RandomAccessFile#writeShort(short) + * java.io.RandomAccessFile#readShort() + * java.io.RandomAccessFile#writeShort(short) */ public void test_read_writeShort() throws IOException { RandomAccessFile raf = new java.io.RandomAccessFile(fileName, "rw"); @@ -718,8 +718,8 @@ public class OldRandomAccessFileTest extends junit.framework.TestCase { } /** - * @tests java.io.RandomAccessFile#readUTF() - * @tests java.io.RandomAccessFile#writeShort(char) + * java.io.RandomAccessFile#readUTF() + * java.io.RandomAccessFile#writeShort(char) */ public void test_read_writeUTF() throws IOException { RandomAccessFile raf = new java.io.RandomAccessFile(fileName, "rw"); @@ -751,8 +751,8 @@ public class OldRandomAccessFileTest extends junit.framework.TestCase { } /** - * @tests java.io.RandomAccessFile#writeBytes(java.lang.String) - * @tests java.io.RandomAccessFile#readFully(byte[]) + * java.io.RandomAccessFile#writeBytes(java.lang.String) + * java.io.RandomAccessFile#readFully(byte[]) */ public void test_readFully$B_writeBytesLjava_lang_String() throws IOException { byte[] buf = new byte[testLength]; @@ -794,8 +794,8 @@ public class OldRandomAccessFileTest extends junit.framework.TestCase { } /** - * @tests java.io.RandomAccessFile#writeBytes(java.lang.String) - * @tests java.io.RandomAccessFile#readFully(byte[], int, int) + * java.io.RandomAccessFile#writeBytes(java.lang.String) + * java.io.RandomAccessFile#readFully(byte[], int, int) */ public void test_readFully$BII() throws IOException { byte[] buf = new byte[testLength]; @@ -857,7 +857,7 @@ public class OldRandomAccessFileTest extends junit.framework.TestCase { } /** - * @tests java.io.RandomAccessFile#readUnsignedByte() + * java.io.RandomAccessFile#readUnsignedByte() */ public void test_readUnsignedByte() throws IOException { RandomAccessFile raf = new java.io.RandomAccessFile(fileName, "rw"); @@ -884,7 +884,7 @@ public class OldRandomAccessFileTest extends junit.framework.TestCase { } /** - * @tests java.io.RandomAccessFile#readUnsignedShort() + * java.io.RandomAccessFile#readUnsignedShort() */ public void test_readUnsignedShort() throws IOException { RandomAccessFile raf = new java.io.RandomAccessFile(fileName, "rw"); @@ -911,7 +911,7 @@ public class OldRandomAccessFileTest extends junit.framework.TestCase { } /** - * @tests java.io.RandomAccessFile#readLine() + * java.io.RandomAccessFile#readLine() */ public void test_readLine() throws IOException { // Test for method java.lang.String java.io.RandomAccessFile.readLine() @@ -936,7 +936,7 @@ public class OldRandomAccessFileTest extends junit.framework.TestCase { } /** - * @tests java.io.RandomAccessFile#seek(long) + * java.io.RandomAccessFile#seek(long) */ public void test_seekJ() throws IOException { // Test for method void java.io.RandomAccessFile.seek(long) @@ -964,7 +964,7 @@ public class OldRandomAccessFileTest extends junit.framework.TestCase { } /** - * @tests java.io.RandomAccessFile#skipBytes(int) + * java.io.RandomAccessFile#skipBytes(int) */ public void test_skipBytesI() throws IOException { byte[] buf = new byte[5]; @@ -996,7 +996,7 @@ public class OldRandomAccessFileTest extends junit.framework.TestCase { } /** - * @tests java.io.RandomAccessFile#skipBytes(int) + * java.io.RandomAccessFile#skipBytes(int) */ public void test_setLengthJ() throws IOException { int bytesRead; @@ -1050,7 +1050,7 @@ public class OldRandomAccessFileTest extends junit.framework.TestCase { } /** - * @tests java.io.RandomAccessFile#write(byte[]) + * java.io.RandomAccessFile#write(byte[]) */ public void test_write$B() throws IOException { byte[] rbuf = new byte[4000]; @@ -1092,7 +1092,7 @@ public class OldRandomAccessFileTest extends junit.framework.TestCase { } /** - * @tests java.io.RandomAccessFile#write(byte[], int, int) + * java.io.RandomAccessFile#write(byte[], int, int) */ public void test_write$BII() throws Exception { RandomAccessFile raf = new java.io.RandomAccessFile(fileName, "rw"); @@ -1161,7 +1161,7 @@ public class OldRandomAccessFileTest extends junit.framework.TestCase { } /** - * @tests java.io.RandomAccessFile#writeChars(java.lang.String) + * java.io.RandomAccessFile#writeChars(java.lang.String) */ public void test_writeCharsLjava_lang_String() throws IOException { RandomAccessFile raf = new java.io.RandomAccessFile(fileName, "rw"); diff --git a/luni/src/test/java/libcore/java/lang/OldThreadGroupTest.java b/luni/src/test/java/libcore/java/lang/OldThreadGroupTest.java index d6b50f8..a7e0075 100644 --- a/luni/src/test/java/libcore/java/lang/OldThreadGroupTest.java +++ b/luni/src/test/java/libcore/java/lang/OldThreadGroupTest.java @@ -232,7 +232,7 @@ public class OldThreadGroupTest extends TestCase implements Thread.UncaughtExcep } /** - * @tests java.lang.ThreadGroup#interrupt() + * java.lang.ThreadGroup#interrupt() */ private static boolean interrupted = false; public void test_interrupt() { diff --git a/luni/src/test/java/libcore/java/lang/OldThreadTest.java b/luni/src/test/java/libcore/java/lang/OldThreadTest.java index 7f0c5b3..1e189f6 100644 --- a/luni/src/test/java/libcore/java/lang/OldThreadTest.java +++ b/luni/src/test/java/libcore/java/lang/OldThreadTest.java @@ -169,7 +169,7 @@ public class OldThreadTest extends junit.framework.TestCase { } /** - * @tests java.lang.Thread#sleep(long) + * java.lang.Thread#sleep(long) */ public void test_sleepJ() { // Note: Not too much we can test here that can be reliably measured. diff --git a/luni/src/test/java/libcore/java/math/OldBigDecimalArithmeticTest.java b/luni/src/test/java/libcore/java/math/OldBigDecimalArithmeticTest.java index 6e22c63..623b854 100644 --- a/luni/src/test/java/libcore/java/math/OldBigDecimalArithmeticTest.java +++ b/luni/src/test/java/libcore/java/math/OldBigDecimalArithmeticTest.java @@ -517,7 +517,7 @@ public class OldBigDecimalArithmeticTest extends TestCase { assertEquals("incorrect value", "1000000", bd.toString()); } /** - * @tests java.math.BigDecimal#add(java.math.BigDecimal) + * java.math.BigDecimal#add(java.math.BigDecimal) */ public void test_addBigDecimal() { BigDecimal add1 = new BigDecimal("23.456"); @@ -534,7 +534,7 @@ public class OldBigDecimalArithmeticTest extends TestCase { } /** - * @tests java.math.BigDecimal#divide(java.math.BigDecimal, + * java.math.BigDecimal#divide(java.math.BigDecimal, * java.math.MathContext) divide(BigDecimal, RoundingMode) */ public void test_DivideBigDecimalRoundingModeUP() { @@ -549,7 +549,7 @@ public class OldBigDecimalArithmeticTest extends TestCase { } /** - * @tests java.math.BigDecimal#divide(java.math.BigDecimal, + * java.math.BigDecimal#divide(java.math.BigDecimal, * java.math.RoundingMode) divide(BigDecimal, RoundingMode) */ public void test_DivideBigDecimalRoundingModeDOWN() { @@ -564,7 +564,7 @@ public class OldBigDecimalArithmeticTest extends TestCase { } /** - * @tests java.math.BigDecimal#divide(java.math.BigDecimal, + * java.math.BigDecimal#divide(java.math.BigDecimal, * java.math.RoundingMode) divide(BigDecimal, RoundingMode) */ public void test_DivideBigDecimalRoundingModeCEILING() { @@ -579,7 +579,7 @@ public class OldBigDecimalArithmeticTest extends TestCase { } /** - * @tests java.math.BigDecimal#divide(java.math.BigDecimal, + * java.math.BigDecimal#divide(java.math.BigDecimal, * java.math.RoundingMode) divide(BigDecimal, RoundingMode) */ public void test_DivideBigDecimalRoundingModeFLOOR() { @@ -594,7 +594,7 @@ public class OldBigDecimalArithmeticTest extends TestCase { } /** - * @tests java.math.BigDecimal#divide(java.math.BigDecimal, + * java.math.BigDecimal#divide(java.math.BigDecimal, * java.math.RoundingMode) divide(BigDecimal, RoundingMode) */ public void test_DivideBigDecimalRoundingModeHALF_UP() { @@ -609,7 +609,7 @@ public class OldBigDecimalArithmeticTest extends TestCase { } /** - * @tests java.math.BigDecimal#divide(java.math.BigDecimal, + * java.math.BigDecimal#divide(java.math.BigDecimal, * java.math.RoundingMode) divide(BigDecimal, RoundingMode) */ public void test_DivideBigDecimalRoundingModeHALF_DOWN() { @@ -628,7 +628,7 @@ public class OldBigDecimalArithmeticTest extends TestCase { } /** - * @tests java.math.BigDecimal#divide(java.math.BigDecimal, + * java.math.BigDecimal#divide(java.math.BigDecimal, * java.math.RoundingMode) divide(BigDecimal, RoundingMode) */ public void test_DivideBigDecimalRoundingModeHALF_EVEN() { @@ -643,7 +643,7 @@ public class OldBigDecimalArithmeticTest extends TestCase { } /** - * @tests java.math.BigDecimal#divide(java.math.BigDecimal, + * java.math.BigDecimal#divide(java.math.BigDecimal, * java.math.RoundingMode) divide(BigDecimal, RoundingMode) */ public void test_DivideBigDecimalRoundingExc() { diff --git a/luni/src/test/java/libcore/java/math/OldBigDecimalConstructorsTest.java b/luni/src/test/java/libcore/java/math/OldBigDecimalConstructorsTest.java index dffa392..e0ca50d 100644 --- a/luni/src/test/java/libcore/java/math/OldBigDecimalConstructorsTest.java +++ b/luni/src/test/java/libcore/java/math/OldBigDecimalConstructorsTest.java @@ -713,7 +713,7 @@ public class OldBigDecimalConstructorsTest extends TestCase { // ANDROID ADDED /** - * @tests java.math.BigDecimal#BigDecimal(java.math.BigInteger, int) + * java.math.BigDecimal#BigDecimal(java.math.BigInteger, int) */ public void test_Constructor_java_math_BigInteger_int() { BigInteger value = new BigInteger("12345908"); @@ -732,7 +732,7 @@ public class OldBigDecimalConstructorsTest extends TestCase { } /** - * @tests java.math.BigDecimal#BigDecimal(double) + * java.math.BigDecimal#BigDecimal(double) */ public void test_Constructor_Double() { BigDecimal big = new BigDecimal(123E04); @@ -760,7 +760,7 @@ public class OldBigDecimalConstructorsTest extends TestCase { } /** - * @tests java.math.BigDecimal#BigDecimal(java.lang.String) + * java.math.BigDecimal#BigDecimal(java.lang.String) */ public void test_Constructor_java_lang_String() throws NumberFormatException { BigDecimal big = new BigDecimal("345.23499600293850"); diff --git a/luni/src/test/java/libcore/java/math/OldBigDecimalConvertTest.java b/luni/src/test/java/libcore/java/math/OldBigDecimalConvertTest.java index 3ce40a6..8f01a17 100644 --- a/luni/src/test/java/libcore/java/math/OldBigDecimalConvertTest.java +++ b/luni/src/test/java/libcore/java/math/OldBigDecimalConvertTest.java @@ -118,7 +118,7 @@ public class OldBigDecimalConvertTest extends TestCase { } /** - * @tests java.math.BigDecimal#longValueExact() Long value of a positive + * java.math.BigDecimal#longValueExact() Long value of a positive * BigDecimal */ public void test_LongValueExactFloatPos() { diff --git a/luni/src/test/java/libcore/java/math/OldBigDecimalTest.java b/luni/src/test/java/libcore/java/math/OldBigDecimalTest.java index cedb3e6..08724c5 100644 --- a/luni/src/test/java/libcore/java/math/OldBigDecimalTest.java +++ b/luni/src/test/java/libcore/java/math/OldBigDecimalTest.java @@ -25,7 +25,7 @@ public class OldBigDecimalTest extends junit.framework.TestCase { BigInteger value = new BigInteger("12345908"); /** - * @tests java.math.BigDecimal#BigDecimal(double) + * java.math.BigDecimal#BigDecimal(double) */ public void test_ConstructorD() { // @@ -50,7 +50,7 @@ public class OldBigDecimalTest extends junit.framework.TestCase { } /** - * @tests java.math.BigDecimal#BigDecimal(java.lang.String) + * java.math.BigDecimal#BigDecimal(java.lang.String) */ public void test_constructor_String_plus_exp() { /* @@ -67,7 +67,7 @@ public class OldBigDecimalTest extends junit.framework.TestCase { } /** - * @tests java.math.BigDecimal#setScale(int, java.math.RoundingMode) + * java.math.BigDecimal#setScale(int, java.math.RoundingMode) */ public void test_setScaleILjava_math_RoundingMode() { BigDecimal setScale1 = new BigDecimal(2.323E102); diff --git a/luni/src/test/java/libcore/java/math/OldBigIntegerConstructorsTest.java b/luni/src/test/java/libcore/java/math/OldBigIntegerConstructorsTest.java index 954d360..44caec2 100644 --- a/luni/src/test/java/libcore/java/math/OldBigIntegerConstructorsTest.java +++ b/luni/src/test/java/libcore/java/math/OldBigIntegerConstructorsTest.java @@ -27,7 +27,7 @@ import junit.framework.TestCase; public class OldBigIntegerConstructorsTest extends TestCase { /** - * @tests java.math.BigInteger#BigInteger(java.lang.String) + * java.math.BigInteger#BigInteger(java.lang.String) */ public void test_ConstrString1() { String s = "0"; @@ -37,7 +37,7 @@ public class OldBigIntegerConstructorsTest extends TestCase { } /** - * @tests java.math.BigInteger#BigInteger(java.lang.String) + * java.math.BigInteger#BigInteger(java.lang.String) */ public void test_ConstrString2() { String s = "-2147483648"; @@ -48,7 +48,7 @@ public class OldBigIntegerConstructorsTest extends TestCase { } /** - * @tests java.math.BigInteger#BigInteger(java.lang.String) + * java.math.BigInteger#BigInteger(java.lang.String) */ public void test_ConstrString3() { String s = "2147483647"; @@ -59,7 +59,7 @@ public class OldBigIntegerConstructorsTest extends TestCase { } /** - * @tests java.math.BigInteger#BigInteger(java.lang.String) + * java.math.BigInteger#BigInteger(java.lang.String) */ public void test_ConstrStringExc1() { try { @@ -70,7 +70,7 @@ public class OldBigIntegerConstructorsTest extends TestCase { } /** - * @tests java.math.BigInteger#BigInteger(java.lang.String) + * java.math.BigInteger#BigInteger(java.lang.String) */ public void test_ConstrStringExc2() { try { @@ -81,7 +81,7 @@ public class OldBigIntegerConstructorsTest extends TestCase { } /** - * @tests java.math.BigInteger#BigInteger(java.lang.String) + * java.math.BigInteger#BigInteger(java.lang.String) */ public void test_ConstrStringExc3() { try { @@ -92,7 +92,7 @@ public class OldBigIntegerConstructorsTest extends TestCase { } /** - * @tests java.math.BigInteger#BigInteger(java.lang.String) + * java.math.BigInteger#BigInteger(java.lang.String) */ public void test_ConstrStringExc4() { try { diff --git a/luni/src/test/java/libcore/java/math/OldBigIntegerOperateBitsTest.java b/luni/src/test/java/libcore/java/math/OldBigIntegerOperateBitsTest.java index dfbb66c..f215c11 100644 --- a/luni/src/test/java/libcore/java/math/OldBigIntegerOperateBitsTest.java +++ b/luni/src/test/java/libcore/java/math/OldBigIntegerOperateBitsTest.java @@ -28,7 +28,7 @@ public class OldBigIntegerOperateBitsTest extends TestCase { /** - * @tests java.math.BigInteger#getLowestSetBit() getLowestSetBit for + * java.math.BigInteger#getLowestSetBit() getLowestSetBit for * negative BigInteger */ public void test_getLowestSetBitNeg() { @@ -43,7 +43,7 @@ public class OldBigIntegerOperateBitsTest extends TestCase { } /** - * @tests java.math.BigInteger#getLowestSetBit() getLowestSetBit for + * java.math.BigInteger#getLowestSetBit() getLowestSetBit for * positive BigInteger */ public void test_getLowestSetBitPos() { @@ -74,7 +74,7 @@ public class OldBigIntegerOperateBitsTest extends TestCase { } /** - * @tests java.math.BigInteger#getLowestSetBit() getLowestSetBit for zero + * java.math.BigInteger#getLowestSetBit() getLowestSetBit for zero * BigInteger */ public void test_getLowestSetBitZero() { diff --git a/luni/src/test/java/libcore/java/net/OldURLClassLoaderTest.java b/luni/src/test/java/libcore/java/net/OldURLClassLoaderTest.java index 35c7f7e..aa36378 100644 --- a/luni/src/test/java/libcore/java/net/OldURLClassLoaderTest.java +++ b/luni/src/test/java/libcore/java/net/OldURLClassLoaderTest.java @@ -54,7 +54,7 @@ public class OldURLClassLoaderTest extends junit.framework.TestCase { }; /** - * @tests java.net.URLClassLoader#URLClassLoader(java.net.URL[]) + * java.net.URLClassLoader#URLClassLoader(java.net.URL[]) */ public void test_Constructor$Ljava_net_URL() throws MalformedURLException { URL[] u = new URL[0]; @@ -85,7 +85,7 @@ public class OldURLClassLoaderTest extends junit.framework.TestCase { } /** - * @tests java.net.URLClassLoader#findResources(java.lang.String) + * java.net.URLClassLoader#findResources(java.lang.String) */ public void test_findResourcesLjava_lang_String() throws Exception { Enumeration<URL> res = null; diff --git a/luni/src/test/java/libcore/java/text/OldAttributedCharacterIteratorAttributeTest.java b/luni/src/test/java/libcore/java/text/OldAttributedCharacterIteratorAttributeTest.java index 58fc605..f550f49 100644 --- a/luni/src/test/java/libcore/java/text/OldAttributedCharacterIteratorAttributeTest.java +++ b/luni/src/test/java/libcore/java/text/OldAttributedCharacterIteratorAttributeTest.java @@ -58,7 +58,7 @@ public class OldAttributedCharacterIteratorAttributeTest extends } /** - * @tests java.text.AttributedCharacterIterator.Attribute#AttributedCharacterIterator.Attribute(java.lang.String) + * java.text.AttributedCharacterIterator.Attribute#AttributedCharacterIterator.Attribute(java.lang.String) * Test of method * java.text.AttributedCharacterIterator.Attribute#AttributedCharacterIterator.Attribute(java.lang.String). */ @@ -71,7 +71,7 @@ public class OldAttributedCharacterIteratorAttributeTest extends } /** - * @tests java.text.AttributedCharacterIterator.Attribute#equals(java.lang.Object) + * java.text.AttributedCharacterIterator.Attribute#equals(java.lang.Object) * Test of method * java.text.AttributedCharacterIterator.Attribute#equals(java.lang.Object). */ @@ -98,7 +98,7 @@ public class OldAttributedCharacterIteratorAttributeTest extends } /** - * @tests java.text.AttributedCharacterIterator.Attribute#getName() Test of + * java.text.AttributedCharacterIterator.Attribute#getName() Test of * method java.text.AttributedCharacterIterator.Attribute#getName(). */ public void test_getName() { @@ -112,7 +112,7 @@ public class OldAttributedCharacterIteratorAttributeTest extends } /** - * @tests java.text.AttributedCharacterIterator.Attribute#hashCode() + * java.text.AttributedCharacterIterator.Attribute#hashCode() */ public void test_hashCode() { try { @@ -140,7 +140,7 @@ public class OldAttributedCharacterIteratorAttributeTest extends } /** - * @tests java.text.AttributedCharacterIterator.Attribute#readResolve() Test + * java.text.AttributedCharacterIterator.Attribute#readResolve() Test * of method * java.text.AttributedCharacterIterator.Attribute#readResolve(). */ @@ -192,7 +192,7 @@ public class OldAttributedCharacterIteratorAttributeTest extends } /** - * @tests java.text.AttributedCharacterIterator.Attribute#toString() Test of + * java.text.AttributedCharacterIterator.Attribute#toString() Test of * method java.text.AttributedCharacterIterator.Attribute#toString(). */ public void test_toString() { diff --git a/luni/src/test/java/libcore/java/text/OldAttributedStringTest.java b/luni/src/test/java/libcore/java/text/OldAttributedStringTest.java index d1e23b7..89f6f13 100644 --- a/luni/src/test/java/libcore/java/text/OldAttributedStringTest.java +++ b/luni/src/test/java/libcore/java/text/OldAttributedStringTest.java @@ -54,7 +54,7 @@ public class OldAttributedStringTest extends junit.framework.TestCase { } /** - * @tests java.text.AttributedString#AttributedString(AttributedCharacterIterator, + * java.text.AttributedString#AttributedString(AttributedCharacterIterator, * int, int) Test of method * java.text.AttributedString#AttributedString(AttributedCharacterIterator, * int, int). Case 1: Try to consruct AttributedString. Case 2: Try @@ -102,7 +102,7 @@ public class OldAttributedStringTest extends junit.framework.TestCase { } /** - * @tests java.text.AttributedString#AttributedString(AttributedCharacterIterator, + * java.text.AttributedString#AttributedString(AttributedCharacterIterator, * int, int, AttributedCharacterIterator.Attribute[]) Test of method * java.text.AttributedString#AttributedString(AttributedCharacterIterator, * int, int, AttributedCharacterIterator.Attribute[]). Case 1: Try to @@ -150,7 +150,7 @@ public class OldAttributedStringTest extends junit.framework.TestCase { } /** - * @tests java.text.AttributedString#AttributedString(AttributedCharacterIterator, + * java.text.AttributedString#AttributedString(AttributedCharacterIterator, * int, int, Map<? extends AttributedCharacterIterator.Attribute,?>) * Test of method * java.text.AttributedString#AttributedString(AttributedCharacterIterator, @@ -321,7 +321,7 @@ public class OldAttributedStringTest extends junit.framework.TestCase { } /** - * @tests java.text.AttributedString.addAttribute(AttributedCharacterIterator, + * java.text.AttributedString.addAttribute(AttributedCharacterIterator, * Object) */ public void test_addAttributeLjava_text_AttributedCharacterIterator$AttributeLjava_lang_Object() { @@ -348,7 +348,7 @@ public class OldAttributedStringTest extends junit.framework.TestCase { } /** - * @tests java.text.AttributedString#addAttributes(Map<? extends + * java.text.AttributedString#addAttributes(Map<? extends * AttributedCharacterIterator.Attribute,?>, int, int) Tests of * method java.text.AttributedString#addAttributes(Map<? extends * AttributedCharacterIterator.Attribute,?>, int, int). Case 1: Try @@ -392,7 +392,7 @@ public class OldAttributedStringTest extends junit.framework.TestCase { } /** - * @tests java.text.AttributedString#getIterator() Test of method + * java.text.AttributedString#getIterator() Test of method * java.text.AttributedString#getIterator(). */ public void test_getIterator() { @@ -408,7 +408,7 @@ public class OldAttributedStringTest extends junit.framework.TestCase { } /** - * @tests java.text.AttributedString#getIterator(AttributedCharacterIterator.Attribute[]) + * java.text.AttributedString#getIterator(AttributedCharacterIterator.Attribute[]) * Test of method * java.text.AttributedString#getIterator(AttributedCharacterIterator.Attribute[]). */ @@ -438,7 +438,7 @@ public class OldAttributedStringTest extends junit.framework.TestCase { } /** - * @tests java.text.AttributedString#getIterator(AttributedCharacterIterator.Attribute[], + * java.text.AttributedString#getIterator(AttributedCharacterIterator.Attribute[], * int, int) Test of method * java.text.AttributedString#getIterator(AttributedCharacterIterator.Attribute[], * int, int). diff --git a/luni/src/test/java/libcore/java/text/OldDateFormatTest.java b/luni/src/test/java/libcore/java/text/OldDateFormatTest.java index 3a3540c..ad9838e 100644 --- a/luni/src/test/java/libcore/java/text/OldDateFormatTest.java +++ b/luni/src/test/java/libcore/java/text/OldDateFormatTest.java @@ -51,7 +51,7 @@ public class OldDateFormatTest extends junit.framework.TestCase { } /** - * @tests java.text.DateFormat#DateFormat() Test of method + * java.text.DateFormat#DateFormat() Test of method * java.text.DateFormat#DateFormat(). */ public void test_Constructor() { @@ -63,7 +63,7 @@ public class OldDateFormatTest extends junit.framework.TestCase { } /** - * @tests java.text.DateFormat#equals(java.lang.Object obj) Test of + * java.text.DateFormat#equals(java.lang.Object obj) Test of * java.text.DateFormat#equals(java.lang.Object obj). */ public void test_equalsLjava_lang_Object() { @@ -81,7 +81,7 @@ public class OldDateFormatTest extends junit.framework.TestCase { } /** - * @tests java.text.DateFormat#format(java.util.Date) Test of method + * java.text.DateFormat#format(java.util.Date) Test of method * java.text.DateFormat#format(java.util.Date). */ public void test_formatLjava_util_Date() { @@ -98,7 +98,7 @@ public class OldDateFormatTest extends junit.framework.TestCase { } /** - * @tests java.text.DateFormat#format(Object, StringBuffer, FieldPosition) + * java.text.DateFormat#format(Object, StringBuffer, FieldPosition) * Test of method java.text.DateFormat#format(Object, StringBuffer, * FieldPosition) */ @@ -140,7 +140,7 @@ public class OldDateFormatTest extends junit.framework.TestCase { } /** - * @tests java.text.DateFormat#hashCode() Test of method + * java.text.DateFormat#hashCode() Test of method * java.text.DateFormat#hashCode(). */ public void test_hashCode() { @@ -157,7 +157,7 @@ public class OldDateFormatTest extends junit.framework.TestCase { } /** - * @tests java.text.DateFormat#isLenient() Test of method + * java.text.DateFormat#isLenient() Test of method * java.text.DateFormat#isLenient(). */ public void test_isLenient() { @@ -201,7 +201,7 @@ public class OldDateFormatTest extends junit.framework.TestCase { } /** - * @tests java.text.DateFormat#parse(String) + * java.text.DateFormat#parse(String) */ public void test_parseLString() { DateFormat format = DateFormat.getInstance(); @@ -371,7 +371,7 @@ public class OldDateFormatTest extends junit.framework.TestCase { } /** - * @tests java.text.DateFormat#parseObject(String, ParsePosition) Test of + * java.text.DateFormat#parseObject(String, ParsePosition) Test of * method java.text.DateFormat#parseObject(String, ParsePosition). * Case 1: Try to parse correct data string. Case 2: Try to parse * partialy correct data string. Case 3: Try to use argument @@ -439,7 +439,7 @@ public class OldDateFormatTest extends junit.framework.TestCase { } /** - * @tests java.text.DateFormat#setLenient(boolean) Test of method + * java.text.DateFormat#setLenient(boolean) Test of method * java.text.DateFormat#setLenient(boolean). */ public void test_setLenientZ() { @@ -469,7 +469,7 @@ public class OldDateFormatTest extends junit.framework.TestCase { } /** - * @tests java.text.DateFormat#setTimeZone(TimeZone) Test of method + * java.text.DateFormat#setTimeZone(TimeZone) Test of method * java.text.DateFormat#setTimeZone(TimeZone). */ public void test_setTimeZoneLjava_util_TimeZone() { diff --git a/luni/src/test/java/libcore/java/text/OldDecimalFormatSymbolsTest.java b/luni/src/test/java/libcore/java/text/OldDecimalFormatSymbolsTest.java index 0a6b77b..2f1a3cc 100644 --- a/luni/src/test/java/libcore/java/text/OldDecimalFormatSymbolsTest.java +++ b/luni/src/test/java/libcore/java/text/OldDecimalFormatSymbolsTest.java @@ -63,7 +63,7 @@ public class OldDecimalFormatSymbolsTest extends TestCase { } /** - * @tests java.text.DecimalFormatSymbols#DecimalFormatSymbols(java.util.Locale) + * java.text.DecimalFormatSymbols#DecimalFormatSymbols(java.util.Locale) */ public void test_ConstructorLjava_util_Locale() { try { diff --git a/luni/src/test/java/libcore/java/text/OldFormatTest.java b/luni/src/test/java/libcore/java/text/OldFormatTest.java index 0c74749..cc6c529 100644 --- a/luni/src/test/java/libcore/java/text/OldFormatTest.java +++ b/luni/src/test/java/libcore/java/text/OldFormatTest.java @@ -47,7 +47,7 @@ public class OldFormatTest extends TestCase { } /** - * @tests java.text.Format#clone() Test of method java.text.Format#clone(). + * java.text.Format#clone() Test of method java.text.Format#clone(). * Compare of internal variables of cloned objects. */ public void test_clone() { diff --git a/luni/src/test/java/libcore/java/text/OldMessageFormatTest.java b/luni/src/test/java/libcore/java/text/OldMessageFormatTest.java index 82f4415..2701d0e 100644 --- a/luni/src/test/java/libcore/java/text/OldMessageFormatTest.java +++ b/luni/src/test/java/libcore/java/text/OldMessageFormatTest.java @@ -111,7 +111,7 @@ public class OldMessageFormatTest extends TestCase { } /** - * @tests java.text.MessageFormat#setFormat(int, Format) Test of method + * java.text.MessageFormat#setFormat(int, Format) Test of method * java.text.MessageFormat#setFormat(int, Format). Case 1: Compare * getFormats() results after calls to setFormat(). Case 2: Try to * call setFormat() using incorrect index. @@ -383,7 +383,7 @@ public class OldMessageFormatTest extends TestCase { } /** - * @tests java.text.MessageFormat#parseObject(java.lang.String, + * java.text.MessageFormat#parseObject(java.lang.String, * java.text.ParsePosition) Test of method * java.text.MessageFormat#parseObject(java.lang.String, * java.text.ParsePosition). Case 1: Parsing of correct data string. diff --git a/luni/src/test/java/libcore/java/text/OldSimpleDateFormatTest.java b/luni/src/test/java/libcore/java/text/OldSimpleDateFormatTest.java index cbcf7e9..01506df 100644 --- a/luni/src/test/java/libcore/java/text/OldSimpleDateFormatTest.java +++ b/luni/src/test/java/libcore/java/text/OldSimpleDateFormatTest.java @@ -76,7 +76,7 @@ public class OldSimpleDateFormatTest extends junit.framework.TestCase { } /** - * @tests java.text.SimpleDateFormat#SimpleDateFormat(java.lang.String, + * java.text.SimpleDateFormat#SimpleDateFormat(java.lang.String, * java.text.DateFormatSymbols) */ public void test_ConstructorLjava_lang_StringLjava_text_DateFormatSymbols() { @@ -183,7 +183,7 @@ public class OldSimpleDateFormatTest extends junit.framework.TestCase { } /** - * @tests java.text.SimpleDateFormat#applyPattern(java.lang.String) + * java.text.SimpleDateFormat#applyPattern(java.lang.String) */ public void test_applyPatternLjava_lang_String() { // Test for method void @@ -421,7 +421,7 @@ public class OldSimpleDateFormatTest extends junit.framework.TestCase { } /** - * @tests java.text.SimpleDateFormat#format(java.util.Date) + * java.text.SimpleDateFormat#format(java.util.Date) */ public void test_timeZoneFormatting() { // tests specific to formatting of timezones diff --git a/luni/src/test/java/libcore/java/util/jar/OldAttributesNameTest.java b/luni/src/test/java/libcore/java/util/jar/OldAttributesNameTest.java index 0d83715..e499414 100644 --- a/luni/src/test/java/libcore/java/util/jar/OldAttributesNameTest.java +++ b/luni/src/test/java/libcore/java/util/jar/OldAttributesNameTest.java @@ -23,7 +23,7 @@ import junit.framework.TestCase; public class OldAttributesNameTest extends TestCase { /** - * @tests java.util.jar.Attributes.Name#Name(java.lang.String) + * java.util.jar.Attributes.Name#Name(java.lang.String) */ public void test_AttributesName_Constructor() { try { diff --git a/luni/src/test/java/libcore/java/util/jar/OldJarEntryTest.java b/luni/src/test/java/libcore/java/util/jar/OldJarEntryTest.java index ed24d8b..21444a1 100644 --- a/luni/src/test/java/libcore/java/util/jar/OldJarEntryTest.java +++ b/luni/src/test/java/libcore/java/util/jar/OldJarEntryTest.java @@ -50,7 +50,7 @@ public class OldJarEntryTest extends TestCase { /** * @throws IOException - * @tests java.util.jar.JarEntry#JarEntry(java.util.jar.JarEntry) + * java.util.jar.JarEntry#JarEntry(java.util.jar.JarEntry) */ public void test_ConstructorLjava_util_jar_JarEntry_on_null() throws IOException { JarEntry newJarEntry = new JarEntry(jarFile.getJarEntry(entryName)); @@ -66,7 +66,7 @@ public class OldJarEntryTest extends TestCase { } /** - * @tests java.util.jar.JarEntry#JarEntry(java.util.zip.ZipEntry) + * java.util.jar.JarEntry#JarEntry(java.util.zip.ZipEntry) */ public void test_ConstructorLjava_util_zip_ZipEntry() { assertNotNull("Jar file is null", jarFile); @@ -81,7 +81,7 @@ public class OldJarEntryTest extends TestCase { } /** - * @tests java.util.jar.JarEntry#getAttributes() + * java.util.jar.JarEntry#getAttributes() */ public void test_getAttributes() { JarFile attrJar = null; diff --git a/luni/src/test/java/libcore/java/util/jar/OldJarExceptionTest.java b/luni/src/test/java/libcore/java/util/jar/OldJarExceptionTest.java index 397931a..f9d6c5d 100644 --- a/luni/src/test/java/libcore/java/util/jar/OldJarExceptionTest.java +++ b/luni/src/test/java/libcore/java/util/jar/OldJarExceptionTest.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; public class OldJarExceptionTest extends TestCase { /** - * @tests java.util.jar.JarException#JarException(java.lang.String) + * java.util.jar.JarException#JarException(java.lang.String) */ public void test_Constructor() throws Exception { JarException ex = new JarException(); diff --git a/luni/src/test/java/libcore/java/util/jar/OldJarFileTest.java b/luni/src/test/java/libcore/java/util/jar/OldJarFileTest.java index 0da4d0e..8345301 100644 --- a/luni/src/test/java/libcore/java/util/jar/OldJarFileTest.java +++ b/luni/src/test/java/libcore/java/util/jar/OldJarFileTest.java @@ -50,7 +50,7 @@ public class OldJarFileTest extends TestCase { } /** - * @tests java.util.jar.JarFile#JarFile(java.io.File) + * java.util.jar.JarFile#JarFile(java.io.File) */ public void test_ConstructorLjava_io_File() throws IOException { try { @@ -77,7 +77,7 @@ public class OldJarFileTest extends TestCase { } /** - * @tests java.util.jar.JarFile#JarFile(java.lang.String) + * java.util.jar.JarFile#JarFile(java.lang.String) */ public void test_ConstructorLjava_lang_String() throws IOException { try { @@ -105,7 +105,7 @@ public class OldJarFileTest extends TestCase { } /** - * @tests java.util.jar.JarFile#JarFile(java.lang.String, boolean) + * java.util.jar.JarFile#JarFile(java.lang.String, boolean) */ public void test_ConstructorLjava_lang_StringZ() throws IOException { try { @@ -133,7 +133,7 @@ public class OldJarFileTest extends TestCase { } /** - * @tests java.util.jar.JarFile#JarFile(java.io.File, boolean) + * java.util.jar.JarFile#JarFile(java.io.File, boolean) */ public void test_ConstructorLjava_io_FileZ() throws IOException { try { @@ -160,7 +160,7 @@ public class OldJarFileTest extends TestCase { } /** - * @tests java.util.jar.JarFile#JarFile(java.io.File, boolean, int) + * java.util.jar.JarFile#JarFile(java.io.File, boolean, int) */ public void test_ConstructorLjava_io_FileZI() { try { @@ -220,7 +220,7 @@ public class OldJarFileTest extends TestCase { /** * @throws IOException - * @tests java.util.jar.JarFile#getInputStream(java.util.zip.ZipEntry) + * java.util.jar.JarFile#getInputStream(java.util.zip.ZipEntry) */ public void test_getInputStreamLjava_util_jar_JarEntry() throws IOException { File localFile = null; diff --git a/luni/src/test/java/libcore/java/util/zip/OldZipFileTest.java b/luni/src/test/java/libcore/java/util/zip/OldZipFileTest.java index cd28114..9f2864b 100644 --- a/luni/src/test/java/libcore/java/util/zip/OldZipFileTest.java +++ b/luni/src/test/java/libcore/java/util/zip/OldZipFileTest.java @@ -82,7 +82,7 @@ public class OldZipFileTest extends junit.framework.TestCase { /** * @throws IOException - * @tests java.util.zip.ZipFile#close() + * java.util.zip.ZipFile#close() */ public void test_close() throws IOException { // Test for method void java.util.zip.ZipFile.close() @@ -125,7 +125,7 @@ public class OldZipFileTest extends junit.framework.TestCase { /** * @throws IOException - * @tests java.util.zip.ZipFile#getInputStream(java.util.zip.ZipEntry) + * java.util.zip.ZipFile#getInputStream(java.util.zip.ZipEntry) */ public void test_getInputStreamLjava_util_zip_ZipEntry() throws IOException { // Test for method java.io.InputStream diff --git a/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/AnnotationFormatErrorTest.java b/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/AnnotationFormatErrorTest.java index b80f3a9..27a2cc1 100644 --- a/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/AnnotationFormatErrorTest.java +++ b/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/AnnotationFormatErrorTest.java @@ -26,7 +26,7 @@ import junit.framework.TestCase; */ public class AnnotationFormatErrorTest extends TestCase { /** - * @tests java.lang.annotation.AnnotationFormatError#AnnotationFormatError(String) + * java.lang.annotation.AnnotationFormatError#AnnotationFormatError(String) */ @SuppressWarnings("nls") public void test_constructorLjava_lang_String() { @@ -35,7 +35,7 @@ public class AnnotationFormatErrorTest extends TestCase { } /** - * @tests java.lang.annotation.AnnotationFormatError#AnnotationFormatError(Throwable) + * java.lang.annotation.AnnotationFormatError#AnnotationFormatError(Throwable) */ public void test_constructorLjava_lang_Throwable() { IllegalArgumentException iae = new IllegalArgumentException(); @@ -44,7 +44,7 @@ public class AnnotationFormatErrorTest extends TestCase { } /** - * @tests java.lang.annotation.AnnotationFormatError#AnnotationFormatError(String,Throwable) + * java.lang.annotation.AnnotationFormatError#AnnotationFormatError(String,Throwable) */ @SuppressWarnings("nls") public void test_constructorLjava_lang_StringLjava_lang_Throwable() { diff --git a/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/AnnotationTypeMismatchExceptionTest.java b/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/AnnotationTypeMismatchExceptionTest.java index 5a07bd5..19d6533 100644 --- a/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/AnnotationTypeMismatchExceptionTest.java +++ b/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/AnnotationTypeMismatchExceptionTest.java @@ -30,7 +30,7 @@ public class AnnotationTypeMismatchExceptionTest extends TestCase { /** * @throws ClassNotFoundException * @throws SecurityException - * @tests java.lang.annotation.AnnotationTypeMismatchException#AnnotationTypeMismatchException(Method, + * java.lang.annotation.AnnotationTypeMismatchException#AnnotationTypeMismatchException(Method, * String) */ @SuppressWarnings("nls") diff --git a/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/ElementTypeTest.java b/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/ElementTypeTest.java index d81cabd..de32a04 100644 --- a/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/ElementTypeTest.java +++ b/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/ElementTypeTest.java @@ -29,7 +29,7 @@ public class ElementTypeTest extends TestCase { /** * @throws Exception - * @tests java.lang.annotation.ElementType#valueOf(String) + * java.lang.annotation.ElementType#valueOf(String) */ @SuppressWarnings("nls") public void test_valueOfLjava_lang_String() throws Exception { @@ -53,7 +53,7 @@ public class ElementTypeTest extends TestCase { /** * @throws Exception - * @tests java.lang.annotation.ElementType#values() + * java.lang.annotation.ElementType#values() */ @SuppressWarnings("nls") public void test_values() throws Exception { diff --git a/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/IncompleteAnnotationExceptionTest.java b/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/IncompleteAnnotationExceptionTest.java index cf6ba36..4e30595 100644 --- a/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/IncompleteAnnotationExceptionTest.java +++ b/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/IncompleteAnnotationExceptionTest.java @@ -41,7 +41,7 @@ public class IncompleteAnnotationExceptionTest extends TestCase { /** * @throws Exception - * @tests java.lang.annotation.IncompleteAnnotationException#IncompleteAnnotationException(Class, + * java.lang.annotation.IncompleteAnnotationException#IncompleteAnnotationException(Class, * String) */ @SuppressWarnings("nls") diff --git a/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/RetentionPolicyTest.java b/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/RetentionPolicyTest.java index c4f7c03..c7532b7 100644 --- a/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/RetentionPolicyTest.java +++ b/luni/src/test/java/org/apache/harmony/annotation/tests/java/lang/annotation/RetentionPolicyTest.java @@ -28,7 +28,7 @@ import junit.framework.TestCase; public class RetentionPolicyTest extends TestCase { /** * @throws Exception - * @tests java.lang.annotation.RetentionPolicy#valueOf(String) + * java.lang.annotation.RetentionPolicy#valueOf(String) */ @SuppressWarnings("nls") public void test_valueOfLjava_lang_String() throws Exception { @@ -48,7 +48,7 @@ public class RetentionPolicyTest extends TestCase { /** * @throws Exception - * @tests java.lang.annotation.RetentionPolicy#values() + * java.lang.annotation.RetentionPolicy#values() */ @SuppressWarnings("nls") public void test_values() throws Exception { diff --git a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarFileTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarFileTest.java index 9ef33f9..226ea66 100644 --- a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarFileTest.java +++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarFileTest.java @@ -104,7 +104,7 @@ public class JarFileTest extends TestCase { } /** - * @tests java.util.jar.JarFile#JarFile(java.io.File) + * java.util.jar.JarFile#JarFile(java.io.File) */ public void test_ConstructorLjava_io_File() { try { @@ -123,7 +123,7 @@ public class JarFileTest extends TestCase { } /** - * @tests java.util.jar.JarFile#JarFile(java.lang.String) + * java.util.jar.JarFile#JarFile(java.lang.String) */ public void test_ConstructorLjava_lang_String() { try { @@ -143,7 +143,7 @@ public class JarFileTest extends TestCase { } /** - * @tests java.util.jar.JarFile#JarFile(java.lang.String, boolean) + * java.util.jar.JarFile#JarFile(java.lang.String, boolean) */ public void test_ConstructorLjava_lang_StringZ() { try { @@ -163,7 +163,7 @@ public class JarFileTest extends TestCase { } /** - * @tests java.util.jar.JarFile#JarFile(java.io.File, boolean) + * java.util.jar.JarFile#JarFile(java.io.File, boolean) */ public void test_ConstructorLjava_io_FileZ() { try { @@ -182,7 +182,7 @@ public class JarFileTest extends TestCase { } /** - * @tests java.util.jar.JarFile#JarFile(java.io.File, boolean, int) + * java.util.jar.JarFile#JarFile(java.io.File, boolean, int) */ public void test_ConstructorLjava_io_FileZI() { try { @@ -216,8 +216,8 @@ public class JarFileTest extends TestCase { /** * Constructs JarFile object. * - * @tests java.util.jar.JarFile#JarFile(java.io.File) - * @tests java.util.jar.JarFile#JarFile(java.lang.String) + * java.util.jar.JarFile#JarFile(java.io.File) + * java.util.jar.JarFile#JarFile(java.lang.String) */ public void testConstructor_file() throws IOException { File f = new File(resources, jarName); @@ -229,7 +229,7 @@ public class JarFileTest extends TestCase { } /** - * @tests java.util.jar.JarFile#entries() + * java.util.jar.JarFile#entries() */ public void test_entries() throws Exception { /* @@ -271,7 +271,7 @@ public class JarFileTest extends TestCase { /** * @throws IOException - * @tests java.util.jar.JarFile#getJarEntry(java.lang.String) + * java.util.jar.JarFile#getJarEntry(java.lang.String) */ public void test_getEntryLjava_lang_String() throws IOException { try { @@ -308,7 +308,7 @@ public class JarFileTest extends TestCase { /** * @throws IOException - * @tests java.util.jar.JarFile#getJarEntry(java.lang.String) + * java.util.jar.JarFile#getJarEntry(java.lang.String) */ public void test_getJarEntryLjava_lang_String() throws IOException { try { @@ -345,7 +345,7 @@ public class JarFileTest extends TestCase { /** - * @tests java.util.jar.JarFile#getJarEntry(java.lang.String) + * java.util.jar.JarFile#getJarEntry(java.lang.String) */ public void testGetJarEntry() throws Exception { Support_Resources.copyFile(resources, null, jarName); @@ -424,7 +424,7 @@ public class JarFileTest extends TestCase { } /** - * @tests java.util.jar.JarFile#getManifest() + * java.util.jar.JarFile#getManifest() */ public void test_getManifest() { // Test for method java.util.jar.Manifest @@ -515,7 +515,7 @@ public class JarFileTest extends TestCase { } /** - * @tests java.util.jar.JarFile#getInputStream(java.util.zip.ZipEntry) + * java.util.jar.JarFile#getInputStream(java.util.zip.ZipEntry) */ // This test doesn't pass on RI. If entry size is set up incorrectly, // SecurityException is thrown. But SecurityException is thrown on RI only @@ -788,7 +788,7 @@ public class JarFileTest extends TestCase { /** * @throws IOException - * @tests java.util.jar.JarFile#getInputStream(java.util.zip.ZipEntry) + * java.util.jar.JarFile#getInputStream(java.util.zip.ZipEntry) */ public void test_getInputStreamLjava_util_jar_JarEntry() throws IOException { File localFile = null; diff --git a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipFileTest.java b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipFileTest.java index d1bbbe6..17d251b 100644 --- a/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipFileTest.java +++ b/luni/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ZipFileTest.java @@ -69,7 +69,7 @@ public class ZipFileTest extends junit.framework.TestCase { }; /** - * @tests java.util.zip.ZipFile#ZipFile(java.io.File) + * java.util.zip.ZipFile#ZipFile(java.io.File) */ public void test_ConstructorLjava_io_File() { // Test for method java.util.zip.ZipFile(java.io.File) @@ -77,7 +77,7 @@ public class ZipFileTest extends junit.framework.TestCase { } /** - * @tests java.util.zip.ZipFile#ZipFile(java.io.File, int) + * java.util.zip.ZipFile#ZipFile(java.io.File, int) */ public void test_ConstructorLjava_io_FileI() throws IOException { zfile.close(); // about to reopen the same temp file @@ -104,7 +104,7 @@ public class ZipFileTest extends junit.framework.TestCase { /** * @throws IOException - * @tests java.util.zip.ZipFile#ZipFile(java.lang.String) + * java.util.zip.ZipFile#ZipFile(java.lang.String) */ public void test_ConstructorLjava_lang_String() throws IOException { System.setProperty("user.dir", System.getProperty("java.io.tmpdir")); @@ -131,7 +131,7 @@ public class ZipFileTest extends junit.framework.TestCase { } /** - * @tests java.util.zip.ZipFile#finalize() + * java.util.zip.ZipFile#finalize() */ public void test_finalize() throws IOException { InputStream in = Support_Resources.getStream("hyts_ZipFile.zip"); @@ -161,7 +161,7 @@ public class ZipFileTest extends junit.framework.TestCase { /** * @throws IOException - * @tests java.util.zip.ZipFile#close() + * java.util.zip.ZipFile#close() */ public void test_close() throws IOException { // Test for method void java.util.zip.ZipFile.close() @@ -191,7 +191,7 @@ public class ZipFileTest extends junit.framework.TestCase { } /** - * @tests java.util.zip.ZipFile#entries() + * java.util.zip.ZipFile#entries() */ public void test_entries() throws Exception { // Test for method java.util.Enumeration java.util.zip.ZipFile.entries() @@ -225,7 +225,7 @@ public class ZipFileTest extends junit.framework.TestCase { } /** - * @tests java.util.zip.ZipFile#getEntry(java.lang.String) + * java.util.zip.ZipFile#getEntry(java.lang.String) */ public void test_getEntryLjava_lang_String() throws IOException { // Test for method java.util.zip.ZipEntry @@ -290,7 +290,7 @@ public class ZipFileTest extends junit.framework.TestCase { /** * @throws IOException - * @tests java.util.zip.ZipFile#getInputStream(java.util.zip.ZipEntry) + * java.util.zip.ZipFile#getInputStream(java.util.zip.ZipEntry) */ public void test_getInputStreamLjava_util_zip_ZipEntry() throws IOException { // Test for method java.io.InputStream @@ -328,7 +328,7 @@ public class ZipFileTest extends junit.framework.TestCase { } /** - * @tests java.util.zip.ZipFile#getName() + * java.util.zip.ZipFile#getName() */ public void test_getName() { // Test for method java.lang.String java.util.zip.ZipFile.getName() @@ -338,7 +338,7 @@ public class ZipFileTest extends junit.framework.TestCase { /** * @throws IOException - * @tests java.util.zip.ZipFile#size() + * java.util.zip.ZipFile#size() */ public void test_size() throws IOException { assertEquals(6, zfile.size()); @@ -351,7 +351,7 @@ public class ZipFileTest extends junit.framework.TestCase { } /** - * @tests java.io.InputStream#reset() + * java.io.InputStream#reset() */ public void test_reset() throws IOException { // read an uncompressed entry @@ -397,7 +397,7 @@ public class ZipFileTest extends junit.framework.TestCase { } /** - * @tests java.io.InputStream#reset() + * java.io.InputStream#reset() */ public void test_reset_subtest0() throws IOException { // read an uncompressed entry diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/BadPaddingExceptionTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/BadPaddingExceptionTest.java index bb6c6d2..eaa4563 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/BadPaddingExceptionTest.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/BadPaddingExceptionTest.java @@ -22,11 +22,6 @@ package org.apache.harmony.crypto.tests.javax.crypto; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import javax.crypto.BadPaddingException; import junit.framework.TestCase; @@ -36,7 +31,6 @@ import junit.framework.TestCase; * Tests for <code>BadPaddingException</code> class constructors and methods. * */ -@TestTargetClass(BadPaddingException.class) public class BadPaddingExceptionTest extends TestCase { static String[] msgs = { @@ -50,12 +44,6 @@ public class BadPaddingExceptionTest extends TestCase { * Test for <code>BadPaddingException()</code> constructor Assertion: * constructs BadPaddingException with no detail message */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "BadPaddingException", - args = {} - ) public void testBadPaddingException01() { BadPaddingException tE = new BadPaddingException(); assertNull("getMessage() must return null.", tE.getMessage()); @@ -67,12 +55,6 @@ public class BadPaddingExceptionTest extends TestCase { * Assertion: constructs BadPaddingException with detail message msg. * Parameter <code>msg</code> is not null. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "BadPaddingException", - args = {java.lang.String.class} - ) public void testBadPaddingException02() { BadPaddingException tE; for (int i = 0; i < msgs.length; i++) { @@ -87,12 +69,6 @@ public class BadPaddingExceptionTest extends TestCase { * Test for <code>BadPaddingException(String)</code> constructor * Assertion: constructs BadPaddingException when <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "BadPaddingException", - args = {java.lang.String.class} - ) public void testBadPaddingException03() { String msg = null; BadPaddingException tE = new BadPaddingException(msg); diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherInputStream1Test.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherInputStream1Test.java index 30fdab4..4fc9b3d 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherInputStream1Test.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherInputStream1Test.java @@ -22,11 +22,6 @@ package org.apache.harmony.crypto.tests.javax.crypto; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.io.ByteArrayInputStream; import java.security.InvalidKeyException; import java.security.Key; @@ -41,10 +36,8 @@ import javax.crypto.CipherInputStream; import junit.framework.TestCase; -@TestTargetClass(CipherInputStream.class) /** */ - public class CipherInputStream1Test extends TestCase { private static class TestInputStream extends ByteArrayInputStream { @@ -68,12 +61,6 @@ public class CipherInputStream1Test extends TestCase { * CipherInputStream uses NullCipher if Cipher is not specified * in the constructor. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "CipherInputStream", - args = {java.io.InputStream.class} - ) public void testCipherInputStream() throws Exception { byte[] data = new byte[] { -127, -100, -50, -10, -1, 0, 1, 10, 50, 127 }; TestInputStream tis = new TestInputStream(data); @@ -94,12 +81,6 @@ public class CipherInputStream1Test extends TestCase { * read() method testing. Tests that method returns the correct value * (related to the InputStream) and that it returns -1 at the end of stream. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Can not check IOException.", - method = "read", - args = {} - ) public void testRead1() throws Exception { byte[] data = new byte[] { -127, -100, -50, -10, -1, 0, 1, 10, 50, 127 }; TestInputStream tis = new TestInputStream(data); @@ -121,12 +102,6 @@ public class CipherInputStream1Test extends TestCase { * value (related to the InputStream) and that it returns -1 at the end of * stream. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Can not check IOException.", - method = "read", - args = {byte[].class} - ) public void testRead2() throws Exception { byte[] data = new byte[] { -127, -100, -50, -10, -1, 0, 1, 10, 50, 127 }; TestInputStream tis = new TestInputStream(data); @@ -165,12 +140,6 @@ public class CipherInputStream1Test extends TestCase { * bytes in the case of null buffer, and that it returns -1 at the end of * stream. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Can not check IOException.", - method = "read", - args = {byte[].class, int.class, int.class} - ) public void testRead3() throws Exception { byte[] data = new byte[] { -127, -100, -50, -10, -1, 0, 1, 10, 50, 127 }; TestInputStream tis = new TestInputStream(data); @@ -209,12 +178,6 @@ public class CipherInputStream1Test extends TestCase { * skip(long n) method testing. Tests that the method correctly skips the * bytes. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Can not check IOException.", - method = "skip", - args = {long.class} - ) public void testSkip() throws Exception { byte[] data = new byte[] { -127, -100, -50, -10, -1, 0, 1, 10, 50, 127 }; TestInputStream tis = new TestInputStream(data); @@ -253,12 +216,6 @@ public class CipherInputStream1Test extends TestCase { /** * available() method testing. Tests that the method always return 0. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Can not check IOException.", - method = "available", - args = {} - ) public void testAvailable() throws Exception { byte[] data = new byte[] { -127, -100, -50, -10, -1, 0, 1, 10, 50, 127 }; TestInputStream tis = new TestInputStream(data); @@ -271,12 +228,6 @@ public class CipherInputStream1Test extends TestCase { * close() method testing. Tests that the method calls the close() * method of the underlying input stream. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Can not check IOException.", - method = "close", - args = {} - ) public void testClose() throws Exception { byte[] data = new byte[] { -127, -100, -50, -10, -1, 0, 1, 10, 50, 127 }; TestInputStream tis = new TestInputStream(data); @@ -289,12 +240,6 @@ public class CipherInputStream1Test extends TestCase { /** * markSupported() method testing. Tests that mark is not supported. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "markSupported", - args = {} - ) public void testMarkSupported() { byte[] data = new byte[] {-127, -100, -50, -10, -1, 0, 1, 10, 50, 127}; TestInputStream tis = new TestInputStream(data); @@ -303,12 +248,6 @@ public class CipherInputStream1Test extends TestCase { + "should be false.", cis.markSupported()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "CipherInputStream", - args = {java.io.InputStream.class, javax.crypto.Cipher.class} - ) public void test_ConstructorLjava_io_InputStreamLjavax_crypto_Cipher () throws NoSuchAlgorithmException, NoSuchPaddingException, InvalidKeyException { ByteArrayInputStream bais = new ByteArrayInputStream(new byte[100]); diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherInputStreamTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherInputStreamTest.java index 64562bb..e40ceac 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherInputStreamTest.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherInputStreamTest.java @@ -17,11 +17,6 @@ package org.apache.harmony.crypto.tests.javax.crypto; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; import java.io.InputStream; @@ -32,18 +27,11 @@ import javax.crypto.Cipher; import javax.crypto.CipherInputStream; import javax.crypto.NullCipher; -@TestTargetClass(CipherInputStream.class) public class CipherInputStreamTest extends TestCase { /** - * @tests javax.crypto.CipherInputStream#read(byte[] b, int off, int len) + * javax.crypto.CipherInputStream#read(byte[] b, int off, int len) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Regression test. Checks NullPointerException", - method = "read", - args = {byte[].class, int.class, int.class} - ) public void testReadBII() throws Exception { // Regression for HARMONY-1080 CipherInputStream stream = new CipherInputStream(null, new NullCipher()); @@ -56,14 +44,8 @@ public class CipherInputStreamTest extends TestCase { } /** - * @tests javax.crypto.CipherInputStream#close() + * javax.crypto.CipherInputStream#close() */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Regression test. Checks IllegalStateException", - method = "close", - args = {} - ) public void testClose() throws Exception { // Regression for HARMONY-1087 try { diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherOutputStream1Test.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherOutputStream1Test.java index e042a91..359ac66 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherOutputStream1Test.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherOutputStream1Test.java @@ -22,11 +22,6 @@ package org.apache.harmony.crypto.tests.javax.crypto; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.io.BufferedOutputStream; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -45,10 +40,8 @@ import javax.crypto.Cipher; import junit.framework.TestCase; -@TestTargetClass(CipherOutputStream.class) /** */ - public class CipherOutputStream1Test extends TestCase { private static class TestOutputStream extends ByteArrayOutputStream { @@ -68,12 +61,6 @@ public class CipherOutputStream1Test extends TestCase { * CipherOutputStream uses NullCipher if Cipher is not specified * in the constructor. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "CipherOutputStream", - args = {java.io.OutputStream.class} - ) public void testCipherOutputStream() throws Exception { byte[] data = new byte[] { -127, -100, -50, -10, -1, 0, 1, 10, 50, 127 }; TestOutputStream tos = new TestOutputStream(); @@ -90,12 +77,6 @@ public class CipherOutputStream1Test extends TestCase { * write(int b) method testing. Tests that method writes correct values to * the underlying output stream. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Can not check IOException.", - method = "write", - args = {int.class} - ) public void testWrite1() throws Exception { byte[] data = new byte[] { -127, -100, -50, -10, -1, 0, 1, 10, 50, 127 }; TestOutputStream tos = new TestOutputStream(); @@ -114,12 +95,6 @@ public class CipherOutputStream1Test extends TestCase { * write(byte[] b) method testing. Tests that method writes correct values * to the underlying output stream. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Can not check IOException.", - method = "write", - args = {byte[].class} - ) public void testWrite2() throws Exception { byte[] data = new byte[] { -127, -100, -50, -10, -1, 0, 1, 10, 50, 127 }; TestOutputStream tos = new TestOutputStream(); @@ -142,12 +117,6 @@ public class CipherOutputStream1Test extends TestCase { /** * write(byte[] b, int off, int len) method testing. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Can not check IOException.", - method = "write", - args = {byte[].class, int.class, int.class} - ) public void testWrite3() throws Exception { byte[] data = new byte[] { -127, -100, -50, -10, -1, 0, 1, 10, 50, 127 }; TestOutputStream tos = new TestOutputStream(); @@ -163,14 +132,8 @@ public class CipherOutputStream1Test extends TestCase { } /** - * @tests write(byte[] b, int off, int len) + * write(byte[] b, int off, int len) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Regression test. IllegalArgumentException checked.", - method = "write", - args = {byte[].class, int.class, int.class} - ) public void testWrite4() throws Exception { //Regression for HARMONY-758 try { @@ -180,14 +143,8 @@ public class CipherOutputStream1Test extends TestCase { } /** - * @tests write(byte[] b, int off, int len) + * write(byte[] b, int off, int len) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Can not check IOException.", - method = "write", - args = {byte[].class, int.class, int.class} - ) public void testWrite5() throws Exception { //Regression for HARMONY-758 Cipher cf = Cipher.getInstance("DES/CBC/PKCS5Padding"); @@ -203,12 +160,6 @@ public class CipherOutputStream1Test extends TestCase { * flush() method testing. Tests that method flushes the data to the * underlying output stream. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Can not check IOException.", - method = "flush", - args = {} - ) public void testFlush() throws Exception { byte[] data = new byte[] { -127, -100, -50, -10, -1, 0, 1, 10, 50, 127 }; TestOutputStream tos = new TestOutputStream(); @@ -225,12 +176,6 @@ public class CipherOutputStream1Test extends TestCase { * close() method testing. Tests that the method calls the close() method of * the underlying input stream. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Can not check IOException.", - method = "close", - args = {} - ) public void testClose() throws Exception { byte[] data = new byte[] { -127, -100, -50, -10, -1, 0, 1, 10, 50, 127 }; TestOutputStream tos = new TestOutputStream(); @@ -245,12 +190,6 @@ public class CipherOutputStream1Test extends TestCase { + "of its underlying output stream.", tos.wasClosed()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "CipherOutputStream", - args = {java.io.OutputStream.class, javax.crypto.Cipher.class} - ) public void test_ConstructorLjava_io_OutputStreamLjavax_crypto_Cipher() throws NoSuchAlgorithmException, NoSuchPaddingException, InvalidKeyException { ByteArrayOutputStream baos = new ByteArrayOutputStream(); diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherOutputStreamTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherOutputStreamTest.java index aadad1a..329fc1b 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherOutputStreamTest.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherOutputStreamTest.java @@ -17,27 +17,15 @@ package org.apache.harmony.crypto.tests.javax.crypto; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.io.OutputStream; import javax.crypto.Cipher; import javax.crypto.CipherOutputStream; -@TestTargetClass(CipherOutputStream.class) public class CipherOutputStreamTest extends junit.framework.TestCase { /** - * @tests javax.crypto.CipherOutputStream#close() + * javax.crypto.CipherOutputStream#close() */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Regression test. Checks IllegalStateException.", - method = "close", - args = {} - ) public void test_close() throws Exception { // regression test for HARMONY-1139 try { diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherSpiTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherSpiTest.java index e7640d5..e240f6f 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherSpiTest.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/CipherSpiTest.java @@ -22,11 +22,6 @@ package org.apache.harmony.crypto.tests.javax.crypto; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.spec.AlgorithmParameterSpec; import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; @@ -44,7 +39,6 @@ import java.nio.ByteBuffer; import junit.framework.TestCase; -@TestTargetClass(CipherSpi.class) /** * Tests for <code>CipherSpi</code> class constructors and methods. * @@ -145,12 +139,6 @@ public class CipherSpiTest extends TestCase { * Test for <code>CipherSpi</code> constructor * Assertion: constructs CipherSpi */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "CipherSpi", - args = {} - ) public void testCipherSpiTests01() throws IllegalBlockSizeException, BadPaddingException, ShortBufferException { @@ -180,11 +168,6 @@ public class CipherSpiTest extends TestCase { * Test for <code>engineGetKeySize(Key)</code> method * Assertion: It throws UnsupportedOperationException if it is not overridden */ - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "engineGetKeySize", - args = {java.security.Key.class} - ) public void testCipherSpi02() throws Exception { Mock_CipherSpi cSpi = new Mock_CipherSpi(); try { @@ -198,12 +181,6 @@ public class CipherSpiTest extends TestCase { * Test for <code>engineWrap(Key)</code> method * Assertion: It throws UnsupportedOperationException if it is not overridden */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Functionality not tested.", - method = "engineWrap", - args = {java.security.Key.class} - ) public void testCipherSpi03() throws Exception { Mock_CipherSpi cSpi = new Mock_CipherSpi(); try { @@ -217,12 +194,6 @@ public class CipherSpiTest extends TestCase { * Test for <code>engineUnwrap(byte[], String, int)</code> method * Assertion: It throws UnsupportedOperationException if it is not overridden */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Functionality not tested.", - method = "engineUnwrap", - args = {byte[].class, java.lang.String.class, int.class} - ) public void testCipherSpi04() throws Exception { Mock_CipherSpi cSpi = new Mock_CipherSpi(); try { @@ -238,12 +209,6 @@ public class CipherSpiTest extends TestCase { * throws NullPointerException if one of these buffers is null; * throws ShortBufferException is there is no space in output to hold result */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineUpdate", - args = {java.nio.ByteBuffer.class, java.nio.ByteBuffer.class} - ) public void testCipherSpi05() throws ShortBufferException { Mock_CipherSpi cSpi = new Mock_CipherSpi(); byte[] bb = { (byte) 0, (byte) 1, (byte) 2, (byte) 3, (byte) 4, @@ -296,12 +261,6 @@ public class CipherSpiTest extends TestCase { * throws NullPointerException if one of these buffers is null; * throws ShortBufferException is there is no space in output to hold result */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "BadPaddingException & IllegalBlockSizeException checking missed.", - method = "engineDoFinal", - args = {java.nio.ByteBuffer.class, java.nio.ByteBuffer.class} - ) public void testCipherSpi06() throws BadPaddingException, ShortBufferException, IllegalBlockSizeException { Mock_CipherSpi cSpi = new Mock_CipherSpi(); diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/EncryptedPrivateKeyInfoTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/EncryptedPrivateKeyInfoTest.java index 8e277b3..63e5600 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/EncryptedPrivateKeyInfoTest.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/EncryptedPrivateKeyInfoTest.java @@ -22,10 +22,6 @@ package org.apache.harmony.crypto.tests.javax.crypto; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.io.IOException; import java.security.AlgorithmParameters; import java.security.AlgorithmParametersSpi; @@ -57,7 +53,6 @@ import org.apache.harmony.crypto.tests.support.EncryptedPrivateKeyInfoData; import junit.framework.TestCase; -@TestTargetClass(EncryptedPrivateKeyInfo.class) /** * Test for EncryptedPrivateKeyInfo class. * @@ -199,12 +194,6 @@ public class EncryptedPrivateKeyInfoTest extends TestCase { super.setUp(); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getAlgName", - args = {} - ) public void test_getAlgName () { boolean performed = false; for (int i = 0; i < algName.length; i++) { @@ -244,12 +233,6 @@ public class EncryptedPrivateKeyInfoTest extends TestCase { * @throws IOException * @throws NoSuchAlgorithmException */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for EncryptedPrivateKeyInfo(byte[]) constructor.", - method = "EncryptedPrivateKeyInfo", - args = {byte[].class} - ) public final void testEncryptedPrivateKeyInfobyteArray1() throws Exception { new EncryptedPrivateKeyInfo(EncryptedPrivateKeyInfoData .getValidEncryptedPrivateKeyInfoEncoding("DH")); @@ -265,12 +248,6 @@ public class EncryptedPrivateKeyInfoTest extends TestCase { * * @throws IOException */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for EncryptedPrivateKeyInfo(byte[]) constructor.", - method = "EncryptedPrivateKeyInfo", - args = {byte[].class} - ) public final void testEncryptedPrivateKeyInfobyteArray2() throws IOException { try { @@ -287,12 +264,6 @@ public class EncryptedPrivateKeyInfoTest extends TestCase { * Test preconditions: wrong encoding passed as a parameter <br> * Expected: <code>IOException</code> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for EncryptedPrivateKeyInfo(byte[]) constructor.", - method = "EncryptedPrivateKeyInfo", - args = {byte[].class} - ) public final void testEncryptedPrivateKeyInfobyteArray3() { try { new EncryptedPrivateKeyInfo(new byte[0]); @@ -308,12 +279,6 @@ public class EncryptedPrivateKeyInfoTest extends TestCase { * Test preconditions: wrong encoding passed as a parameter <br> * Expected: <code>IOException</code> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for EncryptedPrivateKeyInfo(byte[]) constructor.", - method = "EncryptedPrivateKeyInfo", - args = {byte[].class} - ) public final void testEncryptedPrivateKeyInfobyteArray4() { try { new EncryptedPrivateKeyInfo(new byte[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, @@ -330,12 +295,6 @@ public class EncryptedPrivateKeyInfoTest extends TestCase { * Test preconditions: wrong encoding passed as a parameter <br> * Expected: <code>IOException</code> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for EncryptedPrivateKeyInfo(byte[]) constructor.", - method = "EncryptedPrivateKeyInfo", - args = {byte[].class} - ) public final void testEncryptedPrivateKeyInfobyteArray5() throws Exception { byte[] enc = null; try { @@ -427,12 +386,6 @@ public class EncryptedPrivateKeyInfoTest extends TestCase { * * @throws IOException */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for EncryptedPrivateKeyInfo(byte[]) constructor.", - method = "EncryptedPrivateKeyInfo", - args = {byte[].class} - ) public final void testEncryptedPrivateKeyInfobyteArray6() throws Exception { byte[] encoded = EncryptedPrivateKeyInfoData .getValidEncryptedPrivateKeyInfoEncoding("DSA"); @@ -452,12 +405,6 @@ public class EncryptedPrivateKeyInfoTest extends TestCase { * Test preconditions: valid parameters passed <br> * Expected: must pass without any exceptions */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for EncryptedPrivateKeyInfo(String, byte[]) constructor.", - method = "EncryptedPrivateKeyInfo", - args = {java.lang.String.class, byte[].class} - ) public final void testEncryptedPrivateKeyInfoStringbyteArray1() { boolean performed = false; @@ -482,12 +429,6 @@ public class EncryptedPrivateKeyInfoTest extends TestCase { * Test preconditions: pass nonexistent algorithm name <br> * Expected: <code>NoSuchAlgorithmException</code> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for EncryptedPrivateKeyInfo(String, byte[]) constructor.", - method = "EncryptedPrivateKeyInfo", - args = {java.lang.String.class, byte[].class} - ) public final void testEncryptedPrivateKeyInfoStringbyteArray2() { try { new EncryptedPrivateKeyInfo("bla-bla", @@ -515,12 +456,6 @@ public class EncryptedPrivateKeyInfoTest extends TestCase { * * @throws NoSuchAlgorithmException */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for EncryptedPrivateKeyInfo(String, byte[]) constructor.", - method = "EncryptedPrivateKeyInfo", - args = {java.lang.String.class, byte[].class} - ) public final void testEncryptedPrivateKeyInfoStringbyteArray3() throws NoSuchAlgorithmException { // pass null as name @@ -547,12 +482,6 @@ public class EncryptedPrivateKeyInfoTest extends TestCase { * Test preconditions: pass empty encrypted data <br> * Expected: <code>IllegalArgumentException</code> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for EncryptedPrivateKeyInfo(String, byte[]) constructor.", - method = "EncryptedPrivateKeyInfo", - args = {java.lang.String.class, byte[].class} - ) public final void testEncryptedPrivateKeyInfoStringbyteArray4() throws Exception { try { @@ -572,12 +501,6 @@ public class EncryptedPrivateKeyInfoTest extends TestCase { * * @throws IOException */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for EncryptedPrivateKeyInfo(String, byte[]) constructor.", - method = "EncryptedPrivateKeyInfo", - args = {java.lang.String.class, byte[].class} - ) public final void testEncryptedPrivateKeyInfoStringbyteArray5() throws Exception { byte[] encryptedDataCopy = EncryptedPrivateKeyInfoData.encryptedData @@ -593,15 +516,9 @@ public class EncryptedPrivateKeyInfoTest extends TestCase { } /** - * @tests javax/crypto/EncryptedPrivateKeyInfo(String, byte[]) + * javax/crypto/EncryptedPrivateKeyInfo(String, byte[]) * Checks exception order */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for EncryptedPrivateKeyInfo(String, byte[]) constructor.", - method = "EncryptedPrivateKeyInfo", - args = {java.lang.String.class, byte[].class} - ) public final void testEncryptedPrivateKeyInfoStringbyteArray6() { //Regression for HARMONY-768 try { @@ -630,12 +547,6 @@ public class EncryptedPrivateKeyInfoTest extends TestCase { * @throws IOException * @throws NoSuchAlgorithmException */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality checked. NoSuchAlgorithmException should be tested for complete tests subset.", - method = "EncryptedPrivateKeyInfo", - args = {java.security.AlgorithmParameters.class, byte[].class} - ) public final void testEncryptedPrivateKeyInfoAlgorithmParametersbyteArray1() throws IOException, NoSuchAlgorithmException { AlgorithmParameters ap = null; @@ -683,12 +594,6 @@ public class EncryptedPrivateKeyInfoTest extends TestCase { * @throws NoSuchAlgorithmException * @throws IOException */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "NullPointerException checked.", - method = "EncryptedPrivateKeyInfo", - args = {java.security.AlgorithmParameters.class, byte[].class} - ) public final void testEncryptedPrivateKeyInfoAlgorithmParametersbyteArray2() throws NoSuchAlgorithmException, IOException { // 1: pass null as AlgorithmParameters @@ -723,12 +628,6 @@ public class EncryptedPrivateKeyInfoTest extends TestCase { * @throws NoSuchAlgorithmException * @throws IOException */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "IllegalArgumentException checked.", - method = "EncryptedPrivateKeyInfo", - args = {java.security.AlgorithmParameters.class, byte[].class} - ) public final void testEncryptedPrivateKeyInfoAlgorithmParametersbyteArray3() throws Exception { try { @@ -755,12 +654,6 @@ public class EncryptedPrivateKeyInfoTest extends TestCase { * * @throws IOException */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality checked.", - method = "EncryptedPrivateKeyInfo", - args = {java.security.AlgorithmParameters.class, byte[].class} - ) public final void testEncryptedPrivateKeyInfoAlgorithmParametersbyteArray4() throws Exception { AlgorithmParameters ap = AlgorithmParameters.getInstance("DSA"); @@ -790,12 +683,6 @@ public class EncryptedPrivateKeyInfoTest extends TestCase { * * @throws IOException */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for getAlgParameters method.", - method = "getAlgParameters", - args = {} - ) public final void testGetAlgParameters01() throws IOException { boolean performed = false; for (int i = 0; i < EncryptedPrivateKeyInfoData.algName0.length; i++) { @@ -824,12 +711,6 @@ public class EncryptedPrivateKeyInfoTest extends TestCase { assertTrue("Test not performed", performed); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for getAlgParameters method.", - method = "getAlgParameters", - args = {} - ) public final void testGetAlgParameters01_01() throws Exception { byte[] validEncodingWithUnknownAlgOID = EncryptedPrivateKeyInfoData .getValidEncryptedPrivateKeyInfoEncoding("DH"); @@ -851,12 +732,6 @@ public class EncryptedPrivateKeyInfoTest extends TestCase { * * @throws IOException */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for getAlgParameters method.", - method = "getAlgParameters", - args = {} - ) public final void testGetAlgParameters02() throws IOException { boolean performed = false; for (int i = 0; i < EncryptedPrivateKeyInfoData.algName0.length; i++) { @@ -890,12 +765,6 @@ public class EncryptedPrivateKeyInfoTest extends TestCase { * * @throws IOException */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for getAlgParameters method.", - method = "getAlgParameters", - args = {} - ) public final void testGetAlgParameters03() throws IOException { boolean performed = false; for (int i = 0; i < EncryptedPrivateKeyInfoData.algName0.length; i++) { @@ -925,12 +794,6 @@ public class EncryptedPrivateKeyInfoTest extends TestCase { * * @throws IOException */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for getAlgParameters method.", - method = "getAlgParameters", - args = {} - ) public final void testGetAlgParameters04() throws IOException { boolean performed = false; for (int i = 0; i < EncryptedPrivateKeyInfoData.algName0.length; i++) { @@ -967,12 +830,6 @@ public class EncryptedPrivateKeyInfoTest extends TestCase { * * @throws IOException */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for getEncryptedData method.", - method = "getEncryptedData", - args = {} - ) public final void testGetEncryptedData01() throws IOException { boolean performed = false; for (int i = 0; i < EncryptedPrivateKeyInfoData.algName0.length; i++) { @@ -1002,12 +859,6 @@ public class EncryptedPrivateKeyInfoTest extends TestCase { * name and encrypted data as a parameters <br> * Expected: the equivalent encrypted data must be returned */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for getEncryptedData method.", - method = "getEncryptedData", - args = {} - ) public final void testGetEncryptedData02() { boolean performed = false; for (int i = 0; i < EncryptedPrivateKeyInfoData.algName0.length; i++) { @@ -1038,12 +889,6 @@ public class EncryptedPrivateKeyInfoTest extends TestCase { * * @throws IOException */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for getEncryptedData method.", - method = "getEncryptedData", - args = {} - ) public final void testGetEncryptedData03() throws IOException { boolean performed = false; for (int i = 0; i < EncryptedPrivateKeyInfoData.algName0.length; i++) { @@ -1078,12 +923,6 @@ public class EncryptedPrivateKeyInfoTest extends TestCase { * Expected: refs to encrypted data byte array passed to the ctor and * returned by the method under test must be different */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for getEncryptedData method.", - method = "getEncryptedData", - args = {} - ) public final void testGetEncryptedData04() { boolean performed = false; for (int i = 0; i < EncryptedPrivateKeyInfoData.algName0.length; i++) { @@ -1116,12 +955,6 @@ public class EncryptedPrivateKeyInfoTest extends TestCase { * * @throws IOException */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Can not check IOException", - method = "getEncoded", - args = {} - ) public final void testGetEncoded01() throws IOException { boolean performed = false; for (int i = 0; i < EncryptedPrivateKeyInfoData.algName0.length; i++) { @@ -1151,12 +984,6 @@ public class EncryptedPrivateKeyInfoTest extends TestCase { * * @throws IOException */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Can not check IOException", - method = "getEncoded", - args = {} - ) public final void testGetEncoded02() throws IOException { boolean performed = false; for (int i = 0; i < EncryptedPrivateKeyInfoData.algName0.length; i++) { @@ -1192,12 +1019,6 @@ public class EncryptedPrivateKeyInfoTest extends TestCase { * * @throws IOException */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Can not check IOException", - method = "getEncoded", - args = {} - ) public final void testGetEncoded03() throws IOException { boolean performed = false; for (int i = 0; i < EncryptedPrivateKeyInfoData.algName0.length; i++) { @@ -1236,12 +1057,6 @@ public class EncryptedPrivateKeyInfoTest extends TestCase { * * @throws IOException */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Can not check IOException", - method = "getEncoded", - args = {} - ) public final void testGetEncoded04() throws IOException { boolean performed = false; for (int i = 0; i < EncryptedPrivateKeyInfoData.algName0.length; i++) { @@ -1266,12 +1081,6 @@ public class EncryptedPrivateKeyInfoTest extends TestCase { assertTrue("Test not performed", performed); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for getKeySpec method.", - method = "getKeySpec", - args = {javax.crypto.Cipher.class} - ) public final void testGetKeySpecCipher01() { boolean performed = false; for (int i = 0; i < EncryptedPrivateKeyInfoData.algName0.length; i++) { @@ -1301,12 +1110,6 @@ public class EncryptedPrivateKeyInfoTest extends TestCase { /** * Encrypted data contains valid PKCS8 key info encoding */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for getKeySpec method.", - method = "getKeySpec", - args = {javax.crypto.Cipher.class} - ) public final void test_ROUNDTRIP_GetKeySpecCipher01() { boolean performed = false; @@ -1347,12 +1150,6 @@ public class EncryptedPrivateKeyInfoTest extends TestCase { /** * Encrypted data contains invalid PKCS8 key info encoding */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for getKeySpec method.", - method = "getKeySpec", - args = {javax.crypto.Cipher.class} - ) public final void test_ROUNDTRIP_GetKeySpecCipher02() { boolean performed = false; for (int i = 0; i < algName.length; i++) { @@ -1387,12 +1184,6 @@ public class EncryptedPrivateKeyInfoTest extends TestCase { assertTrue("Test not performed", performed); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Can not check NoSuchAlgorithmException", - method = "getKeySpec", - args = {java.security.Key.class} - ) public final void testGetKeySpecKey01() { boolean performed = false; for (int i = 0; i < EncryptedPrivateKeyInfoData.algName0.length; i++) { @@ -1422,12 +1213,6 @@ public class EncryptedPrivateKeyInfoTest extends TestCase { /** * Encrypted data contains valid PKCS8 key info encoding */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Can not check NoSuchAlgorithmException", - method = "getKeySpec", - args = {java.security.Key.class} - ) public final void test_ROUNDTRIP_GetKeySpecKey01() { boolean performed = false; for (int i = 0; i < algName.length; i++) { @@ -1466,12 +1251,6 @@ public class EncryptedPrivateKeyInfoTest extends TestCase { /** * Encrypted data contains invalid PKCS8 key info encoding */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Can not check NoSuchAlgorithmException", - method = "getKeySpec", - args = {java.security.Key.class} - ) public final void test_ROUNDTRIP_GetKeySpecKey02() { boolean performed = false; for (int i = 0; i < algName.length; i++) { @@ -1502,12 +1281,6 @@ public class EncryptedPrivateKeyInfoTest extends TestCase { assertTrue("Test not performed", performed); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "NoSuchAlgorithmException can not be checking", - method = "getKeySpec", - args = {java.security.Key.class, java.lang.String.class} - ) public final void testGetKeySpecKeyString01() throws Exception { boolean performed = false; for (int i = 0; i < EncryptedPrivateKeyInfoData.algName0.length; i++) { @@ -1575,12 +1348,6 @@ public class EncryptedPrivateKeyInfoTest extends TestCase { /** * Encrypted data contains valid PKCS8 key info encoding */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "In subset missed NoSuchProviderException & NoSuchAlgorithmException checking", - method = "getKeySpec", - args = {java.security.Key.class, java.lang.String.class} - ) public final void test_ROUNDTRIP_GetKeySpecKeyString01() throws Exception { boolean performed = false; for (int i = 0; i < algName.length; i++) { @@ -1630,12 +1397,6 @@ public class EncryptedPrivateKeyInfoTest extends TestCase { /** * Encrypted data contains invalid PKCS8 key info encoding */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "In subset missed NoSuchProviderException & NoSuchAlgorithmException checking", - method = "getKeySpec", - args = {java.security.Key.class, java.lang.String.class} - ) public final void test_ROUNDTRIP_GetKeySpecKeyString02() throws Exception { boolean performed = false; for (int i = 0; i < algName.length; i++) { @@ -1680,12 +1441,6 @@ public class EncryptedPrivateKeyInfoTest extends TestCase { assertTrue("Test not performed", performed); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Can not check NoSuchAlgorithmException", - method = "getKeySpec", - args = {java.security.Key.class, java.security.Provider.class} - ) public final void testGetKeySpecKeyProvider01() throws Exception { boolean performed = false; @@ -1734,12 +1489,6 @@ public class EncryptedPrivateKeyInfoTest extends TestCase { /** * Encrypted data contains valid PKCS8 key info encoding */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Can not check NoSuchAlgorithmException", - method = "getKeySpec", - args = {java.security.Key.class, java.security.Provider.class} - ) public final void test_ROUNDTRIP_GetKeySpecKeyProvider01() { boolean performed = false; @@ -1789,12 +1538,6 @@ public class EncryptedPrivateKeyInfoTest extends TestCase { /** * Encrypted data contains invalid PKCS8 key info encoding */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Can not check NoSuchAlgorithmException", - method = "getKeySpec", - args = {java.security.Key.class, java.security.Provider.class} - ) public final void test_ROUNDTRIP_GetKeySpecKeyProvider02() { boolean performed = false; diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismExceptionTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismExceptionTest.java index b1fbc5b..866ac96 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismExceptionTest.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismExceptionTest.java @@ -22,17 +22,10 @@ package org.apache.harmony.crypto.tests.javax.crypto; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import javax.crypto.ExemptionMechanismException; import junit.framework.TestCase; - -@TestTargetClass(ExemptionMechanismException.class) /** * Tests for <code>ExemptionMechanismException</code> class constructors and * methods. @@ -56,12 +49,6 @@ public class ExemptionMechanismExceptionTest extends TestCase { * Test for <code>ExemptionMechanismException()</code> constructor * Assertion: constructs ExemptionMechanismException with no detail message */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "ExemptionMechanismException", - args = {} - ) public void testExemptionMechanismException01() { ExemptionMechanismException tE = new ExemptionMechanismException(); assertNull("getMessage() must return null.", tE.getMessage()); @@ -78,12 +65,6 @@ public class ExemptionMechanismExceptionTest extends TestCase { * Assertion: constructs ExemptionMechanismException with detail message * msg. Parameter <code>msg</code> is not null. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "ExemptionMechanismException", - args = {java.lang.String.class} - ) public void testExemptionMechanismException02() { ExemptionMechanismException tE; for (int i = 0; i < msgs.length; i++) { @@ -104,12 +85,6 @@ public class ExemptionMechanismExceptionTest extends TestCase { * Assertion: constructs ExemptionMechanismException when <code>msg</code> * is null */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "ExemptionMechanismException", - args = {java.lang.String.class} - ) public void testExemptionMechanismException03() { String msg = null; ExemptionMechanismException tE = new ExemptionMechanismException(msg); diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismSpiTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismSpiTest.java index f0ca626..b363e91 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismSpiTest.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismSpiTest.java @@ -22,11 +22,6 @@ package org.apache.harmony.crypto.tests.javax.crypto; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.math.BigInteger; import java.security.AlgorithmParameters; import java.security.InvalidAlgorithmParameterException; @@ -44,7 +39,6 @@ import org.apache.harmony.crypto.tests.support.MyExemptionMechanismSpi; import junit.framework.TestCase; -@TestTargetClass(ExemptionMechanismSpi.class) /** * Tests for <code>ExemptionMechanismSpi</code> class constructors and * methods. @@ -93,12 +87,6 @@ class Mock_ExemptionMechanismSpi extends MyExemptionMechanismSpi{ * constructs ExemptionMechanismSpi * @throws Exception */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "ExemptionMechanismSpi", - args = {} - ) public void testExemptionMechanismSpi01() throws Exception { Mock_ExemptionMechanismSpi emSpi = new Mock_ExemptionMechanismSpi(){}; int len = MyExemptionMechanismSpi.getLength(); diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismTest.java index 0aadd59..f617adb 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismTest.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismTest.java @@ -17,10 +17,6 @@ package org.apache.harmony.crypto.tests.javax.crypto; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; import dalvik.annotation.SideEffect; import java.math.BigInteger; @@ -48,12 +44,10 @@ import org.apache.harmony.security.tests.support.SpiEngUtils; import junit.framework.TestCase; -@TestTargetClass(ExemptionMechanism.class) /** * Tests for <code>ExemptionMechanism</code> class constructors and methods * */ - public class ExemptionMechanismTest extends TestCase { private static final String srvExemptionMechanism = "ExemptionMechanism"; @@ -66,12 +60,6 @@ public class ExemptionMechanismTest extends TestCase { * Test for <code>ExemptionMechanism</code> constructor * Assertion: creates new object using provider and mechanism name */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "ExemptionMechanism", - args = {javax.crypto.ExemptionMechanismSpi.class, java.security.Provider.class, java.lang.String.class} - ) public void testExemptionMechanism() throws Exception { Provider mProv = (new SpiEngUtils()).new MyProvider("MyExMechProvider", "Provider for ExemptionMechanism testing", @@ -108,15 +96,9 @@ public class ExemptionMechanismTest extends TestCase { } /** - * @tests javax/crypto/ExemptionMechanism#getInstance(String algorithm, String provider) + * javax/crypto/ExemptionMechanism#getInstance(String algorithm, String provider) * Checks exception order */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void testGetInstance() throws Exception { //Regression for HARMONY-762 try { @@ -136,12 +118,6 @@ public class ExemptionMechanismTest extends TestCase { /** * Test for <code>isCryptoAllowed(Key key)</code> method */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isCryptoAllowed", - args = {java.security.Key.class} - ) public void testIsCryptoAllowed() throws Exception { //Regression for HARMONY-1029 @@ -175,12 +151,6 @@ public class ExemptionMechanismTest extends TestCase { /** * Test for <code>genExemptionBlob((byte[] output, int outputOffset)</code> method */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Regression test", - method = "genExemptionBlob", - args = {byte[].class, int.class} - ) public void testGenExemptionBlob() throws Exception { //Regression for HARMONY-1029 Provider mProv = (new SpiEngUtils()).new MyProvider("MyExMechProvider", @@ -216,12 +186,6 @@ public class ExemptionMechanismTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "finalize", - args = {} - ) @SideEffect("Causes OutOfMemoryError to test finalization") public void test_finalize () { Mock_ExemptionMechanism mem = new Mock_ExemptionMechanism(null, null, "Name"); @@ -268,21 +232,6 @@ public class ExemptionMechanismTest extends TestCase { } } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "genExemptionBlob", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - clazz = ExemptionMechanismSpi.class, - method = "engineGenExemptionBlob", - args = {} - ) - }) public void test_genExemptionBlob() throws InvalidKeyException, ExemptionMechanismException { Provider mProv = (new SpiEngUtils()).new MyProvider("MyExMechProvider", @@ -321,12 +270,6 @@ public class ExemptionMechanismTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "genExemptionBlob", - args = {byte[].class} - ) public void test_genExemptionBlob$B() throws InvalidKeyException, ExemptionMechanismException, ShortBufferException { Provider mProv = (new SpiEngUtils()).new MyProvider("MyExMechProvider", @@ -367,21 +310,6 @@ public class ExemptionMechanismTest extends TestCase { } } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "genExemptionBlob", - args = {byte[].class, int.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - clazz = ExemptionMechanismSpi.class, - method = "engineGenExemptionBlob", - args = {byte[].class, int.class} - ) - }) public void test_genExemptionBlob$BI() throws InvalidKeyException, ExemptionMechanismException, ShortBufferException { Provider mProv = (new SpiEngUtils()).new MyProvider("MyExMechProvider", @@ -422,12 +350,6 @@ public class ExemptionMechanismTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Tests Exceptions", - method = "getInstance", - args = {java.lang.String.class} - ) public void test_getInstanceLjava_lang_String() throws Exception { try { ExemptionMechanism.getInstance((String) null); @@ -453,12 +375,6 @@ public class ExemptionMechanismTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Tests Exceptions", - method = "getInstance", - args = {java.lang.String.class, java.security.Provider.class} - ) public void test_getInstanceLjava_lang_StringLjava_security_Provider() throws Exception { Provider mProv = (new SpiEngUtils()).new MyProvider("MyExMechProvider", @@ -492,12 +408,6 @@ public class ExemptionMechanismTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getName", - args = {} - ) public void test_getName() throws Exception { Provider mProv = (new SpiEngUtils()).new MyProvider("MyExMechProvider", "Provider for ExemptionMechanism testing", @@ -513,21 +423,6 @@ public class ExemptionMechanismTest extends TestCase { assertEquals(defaultAlg, em.getName()); } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getOutputSize", - args = {int.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - clazz = ExemptionMechanismSpi.class, - method = "engineGetOutputSize", - args = {int.class} - ) - }) public void test_getOutputSizeI() throws Exception { Provider mProv = (new SpiEngUtils()).new MyProvider("MyExMechProvider", "Provider for ExemptionMechanism testing", @@ -551,12 +446,6 @@ public class ExemptionMechanismTest extends TestCase { assertEquals(10, em.getOutputSize(10)); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getProvider", - args = {} - ) public void test_getProvider() throws Exception { Provider mProv = (new SpiEngUtils()).new MyProvider("MyExMechProvider", "Provider for ExemptionMechanism testing", @@ -572,21 +461,6 @@ public class ExemptionMechanismTest extends TestCase { assertEquals(mProv, em.getProvider()); } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "init", - args = {java.security.Key.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - clazz = ExemptionMechanismSpi.class, - method = "engineInit", - args = {java.security.Key.class} - ) - }) public void test_initLjava_security_Key() throws Exception { Provider mProv = (new SpiEngUtils()).new MyProvider("MyExMechProvider", "Provider for ExemptionMechanism testing", @@ -620,21 +494,6 @@ public class ExemptionMechanismTest extends TestCase { } } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "init", - args = {java.security.Key.class, java.security.AlgorithmParameters.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - clazz = ExemptionMechanismSpi.class, - method = "engineInit", - args = {java.security.Key.class, java.security.AlgorithmParameters.class} - ) - }) public void test_initLjava_security_KeyLjava_security_AlgorithmParameters() throws Exception { Provider mProv = (new SpiEngUtils()).new MyProvider("MyExMechProvider", @@ -676,21 +535,6 @@ public class ExemptionMechanismTest extends TestCase { } } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "init", - args = {java.security.Key.class, java.security.spec.AlgorithmParameterSpec.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - clazz = ExemptionMechanismSpi.class, - method = "engineInit", - args = {java.security.Key.class, java.security.spec.AlgorithmParameterSpec.class} - ) - }) public void test_initLjava_security_KeyLjava_security_spec_AlgorithmParameterSpec() throws Exception{ Provider mProv = (new SpiEngUtils()).new MyProvider("MyExMechProvider", diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/IllegalBlockSizeExceptionTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/IllegalBlockSizeExceptionTest.java index 8887077..4b4ae12 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/IllegalBlockSizeExceptionTest.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/IllegalBlockSizeExceptionTest.java @@ -22,17 +22,11 @@ package org.apache.harmony.crypto.tests.javax.crypto; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import javax.crypto.IllegalBlockSizeException; import junit.framework.TestCase; -@TestTargetClass(IllegalBlockSizeException.class) /** * Tests for <code>IllegalBlockSizeException</code> class constructors and * methods. @@ -51,12 +45,6 @@ public class IllegalBlockSizeExceptionTest extends TestCase { * Test for <code>IllegalBlockSizeException()</code> constructor * Assertion: constructs IllegalBlockSizeException with no detail message */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "IllegalBlockSizeException", - args = {} - ) public void testIllegalBlockSizeException01() { IllegalBlockSizeException tE = new IllegalBlockSizeException(); assertNull("getMessage() must return null.", tE.getMessage()); @@ -68,12 +56,6 @@ public class IllegalBlockSizeExceptionTest extends TestCase { * Assertion: constructs IllegalBlockSizeException with detail message msg. * Parameter <code>msg</code> is not null. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "IllegalBlockSizeException", - args = {java.lang.String.class} - ) public void testIllegalBlockSizeException02() { IllegalBlockSizeException tE; for (int i = 0; i < msgs.length; i++) { @@ -89,12 +71,6 @@ public class IllegalBlockSizeExceptionTest extends TestCase { * Assertion: constructs IllegalBlockSizeException when <code>msg</code> * is null */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "IllegalBlockSizeException", - args = {java.lang.String.class} - ) public void testIllegalBlockSizeException03() { String msg = null; IllegalBlockSizeException tE = new IllegalBlockSizeException(msg); diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreementSpiTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreementSpiTest.java index 7c0313d..83d6ed7 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreementSpiTest.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreementSpiTest.java @@ -37,16 +37,10 @@ import junit.framework.TestCase; import org.apache.harmony.crypto.tests.support.MyKeyAgreementSpi; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; - -@TestTargetClass(KeyAgreementSpi.class) /** * Tests for <code>KeyAgreementSpi</code> class constructors and methods. * */ - public class KeyAgreementSpiTest extends TestCase { class Mock_KeyAgreementSpi extends MyKeyAgreementSpi { @@ -90,12 +84,6 @@ public class KeyAgreementSpiTest extends TestCase { * Test for <code>KeyAgreementSpi</code> constructor Assertion: constructs * KeyAgreementSpi */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "KeyAgreementSpi", - args = {} - ) public void testKeyAgreementSpi01() throws InvalidKeyException, ShortBufferException, NoSuchAlgorithmException, InvalidAlgorithmParameterException { diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreementTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreementTest.java index b79faa5..99d127a 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreementTest.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreementTest.java @@ -22,12 +22,6 @@ package org.apache.harmony.crypto.tests.javax.crypto; -import dalvik.annotation.KnownFailure; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.math.BigInteger; import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; @@ -54,12 +48,10 @@ import org.apache.harmony.security.tests.support.TestKeyPair; import junit.framework.TestCase; -@TestTargetClass(KeyAgreement.class) /** * Tests for KeyAgreement constructor and methods * */ - public class KeyAgreementTest extends TestCase { public static final String srvKeyAgreement = "KeyAgreement"; @@ -124,12 +116,6 @@ public class KeyAgreementTest extends TestCase { * throws NullPointerException when algorithm is null throws * NoSuchAlgorithmException when algorithm isnot available */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for getInstance method.", - method = "getInstance", - args = {java.lang.String.class} - ) public void testGetInstanceString01() throws NoSuchAlgorithmException { try { KeyAgreement.getInstance(null); @@ -150,12 +136,6 @@ public class KeyAgreementTest extends TestCase { * Test for <code> getInstance(String algorithm) </code> method Assertions: * returns KeyAgreement object */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for getInstance method.", - method = "getInstance", - args = {java.lang.String.class} - ) public void testGetInstanceString02() throws NoSuchAlgorithmException { if (!DEFSupported) { fail(NotSupportMsg); @@ -174,12 +154,6 @@ public class KeyAgreementTest extends TestCase { * method Assertions: throws NullPointerException when algorithm is null * throws NoSuchAlgorithmException when algorithm is not available */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for getInstance method.", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void testGetInstanceStringString01() throws NoSuchAlgorithmException, IllegalArgumentException, NoSuchProviderException { @@ -208,12 +182,6 @@ public class KeyAgreementTest extends TestCase { * or empty throws NoSuchProviderException when provider has not be * configured */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for getInstance method.", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void testGetInstanceStringString02() throws IllegalArgumentException, NoSuchAlgorithmException, NoSuchProviderException { @@ -249,12 +217,6 @@ public class KeyAgreementTest extends TestCase { * Test for <code> getInstance(String algorithm, String provider)</code> * method Assertions: returns KeyAgreement object */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for getInstance method.", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void testGetInstanceStringString03() throws IllegalArgumentException, NoSuchAlgorithmException, NoSuchProviderException { @@ -278,12 +240,6 @@ public class KeyAgreementTest extends TestCase { * method Assertions: throws NullPointerException when algorithm is null * throws NoSuchAlgorithmException when algorithm isnot available */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for getInstance method.", - method = "getInstance", - args = {java.lang.String.class, java.security.Provider.class} - ) public void testGetInstanceStringProvider01() throws NoSuchAlgorithmException, IllegalArgumentException { if (!DEFSupported) { @@ -309,12 +265,6 @@ public class KeyAgreementTest extends TestCase { * Test for <code> getInstance(String algorithm, Provider provider)</code> * method Assertions: throws IllegalArgumentException when provider is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for getInstance method.", - method = "getInstance", - args = {java.lang.String.class, java.security.Provider.class} - ) public void testGetInstanceStringProvider02() throws NoSuchAlgorithmException, IllegalArgumentException { if (!DEFSupported) { @@ -335,12 +285,6 @@ public class KeyAgreementTest extends TestCase { * Test for <code> getInstance(String algorithm, Provider provider)</code> * method Assertions: returns KeyAgreement object */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for getInstance method.", - method = "getInstance", - args = {java.lang.String.class, java.security.Provider.class} - ) public void testGetInstanceStringProvider03() throws IllegalArgumentException, NoSuchAlgorithmException { if (!DEFSupported) { @@ -366,53 +310,6 @@ public class KeyAgreementTest extends TestCase { * sharedsecret in buffer and return numbers of bytes; returns SecretKey * object */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Checks functionality only.", - method = "init", - args = {java.security.Key.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Checks functionality only.", - method = "generateSecret", - args = {} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Checks functionality only.", - method = "generateSecret", - args = {byte[].class, int.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Checks functionality only.", - method = "generateSecret", - args = {java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Checks functionality only.", - clazz = KeyAgreementSpi.class, - method = "engineGenerateSecret", - args = {} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Checks functionality only.", - clazz = KeyAgreementSpi.class, - method = "engineGenerateSecret", - args = {byte[].class, int.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Checks functionality only.", - clazz = KeyAgreementSpi.class, - method = "engineGenerateSecret", - args = {java.lang.String.class} - ) - }) public void testGenerateSecret03() throws Exception { if (!DEFSupported) { fail(NotSupportMsg); @@ -441,21 +338,6 @@ public class KeyAgreementTest extends TestCase { * Test for <code>doPhase(Key key, boolean lastPhase)</code> method * Assertion: throws InvalidKeyException if key is not appropriate */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "doPhase", - args = {java.security.Key.class, boolean.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - clazz = KeyAgreementSpi.class, - method = "engineDoPhase", - args = {java.security.Key.class, boolean.class} - ) - }) public void testDoPhase() throws Exception { if (!DEFSupported) { fail(NotSupportMsg); @@ -503,34 +385,6 @@ public class KeyAgreementTest extends TestCase { * <code>init(Key key, AlgorithmParameterSpec params, SecureRandom random)</code> * Assertion: throws InvalidKeyException when key is inappropriate */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Checks InvalidKeyException.", - method = "init", - args = {java.security.Key.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Checks InvalidKeyException.", - method = "init", - args = {java.security.Key.class, java.security.spec.AlgorithmParameterSpec.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Checks InvalidKeyException.", - clazz = KeyAgreementSpi.class, - method = "engineInit", - args = {java.security.Key.class, java.security.spec.AlgorithmParameterSpec.class, java.security.SecureRandom.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Checks InvalidKeyException.", - clazz = KeyAgreementSpi.class, - method = "engineInit", - args = {java.security.Key.class, java.security.SecureRandom.class} - ) - }) public void testInit01() throws Exception { if (!DEFSupported) { fail(NotSupportMsg); @@ -584,21 +438,6 @@ public class KeyAgreementTest extends TestCase { * Assertion: throws AlgorithmParameterException when params are * inappropriate */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Checks InvalidAlgorithmParameterException.This is a complete subset of tests for exceptions checking for init methods group", - method = "init", - args = {java.security.Key.class, java.security.spec.AlgorithmParameterSpec.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Checks InvalidAlgorithmParameterException.This is a complete subset of tests for exceptions checking for init methods group", - clazz = KeyAgreementSpi.class, - method = "engineInit", - args = {java.security.Key.class, java.security.spec.AlgorithmParameterSpec.class, java.security.SecureRandom.class} - ) - }) public void testInit02() throws Exception { if (!DEFSupported) { fail(NotSupportMsg); @@ -638,47 +477,6 @@ public class KeyAgreementTest extends TestCase { * <code>generateSecret()</code> * Assertions: initializes KeyAgreement and returns byte array */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Checks functionality.", - method = "init", - args = {java.security.Key.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Checks functionality.", - method = "init", - args = {java.security.Key.class, java.security.SecureRandom.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Checks functionality.", - method = "generateSecret", - args = {} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Checks functionality.", - clazz = KeyAgreementSpi.class, - method = "engineInit", - args = {java.security.Key.class, java.security.SecureRandom.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Checks functionality.", - clazz = KeyAgreementSpi.class, - method = "engineInit", - args = {java.security.Key.class, java.security.spec.AlgorithmParameterSpec.class, java.security.SecureRandom.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Checks functionality.", - clazz = KeyAgreementSpi.class, - method = "engineGenerateSecret", - args = {} - ) - }) public void testInit03() throws Exception { if (!DEFSupported) { fail(NotSupportMsg); @@ -724,47 +522,6 @@ public class KeyAgreementTest extends TestCase { * <code>generateSecret()</code> * Assertions: initializes KeyAgreement and returns byte array */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Checks functionality.", - method = "init", - args = {java.security.Key.class, java.security.spec.AlgorithmParameterSpec.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Checks functionality.", - method = "init", - args = {java.security.Key.class, java.security.spec.AlgorithmParameterSpec.class, java.security.SecureRandom.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Checks functionality.", - method = "generateSecret", - args = {} - ), - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Checks functionality.", - clazz = KeyAgreementSpi.class, - method = "engineInit", - args = {java.security.Key.class, SecureRandom.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Checks functionality.", - clazz = KeyAgreementSpi.class, - method = "engineInit", - args = {java.security.Key.class, java.security.spec.AlgorithmParameterSpec.class, java.security.SecureRandom.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Checks functionality.", - clazz = KeyAgreementSpi.class, - method = "engineGenerateSecret", - args = {} - ) - }) public void testInit04() throws Exception, InvalidAlgorithmParameterException { if (!DEFSupported) { @@ -826,22 +583,10 @@ public class KeyAgreementTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "KeyAgreement", - args = {javax.crypto.KeyAgreementSpi.class, java.security.Provider.class, java.lang.String.class} - ) public void test_constructor() { assertNotNull(new Mock_KeyAgreement(null, null, null)); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getAlgorithm", - args = {} - ) public void test_getAlgorithm() throws NoSuchAlgorithmException { Mock_KeyAgreement mka = new Mock_KeyAgreement(null, null, null); assertNull(mka.getAlgorithm()); @@ -854,12 +599,6 @@ public class KeyAgreementTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getProvider", - args = {} - ) public void test_getProvider() throws NoSuchAlgorithmException { KeyAgreement keyA; for (int i = 0; i < validValues.length; i++) { @@ -868,20 +607,6 @@ public class KeyAgreementTest extends TestCase { } } -@TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "generateSecret", - args = {byte[].class, int.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - clazz = KeyAgreementSpi.class, - method = "engineGenerateSecret", - args = {byte[].class, int.class} - )}) public void test_generateSecret$BI() throws Exception { if (!DEFSupported) { fail(NotSupportMsg); @@ -908,20 +633,6 @@ public class KeyAgreementTest extends TestCase { } } -@TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "generateSecret", - args = {java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - clazz = KeyAgreementSpi.class, - method = "engineGenerateSecret", - args = {java.lang.String.class} - )}) public void test_generateSecretLjava_lang_String() throws Exception { if (!DEFSupported) { fail(NotSupportMsg); @@ -948,12 +659,6 @@ public class KeyAgreementTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "init", - args = {java.security.Key.class, java.security.SecureRandom.class} - ) public void test_initLjava_security_KeyLjava_security_SecureRandom() throws Exception { if (!DEFSupported) { fail(NotSupportMsg); diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/KeyGeneratorSpiTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/KeyGeneratorSpiTest.java index ff0fd86..7add99e 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/KeyGeneratorSpiTest.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/KeyGeneratorSpiTest.java @@ -22,11 +22,6 @@ package org.apache.harmony.crypto.tests.javax.crypto; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.InvalidAlgorithmParameterException; import java.security.SecureRandom; import java.security.spec.AlgorithmParameterSpec; @@ -37,12 +32,10 @@ import org.apache.harmony.crypto.tests.support.MyKeyGeneratorSpi; import junit.framework.TestCase; -@TestTargetClass(KeyGeneratorSpi.class) /** * Tests for <code>KeyGeneratorSpi</code> class constructors and methods. * */ - public class KeyGeneratorSpiTest extends TestCase { class Mock_KeyGeneratorSpi extends MyKeyGeneratorSpi { @@ -73,7 +66,6 @@ public class KeyGeneratorSpiTest extends TestCase { * Test for <code>KeyGeneratorSpi</code> constructor Assertion: constructs * KeyGeneratorSpi */ - @TestTargetNew(level = TestLevel.COMPLETE, notes = "", method = "KeyGeneratorSpi", args = {}) public void testKeyGeneratorSpi01() throws InvalidAlgorithmParameterException { Mock_KeyGeneratorSpi kgSpi = new Mock_KeyGeneratorSpi(); assertNull("Not null result", kgSpi.engineGenerateKey()); diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/KeyGeneratorTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/KeyGeneratorTest.java index a8ce653..e6b50e1 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/KeyGeneratorTest.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/KeyGeneratorTest.java @@ -22,11 +22,6 @@ package org.apache.harmony.crypto.tests.javax.crypto; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.math.BigInteger; import java.security.InvalidAlgorithmParameterException; import java.security.InvalidParameterException; @@ -50,12 +45,10 @@ import org.apache.harmony.security.tests.support.SpiEngUtils; import junit.framework.TestCase; -@TestTargetClass(KeyGenerator.class) /** * Tests for KeyGenerator constructor and methods * */ - public class KeyGeneratorTest extends TestCase { public static final String srvKeyGenerator = "KeyGenerator"; @@ -115,12 +108,6 @@ public class KeyGeneratorTest extends TestCase { * Test for <code>KeyGenerator</code> constructor Assertion: returns * KeyGenerator object */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "KeyGenerator", - args = {javax.crypto.KeyGeneratorSpi.class, java.security.Provider.class, java.lang.String.class} - ) public void testKeyGenerator() throws NoSuchAlgorithmException, InvalidAlgorithmParameterException { if (!DEFSupported) { @@ -167,12 +154,6 @@ public class KeyGeneratorTest extends TestCase { * throws NullPointerException when algorithm is null throws * NoSuchAlgorithmException when algorithm isnot available */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for getInstance method.", - method = "getInstance", - args = {java.lang.String.class} - ) public void testGetInstanceString01() throws NoSuchAlgorithmException { try { KeyGenerator.getInstance(null); @@ -193,12 +174,6 @@ public class KeyGeneratorTest extends TestCase { * Test for <code> getInstance(String algorithm) </code> method * Assertions: returns KeyGenerator object */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for getInstance method.", - method = "getInstance", - args = {java.lang.String.class} - ) public void testGetInstanceString02() throws NoSuchAlgorithmException { if (!DEFSupported) { fail(NotSupportMsg); @@ -217,12 +192,6 @@ public class KeyGeneratorTest extends TestCase { * throws NullPointerException when algorithm is null * throws NoSuchAlgorithmException when algorithm isnot available */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for getInstance method.", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void testGetInstanceStringString01() throws NoSuchAlgorithmException, IllegalArgumentException, NoSuchProviderException { @@ -251,12 +220,6 @@ public class KeyGeneratorTest extends TestCase { * throws IllegalArgumentException when provider is null or empty * throws NoSuchProviderException when provider has not be configured */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for getInstance method.", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void testGetInstanceStringString02() throws IllegalArgumentException, NoSuchAlgorithmException, NoSuchProviderException { if (!DEFSupported) { @@ -291,12 +254,6 @@ public class KeyGeneratorTest extends TestCase { * Test for <code> getInstance(String algorithm, String provider)</code> method * Assertions: returns KeyGenerator object */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for getInstance method.", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void testGetInstanceStringString03() throws IllegalArgumentException, NoSuchAlgorithmException, NoSuchProviderException { if (!DEFSupported) { @@ -317,12 +274,6 @@ public class KeyGeneratorTest extends TestCase { * throws NullPointerException when algorithm is null * throws NoSuchAlgorithmException when algorithm isnot available */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for getInstance method.", - method = "getInstance", - args = {java.lang.String.class, java.security.Provider.class} - ) public void testGetInstanceStringProvider01() throws NoSuchAlgorithmException, IllegalArgumentException { if (!DEFSupported) { @@ -348,12 +299,6 @@ public class KeyGeneratorTest extends TestCase { * Assertions: * throws IllegalArgumentException when provider is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for getInstance method.", - method = "getInstance", - args = {java.lang.String.class, java.security.Provider.class} - ) public void testGetInstanceStringProvider02() throws NoSuchAlgorithmException, IllegalArgumentException { if (!DEFSupported) { @@ -374,12 +319,6 @@ public class KeyGeneratorTest extends TestCase { * Test for <code> getInstance(String algorithm, Provider provider)</code> method * Assertions: returns KeyGenerator object */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for getInstance method.", - method = "getInstance", - args = {java.lang.String.class, java.security.Provider.class} - ) public void testGetInstanceStringProvider03() throws IllegalArgumentException, NoSuchAlgorithmException { if (!DEFSupported) { @@ -400,18 +339,6 @@ public class KeyGeneratorTest extends TestCase { * Assertion: throws InvalidParameterException if keysize is wrong * */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "init", - args = {int.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "init", - args = {int.class, java.security.SecureRandom.class} - ) - }) public void testInitKey() throws Exception { byte flag = 0xF; if (!DEFSupported) { @@ -451,27 +378,6 @@ public class KeyGeneratorTest extends TestCase { * <code>init(AlgorithmParameterSpec params, SecureRandom random)</code> methods * Assertion: throws InvalidAlgorithmParameterException when params is null */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Checks exceptions only", - method = "init", - args = {java.security.spec.AlgorithmParameterSpec.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Checks exceptions only", - method = "init", - args = {java.security.spec.AlgorithmParameterSpec.class, java.security.SecureRandom.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Checks exceptions only", - clazz = KeyGeneratorSpi.class, - method = "engineInit", - args = {java.security.spec.AlgorithmParameterSpec.class, java.security.SecureRandom.class} - ) - }) public void testInitParams() throws Exception { if (!DEFSupported) { fail(NotSupportMsg); @@ -506,21 +412,6 @@ public class KeyGeneratorTest extends TestCase { * returns SecretKey object * */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "generateKey", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - clazz = KeyGeneratorSpi.class, - method = "engineGenerateKey", - args = {} - ) - }) public void testGenerateKey() throws Exception { if (!DEFSupported) { fail(NotSupportMsg); @@ -550,12 +441,6 @@ public class KeyGeneratorTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getAlgorithm", - args = {} - ) public void test_getAlgorithm() throws NoSuchAlgorithmException { KeyGenerator kg = null; @@ -568,12 +453,6 @@ public class KeyGeneratorTest extends TestCase { assertNull(kg.getAlgorithm()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getProvider", - args = {} - ) public void test_getProvider () throws NoSuchAlgorithmException { KeyGenerator kg = null; @@ -586,21 +465,6 @@ public class KeyGeneratorTest extends TestCase { assertNull(kg.getProvider()); } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "init", - args = {int.class, java.security.SecureRandom.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - clazz = KeyGeneratorSpi.class, - method = "engineInit", - args = {int.class, java.security.SecureRandom.class} - ) - }) public void test_initILjava_security_SecureRandom() throws NoSuchAlgorithmException { SecureRandom random = null; KeyGenerator kg = null; @@ -622,21 +486,6 @@ public class KeyGeneratorTest extends TestCase { } } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "init", - args = {java.security.SecureRandom.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - clazz = KeyGeneratorSpi.class, - method = "engineInit", - args = {java.security.SecureRandom.class} - ) - }) public void test_Ljava_security_SecureRandom() throws NoSuchAlgorithmException { SecureRandom random = null; KeyGenerator kg = null; @@ -649,12 +498,6 @@ public class KeyGeneratorTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "init", - args = {java.security.spec.AlgorithmParameterSpec.class} - ) public void test_initLjava_security_spec_AlgorithmParameterSpec () throws Exception { KeyGenerator kg = null; diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/MacSpiTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/MacSpiTest.java index 48c69d0..550b27b 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/MacSpiTest.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/MacSpiTest.java @@ -22,11 +22,6 @@ package org.apache.harmony.crypto.tests.javax.crypto; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.nio.ByteBuffer; import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; @@ -41,12 +36,10 @@ import org.apache.harmony.crypto.tests.support.MyMacSpi; import junit.framework.TestCase; -@TestTargetClass(MacSpi.class) /** * Tests for <code>MacSpi</code> class constructors and methods. * */ - public class MacSpiTest extends TestCase { class Mock_MacSpi extends MyMacSpi { @@ -164,26 +157,6 @@ class Mock_MacSpi2 extends MyMacSpi2 { * Test for <code>MacSpi</code> constructor * Assertion: constructs MacSpi */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "All others methods are abstract.", - method = "MacSpi", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "All others methods are abstract.", - method = "engineUpdate", - args = {java.nio.ByteBuffer.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "All others methods are abstract.", - method = "clone", - args = {} - ) - }) public void testMacSpiTests01() throws Exception { Mock_MacSpi mSpi = new Mock_MacSpi(); diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/MacTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/MacTest.java index 5950072..e808bc1 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/MacTest.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/MacTest.java @@ -22,11 +22,6 @@ package org.apache.harmony.crypto.tests.javax.crypto; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.math.BigInteger; import java.nio.ByteBuffer; import java.security.InvalidAlgorithmParameterException; @@ -52,12 +47,10 @@ import junit.framework.TestCase; import junit.framework.Test; import junit.framework.TestSuite; -@TestTargetClass(Mac.class) /** * Tests for Mac class constructors and methods * */ - public class MacTest extends TestCase { public static final String srvMac = "Mac"; @@ -118,12 +111,6 @@ public class MacTest extends TestCase { * throws NullPointerException when algorithm is null * throws NoSuchAlgorithmException when algorithm is not available */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for getInstance method.", - method = "getInstance", - args = {java.lang.String.class} - ) public void testMac01() { try { Mac.getInstance(null); @@ -145,12 +132,6 @@ public class MacTest extends TestCase { * Test for <code>getInstance(String algorithm)</code> method * Assertion: returns Mac object */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for getInstance method.", - method = "getInstance", - args = {java.lang.String.class} - ) public void testMac02() throws NoSuchAlgorithmException { if (!DEFSupported) { fail(NotSupportedMsg); @@ -168,12 +149,6 @@ public class MacTest extends TestCase { * throws IllegalArgumentException when provider is null or empty * throws NoSuchProviderException when provider is not available */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for getInstance method.", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void testMac03() throws NoSuchAlgorithmException, NoSuchProviderException { if (!DEFSupported) { fail(NotSupportedMsg); @@ -209,12 +184,6 @@ public class MacTest extends TestCase { * throws NullPointerException when algorithm is null * throws NoSuchAlgorithmException when algorithm is not available */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for getInstance method.", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void testMac04() throws NoSuchAlgorithmException, IllegalArgumentException, NoSuchProviderException { if (!DEFSupported) { @@ -240,12 +209,6 @@ public class MacTest extends TestCase { * Test for <code>getInstance(String algorithm, String provider)</code> method * Assertion: returns Mac object */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for getInstance method.", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void testMac05() throws NoSuchAlgorithmException, NoSuchProviderException, IllegalArgumentException { if (!DEFSupported) { @@ -265,12 +228,6 @@ public class MacTest extends TestCase { * Test for <code>getInstance(String algorithm, Provider provider)</code> method * Assertion: throws IllegalArgumentException when provider is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for getInstance method.", - method = "getInstance", - args = {java.lang.String.class, java.security.Provider.class} - ) public void testMac06() throws NoSuchAlgorithmException, NoSuchProviderException { if (!DEFSupported) { fail(NotSupportedMsg); @@ -291,12 +248,6 @@ public class MacTest extends TestCase { * throws NullPointerException when algorithm is null * throws NoSuchAlgorithmException when algorithm is not available */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for getInstance method.", - method = "getInstance", - args = {java.lang.String.class, java.security.Provider.class} - ) public void testMac07() throws NoSuchAlgorithmException, NoSuchProviderException, IllegalArgumentException { if (!DEFSupported) { @@ -323,12 +274,6 @@ public class MacTest extends TestCase { * Test for <code>getInstance(String algorithm, Provider provider)</code> method * Assertion: returns Mac object */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for getInstance method.", - method = "getInstance", - args = {java.lang.String.class, java.security.Provider.class} - ) public void testMac08() throws NoSuchAlgorithmException, NoSuchProviderException, IllegalArgumentException { if (!DEFSupported) { @@ -347,71 +292,6 @@ public class MacTest extends TestCase { * Assertion: throws IllegalStateException when Mac is not initialized * @throws Exception */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Checks IllegalStateException only but for all methods. Not enough for doFinal(byte[] output, int outOffset) - it can throw ShortBufferException", - method = "doFinal", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Checks IllegalStateException only but for all methods. Not enough for doFinal(byte[] output, int outOffset) - it can throw ShortBufferException", - clazz = MacSpi.class, - method = "engineDoFinal", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Checks IllegalStateException only but for all methods. Not enough for doFinal(byte[] output, int outOffset) - it can throw ShortBufferException", - method = "doFinal", - args = {byte[].class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Checks IllegalStateException only but for all methods. Not enough for doFinal(byte[] output, int outOffset) - it can throw ShortBufferException", - method = "doFinal", - args = {byte[].class, int.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Checks IllegalStateException only but for all methods. Not enough for doFinal(byte[] output, int outOffset) - it can throw ShortBufferException", - method = "update", - args = {byte.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Checks IllegalStateException only but for all methods. Not enough for doFinal(byte[] output, int outOffset) - it can throw ShortBufferException", - clazz = MacSpi.class, - method = "engineUpdate", - args = {byte.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Checks IllegalStateException only but for all methods. Not enough for doFinal(byte[] output, int outOffset) - it can throw ShortBufferException", - method = "update", - args = {byte[].class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Checks IllegalStateException only but for all methods. Not enough for doFinal(byte[] output, int outOffset) - it can throw ShortBufferException", - method = "update", - args = {byte[].class, int.class, int.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Checks IllegalStateException only but for all methods. Not enough for doFinal(byte[] output, int outOffset) - it can throw ShortBufferException", - clazz = MacSpi.class, - method = "engineUpdate", - args = {byte[].class, int.class, int.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Checks IllegalStateException only but for all methods. Not enough for doFinal(byte[] output, int outOffset) - it can throw ShortBufferException", - method = "update", - args = {java.nio.ByteBuffer.class} - ) - }) public void testMac09() throws Exception { if (!DEFSupported) { fail(NotSupportedMsg); @@ -475,12 +355,6 @@ public class MacTest extends TestCase { * throws ShotBufferException when outOffset is negative or * outOffset >= output.length or when given buffer is small */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Checks ShortBufferException", - method = "doFinal", - args = {byte[].class, int.class} - ) public void testMac10() throws NoSuchAlgorithmException, NoSuchProviderException, IllegalArgumentException, IllegalStateException, InvalidKeyException { @@ -529,27 +403,6 @@ public class MacTest extends TestCase { * <code>doFinal()</code> methods Assertion: Mac result is stored in * output buffer */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Checks functionality.", - method = "doFinal", - args = {} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Checks IllegalStateException only but for all methods. Not enough for doFinal(byte[] output, int outOffset) - it can throw ShortBufferException", - clazz = MacSpi.class, - method = "engineDoFinal", - args = {} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Checks functionality.", - method = "doFinal", - args = {byte[].class, int.class} - ) - }) public void testMac11() throws NoSuchAlgorithmException, NoSuchProviderException, IllegalArgumentException, IllegalStateException, InvalidKeyException, ShortBufferException { @@ -576,27 +429,6 @@ public class MacTest extends TestCase { * Test for <code>doFinal(byte[] input)</code> method * Assertion: update Mac and returns result */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Checks functionality.", - method = "doFinal", - args = {} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Checks IllegalStateException only but for all methods. Not enough for doFinal(byte[] output, int outOffset) - it can throw ShortBufferException", - clazz = MacSpi.class, - method = "engineDoFinal", - args = {} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Checks functionality.", - method = "doFinal", - args = {byte[].class} - ) - }) public void testMac12() throws NoSuchAlgorithmException, NoSuchProviderException, IllegalArgumentException, IllegalStateException, InvalidKeyException { @@ -632,21 +464,6 @@ public class MacTest extends TestCase { * Assertion: throws IllegalArgumentException when offset or len is negative, * offset + len >= input.length */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Checks IllegalArgumentException", - method = "update", - args = {byte[].class, int.class, int.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Checks IllegalStateException only but for all methods. Not enough for doFinal(byte[] output, int outOffset) - it can throw ShortBufferException", - clazz = MacSpi.class, - method = "engineUpdate", - args = {byte[].class, int.class, int.class} - ) - }) public void testMac13() throws NoSuchAlgorithmException, NoSuchProviderException, IllegalArgumentException, IllegalStateException, InvalidKeyException { @@ -688,34 +505,6 @@ public class MacTest extends TestCase { * methods * Assertion: updates Mac */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Checks functionality.", - method = "update", - args = {byte.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Checks IllegalStateException only but for all methods. Not enough for doFinal(byte[] output, int outOffset) - it can throw ShortBufferException", - clazz = MacSpi.class, - method = "engineUpdate", - args = {byte.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Checks functionality.", - method = "update", - args = {byte[].class, int.class, int.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Checks IllegalStateException only but for all methods. Not enough for doFinal(byte[] output, int outOffset) - it can throw ShortBufferException", - clazz = MacSpi.class, - method = "engineUpdate", - args = {byte[].class, int.class, int.class} - ) - }) public void testMac14() throws NoSuchAlgorithmException, NoSuchProviderException, IllegalArgumentException, IllegalStateException, InvalidKeyException { @@ -758,12 +547,6 @@ public class MacTest extends TestCase { * Test for <code>clone()</code> method * Assertion: returns Mac object or throws CloneNotSupportedException */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "clone", - args = {} - ) public void testMacClone() throws NoSuchAlgorithmException, CloneNotSupportedException { if (!DEFSupported) { fail(NotSupportedMsg); @@ -789,27 +572,6 @@ public class MacTest extends TestCase { * Assertion: throws InvalidKeyException and InvalidAlgorithmParameterException * when parameters are not appropriate */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Checks exceptions", - method = "init", - args = {java.security.Key.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Checks exceptions", - method = "init", - args = {java.security.Key.class, java.security.spec.AlgorithmParameterSpec.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Checks exceptions", - clazz = MacSpi.class, - method = "engineInit", - args = {java.security.Key.class, java.security.spec.AlgorithmParameterSpec.class} - ) - }) public void testInit() throws NoSuchAlgorithmException, NoSuchProviderException, IllegalArgumentException, IllegalStateException, InvalidAlgorithmParameterException, InvalidKeyException { @@ -859,27 +621,6 @@ public class MacTest extends TestCase { * methods * Assertion: processes Mac; if input is null then do nothing */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Checks functionality", - method = "update", - args = {byte[].class, int.class, int.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Checks IllegalStateException only but for all methods. Not enough for doFinal(byte[] output, int outOffset) - it can throw ShortBufferException", - clazz = MacSpi.class, - method = "engineUpdate", - args = {byte[].class, int.class, int.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Checks functionality", - method = "update", - args = {java.nio.ByteBuffer.class} - ) - }) public void testUpdateByteBuffer01() throws NoSuchAlgorithmException, NoSuchProviderException, IllegalArgumentException, IllegalStateException, InvalidAlgorithmParameterException, InvalidKeyException { @@ -923,27 +664,6 @@ public class MacTest extends TestCase { * methods * Assertion: processes Mac */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Checks functionality", - method = "update", - args = {java.nio.ByteBuffer.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Checks functionality", - method = "update", - args = {byte[].class, int.class, int.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Checks IllegalStateException only but for all methods. Not enough for doFinal(byte[] output, int outOffset) - it can throw ShortBufferException", - clazz = MacSpi.class, - method = "engineUpdate", - args = {byte[].class, int.class, int.class} - ) - }) public void testUpdateByteBuffer02() throws NoSuchAlgorithmException, NoSuchProviderException, IllegalArgumentException, IllegalStateException, InvalidAlgorithmParameterException, InvalidKeyException { @@ -979,12 +699,6 @@ public class MacTest extends TestCase { * Test for <code>clone()</code> method * Assertion: clone if provider is clo */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "clone", - args = {} - ) public void testClone() { if (!DEFSupported) { fail(NotSupportedMsg); @@ -1006,21 +720,6 @@ public class MacTest extends TestCase { * Test for <code>getMacLength()</code> method * Assertion: return Mac length */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getMacLength", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - clazz = MacSpi.class, - method = "engineGetMacLength", - args = {} - ) - }) public void testGetMacLength() { if (!DEFSupported) { fail(NotSupportedMsg); @@ -1037,21 +736,6 @@ public class MacTest extends TestCase { * Test for <code>reset()</code> method * Assertion: return Mac length */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "reset", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - clazz = MacSpi.class, - method = "engineReset", - args = {} - ) - }) public void testReset() throws InvalidKeyException { if (!DEFSupported) { fail(NotSupportedMsg); @@ -1089,12 +773,6 @@ public class MacTest extends TestCase { * Test for <code>Mac</code> constructor * Assertion: returns Mac object */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "Mac", - args = {javax.crypto.MacSpi.class, java.security.Provider.class, java.lang.String.class} - ) public void testMacConstructor() throws NoSuchAlgorithmException, InvalidKeyException, InvalidAlgorithmParameterException { if (!DEFSupported) { @@ -1128,12 +806,6 @@ public class MacTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getAlgorithm", - args = {} - ) public void test_getAlgorithm() throws NoSuchAlgorithmException { Mac mac; for (int i = 0; i < validValues.length; i++) { @@ -1145,12 +817,6 @@ public class MacTest extends TestCase { assertNull(mac.getAlgorithm()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getProvider", - args = {} - ) public void test_getProvider() throws NoSuchAlgorithmException { Mac mac; for (int i = 0; i < validValues.length; i++) { diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/NoSuchPaddingExceptionTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/NoSuchPaddingExceptionTest.java index 34d705c..148b985 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/NoSuchPaddingExceptionTest.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/NoSuchPaddingExceptionTest.java @@ -22,17 +22,11 @@ package org.apache.harmony.crypto.tests.javax.crypto; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import javax.crypto.NoSuchPaddingException; import junit.framework.TestCase; -@TestTargetClass(NoSuchPaddingException.class) /** * Tests for <code>NoSuchPaddingException</code> class constructors and * methods. @@ -51,12 +45,6 @@ public class NoSuchPaddingExceptionTest extends TestCase { * Test for <code>NoSuchPaddingException()</code> constructor Assertion: * constructs NoSuchPaddingException with no detail message */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "NoSuchPaddingException", - args = {} - ) public void testNoSuchPaddingException01() { NoSuchPaddingException tE = new NoSuchPaddingException(); assertNull("getMessage() must return null.", tE.getMessage()); @@ -68,12 +56,6 @@ public class NoSuchPaddingExceptionTest extends TestCase { * Assertion: constructs NoSuchPaddingException with detail message msg. * Parameter <code>msg</code> is not null. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "NoSuchPaddingException", - args = {java.lang.String.class} - ) public void testNoSuchPaddingException02() { NoSuchPaddingException tE; for (int i = 0; i < msgs.length; i++) { @@ -89,12 +71,6 @@ public class NoSuchPaddingExceptionTest extends TestCase { * Assertion: constructs NoSuchPaddingException when <code>msg</code> is * null */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "NoSuchPaddingException", - args = {java.lang.String.class} - ) public void testNoSuchPaddingException03() { String msg = null; NoSuchPaddingException tE = new NoSuchPaddingException(msg); diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/NullCipherTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/NullCipherTest.java index 9fe729e..683fa07 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/NullCipherTest.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/NullCipherTest.java @@ -22,11 +22,6 @@ package org.apache.harmony.crypto.tests.javax.crypto; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.SecureRandom; import java.util.Arrays; @@ -37,7 +32,6 @@ import javax.crypto.spec.SecretKeySpec; import junit.framework.TestCase; -@TestTargetClass(NullCipher.class) /** * * Tests for NullCipher @@ -51,79 +45,26 @@ public class NullCipherTest extends TestCase { c = new NullCipher(); } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Class checks inherited methods.", - method = "getAlgorithm", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Class checks inherited methods.", - method = "NullCipher", - args = {} - ) - }) public void testGetAlgorithm() { c.getAlgorithm(); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Checks inherited method from Cipher.", - method = "getBlockSize", - args = {} - ) public void testGetBlockSize() { assertEquals("Incorrect BlockSize", 1, c.getBlockSize()); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "IllegalStateException checking missed. Checks inherited method from Cipher.", - method = "getOutputSize", - args = {int.class} - ) public void testGetOutputSize() { assertEquals("Incorrect OutputSize", 111, c.getOutputSize(111)); } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Checks inherited method from Cipher.", - method = "getIV", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Checks inherited method from Cipher.", - clazz = CipherSpi.class, - method = "engineGetIV", - args = {} - ) - }) public void testGetIV() { assertTrue("Incorrect IV", Arrays.equals(c.getIV(), new byte[8])); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Checks inherited method from Cipher.", - method = "getParameters", - args = {} - ) public void testGetParameters() { assertNull("Incorrect Parameters", c.getParameters()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Checks inherited method from Cipher.", - method = "getExemptionMechanism", - args = {} - ) public void testGetExemptionMechanism() { assertNull("Incorrect ExemptionMechanism", c.getExemptionMechanism()); } @@ -131,12 +72,6 @@ public class NullCipherTest extends TestCase { /* * Class under test for void init(int, Key) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "InvalidKeyException checking missed. Checks inherited method from Cipher.", - method = "init", - args = {int.class, java.security.Key.class} - ) public void testInitintKey() throws Exception { c.init(Cipher.ENCRYPT_MODE, new SecretKeySpec(new byte[1], "algorithm")); @@ -145,12 +80,6 @@ public class NullCipherTest extends TestCase { /* * Class under test for void init(int, Key, SecureRandom) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "InvalidKeyException checking missed. Checks inherited method from Cipher.", - method = "init", - args = {int.class, java.security.Key.class, java.security.SecureRandom.class} - ) public void testInitintKeySecureRandom() throws Exception { c.init(Cipher.ENCRYPT_MODE, new SecretKeySpec(new byte[1], "algorithm"), new SecureRandom()); @@ -159,12 +88,6 @@ public class NullCipherTest extends TestCase { /* * Class under test for void init(int, Key, AlgorithmParameterSpec) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Exceptions checking missed. Checks inherited method from Cipher.", - method = "init", - args = {int.class, java.security.Key.class, java.security.spec.AlgorithmParameterSpec.class} - ) public void testInitintKeyAlgorithmParameterSpec() throws Exception { class myAlgorithmParameterSpec implements java.security.spec.AlgorithmParameterSpec {} c.init(Cipher.ENCRYPT_MODE, new SecretKeySpec(new byte[1], @@ -174,12 +97,6 @@ public class NullCipherTest extends TestCase { /* * Class under test for byte[] update(byte[]) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "IllegalStateException checking missed. Checks inherited method from Cipher.", - method = "update", - args = {byte[].class} - ) public void testUpdatebyteArray() throws Exception { byte [] b = {1, 2, 3, 4, 5}; byte [] r = c.update(b); @@ -190,12 +107,6 @@ public class NullCipherTest extends TestCase { /* * Class under test for byte[] update(byte[], int, int) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "IllegalStateException checking missed. Checks inherited method from Cipher.", - method = "update", - args = {byte[].class, int.class, int.class} - ) public void testUpdatebyteArrayintint() throws Exception { byte [] b = {1, 2, 3, 4, 5}; byte [] r = c.update(b, 0, 5); @@ -212,12 +123,6 @@ public class NullCipherTest extends TestCase { /* * Class under test for int update(byte[], int, int, byte[]) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Exceptions checking missed. Checks inherited method from Cipher.", - method = "update", - args = {byte[].class, int.class, int.class, byte[].class} - ) public void testUpdatebyteArrayintintbyteArray() throws Exception { byte [] b = {1, 2, 3, 4, 5}; byte [] r = new byte[5]; @@ -228,12 +133,6 @@ public class NullCipherTest extends TestCase { /* * Class under test for int update(byte[], int, int, byte[], int) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Exceptions checking missed. Checks inherited method from Cipher.", - method = "update", - args = {byte[].class, int.class, int.class, byte[].class, int.class} - ) public void testUpdatebyteArrayintintbyteArrayint() throws Exception { byte [] b = {1, 2, 3, 4, 5}; byte [] r = new byte[5]; @@ -244,12 +143,6 @@ public class NullCipherTest extends TestCase { /* * Class under test for byte[] doFinal() */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Exceptions checking missed. Checks inherited method from Cipher.", - method = "doFinal", - args = {} - ) public void testDoFinal() throws Exception { assertNull("doFinal failed", c.doFinal()); } @@ -257,12 +150,6 @@ public class NullCipherTest extends TestCase { /* * Class under test for int doFinal(byte[], int) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Exceptions checking missed. Checks inherited method from Cipher.", - method = "doFinal", - args = {byte[].class, int.class} - ) public void testDoFinalbyteArrayint() throws Exception { byte [] r = new byte[5]; assertEquals("doFinal failed", 0, c.doFinal(r, 0)); @@ -271,12 +158,6 @@ public class NullCipherTest extends TestCase { /* * Class under test for byte[] doFinal(byte[]) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Exceptions checking missed. Checks inherited method from Cipher.", - method = "doFinal", - args = {byte[].class} - ) public void testDoFinalbyteArray() throws Exception { byte [] b = {1, 2, 3, 4, 5}; byte [] r = null; @@ -288,12 +169,6 @@ public class NullCipherTest extends TestCase { /* * Class under test for byte[] doFinal(byte[], int, int) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Exceptions checking missed. Checks inherited method from Cipher.", - method = "doFinal", - args = {byte[].class, int.class, int.class} - ) public void testDoFinalbyteArrayintint() throws Exception { byte [] b = {1, 2, 3, 4, 5}; byte [] r = null; @@ -311,12 +186,6 @@ public class NullCipherTest extends TestCase { /* * Class under test for byte[] update(byte[], int, int) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Exceptions checking missed. Checks inherited method from Cipher.", - method = "update", - args = {byte[].class, int.class, int.class} - ) public void testUpdatebyteArrayintint2() { //Regression for HARMONY-758 try { @@ -329,12 +198,6 @@ public class NullCipherTest extends TestCase { /* * Class under test for int doFinal(byte[], int, int, byte[]) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Exceptions checking missed. Checks inherited method from Cipher.", - method = "doFinal", - args = {byte[].class, int.class, int.class, byte[].class} - ) public void testDoFinalbyteArrayintintbyteArray() throws Exception { byte [] b = {1, 2, 3, 4, 5}; byte [] r = new byte[5]; @@ -345,12 +208,6 @@ public class NullCipherTest extends TestCase { /* * Class under test for int doFinal(byte[], int, int, byte[]) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Exceptions checking missed. Checks inherited method from Cipher.", - method = "doFinal", - args = {byte[].class, int.class, int.class, byte[].class} - ) public void testDoFinalbyteArrayintintbyteArray2() throws Exception { //Regression for HARMONY-758 try { @@ -364,12 +221,6 @@ public class NullCipherTest extends TestCase { /* * Class under test for int doFinal(byte[], int, int, byte[]) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Exceptions checking missed. Checks inherited method from Cipher.", - method = "doFinal", - args = {byte[].class, int.class, int.class, byte[].class} - ) public void testDoFinalbyteArrayintintbyteArray3() throws Exception { //Regression for HARMONY-758 try { @@ -382,12 +233,6 @@ public class NullCipherTest extends TestCase { /* * Class under test for int doFinal(byte[], int, int, byte[], int) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Exceptions checking missed. Checks inherited method from Cipher.", - method = "doFinal", - args = {byte[].class, int.class, int.class, byte[].class, int.class} - ) public void testDoFinalbyteArrayintintbyteArrayint() throws Exception { byte [] b = {1, 2, 3, 4, 5}; byte [] r = new byte[5]; @@ -398,12 +243,6 @@ public class NullCipherTest extends TestCase { /* * Class under test for int doFinal(byte[], int, int, byte[], int) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Exceptions checking missed. Checks inherited method from Cipher.", - method = "doFinal", - args = {byte[].class, int.class, int.class, byte[].class, int.class} - ) public void testDoFinalbyteArrayintintbyteArrayint2() throws Exception { //Regression for HARMONY-758 try { @@ -417,12 +256,6 @@ public class NullCipherTest extends TestCase { /* * Class under test for int doFinal(byte[], int, int, byte[], int) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Exceptions checking missed. Checks inherited method from Cipher.", - method = "doFinal", - args = {byte[].class, int.class, int.class, byte[].class, int.class} - ) public void testDoFinalbyteArrayintintbyteArrayint3() throws Exception { //Regression for HARMONY-758 try { diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/SealedObjectTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/SealedObjectTest.java index 924dee3..b3b2931 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/SealedObjectTest.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/SealedObjectTest.java @@ -22,10 +22,6 @@ package org.apache.harmony.crypto.tests.javax.crypto; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; - import junit.framework.TestCase; import java.io.ByteArrayInputStream; @@ -47,7 +43,6 @@ import javax.crypto.SealedObject; import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.SecretKeySpec; -@TestTargetClass(SealedObject.class) /** */ public class SealedObjectTest extends TestCase { @@ -69,12 +64,6 @@ public class SealedObjectTest extends TestCase { * deserialized, the content od deserialized object equals to the content of * initial object. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "!Serialization", - args = {} - ) public void testReadObject() throws Exception { String secret = "secret string"; SealedObject so = new SealedObject(secret, new NullCipher()); @@ -99,11 +88,6 @@ public class SealedObjectTest extends TestCase { * SealedObject(Serializable object, Cipher c) method testing. Tests if the * NullPointerException is thrown in the case of null cipher. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "SealedObject", - args = {java.io.Serializable.class, javax.crypto.Cipher.class} - ) public void testSealedObject1() throws Exception { String secret = "secret string"; try { @@ -139,12 +123,6 @@ public class SealedObjectTest extends TestCase { * SealedObject(SealedObject so) method testing. Tests if the * NullPointerException is thrown in the case of null SealedObject. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "SealedObject", - args = {javax.crypto.SealedObject.class} - ) public void testSealedObject2() throws Exception { try { new SealedObject(null) {}; @@ -170,12 +148,6 @@ public class SealedObjectTest extends TestCase { * getAlgorithm() method testing. Tests if the returned value equals to the * corresponding value of Cipher object. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getAlgorithm", - args = {} - ) public void testGetAlgorithm() throws Exception { String secret = "secret string"; String algorithm = "DES"; @@ -195,12 +167,6 @@ public class SealedObjectTest extends TestCase { * encryption algorithm and specified parameters can be retrieved by * specifying the cryptographic key. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Not all exceptions can be checked.", - method = "getObject", - args = {java.security.Key.class} - ) public void testGetObject1() throws Exception { KeyGenerator kg = KeyGenerator.getInstance("DES"); Key key = kg.generateKey(); @@ -237,12 +203,6 @@ public class SealedObjectTest extends TestCase { * with encryption algorithm and specified parameters can be retrieved by * specifying the initialized Cipher object. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Not all exceptions can be checked.", - method = "getObject", - args = {javax.crypto.Cipher.class} - ) public void testGetObject2() throws Exception { try { new SealedObject("secret string", new NullCipher()) @@ -282,12 +242,6 @@ public class SealedObjectTest extends TestCase { * object sealed with encryption algorithm can be retrieved by specifying * the cryptographic key and provider name. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Not all exceptions can be checked.", - method = "getObject", - args = {java.security.Key.class, java.lang.String.class} - ) public void testGetObject3() throws Exception { try { new SealedObject("secret string", new NullCipher()).getObject( diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyFactorySpiTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyFactorySpiTest.java index bcc05a2..de68dc8 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyFactorySpiTest.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyFactorySpiTest.java @@ -22,11 +22,6 @@ package org.apache.harmony.crypto.tests.javax.crypto; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.InvalidKeyException; import java.security.spec.InvalidKeySpecException; import java.security.spec.KeySpec; @@ -39,8 +34,6 @@ import junit.framework.TestCase; /** * Tests for <code>SecretKeyFactorySpi</code> class constructors and methods. */ - -@TestTargetClass(SecretKeyFactorySpi.class) public class SecretKeyFactorySpiTest extends TestCase { class Mock_SecretKeyFactorySpi extends MySecretKeyFactorySpi { @@ -66,7 +59,6 @@ public class SecretKeyFactorySpiTest extends TestCase { * Test for <code>SecretKeyFactorySpi</code> constructor Assertion: * constructs SecretKeyFactorySpi */ - @TestTargetNew(level = TestLevel.COMPLETE, notes = "", method = "SecretKeyFactorySpi", args = {}) public void testSecretKeyFactorySpi01() throws InvalidKeyException, InvalidKeySpecException { Mock_SecretKeyFactorySpi skfSpi = new Mock_SecretKeyFactorySpi(); SecretKey sk = null; diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyFactoryTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyFactoryTest.java index d73959c..7d2bcf9 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyFactoryTest.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyFactoryTest.java @@ -22,11 +22,6 @@ package org.apache.harmony.crypto.tests.javax.crypto; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.InvalidKeyException; import java.security.Key; import java.security.NoSuchAlgorithmException; @@ -49,12 +44,10 @@ import org.apache.harmony.security.tests.support.SpiEngUtils; import junit.framework.TestCase; -@TestTargetClass(SecretKeyFactory.class) /** * Tests for <code>SecretKeyFactory</code> class constructors and methods. * */ - public class SecretKeyFactoryTest extends TestCase { public static final String srvSecretKeyFactory = "SecretKeyFactory"; @@ -124,12 +117,6 @@ public class SecretKeyFactoryTest extends TestCase { * Test for <code>SecretKeyFactory</code> constructor * Assertion: returns SecretKeyFactory object */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "SecretKeyFactory", - args = {javax.crypto.SecretKeyFactorySpi.class, java.security.Provider.class, java.lang.String.class} - ) public void testSecretKeyFactory01() throws NoSuchAlgorithmException, InvalidKeySpecException, InvalidKeyException { if (!DEFSupported) { @@ -161,12 +148,6 @@ public class SecretKeyFactoryTest extends TestCase { * throws NullPointerException when algorithm is null; * throws NoSuchAlgorithmException when algorithm has invalid value */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for getInstance method.", - method = "getInstance", - args = {java.lang.String.class} - ) public void testSecretKeyFactory02() throws NoSuchAlgorithmException { try { SecretKeyFactory.getInstance(null); @@ -187,12 +168,6 @@ public class SecretKeyFactoryTest extends TestCase { * Test for <code>getInstance(String algorithm)</code> method * Assertion: returns SecretKeyObject */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for getInstance method.", - method = "getInstance", - args = {java.lang.String.class} - ) public void testSecretKeyFactory03() throws NoSuchAlgorithmException { if (!DEFSupported) { fail(NotSupportMsg); @@ -213,12 +188,6 @@ public class SecretKeyFactoryTest extends TestCase { * throws NullPointerException when algorithm is null; * throws NoSuchAlgorithmException when algorithm is invalid */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for getInstance method.", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void testSecretKeyFactory04() throws NoSuchAlgorithmException, NoSuchProviderException { if (!DEFSupported) { @@ -249,12 +218,6 @@ public class SecretKeyFactoryTest extends TestCase { * throws IllegalArgumentException when provider is null or empty; * throws NoSuchProviderException when provider has invalid value */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for getInstance method.", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void testSecretKeyFactory05() throws NoSuchAlgorithmException, NoSuchProviderException { if (!DEFSupported) { @@ -293,12 +256,6 @@ public class SecretKeyFactoryTest extends TestCase { * method * Assertion: returns SecretKeyFactory object */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for getInstance method.", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void testSecretKeyFactory06() throws NoSuchProviderException, NoSuchAlgorithmException { if (!DEFSupported) { @@ -321,12 +278,6 @@ public class SecretKeyFactoryTest extends TestCase { * Assertion: throws NullPointerException when algorithm is null; * throws NoSuchAlgorithmException when algorithm is invalid */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for getInstance method.", - method = "getInstance", - args = {java.lang.String.class, java.security.Provider.class} - ) public void testSecretKeyFactory07() throws NoSuchAlgorithmException { if (!DEFSupported) { fail(NotSupportMsg); @@ -353,12 +304,6 @@ public class SecretKeyFactoryTest extends TestCase { * method * Assertion: throws IllegalArgumentException when provider is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for getInstance method.", - method = "getInstance", - args = {java.lang.String.class, java.security.Provider.class} - ) public void testSecretKeyFactory08() throws NoSuchAlgorithmException { if (!DEFSupported) { fail(NotSupportMsg); @@ -380,12 +325,6 @@ public class SecretKeyFactoryTest extends TestCase { * method * Assertion: returns SecretKeyFactory object */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is a complete subset of tests for getInstance method.", - method = "getInstance", - args = {java.lang.String.class, java.security.Provider.class} - ) public void testSecretKeyFactory09() throws NoSuchAlgorithmException { if (!DEFSupported) { fail(NotSupportMsg); @@ -408,34 +347,6 @@ public class SecretKeyFactoryTest extends TestCase { * Assertion: * throw InvalidKeySpecException if parameter is inappropriate */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Tis test is checking two methods.", - method = "generateSecret", - args = {java.security.spec.KeySpec.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Tis test is checking two methods.", - clazz = SecretKeyFactorySpi.class, - method = "engineGenerateSecret", - args = {java.security.spec.KeySpec.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Tis test is checking two methods.", - method = "getKeySpec", - args = {javax.crypto.SecretKey.class, java.lang.Class.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Tis test is checking two methods.", - clazz = SecretKeyFactorySpi.class, - method = "engineGetKeySpec", - args = {javax.crypto.SecretKey.class, java.lang.Class.class} - ) - }) public void testSecretKeyFactory10() throws InvalidKeyException, InvalidKeySpecException { if (!DEFSupported) { @@ -508,12 +419,6 @@ public class SecretKeyFactoryTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getAlgorithm", - args = {} - ) public void test_getAlgorithm() throws NoSuchAlgorithmException { for (int i = 0; i < validValues.length; i++) { SecretKeyFactory secKF = SecretKeyFactory @@ -532,12 +437,6 @@ public class SecretKeyFactoryTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getProvider", - args = {} - ) public void test_getProvider() throws NoSuchAlgorithmException { for (int i = 0; i < validValues.length; i++) { SecretKeyFactory secKF = SecretKeyFactory @@ -549,21 +448,6 @@ public class SecretKeyFactoryTest extends TestCase { assertNull(msf.getProvider()); } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "translateKey", - args = {javax.crypto.SecretKey.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - clazz = SecretKeyFactorySpi.class, - method = "engineTranslateKey", - args = {javax.crypto.SecretKey.class} - ) - }) public void test_translateKeyLjavax_crypto_SecretKey() throws NoSuchAlgorithmException, InvalidKeyException { KeyGenerator kg = null; diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyTest.java index 6d0b242..a27083c 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyTest.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyTest.java @@ -22,17 +22,11 @@ package org.apache.harmony.crypto.tests.javax.crypto; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import javax.crypto.SecretKey; import junit.framework.TestCase; -@TestTargetClass(SecretKey.class) /** * Tests for <code>SecretKey</code> class field * @@ -42,12 +36,6 @@ public class SecretKeyTest extends TestCase { /** * Test for <code>serialVersionUID</code> field */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "!Constants", - args = {} - ) public void testField() { checkSecretKey sk = new checkSecretKey(); assertEquals("Incorrect serialVersionUID", diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ShortBufferExceptionTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ShortBufferExceptionTest.java index c29567e..52fa969 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ShortBufferExceptionTest.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/ShortBufferExceptionTest.java @@ -22,16 +22,10 @@ package org.apache.harmony.crypto.tests.javax.crypto; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import javax.crypto.ShortBufferException; import junit.framework.TestCase; -@TestTargetClass(ShortBufferException.class) /** * Tests for <code>ShortBufferException</code> class constructors and methods. * @@ -49,12 +43,6 @@ public class ShortBufferExceptionTest extends TestCase { * Test for <code>ShortBufferException()</code> constructor Assertion: * constructs ShortBufferException with no detail message */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "ShortBufferException", - args = {} - ) public void testShortBufferException01() { ShortBufferException tE = new ShortBufferException(); assertNull("getMessage() must return null.", tE.getMessage()); @@ -66,12 +54,6 @@ public class ShortBufferExceptionTest extends TestCase { * Assertion: constructs ShortBufferException with detail message msg. * Parameter <code>msg</code> is not null. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "ShortBufferException", - args = {java.lang.String.class} - ) public void testShortBufferException02() { ShortBufferException tE; for (int i = 0; i < msgs.length; i++) { @@ -87,12 +69,6 @@ public class ShortBufferExceptionTest extends TestCase { * Assertion: constructs ShortBufferException when <code>msg</code> is * null */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "ShortBufferException", - args = {java.lang.String.class} - ) public void testShortBufferException03() { String msg = null; ShortBufferException tE = new ShortBufferException(msg); diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherAesTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherAesTest.java index 2e4d7e7..0b8f017 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherAesTest.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherAesTest.java @@ -15,20 +15,10 @@ */ package org.apache.harmony.crypto.tests.javax.crypto.func; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; - import junit.framework.TestCase; public class CipherAesTest extends TestCase { // 216 cases checked - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "method", - args = {} - ) public void test_AesNoISO() { CipherSymmetricKeyThread aesNoISO = new CipherSymmetricKeyThread("AES", new int[] {128, 192, 256}, // Keysize must be 128, 192, 256. @@ -48,12 +38,6 @@ public class CipherAesTest extends TestCase { } // 108 cases checked - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "method", - args = {} - ) public void test_AesISO() { CipherSymmetricKeyThread aesISO = new CipherSymmetricKeyThread("AES", new int[] {128, 192, 256}, // Keysize must be 128, 192, 256. diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherAesWrapTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherAesWrapTest.java index 7a9ceaf..ed86fdd 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherAesWrapTest.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherAesWrapTest.java @@ -15,9 +15,6 @@ */ package org.apache.harmony.crypto.tests.javax.crypto.func; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import junit.framework.TestCase; public class CipherAesWrapTest extends TestCase { @@ -27,12 +24,6 @@ public class CipherAesWrapTest extends TestCase { } // 3 cases checked - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "method", - args = {} - ) public void test_AesWrap() { CipherWrapThread aesWrap = new CipherWrapThread("AESWrap", new int[] { 128, 192, 256}, // Keysize must be 128, 192, 256. diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherDESedeTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherDESedeTest.java index 54ca325..d8565f1 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherDESedeTest.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherDESedeTest.java @@ -15,20 +15,10 @@ */ package org.apache.harmony.crypto.tests.javax.crypto.func; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; - import junit.framework.TestCase; public class CipherDESedeTest extends TestCase { // 80 cases checked - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "method", - args = {} - ) public void test_DESedeNoISO() { CipherSymmetricKeyThread DESedeNoISO = new CipherSymmetricKeyThread( "DESede", new int[] {112, 168},// Keysize must be 112 or 168. @@ -45,12 +35,6 @@ public class CipherDESedeTest extends TestCase { } // 40 cases checked - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "method", - args = {} - ) public void test_DESedeISO() { CipherSymmetricKeyThread DESedeISO = new CipherSymmetricKeyThread( "DESede", new int[] {112, 168},// Keysize must be 112 or 168. diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherDESedeWrapTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherDESedeWrapTest.java index da71684..07ab945 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherDESedeWrapTest.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherDESedeWrapTest.java @@ -15,20 +15,10 @@ */ package org.apache.harmony.crypto.tests.javax.crypto.func; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; public class CipherDESedeWrapTest extends TestCase { // 2 cases checked. - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "method", - args = {} - ) public void test_DESedeWrap() { CipherWrapThread DESedeWrap = new CipherWrapThread("DESedeWrap", new int[] {112, 168}, // Keysize must be 112 or 168. diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherDesTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherDesTest.java index 6ae5e6f..0c46ad0 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherDesTest.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherDesTest.java @@ -15,20 +15,10 @@ */ package org.apache.harmony.crypto.tests.javax.crypto.func; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; - import junit.framework.TestCase; public class CipherDesTest extends TestCase { // 40 cases checked - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "method", - args = {} - ) public void test_DesNoISO() { CipherSymmetricKeyThread desNoISO = new CipherSymmetricKeyThread("DES", new int[] {56},// Keysize must be 56. @@ -45,12 +35,6 @@ public class CipherDesTest extends TestCase { } // 20 cases checked - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "method", - args = {} - ) public void test_DesISO() { CipherSymmetricKeyThread desISO = new CipherSymmetricKeyThread("DES", new int[] {56},// Keysize must be 56. diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherPBETest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherPBETest.java index d02bf91..f21374f 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherPBETest.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherPBETest.java @@ -16,20 +16,11 @@ package org.apache.harmony.crypto.tests.javax.crypto.func; import dalvik.annotation.AndroidOnly; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; import junit.framework.TestCase; public class CipherPBETest extends TestCase { - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "method", - args = {} - ) public void test_PBEWithMD5AndDES() throws Exception { CipherPBEThread PBEWithMD5AndDES = new CipherPBEThread( "PBEWithMD5AndDES", new int[] {56}, new String[] {"CBC"}, @@ -41,12 +32,6 @@ public class CipherPBETest extends TestCase { .getTotalFailuresNumber()); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "method", - args = {} - ) @AndroidOnly("Not supported by RI (maybe with a different name)") public void test_PBEWithSHAand3KeyTripleDES() throws Exception { CipherPBEThread PBEWITHSHAAND3KEYTRIPLEDESCBC = new CipherPBEThread( diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherRSATest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherRSATest.java index cdc8c9a..d25d958 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherRSATest.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/CipherRSATest.java @@ -16,20 +16,11 @@ package org.apache.harmony.crypto.tests.javax.crypto.func; import dalvik.annotation.AndroidOnly; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; import junit.framework.TestCase; public class CipherRSATest extends TestCase { // 3 cases checked - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "method", - args = {} - ) public void test_RSAShortKey() { CipherRSAThread rsa = new CipherRSAThread("RSA", new int[] {512}, new String[] {"ECB"}, new String[] { @@ -64,12 +55,6 @@ public class CipherRSATest extends TestCase { assertEquals(rsa.getFailureMessages(), 0, rsa.getTotalFailuresNumber()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "method", - args = {} - ) @AndroidOnly("Fails on RI but succeeds on Android.") public void test_RSANoPadding() { CipherRSAThread rsa = new CipherRSAThread("RSA", new int[] {1024}, diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/KeyAgreementFunctionalTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/KeyAgreementFunctionalTest.java index fbf897c..acb06ae 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/KeyAgreementFunctionalTest.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/KeyAgreementFunctionalTest.java @@ -16,9 +16,6 @@ package org.apache.harmony.crypto.tests.javax.crypto.func; import dalvik.annotation.BrokenTest; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; import junit.framework.TestCase; diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/KeyGeneratorFunctionalTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/KeyGeneratorFunctionalTest.java index 4d0d700..ee9a198 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/KeyGeneratorFunctionalTest.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/KeyGeneratorFunctionalTest.java @@ -15,10 +15,6 @@ */ package org.apache.harmony.crypto.tests.javax.crypto.func; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; - import junit.framework.TestCase; public class KeyGeneratorFunctionalTest extends TestCase { diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/MacFunctionalTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/MacFunctionalTest.java index 6edc2db..8c05111 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/MacFunctionalTest.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/MacFunctionalTest.java @@ -15,10 +15,6 @@ */ package org.apache.harmony.crypto.tests.javax.crypto.func; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; - import junit.framework.TestCase; public class MacFunctionalTest extends TestCase { diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/SecretKeyFactoryFunctionalTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/SecretKeyFactoryFunctionalTest.java index 2add9b0..8c2e2af 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/SecretKeyFactoryFunctionalTest.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/func/SecretKeyFactoryFunctionalTest.java @@ -15,11 +15,6 @@ */ package org.apache.harmony.crypto.tests.javax.crypto.func; -import dalvik.annotation.KnownFailure; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; - import junit.framework.TestCase; public class SecretKeyFactoryFunctionalTest extends TestCase { diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/DHPrivateKeyTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/DHPrivateKeyTest.java index 24bfed0..eedb14c 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/DHPrivateKeyTest.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/DHPrivateKeyTest.java @@ -31,28 +31,16 @@ import javax.crypto.interfaces.DHPrivateKey; import javax.crypto.spec.DHParameterSpec; import junit.framework.TestCase; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; -import dalvik.annotation.BrokenTest; - /** * Tests for <code>DHPrivateKey</code> class field * */ -@TestTargetClass(DHPrivateKey.class) public class DHPrivateKeyTest extends TestCase { /** * Test for <code>serialVersionUID</code> field */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "tests serialVersionUID for a fixed value", - method = "!field:serialVersionUID" - ) public void testField() { checkDHPrivateKey key = new checkDHPrivateKey(); assertEquals("Incorrect serialVersionUID", @@ -60,19 +48,6 @@ public class DHPrivateKeyTest extends TestCase { 2211791113380396553L); } -@TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getX", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - clazz = DHKey.class, - method = "getParams", - args = {} - ) - }) public void test_getParams() throws Exception { KeyPairGenerator kg = KeyPairGenerator.getInstance("DH"); kg.initialize(192); 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 2c3e339..471d670 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 @@ -23,10 +23,6 @@ package org.apache.harmony.crypto.tests.javax.crypto.interfaces; import dalvik.annotation.BrokenTest; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; import junit.framework.TestCase; @@ -43,17 +39,11 @@ import javax.crypto.spec.DHParameterSpec; * Tests for <code>DHPublicKey</code> class field * */ -@TestTargetClass(DHPublicKey.class) public class DHPublicKeyTest extends TestCase { /** * Test for <code>serialVersionUID</code> field */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "tests serialVersionUID for a fixed value", - method = "!field:serialVersionUID" - ) public void testField() { checkDHPublicKey key = new checkDHPublicKey(); assertEquals("Incorrect serialVersionUID", @@ -61,19 +51,6 @@ public class DHPublicKeyTest extends TestCase { -6628103563352519193L); } -@TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getY", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - clazz = DHKey.class, - method = "getParams", - args = {} - ) - }) @BrokenTest("Too slow - disabling for now") public void test_getParams() throws Exception { KeyPairGenerator kg = KeyPairGenerator.getInstance("DH"); diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/PBEKeyTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/PBEKeyTest.java index 5e77044..b941dc5 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/PBEKeyTest.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/interfaces/PBEKeyTest.java @@ -22,10 +22,6 @@ package org.apache.harmony.crypto.tests.javax.crypto.interfaces; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; - import junit.framework.TestCase; import java.math.BigInteger; @@ -37,18 +33,12 @@ import javax.crypto.interfaces.PBEKey; * Tests for <code>PBEKey</code> class field * */ -@TestTargetClass(PBEKey.class) public class PBEKeyTest extends TestCase { /** * Test for <code>serialVersionUID</code> field */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "tests serialVersionUID for a fixed value", - method = "!field:serialVersionUID" - ) public void testField() { checkPBEKey key = new checkPBEKey(); assertEquals("Incorrect serialVersionUID", @@ -56,33 +46,18 @@ public class PBEKeyTest extends TestCase { -1430015993304333921L); } -@TestTargetNew( - level = TestLevel.COMPLETE, - method = "getIterationCount", - args = {} - ) public void test_getIterationCount() throws Exception { checkPBEKey key = new checkPBEKey(); key.getIterationCount(); } -@TestTargetNew( - level = TestLevel.COMPLETE, - method = "getPassword", - args = {} - ) public void test_getPassword() throws Exception { checkPBEKey key = new checkPBEKey(); key.getPassword(); } -@TestTargetNew( - level = TestLevel.COMPLETE, - method = "getSalt", - args = {} - ) public void test_getSalt() throws Exception { checkPBEKey key = new checkPBEKey(); diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DESKeySpecTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DESKeySpecTest.java index f3ade0a..38ecc9d 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DESKeySpecTest.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DESKeySpecTest.java @@ -21,11 +21,6 @@ package org.apache.harmony.crypto.tests.javax.crypto.spec; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.lang.NullPointerException; import java.security.InvalidKeyException; import java.util.Arrays; @@ -36,10 +31,8 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -@TestTargetClass(DESKeySpec.class) /** */ - public class DESKeySpecTest extends TestCase { // DES weak and semi-weak keys @@ -110,20 +103,6 @@ public class DESKeySpecTest extends TestCase { * Constructors testing. Tests behavior of each of two constructors * in the cases of: null array, short array, normal array. */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Checks both constructors.", - method = "DESKeySpec", - args = {byte[].class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Checks both constructors.", - method = "DESKeySpec", - args = {byte[].class, int.class} - ) - }) public void testDESKeySpec() { try { new DESKeySpec((byte []) null); @@ -179,12 +158,6 @@ public class DESKeySpecTest extends TestCase { * the key with the key specified in the constructor. The object under * the test is created by different constructors. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getKey", - args = {} - ) public void testGetKey() { byte[] key = {1, 2, 3, 4, 5, 6, 7, 8}; DESKeySpec ks; @@ -223,12 +196,6 @@ public class DESKeySpecTest extends TestCase { * it returns false on the key which is not parity adjusted, and if * it returns true on parity adjusted key. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isParityAdjusted", - args = {byte[].class, int.class} - ) public void testIsParityAdjusted() { try { DESKeySpec.isParityAdjusted(null, 1); @@ -277,12 +244,6 @@ public class DESKeySpecTest extends TestCase { * it returns true on weak or semi-weak keys, and if it returns * false on other keys. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isWeak", - args = {byte[].class, int.class} - ) public void testIsWeak() { try { DESKeySpec.isWeak(null, 1); diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DESedeKeySpecTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DESedeKeySpecTest.java index 1a6dd5f..e66a7b6 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DESedeKeySpecTest.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DESedeKeySpecTest.java @@ -22,11 +22,6 @@ package org.apache.harmony.crypto.tests.javax.crypto.spec; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.lang.NullPointerException; import java.security.InvalidKeyException; import java.util.Arrays; @@ -37,30 +32,14 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -@TestTargetClass(DESedeKeySpec.class) /** */ - public class DESedeKeySpecTest extends TestCase { /** * Constructors testing. Tests behavior of each of two constructors * in the cases of: null array, short array, normal array. */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Checks both constructors.", - method = "DESedeKeySpec", - args = {byte[].class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Checks both constructors.", - method = "DESedeKeySpec", - args = {byte[].class, int.class} - ) - }) public void testDESedeKeySpec() { try { new DESedeKeySpec((byte []) null); @@ -122,12 +101,6 @@ public class DESedeKeySpecTest extends TestCase { * the key with the key specified in the constructor. The object under * the test is created by different constructors. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getKey", - args = {} - ) public void testGetKey() { byte[] key = {1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, 1, 2}; @@ -168,12 +141,6 @@ public class DESedeKeySpecTest extends TestCase { * it returns false on the key which is not parity adjusted, and if * it returns true on parity adjusted key. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isParityAdjusted", - args = {byte[].class, int.class} - ) public void testIsParityAdjusted() { try { DESedeKeySpec.isParityAdjusted(null, 1); diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHGenParameterSpecTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHGenParameterSpecTest.java index aef1286..3c372da 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHGenParameterSpecTest.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHGenParameterSpecTest.java @@ -22,11 +22,6 @@ package org.apache.harmony.crypto.tests.javax.crypto.spec; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.lang.Integer; import javax.crypto.spec.DHGenParameterSpec; @@ -35,10 +30,8 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -@TestTargetClass(DHGenParameterSpec.class) /** */ - public class DHGenParameterSpecTest extends TestCase { /** @@ -46,26 +39,6 @@ public class DHGenParameterSpecTest extends TestCase { * parameters specified in the constructor with the values returned * by getters. */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "All functionality tested in one method. Probably it should be divided into several tests.", - method = "DHGenParameterSpec", - args = {int.class, int.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "All functionality tested in one method. Probably it should be divided into several tests.", - method = "getExponentSize", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "All functionality tested in one method. Probably it should be divided into several tests.", - method = "getPrimeSize", - args = {} - ) - }) public void testDHGenParameterSpec() { int[] primes = {Integer.MIN_VALUE, -1, 0, 1, Integer.MAX_VALUE}; int[] exponents = {Integer.MIN_VALUE, -1, 0, 1, Integer.MAX_VALUE}; diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHParameterSpecTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHParameterSpecTest.java index 65d1a17..9887f7d 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHParameterSpecTest.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHParameterSpecTest.java @@ -22,11 +22,6 @@ package org.apache.harmony.crypto.tests.javax.crypto.spec; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.lang.Integer; import java.math.BigInteger; @@ -36,10 +31,8 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -@TestTargetClass(DHParameterSpec.class) /** */ - public class DHParameterSpecTest extends TestCase { /** @@ -47,38 +40,6 @@ public class DHParameterSpecTest extends TestCase { * specified in the constructor with the values returned by getters. * The tested object is created by different constructors. */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "All functionality tested in one method. Probably it should be divided into several tests.", - method = "DHParameterSpec", - args = {java.math.BigInteger.class, java.math.BigInteger.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "All functionality tested in one method. Probably it should be divided into several tests.", - method = "DHParameterSpec", - args = {java.math.BigInteger.class, java.math.BigInteger.class, int.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "All functionality tested in one method. Probably it should be divided into several tests.", - method = "getG", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "All functionality tested in one method. Probably it should be divided into several tests.", - method = "getL", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "All functionality tested in one method. Probably it should be divided into several tests.", - method = "getP", - args = {} - ) - }) public void testDHParameterSpec() { BigInteger[] ps = {new BigInteger("-1000000000000"), BigInteger.ZERO, BigInteger.ONE, new BigInteger("1000000000000")}; diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHPrivateKeySpecTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHPrivateKeySpecTest.java index 327004a..c857387 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHPrivateKeySpecTest.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHPrivateKeySpecTest.java @@ -22,11 +22,6 @@ package org.apache.harmony.crypto.tests.javax.crypto.spec; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.math.BigInteger; import javax.crypto.spec.DHPrivateKeySpec; @@ -35,42 +30,14 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -@TestTargetClass(DHPrivateKeySpec.class) /** */ - public class DHPrivateKeySpecTest extends TestCase { /** * DHPrivateKeySpec class testing. Tests the equivalence of parameters * specified in the constructor with the values returned by getters. */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "All functionality tested in one method. Probably it should be divided into several tests.", - method = "DHPrivateKeySpec", - args = {java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "All functionality tested in one method. Probably it should be divided into several tests.", - method = "getG", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "All functionality tested in one method. Probably it should be divided into several tests.", - method = "getP", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "All functionality tested in one method. Probably it should be divided into several tests.", - method = "getX", - args = {} - ) - }) public void testDHPrivateKeySpec() { BigInteger[] xs = {new BigInteger("-1000000000000"), BigInteger.ZERO, BigInteger.ONE, new BigInteger("1000000000000")}; diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHPublicKeySpecTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHPublicKeySpecTest.java index 905d8cd..937afe5 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHPublicKeySpecTest.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/DHPublicKeySpecTest.java @@ -22,11 +22,6 @@ package org.apache.harmony.crypto.tests.javax.crypto.spec; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.math.BigInteger; import javax.crypto.spec.DHPublicKeySpec; @@ -35,42 +30,14 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -@TestTargetClass(DHPublicKeySpec.class) /** */ - public class DHPublicKeySpecTest extends TestCase { /** * DHPublicKeySpec class testing. Tests the equivalence of parameters * specified in the constructor with the values returned by getters. */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "All functionality tested in one method. Probably it should be divided into several tests.", - method = "DHPublicKeySpec", - args = {java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "All functionality tested in one method. Probably it should be divided into several tests.", - method = "getG", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "All functionality tested in one method. Probably it should be divided into several tests.", - method = "getP", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "All functionality tested in one method. Probably it should be divided into several tests.", - method = "getY", - args = {} - ) - }) public void testDHPrivateKeySpec() { BigInteger[] ys = {new BigInteger("-1000000000000"), BigInteger.ZERO, BigInteger.ONE, new BigInteger("1000000000000")}; diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/IvParameterSpecTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/IvParameterSpecTest.java index 1c27f68..2c2ef66 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/IvParameterSpecTest.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/IvParameterSpecTest.java @@ -22,11 +22,6 @@ package org.apache.harmony.crypto.tests.javax.crypto.spec; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.lang.NullPointerException; import java.lang.IllegalArgumentException; import java.lang.ArrayIndexOutOfBoundsException; @@ -37,10 +32,8 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -@TestTargetClass(IvParameterSpec.class) /** */ - public class IvParameterSpecTest extends TestCase { /** @@ -48,12 +41,6 @@ public class IvParameterSpecTest extends TestCase { * NullPointerException is thrown in the case of null input * array and that input array is copied during initialization. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "IvParameterSpec", - args = {byte[].class} - ) public void testIvParameterSpec1() { try { new IvParameterSpec(null); @@ -74,12 +61,6 @@ public class IvParameterSpecTest extends TestCase { * NullPointerException is thrown in the case of null input * array and that input array is copied during initialization. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "IvParameterSpec", - args = {byte[].class, int.class, int.class} - ) public void testIvParameterSpec2() { try { new IvParameterSpec(null, 1, 1); @@ -142,12 +123,6 @@ public class IvParameterSpecTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getIV", - args = {} - ) public void testGetIV() { byte[] iv = new byte[] {1, 2, 3, 4, 5}; IvParameterSpec ivps = new IvParameterSpec(iv); diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/OAEPParameterSpecTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/OAEPParameterSpecTest.java index 3fa2d72..ce0ea2e 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/OAEPParameterSpecTest.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/OAEPParameterSpecTest.java @@ -22,11 +22,6 @@ package org.apache.harmony.crypto.tests.javax.crypto.spec; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.spec.MGF1ParameterSpec; import java.security.spec.AlgorithmParameterSpec; @@ -37,10 +32,8 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -@TestTargetClass(OAEPParameterSpec.class) /** */ - public class OAEPParameterSpecTest extends TestCase { /** @@ -49,12 +42,6 @@ public class OAEPParameterSpecTest extends TestCase { * is thrown in the case of inappropriate constructor parameters and checks * the value of DEFAULT field. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "OAEPParameterSpec", - args = {java.lang.String.class, java.lang.String.class, java.security.spec.AlgorithmParameterSpec.class, javax.crypto.spec.PSource.class} - ) public void testOAEPParameterSpec() { // using init values for OAEPParameterSpec.DEFAULT String mdName = "SHA-1"; @@ -106,12 +93,6 @@ public class OAEPParameterSpecTest extends TestCase { /** * getDigestAlgorithm() method testing. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getDigestAlgorithm", - args = {} - ) public void testGetDigestAlgorithm() { String mdName = "SHA-1"; String mgfName = "MGF1"; @@ -128,12 +109,6 @@ public class OAEPParameterSpecTest extends TestCase { /** * getMGFAlgorithm() method testing. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getMGFAlgorithm", - args = {} - ) public void testGetMGFAlgorithm() { String mdName = "SHA-1"; String mgfName = "MGF1"; @@ -150,12 +125,6 @@ public class OAEPParameterSpecTest extends TestCase { /** * getMGFParameters() method testing. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getMGFParameters", - args = {} - ) public void testGetMGFParameters() { String mdName = "SHA-1"; String mgfName = "MGF1"; @@ -172,12 +141,6 @@ public class OAEPParameterSpecTest extends TestCase { /** * getPSource() method testing. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPSource", - args = {} - ) public void testGetPSource() { String mdName = "SHA-1"; String mgfName = "MGF1"; diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/PBEKeySpecTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/PBEKeySpecTest.java index bbce868..85e429a 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/PBEKeySpecTest.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/PBEKeySpecTest.java @@ -22,11 +22,6 @@ package org.apache.harmony.crypto.tests.javax.crypto.spec; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.util.Arrays; import javax.crypto.spec.PBEKeySpec; @@ -35,10 +30,8 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -@TestTargetClass(PBEKeySpec.class) /** */ - public class PBEKeySpecTest extends TestCase { /** @@ -46,12 +39,6 @@ public class PBEKeySpecTest extends TestCase { * the method in the case of null input char array and tests that input * array is copied during the object initialization. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "PBEKeySpec", - args = {char[].class} - ) public void testPBEKeySpec1() { try { PBEKeySpec pbeks = new PBEKeySpec(null); @@ -75,12 +62,6 @@ public class PBEKeySpecTest extends TestCase { * of inappropriate parameters and checks that array objects specified as * a parameters are copied during the object initialization. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "PBEKeySpec", - args = {char[].class, byte[].class, int.class, int.class} - ) public void testPBEKeySpec2() { char[] password = new char[] {'1', '2', '3', '4', '5'}; byte[] salt = new byte[] {1, 2, 3, 4, 5}; @@ -160,12 +141,6 @@ public class PBEKeySpecTest extends TestCase { * of inappropriate parameters and checks that array objects specified as * a parameters are copied during the object initialization. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "PBEKeySpec", - args = {char[].class, byte[].class, int.class} - ) public void testPBEKeySpec3() { char[] password = new char[] {'1', '2', '3', '4', '5'}; byte[] salt = new byte[] {1, 2, 3, 4, 5}; @@ -227,12 +202,6 @@ public class PBEKeySpecTest extends TestCase { * clearPassword() method testing. Tests that internal copy of password * is cleared after the method call. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "clearPassword", - args = {} - ) public void testClearPassword() { char[] password = new char[] {'1', '2', '3', '4', '5'}; PBEKeySpec pbeks = new PBEKeySpec(password); @@ -250,12 +219,6 @@ public class PBEKeySpecTest extends TestCase { * to the password specified in the constructor and that the change of * returned array does not cause the change of internal array. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Exception was checked in testClearPassword() method.", - method = "getPassword", - args = {} - ) public void testGetPassword() { char[] password = new char[] {'1', '2', '3', '4', '5'}; PBEKeySpec pbeks = new PBEKeySpec(password); @@ -277,12 +240,6 @@ public class PBEKeySpecTest extends TestCase { * Also it checks that the method returns null if salt is not * specified. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSalt", - args = {} - ) public void testGetSalt() { char[] password = new char[] {'1', '2', '3', '4', '5'}; byte[] salt = new byte[] {1, 2, 3, 4, 5}; @@ -308,12 +265,6 @@ public class PBEKeySpecTest extends TestCase { * Also it checks that the method returns 0 if iterationCount is not * specified. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getIterationCount", - args = {} - ) public void testGetIterationCount() { char[] password = new char[] {'1', '2', '3', '4', '5'}; byte[] salt = new byte[] {1, 2, 3, 4, 5}; @@ -331,12 +282,6 @@ public class PBEKeySpecTest extends TestCase { /** * getKeyLength() method testing. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getKeyLength", - args = {} - ) public void testGetKeyLength() { char[] password = new char[] {'1', '2', '3', '4', '5'}; byte[] salt = new byte[] {1, 2, 3, 4, 5}; diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/PBEParameterSpecTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/PBEParameterSpecTest.java index 6bca15c..6639099 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/PBEParameterSpecTest.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/PBEParameterSpecTest.java @@ -22,11 +22,6 @@ package org.apache.harmony.crypto.tests.javax.crypto.spec; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.util.Arrays; import javax.crypto.spec.PBEParameterSpec; @@ -35,10 +30,8 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -@TestTargetClass(PBEParameterSpec.class) /** */ - public class PBEParameterSpecTest extends TestCase { /** @@ -46,12 +39,6 @@ public class PBEParameterSpecTest extends TestCase { * Tests the behavior of the method in the case of null input array * and tests that input array is copied during the object initialization. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "PBEParameterSpec", - args = {byte[].class, int.class} - ) public void testPBEParameterSpec() { byte[] salt = {1, 2, 3, 4, 5}; int iterationCount = 10; @@ -75,12 +62,6 @@ public class PBEParameterSpecTest extends TestCase { * to the salt specified in the constructor and that the change of * returned array does not cause the change of internal array. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSalt", - args = {} - ) public void testGetSalt() { byte[] salt = new byte[] {1, 2, 3, 4, 5}; int iterationCount = 10; @@ -100,12 +81,6 @@ public class PBEParameterSpecTest extends TestCase { * getIterationCount() method testing. Tests that returned value is equal * to the value specified in the constructor. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getIterationCount", - args = {} - ) public void testGetIterationCount() { byte[] salt = new byte[] {1, 2, 3, 4, 5}; int iterationCount = 10; diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/PSourceTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/PSourceTest.java index ac3c5e5..bead58c 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/PSourceTest.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/PSourceTest.java @@ -22,11 +22,6 @@ package org.apache.harmony.crypto.tests.javax.crypto.spec; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.util.Arrays; import javax.crypto.spec.PSource; @@ -34,7 +29,6 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -@TestTargetClass(PSource.class) /** */ public class PSourceTest extends TestCase { @@ -45,13 +39,6 @@ public class PSourceTest extends TestCase { * DEFAULT field, and that input p array is copied to protect against * subsequent modification. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Nested class.", - clazz = PSource.PSpecified.class, - method = "PSpecified", - args = { byte[].class } - ) public void testPSpecified() { try { new PSource.PSpecified(null); @@ -76,22 +63,6 @@ public class PSourceTest extends TestCase { * array specified in the constructor. Checks that modification * of returned array does not affect the internal array. */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - clazz = PSource.PSpecified.class, - method = "PSpecified", - args = {byte[].class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - clazz = PSource.PSpecified.class, - method = "getValue", - args = {} - ) - }) public void testGetValue() { byte[] p = new byte[] {1, 2, 3, 4, 5}; @@ -112,12 +83,6 @@ public class PSourceTest extends TestCase { * PSource(String pSrcName) method testing. Tests that returned value is * equal to the value specified in the constructor. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Checks NullPointerException", - method = "PSource", - args = {java.lang.String.class} - ) public void testPSource() { try { new PSource(null) {}; @@ -131,20 +96,6 @@ public class PSourceTest extends TestCase { * getAlgorithm() method testing. Tests that returned value is * equal to the value specified in the constructor. */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getAlgorithm", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "PSource", - args = {java.lang.String.class} - ) - }) public void testGetAlgorithm() { String pSrcName = "pSrcName"; PSource ps = new PSource(pSrcName) {}; diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/RC2ParameterSpecTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/RC2ParameterSpecTest.java index 2ddb8f8..f4b2894 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/RC2ParameterSpecTest.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/RC2ParameterSpecTest.java @@ -22,11 +22,6 @@ package org.apache.harmony.crypto.tests.javax.crypto.spec; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.lang.IllegalArgumentException; import java.util.Arrays; @@ -36,10 +31,8 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -@TestTargetClass(RC2ParameterSpec.class) /** */ - public class RC2ParameterSpecTest extends TestCase { /** @@ -48,12 +41,6 @@ public class RC2ParameterSpecTest extends TestCase { * inappropriate constructor parameters and that input iv array is * copied to protect against subsequent modification. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "RC2ParameterSpec", - args = {int.class, byte[].class} - ) public void testRC2ParameterSpec1() { int effectiveKeyBits = 10; byte[] iv = {1, 2, 3, 4, 5, 6, 7, 8}; @@ -85,12 +72,6 @@ public class RC2ParameterSpecTest extends TestCase { * inappropriate constructor parameters and that input iv array is * copied to protect against subsequent modification. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "RC2ParameterSpec", - args = {int.class, byte[].class, int.class} - ) public void testRC2ParameterSpec2() { int effectiveKeyBits = 10; byte[] iv = {1, 2, 3, 4, 5, 6, 7, 8, 9, 0}; @@ -121,12 +102,6 @@ public class RC2ParameterSpecTest extends TestCase { * getEffectiveKeyBits() method testing. Tests that returned value is * equal to the value specified in the constructor. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getEffectiveKeyBits", - args = {} - ) public void testGetEffectiveKeyBits() { int effectiveKeyBits = 10; byte[] iv = {1, 2, 3, 4, 5, 6, 7, 8}; @@ -143,12 +118,6 @@ public class RC2ParameterSpecTest extends TestCase { * of returned array does not affect the internal array. Also it checks * that getIV() method returns null if iv is not specified. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getIV", - args = {} - ) public void testGetIV() { int effectiveKeyBits = 10; byte[] iv = new byte[] {1, 2, 3, 4, 5, 6, 7, 8}; @@ -173,12 +142,6 @@ public class RC2ParameterSpecTest extends TestCase { * operation: it should be reflexive, symmetric, transitive, consistent * and should be false on null object. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "equals", - args = {java.lang.Object.class} - ) public void testEquals() { int effectiveKeyBits = 10; byte[] iv = new byte[] {1, 2, 3, 4, 5, 6, 7, 8}; @@ -219,12 +182,6 @@ public class RC2ParameterSpecTest extends TestCase { * hashCode() method testing. Tests that for equal objects hash codes * are equal. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hashCode", - args = {} - ) public void testHashCode() { int effectiveKeyBits = 0; byte[] iv = new byte[] {1, 2, 3, 4, 5, 6, 7, 8}; @@ -236,12 +193,6 @@ public class RC2ParameterSpecTest extends TestCase { ps1.hashCode() == ps2.hashCode()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "RC2ParameterSpec", - args = {int.class} - ) public void test_constructorI() { int effectiveKeyBits = 0; diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/RC5ParameterSpecTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/RC5ParameterSpecTest.java index 0d235fe..9e92152 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/RC5ParameterSpecTest.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/RC5ParameterSpecTest.java @@ -22,11 +22,6 @@ package org.apache.harmony.crypto.tests.javax.crypto.spec; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.util.Arrays; import javax.crypto.spec.RC5ParameterSpec; @@ -35,10 +30,8 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -@TestTargetClass(RC5ParameterSpec.class) /** */ - public class RC5ParameterSpecTest extends TestCase { /** @@ -47,12 +40,6 @@ public class RC5ParameterSpecTest extends TestCase { * inappropriate constructor parameters and that input iv array is * copied to protect against subsequent modification. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "RC5ParameterSpec", - args = {int.class, int.class, int.class, byte[].class} - ) public void testRC5ParameterSpec1() { int version = 1; int rounds = 5; @@ -94,12 +81,6 @@ public class RC5ParameterSpecTest extends TestCase { * the case of inappropriate constructor parameters and that input iv array * is copied to protect against subsequent modification. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "RC5ParameterSpec", - args = {int.class, int.class, int.class, byte[].class, int.class} - ) public void testRC5ParameterSpec2() { int version = 1; int rounds = 5; @@ -156,12 +137,6 @@ public class RC5ParameterSpecTest extends TestCase { * getVersion() method testing. Tests that returned value is * equal to the value specified in the constructor. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getVersion", - args = {} - ) public void testGetVersion() { int version = 1; int rounds = 5; @@ -177,12 +152,6 @@ public class RC5ParameterSpecTest extends TestCase { * getRounds() method testing. Tests that returned value is * equal to the value specified in the constructor. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getRounds", - args = {} - ) public void testGetRounds() { int version = 1; int rounds = 5; @@ -198,12 +167,6 @@ public class RC5ParameterSpecTest extends TestCase { * getWordSize() method testing. Tests that returned value is * equal to the value specified in the constructor. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getWordSize", - args = {} - ) public void testGetWordSize() { int version = 1; int rounds = 5; @@ -221,12 +184,6 @@ public class RC5ParameterSpecTest extends TestCase { * of returned array does not affect the internal array. Also it checks * that getIV() method returns null if iv is not specified. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getIV", - args = {} - ) public void testGetIV() { int version = 1; int rounds = 5; @@ -254,12 +211,6 @@ public class RC5ParameterSpecTest extends TestCase { * operation: it should be reflexive, symmetric, transitive, consistent * and should be false on null object. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "equals", - args = {java.lang.Object.class} - ) public void testEquals() { int version = 1; int rounds = 5; @@ -310,12 +261,6 @@ public class RC5ParameterSpecTest extends TestCase { * hashCode() method testing. Tests that for equal objects hash codes * are equal. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hashCode", - args = {} - ) public void testHashCode() { int version = 1; int rounds = 5; @@ -330,11 +275,6 @@ public class RC5ParameterSpecTest extends TestCase { ps1.hashCode() == ps2.hashCode()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "RC5ParameterSpec", - args = {int.class, int.class, int.class} - ) public void test_constructorIII() { int version = 1; int rounds = 5; diff --git a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/SecretKeySpecTest.java b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/SecretKeySpecTest.java index a411762..f48213c 100644 --- a/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/SecretKeySpecTest.java +++ b/luni/src/test/java/org/apache/harmony/crypto/tests/javax/crypto/spec/SecretKeySpecTest.java @@ -22,10 +22,6 @@ package org.apache.harmony.crypto.tests.javax.crypto.spec; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; - import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; @@ -34,10 +30,8 @@ import java.util.Arrays; import javax.crypto.spec.SecretKeySpec; -@TestTargetClass(SecretKeySpec.class) /** */ - public class SecretKeySpecTest extends TestCase { /** @@ -46,12 +40,6 @@ public class SecretKeySpecTest extends TestCase { * constructor parameters and that input iv array is * copied to protect against subsequent modification. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "SecretKeySpec", - args = {byte[].class, java.lang.String.class} - ) public void testSecretKeySpec1() { byte[] key = new byte[] {1, 2, 3, 4, 5}; String algorithm = "Algorithm"; @@ -90,12 +78,6 @@ public class SecretKeySpecTest extends TestCase { * the case of inappropriate constructor parameters and that input iv array * is copied to protect against subsequent modification. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "SecretKeySpec", - args = {byte[].class, int.class, int.class, java.lang.String.class} - ) public void testSecretKeySpec2() { byte[] key = new byte[] {1, 2, 3, 4, 5}; int offset = 1; @@ -154,12 +136,6 @@ public class SecretKeySpecTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "SecretKeySpec", - args = {byte[].class, int.class, int.class, java.lang.String.class} - ) public void testSecretKeySpec3() { byte[] key = new byte[] {1, 2, 3, 4, 5}; int offset = 1; @@ -180,12 +156,6 @@ public class SecretKeySpecTest extends TestCase { * getAlgorithm() method testing. Tests that returned value is * equal to the value specified in the constructor. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getAlgorithm", - args = {} - ) public void testGetAlgorithm() { byte[] key = new byte[] {1, 2, 3, 4, 5}; String algorithm = "Algorithm"; @@ -199,12 +169,6 @@ public class SecretKeySpecTest extends TestCase { /** * getFormat() method testing. Tests that returned value is "RAW". */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getFormat", - args = {} - ) public void testGetFormat() { byte[] key = new byte[] {1, 2, 3, 4, 5}; String algorithm = "Algorithm"; @@ -219,12 +183,6 @@ public class SecretKeySpecTest extends TestCase { * array specified in the constructor. Checks that modification * of returned array does not affect the internal array. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getEncoded", - args = {} - ) public void testGetEncoded() { byte[] key = new byte[] {1, 2, 3, 4, 5}; String algorithm = "Algorithm"; @@ -251,12 +209,6 @@ public class SecretKeySpecTest extends TestCase { * hashCode() method testing. Tests that for equal objects hash codes * are equal. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hashCode", - args = {} - ) public void testHashCode() { byte[] key = new byte[] {1, 2, 3, 4, 5}; String algorithm = "Algorithm"; @@ -272,12 +224,6 @@ public class SecretKeySpecTest extends TestCase { * operation: it should be reflexive, symmetric, transitive, consistent * and should be false on null object. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "equals", - args = {java.lang.Object.class} - ) public void testEquals() { byte[] key = new byte[] {1, 2, 3, 4, 5}; String algorithm = "Algorithm"; diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/internal/net/www/protocol/http/HttpURLConnectionTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/internal/net/www/protocol/http/HttpURLConnectionTest.java index d7a693c..dcd50bb 100644 --- a/luni/src/test/java/org/apache/harmony/luni/tests/internal/net/www/protocol/http/HttpURLConnectionTest.java +++ b/luni/src/test/java/org/apache/harmony/luni/tests/internal/net/www/protocol/http/HttpURLConnectionTest.java @@ -18,12 +18,6 @@ package org.apache.harmony.luni.tests.internal.net.www.protocol.http; import dalvik.annotation.SideEffect; -import dalvik.annotation.BrokenTest; -import dalvik.annotation.KnownFailure; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; import java.io.IOException; import java.net.Authenticator; @@ -47,7 +41,6 @@ import junit.framework.TestCase; * Tests for <code>HTTPURLConnection</code> class constructors and methods. * */ -@TestTargetClass(HttpURLConnection.class) public class HttpURLConnectionTest extends TestCase { private final static Object bound = new Object(); @@ -165,14 +158,8 @@ public class HttpURLConnectionTest extends TestCase { } /** - * @tests org.apache.harmony.luni.internal.net.www.http.getOutputStream() + * org.apache.harmony.luni.internal.net.www.http.getOutputStream() */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Regression test.", - method = "getOutputStream", - args = {} - ) public void testGetOutputStream() throws Exception { // Regression for HARMONY-482 MockServer httpServer = @@ -198,12 +185,6 @@ public class HttpURLConnectionTest extends TestCase { * Test checks if the proxy specified in openConnection * method will be used for connection to the server */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies if the proxy specified in openConnection method will be used for connection to the server.", - method = "usingProxy", - args = {} - ) public void testUsingProxy() throws Exception { // Regression for HARMONY-570 MockServer server = new MockServer("server"); @@ -244,12 +225,6 @@ public class HttpURLConnectionTest extends TestCase { * Test checks if the proxy provided by proxy selector * will be used for connection to the server */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies if the proxy provided by proxy selector will be used for connection to the server.", - method = "usingProxy", - args = {} - ) public void testUsingProxySelector() throws Exception { // Regression for HARMONY-570 MockServer server = new MockServer("server"); @@ -291,20 +266,6 @@ public class HttpURLConnectionTest extends TestCase { ProxySelector.setDefault(defPS); } } - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Regression test.", - method = "getResponseCode", - args = {} - ), - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Regression test.", - method = "connect", - args = {} - ) - }) @SideEffect("Suffers from side effect of other, currently unknown test") public void testProxyAuthorization() throws Exception { // Set up test Authenticator diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/io/ObjectInputStreamTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/io/ObjectInputStreamTest.java index 7120dd6..12406f3 100644 --- a/luni/src/test/java/org/apache/harmony/luni/tests/java/io/ObjectInputStreamTest.java +++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/io/ObjectInputStreamTest.java @@ -128,7 +128,7 @@ public class ObjectInputStreamTest extends TestCase implements } /** - * @tests java.io.ObjectInputStream#readObject() + * java.io.ObjectInputStream#readObject() */ public void test_readObjectMissingClasses() throws Exception { SerializationTest.verifySelf(new A1(), new SerializableAssert() { @@ -140,7 +140,7 @@ public class ObjectInputStreamTest extends TestCase implements } /** - * @tests java.io.ObjectInputStream#ObjectInputStream(java.io.InputStream) + * java.io.ObjectInputStream#ObjectInputStream(java.io.InputStream) */ public void test_ConstructorLjava_io_InputStream() throws IOException { oos.writeDouble(Double.MAX_VALUE); @@ -158,7 +158,7 @@ public class ObjectInputStreamTest extends TestCase implements } /** - * @tests {@link java.io.ObjectInputStream#resolveProxyClass(String[])} + * {@link java.io.ObjectInputStream#resolveProxyClass(String[])} */ public void test_resolveProxyClass() throws IOException, ClassNotFoundException { @@ -208,7 +208,7 @@ public class ObjectInputStreamTest extends TestCase implements } /** - * @tests java.io.ObjectInputStream#available() + * java.io.ObjectInputStream#available() */ public void test_available() throws IOException { oos.writeBytes("HelloWorld"); @@ -219,7 +219,7 @@ public class ObjectInputStreamTest extends TestCase implements } /** - * @tests java.io.ObjectInputStream#close() + * java.io.ObjectInputStream#close() */ public void test_close() throws IOException { oos.writeBytes("HelloWorld"); @@ -229,7 +229,7 @@ public class ObjectInputStreamTest extends TestCase implements } /** - * @tests java.io.ObjectInputStream#defaultReadObject() + * java.io.ObjectInputStream#defaultReadObject() */ public void test_defaultReadObject() throws Exception { // SM. This method may as well be private, as if called directly it @@ -249,7 +249,7 @@ public class ObjectInputStreamTest extends TestCase implements } /** - * @tests java.io.ObjectInputStream#read() + * java.io.ObjectInputStream#read() */ public void test_read() throws IOException { oos.write('T'); @@ -260,7 +260,7 @@ public class ObjectInputStreamTest extends TestCase implements } /** - * @tests java.io.ObjectInputStream#read(byte[], int, int) + * java.io.ObjectInputStream#read(byte[], int, int) */ public void test_read$BII() throws IOException { byte[] buf = new byte[10]; @@ -274,7 +274,7 @@ public class ObjectInputStreamTest extends TestCase implements } /** - * @tests java.io.ObjectInputStream#readBoolean() + * java.io.ObjectInputStream#readBoolean() */ public void test_readBoolean() throws IOException { oos.writeBoolean(true); @@ -285,7 +285,7 @@ public class ObjectInputStreamTest extends TestCase implements } /** - * @tests java.io.ObjectInputStream#readByte() + * java.io.ObjectInputStream#readByte() */ public void test_readByte() throws IOException { oos.writeByte(127); @@ -296,7 +296,7 @@ public class ObjectInputStreamTest extends TestCase implements } /** - * @tests java.io.ObjectInputStream#readChar() + * java.io.ObjectInputStream#readChar() */ public void test_readChar() throws IOException { oos.writeChar('T'); @@ -307,7 +307,7 @@ public class ObjectInputStreamTest extends TestCase implements } /** - * @tests java.io.ObjectInputStream#readDouble() + * java.io.ObjectInputStream#readDouble() */ public void test_readDouble() throws IOException { oos.writeDouble(Double.MAX_VALUE); @@ -319,7 +319,7 @@ public class ObjectInputStreamTest extends TestCase implements } /** - * @tests java.io.ObjectInputStream#readFields() + * java.io.ObjectInputStream#readFields() */ public void test_readFields() throws Exception { @@ -344,7 +344,7 @@ public class ObjectInputStreamTest extends TestCase implements } /** - * @tests java.io.ObjectInputStream#readFloat() + * java.io.ObjectInputStream#readFloat() */ public void test_readFloat() throws IOException { oos.writeFloat(Float.MAX_VALUE); @@ -356,7 +356,7 @@ public class ObjectInputStreamTest extends TestCase implements } /** - * @tests java.io.ObjectInputStream#readFully(byte[]) + * java.io.ObjectInputStream#readFully(byte[]) */ public void test_readFully$B() throws IOException { byte[] buf = new byte[10]; @@ -370,7 +370,7 @@ public class ObjectInputStreamTest extends TestCase implements } /** - * @tests java.io.ObjectInputStream#readFully(byte[], int, int) + * java.io.ObjectInputStream#readFully(byte[], int, int) */ public void test_readFully$BII() throws IOException { byte[] buf = new byte[10]; @@ -384,7 +384,7 @@ public class ObjectInputStreamTest extends TestCase implements } /** - * @tests java.io.ObjectInputStream#readInt() + * java.io.ObjectInputStream#readInt() */ public void test_readInt() throws IOException { oos.writeInt(Integer.MAX_VALUE); @@ -396,7 +396,7 @@ public class ObjectInputStreamTest extends TestCase implements } /** - * @tests java.io.ObjectInputStream#readLine() + * java.io.ObjectInputStream#readLine() */ @SuppressWarnings("deprecation") public void test_readLine() throws IOException { @@ -410,7 +410,7 @@ public class ObjectInputStreamTest extends TestCase implements } /** - * @tests java.io.ObjectInputStream#readLong() + * java.io.ObjectInputStream#readLong() */ public void test_readLong() throws IOException { oos.writeLong(Long.MAX_VALUE); @@ -422,7 +422,7 @@ public class ObjectInputStreamTest extends TestCase implements } /** - * @tests java.io.ObjectInputStream#readObject() + * java.io.ObjectInputStream#readObject() */ public void test_readObject() throws Exception { String s = "HelloWorld"; @@ -510,7 +510,7 @@ public class ObjectInputStreamTest extends TestCase implements } /** - * @tests java.io.ObjectInputStream#readObjectOverride() + * java.io.ObjectInputStream#readObjectOverride() */ public void test_readObjectOverride() throws Exception { // Regression for HARMONY-846 @@ -540,7 +540,7 @@ public class ObjectInputStreamTest extends TestCase implements } /** - * @tests java.io.ObjectInputStream#readObject() + * java.io.ObjectInputStream#readObject() */ public void test_readObjectCorrupt() throws IOException, ClassNotFoundException { byte[] bytes = { 00, 00, 00, 0x64, 0x43, 0x48, (byte) 0xFD, 0x71, 00, @@ -556,7 +556,7 @@ public class ObjectInputStreamTest extends TestCase implements } /** - * @tests java.io.ObjectInputStream#readShort() + * java.io.ObjectInputStream#readShort() */ public void test_readShort() throws IOException { oos.writeShort(Short.MAX_VALUE); @@ -568,7 +568,7 @@ public class ObjectInputStreamTest extends TestCase implements } /** - * @tests java.io.ObjectInputStream#readUnsignedByte() + * java.io.ObjectInputStream#readUnsignedByte() */ public void test_readUnsignedByte() throws IOException { oos.writeByte(-1); @@ -580,7 +580,7 @@ public class ObjectInputStreamTest extends TestCase implements } /** - * @tests java.io.ObjectInputStream#readUnsignedShort() + * java.io.ObjectInputStream#readUnsignedShort() */ public void test_readUnsignedShort() throws IOException { oos.writeShort(-1); @@ -592,7 +592,7 @@ public class ObjectInputStreamTest extends TestCase implements } /** - * @tests java.io.ObjectInputStream#readUTF() + * java.io.ObjectInputStream#readUTF() */ public void test_readUTF() throws IOException { oos.writeUTF("HelloWorld"); @@ -603,7 +603,7 @@ public class ObjectInputStreamTest extends TestCase implements } /** - * @tests java.io.ObjectInputStream#skipBytes(int) + * java.io.ObjectInputStream#skipBytes(int) */ public void test_skipBytesI() throws IOException { byte[] buf = new byte[10]; @@ -777,7 +777,7 @@ public class ObjectInputStreamTest extends TestCase implements } /** - * @tests java.io.ObjectInputStream#resolveObject(Object) + * java.io.ObjectInputStream#resolveObject(Object) */ public void test_resolveObjectLjava_lang_Object() throws Exception { // Write an Integer object into memory diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/net/ContentHandlerFactoryTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/net/ContentHandlerFactoryTest.java index 8fa5615..74b2276 100644 --- a/luni/src/test/java/org/apache/harmony/luni/tests/java/net/ContentHandlerFactoryTest.java +++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/net/ContentHandlerFactoryTest.java @@ -1,10 +1,6 @@ package org.apache.harmony.luni.tests.java.net; import dalvik.annotation.SideEffect; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; import junit.framework.TestCase; @@ -18,7 +14,6 @@ import java.net.MalformedURLException; import java.net.URL; import java.net.URLConnection; -@TestTargetClass(ContentHandlerFactory.class) public class ContentHandlerFactoryTest extends TestCase { ContentHandlerFactory oldFactory = null; @@ -29,21 +24,6 @@ public class ContentHandlerFactoryTest extends TestCase { boolean isGetContentCalled = false; boolean isCreateContentHandlerCalled = false; - @TestTargets ({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "createContentHandler", - args = {java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies positive case, and java.lang.Error.", - clazz = URLConnection.class, - method = "setContentHandlerFactory", - args = { ContentHandlerFactory.class } - ) - }) @SideEffect("This test affects tests that are run after this one." + " The reason are side effects due to caching in URLConnection." + " Maybe this test needs to be run in isolation.") diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/net/ContentHandlerTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/net/ContentHandlerTest.java index 638d024..6760d41 100644 --- a/luni/src/test/java/org/apache/harmony/luni/tests/java/net/ContentHandlerTest.java +++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/net/ContentHandlerTest.java @@ -27,7 +27,7 @@ import junit.framework.TestCase; public class ContentHandlerTest extends TestCase { /** - * @tests java.net.ContentHandler#getContent(java.net.URLConnection, + * java.net.ContentHandler#getContent(java.net.URLConnection, * java.lang.Class[]) */ public void test_getContent() throws IOException { diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/net/HttpRetryExceptionTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/net/HttpRetryExceptionTest.java index 32a7eda..16b5886 100644 --- a/luni/src/test/java/org/apache/harmony/luni/tests/java/net/HttpRetryExceptionTest.java +++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/net/HttpRetryExceptionTest.java @@ -46,7 +46,7 @@ public class HttpRetryExceptionTest extends TestCase { }; /** - * @tests serialization/deserialization. + * serialization/deserialization. */ public void testSerializationSelf() throws Exception { SerializationTest.verifySelf(new HttpRetryException(DETAIL, 100, @@ -54,7 +54,7 @@ public class HttpRetryExceptionTest extends TestCase { } /** - * @tests serialization/deserialization compatibility with RI. + * serialization/deserialization compatibility with RI. */ public void testSerializationCompatibility() throws Exception { SerializationTest.verifyGolden(this, new HttpRetryException(DETAIL, diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/net/Inet4AddressTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/net/Inet4AddressTest.java index d2c0c6c..9759f18 100644 --- a/luni/src/test/java/org/apache/harmony/luni/tests/java/net/Inet4AddressTest.java +++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/net/Inet4AddressTest.java @@ -17,16 +17,12 @@ package org.apache.harmony.luni.tests.java.net; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; import java.io.Serializable; import java.net.Inet4Address; import java.net.InetAddress; import org.apache.harmony.testframework.serialization.SerializationTest; import org.apache.harmony.testframework.serialization.SerializationTest.SerializableAssert; -@TestTargetClass(Inet4Address.class) public class Inet4AddressTest extends junit.framework.TestCase { private Inet4Address ipv4Localhost; @@ -40,14 +36,8 @@ public class Inet4AddressTest extends junit.framework.TestCase { } /** - * @tests java.net.Inet4Address#isMulticastAddress() + * java.net.Inet4Address#isMulticastAddress() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isMulticastAddress", - args = {} - ) public void test_isMulticastAddress() { // Create 2 IP v4 addresses and call "isMulticastAddress()" @@ -78,14 +68,8 @@ public class Inet4AddressTest extends junit.framework.TestCase { } /** - * @tests java.net.Inet4Address#isAnyLocalAddress() + * java.net.Inet4Address#isAnyLocalAddress() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isAnyLocalAddress", - args = {} - ) public void test_isAnyLocalAddress() { String addrName = ""; try { @@ -99,14 +83,8 @@ public class Inet4AddressTest extends junit.framework.TestCase { } /** - * @tests java.net.Inet4Address#isLoopbackAddress() + * java.net.Inet4Address#isLoopbackAddress() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isLoopbackAddress", - args = {} - ) public void test_isLoopbackAddress() { // Create some IP V4 addresses and test if they are local... @@ -137,14 +115,8 @@ public class Inet4AddressTest extends junit.framework.TestCase { } /** - * @tests java.net.Inet4Address#isLinkLocalAddress() + * java.net.Inet4Address#isLinkLocalAddress() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isLinkLocalAddress", - args = {} - ) public void test_isLinkLocalAddress() { String addrName = ""; @@ -163,14 +135,8 @@ public class Inet4AddressTest extends junit.framework.TestCase { } /** - * @tests java.net.Inet4Address#isSiteLocalAddress() + * java.net.Inet4Address#isSiteLocalAddress() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isSiteLocalAddress", - args = {} - ) public void test_isSiteLocalAddress() { String addrName = ""; try { @@ -188,14 +154,8 @@ public class Inet4AddressTest extends junit.framework.TestCase { } /** - * @tests java.net.Inet4Address#isMCGlobal() + * java.net.Inet4Address#isMCGlobal() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isMCGlobal", - args = {} - ) public void test_isMCGlobal() { // Create an IPv4 mulitcast address. It should return @@ -246,14 +206,8 @@ public class Inet4AddressTest extends junit.framework.TestCase { } /** - * @tests java.net.Inet4Address#isMCNodeLocal() + * java.net.Inet4Address#isMCNodeLocal() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isMCNodeLocal", - args = {} - ) public void test_isMCNodeLocal() { // Create an IPv4 mulitcast address. It should return // false for node-local mutlicast. There are no valid IPv4 @@ -283,14 +237,8 @@ public class Inet4AddressTest extends junit.framework.TestCase { } /** - * @tests java.net.Inet4Address#isMCLinkLocal() + * java.net.Inet4Address#isMCLinkLocal() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isMCLinkLocal", - args = {} - ) public void test_isMCLinkLocal() { // Create an IPv4 mulitcast address. It should return // false for link-local mutlicast. There are no valid IPv4 @@ -332,14 +280,8 @@ public class Inet4AddressTest extends junit.framework.TestCase { } /** - * @tests java.net.Inet4Address#isMCSiteLocal() + * java.net.Inet4Address#isMCSiteLocal() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isMCSiteLocal", - args = {} - ) public void test_isMCSiteLocal() { // Create an IPv4 mulitcast address. It should return // false for site-local mutlicast. There are no valid IPv4 @@ -387,14 +329,8 @@ public class Inet4AddressTest extends junit.framework.TestCase { } /** - * @tests java.net.Inet4Address#isMCOrgLocal() + * java.net.Inet4Address#isMCOrgLocal() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isMCOrgLocal", - args = {} - ) public void test_isMCOrgLocal() { // Create an IPv4 mulitcast address. It should return // false for organization-local mutlicast. There are no valid IPv4 @@ -455,37 +391,19 @@ public class Inet4AddressTest extends junit.framework.TestCase { }; /** - * @tests serialization/deserialization compatibility. + * serialization/deserialization compatibility. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Checks serialization", - method = "!SerializationSelf", - args = {} - ) public void testSerializationSelf() throws Exception { SerializationTest.verifySelf(ipv4LoopbackIp, COMPARATOR); } /** - * @tests serialization/deserialization compatibility with RI. + * serialization/deserialization compatibility with RI. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Checks serialization", - method = "!SerializationGolden", - args = {} - ) public void testSerializationCompatibility() throws Exception { SerializationTest.verifyGolden(this, ipv4Localhost, COMPARATOR); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "equals", - args = {java.lang.Object.class} - ) public void test_equals() throws Exception { InetAddress addr = InetAddress.getByName("239.191.255.255"); assertTrue(addr.equals(addr)); @@ -496,12 +414,6 @@ public class Inet4AddressTest extends junit.framework.TestCase { assertFalse(ipv4LoopbackIp.equals(addr3)); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getHostAddress", - args = {} - ) public void test_getHostAddress() throws Exception { assertEquals("127.0.0.1", ipv4Localhost.getHostAddress()); assertEquals("127.0.0.1", ipv4LoopbackIp.getHostAddress()); @@ -519,12 +431,6 @@ public class Inet4AddressTest extends junit.framework.TestCase { assertEquals("1.1.0.1", addr.getHostAddress()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hashCode", - args = {} - ) public void test_hashCode() throws Exception { InetAddress addr1 = InetAddress.getByName("1.1"); InetAddress addr2 = InetAddress.getByName("1.1.1"); diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/net/Inet6AddressTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/net/Inet6AddressTest.java index eab7192..791f857 100644 --- a/luni/src/test/java/org/apache/harmony/luni/tests/java/net/Inet6AddressTest.java +++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/net/Inet6AddressTest.java @@ -17,10 +17,6 @@ package org.apache.harmony.luni.tests.java.net; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.io.Serializable; import java.net.Inet4Address; import java.net.Inet6Address; @@ -34,7 +30,6 @@ import org.apache.harmony.luni.tests.java.net.InetAddressTest.MockSecurityManage import org.apache.harmony.testframework.serialization.SerializationTest; import org.apache.harmony.testframework.serialization.SerializationTest.SerializableAssert; -@TestTargetClass(Inet6Address.class) public class Inet6AddressTest extends junit.framework.TestCase { private Inet6Address ipv6Localhost; @@ -47,14 +42,8 @@ public class Inet6AddressTest extends junit.framework.TestCase { ipv6Localhost = (Inet6Address) InetAddress.getByAddress("localhost", ipv6Loopback); } /** - * @tests java.net.Inet6Address#isMulticastAddress() + * java.net.Inet6Address#isMulticastAddress() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isMulticastAddress", - args = {} - ) public void test_isMulticastAddress() { String addrName = ""; @@ -121,14 +110,8 @@ public class Inet6AddressTest extends junit.framework.TestCase { } /** - * @tests java.net.Inet6Address#isAnyLocalAddress() + * java.net.Inet6Address#isAnyLocalAddress() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isAnyLocalAddress", - args = {} - ) public void test_isAnyLocalAddress() { String addrName = ""; @@ -163,14 +146,8 @@ public class Inet6AddressTest extends junit.framework.TestCase { } /** - * @tests java.net.Inet6Address#isLoopbackAddress() + * java.net.Inet6Address#isLoopbackAddress() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isLoopbackAddress", - args = {} - ) public void test_isLoopbackAddress() { String addrName = ""; @@ -256,14 +233,8 @@ public class Inet6AddressTest extends junit.framework.TestCase { } /** - * @tests java.net.Inet6Address#isLinkLocalAddress() + * java.net.Inet6Address#isLinkLocalAddress() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isLinkLocalAddress", - args = {} - ) public void test_isLinkLocalAddress() { String addrName = ""; @@ -309,14 +280,8 @@ public class Inet6AddressTest extends junit.framework.TestCase { } /** - * @tests java.net.Inet6Address#isSiteLocalAddress() + * java.net.Inet6Address#isSiteLocalAddress() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isSiteLocalAddress", - args = {} - ) public void test_isSiteLocalAddress() { String addrName = ""; try { @@ -355,14 +320,8 @@ public class Inet6AddressTest extends junit.framework.TestCase { } /** - * @tests java.net.Inet6Address#isMCGlobal() + * java.net.Inet6Address#isMCGlobal() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isMCGlobal", - args = {} - ) public void test_isMCGlobal() { String addrName = ""; try { @@ -443,14 +402,8 @@ public class Inet6AddressTest extends junit.framework.TestCase { } /** - * @tests java.net.Inet6Address#isMCNodeLocal() + * java.net.Inet6Address#isMCNodeLocal() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isMCNodeLocal", - args = {} - ) public void test_isMCNodeLocal() { String addrName = ""; try { @@ -518,14 +471,8 @@ public class Inet6AddressTest extends junit.framework.TestCase { } /** - * @tests java.net.Inet6Address#isMCLinkLocal() + * java.net.Inet6Address#isMCLinkLocal() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isMCLinkLocal", - args = {} - ) public void test_isMCLinkLocal() { String addrName = ""; try { @@ -615,14 +562,8 @@ public class Inet6AddressTest extends junit.framework.TestCase { } /** - * @tests java.net.Inet6Address#isMCSiteLocal() + * java.net.Inet6Address#isMCSiteLocal() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isMCSiteLocal", - args = {} - ) public void test_isMCSiteLocal() { String addrName = ""; try { @@ -711,14 +652,8 @@ public class Inet6AddressTest extends junit.framework.TestCase { } /** - * @tests java.net.Inet6Address#isMCOrgLocal() + * java.net.Inet6Address#isMCOrgLocal() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isMCOrgLocal", - args = {} - ) public void test_isMCOrgLocal() { String addrName = ""; try { @@ -809,14 +744,8 @@ public class Inet6AddressTest extends junit.framework.TestCase { } /** - * @tests java.net.Inet6Address#isIPv4CompatibleAddress() + * java.net.Inet6Address#isIPv4CompatibleAddress() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isIPv4CompatibleAddress", - args = {} - ) public void test_isIPv4CompatibleAddress() { String addrName = ""; Inet6Address addr = null; @@ -856,14 +785,8 @@ public class Inet6AddressTest extends junit.framework.TestCase { } /** - * @tests java.net.Inet6Address#getByName(java.lang.String) + * java.net.Inet6Address#getByName(java.lang.String) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getByName", - args = {java.lang.String.class} - ) public void test_getByNameLjava_lang_String() throws Exception { // ones to add "::255.255.255.255", "::FFFF:0.0.0.0", // "0.0.0.0.0.0::255.255.255.255", "F:F:F:F:F:F:F:F", @@ -908,14 +831,8 @@ public class Inet6AddressTest extends junit.framework.TestCase { } /** - * @tests java.net.Inet6Address#getByAddress(String, byte[], int) + * java.net.Inet6Address#getByAddress(String, byte[], int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getByAddress", - args = {java.lang.String.class, byte[].class, int.class} - ) public void test_getByAddressLString$BI() throws UnknownHostException{ try { Inet6Address.getByAddress("123", null, 0); @@ -942,15 +859,9 @@ public class Inet6AddressTest extends junit.framework.TestCase { } /** - * @tests java.net.Inet6Address#getByAddress(String, byte[], + * java.net.Inet6Address#getByAddress(String, byte[], * NetworkInterface) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getByAddress", - args = {java.lang.String.class, byte[].class, java.net.NetworkInterface.class} - ) public void test_getByAddressLString$BLNetworkInterface() throws UnknownHostException { NetworkInterface nif = null; @@ -977,14 +888,8 @@ public class Inet6AddressTest extends junit.framework.TestCase { /** * @throws UnknownHostException - * @tests java.net.Inet6Address#getScopeID() + * java.net.Inet6Address#getScopeID() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getScopeId", - args = {} - ) public void test_getScopeID() throws UnknownHostException { Inet6Address v6ia; byte[] addr = { (byte) 0xFE, (byte) 0x80, 0, 0, 0, 0, 0, 0, 0x02, 0x11, @@ -1002,14 +907,8 @@ public class Inet6AddressTest extends junit.framework.TestCase { } /** - * @tests java.net.Inet6Address#getScopedInterface() + * java.net.Inet6Address#getScopedInterface() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getScopedInterface", - args = {} - ) public void test_getScopedInterface() throws UnknownHostException { byte[] addr = { (byte) 0xFE, (byte) 0x80, (byte) 0x09, (byte) 0xb5, (byte) 0x6b, (byte) 0xa4, 0, 0, 0, 0, 0, 0, (byte) 0x09, @@ -1091,14 +990,8 @@ public class Inet6AddressTest extends junit.framework.TestCase { }; /** - * @tests serialization/deserialization compatibility. + * serialization/deserialization compatibility. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Checks serialization", - method = "!SerializationSelf", - args = {} - ) public void testSerializationSelf() throws Exception { byte[] localv6 = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 }; @@ -1108,14 +1001,8 @@ public class Inet6AddressTest extends junit.framework.TestCase { } /** - * @tests serialization/deserialization compatibility with RI. + * serialization/deserialization compatibility with RI. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Checks serialization", - method = "!SerializationGolden", - args = {} - ) public void testSerializationCompatibility() throws Exception { byte[] localv6 = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 }; @@ -1128,12 +1015,6 @@ public class Inet6AddressTest extends junit.framework.TestCase { SerializationTest.verifyGolden(this, addresses, COMPARATOR); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "equals", - args = {java.lang.Object.class} - ) public void test_equals() throws Exception { InetAddress addr = InetAddress.getByName("239.191.255.255"); assertTrue(addr.equals(addr)); @@ -1144,12 +1025,6 @@ public class Inet6AddressTest extends junit.framework.TestCase { assertFalse(ipv6LoopbackIp.equals(addr3)); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getHostAddress", - args = {} - ) public void test_getHostAddress() throws Exception { assertEquals("::1", ipv6Localhost.getHostAddress()); assertEquals("::1", InetAddress.getByName("::1").getHostAddress()); @@ -1205,12 +1080,6 @@ public class Inet6AddressTest extends junit.framework.TestCase { assertEquals("10:2030:4050:6070:8090:a0b0:c0d0:e0f0", aAddr.getHostAddress()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hashCode", - args = {} - ) public void test_hashCode() throws Exception { InetAddress addr1 = InetAddress.getByName("1.1"); InetAddress addr2 = InetAddress.getByName("1.1.1"); @@ -1222,12 +1091,6 @@ public class Inet6AddressTest extends junit.framework.TestCase { assertTrue(ipv6LoopbackIp.hashCode() == ipv6Localhost.hashCode()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {} - ) public void test_toString() throws Exception { String validIPAddresses[] = { "::1.2.3.4", "::", "::", "1::0", "1::", "::1", "0", /* jdk1.5 accepts 0 as valid */ diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/net/InetAddressTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/net/InetAddressTest.java index 4a47db3..5284749 100644 --- a/luni/src/test/java/org/apache/harmony/luni/tests/java/net/InetAddressTest.java +++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/net/InetAddressTest.java @@ -18,9 +18,6 @@ package org.apache.harmony.luni.tests.java.net; import dalvik.annotation.BrokenTest; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; import java.io.IOException; import java.io.Serializable; @@ -39,7 +36,6 @@ import org.apache.harmony.testframework.serialization.SerializationTest.Serializ import tests.support.Support_Configuration; -@TestTargetClass(InetAddress.class) public class InetAddressTest extends junit.framework.TestCase { private static boolean someoneDone[] = new boolean[2]; @@ -152,28 +148,16 @@ public class InetAddressTest extends junit.framework.TestCase { } /** - * @tests java.net.InetAddress#equals(java.lang.Object) + * java.net.InetAddress#equals(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "equals", - args = {java.lang.Object.class} - ) public void test_equalsLjava_lang_Object() { // Test for method boolean java.net.InetAddress.equals(java.lang.Object) assertTrue(ipv4Localhost.equals(ipv4LoopbackIp)); } /** - * @tests java.net.InetAddress#getAddress() + * java.net.InetAddress#getAddress() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getAddress", - args = {} - ) public void test_getAddress() { // Test for method byte [] java.net.InetAddress.getAddress() try { @@ -192,14 +176,8 @@ public class InetAddressTest extends junit.framework.TestCase { } /** - * @tests java.net.InetAddress#getAllByName(java.lang.String) + * java.net.InetAddress#getAllByName(java.lang.String) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getAllByName", - args = {java.lang.String.class} - ) public void test_getAllByNameLjava_lang_String() throws Exception { // Test for method java.net.InetAddress [] // java.net.InetAddress.getAllByName(java.lang.String) @@ -233,14 +211,8 @@ public class InetAddressTest extends junit.framework.TestCase { } /** - * @tests java.net.InetAddress#getByName(java.lang.String) + * java.net.InetAddress#getByName(java.lang.String) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getByName", - args = {java.lang.String.class} - ) public void test_getByNameLjava_lang_String() throws Exception { // Test for method java.net.InetAddress // java.net.InetAddress.getByName(java.lang.String) @@ -298,27 +270,15 @@ public class InetAddressTest extends junit.framework.TestCase { } /** - * @tests java.net.InetAddress#getHostAddress() + * java.net.InetAddress#getHostAddress() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getHostAddress", - args = {} - ) public void test_getHostAddress() { assertTrue(ipv4Localhost.getHostAddress().equals("127.0.0.1")); } /** - * @tests java.net.InetAddress#getHostName() + * java.net.InetAddress#getHostName() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getHostName", - args = {} - ) public void test_getHostName() throws Exception { // Test for method java.lang.String java.net.InetAddress.getHostName() InetAddress ia = InetAddress @@ -368,14 +328,8 @@ public class InetAddressTest extends junit.framework.TestCase { } /** - * @tests java.net.InetAddress#getLocalHost() + * java.net.InetAddress#getLocalHost() */ - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "UnknownHostException should be thrown if no IP address for the host could be found.", - method = "getLocalHost", - args = {} - ) public void test_getLocalHost() { // Test for method java.net.InetAddress // java.net.InetAddress.getLocalHost() @@ -392,14 +346,8 @@ public class InetAddressTest extends junit.framework.TestCase { } /** - * @tests java.net.InetAddress#hashCode() + * java.net.InetAddress#hashCode() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hashCode", - args = {} - ) int getHashCode(String literal) { InetAddress host = null; try { @@ -422,14 +370,8 @@ public class InetAddressTest extends junit.framework.TestCase { } /** - * @tests java.net.InetAddress#isMulticastAddress() + * java.net.InetAddress#isMulticastAddress() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isMulticastAddress", - args = {} - ) public void test_isMulticastAddress() { // Test for method boolean java.net.InetAddress.isMulticastAddress() try { @@ -451,14 +393,8 @@ public class InetAddressTest extends junit.framework.TestCase { } /** - * @tests java.net.InetAddress#toString() + * java.net.InetAddress#toString() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {} - ) public void test_toString() throws Exception { // Test for method java.lang.String java.net.InetAddress.toString() InetAddress ia2 = InetAddress.getByName(Support_Configuration.InetTestIP); @@ -469,14 +405,8 @@ public class InetAddressTest extends junit.framework.TestCase { } /** - * @tests java.net.InetAddress#getByAddress(java.lang.String, byte[]) + * java.net.InetAddress#getByAddress(java.lang.String, byte[]) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getByAddress", - args = {java.lang.String.class, byte[].class} - ) public void test_getByAddressLjava_lang_String$B() { // Check an IPv4 address with an IPv6 hostname byte ipAddress[] = { 127, 0, 0, 1 }; @@ -510,14 +440,8 @@ public class InetAddressTest extends junit.framework.TestCase { } /** - * @tests java.net.InetAddress#getCanonicalHostName() + * java.net.InetAddress#getCanonicalHostName() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getCanonicalHostName", - args = {} - ) public void test_getCanonicalHostName() throws Exception { assertTrue("getCanonicalHostName returned a zero length string ", ipv4Localhost.getCanonicalHostName().length() != 0); @@ -539,14 +463,8 @@ public class InetAddressTest extends junit.framework.TestCase { } /** - * @tests java.net.InetAddress#isReachableI + * java.net.InetAddress#isReachableI */ - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "IOException checking missed (if network error occurs).", - method = "isReachable", - args = {int.class} - ) public void test_isReachableI() throws Exception { assertTrue(ipv4LoopbackIp.isReachable(10000)); try { @@ -558,14 +476,8 @@ public class InetAddressTest extends junit.framework.TestCase { } /** - * @tests java.net.InetAddress#isReachableLjava_net_NetworkInterfaceII + * java.net.InetAddress#isReachableLjava_net_NetworkInterfaceII */ - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "IOException checking missed (if network error occurs).", - method = "isReachable", - args = {java.net.NetworkInterface.class, int.class, int.class} - ) @BrokenTest("Depends on external network address and shows different" + "behavior with WLAN and 3G networks") public void test_isReachableLjava_net_NetworkInterfaceII() throws Exception { @@ -622,12 +534,6 @@ public class InetAddressTest extends junit.framework.TestCase { }; // Regression Test for Harmony-2290 - @TestTargetNew( - level = TestLevel.ADDITIONAL, - notes = "Regeression test. Functional test.", - method = "isReachable", - args = {java.net.NetworkInterface.class, int.class, int.class} - ) public void test_isReachableLjava_net_NetworkInterfaceII_loopbackInterface() throws IOException { final int TTL = 20; final int TIME_OUT = 3000; @@ -663,40 +569,22 @@ public class InetAddressTest extends junit.framework.TestCase { } /** - * @tests serialization/deserialization compatibility. + * serialization/deserialization compatibility. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Checks serialization.", - method = "!SerializationSelf", - args = {} - ) public void testSerializationSelf() throws Exception { SerializationTest.verifySelf(ipv4Localhost, COMPARATOR); } /** - * @tests serialization/deserialization compatibility with RI. + * serialization/deserialization compatibility with RI. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Checks serialization.", - method = "!SerializationGolden", - args = {} - ) public void testSerializationCompatibility() throws Exception { SerializationTest.verifyGolden(this, ipv4Localhost, COMPARATOR); } /** - * @tests java.net.InetAddress#getByAddress(byte[]) + * java.net.InetAddress#getByAddress(byte[]) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getByAddress", - args = {byte[].class} - ) public void test_getByAddress() { byte ipAddress[] = { 127, 0, 0, 1 }; try { @@ -732,12 +620,6 @@ public class InetAddressTest extends junit.framework.TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isAnyLocalAddress", - args = {} - ) public void test_isAnyLocalAddress() throws Exception { byte [] ipAddress1 = { 127, 42, 42, 42 }; InetAddress ia1 = InetAddress.getByAddress(ipAddress1); @@ -748,12 +630,6 @@ public class InetAddressTest extends junit.framework.TestCase { assertTrue(ia2.isAnyLocalAddress()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isLinkLocalAddress", - args = {} - ) public void test_isLinkLocalAddress() throws Exception { String addrName = "FE80::0"; InetAddress addr = InetAddress.getByName(addrName); @@ -780,12 +656,6 @@ public class InetAddressTest extends junit.framework.TestCase { .isLinkLocalAddress()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isLoopbackAddress", - args = {} - ) public void test_isLoopbackAddress() throws Exception { String addrName = "127.0.0.0"; assertTrue("Loopback address " + addrName + " not detected.", @@ -815,12 +685,6 @@ public class InetAddressTest extends junit.framework.TestCase { .isLoopbackAddress()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isMCGlobal", - args = {} - ) public void test_isMCGlobal() throws Exception { String addrName = "224.0.0.255"; InetAddress addr = InetAddress.getByName(addrName); @@ -846,12 +710,6 @@ public class InetAddressTest extends junit.framework.TestCase { .isMCGlobal()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isMCLinkLocal", - args = {} - ) public void test_isMCLinkLocal() throws Exception { String addrName = "224.0.0.255"; InetAddress addr = InetAddress.getByName(addrName); @@ -883,12 +741,6 @@ public class InetAddressTest extends junit.framework.TestCase { !addr.isMCLinkLocal()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isMCNodeLocal", - args = {} - ) public void test_isMCNodeLocal() throws Exception { String addrName = "224.42.42.42"; InetAddress addr = InetAddress.getByName(addrName); @@ -911,12 +763,6 @@ public class InetAddressTest extends junit.framework.TestCase { .isMCNodeLocal()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isMCOrgLocal", - args = {} - ) public void test_isMCOrgLocal() throws Exception { String addrName = "239.252.0.0"; // a multicast addr 1110 InetAddress addr = InetAddress.getByName(addrName); @@ -946,12 +792,6 @@ public class InetAddressTest extends junit.framework.TestCase { !addr.isMCOrgLocal()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isMCSiteLocal", - args = {} - ) public void test_isMCSiteLocal() throws Exception { String addrName = "FFF5:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"; InetAddress addr = InetAddress.getByName(addrName); @@ -984,12 +824,6 @@ public class InetAddressTest extends junit.framework.TestCase { addr.isMCSiteLocal()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isSiteLocalAddress", - args = {} - ) public void test_isSiteLocalAddress() throws Exception { String addrName = "42.42.42.42"; InetAddress addr = InetAddress.getByName(addrName); diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/net/InetSocketAddressTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/net/InetSocketAddressTest.java index 724b8c0..016c229 100644 --- a/luni/src/test/java/org/apache/harmony/luni/tests/java/net/InetSocketAddressTest.java +++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/net/InetSocketAddressTest.java @@ -15,12 +15,6 @@ */ package org.apache.harmony.luni.tests.java.net; -import dalvik.annotation.KnownFailure; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.io.Serializable; import java.net.InetAddress; import java.net.InetSocketAddress; @@ -33,27 +27,11 @@ import junit.framework.TestCase; import org.apache.harmony.testframework.serialization.SerializationTest; import org.apache.harmony.testframework.serialization.SerializationTest.SerializableAssert; -@TestTargetClass(InetSocketAddress.class) public class InetSocketAddressTest extends TestCase { /** - * @tests java.net.InetSocketAddress#InetSocketAddress(String, int) + * java.net.InetSocketAddress#InetSocketAddress(String, int) */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "InetSocketAddress", - args = {java.lang.String.class, int.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - clazz = SocketAddress.class, - method = "SocketAddress", - args = {} - ) - }) public void test_ConstructorLjava_lang_StringI() throws Exception { // regression test for Harmony-1042 InetSocketAddress address = new InetSocketAddress("127.0.0.1", 0); @@ -74,33 +52,6 @@ public class InetSocketAddressTest extends TestCase { } } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "InetSocketAddress", - args = {java.net.InetAddress.class, int.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getHostName", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPort", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - clazz = SocketAddress.class, - method = "SocketAddress", - args = {} - ) - }) public void test_ConstructorLInetAddressI() { String validIPAddresses[] = { "::1.2.3.4", "::", "::", "1::0", "1::", "::1", "0", @@ -155,21 +106,6 @@ public class InetSocketAddressTest extends TestCase { fail("UnknownHostException was thrown."); } } - @TestTargets ({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "InetSocketAddress", - args = {int.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - clazz = SocketAddress.class, - method = "SocketAddress", - args = {} - ) - }) public void test_ConstructorI() { InetSocketAddress isa = new InetSocketAddress(65535); @@ -192,14 +128,8 @@ public class InetSocketAddressTest extends TestCase { } /** - * @tests java.net.InetSocketAddress#createUnresolved(String, int) + * java.net.InetSocketAddress#createUnresolved(String, int) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is the complete subset of tests for createUnresolved method.", - method = "createUnresolved", - args = {java.lang.String.class, int.class} - ) public void test_createUnresolvedLjava_lang_StringI() { HostPortPair[] legalHostPortPairs = { new HostPortPair("127.0.0.1", 1234), new HostPortPair("192.168.0.1", 10000), new HostPortPair("127.0.0", 0), @@ -216,14 +146,8 @@ public class InetSocketAddressTest extends TestCase { } /** - * @tests java.net.InetSocketAddress#createUnresolved(String, int) + * java.net.InetSocketAddress#createUnresolved(String, int) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "This is the complete subset of tests for createUnresolved method.", - method = "createUnresolved", - args = {java.lang.String.class, int.class} - ) public void test_createUnresolvedLjava_lang_StringI_IllegalArgumentException() { HostPortPair[] illegalHostPortPairs = { new HostPortPair(null, 1), new HostPortPair("host", -1), new HostPortPair("host", 65536) }; @@ -270,14 +194,8 @@ public class InetSocketAddressTest extends TestCase { }; /** - * @tests serialization/deserialization compatibility. + * serialization/deserialization compatibility. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Checks serialization", - method = "!SerializationSelf", - args = {} - ) public void testSerializationSelf() throws Exception { Object[] testCases = { @@ -288,14 +206,8 @@ public class InetSocketAddressTest extends TestCase { } /** - * @tests serialization/deserialization compatibility with RI. + * serialization/deserialization compatibility with RI. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Checks serialization", - method = "!SerializationGolden", - args = {} - ) public void testSerializationCompatibility() throws Exception { InetAddress localhost = InetAddress.getByAddress("Localhost", new byte[]{127, 0, 0, 1}); Object[] testCases = { @@ -305,12 +217,6 @@ public class InetSocketAddressTest extends TestCase { SerializationTest.verifyGolden(this, testCases, COMPARATOR); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "equals", - args = {java.lang.Object.class} - ) public void test_equals() throws Exception { InetSocketAddress isa1 = new InetSocketAddress(1); InetSocketAddress isa2 = new InetSocketAddress(2); @@ -324,12 +230,6 @@ public class InetSocketAddressTest extends TestCase { assertTrue(isa1.equals(isa2)); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getAddress", - args = {} - ) public void test_getAddress() { String validIPAddresses[] = { "::1.2.3.4", "::", "::", "1::0", "1::", @@ -353,12 +253,6 @@ public class InetSocketAddressTest extends TestCase { assertNotNull(isa.getAddress()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hashCode", - args = {} - ) public void test_hashCode() throws Exception { InetAddress localhost = InetAddress.getByName("localhost"); InetSocketAddress isa1 = new InetSocketAddress(localhost.getHostName(), 8080); @@ -369,12 +263,6 @@ public class InetSocketAddressTest extends TestCase { assertFalse(isa1.hashCode() == isa3.hashCode()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isUnresolved", - args = {} - ) public void test_isUnresolved() { InetSocketAddress isa1 = new InetSocketAddress("localhost", 80); assertFalse(isa1.isUnresolved()); @@ -383,12 +271,6 @@ public class InetSocketAddressTest extends TestCase { assertTrue(sockAddr.isUnresolved()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {} - ) public void test_toString() { InetSocketAddress isa = new InetSocketAddress("localhost", 80); assertNotNull(isa.toString()); diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/net/URITest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/net/URITest.java index 054ab40..35eed90 100644 --- a/luni/src/test/java/org/apache/harmony/luni/tests/java/net/URITest.java +++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/net/URITest.java @@ -84,7 +84,7 @@ public class URITest extends TestCase { } /** - * @tests java.net.URI#URI(java.lang.String) + * java.net.URI#URI(java.lang.String) */ public void test_ConstructorLjava_lang_String() throws URISyntaxException { // tests for public URI(String uri) throws URISyntaxException @@ -252,7 +252,7 @@ public class URITest extends TestCase { } /** - * @tests java.net.URI#URI(java.lang.String) + * java.net.URI#URI(java.lang.String) */ public void test_URI_String() { try { @@ -281,7 +281,7 @@ public class URITest extends TestCase { } /** - * @tests java.net.URI#URI(java.lang.String, java.lang.String, + * java.net.URI#URI(java.lang.String, java.lang.String, * java.lang.String) */ public void test_ConstructorLjava_lang_StringLjava_lang_StringLjava_lang_String() @@ -323,7 +323,7 @@ public class URITest extends TestCase { } /** - * @tests java.net.URI#URI(java.lang.String, java.lang.String, + * java.net.URI#URI(java.lang.String, java.lang.String, * java.lang.String, int, java.lang.String, java.lang.String, * java.lang.String) */ @@ -414,7 +414,7 @@ public class URITest extends TestCase { /** * @throws URISyntaxException - * @tests java.net.URI#URI(java.lang.String, java.lang.String, + * java.net.URI#URI(java.lang.String, java.lang.String, * java.lang.String, java.lang.String) */ public void test_ConstructorLjava_lang_StringLjava_lang_StringLjava_lang_StringLjava_lang_String() @@ -460,7 +460,7 @@ public class URITest extends TestCase { /** * @throws URISyntaxException - * @tests java.net.URI#URI(java.lang.String, java.lang.String, + * java.net.URI#URI(java.lang.String, java.lang.String, * java.lang.String, java.lang.String, java.lang.String) */ public void test_ConstructorLjava_lang_StringLjava_lang_StringLjava_lang_StringLjava_lang_StringLjava_lang_String() @@ -507,7 +507,7 @@ public class URITest extends TestCase { /** * @throws URISyntaxException - * @tests java.net.URI#URI(java.lang.String, java.lang.String, + * java.net.URI#URI(java.lang.String, java.lang.String, * java.lang.String, java.lang.String, java.lang.String) */ public void test_fiveArgConstructor() throws URISyntaxException { @@ -535,7 +535,7 @@ public class URITest extends TestCase { } /** - * @tests java.net.URI#compareTo(java.lang.Object) + * java.net.URI#compareTo(java.lang.Object) */ public void test_compareToLjava_lang_Object() throws Exception { // compareTo tests @@ -611,7 +611,7 @@ public class URITest extends TestCase { /** * @throws URISyntaxException - * @tests java.net.URI#compareTo(java.lang.Object) + * java.net.URI#compareTo(java.lang.Object) */ public void test_compareTo2() throws URISyntaxException { URI uri, uri2; @@ -636,7 +636,7 @@ public class URITest extends TestCase { } /** - * @tests java.net.URI#create(java.lang.String) + * java.net.URI#create(java.lang.String) */ public void test_createLjava_lang_String() { try { @@ -648,7 +648,7 @@ public class URITest extends TestCase { } /** - * @tests java.net.URI#equals(java.lang.Object) + * java.net.URI#equals(java.lang.Object) */ public void test_equalsLjava_lang_Object() throws Exception { String[][] equalsData = new String[][] { @@ -722,7 +722,7 @@ public class URITest extends TestCase { /** * @throws URISyntaxException - * @tests java.net.URI#equals(java.lang.Object) + * java.net.URI#equals(java.lang.Object) */ public void test_equals2() throws URISyntaxException { // test URIs with empty string authority @@ -745,7 +745,7 @@ public class URITest extends TestCase { } /** - * @tests java.net.URI#getAuthority() + * java.net.URI#getAuthority() */ public void test_getAuthority() throws Exception { URI[] uris = getUris(); @@ -778,7 +778,7 @@ public class URITest extends TestCase { } /** - * @tests java.net.URI#getAuthority() + * java.net.URI#getAuthority() */ public void test_getAuthority2() throws Exception { // tests for URIs with empty string authority component @@ -823,7 +823,7 @@ public class URITest extends TestCase { } /** - * @tests java.net.URI#getFragment() + * java.net.URI#getFragment() */ public void test_getFragment() throws Exception { URI[] uris = getUris(); @@ -847,7 +847,7 @@ public class URITest extends TestCase { } /** - * @tests java.net.URI#getHost() + * java.net.URI#getHost() */ public void test_getHost() throws Exception { URI[] uris = getUris(); @@ -868,7 +868,7 @@ public class URITest extends TestCase { } /** - * @tests java.net.URI#getPath() + * java.net.URI#getPath() */ public void test_getPath() throws Exception { URI[] uris = getUris(); @@ -893,7 +893,7 @@ public class URITest extends TestCase { } /** - * @tests java.net.URI#getPort() + * java.net.URI#getPort() */ public void test_getPort() throws Exception { URI[] uris = getUris(); @@ -910,7 +910,7 @@ public class URITest extends TestCase { } /** - * @tests java.net.URI#getPort() + * java.net.URI#getPort() */ public void test_getPort2() throws Exception { // if port value is negative, the authority should be @@ -938,7 +938,7 @@ public class URITest extends TestCase { } /** - * @tests java.net.URI#getQuery() + * java.net.URI#getQuery() */ public void test_getQuery() throws Exception { URI[] uris = getUris(); @@ -962,7 +962,7 @@ public class URITest extends TestCase { } /** - * @tests java.net.URI#getRawAuthority() + * java.net.URI#getRawAuthority() */ public void test_getRawAuthority() throws Exception { URI[] uris = getUris(); @@ -991,7 +991,7 @@ public class URITest extends TestCase { } /** - * @tests java.net.URI#getRawFragment() + * java.net.URI#getRawFragment() */ public void test_getRawFragment() throws Exception { URI[] uris = getUris(); @@ -1017,7 +1017,7 @@ public class URITest extends TestCase { } /** - * @tests java.net.URI#getRawPath() + * java.net.URI#getRawPath() */ public void test_getRawPath() throws Exception { URI[] uris = getUris(); @@ -1043,7 +1043,7 @@ public class URITest extends TestCase { } /** - * @tests java.net.URI#getRawQuery() + * java.net.URI#getRawQuery() */ public void test_getRawQuery() throws Exception { URI[] uris = getUris(); @@ -1071,7 +1071,7 @@ public class URITest extends TestCase { } /** - * @tests java.net.URI#getRawSchemeSpecificPart() + * java.net.URI#getRawSchemeSpecificPart() */ public void test_getRawSchemeSpecificPart() throws Exception { URI[] uris = getUris(); @@ -1102,7 +1102,7 @@ public class URITest extends TestCase { } /** - * @tests java.net.URI#getRawUserInfo() + * java.net.URI#getRawUserInfo() */ public void test_getRawUserInfo() throws URISyntaxException { URI[] uris = getUris(); @@ -1129,7 +1129,7 @@ public class URITest extends TestCase { } /** - * @tests java.net.URI#getScheme() + * java.net.URI#getScheme() */ public void test_getScheme() throws Exception { URI[] uris = getUris(); @@ -1150,7 +1150,7 @@ public class URITest extends TestCase { } /** - * @tests java.net.URI#getSchemeSpecificPart() + * java.net.URI#getSchemeSpecificPart() */ public void test_getSchemeSpecificPart() throws Exception { URI[] uris = getUris(); @@ -1183,7 +1183,7 @@ public class URITest extends TestCase { } /** - * @tests java.net.URI#getUserInfo() + * java.net.URI#getUserInfo() */ public void test_getUserInfo() throws Exception { URI[] uris = getUris(); @@ -1211,7 +1211,7 @@ public class URITest extends TestCase { } /** - * @tests java.net.URI#hashCode() + * java.net.URI#hashCode() */ public void test_hashCode() throws Exception { String[][] hashCodeData = new String[][] { @@ -1281,7 +1281,7 @@ public class URITest extends TestCase { } /** - * @tests java.net.URI#isAbsolute() + * java.net.URI#isAbsolute() */ public void test_isAbsolute() throws URISyntaxException { String[] isAbsoluteData = new String[] { "mailto:user@ca.ibm.com", @@ -1302,7 +1302,7 @@ public class URITest extends TestCase { } /** - * @tests java.net.URI#isOpaque() + * java.net.URI#isOpaque() */ public void test_isOpaque() throws URISyntaxException { String[] isOpaqueData = new String[] { "mailto:user@ca.ibm.com", @@ -1323,7 +1323,7 @@ public class URITest extends TestCase { } /** - * @tests java.net.URI#normalize() + * java.net.URI#normalize() */ public void test_normalize() throws Exception { @@ -1384,7 +1384,7 @@ public class URITest extends TestCase { } /** - * @tests java.net.URI#normalize() + * java.net.URI#normalize() */ public void test_normalize2() throws URISyntaxException { URI uri1 = null, uri2 = null; @@ -1400,7 +1400,7 @@ public class URITest extends TestCase { } /** - * @tests java.net.URI#normalize() + * java.net.URI#normalize() */ public void test_normalize3() throws URISyntaxException { // return same URI if it has a normalized path already @@ -1416,7 +1416,7 @@ public class URITest extends TestCase { } /** - * @tests java.net.URI#parseServerAuthority() + * java.net.URI#parseServerAuthority() */ public void test_parseServerAuthority() throws URISyntaxException { // registry based uris @@ -1538,7 +1538,7 @@ public class URITest extends TestCase { } /** - * @tests java.net.URI#relativize(java.net.URI) + * java.net.URI#relativize(java.net.URI) */ public void test_relativizeLjava_net_URI() throws URISyntaxException { // relativization tests @@ -1624,7 +1624,7 @@ public class URITest extends TestCase { } /** - * @tests java.net.URI#relativize(java.net.URI) + * java.net.URI#relativize(java.net.URI) */ public void test_relativize2() throws URISyntaxException { URI a = new URI("http://host/dir"); @@ -1663,7 +1663,7 @@ public class URITest extends TestCase { } /** - * @tests java.net.URI#resolve(java.net.URI) + * java.net.URI#resolve(java.net.URI) */ public void test_resolve() throws URISyntaxException { URI uri1 = null, uri2 = null; @@ -1679,7 +1679,7 @@ public class URITest extends TestCase { } /** - * @tests java.net.URI#resolve(java.net.URI) + * java.net.URI#resolve(java.net.URI) */ public void test_resolveLjava_net_URI() { // resolution tests @@ -1735,7 +1735,7 @@ public class URITest extends TestCase { } /** - * @tests java.net.URI#toASCIIString() + * java.net.URI#toASCIIString() */ public void test_toASCIIString() throws Exception { URI[] uris = getUris(); @@ -1786,7 +1786,7 @@ public class URITest extends TestCase { } /** - * @tests java.net.URI#toString() + * java.net.URI#toString() */ public void test_toString() throws Exception { URI[] uris = getUris(); @@ -1818,7 +1818,7 @@ public class URITest extends TestCase { } /** - * @tests java.net.URI#toURL() + * java.net.URI#toURL() */ public void test_toURL() throws Exception { String absoluteuris[] = new String[] { "mailto:noreply@apache.org", @@ -1849,7 +1849,7 @@ public class URITest extends TestCase { } /** - * @tests serialization/deserialization. + * serialization/deserialization. */ public void testSerializationSelf() throws Exception { URI uri = new URI("http://harmony.apache.org/"); diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/net/URLConnectionTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/net/URLConnectionTest.java index 8a36419..dd6a0f0 100644 --- a/luni/src/test/java/org/apache/harmony/luni/tests/java/net/URLConnectionTest.java +++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/net/URLConnectionTest.java @@ -17,10 +17,6 @@ package org.apache.harmony.luni.tests.java.net; import dalvik.annotation.BrokenTest; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; import junit.framework.TestCase; import tests.support.Support_Configuration; import tests.support.Support_PortManager; @@ -65,23 +61,6 @@ import java.util.List; import java.util.Map; import java.util.TimeZone; -@TestTargetClass( - value = URLConnection.class, - untestedMethods = { - @TestTargetNew( - level = TestLevel.NOT_NECESSARY, - notes = "Default implementation returns always null according to spec.", - method = "getHeaderField", - args = {int.class} - ), - @TestTargetNew( - level = TestLevel.NOT_NECESSARY, - notes = "Default implementation returns always null according to spec.", - method = "getHeaderFieldKey", - args = {int.class} - ) - } -) public class URLConnectionTest extends TestCase { private static final String testString = "Hello World"; @@ -111,14 +90,8 @@ public class URLConnectionTest extends TestCase { public boolean isAbortCalled; /** - * @tests {@link java.net.URLConnection#addRequestProperty(String, String)} + * {@link java.net.URLConnection#addRequestProperty(String, String)} */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Exceptions checked only. Cannot test positive test since getter method is not supported.", - method = "addRequestProperty", - args = {java.lang.String.class, java.lang.String.class} - ) public void test_addRequestProperty() throws MalformedURLException, IOException { @@ -147,14 +120,8 @@ public class URLConnectionTest extends TestCase { } /** - * @tests {@link java.net.URLConnection#setRequestProperty(String, String)} + * {@link java.net.URLConnection#setRequestProperty(String, String)} */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Exceptions checked only -> only partially implemented.", - method = "setRequestProperty", - args = {java.lang.String.class, java.lang.String.class} - ) public void test_setRequestProperty() throws MalformedURLException, IOException { @@ -186,14 +153,8 @@ public class URLConnectionTest extends TestCase { } /** - * @tests {@link java.net.URLConnection#setUseCaches(boolean)} + * {@link java.net.URLConnection#setUseCaches(boolean)} */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Complete together with getUseCaches test.", - method = "setUseCaches", - args = {boolean.class} - ) public void test_setUseCachesZ() throws MalformedURLException, IOException { // Regression for HARMONY-71 @@ -209,14 +170,8 @@ public class URLConnectionTest extends TestCase { } /** - * @tests {@link java.net.URLConnection#setAllowUserInteraction(boolean)} + * {@link java.net.URLConnection#setAllowUserInteraction(boolean)} */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Exceptions checked only.", - method = "setAllowUserInteraction", - args = {boolean.class} - ) public void test_setAllowUserInteractionZ() throws MalformedURLException, IOException { @@ -414,14 +369,8 @@ public class URLConnectionTest extends TestCase { /** * @throws URISyntaxException * @throws ClassNotFoundException - * @tests {@link java.net.URLConnection#addRequestProperty(java.lang.String,java.lang.String)} + * {@link java.net.URLConnection#addRequestProperty(java.lang.String,java.lang.String)} */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "From harmony branch.", - method = "addRequestProperty", - args = {java.lang.String.class, java.lang.String.class} - ) public void test_addRequestPropertyLjava_lang_StringLjava_lang_String() throws IOException, ClassNotFoundException, URISyntaxException { uc.setRequestProperty("prop", "yo"); @@ -483,22 +432,8 @@ public class URLConnectionTest extends TestCase { /** * @throws IOException - * @tests {@link java.net.URLConnection#getAllowUserInteraction()} + * {@link java.net.URLConnection#getAllowUserInteraction()} */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "From harmony branch.", - method = "getAllowUserInteraction", - args = {} - ), - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "From harmony branch.", - method = "setAllowUserInteraction", - args = {boolean.class} - ) - }) public void test_getAllowUserInteraction() throws IOException { uc.setAllowUserInteraction(false); assertFalse("getAllowUserInteraction should have returned false", uc @@ -559,14 +494,8 @@ public class URLConnectionTest extends TestCase { /** * @throws IOException - * @tests {@link java.net.URLConnection#connect()} + * {@link java.net.URLConnection#connect()} */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "connect", - args = {} - ) public void test_connect() throws IOException { uc.connect(); @@ -581,14 +510,8 @@ public class URLConnectionTest extends TestCase { } /** - * @tests {@link java.net.URLConnection#getContent()} + * {@link java.net.URLConnection#getContent()} */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "From harmony branch.", - method = "getContent", - args = {} - ) public void test_getContent() throws IOException { byte[] ba = new byte[testString.getBytes().length]; String buf = null; @@ -627,14 +550,8 @@ public class URLConnectionTest extends TestCase { } /** - * @tests {@link java.net.URLConnection#getContent(Class[])} + * {@link java.net.URLConnection#getContent(Class[])} */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "From harmony branch.", - method = "getContent", - args = {java.lang.Class[].class} - ) public void test_getContent_LjavalangClass() throws IOException { byte[] ba = new byte[600]; @@ -683,14 +600,8 @@ public class URLConnectionTest extends TestCase { /** * @throws IOException - * @tests {@link java.net.URLConnection#getContentEncoding()} + * {@link java.net.URLConnection#getContentEncoding()} */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getContentEncoding", - args = {} - ) @BrokenTest("Fails in CTS, passes in CoreTestRunner") public void test_getContentEncoding() throws IOException { // faulty setup @@ -721,14 +632,8 @@ public class URLConnectionTest extends TestCase { } /** - * @tests {@link java.net.URLConnection#getContentLength()} + * {@link java.net.URLConnection#getContentLength()} */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getContentLength", - args = {} - ) public void test_getContentLength() { assertEquals(testString.getBytes().length, fileURLCon.getContentLength()); @@ -740,14 +645,8 @@ public class URLConnectionTest extends TestCase { } /** - * @tests {@link java.net.URLConnection#getContentType()} + * {@link java.net.URLConnection#getContentType()} */ - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "only default encoding may be tested", - method = "getContentType", - args = {} - ) public void test_getContentType() throws IOException, MalformedURLException { assertTrue("getContentType failed: " + fileURLCon.getContentType(), @@ -775,16 +674,8 @@ public class URLConnectionTest extends TestCase { } /** - * @tests {@link java.net.URLConnection#getDate()} + * {@link java.net.URLConnection#getDate()} */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "From harmony branch. URLConnection.getDate crashes in cases " + - "where the returned expiration date doesn't seems to be " + - "parsable. The RI just returns 0.", - method = "getDate", - args = {} - ) public void test_getDate() { // should be greater than 930000000000L which represents the past assertTrue("getDate gave wrong date: " + uc.getDate(), @@ -793,22 +684,8 @@ public class URLConnectionTest extends TestCase { /** * @throws IOException - * @tests {@link java.net.URLConnection#getDefaultAllowUserInteraction()} + * {@link java.net.URLConnection#getDefaultAllowUserInteraction()} */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "From harmony branch.", - method = "getDefaultAllowUserInteraction", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "From harmony branch.", - method = "setDefaultAllowUserInteraction", - args = {boolean.class} - ) - }) public void test_getDefaultAllowUserInteraction() throws IOException { boolean oldSetting = URLConnection.getDefaultAllowUserInteraction(); @@ -825,22 +702,8 @@ public class URLConnectionTest extends TestCase { } /** - * @tests {@link java.net.URLConnection#getDefaultRequestProperty(String)} + * {@link java.net.URLConnection#getDefaultRequestProperty(String)} */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "From harmony branch.", - method = "getDefaultRequestProperty", - args = {java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "From harmony branch.", - method = "setDefaultRequestProperty", - args = {java.lang.String.class, java.lang.String.class} - ) - }) @SuppressWarnings("deprecation") public void test_getDefaultRequestPropertyLjava_lang_String() { URLConnection.setDefaultRequestProperty("Shmoo", "Blah"); @@ -859,22 +722,8 @@ public class URLConnectionTest extends TestCase { /** * @throws IOException - * @tests {@link java.net.URLConnection#getDefaultUseCaches()} + * {@link java.net.URLConnection#getDefaultUseCaches()} */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "From harmony branch.", - method = "getDefaultUseCaches", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "From harmony branch.", - method = "setDefaultUseCaches", - args = {boolean.class} - ) - }) public void test_getDefaultUseCaches_CachedRC() throws IOException { boolean oldSetting = uc.getDefaultUseCaches(); @@ -932,22 +781,8 @@ public class URLConnectionTest extends TestCase { /** * @throws IOException - * @tests {@link java.net.URLConnection#getDoInput()} + * {@link java.net.URLConnection#getDoInput()} */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "From harmony branch.", - method = "getDoInput", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "From harmony branch.", - method = "setDoInput", - args = {boolean.class} - ) - }) public void test_getDoInput() throws IOException { assertTrue("Should be set to true by default", uc.getDoInput()); @@ -971,22 +806,8 @@ public class URLConnectionTest extends TestCase { /** * @throws IOException - * @tests {@link java.net.URLConnection#getDoOutput()} + * {@link java.net.URLConnection#getDoOutput()} */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "From harmony branch.", - method = "getDoOutput", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "From harmony branch.", - method = "setDoOutput", - args = {boolean.class} - ) - }) public void test_getDoOutput() throws IOException { assertFalse("Should be set to false by default", uc.getDoOutput()); @@ -1009,16 +830,8 @@ public class URLConnectionTest extends TestCase { /** * @throws IOException - * @tests {@link java.net.URLConnection#getExpiration()} + * {@link java.net.URLConnection#getExpiration()} */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "From harmony branch. URLConnection.getExpiration crashes in " + - "cases where the returned expiration date doesn't seems to " + - "be parsable. The RI just returns 0.", - method = "getExpiration", - args = {} - ) public void test_getExpiration() throws IOException { uc.connect(); @@ -1032,14 +845,8 @@ public class URLConnectionTest extends TestCase { } /** - * @tests {@link java.net.URLConnection#getFileNameMap()} + * {@link java.net.URLConnection#getFileNameMap()} */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "From harmony branch.", - method = "getFileNameMap", - args = {} - ) public void test_getFileNameMap() { // Tests for the standard MIME types -- users may override these // in their JRE @@ -1079,14 +886,8 @@ public class URLConnectionTest extends TestCase { } /** - * @tests {@link java.net.URLConnection#getHeaderFieldDate(java.lang.String, long)} + * {@link java.net.URLConnection#getHeaderFieldDate(java.lang.String, long)} */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getHeaderFieldDate", - args = {java.lang.String.class, long.class} - ) public void test_getHeaderFieldDateLjava_lang_StringJ() { Support_TestWebData params = Support_TestWebData.testParams[0]; @@ -1115,14 +916,8 @@ public class URLConnectionTest extends TestCase { } /** - * @tests {@link java.net.URLConnection#getHeaderField(int)} + * {@link java.net.URLConnection#getHeaderField(int)} */ - @TestTargetNew( - level = TestLevel.NOT_NECESSARY, - notes = "not supported. Always returns null.From harmony branch.", - method = "getHeaderField", - args = {int.class} - ) public void DISABLED_test_getHeaderFieldI() { int i = 0; String hf; @@ -1149,14 +944,8 @@ public class URLConnectionTest extends TestCase { } /** - * @tests {@link java.net.URLConnection#getHeaderFieldKey(int)} + * {@link java.net.URLConnection#getHeaderFieldKey(int)} */ - @TestTargetNew( - level = TestLevel.NOT_NECESSARY, - notes = "Not supported. Current implementation returns always null according to spec.", - method = "getHeaderFieldKey", - args = {int.class} - ) public void DISABLED_test_getHeaderFieldKeyI() { String hf; boolean foundResponse = false; @@ -1174,14 +963,8 @@ public class URLConnectionTest extends TestCase { /** * @throws IOException - * @tests {@link java.net.URLConnection#getHeaderFieldInt(String, int)} + * {@link java.net.URLConnection#getHeaderFieldInt(String, int)} */ - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "", - method = "getHeaderFieldInt", - args = {java.lang.String.class, int.class} - ) public void test_getHeaderFieldInt() throws IOException, ParseException { Support_TestWebData params = Support_TestWebData.testParams[1]; @@ -1208,14 +991,8 @@ public class URLConnectionTest extends TestCase { } /** - * @tests {@link java.net.URLConnection#getHeaderField(java.lang.String)} + * {@link java.net.URLConnection#getHeaderField(java.lang.String)} */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getHeaderField", - args = {java.lang.String.class} - ) public void test_getHeaderFieldLjava_lang_String() { Support_TestWebData params = Support_TestWebData.testParams[0]; @@ -1246,14 +1023,8 @@ public class URLConnectionTest extends TestCase { /** * @throws URISyntaxException * @throws ClassNotFoundException - * @tests {@link java.net.URLConnection#getHeaderFields()} + * {@link java.net.URLConnection#getHeaderFields()} */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getHeaderFields", - args = {} - ) public void test_getHeaderFields() throws IOException, ClassNotFoundException, URISyntaxException { Support_TestWebData params = Support_TestWebData.testParams[1]; @@ -1297,14 +1068,8 @@ public class URLConnectionTest extends TestCase { /** * @throws IOException - * @tests {@link java.net.URLConnection#getLastModified()} + * {@link java.net.URLConnection#getLastModified()} */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "From harmony branch.", - method = "getLastModified", - args = {} - ) public void test_getLastModified() throws IOException { URL url4 = new URL(Support_Configuration.hTTPURLwLastModified); @@ -1329,12 +1094,6 @@ public class URLConnectionTest extends TestCase { ((HttpURLConnection) uc).disconnect(); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getOutputStream", - args = {} - ) public void test_getOutputStream() throws IOException { String posted = "this is a test"; URLConnection uc3 = new URL(Support_Configuration.hTTPURLgoogle) @@ -1376,14 +1135,8 @@ public class URLConnectionTest extends TestCase { } /** - * @tests {@link java.net.URLConnection#getPermission()} + * {@link java.net.URLConnection#getPermission()} */ - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "From harmony branch.", - method = "getPermission", - args = {} - ) public void test_getPermission() throws Exception { java.security.Permission p = uc.getPermission(); assertTrue("Permission of wrong type: " + p.toString(), @@ -1434,14 +1187,8 @@ public class URLConnectionTest extends TestCase { } /** - * @tests {@link java.net.URLConnection#getRequestProperties()} + * {@link java.net.URLConnection#getRequestProperties()} */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "implementation test.From harmony branch.", - method = "getRequestProperties", - args = {} - ) public void test_getRequestProperties() { uc.setRequestProperty("whatever", "you like"); Map headers = uc.getRequestProperties(); @@ -1470,14 +1217,8 @@ public class URLConnectionTest extends TestCase { } /** - * @tests {@link java.net.URLConnection#getRequestProperties()} + * {@link java.net.URLConnection#getRequestProperties()} */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Exceptions checked only.From harmony branch.", - method = "getRequestProperties", - args = {} - ) public void test_getRequestProperties_Exception() throws IOException { URL url = new URL("http", "test", 80, "index.html", new NewHandler()); URLConnection urlCon = url.openConnection(); @@ -1493,14 +1234,8 @@ public class URLConnectionTest extends TestCase { } /** - * @tests {@link java.net.URLConnection#getRequestProperty(java.lang.String)} + * {@link java.net.URLConnection#getRequestProperty(java.lang.String)} */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Exceptions checked only.From harmony branch.", - method = "getRequestProperty", - args = { String.class } - ) public void test_getRequestProperty_LString_Exception() throws IOException { URL url = new URL("http", "test", 80, "index.html", new NewHandler()); URLConnection urlCon = url.openConnection(); @@ -1517,14 +1252,8 @@ public class URLConnectionTest extends TestCase { } /** - * @tests {@link java.net.URLConnection#getRequestProperty(java.lang.String)} + * {@link java.net.URLConnection#getRequestProperty(java.lang.String)} */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "From harmony branch.", - method = "getRequestProperty", - args = {java.lang.String.class} - ) public void test_getRequestPropertyLjava_lang_String() { uc.setRequestProperty("Yo", "yo"); assertTrue("Wrong property returned: " + uc.getRequestProperty("Yo"), @@ -1534,36 +1263,16 @@ public class URLConnectionTest extends TestCase { } /** - * @tests {@link java.net.URLConnection#getURL()} + * {@link java.net.URLConnection#getURL()} */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Exceptions checked only -> only partially implemented. From harmony branch.", - method = "getURL", - args = {} - ) public void test_getURL() { assertTrue("Incorrect URL returned", uc.getURL().equals(url)); } /** * @throws IOException - * @tests {@link java.net.URLConnection#getUseCaches()} + * {@link java.net.URLConnection#getUseCaches()} */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Exceptions checked in setUseCaches. From harmony branch.", - method = "getUseCaches", - args = {} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Exceptions checked in setUseCaches. From harmony branch.", - method = "setUseCaches", - args = {boolean.class} - ) - }) public void test_getUseCaches() throws IOException { uc2.setUseCaches(false); assertTrue("getUseCaches should have returned false", !uc2 @@ -1586,14 +1295,8 @@ public class URLConnectionTest extends TestCase { } /** - * @tests {@link java.net.URLConnection#guessContentTypeFromName(String)} + * {@link java.net.URLConnection#guessContentTypeFromName(String)} */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "guessContentTypeFromName", - args = {java.lang.String.class} - ) public void test_guessContentTypeFromName() throws IOException { @@ -1620,14 +1323,8 @@ public class URLConnectionTest extends TestCase { } /** - * @tests {@link java.net.URLConnection#guessContentTypeFromStream(java.io.InputStream)} + * {@link java.net.URLConnection#guessContentTypeFromStream(java.io.InputStream)} */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "guessContentTypeFromStream", - args = {java.io.InputStream.class} - ) public void test_guessContentTypeFromStreamLjava_io_InputStream() throws IOException { assertContentTypeEquals("ASCII", "text/html", "<html>"); @@ -1678,22 +1375,8 @@ public class URLConnectionTest extends TestCase { } /** - * @tests {@link java.net.URLConnection#setConnectTimeout(int)} + * {@link java.net.URLConnection#setConnectTimeout(int)} */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setConnectTimeout", - args = {int.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getConnectTimeout", - args = {} - ) - }) public void test_setConnectTimeoutI() throws Exception { URLConnection uc = new URL("http://localhost").openConnection(); assertEquals(0, uc.getConnectTimeout()); @@ -1728,22 +1411,8 @@ public class URLConnectionTest extends TestCase { /** * @throws IOException - * @tests {@link java.net.URLConnection#setFileNameMap(java.net.FileNameMap)} + * {@link java.net.URLConnection#setFileNameMap(java.net.FileNameMap)} */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setFileNameMap", - args = {java.net.FileNameMap.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getFileNameMap", - args = {} - ) - }) public void test_setFileNameMapLjava_net_FileNameMap() throws IOException { FileNameMap mapOld = URLConnection.getFileNameMap(); // nothing happens if set null @@ -1784,22 +1453,8 @@ public class URLConnectionTest extends TestCase { } /** - * @tests {@link java.net.URLConnection#setIfModifiedSince(long)} + * {@link java.net.URLConnection#setIfModifiedSince(long)} */ - @TestTargets ( { - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setIfModifiedSince", - args = {long.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "From harmony branch.", - method = "getIfModifiedSince", - args = {} - ) - }) public void test_setIfModifiedSinceJ() throws IOException { URL url = new URL("http://localhost:8080/"); URLConnection connection = url.openConnection(); @@ -1832,12 +1487,6 @@ public class URLConnectionTest extends TestCase { } - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "test that page was not renewed in time indicated -> page returned event though it should not.", - method = "getIfModifiedSince", - args = {} - ) public void test_getIfModifiedSinceJ() throws IOException { uc2.setIfModifiedSince(Calendar.getInstance().getTimeInMillis()); @@ -1849,22 +1498,8 @@ public class URLConnectionTest extends TestCase { /** - * @tests {@link java.net.URLConnection#setReadTimeout(int)} + * {@link java.net.URLConnection#setReadTimeout(int)} */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Test for SocketTimeoutException fails: instead undocumented UnknownServiceException is thrown.", - method = "setReadTimeout", - args = {int.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Test for SocketTimeoutException fails: instead undocumented UnknownServiceException is thrown.", - method = "getReadTimeout", - args = {} - ) - }) public void test_setReadTimeoutI() throws Exception { assertEquals(0, uc.getReadTimeout()); uc.setReadTimeout(0); @@ -1902,14 +1537,8 @@ public class URLConnectionTest extends TestCase { } /** - * @tests {@link java.net.URLConnection#toString()} + * {@link java.net.URLConnection#toString()} */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {} - ) public void test_toString() { assertTrue("Wrong toString: " + uc.toString(), uc.toString().indexOf( @@ -1918,23 +1547,11 @@ public class URLConnectionTest extends TestCase { uc.getURL().toString()) > 0); } - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "protected constructor", - method = "URLConnection", - args = {java.net.URL.class} - ) public void test_URLConnection() { String url = uc2.getURL().toString(); assertEquals(url2.toString(), url); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInputStream", - args = {} - ) public void testGetInputStream() throws IOException { fileURLCon.setDoInput(true); fileURLCon.connect(); diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/net/URLEncoderTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/net/URLEncoderTest.java index 04d2d41..1c86303 100644 --- a/luni/src/test/java/org/apache/harmony/luni/tests/java/net/URLEncoderTest.java +++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/net/URLEncoderTest.java @@ -27,7 +27,7 @@ import tests.support.Support_Configuration; public class URLEncoderTest extends TestCase { /** - * @tests java.net.URLEncoder#encode(java.lang.String) + * java.net.URLEncoder#encode(java.lang.String) */ @SuppressWarnings("deprecation") public void test_encodeLjava_lang_String() { @@ -44,7 +44,7 @@ public class URLEncoderTest extends TestCase { } /** - * @tests URLEncoder#encode(String, String) + * URLEncoder#encode(String, String) */ public void test_encodeLjava_lang_StringLjava_lang_String() throws Exception { diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/AbstractCollectionTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/AbstractCollectionTest.java index 6191178..348a83c 100644 --- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/AbstractCollectionTest.java +++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/AbstractCollectionTest.java @@ -26,7 +26,7 @@ import junit.framework.TestCase; public class AbstractCollectionTest extends TestCase { /** - * @tests java.util.AbstractCollection#add(java.lang.Object) + * java.util.AbstractCollection#add(java.lang.Object) */ public void test_addLjava_lang_Object() { AbstractCollection<Object> ac = new AbstractCollection<Object>() { @@ -51,7 +51,7 @@ public class AbstractCollectionTest extends TestCase { } /** - * @tests java.util.AbstractCollection#addAll(java.util.Collection) + * java.util.AbstractCollection#addAll(java.util.Collection) */ public void test_addAllLjava_util_Collection() { final Collection<String> fixtures = Arrays.asList("0", "1", "2"); @@ -80,7 +80,7 @@ public class AbstractCollectionTest extends TestCase { } /** - * @tests java.util.AbstractCollection#containsAll(java.util.Collection) + * java.util.AbstractCollection#containsAll(java.util.Collection) */ public void test_containsAllLjava_util_Collection() { final Collection<String> fixtures = Arrays.asList("0", "1", "2"); @@ -109,7 +109,7 @@ public class AbstractCollectionTest extends TestCase { } /** - * @tests java.util.AbstractCollection#isEmpty() + * java.util.AbstractCollection#isEmpty() */ public void test_isEmpty() { final boolean[] sizeCalled = new boolean[1]; @@ -130,7 +130,7 @@ public class AbstractCollectionTest extends TestCase { } /** - * @tests java.util.AbstractCollection#removeAll(java.util.Collection) + * java.util.AbstractCollection#removeAll(java.util.Collection) */ public void test_removeAllLjava_util_Collection() { final String[] removed = new String[3]; @@ -172,7 +172,7 @@ public class AbstractCollectionTest extends TestCase { } /** - * @tests java.util.AbstractCollection#retainAll(java.util.Collection) + * java.util.AbstractCollection#retainAll(java.util.Collection) */ public void test_retainAllLjava_util_Collection() { final String[] removed = new String[1]; @@ -210,7 +210,7 @@ public class AbstractCollectionTest extends TestCase { } /** - * @tests java.util.AbstractCollection#toArray() + * java.util.AbstractCollection#toArray() */ public void test_toArray() { AbstractCollection<String> ac = new AbstractCollection<String>() { @@ -250,7 +250,7 @@ public class AbstractCollectionTest extends TestCase { } /** - * @tests java.util.AbstractCollection#toArray(java.lang.Object[]) + * java.util.AbstractCollection#toArray(java.lang.Object[]) */ public void test_toArray$Ljava_lang_Object() { AbstractCollection<String> ac = new AbstractCollection<String>() { @@ -309,7 +309,7 @@ public class AbstractCollectionTest extends TestCase { } /** - * @tests java.util.AbstractCollection#toString() + * java.util.AbstractCollection#toString() */ public void test_toString() { // see HARMONY-1522 diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/AbstractMapTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/AbstractMapTest.java index 2ca15cb..fafc415 100644 --- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/AbstractMapTest.java +++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/AbstractMapTest.java @@ -17,11 +17,6 @@ package org.apache.harmony.luni.tests.java.util; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import java.util.AbstractMap; import java.util.AbstractSet; import java.util.Collections; @@ -38,7 +33,6 @@ import java.util.TreeMap; import java.util.Vector; import java.util.WeakHashMap; -@TestTargetClass(java.util.AbstractMap.class) public class AbstractMapTest extends junit.framework.TestCase { static final String specialKey = "specialKey".intern(); @@ -76,14 +70,8 @@ public class AbstractMapTest extends junit.framework.TestCase { } /** - * @tests java.util.AbstractMap#keySet() + * java.util.AbstractMap#keySet() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Class is abstract. Functionality tested in subclasses for example in java.util.HashMap.", - method = "keySet", - args = {} - ) public void test_keySet() { AbstractMap map1 = new HashMap(0); assertSame("HashMap(0)", map1.keySet(), map1.keySet()); @@ -108,14 +96,8 @@ public class AbstractMapTest extends junit.framework.TestCase { } /** - * @tests java.util.AbstractMap#remove(java.lang.Object) + * java.util.AbstractMap#remove(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Class is abstract. Functionality tested in subclasses for example in java.util.HashMap.", - method = "remove", - args = {java.lang.Object.class} - ) public void test_removeLjava_lang_Object() { Object key = new Object(); Object value = new Object(); @@ -152,14 +134,8 @@ public class AbstractMapTest extends junit.framework.TestCase { } /** - * @tests java.util.AbstractMap#values() + * java.util.AbstractMap#values() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Class is abstract. Functionality tested in subclasses for example in java.util.HashMap.", - method = "values", - args = {} - ) public void test_values() { AbstractMap map1 = new HashMap(0); assertSame("HashMap(0)", map1.values(), map1.values()); @@ -184,14 +160,8 @@ public class AbstractMapTest extends junit.framework.TestCase { } /** - * @tests java.util.AbstractMap#clone() + * java.util.AbstractMap#clone() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Class is abstract. Functionality tested in subclasses for example in java.util.HashMap.", - method = "clone", - args = {} - ) public void test_clone() { class MyMap extends AbstractMap implements Cloneable { private Map map = new HashMap(); @@ -240,12 +210,6 @@ public class AbstractMapTest extends junit.framework.TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Class is abstract. Functionality tested in subclasses for example in java.util.HashMap.", - method = "clear", - args = {} - ) public void test_clear() { // normal clear() AbstractMap map = new HashMap(); @@ -264,14 +228,8 @@ public class AbstractMapTest extends junit.framework.TestCase { } /** - * @tests java.util.AbstractMap#containsKey(Object) + * java.util.AbstractMap#containsKey(Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Class is abstract. Functionality tested in subclasses for example in java.util.HashMap.", - method = "containsKey", - args = {java.lang.Object.class} - ) public void test_containsKey() { AbstractMap map = new AMT(); @@ -289,14 +247,8 @@ public class AbstractMapTest extends junit.framework.TestCase { } /** - * @tests java.util.AbstractMap#containsValue(Object) + * java.util.AbstractMap#containsValue(Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Class is abstract. Functionality tested in subclasses for example in java.util.HashMap.", - method = "containsValue", - args = {java.lang.Object.class} - ) public void test_containValue() { AbstractMap map = new AMT(); @@ -313,14 +265,8 @@ public class AbstractMapTest extends junit.framework.TestCase { } /** - * @tests java.util.AbstractMap#get(Object) + * java.util.AbstractMap#get(Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Class is abstract. Functionality tested in subclasses for example in java.util.HashMap.", - method = "get", - args = {java.lang.Object.class} - ) public void test_get() { AbstractMap map = new AMT(); assertNull(map.get("key")); @@ -396,14 +342,8 @@ public class AbstractMapTest extends junit.framework.TestCase { } /** - * @tests {@link java.util.AbstractMap#putAll(Map)} + * {@link java.util.AbstractMap#putAll(Map)} */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Class is abstract. Functionality tested in subclasses for example in java.util.HashMap.", - method = "putAll", - args = {java.util.Map.class} - ) public void test_putAllLMap() { Hashtable ht = new Hashtable(); AbstractMap amt = new AMT(); @@ -412,23 +352,11 @@ public class AbstractMapTest extends junit.framework.TestCase { assertEquals("Should be equal", amt, ht); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Class is abstract. Functionality tested in subclasses for example in java.util.HashMap.", - method = "AbstractMap", - args = {} - ) public void test_Constructor() { AMT amt = new AMT(); assertNotNull(amt); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Class is abstract. Functionality tested in subclasses for example in java.util.HashMap.", - method = "equals", - args = {java.lang.Object.class} - ) public void test_equalsLjava_lang_Object() { AbstractMap amt1 = new AMT(); AbstractMap amt2 = new AMT(); @@ -447,12 +375,6 @@ public class AbstractMapTest extends junit.framework.TestCase { assertFalse("assert 5", amt1.equals(this)); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Class is abstract. Functionality tested in subclasses for example in java.util.HashMap.", - method = "hashCode", - args = {} - ) public void test_hashCode() { AMT amt1 = new AMT(); AMT amt2 = new AMT(); @@ -461,12 +383,6 @@ public class AbstractMapTest extends junit.framework.TestCase { assertNotSame(amt1.hashCode(), amt2.hashCode()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Class is abstract. Functionality tested in subclasses for example in java.util.HashMap.", - method = "isEmpty", - args = {} - ) public void test_isEmpty() { AMT amt = new AMT(); assertTrue(amt.isEmpty()); @@ -474,12 +390,6 @@ public class AbstractMapTest extends junit.framework.TestCase { assertFalse(amt.isEmpty()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Class is abstract. Functionality tested in subclasses for example in java.util.HashMap.", - method = "put", - args = {java.lang.Object.class, java.lang.Object.class} - ) public void test_put() { AMT amt = new AMT(); assertEquals(0, amt.size()); @@ -491,12 +401,6 @@ public class AbstractMapTest extends junit.framework.TestCase { assertEquals(3, amt.size()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Class is abstract. Functionality tested in subclasses for example in java.util.HashMap.", - method = "size", - args = {} - ) public void test_size() { AMT amt = new AMT(); assertEquals(0, amt.size()); @@ -508,12 +412,6 @@ public class AbstractMapTest extends junit.framework.TestCase { assertEquals(3, amt.size()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Class is abstract. Functionality tested in subclasses for example in java.util.HashMap.", - method = "toString", - args = {} - ) public void test_toString() { AMT amt = new AMT(); assertEquals("{}", amt.toString()); diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/AbstractSetTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/AbstractSetTest.java index 952025f..f990b33 100644 --- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/AbstractSetTest.java +++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/AbstractSetTest.java @@ -16,11 +16,6 @@ package org.apache.harmony.luni.tests.java.util; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.util.AbstractSequentialList; @@ -29,7 +24,6 @@ import java.util.Collection; import java.util.Iterator; import java.util.Vector; -@TestTargetClass(AbstractSet.class) public class AbstractSetTest extends TestCase { class Mock_AbstractSet extends AbstractSet{ @@ -56,31 +50,11 @@ public class AbstractSetTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hashCode", - args = {} - ) public void testHashCode() { AbstractSet as = new Mock_AbstractSet(); assertNotNull(as.hashCode()); } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "equals", - args = {java.lang.Object.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "AbstractSet", - args = {} - ) - }) public void testEquals() { AbstractSet as1 = new Mock_AbstractSet(); AbstractSet as2 = new Mock_AbstractSet(); @@ -88,12 +62,6 @@ public class AbstractSetTest extends TestCase { assertTrue(as1.equals(as2)); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "removeAll", - args = {java.util.Collection.class} - ) public void testRemoveAll() { AbstractSet as = new AbstractSet(){ @Override diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/ArrayListTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/ArrayListTest.java index 75154fa..8d328e7 100644 --- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/ArrayListTest.java +++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/ArrayListTest.java @@ -40,7 +40,7 @@ public class ArrayListTest extends junit.framework.TestCase { } /** - * @tests java.util.ArrayList#ArrayList() + * java.util.ArrayList#ArrayList() */ public void test_Constructor() { // Test for method java.util.ArrayList() @@ -53,7 +53,7 @@ public class ArrayListTest extends junit.framework.TestCase { } /** - * @tests java.util.ArrayList#ArrayList(int) + * java.util.ArrayList#ArrayList(int) */ public void test_ConstructorI() { // Test for method java.util.ArrayList(int) @@ -72,7 +72,7 @@ public class ArrayListTest extends junit.framework.TestCase { } /** - * @tests java.util.ArrayList#ArrayList(java.util.Collection) + * java.util.ArrayList#ArrayList(java.util.Collection) */ public void test_ConstructorLjava_util_Collection() { // Test for method java.util.ArrayList(java.util.Collection) @@ -93,7 +93,7 @@ public class ArrayListTest extends junit.framework.TestCase { } /** - * @tests java.util.ArrayList#add(int, java.lang.Object) + * java.util.ArrayList#add(int, java.lang.Object) */ public void test_addILjava_lang_Object() { // Test for method void java.util.ArrayList.add(int, java.lang.Object) @@ -154,7 +154,7 @@ public class ArrayListTest extends junit.framework.TestCase { } /** - * @tests java.util.ArrayList#add(int, java.lang.Object) + * java.util.ArrayList#add(int, java.lang.Object) */ public void test_addILjava_lang_Object_2() { Object o = new Object(); @@ -174,7 +174,7 @@ public class ArrayListTest extends junit.framework.TestCase { } /** - * @tests java.util.ArrayList#add(java.lang.Object) + * java.util.ArrayList#add(java.lang.Object) */ public void test_addLjava_lang_Object() { // Test for method boolean java.util.ArrayList.add(java.lang.Object) @@ -186,7 +186,7 @@ public class ArrayListTest extends junit.framework.TestCase { } /** - * @tests java.util.ArrayList#addAll(int, java.util.Collection) + * java.util.ArrayList#addAll(int, java.util.Collection) */ public void test_addAllILjava_util_Collection() { // Test for method boolean java.util.ArrayList.addAll(int, @@ -223,7 +223,7 @@ public class ArrayListTest extends junit.framework.TestCase { } /** - * @tests java.util.ArrayList#addAll(int, java.util.Collection) + * java.util.ArrayList#addAll(int, java.util.Collection) */ @SuppressWarnings("unchecked") public void test_addAllILjava_util_Collection_2() { @@ -292,7 +292,7 @@ public class ArrayListTest extends junit.framework.TestCase { } /** - * @tests java.util.ArrayList#addAll(int, java.util.Collection) + * java.util.ArrayList#addAll(int, java.util.Collection) */ public void test_addAllILjava_util_Collection_3() { ArrayList obj = new ArrayList(); @@ -355,7 +355,7 @@ public class ArrayListTest extends junit.framework.TestCase { } /** - * @tests java.util.ArrayList#addAll(java.util.Collection) + * java.util.ArrayList#addAll(java.util.Collection) */ public void test_addAllLjava_util_Collection() { // Test for method boolean @@ -459,7 +459,7 @@ public class ArrayListTest extends junit.framework.TestCase { } /** - * @tests java.util.ArrayList#clear() + * java.util.ArrayList#clear() */ public void test_clear() { // Test for method void java.util.ArrayList.clear() @@ -479,7 +479,7 @@ public class ArrayListTest extends junit.framework.TestCase { } /** - * @tests java.util.ArrayList#clone() + * java.util.ArrayList#clone() */ public void test_clone() { // Test for method java.lang.Object java.util.ArrayList.clone() @@ -501,7 +501,7 @@ public class ArrayListTest extends junit.framework.TestCase { } /** - * @tests java.util.ArrayList#contains(java.lang.Object) + * java.util.ArrayList#contains(java.lang.Object) */ public void test_containsLjava_lang_Object() { // Test for method boolean @@ -520,7 +520,7 @@ public class ArrayListTest extends junit.framework.TestCase { } /** - * @tests java.util.ArrayList#ensureCapacity(int) + * java.util.ArrayList#ensureCapacity(int) */ public void test_ensureCapacityI() { // Test for method void java.util.ArrayList.ensureCapacity(int) @@ -549,7 +549,7 @@ public class ArrayListTest extends junit.framework.TestCase { } /** - * @tests java.util.ArrayList#get(int) + * java.util.ArrayList#get(int) */ public void test_getI() { // Test for method java.lang.Object java.util.ArrayList.get(int) @@ -564,7 +564,7 @@ public class ArrayListTest extends junit.framework.TestCase { } /** - * @tests java.util.ArrayList#indexOf(java.lang.Object) + * java.util.ArrayList#indexOf(java.lang.Object) */ public void test_indexOfLjava_lang_Object() { // Test for method int java.util.ArrayList.indexOf(java.lang.Object) @@ -579,7 +579,7 @@ public class ArrayListTest extends junit.framework.TestCase { } /** - * @tests java.util.ArrayList#isEmpty() + * java.util.ArrayList#isEmpty() */ public void test_isEmpty() { // Test for method boolean java.util.ArrayList.isEmpty() @@ -590,7 +590,7 @@ public class ArrayListTest extends junit.framework.TestCase { } /** - * @tests java.util.ArrayList#lastIndexOf(java.lang.Object) + * java.util.ArrayList#lastIndexOf(java.lang.Object) */ public void test_lastIndexOfLjava_lang_Object() { // Test for method int java.util.ArrayList.lastIndexOf(java.lang.Object) @@ -606,7 +606,7 @@ public class ArrayListTest extends junit.framework.TestCase { } /** - * @tests {@link java.util.ArrayList#removeRange(int, int)} + * {@link java.util.ArrayList#removeRange(int, int)} */ public void test_removeRange() { MockArrayList mylist = new MockArrayList(); @@ -663,7 +663,7 @@ public class ArrayListTest extends junit.framework.TestCase { } /** - * @tests java.util.ArrayList#remove(int) + * java.util.ArrayList#remove(int) */ public void test_removeI() { // Test for method java.lang.Object java.util.ArrayList.remove(int) @@ -716,7 +716,7 @@ public class ArrayListTest extends junit.framework.TestCase { } /** - * @tests java.util.ArrayList#set(int, java.lang.Object) + * java.util.ArrayList#set(int, java.lang.Object) */ public void test_setILjava_lang_Object() { // Test for method java.lang.Object java.util.ArrayList.set(int, @@ -767,7 +767,7 @@ public class ArrayListTest extends junit.framework.TestCase { } /** - * @tests java.util.ArrayList#size() + * java.util.ArrayList#size() */ public void test_size() { // Test for method int java.util.ArrayList.size() @@ -778,7 +778,7 @@ public class ArrayListTest extends junit.framework.TestCase { } /** - * @tests java.util.AbstractCollection#toString() + * java.util.AbstractCollection#toString() */ public void test_toString() { ArrayList l = new ArrayList(1); @@ -788,7 +788,7 @@ public class ArrayListTest extends junit.framework.TestCase { } /** - * @tests java.util.ArrayList#toArray() + * java.util.ArrayList#toArray() */ public void test_toArray() { // Test for method java.lang.Object [] java.util.ArrayList.toArray() @@ -810,7 +810,7 @@ public class ArrayListTest extends junit.framework.TestCase { } /** - * @tests java.util.ArrayList#toArray(java.lang.Object[]) + * java.util.ArrayList#toArray(java.lang.Object[]) */ public void test_toArray$Ljava_lang_Object() { // Test for method java.lang.Object [] @@ -835,7 +835,7 @@ public class ArrayListTest extends junit.framework.TestCase { } /** - * @tests java.util.ArrayList#trimToSize() + * java.util.ArrayList#trimToSize() */ public void test_trimToSize() { // Test for method void java.util.ArrayList.trimToSize() diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/ArraysTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/ArraysTest.java index 6642229..7e73bcf 100644 --- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/ArraysTest.java +++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/ArraysTest.java @@ -71,7 +71,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#asList(java.lang.Object[]) + * java.util.Arrays#asList(java.lang.Object[]) */ public void test_asList$Ljava_lang_Object() { // Test for method java.util.List @@ -107,7 +107,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#binarySearch(byte[], byte) + * java.util.Arrays#binarySearch(byte[], byte) */ public void test_binarySearch$BB() { // Test for method int java.util.Arrays.binarySearch(byte [], byte) @@ -128,7 +128,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#binarySearch(char[], char) + * java.util.Arrays#binarySearch(char[], char) */ public void test_binarySearch$CC() { // Test for method int java.util.Arrays.binarySearch(char [], char) @@ -144,7 +144,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#binarySearch(double[], double) + * java.util.Arrays#binarySearch(double[], double) */ public void test_binarySearch$DD() { // Test for method int java.util.Arrays.binarySearch(double [], double) @@ -178,7 +178,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#binarySearch(float[], float) + * java.util.Arrays#binarySearch(float[], float) */ public void test_binarySearch$FF() { // Test for method int java.util.Arrays.binarySearch(float [], float) @@ -211,7 +211,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#binarySearch(int[], int) + * java.util.Arrays#binarySearch(int[], int) */ public void test_binarySearch$II() { // Test for method int java.util.Arrays.binarySearch(int [], int) @@ -231,7 +231,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#binarySearch(long[], long) + * java.util.Arrays#binarySearch(long[], long) */ public void test_binarySearch$JJ() { // Test for method int java.util.Arrays.binarySearch(long [], long) @@ -252,7 +252,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#binarySearch(java.lang.Object[], + * java.util.Arrays#binarySearch(java.lang.Object[], * java.lang.Object) */ public void test_binarySearch$Ljava_lang_ObjectLjava_lang_Object() { @@ -288,7 +288,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#binarySearch(java.lang.Object[], + * java.util.Arrays#binarySearch(java.lang.Object[], * java.lang.Object, java.util.Comparator) */ public void test_binarySearch$Ljava_lang_ObjectLjava_lang_ObjectLjava_util_Comparator() { @@ -310,7 +310,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#binarySearch(short[], short) + * java.util.Arrays#binarySearch(short[], short) */ public void test_binarySearch$SS() { // Test for method int java.util.Arrays.binarySearch(short [], short) @@ -331,7 +331,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#fill(byte[], byte) + * java.util.Arrays#fill(byte[], byte) */ public void test_fill$BB() { // Test for method void java.util.Arrays.fill(byte [], byte) @@ -344,7 +344,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#fill(byte[], int, int, byte) + * java.util.Arrays#fill(byte[], int, int, byte) */ public void test_fill$BIIB() { // Test for method void java.util.Arrays.fill(byte [], int, int, byte) @@ -387,7 +387,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#fill(short[], short) + * java.util.Arrays#fill(short[], short) */ public void test_fill$SS() { // Test for method void java.util.Arrays.fill(short [], short) @@ -400,7 +400,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#fill(short[], int, int, short) + * java.util.Arrays#fill(short[], int, int, short) */ public void test_fill$SIIS() { // Test for method void java.util.Arrays.fill(short [], int, int, short) @@ -414,7 +414,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#fill(char[], char) + * java.util.Arrays#fill(char[], char) */ public void test_fill$CC() { // Test for method void java.util.Arrays.fill(char [], char) @@ -426,7 +426,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#fill(char[], int, int, char) + * java.util.Arrays#fill(char[], int, int, char) */ public void test_fill$CIIC() { // Test for method void java.util.Arrays.fill(char [], int, int, char) @@ -440,7 +440,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#fill(int[], int) + * java.util.Arrays#fill(int[], int) */ public void test_fill$II() { // Test for method void java.util.Arrays.fill(int [], int) @@ -453,7 +453,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#fill(int[], int, int, int) + * java.util.Arrays#fill(int[], int, int, int) */ public void test_fill$IIII() { // Test for method void java.util.Arrays.fill(int [], int, int, int) @@ -467,7 +467,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#fill(long[], long) + * java.util.Arrays#fill(long[], long) */ public void test_fill$JJ() { // Test for method void java.util.Arrays.fill(long [], long) @@ -480,7 +480,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#fill(long[], int, int, long) + * java.util.Arrays#fill(long[], int, int, long) */ public void test_fill$JIIJ() { // Test for method void java.util.Arrays.fill(long [], int, int, long) @@ -494,7 +494,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#fill(float[], float) + * java.util.Arrays#fill(float[], float) */ public void test_fill$FF() { // Test for method void java.util.Arrays.fill(float [], float) @@ -506,7 +506,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#fill(float[], int, int, float) + * java.util.Arrays#fill(float[], int, int, float) */ public void test_fill$FIIF() { // Test for method void java.util.Arrays.fill(float [], int, int, float) @@ -520,7 +520,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#fill(double[], double) + * java.util.Arrays#fill(double[], double) */ public void test_fill$DD() { // Test for method void java.util.Arrays.fill(double [], double) @@ -533,7 +533,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#fill(double[], int, int, double) + * java.util.Arrays#fill(double[], int, int, double) */ public void test_fill$DIID() { // Test for method void java.util.Arrays.fill(double [], int, int, @@ -548,7 +548,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#fill(boolean[], boolean) + * java.util.Arrays#fill(boolean[], boolean) */ public void test_fill$ZZ() { // Test for method void java.util.Arrays.fill(boolean [], boolean) @@ -560,7 +560,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#fill(boolean[], int, int, boolean) + * java.util.Arrays#fill(boolean[], int, int, boolean) */ public void test_fill$ZIIZ() { // Test for method void java.util.Arrays.fill(boolean [], int, int, @@ -575,7 +575,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#fill(java.lang.Object[], java.lang.Object) + * java.util.Arrays#fill(java.lang.Object[], java.lang.Object) */ public void test_fill$Ljava_lang_ObjectLjava_lang_Object() { // Test for method void java.util.Arrays.fill(java.lang.Object [], @@ -588,7 +588,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#fill(java.lang.Object[], int, int, + * java.util.Arrays#fill(java.lang.Object[], int, int, * java.lang.Object) */ public void test_fill$Ljava_lang_ObjectIILjava_lang_Object() { @@ -609,7 +609,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#equals(byte[], byte[]) + * java.util.Arrays#equals(byte[], byte[]) */ public void test_equals$B$B() { // Test for method boolean java.util.Arrays.equals(byte [], byte []) @@ -623,7 +623,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#equals(short[], short[]) + * java.util.Arrays#equals(short[], short[]) */ public void test_equals$S$S() { // Test for method boolean java.util.Arrays.equals(short [], short []) @@ -637,7 +637,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#equals(char[], char[]) + * java.util.Arrays#equals(char[], char[]) */ public void test_equals$C$C() { // Test for method boolean java.util.Arrays.equals(char [], char []) @@ -652,7 +652,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#equals(int[], int[]) + * java.util.Arrays#equals(int[], int[]) */ public void test_equals$I$I() { // Test for method boolean java.util.Arrays.equals(int [], int []) @@ -671,7 +671,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#equals(long[], long[]) + * java.util.Arrays#equals(long[], long[]) */ public void test_equals$J$J() { // Test for method boolean java.util.Arrays.equals(long [], long []) @@ -689,7 +689,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#equals(float[], float[]) + * java.util.Arrays#equals(float[], float[]) */ public void test_equals$F$F() { // Test for method boolean java.util.Arrays.equals(float [], float []) @@ -708,7 +708,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#equals(double[], double[]) + * java.util.Arrays#equals(double[], double[]) */ public void test_equals$D$D() { // Test for method boolean java.util.Arrays.equals(double [], double []) @@ -730,7 +730,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#equals(boolean[], boolean[]) + * java.util.Arrays#equals(boolean[], boolean[]) */ public void test_equals$Z$Z() { // Test for method boolean java.util.Arrays.equals(boolean [], boolean @@ -745,7 +745,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#equals(java.lang.Object[], java.lang.Object[]) + * java.util.Arrays#equals(java.lang.Object[], java.lang.Object[]) */ public void test_equals$Ljava_lang_Object$Ljava_lang_Object() { // Test for method boolean java.util.Arrays.equals(java.lang.Object [], @@ -763,7 +763,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(byte[]) + * java.util.Arrays#sort(byte[]) */ public void test_sort$B() { // Test for method void java.util.Arrays.sort(byte []) @@ -777,7 +777,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(byte[], int, int) + * java.util.Arrays#sort(byte[], int, int) */ public void test_sort$BII() { // Test for method void java.util.Arrays.sort(byte [], int, int) @@ -828,7 +828,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(char[]) + * java.util.Arrays#sort(char[]) */ public void test_sort$C() { // Test for method void java.util.Arrays.sort(char []) @@ -843,7 +843,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(char[], int, int) + * java.util.Arrays#sort(char[], int, int) */ public void test_sort$CII() { // Test for method void java.util.Arrays.sort(char [], int, int) @@ -894,7 +894,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(double[]) + * java.util.Arrays#sort(double[]) */ public void test_sort$D() { // Test for method void java.util.Arrays.sort(double []) @@ -943,7 +943,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(double[], int, int) + * java.util.Arrays#sort(double[], int, int) */ public void test_sort$DII() { // Test for method void java.util.Arrays.sort(double [], int, int) @@ -994,7 +994,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(float[]) + * java.util.Arrays#sort(float[]) */ public void test_sort$F() { // Test for method void java.util.Arrays.sort(float []) @@ -1032,7 +1032,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(float[], int, int) + * java.util.Arrays#sort(float[], int, int) */ public void test_sort$FII() { // Test for method void java.util.Arrays.sort(float [], int, int) @@ -1083,7 +1083,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(int[]) + * java.util.Arrays#sort(int[]) */ public void test_sort$I() { // Test for method void java.util.Arrays.sort(int []) @@ -1097,7 +1097,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(int[], int, int) + * java.util.Arrays#sort(int[], int, int) */ public void test_sort$III() { // Test for method void java.util.Arrays.sort(int [], int, int) @@ -1148,7 +1148,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(long[]) + * java.util.Arrays#sort(long[]) */ public void test_sort$J() { // Test for method void java.util.Arrays.sort(long []) @@ -1163,7 +1163,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(long[], int, int) + * java.util.Arrays#sort(long[], int, int) */ public void test_sort$JII() { // Test for method void java.util.Arrays.sort(long [], int, int) @@ -1214,7 +1214,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(java.lang.Object[]) + * java.util.Arrays#sort(java.lang.Object[]) */ public void test_sort$Ljava_lang_Object() { // Test for method void java.util.Arrays.sort(java.lang.Object []) @@ -1228,7 +1228,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(java.lang.Object[], int, int) + * java.util.Arrays#sort(java.lang.Object[], int, int) */ public void test_sort$Ljava_lang_ObjectII() { // Test for method void java.util.Arrays.sort(java.lang.Object [], int, @@ -1281,7 +1281,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(java.lang.Object[], int, int, + * java.util.Arrays#sort(java.lang.Object[], int, int, * java.util.Comparator) */ public void test_sort$Ljava_lang_ObjectIILjava_util_Comparator() { @@ -1306,7 +1306,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(java.lang.Object[], java.util.Comparator) + * java.util.Arrays#sort(java.lang.Object[], java.util.Comparator) */ public void test_sort$Ljava_lang_ObjectLjava_util_Comparator() { // Test for method void java.util.Arrays.sort(java.lang.Object [], @@ -1365,7 +1365,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(short[]) + * java.util.Arrays#sort(short[]) */ public void test_sort$S() { // Test for method void java.util.Arrays.sort(short []) @@ -1379,7 +1379,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(short[], int, int) + * java.util.Arrays#sort(short[], int, int) */ public void test_sort$SII() { // Test for method void java.util.Arrays.sort(short [], int, int) @@ -1430,7 +1430,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(byte[], int, int) + * java.util.Arrays#sort(byte[], int, int) */ public void test_java_util_Arrays_sort_byte_array_NPE() { byte[] byte_array_null = null; @@ -1450,7 +1450,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(char[], int, int) + * java.util.Arrays#sort(char[], int, int) */ public void test_java_util_Arrays_sort_char_array_NPE() { char[] char_array_null = null; @@ -1470,7 +1470,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(double[], int, int) + * java.util.Arrays#sort(double[], int, int) */ public void test_java_util_Arrays_sort_double_array_NPE() { double[] double_array_null = null; @@ -1490,7 +1490,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(float[], int, int) + * java.util.Arrays#sort(float[], int, int) */ public void test_java_util_Arrays_sort_float_array_NPE() { float[] float_array_null = null; @@ -1510,7 +1510,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(int[], int, int) + * java.util.Arrays#sort(int[], int, int) */ public void test_java_util_Arrays_sort_int_array_NPE() { int[] int_array_null = null; @@ -1530,7 +1530,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(Object[], int, int) + * java.util.Arrays#sort(Object[], int, int) */ public void test_java_util_Arrays_sort_object_array_NPE() { Object[] object_array_null = null; @@ -1557,7 +1557,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(long[], int, int) + * java.util.Arrays#sort(long[], int, int) */ public void test_java_util_Arrays_sort_long_array_NPE() { long[] long_array_null = null; @@ -1577,7 +1577,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(short[], int, int) + * java.util.Arrays#sort(short[], int, int) */ public void test_java_util_Arrays_sort_short_array_NPE() { short[] short_array_null = null; @@ -1597,7 +1597,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#deepEquals(Object[], Object[]) + * java.util.Arrays#deepEquals(Object[], Object[]) */ public void test_deepEquals$Ljava_lang_ObjectLjava_lang_Object() { int [] a1 = {1, 2, 3}; @@ -1621,7 +1621,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#deepHashCode(Object[]) + * java.util.Arrays#deepHashCode(Object[]) */ public void test_deepHashCode$Ljava_lang_Object() { int [] a1 = {1, 2, 3}; @@ -1642,7 +1642,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#hashCode(boolean[] a) + * java.util.Arrays#hashCode(boolean[] a) */ public void test_hashCode$LZ() { int listHashCode; @@ -1659,7 +1659,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#hashCode(int[] a) + * java.util.Arrays#hashCode(int[] a) */ public void test_hashCode$LI() { int listHashCode; @@ -1680,7 +1680,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#hashCode(char[] a) + * java.util.Arrays#hashCode(char[] a) */ public void test_hashCode$LC() { int listHashCode; @@ -1697,7 +1697,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#hashCode(byte[] a) + * java.util.Arrays#hashCode(byte[] a) */ public void test_hashCode$LB() { int listHashCode; @@ -1714,7 +1714,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#hashCode(long[] a) + * java.util.Arrays#hashCode(long[] a) */ public void test_hashCode$LJ() { int listHashCode; @@ -1732,7 +1732,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#hashCode(float[] a) + * java.util.Arrays#hashCode(float[] a) */ public void test_hashCode$LF() { int listHashCode; @@ -1752,7 +1752,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#hashCode(double[] a) + * java.util.Arrays#hashCode(double[] a) */ public void test_hashCode$LD() { int listHashCode; @@ -1769,7 +1769,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#hashCode(short[] a) + * java.util.Arrays#hashCode(short[] a) */ public void test_hashCode$LS() { int listHashCode; @@ -1786,7 +1786,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#hashCode(Object[] a) + * java.util.Arrays#hashCode(Object[] a) */ public void test_hashCode$Ljava_lang_Object() { int listHashCode; @@ -1834,7 +1834,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#binarySearch(byte[],int,int, byte) + * java.util.Arrays#binarySearch(byte[],int,int, byte) */ public void test_binarySearch$BIIB() { for (byte counter = 0; counter < arraySize; counter++) { @@ -1910,7 +1910,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#binarySearch(char[], char) + * java.util.Arrays#binarySearch(char[], char) */ public void test_binarySearch$CIIC() { for (char counter = 0; counter < arraySize; counter++) { @@ -1977,7 +1977,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#binarySearch(double[], double) + * java.util.Arrays#binarySearch(double[], double) */ public void test_binarySearch$DIID() { for (int counter = 0; counter < arraySize; counter++) { @@ -2062,7 +2062,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#binarySearch(float[], float) + * java.util.Arrays#binarySearch(float[], float) */ public void test_binarySearch$FIIF() { for (int counter = 0; counter < arraySize; counter++) { @@ -2152,7 +2152,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#binarySearch(int[], int) + * java.util.Arrays#binarySearch(int[], int) */ public void test_binarySearch$IIII() { for (int counter = 0; counter < arraySize; counter++) { @@ -2227,7 +2227,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#binarySearch(long[], long) + * java.util.Arrays#binarySearch(long[], long) */ public void test_binarySearch$JIIJ() { for (long counter = 0; counter < arraySize; counter++){ @@ -2301,7 +2301,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#binarySearch(java.lang.Object[], + * java.util.Arrays#binarySearch(java.lang.Object[], * java.lang.Object) */ public void test_binarySearch$Ljava_lang_ObjectIILjava_lang_Object() { @@ -2375,7 +2375,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#binarySearch(java.lang.Object[], + * java.util.Arrays#binarySearch(java.lang.Object[], * java.lang.Object, java.util.Comparator) */ public void test_binarySearch$Ljava_lang_ObjectIILjava_lang_ObjectLjava_util_Comparator() { @@ -2458,7 +2458,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#binarySearch(short[], short) + * java.util.Arrays#binarySearch(short[], short) */ public void test_binarySearch$SIIS() { for (short counter = 0; counter < arraySize; counter++){ @@ -2534,7 +2534,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests {@link java.util.Arrays#copyOf(byte[],int) + * {@link java.util.Arrays#copyOf(byte[],int) */ public void test_copyOf_$BI() throws Exception { byte[] result = Arrays.copyOf(byteArray, arraySize*2); @@ -2571,7 +2571,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests {@link java.util.Arrays#copyOf(short[],int) + * {@link java.util.Arrays#copyOf(short[],int) */ public void test_copyOf_$SI() throws Exception { short[] result = Arrays.copyOf(shortArray, arraySize*2); @@ -2608,7 +2608,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests {@link java.util.Arrays#copyOf(int[],int) + * {@link java.util.Arrays#copyOf(int[],int) */ public void test_copyOf_$II() throws Exception { int[] result = Arrays.copyOf(intArray, arraySize*2); @@ -2645,7 +2645,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests {@link java.util.Arrays#copyOf(boolean[],int) + * {@link java.util.Arrays#copyOf(boolean[],int) */ public void test_copyOf_$ZI() throws Exception { boolean[] result = Arrays.copyOf(booleanArray, arraySize*2); @@ -2682,7 +2682,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests {@link java.util.Arrays#copyOf(char[],int) + * {@link java.util.Arrays#copyOf(char[],int) */ public void test_copyOf_$CI() throws Exception { char[] result = Arrays.copyOf(charArray, arraySize*2); @@ -2719,7 +2719,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests {@link java.util.Arrays#copyOf(float[],int) + * {@link java.util.Arrays#copyOf(float[],int) */ public void test_copyOf_$FI() throws Exception { float[] result = Arrays.copyOf(floatArray, arraySize*2); @@ -2756,7 +2756,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests {@link java.util.Arrays#copyOf(double[],int) + * {@link java.util.Arrays#copyOf(double[],int) */ public void test_copyOf_$DI() throws Exception { double[] result = Arrays.copyOf(doubleArray, arraySize*2); @@ -2793,7 +2793,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests {@link java.util.Arrays#copyOf(long[],int) + * {@link java.util.Arrays#copyOf(long[],int) */ public void test_copyOf_$JI() throws Exception { long[] result = Arrays.copyOf(longArray, arraySize*2); @@ -2830,7 +2830,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests {@link java.util.Arrays#copyOf(T[],int) + * {@link java.util.Arrays#copyOf(T[],int) */ public void test_copyOf_$TI() throws Exception { Object[] result = Arrays.copyOf(objArray, arraySize*2); @@ -2876,7 +2876,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests {@link java.util.Arrays#copyOf(T[],int,Class<? extends Object[]>)) + * {@link java.util.Arrays#copyOf(T[],int,Class<? extends Object[]>)) */ public void test_copyOf_$TILClass() throws Exception { Object[] result = Arrays.copyOf(objArray, arraySize*2,Object[].class); @@ -2943,7 +2943,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests {@link java.util.Arrays#copyOfRange(byte[],int,int) + * {@link java.util.Arrays#copyOfRange(byte[],int,int) */ public void test_copyOfRange_$BII() throws Exception { byte[] result = Arrays.copyOfRange(byteArray, 0,arraySize*2); @@ -2996,7 +2996,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests {@link java.util.Arrays#copyOfRange(short[],int,int) + * {@link java.util.Arrays#copyOfRange(short[],int,int) */ public void test_copyOfRange_$SII() throws Exception { short[] result = Arrays.copyOfRange(shortArray, 0,arraySize*2); @@ -3049,7 +3049,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests {@link java.util.Arrays#copyOfRange(int[],int,int) + * {@link java.util.Arrays#copyOfRange(int[],int,int) */ public void test_copyOfRange_$III() throws Exception { int[] result = Arrays.copyOfRange(intArray, 0,arraySize*2); @@ -3102,7 +3102,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests {@link java.util.Arrays#copyOfRange(long[],int,int) + * {@link java.util.Arrays#copyOfRange(long[],int,int) */ public void test_copyOfRange_$JII() throws Exception { long[] result = Arrays.copyOfRange(longArray, 0,arraySize*2); @@ -3155,7 +3155,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests {@link java.util.Arrays#copyOfRange(char[],int,int) + * {@link java.util.Arrays#copyOfRange(char[],int,int) */ public void test_copyOfRange_$CII() throws Exception { char[] result = Arrays.copyOfRange(charArray, 0,arraySize*2); @@ -3208,7 +3208,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests {@link java.util.Arrays#copyOfRange(float[],int,int) + * {@link java.util.Arrays#copyOfRange(float[],int,int) */ public void test_copyOfRange_$FII() throws Exception { float[] result = Arrays.copyOfRange(floatArray, 0,arraySize*2); @@ -3261,7 +3261,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests {@link java.util.Arrays#copyOfRange(double[],int,int) + * {@link java.util.Arrays#copyOfRange(double[],int,int) */ public void test_copyOfRange_$DII() throws Exception { double[] result = Arrays.copyOfRange(doubleArray, 0,arraySize*2); @@ -3314,7 +3314,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests {@link java.util.Arrays#copyOfRange(boolean[],int,int) + * {@link java.util.Arrays#copyOfRange(boolean[],int,int) */ public void test_copyOfRange_$ZII() throws Exception { boolean[] result = Arrays.copyOfRange(booleanArray, 0,arraySize*2); @@ -3367,7 +3367,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests {@link java.util.Arrays#copyOfRange(Object[],int,int) + * {@link java.util.Arrays#copyOfRange(Object[],int,int) */ public void test_copyOfRange_$TII() throws Exception { Object[] result = Arrays.copyOfRange(objArray, 0,arraySize*2); @@ -3420,7 +3420,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests {@link java.util.Arrays#copyOfRange(Object[], int, int, Class) + * {@link java.util.Arrays#copyOfRange(Object[], int, int, Class) */ public void test_copyOfRange_$TIILClass() throws Exception { Object[] result = Arrays.copyOfRange(objArray, 0,arraySize*2,Integer[].class); @@ -3498,7 +3498,7 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#swap(int, int, Object[]) + * java.util.Arrays#swap(int, int, Object[]) */ /* BEGIN android-removed: tests private implementation detail we don't share. public void test_swap_I_I_$Ljava_lang_Object() throws Exception { diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/BitSetTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/BitSetTest.java index f8be96d..5662480 100644 --- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/BitSetTest.java +++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/BitSetTest.java @@ -26,7 +26,7 @@ public class BitSetTest extends TestCase { BitSet eightbs; /** - * @tests java.util.BitSet#BitSet() + * java.util.BitSet#BitSet() */ public void test_Constructor() { BitSet bs = new BitSet(); @@ -36,7 +36,7 @@ public class BitSetTest extends TestCase { } /** - * @tests java.util.BitSet#BitSet(int) + * java.util.BitSet#BitSet(int) */ public void test_ConstructorI() { BitSet bs = new BitSet(128); @@ -65,7 +65,7 @@ public class BitSetTest extends TestCase { } /** - * @tests java.util.BitSet#equals(java.lang.Object) + * java.util.BitSet#equals(java.lang.Object) */ public void test_equalsLjava_lang_Object() { BitSet bs; @@ -86,7 +86,7 @@ public class BitSetTest extends TestCase { } /** - * @tests java.util.BitSet#hashCode() + * java.util.BitSet#hashCode() */ public void test_hashCode() { // Test for method int java.util.BitSet.hashCode() @@ -100,7 +100,7 @@ public class BitSetTest extends TestCase { } /** - * @tests java.util.BitSet#clear() + * java.util.BitSet#clear() */ public void test_clear() { eightbs.clear(); @@ -120,7 +120,7 @@ public class BitSetTest extends TestCase { } /** - * @tests java.util.BitSet#clear(int) + * java.util.BitSet#clear(int) */ public void test_clearI() { // Test for method void java.util.BitSet.clear(int) @@ -172,7 +172,7 @@ public class BitSetTest extends TestCase { } /** - * @tests java.util.BitSet#clear(int, int) + * java.util.BitSet#clear(int, int) */ public void test_clearII() throws IndexOutOfBoundsException { // Regression for HARMONY-98 @@ -356,7 +356,7 @@ public class BitSetTest extends TestCase { } /** - * @tests java.util.BitSet#get(int) + * java.util.BitSet#get(int) */ public void test_getI() { // Test for method boolean java.util.BitSet.get(int) @@ -396,7 +396,7 @@ public class BitSetTest extends TestCase { } /** - * @tests java.util.BitSet#get(int, int) + * java.util.BitSet#get(int, int) */ public void test_getII() { BitSet bitset = new BitSet(30); @@ -534,7 +534,7 @@ public class BitSetTest extends TestCase { } /** - * @tests java.util.BitSet#flip(int) + * java.util.BitSet#flip(int) */ public void test_flipI() { // Test for method void java.util.BitSet.flip(int) @@ -608,7 +608,7 @@ public class BitSetTest extends TestCase { } /** - * @tests java.util.BitSet#clear(int, int) + * java.util.BitSet#clear(int, int) */ public void test_flipII() { BitSet bitset = new BitSet(); @@ -756,7 +756,7 @@ public class BitSetTest extends TestCase { } /** - * @tests java.util.BitSet#set(int) + * java.util.BitSet#set(int) */ public void test_setI() { // Test for method void java.util.BitSet.set(int) @@ -796,7 +796,7 @@ public class BitSetTest extends TestCase { } /** - * @tests java.util.BitSet#set(int, boolean) + * java.util.BitSet#set(int, boolean) */ public void test_setIZ() { // Test for method void java.util.BitSet.set(int, boolean) @@ -808,7 +808,7 @@ public class BitSetTest extends TestCase { } /** - * @tests java.util.BitSet#set(int, int) + * java.util.BitSet#set(int, int) */ public void test_setII() throws IndexOutOfBoundsException { BitSet bitset = new BitSet(30); @@ -933,7 +933,7 @@ public class BitSetTest extends TestCase { } /** - * @tests java.util.BitSet#set(int, int, boolean) + * java.util.BitSet#set(int, int, boolean) */ public void test_setIIZ() { // Test for method void java.util.BitSet.set(int, int, boolean) @@ -948,7 +948,7 @@ public class BitSetTest extends TestCase { } /** - * @tests java.util.BitSet#intersects(java.util.BitSet) + * java.util.BitSet#intersects(java.util.BitSet) */ public void test_intersectsLjava_util_BitSet() { // Test for method boolean java.util.BitSet.intersects(java.util.BitSet) @@ -1024,7 +1024,7 @@ public class BitSetTest extends TestCase { } /** - * @tests java.util.BitSet#and(java.util.BitSet) + * java.util.BitSet#and(java.util.BitSet) */ public void test_andLjava_util_BitSet() { // Test for method void java.util.BitSet.and(java.util.BitSet) @@ -1047,7 +1047,7 @@ public class BitSetTest extends TestCase { } /** - * @tests java.util.BitSet#andNot(java.util.BitSet) + * java.util.BitSet#andNot(java.util.BitSet) */ public void test_andNotLjava_util_BitSet() { BitSet bs = (BitSet) eightbs.clone(); @@ -1065,7 +1065,7 @@ public class BitSetTest extends TestCase { } /** - * @tests java.util.BitSet#or(java.util.BitSet) + * java.util.BitSet#or(java.util.BitSet) */ public void test_orLjava_util_BitSet() { // Test for method void java.util.BitSet.or(java.util.BitSet) @@ -1088,7 +1088,7 @@ public class BitSetTest extends TestCase { } /** - * @tests java.util.BitSet#xor(java.util.BitSet) + * java.util.BitSet#xor(java.util.BitSet) */ public void test_xorLjava_util_BitSet() { // Test for method void java.util.BitSet.xor(java.util.BitSet) @@ -1116,7 +1116,7 @@ public class BitSetTest extends TestCase { } /** - * @tests java.util.BitSet#size() + * java.util.BitSet#size() */ public void test_size() { // Test for method int java.util.BitSet.size() @@ -1127,7 +1127,7 @@ public class BitSetTest extends TestCase { } /** - * @tests java.util.BitSet#toString() + * java.util.BitSet#toString() */ public void test_toString() { // Test for method java.lang.String java.util.BitSet.toString() @@ -1139,7 +1139,7 @@ public class BitSetTest extends TestCase { } /** - * @tests java.util.BitSet#length() + * java.util.BitSet#length() */ public void test_length() { BitSet bs = new BitSet(); @@ -1155,7 +1155,7 @@ public class BitSetTest extends TestCase { } /** - * @tests java.util.BitSet#nextSetBit(int) + * java.util.BitSet#nextSetBit(int) */ public void test_nextSetBitI() { // Test for method int java.util.BitSet.nextSetBit() @@ -1237,7 +1237,7 @@ public class BitSetTest extends TestCase { } /** - * @tests java.util.BitSet#nextClearBit(int) + * java.util.BitSet#nextClearBit(int) */ public void test_nextClearBitI() { // Test for method int java.util.BitSet.nextSetBit() @@ -1330,7 +1330,7 @@ public class BitSetTest extends TestCase { } /** - * @tests java.util.BitSet#isEmpty() + * java.util.BitSet#isEmpty() */ public void test_isEmpty() { BitSet bs = new BitSet(500); @@ -1361,7 +1361,7 @@ public class BitSetTest extends TestCase { } /** - * @tests java.util.BitSet#cardinality() + * java.util.BitSet#cardinality() */ public void test_cardinality() { // test for method int java.util.BitSet.cardinality() diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/CollectionsTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/CollectionsTest.java index 8e40752..84d498d 100644 --- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/CollectionsTest.java +++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/CollectionsTest.java @@ -17,11 +17,6 @@ package org.apache.harmony.luni.tests.java.util; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.io.Serializable; @@ -49,7 +44,6 @@ import org.apache.harmony.testframework.serialization.SerializationTest.Serializ import tests.util.SerializationTester; -@TestTargetClass(Collections.class) public class CollectionsTest extends TestCase { private static final SerializableAssert comparator = new SerializableAssert() { @@ -59,15 +53,9 @@ public class CollectionsTest extends TestCase { }; /** - * @tests java.util.Collections#binarySearch(java.util.List, + * java.util.Collections#binarySearch(java.util.List, * java.lang.Object, java.util.Comparator) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "binarySearch", - args = {java.util.List.class, java.lang.Object.class, java.util.Comparator.class} - ) public void test_binarySearchLjava_util_ListLjava_lang_ObjectLjava_util_Comparator() { // Regression for HARMONY-94 LinkedList<Integer> lst = new LinkedList<Integer>(); @@ -93,15 +81,9 @@ public class CollectionsTest extends TestCase { } /** - * @tests java.util.Collections#binarySearch(java.util.List, + * java.util.Collections#binarySearch(java.util.List, * java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "binarySearch", - args = {java.util.List.class, java.lang.Object.class} - ) @SuppressWarnings("unchecked") public void test_binarySearchLjava_util_ListLjava_lang_Object() { // regression for Harmony-1367 @@ -132,14 +114,8 @@ public class CollectionsTest extends TestCase { } /** - * @tests java.util.Collections#rotate(java.util.List, int) + * java.util.Collections#rotate(java.util.List, int) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "UnsupportedOperationException is not tested.", - method = "rotate", - args = {java.util.List.class, int.class} - ) public void test_rotateLjava_util_ListI() { // Regression for HARMONY-19 Rotate an *empty* list Collections.rotate(new ArrayList<Object>(), 25); @@ -166,14 +142,8 @@ public class CollectionsTest extends TestCase { } /** - * @tests java.util.Collections#synchronizedCollection(java.util.Collection) + * java.util.Collections#synchronizedCollection(java.util.Collection) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException.", - method = "synchronizedCollection", - args = {java.util.Collection.class} - ) public void test_synchronizedCollectionLjava_util_Collection() { try { // Regression for HARMONY-93 @@ -185,14 +155,8 @@ public class CollectionsTest extends TestCase { } /** - * @tests java.util.Collections#synchronizedSortedMap(java.util.SortedMap) + * java.util.Collections#synchronizedSortedMap(java.util.SortedMap) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException.", - method = "synchronizedSortedMap", - args = {java.util.SortedMap.class} - ) public void test_synchronizedSortedMapLjava_util_SortedMap() { try { // Regression for HARMONY-93 @@ -204,14 +168,8 @@ public class CollectionsTest extends TestCase { } /** - * @tests java.util.Collections#synchronizedMap(java.util.Map) + * java.util.Collections#synchronizedMap(java.util.Map) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException.", - method = "synchronizedMap", - args = {java.util.Map.class} - ) public void test_synchronizedMapLjava_util_Map() { try { // Regression for HARMONY-93 @@ -223,14 +181,8 @@ public class CollectionsTest extends TestCase { } /** - * @tests java.util.Collections#synchronizedSet(java.util.Set) + * java.util.Collections#synchronizedSet(java.util.Set) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException.", - method = "synchronizedSet", - args = {java.util.Set.class} - ) public void test_synchronizedSetLjava_util_Set() { try { // Regression for HARMONY-93 @@ -242,14 +194,8 @@ public class CollectionsTest extends TestCase { } /** - * @tests java.util.Collections#synchronizedSortedSet(java.util.SortedSet) + * java.util.Collections#synchronizedSortedSet(java.util.SortedSet) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException.", - method = "synchronizedSortedSet", - args = {java.util.SortedSet.class} - ) public void test_synchronizedSortedSetLjava_util_SortedSet() { try { // Regression for HARMONY-93 @@ -261,14 +207,8 @@ public class CollectionsTest extends TestCase { } /** - * @tests java.util.Collections#unmodifiableCollection(java.util.Collection) + * java.util.Collections#unmodifiableCollection(java.util.Collection) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException.", - method = "unmodifiableCollection", - args = {java.util.Collection.class} - ) public void test_unmodifiableCollectionLjava_util_Collection() { try { // Regression for HARMONY-93 @@ -280,14 +220,8 @@ public class CollectionsTest extends TestCase { } /** - * @tests java.util.Collections#unmodifiableMap(java.util.Map) + * java.util.Collections#unmodifiableMap(java.util.Map) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException.", - method = "unmodifiableMap", - args = {java.util.Map.class} - ) public void test_unmodifiableMapLjava_util_Map() { try { // Regression for HARMONY-93 @@ -299,14 +233,8 @@ public class CollectionsTest extends TestCase { } /** - * @tests java.util.Collections#unmodifiableSet(java.util.Set) + * java.util.Collections#unmodifiableSet(java.util.Set) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException.", - method = "unmodifiableSet", - args = {java.util.Set.class} - ) public void test_unmodifiableSetLjava_util_Set() { try { // Regression for HARMONY-93 @@ -318,14 +246,8 @@ public class CollectionsTest extends TestCase { } /** - * @tests java.util.Collections#unmodifiableSortedMap(java.util.SortedMap) + * java.util.Collections#unmodifiableSortedMap(java.util.SortedMap) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException.", - method = "unmodifiableSortedMap", - args = {java.util.SortedMap.class} - ) public void test_unmodifiableSortedMapLjava_util_SortedMap() { try { // Regression for HARMONY-93 @@ -337,14 +259,8 @@ public class CollectionsTest extends TestCase { } /** - * @tests java.util.Collections#unmodifiableSortedSet(java.util.SortedSet) + * java.util.Collections#unmodifiableSortedSet(java.util.SortedSet) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException.", - method = "unmodifiableSortedSet", - args = {java.util.SortedSet.class} - ) public void test_unmodifiableSortedSetLjava_util_SortedSet() { try { // Regression for HARMONY-93 @@ -356,14 +272,8 @@ public class CollectionsTest extends TestCase { } /** - * @tests java.util.Collections#frequency(java.util.Collection,Object) + * java.util.Collections#frequency(java.util.Collection,Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "frequency", - args = {java.util.Collection.class, java.lang.Object.class} - ) public void test_frequencyLjava_util_CollectionLint() { try { Collections.frequency(null, null); @@ -398,14 +308,8 @@ public class CollectionsTest extends TestCase { } /** - * @tests java.util.Collections#reverseOrder() + * java.util.Collections#reverseOrder() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "reverseOrder", - args = {} - ) public void test_reverseOrder() { Comparator<String> roc = Collections.reverseOrder(); assertNotNull("Assert 0: comparator must not be null", roc); @@ -421,14 +325,8 @@ public class CollectionsTest extends TestCase { } /** - * @tests java.util.Collections#reverseOrder(java.util.Comparator) + * java.util.Collections#reverseOrder(java.util.Comparator) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "reverseOrder", - args = {java.util.Comparator.class} - ) public void test_reverseOrderLjava_util_Comparator() { Comparator<String> roc = Collections .reverseOrder(String.CASE_INSENSITIVE_ORDER); @@ -564,12 +462,6 @@ public class CollectionsTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "addAll", - args = {java.util.Collection.class, java.lang.Object[].class} - ) public void test_AddAll() { List<Object> l = new ArrayList<Object>(); assertFalse(Collections.addAll(l, new Object[] {})); @@ -618,12 +510,6 @@ public class CollectionsTest extends TestCase { Collections.addAll(c, new String[] { "String", "", "Correct element" }); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "disjoint", - args = {java.util.Collection.class, java.util.Collection.class} - ) public void test_Disjoint() { Object[] arr1 = new Object[10]; for (int i = 0; i < arr1.length; i++) { @@ -697,132 +583,66 @@ public class CollectionsTest extends TestCase { } /** - * @tests java.util.Collections.EmptyList#readResolve() + * java.util.Collections.EmptyList#readResolve() */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "!SerializationSelf", - args = {} - ) public void test_EmptyList_readResolve() throws Exception { SerializationTest.verifySelf(Collections.EMPTY_LIST, comparator); } /** - * @tests java.util.Collections.EmptyMap#readResolve() + * java.util.Collections.EmptyMap#readResolve() */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "!SerializationSelf", - args = {} - ) public void test_EmptyMap_readResolve() throws Exception { SerializationTest.verifySelf(Collections.EMPTY_MAP, comparator); } /** - * @tests java.util.Collections.EmptySet#readResolve() + * java.util.Collections.EmptySet#readResolve() */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "!SerializationSelf", - args = {} - ) public void test_EmptySet_readResolve() throws Exception { SerializationTest.verifySelf(Collections.EMPTY_SET, comparator); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "!SerializationGolden", - args = {} - ) public void test_checkedCollectionSerializationCompatability() throws Exception { Collection<String> c = Collections.emptySet(); c = Collections.checkedCollection(c, String.class); SerializationTester.assertCompabilityEquals(c, "/serialization/org/apache/harmony/luni/tests/java/util/Collections_CheckedCollection.golden.ser"); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "!SerializationGolden", - args = {} - ) public void test_checkedListRandomAccessSerializationCompatability() throws Exception { List<String> c = new ArrayList<String>(); assertTrue(c instanceof RandomAccess); c = Collections.checkedList(c, String.class); SerializationTester.assertCompabilityEquals(c, "/serialization/org/apache/harmony/luni/tests/java/util/Collections_CheckedListRandomAccess.golden.ser"); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "!SerializationGolden", - args = {} - ) public void test_checkedListSerializationCompatability() throws Exception { List<String> c = new LinkedList<String>(); assertFalse(c instanceof RandomAccess); c = Collections.checkedList(c, String.class); SerializationTester.assertCompabilityEquals(c, "/serialization/org/apache/harmony/luni/tests/java/util/Collections_CheckedList.golden.ser"); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "!SerializationGolden", - args = {} - ) public void test_checkedSetSerializationCompatability() throws Exception { Set<String> c = new HashSet<String>(); assertFalse(c instanceof SortedSet); c = Collections.checkedSet(c, String.class); SerializationTester.assertCompabilityEquals(c, "/serialization/org/apache/harmony/luni/tests/java/util/Collections_CheckedSet.golden.ser"); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "!SerializationGolden", - args = {} - ) public void test_checkedMapSerializationCompatability() throws Exception { Map<String, String> c = new HashMap<String, String>(); assertFalse(c instanceof SortedMap); c = Collections.checkedMap(c, String.class, String.class); SerializationTester.assertCompabilityEquals(c, "/serialization/org/apache/harmony/luni/tests/java/util/Collections_CheckedMap.golden.ser"); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "!SerializationGolden", - args = {} - ) public void test_checkedSortedSetSerializationCompatability() throws Exception { SortedSet<String> c = new TreeSet<String>(); c = Collections.checkedSortedSet(c, String.class); SerializationTester.assertCompabilityEquals(c, "/serialization/org/apache/harmony/luni/tests/java/util/Collections_CheckedSortedSet.golden.ser"); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "!SerializationGolden", - args = {} - ) public void test_checkedSortedMapSerializationCompatability() throws Exception { SortedMap<String, String> c = new TreeMap<String, String>(); c = Collections.checkedSortedMap(c, String.class, String.class); SerializationTester.assertCompabilityEquals(c, "/serialization/org/apache/harmony/luni/tests/java/util/Collections_CheckedSortedMap.golden.ser"); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "checkedCollection", - args = {java.util.Collection.class, java.lang.Class.class} - ) public void test_checkedCollectionLjava_util_CollectionLjava_lang_Class() { ArrayList al = new ArrayList<Integer>(); @@ -838,12 +658,6 @@ public class CollectionsTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "checkedList", - args = {java.util.List.class, java.lang.Class.class} - ) public void test_checkedListLjava_util_ListLjava_lang_Class() { ArrayList al = new ArrayList<Integer>(); @@ -859,12 +673,6 @@ public class CollectionsTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "checkedMap", - args = {java.util.Map.class, java.lang.Class.class, java.lang.Class.class} - ) public void test_checkedMapLjava_util_MapLjava_lang_ClassLjava_lang_Class() { HashMap hm = new HashMap<Integer, String>(); @@ -888,12 +696,6 @@ public class CollectionsTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "checkedSet", - args = {java.util.Set.class, java.lang.Class.class} - ) public void test_checkedSetLjava_util_SetLjava_lang_Class() { HashSet hs = new HashSet<Integer>(); @@ -909,12 +711,6 @@ public class CollectionsTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "checkedSortedMap", - args = {java.util.SortedMap.class, java.lang.Class.class, java.lang.Class.class} - ) public void test_checkedSortedMapLjava_util_SortedMapLjava_lang_ClassLjava_lang_Class() { TreeMap tm = new TreeMap<Integer, String>(); @@ -938,12 +734,6 @@ public class CollectionsTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "checkedSortedSet", - args = {java.util.SortedSet.class, java.lang.Class.class} - ) public void test_checkedSortedSetLjava_util_SortedSetLjava_lang_Class() { TreeSet ts = new TreeSet<Integer>(); @@ -959,12 +749,6 @@ public class CollectionsTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "emptyList", - args = {} - ) public void test_emptyList() { List<String> ls = Collections.emptyList(); List<Integer> li = Collections.emptyList(); @@ -973,12 +757,6 @@ public class CollectionsTest extends TestCase { assertTrue(li.equals(Collections.EMPTY_LIST)); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "emptyMap", - args = {} - ) public void test_emptyMap() { Map<Integer, String> mis = Collections.emptyMap(); Map<String, Integer> msi = Collections.emptyMap(); @@ -987,12 +765,6 @@ public class CollectionsTest extends TestCase { assertTrue(msi.equals(Collections.EMPTY_MAP)); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "emptySet", - args = {} - ) public void test_emptySet() { Set<String> ss = Collections.emptySet(); Set<Integer> si = Collections.emptySet(); diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/DictionaryTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/DictionaryTest.java index 19cf8c0..2aaab58 100644 --- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/DictionaryTest.java +++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/DictionaryTest.java @@ -16,18 +16,12 @@ package org.apache.harmony.luni.tests.java.util; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.util.Date; import java.util.Dictionary; import java.util.Enumeration; -@TestTargetClass(Dictionary.class) public class DictionaryTest extends TestCase { class Mock_Dictionary extends Dictionary { @@ -68,12 +62,6 @@ public class DictionaryTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "Dictionary", - args = {} - ) public void testDictionary() { Dictionary md = new Mock_Dictionary(); assertNotNull(md); diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/DuplicateFormatFlagsExceptionTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/DuplicateFormatFlagsExceptionTest.java index 7170f5b..1c4df4f 100644 --- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/DuplicateFormatFlagsExceptionTest.java +++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/DuplicateFormatFlagsExceptionTest.java @@ -27,7 +27,7 @@ import org.apache.harmony.testframework.serialization.SerializationTest.Serializ public class DuplicateFormatFlagsExceptionTest extends TestCase { /** - * @tests java.util.DuplicateFormatFlagsException#DuplicateFormatFlagsException(String) + * java.util.DuplicateFormatFlagsException#DuplicateFormatFlagsException(String) */ public void test_duplicateFormatFlagsException() { try { @@ -39,7 +39,7 @@ public class DuplicateFormatFlagsExceptionTest extends TestCase { } /** - * @tests java.util.DuplicateFormatFlagsException#getFlags() + * java.util.DuplicateFormatFlagsException#getFlags() */ public void test_getFlags() { String strFlags = "MYTESTFLAGS"; @@ -49,7 +49,7 @@ public class DuplicateFormatFlagsExceptionTest extends TestCase { } /** - * @tests java.util.DuplicateFormatFlagsException#getMessage() + * java.util.DuplicateFormatFlagsException#getMessage() */ public void test_getMessage() { String strFlags = "MYTESTFLAGS"; @@ -75,7 +75,7 @@ public class DuplicateFormatFlagsExceptionTest extends TestCase { }; /** - * @tests serialization/deserialization. + * serialization/deserialization. */ public void testSerializationSelf() throws Exception { @@ -84,7 +84,7 @@ public class DuplicateFormatFlagsExceptionTest extends TestCase { } /** - * @tests serialization/deserialization compatibility with RI. + * serialization/deserialization compatibility with RI. */ public void testSerializationCompatibility() throws Exception { diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/EventListenerProxyTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/EventListenerProxyTest.java index e6c0ac7..11e8c26 100644 --- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/EventListenerProxyTest.java +++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/EventListenerProxyTest.java @@ -16,17 +16,11 @@ package org.apache.harmony.luni.tests.java.util; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.util.EventListener; import java.util.EventListenerProxy; -@TestTargetClass(EventListenerProxy.class) public class EventListenerProxyTest extends TestCase { class Mock_EventListener implements EventListener { @@ -41,23 +35,11 @@ public class EventListenerProxyTest extends TestCase { } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "EventListenerProxy", - args = {java.util.EventListener.class} - ) public void testEventListenerProxy() { assertNotNull(new Mock_EventListenerProxy(null)); assertNotNull(new Mock_EventListenerProxy(new Mock_EventListener())); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getListener", - args = {} - ) public void testGetListener() { EventListener el = new Mock_EventListener(); EventListenerProxy elp = new Mock_EventListenerProxy(el); diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/FormatFlagsConversionMismatchExceptionTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/FormatFlagsConversionMismatchExceptionTest.java index ffe3e53..fd2a545 100644 --- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/FormatFlagsConversionMismatchExceptionTest.java +++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/FormatFlagsConversionMismatchExceptionTest.java @@ -27,7 +27,7 @@ import org.apache.harmony.testframework.serialization.SerializationTest.Serializ public class FormatFlagsConversionMismatchExceptionTest extends TestCase { /** - * @tests java.util.FormatFlagsConversionMismatchException#FormatFlagsConversionMismatchException(String, + * java.util.FormatFlagsConversionMismatchException#FormatFlagsConversionMismatchException(String, * char) */ public void test_formatFlagsConversionMismatchException() { @@ -41,7 +41,7 @@ public class FormatFlagsConversionMismatchExceptionTest extends TestCase { } /** - * @tests java.util.FormatFlagsConversionMismatchException#getFlags() + * java.util.FormatFlagsConversionMismatchException#getFlags() */ public void test_getFlags() { String flags = "MYTESTFLAGS"; @@ -52,7 +52,7 @@ public class FormatFlagsConversionMismatchExceptionTest extends TestCase { } /** - * @tests java.util.FormatFlagsConversionMismatchException#getConversion() + * java.util.FormatFlagsConversionMismatchException#getConversion() */ public void test_getConversion() { String flags = "MYTESTFLAGS"; @@ -65,7 +65,7 @@ public class FormatFlagsConversionMismatchExceptionTest extends TestCase { } /** - * @tests java.util.FormatFlagsConversionMismatchException#getMessage() + * java.util.FormatFlagsConversionMismatchException#getMessage() */ public void test_getMessage() { String flags = "MYTESTFLAGS"; @@ -94,7 +94,7 @@ public class FormatFlagsConversionMismatchExceptionTest extends TestCase { }; /** - * @tests serialization/deserialization. + * serialization/deserialization. */ public void testSerializationSelf() throws Exception { @@ -104,7 +104,7 @@ public class FormatFlagsConversionMismatchExceptionTest extends TestCase { } /** - * @tests serialization/deserialization compatibility with RI. + * serialization/deserialization compatibility with RI. */ public void testSerializationCompatibility() throws Exception { diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/FormattableTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/FormattableTest.java index 19d7cdb..e972bdd 100644 --- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/FormattableTest.java +++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/FormattableTest.java @@ -16,17 +16,11 @@ package org.apache.harmony.luni.tests.java.util; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.util.Formattable; import java.util.Formatter; -@TestTargetClass(Formattable.class) public class FormattableTest extends TestCase { class Mock_Formattable implements Formattable { @@ -51,12 +45,6 @@ public class FormattableTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "formatTo", - args = {java.util.Formatter.class, int.class, int.class, int.class} - ) public void testFormatTo() { Formatter fmt = new Formatter(); Mock_Formattable mf = new Mock_Formattable(); diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/FormatterClosedExceptionTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/FormatterClosedExceptionTest.java index e3c8327..273aee8 100644 --- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/FormatterClosedExceptionTest.java +++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/FormatterClosedExceptionTest.java @@ -25,7 +25,7 @@ import org.apache.harmony.testframework.serialization.SerializationTest; public class FormatterClosedExceptionTest extends TestCase { /** - * @tests serialization/deserialization. + * serialization/deserialization. */ public void testSerializationSelf() throws Exception { @@ -33,7 +33,7 @@ public class FormatterClosedExceptionTest extends TestCase { } /** - * @tests serialization/deserialization compatibility with RI. + * serialization/deserialization compatibility with RI. */ public void testSerializationCompatibility() throws Exception { diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/HashMapTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/HashMapTest.java index 8be1578..aca5bac 100644 --- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/HashMapTest.java +++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/HashMapTest.java @@ -110,7 +110,7 @@ public class HashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.HashMap#HashMap() + * java.util.HashMap#HashMap() */ public void test_Constructor() { // Test for method java.util.HashMap() @@ -121,7 +121,7 @@ public class HashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.HashMap#HashMap(int) + * java.util.HashMap#HashMap(int) */ public void test_ConstructorI() { // Test for method java.util.HashMap(int) @@ -142,7 +142,7 @@ public class HashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.HashMap#HashMap(int, float) + * java.util.HashMap#HashMap(int, float) */ public void test_ConstructorIF() { // Test for method java.util.HashMap(int, float) @@ -163,7 +163,7 @@ public class HashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.HashMap#HashMap(java.util.Map) + * java.util.HashMap#HashMap(java.util.Map) */ public void test_ConstructorLjava_util_Map() { // Test for method java.util.HashMap(java.util.Map) @@ -191,7 +191,7 @@ public class HashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.HashMap#clear() + * java.util.HashMap#clear() */ public void test_clear() { hm.clear(); @@ -213,7 +213,7 @@ public class HashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.HashMap#clone() + * java.util.HashMap#clone() */ public void test_clone() { // Test for method java.lang.Object java.util.HashMap.clone() @@ -259,7 +259,7 @@ public class HashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.HashMap#containsKey(java.lang.Object) + * java.util.HashMap#containsKey(java.lang.Object) */ public void test_containsKeyLjava_lang_Object() { // Test for method boolean @@ -276,7 +276,7 @@ public class HashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.HashMap#containsValue(java.lang.Object) + * java.util.HashMap#containsValue(java.lang.Object) */ public void test_containsValueLjava_lang_Object() { // Test for method boolean @@ -288,7 +288,7 @@ public class HashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.HashMap#entrySet() + * java.util.HashMap#entrySet() */ public void test_entrySet() { // Test for method java.util.Set java.util.HashMap.entrySet() @@ -308,7 +308,7 @@ public class HashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.HashMap#get(java.lang.Object) + * java.util.HashMap#get(java.lang.Object) */ public void test_getLjava_lang_Object() { // Test for method java.lang.Object @@ -380,7 +380,7 @@ public class HashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.HashMap#isEmpty() + * java.util.HashMap#isEmpty() */ public void test_isEmpty() { // Test for method boolean java.util.HashMap.isEmpty() @@ -389,7 +389,7 @@ public class HashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.HashMap#keySet() + * java.util.HashMap#keySet() */ public void test_keySet() { // Test for method java.util.Set java.util.HashMap.keySet() @@ -442,7 +442,7 @@ public class HashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.HashMap#put(java.lang.Object, java.lang.Object) + * java.util.HashMap#put(java.lang.Object, java.lang.Object) */ public void test_putLjava_lang_ObjectLjava_lang_Object() { hm.put("KEY", "VALUE"); @@ -512,7 +512,7 @@ public class HashMapTest extends junit.framework.TestCase { } } /** - * @tests java.util.HashMap#putAll(java.util.Map) + * java.util.HashMap#putAll(java.util.Map) */ public void test_putAllLjava_util_Map() { // Test for method void java.util.HashMap.putAll(java.util.Map) @@ -529,7 +529,7 @@ public class HashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.HashMap#putAll(java.util.Map) + * java.util.HashMap#putAll(java.util.Map) */ public void test_putAllLjava_util_Map_Null() { HashMap hashMap = new HashMap(); @@ -549,7 +549,7 @@ public class HashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.HashMap#remove(java.lang.Object) + * java.util.HashMap#remove(java.lang.Object) */ public void test_removeLjava_lang_Object() { int size = hm.size(); @@ -593,7 +593,7 @@ public class HashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.HashMap#size() + * java.util.HashMap#size() */ public void test_size() { // Test for method int java.util.HashMap.size() @@ -602,7 +602,7 @@ public class HashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.HashMap#values() + * java.util.HashMap#values() */ public void test_values() { // Test for method java.util.Collection java.util.HashMap.values() @@ -628,7 +628,7 @@ public class HashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.AbstractMap#toString() + * java.util.AbstractMap#toString() */ public void test_toString() { @@ -747,7 +747,7 @@ public class HashMapTest extends junit.framework.TestCase { } /** - * @tests serialization/deserialization. + * serialization/deserialization. */ public void testSerializationSelf() throws Exception { HashMap<String, String> hm = new HashMap<String, String>(); @@ -761,7 +761,7 @@ public class HashMapTest extends junit.framework.TestCase { } /** - * @tests serialization/deserialization compatibility with RI. + * serialization/deserialization compatibility with RI. */ public void testSerializationCompatibility() throws Exception { HashMap<String, String> hm = new HashMap<String, String>(); diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IdentityHashMapTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IdentityHashMapTest.java index 09742d7..fba97ef 100644 --- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IdentityHashMapTest.java +++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IdentityHashMapTest.java @@ -32,10 +32,10 @@ import org.apache.harmony.testframework.serialization.SerializationTest.Serializ public class IdentityHashMapTest extends junit.framework.TestCase { /** - * @tests java.util.IdentityHashMap#containsKey(java.lang.Object) - * @tests java.util.IdentityHashMap#containsValue(java.lang.Object) - * @tests java.util.IdentityHashMap#put(java.lang.Object, java.lang.Object) - * @tests java.util.IdentityHashMap#get(java.lang.Object) + * java.util.IdentityHashMap#containsKey(java.lang.Object) + * java.util.IdentityHashMap#containsValue(java.lang.Object) + * java.util.IdentityHashMap#put(java.lang.Object, java.lang.Object) + * java.util.IdentityHashMap#get(java.lang.Object) */ public void test_null_Keys_and_Values() { // tests with null keys and values @@ -90,7 +90,7 @@ public class IdentityHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.IdentityHashMap#put(java.lang.Object, java.lang.Object) + * java.util.IdentityHashMap#put(java.lang.Object, java.lang.Object) */ public void test_putLjava_lang_ObjectLjava_lang_Object() { IdentityHashMap<Object, Object> map = new IdentityHashMap<Object, Object>(); @@ -107,8 +107,8 @@ public class IdentityHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.IdentityHashMap#remove(java.lang.Object) - * @tests java.util.IdentityHashMap#keySet() + * java.util.IdentityHashMap#remove(java.lang.Object) + * java.util.IdentityHashMap#keySet() */ public void test_remove() { IdentityHashMap map = new IdentityHashMap(); @@ -127,7 +127,7 @@ public class IdentityHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.IdentityHashMapTest#remove(java.lang.Object) + * java.util.IdentityHashMapTest#remove(java.lang.Object) */ public void test_removeLjava_lang_Object() { // Regression for HARMONY-37 @@ -146,9 +146,9 @@ public class IdentityHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.IdentityHashMap#entrySet() - * @tests java.util.IdentityHashMap#keySet() - * @tests java.util.IdentityHashMap#values() + * java.util.IdentityHashMap#entrySet() + * java.util.IdentityHashMap#keySet() + * java.util.IdentityHashMap#values() */ public void test_sets() { // tests with null keys and values @@ -182,8 +182,8 @@ public class IdentityHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.IdentityHashMap#entrySet() - * @tests java.util.IdentityHashMap#remove(java.lang.Object) + * java.util.IdentityHashMap#entrySet() + * java.util.IdentityHashMap#remove(java.lang.Object) */ public void test_entrySet_removeAll() { IdentityHashMap map = new IdentityHashMap(); @@ -201,8 +201,8 @@ public class IdentityHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.IdentityHashMap#keySet() - * @tests java.util.IdentityHashMap#clear() + * java.util.IdentityHashMap#keySet() + * java.util.IdentityHashMap#clear() */ public void test_keySet_clear() { IdentityHashMap map = new IdentityHashMap(); @@ -220,7 +220,7 @@ public class IdentityHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.IdentityHashMap#values() + * java.util.IdentityHashMap#values() */ public void test_values() { @@ -270,8 +270,8 @@ public class IdentityHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.IdentityHashMap#keySet() - * @tests java.util.IdentityHashMap#remove(java.lang.Object) + * java.util.IdentityHashMap#keySet() + * java.util.IdentityHashMap#remove(java.lang.Object) */ public void test_keySet_removeAll() { IdentityHashMap map = new IdentityHashMap(); @@ -289,7 +289,7 @@ public class IdentityHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.IdentityHashMap#keySet() + * java.util.IdentityHashMap#keySet() */ public void test_keySet_retainAll() { IdentityHashMap map = new IdentityHashMap(); @@ -314,8 +314,8 @@ public class IdentityHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.IdentityHashMap#keySet() - * @tests java.util.IdentityHashMap#remove(java.lang.Object) + * java.util.IdentityHashMap#keySet() + * java.util.IdentityHashMap#remove(java.lang.Object) */ public void test_keyset_remove() { IdentityHashMap map = new IdentityHashMap(); @@ -423,7 +423,7 @@ public class IdentityHashMapTest extends junit.framework.TestCase { }; /** - * @tests serialization/deserialization compatibility with RI. + * serialization/deserialization compatibility with RI. */ public void testSerializationCompatibility() throws Exception { IdentityHashMap<String, String> identityHashMap = new IdentityHashMap<String, String>(); diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IllegalFormatCodePointExceptionTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IllegalFormatCodePointExceptionTest.java index 3d0286a..4592ab9 100644 --- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IllegalFormatCodePointExceptionTest.java +++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IllegalFormatCodePointExceptionTest.java @@ -27,7 +27,7 @@ import org.apache.harmony.testframework.serialization.SerializationTest.Serializ public class IllegalFormatCodePointExceptionTest extends TestCase { /** - * @tests java.util.IllegalFormatCodePointException.IllegalFormatCodePointException(int) + * java.util.IllegalFormatCodePointException.IllegalFormatCodePointException(int) */ public void test_illegalFormatCodePointException() { IllegalFormatCodePointException illegalFormatCodePointException = new IllegalFormatCodePointException( @@ -36,7 +36,7 @@ public class IllegalFormatCodePointExceptionTest extends TestCase { } /** - * @tests java.util.IllegalFormatCodePointException.getCodePoint() + * java.util.IllegalFormatCodePointException.getCodePoint() */ public void test_getCodePoint() { int codePoint = 12345; @@ -46,7 +46,7 @@ public class IllegalFormatCodePointExceptionTest extends TestCase { } /** - * @tests java.util.IllegalFormatCodePointException.getMessage() + * java.util.IllegalFormatCodePointException.getMessage() */ public void test_getMessage() { int codePoint = 12345; @@ -72,7 +72,7 @@ public class IllegalFormatCodePointExceptionTest extends TestCase { }; /** - * @tests serialization/deserialization. + * serialization/deserialization. */ public void testSerializationSelf() throws Exception { @@ -81,7 +81,7 @@ public class IllegalFormatCodePointExceptionTest extends TestCase { } /** - * @tests serialization/deserialization compatibility with RI. + * serialization/deserialization compatibility with RI. */ public void testSerializationCompatibility() throws Exception { diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IllegalFormatConversionExceptionTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IllegalFormatConversionExceptionTest.java index e934805..94cf1e4 100644 --- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IllegalFormatConversionExceptionTest.java +++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IllegalFormatConversionExceptionTest.java @@ -27,7 +27,7 @@ import org.apache.harmony.testframework.serialization.SerializationTest.Serializ public class IllegalFormatConversionExceptionTest extends TestCase { /** - * @tests java.util.IllegalFormatConversionException#IllegalFormatConversionException(char, + * java.util.IllegalFormatConversionException#IllegalFormatConversionException(char, * Class) */ public void test_illegalFormatConversionException() { @@ -40,7 +40,7 @@ public class IllegalFormatConversionExceptionTest extends TestCase { } /** - * @tests java.util.IllegalFormatConversionException#getArgumentClass() + * java.util.IllegalFormatConversionException#getArgumentClass() */ public void test_getArgumentClass() { char c = '*'; @@ -53,7 +53,7 @@ public class IllegalFormatConversionExceptionTest extends TestCase { } /** - * @tests java.util.IllegalFormatConversionException#getConversion() + * java.util.IllegalFormatConversionException#getConversion() */ public void test_getConversion() { char c = '*'; @@ -65,7 +65,7 @@ public class IllegalFormatConversionExceptionTest extends TestCase { } /** - * @tests java.util.IllegalFormatConversionException#getMessage() + * java.util.IllegalFormatConversionException#getMessage() */ public void test_getMessage() { char c = '*'; @@ -95,7 +95,7 @@ public class IllegalFormatConversionExceptionTest extends TestCase { }; /** - * @tests serialization/deserialization. + * serialization/deserialization. */ public void testSerializationSelf() throws Exception { @@ -104,7 +104,7 @@ public class IllegalFormatConversionExceptionTest extends TestCase { } /** - * @tests serialization/deserialization compatibility with RI. + * serialization/deserialization compatibility with RI. */ public void testSerializationCompatibility() throws Exception { diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IllegalFormatFlagsExceptionTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IllegalFormatFlagsExceptionTest.java index 6ccc97a..6816d16 100644 --- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IllegalFormatFlagsExceptionTest.java +++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IllegalFormatFlagsExceptionTest.java @@ -27,7 +27,7 @@ import org.apache.harmony.testframework.serialization.SerializationTest.Serializ public class IllegalFormatFlagsExceptionTest extends TestCase { /** - * @tests java.util.IllegalFormatFlagsException#IllegalFormatFlagsException(String) + * java.util.IllegalFormatFlagsException#IllegalFormatFlagsException(String) */ public void test_illegalFormatFlagsException() { try { @@ -39,7 +39,7 @@ public class IllegalFormatFlagsExceptionTest extends TestCase { } /** - * @tests java.util.IllegalFormatFlagsException.getFlags() + * java.util.IllegalFormatFlagsException.getFlags() */ public void test_getFlags() { String flags = "TESTFLAGS"; @@ -49,7 +49,7 @@ public class IllegalFormatFlagsExceptionTest extends TestCase { } /** - * @tests java.util.IllegalFormatFlagsException.getMessage() + * java.util.IllegalFormatFlagsException.getMessage() */ public void test_getMessage() { String flags = "TESTFLAGS"; @@ -75,7 +75,7 @@ public class IllegalFormatFlagsExceptionTest extends TestCase { }; /** - * @tests serialization/deserialization. + * serialization/deserialization. */ public void testSerializationSelf() throws Exception { @@ -84,7 +84,7 @@ public class IllegalFormatFlagsExceptionTest extends TestCase { } /** - * @tests serialization/deserialization compatibility with RI. + * serialization/deserialization compatibility with RI. */ public void testSerializationCompatibility() throws Exception { diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IllegalFormatPrecisionExceptionTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IllegalFormatPrecisionExceptionTest.java index 8d148bc..84d06c4 100644 --- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IllegalFormatPrecisionExceptionTest.java +++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IllegalFormatPrecisionExceptionTest.java @@ -26,7 +26,7 @@ import org.apache.harmony.testframework.serialization.SerializationTest.Serializ public class IllegalFormatPrecisionExceptionTest extends TestCase { /** - * @tests java.util.IllegalFormatPrecisionException#IllegalFormatPrecisionException(int) + * java.util.IllegalFormatPrecisionException#IllegalFormatPrecisionException(int) */ public void test_illegalFormatPrecisionException() { IllegalFormatPrecisionException illegalFormatPrecisionException = new IllegalFormatPrecisionException( @@ -36,7 +36,7 @@ public class IllegalFormatPrecisionExceptionTest extends TestCase { } /** - * @tests java.util.IllegalFormatPrecisionException#getPrecision() + * java.util.IllegalFormatPrecisionException#getPrecision() */ public void test_getPrecision() { int precision = 12345; @@ -46,7 +46,7 @@ public class IllegalFormatPrecisionExceptionTest extends TestCase { } /** - * @tests method for 'java.util.IllegalFormatPrecisionException#getMessage() + * method for 'java.util.IllegalFormatPrecisionException#getMessage() */ public void test_getMessage() { int precision = 12345; @@ -73,7 +73,7 @@ public class IllegalFormatPrecisionExceptionTest extends TestCase { }; /** - * @tests serialization/deserialization. + * serialization/deserialization. */ public void testSerializationSelf() throws Exception { @@ -82,7 +82,7 @@ public class IllegalFormatPrecisionExceptionTest extends TestCase { } /** - * @tests serialization/deserialization compatibility with RI. + * serialization/deserialization compatibility with RI. */ public void testSerializationCompatibility() throws Exception { diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IllegalFormatWidthExceptionTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IllegalFormatWidthExceptionTest.java index 032f01a..312635b 100644 --- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IllegalFormatWidthExceptionTest.java +++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/IllegalFormatWidthExceptionTest.java @@ -26,7 +26,7 @@ import org.apache.harmony.testframework.serialization.SerializationTest.Serializ public class IllegalFormatWidthExceptionTest extends TestCase { /** - * @tests java.util.IllegalFormatWidthException#IllegalFormatWidthException(int) + * java.util.IllegalFormatWidthException#IllegalFormatWidthException(int) */ public void test_illegalFormatWidthException() { int width = Integer.MAX_VALUE; @@ -37,7 +37,7 @@ public class IllegalFormatWidthExceptionTest extends TestCase { } /** - * @tests java.util.IllegalFormatWidthException#getWidth() + * java.util.IllegalFormatWidthException#getWidth() */ public void test_getWidth() { int width = 12345; @@ -48,7 +48,7 @@ public class IllegalFormatWidthExceptionTest extends TestCase { } /** - * @tests java.util.IllegalFormatWidthException#getMessage() + * java.util.IllegalFormatWidthException#getMessage() */ public void test_getMessage() { int width = 12345; @@ -74,7 +74,7 @@ public class IllegalFormatWidthExceptionTest extends TestCase { }; /** - * @tests serialization/deserialization. + * serialization/deserialization. */ public void testSerializationSelf() throws Exception { @@ -83,7 +83,7 @@ public class IllegalFormatWidthExceptionTest extends TestCase { } /** - * @tests serialization/deserialization compatibility with RI. + * serialization/deserialization compatibility with RI. */ public void testSerializationCompatibility() throws Exception { diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/InputMismatchExceptionTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/InputMismatchExceptionTest.java index 08687fb..fb8fc0d 100644 --- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/InputMismatchExceptionTest.java +++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/InputMismatchExceptionTest.java @@ -28,7 +28,7 @@ public class InputMismatchExceptionTest extends TestCase { private static final String ERROR_MESSAGE = "for serialization test"; /** - * @tests java.util.InputMismatchException#InputMismatchException() + * java.util.InputMismatchException#InputMismatchException() */ @SuppressWarnings("cast") public void test_Constructor() { @@ -39,7 +39,7 @@ public class InputMismatchExceptionTest extends TestCase { } /** - * @tests java.util.InputMismatchException#InputMismatchException(String) + * java.util.InputMismatchException#InputMismatchException(String) */ public void test_ConstructorLjava_lang_String() { InputMismatchException exception = new InputMismatchException( @@ -49,7 +49,7 @@ public class InputMismatchExceptionTest extends TestCase { } /** - * @tests serialization/deserialization. + * serialization/deserialization. */ public void testSerializationSelf() throws Exception { @@ -57,7 +57,7 @@ public class InputMismatchExceptionTest extends TestCase { } /** - * @tests serialization/deserialization compatibility with RI. + * serialization/deserialization compatibility with RI. */ public void testSerializationCompatibility() throws Exception { diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/InvalidPropertiesFormatExceptionTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/InvalidPropertiesFormatExceptionTest.java index e00ac0e..8b7bfce 100644 --- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/InvalidPropertiesFormatExceptionTest.java +++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/InvalidPropertiesFormatExceptionTest.java @@ -24,7 +24,7 @@ public class InvalidPropertiesFormatExceptionTest extends junit.framework.TestCase { /** - * @tests java.util.InvalidPropertiesFormatException#SerializationTest() + * java.util.InvalidPropertiesFormatException#SerializationTest() */ public void test_Serialization() throws Exception { InvalidPropertiesFormatException ipfe = new InvalidPropertiesFormatException( @@ -37,7 +37,7 @@ public class InvalidPropertiesFormatExceptionTest extends } /** - * @tests {@link java.util.InvalidPropertiesFormatException#InvalidPropertiesFormatException(Throwable)} + * {@link java.util.InvalidPropertiesFormatException#InvalidPropertiesFormatException(Throwable)} */ public void test_Constructor_Ljava_lang_Throwable() { Throwable throwable = new Throwable(); diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/LinkedHashMapTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/LinkedHashMapTest.java index 3bbe7cf..37f21da 100644 --- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/LinkedHashMapTest.java +++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/LinkedHashMapTest.java @@ -17,11 +17,6 @@ package org.apache.harmony.luni.tests.java.util; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import java.util.AbstractMap; import java.util.ArrayList; import java.util.Arrays; @@ -37,9 +32,8 @@ import tests.support.Support_MapTest2; import tests.support.Support_UnmodifiableCollectionTest; /** - * @tests java.util.LinkedHashMap + * java.util.LinkedHashMap */ -@TestTargetClass(LinkedHashMap.class) public class LinkedHashMapTest extends junit.framework.TestCase { LinkedHashMap hm; @@ -77,14 +71,8 @@ public class LinkedHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashMap#LinkedHashMap() + * java.util.LinkedHashMap#LinkedHashMap() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "LinkedHashMap", - args = {} - ) public void test_Constructor() { // Test for method java.util.LinkedHashMap() new Support_MapTest2(new LinkedHashMap()).runTest(); @@ -94,14 +82,8 @@ public class LinkedHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashMap#LinkedHashMap(int) + * java.util.LinkedHashMap#LinkedHashMap(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "LinkedHashMap", - args = {int.class} - ) public void test_ConstructorI() { // Test for method java.util.LinkedHashMap(int) LinkedHashMap hm2 = new LinkedHashMap(5); @@ -120,14 +102,8 @@ public class LinkedHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashMap#LinkedHashMap(int, float) + * java.util.LinkedHashMap#LinkedHashMap(int, float) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "LinkedHashMap", - args = {int.class, float.class} - ) public void test_ConstructorIF() { // Test for method java.util.LinkedHashMap(int, float) LinkedHashMap hm2 = new LinkedHashMap(5, (float) 0.5); @@ -146,14 +122,8 @@ public class LinkedHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashMap#LinkedHashMap(java.util.Map) + * java.util.LinkedHashMap#LinkedHashMap(java.util.Map) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "LinkedHashMap", - args = {java.util.Map.class} - ) public void test_ConstructorLjava_util_Map() { // Test for method java.util.LinkedHashMap(java.util.Map) Map myMap = new TreeMap(); @@ -173,14 +143,8 @@ public class LinkedHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashMap#get(java.lang.Object) + * java.util.LinkedHashMap#get(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "get", - args = {java.lang.Object.class} - ) public void test_getLjava_lang_Object() { // Test for method java.lang.Object // java.util.LinkedHashMap.get(java.lang.Object) @@ -198,14 +162,8 @@ public class LinkedHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashMap#put(java.lang.Object, java.lang.Object) + * java.util.LinkedHashMap#put(java.lang.Object, java.lang.Object) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "put", - args = {java.lang.Object.class, java.lang.Object.class} - ) public void test_putLjava_lang_ObjectLjava_lang_Object() { // Test for method java.lang.Object // java.util.LinkedHashMap.put(java.lang.Object, java.lang.Object) @@ -224,14 +182,8 @@ public class LinkedHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashMap#putAll(java.util.Map) + * java.util.LinkedHashMap#putAll(java.util.Map) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies only positive functionality.", - method = "putAll", - args = {java.util.Map.class} - ) public void test_putAllLjava_util_Map() { // Test for method void java.util.LinkedHashMap.putAll(java.util.Map) LinkedHashMap hm2 = new LinkedHashMap(); @@ -242,14 +194,8 @@ public class LinkedHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashMap#putAll(java.util.Map) + * java.util.LinkedHashMap#putAll(java.util.Map) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException.", - method = "putAll", - args = {java.util.Map.class} - ) public void test_putAll_Ljava_util_Map_Null() { LinkedHashMap linkedHashMap = new LinkedHashMap(); try { @@ -268,14 +214,8 @@ public class LinkedHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashMap#entrySet() + * java.util.LinkedHashMap#entrySet() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "entrySet", - args = {} - ) public void test_entrySet() { // Test for method java.util.Set java.util.LinkedHashMap.entrySet() Set s = hm.entrySet(); @@ -290,14 +230,8 @@ public class LinkedHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashMap#keySet() + * java.util.LinkedHashMap#keySet() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "keySet", - args = {} - ) public void test_keySet() { // Test for method java.util.Set java.util.LinkedHashMap.keySet() Set s = hm.keySet(); @@ -349,14 +283,8 @@ public class LinkedHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashMap#values() + * java.util.LinkedHashMap#values() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "values", - args = {} - ) public void test_values() { // Test for method java.util.Collection java.util.LinkedHashMap.values() Collection c = hm.values(); @@ -381,14 +309,8 @@ public class LinkedHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashMap#remove(java.lang.Object) + * java.util.LinkedHashMap#remove(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "remove", - args = {java.lang.Object.class} - ) public void test_removeLjava_lang_Object() { // Test for method java.lang.Object // java.util.LinkedHashMap.remove(java.lang.Object) @@ -409,14 +331,8 @@ public class LinkedHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashMap#clear() + * java.util.LinkedHashMap#clear() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "clear", - args = {} - ) public void test_clear() { // Test for method void java.util.LinkedHashMap.clear() hm.clear(); @@ -428,14 +344,8 @@ public class LinkedHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashMap#clone() + * java.util.LinkedHashMap#clone() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "clone", - args = {} - ) public void test_clone() { // Test for method java.lang.Object java.util.LinkedHashMap.clone() LinkedHashMap hm2 = (LinkedHashMap) hm.clone(); @@ -470,14 +380,8 @@ public class LinkedHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashMap#containsKey(java.lang.Object) + * java.util.LinkedHashMap#containsKey(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "containsKey", - args = {java.lang.Object.class} - ) public void test_containsKeyLjava_lang_Object() { // Test for method boolean // java.util.LinkedHashMap.containsKey(java.lang.Object) @@ -493,14 +397,8 @@ public class LinkedHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashMap#containsValue(java.lang.Object) + * java.util.LinkedHashMap#containsValue(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "containsValue", - args = {java.lang.Object.class} - ) public void test_containsValueLjava_lang_Object() { // Test for method boolean // java.util.LinkedHashMap.containsValue(java.lang.Object) @@ -511,14 +409,8 @@ public class LinkedHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashMap#isEmpty() + * java.util.LinkedHashMap#isEmpty() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isEmpty", - args = {} - ) public void test_isEmpty() { // Test for method boolean java.util.LinkedHashMap.isEmpty() assertTrue("Returned false for new map", new LinkedHashMap().isEmpty()); @@ -526,14 +418,8 @@ public class LinkedHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashMap#size() + * java.util.LinkedHashMap#size() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "size", - args = {} - ) public void test_size() { // Test for method int java.util.LinkedHashMap.size() assertTrue("Returned incorrect size", @@ -541,14 +427,8 @@ public class LinkedHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashMap#entrySet() + * java.util.LinkedHashMap#entrySet() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "entrySet", - args = {} - ) public void test_ordered_entrySet() { int i; int sz = 100; @@ -609,14 +489,8 @@ public class LinkedHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashMap#keySet() + * java.util.LinkedHashMap#keySet() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "keySet", - args = {} - ) public void test_ordered_keySet() { int i; int sz = 100; @@ -671,14 +545,8 @@ public class LinkedHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashMap#values() + * java.util.LinkedHashMap#values() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "values", - args = {} - ) public void test_ordered_values() { int i; int sz = 100; @@ -733,14 +601,8 @@ public class LinkedHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashMap#removeEldestEntry(java.util.Map$Entry) + * java.util.LinkedHashMap#removeEldestEntry(java.util.Map$Entry) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify null as a parameter.", - method = "removeEldestEntry", - args = {java.util.Map.Entry.class} - ) public void test_remove_eldest() { int i; int sz = 10; @@ -760,20 +622,6 @@ public class LinkedHashMapTest extends junit.framework.TestCase { assertTrue("Entries left in map", !it1.hasNext()); } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "LinkedHashMap", - args = {int.class, float.class, boolean.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "put", - args = {java.lang.Object.class, java.lang.Object.class} - ) - }) // BEGIN android-added public void testLinkedHashMap() { // we want to test the LinkedHashMap in access ordering mode. diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/ListIteratorTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/ListIteratorTest.java index d84034f..3a1ca8d 100644 --- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/ListIteratorTest.java +++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/ListIteratorTest.java @@ -16,18 +16,12 @@ package org.apache.harmony.luni.tests.java.util; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.util.LinkedList; import java.util.ListIterator; import java.util.NoSuchElementException; -@TestTargetClass(ListIterator.class) public class ListIteratorTest extends TestCase { ListIterator<Integer> l = null; @@ -39,12 +33,6 @@ public class ListIteratorTest extends TestCase { objArray[i] = new Integer(i); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hasNext", - args = {} - ) public void testHasNext() { for (int i = 0; i < objArray.length; i++) { assertTrue(l.hasNext()); @@ -53,12 +41,6 @@ public class ListIteratorTest extends TestCase { assertFalse(l.hasNext()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "next", - args = {} - ) public void testNext() { for (int i = 0; i < objArray.length; i++) { assertTrue(objArray[i].equals(l.next())); @@ -114,12 +96,6 @@ public class ListIteratorTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "remove", - args = {} - ) public void testRemove() { try { l.remove(); @@ -149,12 +125,6 @@ public class ListIteratorTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hasPrevious", - args = {} - ) public void testHasPrevious() { assertFalse(l.hasPrevious()); for (int i = 0; i < objArray.length; i++) { @@ -163,12 +133,6 @@ public class ListIteratorTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "previous", - args = {} - ) public void testPrevious() { try { l.previous(); @@ -192,12 +156,6 @@ public class ListIteratorTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "nextIndex", - args = {} - ) public void testNextIndex() { for (int i = 0; i < objArray.length; i++) { assertTrue(objArray[i].equals(l.nextIndex())); @@ -205,12 +163,6 @@ public class ListIteratorTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "previousIndex", - args = {} - ) public void testPreviousIndex() { for (int i = 0; i < objArray.length; i++) { assertTrue(objArray[i].equals(l.previousIndex() + 1)); @@ -218,12 +170,6 @@ public class ListIteratorTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "set", - args = {java.lang.Object.class} - ) public void testSet() { try { l.set(new Integer(1)); @@ -269,12 +215,6 @@ public class ListIteratorTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "add", - args = {java.lang.Object.class} - ) public void testAdd() { l.add(new Integer(33)); diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/MapEntryTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/MapEntryTest.java index 42498e2..c3e7a9c 100644 --- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/MapEntryTest.java +++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/MapEntryTest.java @@ -16,11 +16,6 @@ package org.apache.harmony.luni.tests.java.util; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.util.Collection; @@ -29,18 +24,11 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; -@TestTargetClass(Map.Entry.class) public class MapEntryTest extends TestCase { Map.Entry me = null; HashMap hm = null; Iterator i = null; - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getKey", - args = {} - ) public void testGetKey() { assertTrue(hm.containsKey(me.getKey())); hm.clear(); @@ -52,12 +40,6 @@ public class MapEntryTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getValue", - args = {} - ) public void testGetValue() { assertTrue(hm.containsValue(me.getValue())); hm.clear(); @@ -83,12 +65,6 @@ public class MapEntryTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "RI does not throw following exceptions: UnsupportedOperationException,ClassCastException, IllegalArgumentException and NullPointerException", - method = "setValue", - args = {java.lang.Object.class} - ) public void testSetValue() { Mock_HashMap mhm = new Mock_HashMap(); @@ -109,12 +85,6 @@ public class MapEntryTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "equals", - args = {java.lang.Object.class} - ) public void testEquals() { Map.Entry me1 = (Map.Entry)i.next(); assertFalse(me.equals(me1)); @@ -123,12 +93,6 @@ public class MapEntryTest extends TestCase { assertTrue(me.equals(me1)); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hashCode", - args = {} - ) public void testHashCode() { Map.Entry me1 = (Map.Entry)i.next(); assertTrue(me.hashCode() != me1.hashCode()); diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/MissingFormatArgumentExceptionTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/MissingFormatArgumentExceptionTest.java index e84c619..3334fed 100644 --- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/MissingFormatArgumentExceptionTest.java +++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/MissingFormatArgumentExceptionTest.java @@ -27,7 +27,7 @@ import org.apache.harmony.testframework.serialization.SerializationTest.Serializ public class MissingFormatArgumentExceptionTest extends TestCase { /** - * @tests java.util.MissingFormatArgumentException#MissingFormatArgumentException(String) + * java.util.MissingFormatArgumentException#MissingFormatArgumentException(String) */ public void test_missingFormatArgumentException() { @@ -40,7 +40,7 @@ public class MissingFormatArgumentExceptionTest extends TestCase { } /** - * @tests java.util.MissingFormatArgumentException#getFormatSpecifier() + * java.util.MissingFormatArgumentException#getFormatSpecifier() */ public void test_getFormatSpecifier() { String s = "MYTESTSTRING"; @@ -50,7 +50,7 @@ public class MissingFormatArgumentExceptionTest extends TestCase { } /** - * @tests java.util.MissingFormatArgumentException#getMessage() + * java.util.MissingFormatArgumentException#getMessage() */ public void test_getMessage() { String s = "MYTESTSTRING"; @@ -77,7 +77,7 @@ public class MissingFormatArgumentExceptionTest extends TestCase { }; /** - * @tests serialization/deserialization. + * serialization/deserialization. */ public void testSerializationSelf() throws Exception { @@ -86,7 +86,7 @@ public class MissingFormatArgumentExceptionTest extends TestCase { } /** - * @tests serialization/deserialization compatibility with RI. + * serialization/deserialization compatibility with RI. */ public void testSerializationCompatibility() throws Exception { diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/MissingFormatWidthExceptionTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/MissingFormatWidthExceptionTest.java index 33472a4..38c3bdb 100644 --- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/MissingFormatWidthExceptionTest.java +++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/MissingFormatWidthExceptionTest.java @@ -26,7 +26,7 @@ import org.apache.harmony.testframework.serialization.SerializationTest.Serializ public class MissingFormatWidthExceptionTest extends TestCase { /** - * @tests java.util.MissingFormatWidthException#MissingFormatWidthException(String) + * java.util.MissingFormatWidthException#MissingFormatWidthException(String) */ public void test_missingFormatWidthException() { try { @@ -38,7 +38,7 @@ public class MissingFormatWidthExceptionTest extends TestCase { } /** - * @tests java.util.MissingFormatWidthException#getFormatSpecifier() + * java.util.MissingFormatWidthException#getFormatSpecifier() */ public void test_getFormatSpecifier() { String s = "MYTESTSTRING"; @@ -49,7 +49,7 @@ public class MissingFormatWidthExceptionTest extends TestCase { } /** - * @tests java.util.MissingFormatWidthException#getMessage() + * java.util.MissingFormatWidthException#getMessage() */ public void test_getMessage() { String s = "MYTESTSTRING"; @@ -76,7 +76,7 @@ public class MissingFormatWidthExceptionTest extends TestCase { }; /** - * @tests serialization/deserialization. + * serialization/deserialization. */ public void testSerializationSelf() throws Exception { @@ -85,7 +85,7 @@ public class MissingFormatWidthExceptionTest extends TestCase { } /** - * @tests serialization/deserialization compatibility with RI. + * serialization/deserialization compatibility with RI. */ public void testSerializationCompatibility() throws Exception { diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/ObserverTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/ObserverTest.java index cb36136..acba163 100644 --- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/ObserverTest.java +++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/ObserverTest.java @@ -16,17 +16,11 @@ package org.apache.harmony.luni.tests.java.util; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.util.Observable; import java.util.Observer; -@TestTargetClass(Observer.class) public class ObserverTest extends TestCase { class Mock_Observer implements Observer { @@ -51,12 +45,6 @@ public class ObserverTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "update", - args = {java.util.Observable.class, java.lang.Object.class} - ) public void testUpdate() { TestObservable observable = new TestObservable(); Mock_Observer observer = null; diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/UUIDTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/UUIDTest.java index 3216bd9..e70cd78 100644 --- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/UUIDTest.java +++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/UUIDTest.java @@ -247,7 +247,7 @@ public class UUIDTest extends TestCase { } /** - * @tests serialization/deserialization. + * serialization/deserialization. */ public void testSerializationSelf() throws Exception { SerializationTest.verifySelf(new UUID(0xf81d4fae7dec11d0L, @@ -255,7 +255,7 @@ public class UUIDTest extends TestCase { } /** - * @tests serialization/deserialization compatibility with RI. + * serialization/deserialization compatibility with RI. */ public void testSerializationCompatibility() throws Exception { SerializationTest.verifyGolden(this, new UUID(0xf81d4fae7dec11d0L, @@ -357,7 +357,7 @@ public class UUIDTest extends TestCase { } /** - * @tests java.util.UUID#fromString(String) + * java.util.UUID#fromString(String) */ public void test_fromString_LString_Exception() { diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/UnknownFormatFlagsExceptionTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/UnknownFormatFlagsExceptionTest.java index 1073326..01e02be 100644 --- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/UnknownFormatFlagsExceptionTest.java +++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/UnknownFormatFlagsExceptionTest.java @@ -27,7 +27,7 @@ import org.apache.harmony.testframework.serialization.SerializationTest.Serializ public class UnknownFormatFlagsExceptionTest extends TestCase { /** - * @tests java.util.UnknownFormatFlagsException#UnknownFormatFlagsException(String) + * java.util.UnknownFormatFlagsException#UnknownFormatFlagsException(String) */ public void test_unknownFormatFlagsException() { @@ -40,7 +40,7 @@ public class UnknownFormatFlagsExceptionTest extends TestCase { } /** - * @tests java.util.UnknownFormatFlagsException#getFlags() + * java.util.UnknownFormatFlagsException#getFlags() */ public void test_getFlags() { String s = "MYTESTSTRING"; @@ -50,7 +50,7 @@ public class UnknownFormatFlagsExceptionTest extends TestCase { } /** - * @tests java.util.UnknownFormatFlagsException#getMessage() + * java.util.UnknownFormatFlagsException#getMessage() */ public void test_getMessage() { String s = "MYTESTSTRING"; @@ -75,7 +75,7 @@ public class UnknownFormatFlagsExceptionTest extends TestCase { }; /** - * @tests serialization/deserialization. + * serialization/deserialization. */ public void testSerializationSelf() throws Exception { @@ -84,7 +84,7 @@ public class UnknownFormatFlagsExceptionTest extends TestCase { } /** - * @tests serialization/deserialization compatibility with RI. + * serialization/deserialization compatibility with RI. */ public void testSerializationCompatibility() throws Exception { diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/VectorTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/VectorTest.java index e330310..cc075cd 100644 --- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/VectorTest.java +++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/VectorTest.java @@ -37,7 +37,7 @@ public class VectorTest extends junit.framework.TestCase { private String vString = "[Test 0, Test 1, Test 2, Test 3, Test 4, Test 5, Test 6, Test 7, Test 8, Test 9, Test 10, Test 11, Test 12, Test 13, Test 14, Test 15, Test 16, Test 17, Test 18, Test 19, Test 20, Test 21, Test 22, Test 23, Test 24, Test 25, Test 26, Test 27, Test 28, Test 29, Test 30, Test 31, Test 32, Test 33, Test 34, Test 35, Test 36, Test 37, Test 38, Test 39, Test 40, Test 41, Test 42, Test 43, Test 44, Test 45, Test 46, Test 47, Test 48, Test 49, Test 50, Test 51, Test 52, Test 53, Test 54, Test 55, Test 56, Test 57, Test 58, Test 59, Test 60, Test 61, Test 62, Test 63, Test 64, Test 65, Test 66, Test 67, Test 68, Test 69, Test 70, Test 71, Test 72, Test 73, Test 74, Test 75, Test 76, Test 77, Test 78, Test 79, Test 80, Test 81, Test 82, Test 83, Test 84, Test 85, Test 86, Test 87, Test 88, Test 89, Test 90, Test 91, Test 92, Test 93, Test 94, Test 95, Test 96, Test 97, Test 98, Test 99]"; /** - * @tests java.util.Vector#Vector() + * java.util.Vector#Vector() */ public void test_Constructor() { // Test for method java.util.Vector() @@ -58,7 +58,7 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#Vector(int) + * java.util.Vector#Vector(int) */ public void test_ConstructorI() { // Test for method java.util.Vector(int) @@ -69,7 +69,7 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#Vector(int, int) + * java.util.Vector#Vector(int, int) */ public void test_ConstructorII() { // Test for method java.util.Vector(int, int) @@ -106,7 +106,7 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#Vector(java.util.Collection) + * java.util.Vector#Vector(java.util.Collection) */ public void test_ConstructorLjava_util_Collection() { // Test for method java.util.Vector(java.util.Collection) @@ -122,7 +122,7 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#add(int, java.lang.Object) + * java.util.Vector#add(int, java.lang.Object) */ public void test_addILjava_lang_Object() { // Test for method void java.util.Vector.add(int, java.lang.Object) @@ -142,7 +142,7 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#add(java.lang.Object) + * java.util.Vector#add(java.lang.Object) */ public void test_addLjava_lang_Object() { // Test for method boolean java.util.Vector.add(java.lang.Object) @@ -157,7 +157,7 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#addAll(int, java.util.Collection) + * java.util.Vector#addAll(int, java.util.Collection) */ public void test_addAllILjava_util_Collection() { // Test for method boolean java.util.Vector.addAll(int, @@ -209,7 +209,7 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#addAll(java.util.Collection) + * java.util.Vector#addAll(java.util.Collection) */ public void test_addAllLjava_util_Collection() { // Test for method boolean java.util.Vector.addAll(java.util.Collection) @@ -247,7 +247,7 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#addElement(java.lang.Object) + * java.util.Vector#addElement(java.lang.Object) */ public void test_addElementLjava_lang_Object() { // Test for method void java.util.Vector.addElement(java.lang.Object) @@ -262,7 +262,7 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#addElement(java.lang.Object) + * java.util.Vector#addElement(java.lang.Object) */ public void test_addElementLjava_lang_Object_subtest0() { // Test for method void java.util.Vector.addElement(java.lang.Object) @@ -277,7 +277,7 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#capacity() + * java.util.Vector#capacity() */ public void test_capacity() { // Test for method int java.util.Vector.capacity() @@ -287,7 +287,7 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#clear() + * java.util.Vector#clear() */ public void test_clear() { // Test for method void java.util.Vector.clear() @@ -309,7 +309,7 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#clone() + * java.util.Vector#clone() */ public void test_clone() { // Test for method java.lang.Object java.util.Vector.clone() @@ -329,7 +329,7 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#contains(java.lang.Object) + * java.util.Vector#contains(java.lang.Object) */ public void test_containsLjava_lang_Object() { // Test for method boolean java.util.Vector.contains(java.lang.Object) @@ -345,7 +345,7 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#containsAll(java.util.Collection) + * java.util.Vector#containsAll(java.util.Collection) */ public void test_containsAllLjava_util_Collection() { // Test for method boolean @@ -369,7 +369,7 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#copyInto(java.lang.Object[]) + * java.util.Vector#copyInto(java.lang.Object[]) */ public void test_copyInto$Ljava_lang_Object() { // Test for method void java.util.Vector.copyInto(java.lang.Object []) @@ -383,7 +383,7 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#elementAt(int) + * java.util.Vector#elementAt(int) */ public void test_elementAtI() { // Test for method java.lang.Object java.util.Vector.elementAt(int) @@ -396,7 +396,7 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#elements() + * java.util.Vector#elements() */ public void test_elements() { // Test for method java.util.Enumeration java.util.Vector.elements() @@ -412,7 +412,7 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#elements() + * java.util.Vector#elements() */ public void test_elements_subtest0() { final int iterations = 10000; @@ -443,7 +443,7 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#ensureCapacity(int) + * java.util.Vector#ensureCapacity(int) */ public void test_ensureCapacityI() { // Test for method void java.util.Vector.ensureCapacity(int) @@ -484,7 +484,7 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#equals(java.lang.Object) + * java.util.Vector#equals(java.lang.Object) */ public void test_equalsLjava_lang_Object() { // Test for method boolean java.util.Vector.equals(java.lang.Object) @@ -505,7 +505,7 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#firstElement() + * java.util.Vector#firstElement() */ public void test_firstElement() { // Test for method java.lang.Object java.util.Vector.firstElement() @@ -525,7 +525,7 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#get(int) + * java.util.Vector#get(int) */ public void test_getI() { // Test for method java.lang.Object java.util.Vector.get(int) @@ -537,7 +537,7 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#hashCode() + * java.util.Vector#hashCode() */ public void test_hashCode() { // Test for method int java.util.Vector.hashCode() @@ -552,7 +552,7 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#indexOf(java.lang.Object) + * java.util.Vector#indexOf(java.lang.Object) */ public void test_indexOfLjava_lang_Object() { // Test for method int java.util.Vector.indexOf(java.lang.Object) @@ -566,7 +566,7 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#indexOf(java.lang.Object, int) + * java.util.Vector#indexOf(java.lang.Object, int) */ public void test_indexOfLjava_lang_ObjectI() { // Test for method int java.util.Vector.indexOf(java.lang.Object, int) @@ -600,7 +600,7 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#insertElementAt(java.lang.Object, int) + * java.util.Vector#insertElementAt(java.lang.Object, int) */ public void test_insertElementAtLjava_lang_ObjectI() { // Test for method void @@ -645,7 +645,7 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#isEmpty() + * java.util.Vector#isEmpty() */ public void test_isEmpty() { // Test for method boolean java.util.Vector.isEmpty()Vector @@ -656,7 +656,7 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#isEmpty() + * java.util.Vector#isEmpty() */ public void test_isEmpty_subtest0() { final Vector v = new Vector(); @@ -687,7 +687,7 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#lastElement() + * java.util.Vector#lastElement() */ public void test_lastElement() { // Test for method java.lang.Object java.util.Vector.lastElement() @@ -707,7 +707,7 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#lastIndexOf(java.lang.Object) + * java.util.Vector#lastIndexOf(java.lang.Object) */ public void test_lastIndexOfLjava_lang_Object() { // Test for method int java.util.Vector.lastIndexOf(java.lang.Object) @@ -723,7 +723,7 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#lastIndexOf(java.lang.Object, int) + * java.util.Vector#lastIndexOf(java.lang.Object, int) */ public void test_lastIndexOfLjava_lang_ObjectI() { // Test for method int java.util.Vector.lastIndexOf(java.lang.Object, @@ -767,7 +767,7 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#remove(int) + * java.util.Vector#remove(int) */ public void test_removeI() { // Test for method java.lang.Object java.util.Vector.remove(int) @@ -809,7 +809,7 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#remove(java.lang.Object) + * java.util.Vector#remove(java.lang.Object) */ public void test_removeLjava_lang_Object() { // Test for method boolean java.util.Vector.remove(java.lang.Object) @@ -826,7 +826,7 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#removeAll(java.util.Collection) + * java.util.Vector#removeAll(java.util.Collection) */ public void test_removeAllLjava_util_Collection() { // Test for method boolean @@ -858,7 +858,7 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#removeAllElements() + * java.util.Vector#removeAllElements() */ public void test_removeAllElements() { // Test for method void java.util.Vector.removeAllElements() @@ -868,7 +868,7 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#removeElement(java.lang.Object) + * java.util.Vector#removeElement(java.lang.Object) */ public void test_removeElementLjava_lang_Object() { // Test for method boolean @@ -886,7 +886,7 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#removeElementAt(int) + * java.util.Vector#removeElementAt(int) */ public void test_removeElementAtI() { // Test for method void java.util.Vector.removeElementAt(int) @@ -921,7 +921,7 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests {@link java.util.Vector#removeRange(int, int)} + * {@link java.util.Vector#removeRange(int, int)} */ public void test_removeRange() { MockVector myVector = new MockVector(); @@ -973,7 +973,7 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#retainAll(java.util.Collection) + * java.util.Vector#retainAll(java.util.Collection) */ public void test_retainAllLjava_util_Collection() { // Test for method boolean @@ -989,7 +989,7 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#set(int, java.lang.Object) + * java.util.Vector#set(int, java.lang.Object) */ public void test_setILjava_lang_Object() { // Test for method java.lang.Object java.util.Vector.set(int, @@ -1039,7 +1039,7 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#setElementAt(java.lang.Object, int) + * java.util.Vector#setElementAt(java.lang.Object, int) */ public void test_setElementAtLjava_lang_ObjectI() { // Test for method void java.util.Vector.setElementAt(java.lang.Object, @@ -1082,7 +1082,7 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#setSize(int) + * java.util.Vector#setSize(int) */ public void test_setSizeI() { // Test for method void java.util.Vector.setSize(int) @@ -1116,7 +1116,7 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#size() + * java.util.Vector#size() */ public void test_size() { // Test for method int java.util.Vector.size() @@ -1150,7 +1150,7 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#subList(int, int) + * java.util.Vector#subList(int, int) */ public void test_subListII() { // Test for method java.util.List java.util.Vector.subList(int, int) @@ -1166,7 +1166,7 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#toArray() + * java.util.Vector#toArray() */ public void test_toArray() { // Test for method java.lang.Object [] java.util.Vector.toArray() @@ -1175,7 +1175,7 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#toArray(java.lang.Object[]) + * java.util.Vector#toArray(java.lang.Object[]) */ public void test_toArray$Ljava_lang_Object() { // Test for method java.lang.Object [] @@ -1210,7 +1210,7 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#add(Object) + * java.util.Vector#add(Object) */ @SuppressWarnings("nls") public void test_add() { @@ -1223,7 +1223,7 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#toString() + * java.util.Vector#toString() */ public void test_toString() { // Ensure toString works with self-referencing elements. @@ -1264,7 +1264,7 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#trimToSize() + * java.util.Vector#trimToSize() */ public void test_trimToSize() { // Test for method void java.util.Vector.trimToSize() diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/WeakHashMapTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/WeakHashMapTest.java index 433adf2..c17e7a5 100644 --- a/luni/src/test/java/org/apache/harmony/luni/tests/java/util/WeakHashMapTest.java +++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/util/WeakHashMapTest.java @@ -49,7 +49,7 @@ public class WeakHashMapTest extends junit.framework.TestCase { Object[] VALUE_ARRAY; /** - * @tests java.util.WeakHashMap#WeakHashMap() + * java.util.WeakHashMap#WeakHashMap() */ public void test_Constructor() { // Test for method java.util.WeakHashMap() @@ -65,7 +65,7 @@ public class WeakHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.WeakHashMap#WeakHashMap(int) + * java.util.WeakHashMap#WeakHashMap(int) */ public void test_ConstructorI() { // Test for method java.util.WeakHashMap(int) @@ -83,7 +83,7 @@ public class WeakHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.WeakHashMap#WeakHashMap(int, float) + * java.util.WeakHashMap#WeakHashMap(int, float) */ public void test_ConstructorIF() { // Test for method java.util.WeakHashMap(int, float) @@ -101,7 +101,7 @@ public class WeakHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.WeakHashMap#WeakHashMap(java.util.Map) + * java.util.WeakHashMap#WeakHashMap(java.util.Map) */ public void test_ConstructorLjava_util_Map() { Map mockMap = new MockMap(); @@ -110,7 +110,7 @@ public class WeakHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.WeakHashMap#clear() + * java.util.WeakHashMap#clear() */ public void test_clear() { // Test for method boolean java.util.WeakHashMap.clear() @@ -126,7 +126,7 @@ public class WeakHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.WeakHashMap#containsKey(java.lang.Object) + * java.util.WeakHashMap#containsKey(java.lang.Object) */ public void test_containsKeyLjava_lang_Object() { // Test for method boolean java.util.WeakHashMap.containsKey() @@ -141,7 +141,7 @@ public class WeakHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.WeakHashMap#containsValue(java.lang.Object) + * java.util.WeakHashMap#containsValue(java.lang.Object) */ public void test_containsValueLjava_lang_Object() { // Test for method boolean java.util.WeakHashMap.containsValue() @@ -156,7 +156,7 @@ public class WeakHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.WeakHashMap#entrySet() + * java.util.WeakHashMap#entrySet() */ public void test_entrySet() { WeakHashMap<Object, Object> weakMap = new WeakHashMap<Object, Object>(); @@ -245,7 +245,7 @@ public class WeakHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.WeakHashMap#entrySet() + * java.util.WeakHashMap#entrySet() */ public void test_entrySet_2() { // Test for method java.util.Set java.util.WeakHashMap.entrySet() @@ -283,7 +283,7 @@ public class WeakHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.WeakHashMap#get(java.lang.Object) + * java.util.WeakHashMap#get(java.lang.Object) */ public void test_getLjava_lang_Object() { // Test for method java.lang.Object @@ -292,7 +292,7 @@ public class WeakHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.WeakHashMap#isEmpty() + * java.util.WeakHashMap#isEmpty() */ public void test_isEmpty() { // Test for method boolean java.util.WeakHashMap.isEmpty() @@ -306,7 +306,7 @@ public class WeakHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.WeakHashMap#put(java.lang.Object, java.lang.Object) + * java.util.WeakHashMap#put(java.lang.Object, java.lang.Object) */ public void test_putLjava_lang_ObjectLjava_lang_Object() { // Test for method java.lang.Object @@ -320,7 +320,7 @@ public class WeakHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.WeakHashMap#putAll(java.util.Map) + * java.util.WeakHashMap#putAll(java.util.Map) */ public void test_putAllLjava_util_Map() { Map mockMap=new MockMap(); @@ -330,7 +330,7 @@ public class WeakHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.WeakHashMap#remove(java.lang.Object) + * java.util.WeakHashMap#remove(java.lang.Object) */ public void test_removeLjava_lang_Object() { // Test for method java.lang.Object @@ -347,7 +347,7 @@ public class WeakHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.WeakHashMap#size() + * java.util.WeakHashMap#size() */ public void test_size() { // Test for method int java.util.WeakHashMap.size() @@ -355,7 +355,7 @@ public class WeakHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.WeakHashMap#keySet() + * java.util.WeakHashMap#keySet() */ public void test_keySet() { // Test for method java.util.Set java.util.WeakHashMap.keySet() @@ -392,7 +392,7 @@ public class WeakHashMapTest extends junit.framework.TestCase { /** * Regression test for HARMONY-3883 - * @tests java.util.WeakHashMap#keySet() + * java.util.WeakHashMap#keySet() */ public void test_keySet_hasNext() { WeakHashMap map = new WeakHashMap(); @@ -425,7 +425,7 @@ public class WeakHashMapTest extends junit.framework.TestCase { /** - * @tests java.util.WeakHashMap#values() + * java.util.WeakHashMap#values() */ public void test_values() { // Test for method java.util.Set java.util.WeakHashMap.values() diff --git a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/SelectorProviderTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/SelectorProviderTest.java index 138ac68..71edf82 100644 --- a/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/SelectorProviderTest.java +++ b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/SelectorProviderTest.java @@ -16,74 +16,19 @@ package org.apache.harmony.nio.tests.java.nio.channels.spi; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import java.nio.channels.spi.SelectorProvider; import junit.framework.TestCase; -@TestTargetClass(SelectorProvider.class) + public class SelectorProviderTest extends TestCase { /** - * @tests SelectorProvider#openDatagramChannel() - * @tests SelectorProvider#openPipe() - * @tests SelectorProvider#openServerSocketChannel() - * @tests SelectorProvider#openSocketChannel() - * @tests SelectorProvider#openSelector() + * SelectorProvider#openDatagramChannel() + * SelectorProvider#openPipe() + * SelectorProvider#openServerSocketChannel() + * SelectorProvider#openSocketChannel() + * SelectorProvider#openSelector() */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "SelectorProvider", - args = {} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "provider", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "inheritedChannel", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "openDatagramChannel", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "openPipe", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "openServerSocketChannel", - args = {} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "openSocketChannel", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "openSelector", - args = {} - ) - }) public void test_open_methods() throws Exception { // calling #provider to see if it returns without Exception. assertNotNull(SelectorProvider.provider()); @@ -97,4 +42,4 @@ public class SelectorProviderTest extends TestCase { assertNotNull(SelectorProvider.provider().openSocketChannel()); assertNotNull(SelectorProvider.provider().openSelector()); } -}
\ No newline at end of file +} diff --git a/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/Matcher2Test.java b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/Matcher2Test.java index 47e3500..0a64dce 100644 --- a/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/Matcher2Test.java +++ b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/Matcher2Test.java @@ -16,11 +16,6 @@ package org.apache.harmony.regex.tests.java.util.regex; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestLevel; - import junit.framework.TestCase; import java.util.regex.*; @@ -28,65 +23,14 @@ import java.util.regex.*; * Tests Matcher methods * */ -@TestTargetClass(java.util.regex.Matcher.class) public class Matcher2Test extends TestCase { - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies the basic functionality of toString() method.", - method = "toString", - args = {} - ) public void test_toString() { Pattern p = Pattern.compile("foo"); Matcher m = p.matcher("bar"); assertNotNull(m.toString()); } - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies start, end, group, usePattern methods with wrong conditions, IllegalStateException should be thrown", - method = "start", - args = {} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies start, end, group, usePattern methods with wrong conditions, IllegalStateException should be thrown", - method = "end", - args = {} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies start, end, group, usePattern methods with wrong conditions, IllegalStateException should be thrown", - method = "group", - args = {} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies start, end, group, usePattern methods with wrong conditions, IllegalStateException should be thrown", - method = "start", - args = {int.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies start, end, group, usePattern methods with wrong conditions, IllegalStateException should be thrown", - method = "end", - args = {int.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies start, end, group, usePattern methods with wrong conditions, IllegalStateException should be thrown", - method = "group", - args = {int.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies start, end, group, usePattern methods with wrong conditions, IllegalStateException should be thrown", - method = "usePattern", - args = {java.util.regex.Pattern.class} - ) - }) public void testErrorConditions() throws PatternSyntaxException { // Test match cursors in absence of a match Pattern p = Pattern.compile("foo"); @@ -138,38 +82,6 @@ public class Matcher2Test extends TestCase { } } - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies end, start, group methods with wrong conditions, IndexOutOfBoundsException, IllegalStateException should be thrown", - method = "start", - args = {} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies end, start, group methods with wrong conditions, IndexOutOfBoundsException, IllegalStateException should be thrown", - method = "end", - args = {} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies end, start, group methods with wrong conditions, IndexOutOfBoundsException, IllegalStateException should be thrown", - method = "start", - args = {int.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies end, start, group methods with wrong conditions, IndexOutOfBoundsException, IllegalStateException should be thrown", - method = "end", - args = {int.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies end, start, group methods with wrong conditions, IndexOutOfBoundsException, IllegalStateException should be thrown", - method = "group", - args = {int.class} - ) - }) public void testErrorConditions2() throws PatternSyntaxException { // Test match cursors in absence of a match Pattern p = Pattern.compile("(foo[0-9])(bar[a-z])"); @@ -305,12 +217,6 @@ public class Matcher2Test extends TestCase { /* * Regression test for HARMONY-997 */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that IndexOutOfBoundsException exception is thrown while calling of replaceAll method with incorrect string.", - method = "replaceAll", - args = {java.lang.String.class} - ) public void testReplacementBackSlash() { String str = "replace me"; String replacedString = "me"; diff --git a/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/ModeTest.java b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/ModeTest.java index a24e46c..569d3e6 100644 --- a/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/ModeTest.java +++ b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/ModeTest.java @@ -16,11 +16,6 @@ package org.apache.harmony.regex.tests.java.util.regex; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestLevel; - import junit.framework.TestCase; import java.util.regex.Pattern; import java.util.regex.Matcher; @@ -30,23 +25,8 @@ import java.util.regex.PatternSyntaxException; * Tests Pattern compilation modes and modes triggered in pattern strings * */ -@TestTargetClass(Pattern.class) public class ModeTest extends TestCase { - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "The test verifies compile(String regex) and compile(String regex, int flags) methods with Pattern.CASE_INSENSITIVE mode.", - method = "compile", - args = {java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "The test verifies compile(String regex) and compile(String regex, int flags) methods with Pattern.CASE_INSENSITIVE mode.", - method = "compile", - args = {java.lang.String.class, int.class} - ) - }) public void testCase() throws PatternSyntaxException { Pattern p; Matcher m; @@ -75,20 +55,6 @@ public class ModeTest extends TestCase { assertEquals("doG", m.group(1)); assertFalse(m.find()); } - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "The test verifies compile(String regex) and compile(String regex, int flags) methods with Pattern.MULTILINE mode.", - method = "compile", - args = {java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "The test verifies compile(String regex) and compile(String regex, int flags) methods with Pattern.MULTILINE mode.", - method = "compile", - args = {java.lang.String.class, int.class} - ) - }) public void testMultiline() throws PatternSyntaxException { Pattern p; Matcher m; diff --git a/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/Pattern2Test.java b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/Pattern2Test.java index 48d918f..064a9c6 100644 --- a/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/Pattern2Test.java +++ b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/Pattern2Test.java @@ -16,30 +16,18 @@ package org.apache.harmony.regex.tests.java.util.regex; -import dalvik.annotation.BrokenTest; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestLevel; - import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; import junit.framework.TestCase; -@TestTargetClass(Pattern.class) + /** * Tests simple Pattern compilation and Matcher methods * */ public class Pattern2Test extends TestCase { - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies matches(String regex, CharSequence input) method.", - method = "matches", - args = {java.lang.String.class, java.lang.CharSequence.class} - ) public void testSimpleMatch() throws PatternSyntaxException { Pattern p = Pattern.compile("foo.*"); @@ -60,20 +48,6 @@ public class Pattern2Test extends TestCase { assertTrue(Pattern.matches("", "")); } - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies compile(String regex) method and matcher for created pattern.", - method = "compile", - args = {java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies compile(String regex) method and matcher for created pattern.", - method = "matcher", - args = {java.lang.CharSequence.class} - ) - }) public void testCursors() { Pattern p; Matcher m; @@ -128,20 +102,6 @@ public class Pattern2Test extends TestCase { fail(); } } - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies compile(String regex) method and matcher for created pattern.", - method = "compile", - args = {java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies compile(String regex) method and matcher for created pattern.", - method = "matcher", - args = {java.lang.CharSequence.class} - ) - }) public void testGroups() throws PatternSyntaxException { Pattern p; Matcher m; @@ -195,20 +155,6 @@ public class Pattern2Test extends TestCase { assertFalse(m.find()); } - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies compile(String regex) method and matcher for created pattern.", - method = "compile", - args = {java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies compile(String regex) method and matcher for created pattern.", - method = "matcher", - args = {java.lang.CharSequence.class} - ) - }) public void testReplace() throws PatternSyntaxException { Pattern p; Matcher m; @@ -256,20 +202,6 @@ public class Pattern2Test extends TestCase { "I want <b> cheese </b>. <b> Please </b>.")); } - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies compile(String regex) method and matcher for created pattern.", - method = "compile", - args = {java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies compile(String regex) method and matcher for created pattern.", - method = "matcher", - args = {java.lang.CharSequence.class} - ) - }) public void testEscapes() throws PatternSyntaxException { Pattern p; Matcher m; @@ -466,20 +398,6 @@ public class Pattern2Test extends TestCase { // } catch (PatternSyntaxException e) { // } } - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies patterns with different ranges of characters.", - method = "compile", - args = {java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies patterns with different ranges of characters.", - method = "matcher", - args = {CharSequence.class} - ) - }) public void testCharacterClasses() throws PatternSyntaxException { Pattern p; Matcher m; @@ -746,20 +664,6 @@ public class Pattern2Test extends TestCase { // Test x|y pattern // TODO } - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies compile(String regex) method and matcher for patterns with POSIX characters.", - method = "compile", - args = {java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies compile(String regex) method and matcher for patterns with POSIX characters.", - method = "matcher", - args = {java.lang.CharSequence.class} - ) - }) public void testPOSIXGroups() throws PatternSyntaxException { Pattern p; Matcher m; @@ -902,12 +806,6 @@ public class Pattern2Test extends TestCase { // Test \p{Cntrl} // TODO } - @TestTargetNew( - level = TestLevel.ADDITIONAL, - notes = "", - method = "!", - args = {} - ) public void testUnicodeCategories() throws PatternSyntaxException { // Test Unicode categories using \p and \P // One letter codes: L, M, N, P, S, Z, C @@ -1008,12 +906,6 @@ public class Pattern2Test extends TestCase { } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies matcher(CharSequence input) method for input specified by Unicode blocks.", - method = "matcher", - args = {java.lang.CharSequence.class} - ) public void testUnicodeBlocks() throws PatternSyntaxException { Pattern p; Matcher m; @@ -1083,12 +975,6 @@ public class Pattern2Test extends TestCase { // END android-changed } } - @TestTargetNew( - level = TestLevel.ADDITIONAL, - notes = "these tests are still partial, see TODO in the code", - method = "!", - args = {} - ) public void testCapturingGroups() throws PatternSyntaxException { Pattern p; Matcher m; @@ -1142,12 +1028,6 @@ public class Pattern2Test extends TestCase { } } - @TestTargetNew( - level = TestLevel.ADDITIONAL, - notes = "", - method = "!", - args = {} - ) public void testRepeats() { Pattern p; Matcher m; @@ -1216,12 +1096,6 @@ public class Pattern2Test extends TestCase { // Test {<n1>,<n2>}, with n1 < n2, n1 = n2 and n1 > n2 (illegal?) // TODO } - @TestTargetNew( - level = TestLevel.ADDITIONAL, - notes = "", - method = "!", - args = {} - ) public void testAnchors() throws PatternSyntaxException { Pattern p; Matcher m; @@ -1268,20 +1142,6 @@ public class Pattern2Test extends TestCase { // Test negative lookbehind using (?<!...) // TODO } - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies compile(String regex) method and matcher for created pattern.", - method = "compile", - args = {java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies compile(String regex) method and matcher for created pattern.", - method = "matcher", - args = {java.lang.CharSequence.class} - ) - }) public void testMisc() throws PatternSyntaxException { Pattern p; Matcher m; @@ -1341,24 +1201,12 @@ public class Pattern2Test extends TestCase { // Test #<comment text> // TODO } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies compile(String regex) method.", - method = "compile", - args = {java.lang.String.class} - ) public void testCompile1() throws PatternSyntaxException { Pattern pattern = Pattern .compile("[0-9A-Za-z][0-9A-Za-z\\x2e\\x3a\\x2d\\x5f]*"); String name = "iso-8859-1"; assertTrue(pattern.matcher(name).matches()); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies compile(String regex, int flag) method.", - method = "compile", - args = {java.lang.String.class, int.class} - ) public void testCompile2() throws PatternSyntaxException { String findString = "\\Qimport\\E"; @@ -1368,20 +1216,6 @@ public class Pattern2Test extends TestCase { assertTrue(matcher.find(0)); } - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies compile(String regex) and compile(String regex, int flag) method for specific patterns.", - method = "compile", - args = {java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies compile(String regex) and compile(String regex, int flag) method for specific patterns.", - method = "compile", - args = {java.lang.String.class, int.class} - ) - }) public void testCompile3() throws PatternSyntaxException { Pattern p; Matcher m; @@ -1463,12 +1297,6 @@ public class Pattern2Test extends TestCase { assertTrue(m.group().equals("")); assertFalse(m.find()); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies compile(String regex, int flag) method for specific string.", - method = "compile", - args = {java.lang.String.class, int.class} - ) public void testCompile4() throws PatternSyntaxException { String findString = "\\Qpublic\\E"; StringBuffer text = new StringBuffer(" public class Class {\n" @@ -1490,12 +1318,6 @@ public class Pattern2Test extends TestCase { found = matcher.find(); assertFalse(found); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies compile(String regex) methodfor specific string.", - method = "compile", - args = {java.lang.String.class} - ) public void testCompile5() throws PatternSyntaxException { Pattern p = Pattern.compile("^[0-9]"); String s[] = p.split("12", -1); @@ -1752,4 +1574,4 @@ public class Pattern2Test extends TestCase { new UBInfo(0xFFF0, 0xFFFF, "Specials") // Character.UnicodeBlock.SPECIALS // END android-changed }; -}
\ No newline at end of file +} diff --git a/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/PatternErrorTest.java b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/PatternErrorTest.java index a63f0de..fd2c3ae 100644 --- a/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/PatternErrorTest.java +++ b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/PatternErrorTest.java @@ -16,34 +16,14 @@ package org.apache.harmony.regex.tests.java.util.regex; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestLevel; - import java.util.regex.Pattern; import junit.framework.TestCase; -@TestTargetClass(Pattern.class) /** * Test boundary and error conditions in java.util.regex.Pattern * */ public class PatternErrorTest extends TestCase { - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies compile(String regex) and compile(String regex, int flag) method with invalid parameters. Doesn't verify IllegalArgumentException, PatternSyntaxException.", - method = "compile", - args = {java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies compile(String regex) and compile(String regex, int flag) method with invalid parameters. Doesn't verify IllegalArgumentException, PatternSyntaxException.", - method = "compile", - args = {java.lang.String.class, int.class} - ) - }) public void testCompileErrors() throws Exception { // null regex string - should get NullPointerException try { diff --git a/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/PatternSyntaxExceptionTest.java b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/PatternSyntaxExceptionTest.java index 6ccea3a..d2d3596 100644 --- a/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/PatternSyntaxExceptionTest.java +++ b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/PatternSyntaxExceptionTest.java @@ -19,46 +19,9 @@ package org.apache.harmony.regex.tests.java.util.regex; import java.util.regex.PatternSyntaxException; import junit.framework.TestCase; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; -@TestTargetClass(PatternSyntaxException.class) public class PatternSyntaxExceptionTest extends TestCase { - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "PatternSyntaxException", - args = {java.lang.String.class, java.lang.String.class, int.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getDescription", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPattern", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getIndex", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getMessage", - args = {} - ) - }) public void testPatternSyntaxException() { // Normal case PatternSyntaxException e = new PatternSyntaxException("Foo", "Bar", 0); diff --git a/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/ReplaceTest.java b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/ReplaceTest.java index 4ecb336..e609bb2 100644 --- a/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/ReplaceTest.java +++ b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/ReplaceTest.java @@ -16,32 +16,12 @@ package org.apache.harmony.regex.tests.java.util.regex; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestLevel; - import junit.framework.TestCase; import java.util.regex.Pattern; import java.util.regex.Matcher; import java.util.regex.PatternSyntaxException; -@TestTargetClass(Matcher.class) public class ReplaceTest extends TestCase { - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies the basic functionality of replaceFirst(java.lang.String) & replaceAll(java.lang.String) methods.", - method = "replaceFirst", - args = {java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies the basic functionality of replaceFirst(java.lang.String) & replaceAll(java.lang.String) methods.", - method = "replaceAll", - args = {java.lang.String.class} - ) - }) public void testSimpleReplace() throws PatternSyntaxException { String target, pattern, repl; @@ -56,20 +36,6 @@ public class ReplaceTest extends TestCase { assertEquals("foobarxxxarfooxxxbarxxxt", m.replaceAll(repl)); } - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies the functionality of replaceFirst(java.lang.String) & replaceAll(java.lang.String) methods.", - method = "replaceFirst", - args = {java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies the functionality of replaceFirst(java.lang.String) & replaceAll(java.lang.String) methods.", - method = "replaceAll", - args = {java.lang.String.class} - ) - }) public void testCaptureReplace() { String target, pattern, repl, s; Pattern p = null; @@ -101,12 +67,6 @@ public class ReplaceTest extends TestCase { ); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies the functionality of replaceAll(java.lang.String) method with backslash chars.", - method = "replaceAll", - args = {java.lang.String.class} - ) public void testEscapeReplace() { String target, pattern, repl, s; diff --git a/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/SplitTest.java b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/SplitTest.java index 952da05..16ca126 100644 --- a/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/SplitTest.java +++ b/luni/src/test/java/org/apache/harmony/regex/tests/java/util/regex/SplitTest.java @@ -1,33 +1,13 @@ package org.apache.harmony.regex.tests.java.util.regex; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestLevel; - import junit.framework.TestCase; import java.util.regex.*; -@TestTargetClass(java.util.regex.Pattern.class) /** * TODO Type description * */ public class SplitTest extends TestCase { - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies the basic functionality of split(java.lang.CharSequence) & compile(java.lang.String)methods.", - method = "split", - args = {java.lang.CharSequence.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies the basic functionality of split(java.lang.CharSequence) & compile(java.lang.String)methods.", - method = "compile", - args = {java.lang.String.class} - ) - }) public void testSimple() { Pattern p = Pattern.compile("/"); String[] results = p.split("have/you/done/it/right"); @@ -35,14 +15,6 @@ public class SplitTest extends TestCase { assertArraysEqual(expected, results); } - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies the basic functionality of split with empty matches.", - method = "split", - args = {java.lang.CharSequence.class} - ) - }) public void testEmptySplits() { // Trailing empty matches are removed. assertArraysEqual(new String[0], "hello".split(".")); @@ -88,12 +60,6 @@ public class SplitTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies the functionality of split(java.lang.CharSequence). Test uses not empty pattern.", - method = "split", - args = {java.lang.CharSequence.class, int.class} - ) public void testSplit1() throws PatternSyntaxException { Pattern p = Pattern.compile(" "); @@ -185,12 +151,6 @@ public class SplitTest extends TestCase { assertEquals("dle z", tokens[2]); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies the functionality of split(java.lang.CharSequence). Test uses empty pattern.", - method = "split", - args = {java.lang.CharSequence.class, int.class} - ) public void testSplit2() { Pattern p = Pattern.compile(""); String s[]; @@ -218,20 +178,6 @@ public class SplitTest extends TestCase { } - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies the functionality of split(java.lang.CharSequence) & compile(java.lang.String, int) methods. Test uses empty pattern and supplementary chars.", - method = "split", - args = {java.lang.CharSequence.class, int.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies the functionality of split(java.lang.CharSequence) & compile(java.lang.String, int) methods. Test uses empty pattern and supplementary chars.", - method = "compile", - args = {java.lang.String.class} - ) - }) public void testSplitSupplementaryWithEmptyString() { /* diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/AccessControlException2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AccessControlException2Test.java index 238d87d..d118d4e 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/AccessControlException2Test.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AccessControlException2Test.java @@ -17,15 +17,9 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import java.io.FilePermission; import java.security.AccessControlException; -@TestTargetClass(AccessControlException.class) public class AccessControlException2Test extends junit.framework.TestCase { FilePermission filePermission; @@ -34,14 +28,8 @@ public class AccessControlException2Test extends junit.framework.TestCase { AccessControlException acException1; /** - * @tests java.security.AccessControlException#AccessControlException(java.lang.String) + * java.security.AccessControlException#AccessControlException(java.lang.String) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "AccessControlException", - args = {java.lang.String.class} - ) public void test_ConstructorLjava_lang_String() { // Test for method // java.security.AccessControlException(java.lang.String) @@ -52,15 +40,9 @@ public class AccessControlException2Test extends junit.framework.TestCase { } /** - * @tests java.security.AccessControlException#AccessControlException(java.lang.String, + * java.security.AccessControlException#AccessControlException(java.lang.String, * java.security.Permission) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "AccessControlException", - args = {java.lang.String.class, java.security.Permission.class} - ) public void test_ConstructorLjava_lang_StringLjava_security_Permission() { // Test for method // java.security.AccessControlException(java.lang.String, @@ -73,14 +55,8 @@ public class AccessControlException2Test extends junit.framework.TestCase { } /** - * @tests java.security.AccessControlException#getPermission() + * java.security.AccessControlException#getPermission() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPermission", - args = {} - ) public void test_getPermission() { // Test for method java.security.Permission // java.security.AccessControlException.getPermission() @@ -103,4 +79,4 @@ public class AccessControlException2Test extends junit.framework.TestCase { acException1 = new AccessControlException("test message", filePermission); } -}
\ No newline at end of file +} diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/AccessControlExceptionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AccessControlExceptionTest.java index fb71bed..35f2b25 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/AccessControlExceptionTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AccessControlExceptionTest.java @@ -22,11 +22,6 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.AccessControlException; import java.security.AllPermission; import java.security.Permission; @@ -37,18 +32,11 @@ import junit.framework.TestCase; /** * Unit test for AccessControlException. */ -@TestTargetClass(AccessControlException.class) public class AccessControlExceptionTest extends TestCase { /** * Tests AccessControlException(String) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "AccessControlException", - args = {java.lang.String.class} - ) public void testAccessControlExceptionString() { new AccessControlException(null); new AccessControlException("Failure"); @@ -57,12 +45,6 @@ public class AccessControlExceptionTest extends TestCase { /** * Tests AccessControlException(String, Permission) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "AccessControlException", - args = {java.lang.String.class, java.security.Permission.class} - ) public void testAccessControlExceptionStringPermission() { Permission perm = new AllPermission(); AccessControlException controlException = new AccessControlException("001", perm); @@ -74,12 +56,6 @@ public class AccessControlExceptionTest extends TestCase { * * Tests AccessControlException.getPermission() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPermission", - args = {} - ) public void testGetPermission() { Permission perm = new UnresolvedPermission("unresolvedType", "unresolvedName", "unresolvedActions", null); diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/AccessController2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AccessController2Test.java index 235441a..be2903b 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/AccessController2Test.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AccessController2Test.java @@ -27,11 +27,7 @@ import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; import dalvik.annotation.KnownFailure; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -@TestTargetClass(AccessController.class) public class AccessController2Test extends junit.framework.TestCase { PrivilegedAction<Boolean> privAction = new PrivilegedAction<Boolean>() { @@ -58,14 +54,9 @@ public class AccessController2Test extends junit.framework.TestCase { }; /** - * @tests java.security.AccessController#doPrivileged(java.security.PrivilegedAction, + * java.security.AccessController#doPrivileged(java.security.PrivilegedAction, * java.security.AccessControlContext)) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "doPrivileged", - args = {java.security.PrivilegedAction.class, java.security.AccessControlContext.class} - ) @KnownFailure("Fails (probably) because no protection domain is set.") public void test_doPrivilegedLjava_security_PrivilegedActionLjava_security_AccessControlContext() { Boolean pass; @@ -90,13 +81,8 @@ public class AccessController2Test extends junit.framework.TestCase { } /** - * @tests java.security.AccessController#doPrivileged(java.security.PrivilegedAction)) + * java.security.AccessController#doPrivileged(java.security.PrivilegedAction)) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - method = "doPrivileged", - args = {java.security.PrivilegedAction.class} - ) @KnownFailure("Fails (probably) because no protection domain is set.") public void test_doPrivilegedLjava_security_PrivilegedAction() { Boolean pass; @@ -114,14 +100,9 @@ public class AccessController2Test extends junit.framework.TestCase { } /** - * @tests java.security.AccessController#doPrivileged(java.security.PrivilegedExceptionAction, + * java.security.AccessController#doPrivileged(java.security.PrivilegedExceptionAction, * java.security.AccessControlContext)) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "doPrivileged", - args = {java.security.PrivilegedExceptionAction.class, java.security.AccessControlContext.class} - ) @KnownFailure("Fails (probably) because no protection domain is set.") public void test_doPrivilegedLjava_security_PrivilegedExceptionActionLjava_security_AccessControlContext() { Boolean pass; @@ -159,13 +140,8 @@ public class AccessController2Test extends junit.framework.TestCase { } /** - * @tests java.security.AccessController#doPrivileged(java.security.PrivilegedExceptionAction)) + * java.security.AccessController#doPrivileged(java.security.PrivilegedExceptionAction)) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "doPrivileged", - args = {java.security.PrivilegedExceptionAction.class} - ) @KnownFailure("Fails (probably) because no protection domain is set.") public void test_doPrivilegedLjava_security_PrivilegedExceptionAction() { Boolean pass; @@ -190,14 +166,8 @@ public class AccessController2Test extends junit.framework.TestCase { } /** - * @tests java.security.AccessController#checkPermission(Permission perm) + * java.security.AccessController#checkPermission(Permission perm) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "checkPermission", - args = {java.security.Permission.class} - ) public void test_checkPermission_NullParameter() { //Null parameter try { @@ -209,14 +179,8 @@ public class AccessController2Test extends junit.framework.TestCase { } /** - * @tests java.security.AccessController#checkPermission(Permission perm) + * java.security.AccessController#checkPermission(Permission perm) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "checkPermission", - args = {java.security.Permission.class} - ) @KnownFailure("Fails (probably) because no protection domain is set.") public void test_checkPermission_InvalidPermission() { String[] perm_invalid = {null, "1", "", "invalid", "bla-bla", "testCtor123^%$#&^ &^$"}; @@ -246,14 +210,8 @@ public class AccessController2Test extends junit.framework.TestCase { } /** - * @tests java.security.AccessController#getContext() + * java.security.AccessController#getContext() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getContext", - args = {} - ) public void test_getContext() { try { AccessControlContext acc = AccessController.getContext(); @@ -289,4 +247,4 @@ public class AccessController2Test extends junit.framework.TestCase { return false; } } -}
\ No newline at end of file +} diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParameterGenerator1Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParameterGenerator1Test.java index 856262d..82ae58e 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParameterGenerator1Test.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParameterGenerator1Test.java @@ -22,11 +22,6 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.AlgorithmParameterGenerator; import java.security.AlgorithmParameterGeneratorSpi; import java.security.AlgorithmParameters; @@ -41,13 +36,12 @@ import org.apache.harmony.security.tests.support.MyAlgorithmParameterGeneratorSp import org.apache.harmony.security.tests.support.SpiEngUtils; import junit.framework.TestCase; -@TestTargetClass(AlgorithmParameterGenerator.class) + /** * Tests for <code>AlgorithmParameterGenerator</code> class constructors and * methods. * */ - public class AlgorithmParameterGenerator1Test extends TestCase { private static String[] invalidValues = SpiEngUtils.invalidValues; @@ -98,12 +92,6 @@ public class AlgorithmParameterGenerator1Test extends TestCase { * throws NoSuchAlgorithmException must be thrown if algorithm is not available * */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class} - ) public void testAlgorithmParameterGenerator01() throws NoSuchAlgorithmException { try { @@ -126,12 +114,6 @@ public class AlgorithmParameterGenerator1Test extends TestCase { * Assertion: returns AlgorithmParameterGenerator instance * when algorithm is DSA */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class} - ) public void testAlgorithmParameterGenerator02() throws NoSuchAlgorithmException { if (!DSASupported) { @@ -151,12 +133,6 @@ public class AlgorithmParameterGenerator1Test extends TestCase { * Assertion: * throws IllegalArgumentException if provider is null or empty */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void testAlgorithmParameterGenerator03() throws NoSuchAlgorithmException, NoSuchProviderException { if (!DSASupported) { @@ -184,12 +160,6 @@ public class AlgorithmParameterGenerator1Test extends TestCase { * Assertion: throws NoSuchProviderException if provider is not * available */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void testAlgorithmParameterGenerator04() throws NoSuchAlgorithmException { if (!DSASupported) { @@ -216,12 +186,6 @@ public class AlgorithmParameterGenerator1Test extends TestCase { * throws NullPointerException must be thrown is null * throws NoSuchAlgorithmException must be thrown if algorithm is not available */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void testAlgorithmParameterGenerator05() throws NoSuchProviderException { if (!DSASupported) { @@ -250,12 +214,6 @@ public class AlgorithmParameterGenerator1Test extends TestCase { * method * Assertion: return AlgorithmParameterGenerator */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void testAlgorithmParameterGenerator06() throws NoSuchAlgorithmException, NoSuchProviderException { if (!DSASupported) { @@ -277,12 +235,6 @@ public class AlgorithmParameterGenerator1Test extends TestCase { * method * Assertion: throws IllegalArgumentException when provider is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.security.Provider.class} - ) public void testAlgorithmParameterGenerator07() throws NoSuchAlgorithmException { if (!DSASupported) { @@ -306,12 +258,6 @@ public class AlgorithmParameterGenerator1Test extends TestCase { * throws NullPointerException must be thrown is null * throws NoSuchAlgorithmException must be thrown if algorithm is not available */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.security.Provider.class} - ) public void testAlgorithmParameterGenerator08() { if (!DSASupported) { fail(validAlgName + " algorithm is not supported"); @@ -339,12 +285,6 @@ public class AlgorithmParameterGenerator1Test extends TestCase { * method * Assertion: returns AlgorithmParameterGenerator object */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.security.Provider.class} - ) public void testAlgorithmParameterGenerator09() throws NoSuchAlgorithmException { if (!DSASupported) { @@ -364,12 +304,6 @@ public class AlgorithmParameterGenerator1Test extends TestCase { * Test for <code>generateParameters()</code> method * Assertion: returns AlgorithmParameters object */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "generateParameters", - args = {} - ) public void testAlgorithmParameterGenerator10() throws NoSuchAlgorithmException { if (!DSASupported) { @@ -390,24 +324,6 @@ public class AlgorithmParameterGenerator1Test extends TestCase { * methods * Assertion: throws InvalidAlgorithmParameterException when param is null */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Only invalid argument cases are verified. This is " + - "sufficient since the effects of calling init with valid " + - "parameters can not be observed.", - method = "init", - args = {java.security.spec.AlgorithmParameterSpec.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Only invalid argument cases are verified. This is " + - "sufficient since the effects of calling init with valid " + - "parameters can not be observed.", - method = "init", - args = {java.security.spec.AlgorithmParameterSpec.class, java.security.SecureRandom.class} - ) - }) public void testAlgorithmParameterGenerator12() { if (!DSASupported) { fail(validAlgName + " algorithm is not supported"); @@ -439,20 +355,6 @@ public class AlgorithmParameterGenerator1Test extends TestCase { * Test for <code>AlgorithmParameterGenerator</code> constructor * Assertion: returns AlgorithmParameterGenerator object */ - @TestTargets ({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Validity of arguments is not checked in the constructor; " + - "this is done during init.", - method = "AlgorithmParameterGenerator", - args = {java.security.AlgorithmParameterGeneratorSpi.class, java.security.Provider.class, java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - method = "init", - args = {int.class, SecureRandom.class} - ) - }) public void testConstructor() throws NoSuchAlgorithmException { if (!DSASupported) { fail(validAlgName + " algorithm is not supported"); diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParameterGenerator2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParameterGenerator2Test.java index 5ca1ee3..5eb5efc 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParameterGenerator2Test.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParameterGenerator2Test.java @@ -22,11 +22,6 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.AlgorithmParameterGenerator; import java.security.AlgorithmParameters; import java.security.InvalidAlgorithmParameterException; @@ -40,12 +35,11 @@ import java.security.spec.AlgorithmParameterSpec; import org.apache.harmony.security.tests.support.SpiEngUtils; import junit.framework.TestCase; -@TestTargetClass(AlgorithmParameterGenerator.class) + /** * Tests for <code>AlgorithmParameterGenerator</code> class constructors and * methods. */ - public class AlgorithmParameterGenerator2Test extends TestCase { private static final String AlgorithmParameterGeneratorProviderClass = "org.apache.harmony.security.tests.support.MyAlgorithmParameterGeneratorSpi"; @@ -120,12 +114,6 @@ public class AlgorithmParameterGenerator2Test extends TestCase { * throws NoSuchAlgorithmException must be thrown if algorithm is not available * returns AlgorithmParameterGenerator object */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class} - ) public void testGetInstance01() throws NoSuchAlgorithmException, InvalidAlgorithmParameterException { try { @@ -162,12 +150,6 @@ public class AlgorithmParameterGenerator2Test extends TestCase { * throws NoSuchProviderException when provider is available; * returns AlgorithmParameterGenerator object */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void testGetInstance02() throws NoSuchAlgorithmException, NoSuchProviderException, IllegalArgumentException, InvalidAlgorithmParameterException { @@ -228,12 +210,6 @@ public class AlgorithmParameterGenerator2Test extends TestCase { * throws IllegalArgumentException when provider is null; * returns AlgorithmParameterGenerator object */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.security.Provider.class} - ) public void testGetInstance03() throws NoSuchAlgorithmException, IllegalArgumentException, InvalidAlgorithmParameterException { diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParametersSpiTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParametersSpiTest.java index d1bfc3f..2e9a941 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParametersSpiTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParametersSpiTest.java @@ -17,11 +17,6 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.AlgorithmParametersSpi; import java.security.spec.AlgorithmParameterSpec; @@ -32,7 +27,6 @@ import junit.framework.TestCase; * and methods. * */ -@TestTargetClass(AlgorithmParametersSpi.class) public class AlgorithmParametersSpiTest extends TestCase { @@ -40,56 +34,6 @@ public class AlgorithmParametersSpiTest extends TestCase { * Test for <code>AlgorithmParametersSpi</code> constructor * Assertion: constructs AlgorithmParametersSpi */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "AlgorithmParametersSpi", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineGetEncoded", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineGetEncoded", - args = {java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineGetParameterSpec", - args = {java.lang.Class.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineInit", - args = {java.security.spec.AlgorithmParameterSpec.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineInit", - args = {byte[].class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineInit", - args = {byte[].class, java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineToString", - args = {} - ) - }) public void testAlgorithmParametersSpi() { byte[] bt = new byte[10]; MyAlgorithmParametersSpi algParSpi = new MyAlgorithmParametersSpi(); diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParametersTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParametersTest.java index b7ff35a..2315492 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParametersTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AlgorithmParametersTest.java @@ -22,11 +22,6 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.io.IOException; import java.math.BigInteger; import java.security.AlgorithmParameters; @@ -43,7 +38,7 @@ import java.security.NoSuchProviderException; import junit.framework.TestCase; import org.apache.harmony.security.tests.support.MyAlgorithmParameterGeneratorSpi; -@TestTargetClass(AlgorithmParameters.class) + /** * Tests for <code>AlgorithmParameters</code> class constructors and * methods. @@ -74,14 +69,8 @@ public class AlgorithmParametersTest extends TestCase { } /** - * @tests java.security.AlgorithmParameters#getAlgorithm() + * java.security.AlgorithmParameters#getAlgorithm() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getAlgorithm", - args = {} - ) public void test_getAlgorithm() throws Exception { // test: null value @@ -94,14 +83,8 @@ public class AlgorithmParametersTest extends TestCase { } /** - * @tests java.security.AlgorithmParameters#getEncoded() + * java.security.AlgorithmParameters#getEncoded() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getEncoded", - args = {} - ) public void test_getEncoded() throws Exception { final byte[] enc = new byte[] { 0x02, 0x01, 0x03 }; @@ -133,14 +116,8 @@ public class AlgorithmParametersTest extends TestCase { } /** - * @tests java.security.AlgorithmParameters#getEncoded(String) + * java.security.AlgorithmParameters#getEncoded(String) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getEncoded", - args = {java.lang.String.class} - ) public void test_getEncodedLjava_lang_String() throws Exception { final byte[] enc = new byte[] { 0x02, 0x01, 0x03 }; @@ -190,14 +167,8 @@ public class AlgorithmParametersTest extends TestCase { } /** - * @tests java.security.AlgorithmParameters#getInstance(String) + * java.security.AlgorithmParameters#getInstance(String) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class} - ) public void test_getInstanceLjava_lang_String() { String[] str = {"", "qwertyu", "!@#$%^&*()"}; try { @@ -220,14 +191,8 @@ public class AlgorithmParametersTest extends TestCase { } /** - * @tests java.security.AlgorithmParameters#getInstance(String, String) + * java.security.AlgorithmParameters#getInstance(String, String) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void test_getInstanceLjava_lang_StringLjava_lang_String() { String[] alg = {"", "qwertyu", "!@#$%^&*()"}; String[] prv = {"", null}; @@ -276,14 +241,8 @@ public class AlgorithmParametersTest extends TestCase { } /** - * @tests java.security.AlgorithmParameters#getParameterSpec(Class) + * java.security.AlgorithmParameters#getParameterSpec(Class) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getParameterSpec", - args = {java.lang.Class.class} - ) public void test_getParameterSpecLjava_lang_Class() throws Exception { final MyAlgorithmParameterSpec myParamSpec = new MyAlgorithmParameterSpec(); @@ -340,14 +299,8 @@ public class AlgorithmParametersTest extends TestCase { } /** - * @tests java.security.AlgorithmParameters#getInstance(String, Provider) + * java.security.AlgorithmParameters#getInstance(String, Provider) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.security.Provider.class} - ) public void test_getInstanceLjava_lang_StringLjava_security_Provider() { String[] alg = {"", "qwertyu", "!@#$%^&*()"}; Provider pp = null; @@ -383,14 +336,8 @@ public class AlgorithmParametersTest extends TestCase { } /** - * @tests java.security.AlgorithmParameters#getProvider() + * java.security.AlgorithmParameters#getProvider() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getProvider", - args = {} - ) public void test_getProvider() throws Exception { // test: null value AlgorithmParameters ap = new DummyAlgorithmParameters(null, null, "AAA"); @@ -402,14 +349,8 @@ public class AlgorithmParametersTest extends TestCase { } /** - * @tests java.security.AlgorithmParameters#init(java.security.spec.AlgorithmParameterSpec) + * java.security.AlgorithmParameters#init(java.security.spec.AlgorithmParameterSpec) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "init", - args = {java.security.spec.AlgorithmParameterSpec.class} - ) public void test_initLjava_security_spec_AlgorithmParameterSpec() throws Exception { @@ -478,14 +419,8 @@ public class AlgorithmParametersTest extends TestCase { } /** - * @tests java.security.AlgorithmParameters#init(byte[]) + * java.security.AlgorithmParameters#init(byte[]) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "init", - args = {byte[].class} - ) public void test_init$B() throws Exception { // @@ -551,14 +486,8 @@ public class AlgorithmParametersTest extends TestCase { } /** - * @tests java.security.AlgorithmParameters#init(byte[],String) + * java.security.AlgorithmParameters#init(byte[],String) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "init", - args = {byte[].class, java.lang.String.class} - ) public void test_init$BLjava_lang_String() throws Exception { // @@ -634,14 +563,8 @@ public class AlgorithmParametersTest extends TestCase { } /** - * @tests java.security.AlgorithmParameters#toString() + * java.security.AlgorithmParameters#toString() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {} - ) public void test_toString() throws Exception { final String str = "AlgorithmParameters"; @@ -665,12 +588,6 @@ public class AlgorithmParametersTest extends TestCase { /** * Tests DSA AlgorithmParameters provider */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Just DSA parameter checked", - method = "getInstance", - args = {java.lang.String.class} - ) public void testDSAProvider() throws Exception { AlgorithmParameters params = AlgorithmParameters.getInstance("DSA"); @@ -718,12 +635,6 @@ public class AlgorithmParametersTest extends TestCase { /** * Tests OAEP AlgorithmParameters provider */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Just OAEP parameter tested", - method = "getInstance", - args = {java.lang.String.class} - ) public void testOAEPProvider() throws Exception { AlgorithmParameters params = AlgorithmParameters.getInstance("OAEP"); @@ -734,14 +645,6 @@ public class AlgorithmParametersTest extends TestCase { * Test for <code>AlgorithmParameters</code> constructor * Assertion: returns AlgorithmParameters object */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "There are no tests with invalid arguments. This is " + - "ok since the effects of calling the constructor with " + - "invalid parameters can not be observed.", - method = "AlgorithmParameters", - args = {java.security.AlgorithmParametersSpi.class, java.security.Provider.class, java.lang.String.class} - ) public void testAlgorithmParametersConst() throws Exception { AlgorithmParametersSpi spi = new MyAlgorithmParameters(); AlgorithmParameters ap = new myAlgP(spi, p, "ABC"); diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/AllPermission2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AllPermission2Test.java index 8832829..b52a81b 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/AllPermission2Test.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AllPermission2Test.java @@ -17,29 +17,17 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.AllPermission; import java.security.Permission; import java.security.PermissionCollection; import java.security.SecurityPermission; import java.util.Enumeration; -@TestTargetClass(AllPermission.class) public class AllPermission2Test extends junit.framework.TestCase { /** - * @tests java.security.AllPermission#AllPermission() + * java.security.AllPermission#AllPermission() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "AllPermission", - args = {} - ) public void test_Constructor() { // Test for method java.security.AllPermission() AllPermission ap = new AllPermission(); @@ -48,15 +36,9 @@ public class AllPermission2Test extends junit.framework.TestCase { } /** - * @tests java.security.AllPermission#AllPermission(java.lang.String, + * java.security.AllPermission#AllPermission(java.lang.String, * java.lang.String) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Null/empty parameters checking missed", - method = "AllPermission", - args = {java.lang.String.class, java.lang.String.class} - ) public void test_ConstructorLjava_lang_StringLjava_lang_String() { // Test for method java.security.AllPermission(java.lang.String, // java.lang.String) @@ -70,14 +52,8 @@ public class AllPermission2Test extends junit.framework.TestCase { } /** - * @tests java.security.AllPermission#equals(java.lang.Object) + * java.security.AllPermission#equals(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Update comment for first assertTrue method.Because: Two AllPermission objects are always equal", - method = "equals", - args = {java.lang.Object.class} - ) public void test_equalsLjava_lang_Object() { // Test for method boolean // java.security.AllPermission.equals(java.lang.Object) @@ -88,14 +64,8 @@ public class AllPermission2Test extends junit.framework.TestCase { } /** - * @tests java.security.AllPermission#getActions() + * java.security.AllPermission#getActions() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getActions", - args = {} - ) public void test_getActions() { AllPermission ap = new AllPermission(); // Test for method java.lang.String @@ -105,14 +75,8 @@ public class AllPermission2Test extends junit.framework.TestCase { } /** - * @tests java.security.AllPermission#hashCode() + * java.security.AllPermission#hashCode() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hashCode", - args = {} - ) public void test_hashCode() { final int ALLPERMISSION_HASH = 1; // Test for method int java.security.AllPermission.hashCode() @@ -124,14 +88,8 @@ public class AllPermission2Test extends junit.framework.TestCase { } /** - * @tests java.security.AllPermission#implies(java.security.Permission) + * java.security.AllPermission#implies(java.security.Permission) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "implies", - args = {java.security.Permission.class} - ) public void test_impliesLjava_security_Permission() { // Test for method boolean // java.security.AllPermission.implies(java.security.Permission) @@ -145,14 +103,8 @@ public class AllPermission2Test extends junit.framework.TestCase { } /** - * @tests java.security.AllPermission#newPermissionCollection() + * java.security.AllPermission#newPermissionCollection() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "newPermissionCollection", - args = {} - ) public void test_newPermissionCollection() { AllPermission ap1 = new AllPermission(); AllPermission ap2 = new AllPermission("Don't remember this stupid name", @@ -191,4 +143,4 @@ public class AllPermission2Test extends junit.framework.TestCase { assertTrue(perm2.hasMoreElements()); } -}
\ No newline at end of file +} diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/AuthProviderTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AuthProviderTest.java index d5a428f..0819583 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/AuthProviderTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/AuthProviderTest.java @@ -16,18 +16,13 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.AuthProvider; import javax.security.auth.Subject; import javax.security.auth.callback.CallbackHandler; import junit.framework.TestCase; -@TestTargetClass(AuthProvider.class) + public class AuthProviderTest extends TestCase { protected void setUp() throws Exception { @@ -39,34 +34,8 @@ public class AuthProviderTest extends TestCase { } /** - * @tests java.security.AuthProvider#AuthProvider(String, double, String) + * java.security.AuthProvider#AuthProvider(String, double, String) */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "AuthProvider", - args = {java.lang.String.class, double.class, java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "login", - args = {javax.security.auth.Subject.class, javax.security.auth.callback.CallbackHandler.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "logout", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setCallbackHandler", - args = {javax.security.auth.callback.CallbackHandler.class} - ) - }) public void testConstructor01() { AuthProviderStub ap = new AuthProviderStub("name", 1.0, "info"); CallbackHandler handler = null; diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/BasicPermission2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/BasicPermission2Test.java index 1a96647..e398bc4 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/BasicPermission2Test.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/BasicPermission2Test.java @@ -17,15 +17,9 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.BasicPermission; import java.security.PermissionCollection; -@TestTargetClass(BasicPermission.class) public class BasicPermission2Test extends junit.framework.TestCase { public static class BasicPermissionSubclass extends BasicPermission { @@ -49,29 +43,17 @@ public class BasicPermission2Test extends junit.framework.TestCase { BasicPermission bp5 = new BasicPermissionSubclass("this.*"); /** - * @tests java.security.BasicPermission#BasicPermission(java.lang.String) + * java.security.BasicPermission#BasicPermission(java.lang.String) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Test cases, where parameter name is null (expect NullPointerException) and parameter name is empty (expect IllegalArgumentException) are absent", - method = "BasicPermission", - args = {java.lang.String.class} - ) public void test_ConstructorLjava_lang_String() { // Test for method java.security.BasicPermission(java.lang.String) assertEquals("Incorrect name returned", "aName", bp.getName()); } /** - * @tests java.security.BasicPermission#BasicPermission(java.lang.String, + * java.security.BasicPermission#BasicPermission(java.lang.String, * java.lang.String) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Test cases, where parameter name is null (expect NullPointerException) and parameter name is empty (expect IllegalArgumentException) are absent", - method = "BasicPermission", - args = {java.lang.String.class, java.lang.String.class} - ) public void test_ConstructorLjava_lang_StringLjava_lang_String() { // Test for method java.security.BasicPermission(java.lang.String, // java.lang.String) @@ -79,14 +61,8 @@ public class BasicPermission2Test extends junit.framework.TestCase { } /** - * @tests java.security.BasicPermission#equals(java.lang.Object) + * java.security.BasicPermission#equals(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "equals", - args = {java.lang.Object.class} - ) public void test_equalsLjava_lang_Object() { // Test for method boolean // java.security.BasicPermission.equals(java.lang.Object) @@ -97,14 +73,8 @@ public class BasicPermission2Test extends junit.framework.TestCase { } /** - * @tests java.security.BasicPermission#getActions() + * java.security.BasicPermission#getActions() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getActions", - args = {} - ) public void test_getActions() { // Test for method java.lang.String // java.security.BasicPermission.getActions() @@ -115,14 +85,8 @@ public class BasicPermission2Test extends junit.framework.TestCase { } /** - * @tests java.security.BasicPermission#hashCode() + * java.security.BasicPermission#hashCode() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hashCode", - args = {} - ) public void test_hashCode() { // Test for method int java.security.BasicPermission.hashCode() assertTrue("Equal objects should return same hash", @@ -130,14 +94,8 @@ public class BasicPermission2Test extends junit.framework.TestCase { } /** - * @tests java.security.BasicPermission#implies(java.security.Permission) + * java.security.BasicPermission#implies(java.security.Permission) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "implies", - args = {java.security.Permission.class} - ) public void test_impliesLjava_security_Permission() { // Test for method boolean // java.security.BasicPermission.implies(java.security.Permission) @@ -150,14 +108,8 @@ public class BasicPermission2Test extends junit.framework.TestCase { } /** - * @tests java.security.BasicPermission#newPermissionCollection() + * java.security.BasicPermission#newPermissionCollection() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "newPermissionCollection", - args = {} - ) public void test_newPermissionCollection() { // Test for method java.security.PermissionCollection // java.security.BasicPermission.newPermissionCollection() @@ -167,4 +119,4 @@ public class BasicPermission2Test extends junit.framework.TestCase { assertTrue("Should imply", bpc.implies(bp4)); assertTrue("Should not imply", !bpc.implies(bp3)); } -}
\ No newline at end of file +} diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/CodeSignerTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/CodeSignerTest.java index d139b6b..54d906c 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/CodeSignerTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/CodeSignerTest.java @@ -22,11 +22,6 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.CodeSigner; import java.security.Timestamp; import java.security.cert.CertPath; @@ -35,11 +30,10 @@ import java.util.Date; import org.apache.harmony.security.tests.support.TestCertUtils; import junit.framework.TestCase; -@TestTargetClass(CodeSigner.class) + /** * Unit test for CodeSigner. */ - public class CodeSignerTest extends TestCase { private CertPath cpath = TestCertUtils.genCertPath(3, 0); private Date now = new Date(); @@ -49,12 +43,6 @@ public class CodeSignerTest extends TestCase { /** * must throw NPE if signerCertPath is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "NPE case", - method = "CodeSigner", - args = {java.security.cert.CertPath.class, java.security.Timestamp.class} - ) public void testCodeSigner_00() { try { new CodeSigner(null, ts); @@ -67,12 +55,6 @@ public class CodeSignerTest extends TestCase { /** * timestamp can be null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Null parameter timestamp checking", - method = "CodeSigner", - args = {java.security.cert.CertPath.class, java.security.Timestamp.class} - ) public final void testCodeSigner_01() { try { CodeSigner cs = new CodeSigner(cpath, null); @@ -85,12 +67,6 @@ public class CodeSignerTest extends TestCase { /** * Not null parameters */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "CodeSigner", - args = {java.security.cert.CertPath.class, java.security.Timestamp.class} - ) public final void testCodeSigner_02() { try { CodeSigner cs = new CodeSigner(cpath, ts); @@ -103,12 +79,6 @@ public class CodeSignerTest extends TestCase { /** * Test various assertions about equals() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "equals", - args = {java.lang.Object.class} - ) public final void testEqualsObject() { CodeSigner one = new CodeSigner(cpath, ts); @@ -134,12 +104,6 @@ public class CodeSignerTest extends TestCase { /** * Tests CodeSigner.getSignerCertPath() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSignerCertPath", - args = {} - ) public void testGetSignerCertPath() { assertSame(new CodeSigner(cpath, null).getSignerCertPath(), cpath); } @@ -147,12 +111,6 @@ public class CodeSignerTest extends TestCase { /** * Tests CodeSigner.getTimeStamp() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getTimestamp", - args = {} - ) public void testGetTimestamp() { assertNull(new CodeSigner(cpath, null).getTimestamp()); assertSame(new CodeSigner(cpath, ts).getTimestamp(), ts); @@ -161,12 +119,6 @@ public class CodeSignerTest extends TestCase { /** * Tests CodeSigner.toString() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {} - ) public void testToString() { assertTrue(new CodeSigner(cpath, null).toString().contains("")); assertTrue(new CodeSigner(cpath, ts).toString().contains("")); @@ -178,12 +130,6 @@ public class CodeSignerTest extends TestCase { /** * Tests CodeSigner.hashCode() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hashCode", - args = {} - ) public void testHashCode() { CodeSigner cs1 = new CodeSigner(cpath, ts); CodeSigner cs2 = new CodeSigner(cpath, ts); diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/CodeSource2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/CodeSource2Test.java index 95d98e9..34549df 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/CodeSource2Test.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/CodeSource2Test.java @@ -17,11 +17,6 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.net.URL; import java.security.CodeSigner; import java.security.CodeSource; @@ -34,20 +29,13 @@ import java.util.Date; import org.apache.harmony.security.tests.support.TestCertUtils; -@TestTargetClass(CodeSource.class) public class CodeSource2Test extends junit.framework.TestCase { /** * @throws Exception - * @tests java.security.CodeSource#CodeSource(java.net.URL, + * java.security.CodeSource#CodeSource(java.net.URL, * java.security.cert.Certificate[]) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies constructor with valid URL and null certificate array", - method = "CodeSource", - args = {java.net.URL.class, java.security.cert.Certificate[].class} - ) public void test_ConstructorLjava_net_URL$Ljava_security_cert_Certificate() throws Exception { // Test for method java.security.CodeSource(java.net.URL, @@ -57,15 +45,9 @@ public class CodeSource2Test extends junit.framework.TestCase { /** * @throws Exception - * @tests java.security.CodeSource#CodeSource(java.net.URL, + * java.security.CodeSource#CodeSource(java.net.URL, * java.security.CodeSigner[]) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "CodeSource", - args = {java.net.URL.class, java.security.CodeSigner[].class} - ) public void test_ConstructorLjava_net_URL$Ljava_security_CodeSigner() { // Test for method java.security.CodeSource(java.net.URL, // java.security.cert.CodeSigner []) @@ -98,14 +80,8 @@ public class CodeSource2Test extends junit.framework.TestCase { } /** - * @tests java.security.CodeSource#equals(java.lang.Object) + * java.security.CodeSource#equals(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "CodeSource object was created with CodeSource(URL url, Certificate[] certs) only", - method = "equals", - args = {java.lang.Object.class} - ) public void test_equalsLjava_lang_Object() throws Exception { // Test for method boolean // java.security.CodeSource.equals(java.lang.Object) @@ -117,14 +93,8 @@ public class CodeSource2Test extends junit.framework.TestCase { } /** - * @tests java.security.CodeSource#hashCode() + * java.security.CodeSource#hashCode() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hashCode", - args = {} - ) public void test_hashCode() throws Exception { URL url = new java.net.URL("file:///test"); CodeSource cs = new CodeSource(url, (Certificate[]) null); @@ -133,14 +103,8 @@ public class CodeSource2Test extends junit.framework.TestCase { } /** - * @tests java.security.CodeSource#getCertificates() + * java.security.CodeSource#getCertificates() */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies case for null certificates only", - method = "getCertificates", - args = {} - ) public void test_getCertificates() throws Exception { CodeSource cs = new CodeSource(new java.net.URL("file:///test"), (Certificate[]) null); @@ -149,14 +113,8 @@ public class CodeSource2Test extends junit.framework.TestCase { } /** - * @tests java.security.CodeSource#getLocation() + * java.security.CodeSource#getLocation() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getLocation", - args = {} - ) public void test_getLocation() throws Exception { // Test for method java.net.URL java.security.CodeSource.getLocation() CodeSource cs = new CodeSource(new java.net.URL("file:///test"), @@ -167,14 +125,8 @@ public class CodeSource2Test extends junit.framework.TestCase { } /** - * @tests java.security.CodeSource#implies(java.security.CodeSource) + * java.security.CodeSource#implies(java.security.CodeSource) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "implies", - args = {java.security.CodeSource.class} - ) public void test_impliesLjava_security_CodeSource() throws Exception { // Test for method boolean // java.security.CodeSource.implies(java.security.CodeSource) diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/CodeSourceTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/CodeSourceTest.java index 7cf12b5..3b41943 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/CodeSourceTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/CodeSourceTest.java @@ -22,11 +22,6 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.io.File; import java.net.URL; import java.net.InetAddress; @@ -41,12 +36,10 @@ import org.apache.harmony.security.tests.support.TestCertUtils; import junit.framework.TestCase; -@TestTargetClass(CodeSource.class) /** * Unit test for CodeSource. * */ - public class CodeSourceTest extends TestCase { private java.security.cert.Certificate[] chain = null; @@ -127,12 +120,6 @@ public class CodeSourceTest extends TestCase { * Tests hashCode().<br> * javadoc says nothing, so test DRL-specific implementation. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hashCode", - args = {} - ) public void testHashCode() { // when nothing is specified, then hashCode obviously must be 0. assertTrue(new CodeSource(null, (Certificate[]) null).hashCode() == 0); @@ -147,12 +134,6 @@ public class CodeSourceTest extends TestCase { /** * Tests CodeSource(URL, Certificate[]). */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "CodeSource", - args = {java.net.URL.class, java.security.cert.Certificate[].class} - ) public void testCodeSourceURLCertificateArray() { new CodeSource(null, (Certificate[]) null); new CodeSource(urlSite, (Certificate[]) null); @@ -163,12 +144,6 @@ public class CodeSourceTest extends TestCase { /** * Tests CodeSource(URL, CodeSigner[]). */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies method with null parameters only", - method = "CodeSource", - args = {java.net.URL.class, java.security.CodeSigner[].class} - ) public void testCodeSourceURLCodeSignerArray() { if (!has_15_features()) { return; @@ -180,12 +155,6 @@ public class CodeSourceTest extends TestCase { /** * equals(Object) must return <code>false</code> for null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Null parameter checked", - method = "equals", - args = {java.lang.Object.class} - ) public void testEqualsObject_00() { CodeSource thiz = new CodeSource(urlSite, (Certificate[]) null); assertFalse(thiz.equals(null)); @@ -195,12 +164,6 @@ public class CodeSourceTest extends TestCase { /** * equals(Object) must return <code>true</code> for the same object */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Same objects checked", - method = "equals", - args = {java.lang.Object.class} - ) public void testEqualsObject_01() { CodeSource thiz = new CodeSource(urlSite, (Certificate[]) null); assertTrue(thiz.equals(thiz)); @@ -211,12 +174,6 @@ public class CodeSourceTest extends TestCase { * The signer certificate chain must contain the same set of certificates, but * the order of the certificates is not taken into account. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "equals", - args = {java.lang.Object.class} - ) public void testEqualsObject_02() { Certificate cert0 = new TestCertUtils.TestCertificate(); Certificate cert1 = new TestCertUtils.TestCertificate(); @@ -231,12 +188,6 @@ public class CodeSourceTest extends TestCase { * Test for equals(Object)<br> * Checks that both 'null' and not-null URLs are taken into account - properly. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "equals", - args = {java.lang.Object.class} - ) public void testEqualsObject_04() { CodeSource thiz = new CodeSource(urlSite, (Certificate[]) null); CodeSource that = new CodeSource(null, (Certificate[]) null); @@ -251,12 +202,6 @@ public class CodeSourceTest extends TestCase { /** * Tests CodeSource.getCertificates(). */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getCertificates", - args = {} - ) public void testGetCertificates_00() { assertNull(new CodeSource(null, (Certificate[]) null).getCertificates()); java.security.cert.Certificate[] got = new CodeSource(null, chain) @@ -271,12 +216,6 @@ public class CodeSourceTest extends TestCase { * Tests whether the getCertificates() returns certificates obtained from * the signers. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getCertificates", - args = {} - ) public void testGetCertificates_01() { if (!has_15_features()) { return; @@ -375,12 +314,6 @@ public class CodeSourceTest extends TestCase { /** * Tests CodeSource.getCodeSigners(). */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getCodeSigners", - args = {} - ) public void testGetCodeSigners_00() { if (!has_15_features()) { return; @@ -408,12 +341,6 @@ public class CodeSourceTest extends TestCase { /** * Tests CodeSource.getCodeSigners() for null. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getCodeSigners", - args = {} - ) public void testGetCoderSignersNull() throws Exception{ assertNull(new CodeSource(new URL("http://url"), (Certificate[])null).getCodeSigners()); } @@ -421,12 +348,6 @@ public class CodeSourceTest extends TestCase { /** * Tests CodeSource.getLocation() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getLocation", - args = {} - ) public void testGetLocation() { assertTrue(new CodeSource(urlSite, (Certificate[]) null).getLocation() == urlSite); assertTrue(new CodeSource(urlSite, chain).getLocation() == urlSite); @@ -437,12 +358,6 @@ public class CodeSourceTest extends TestCase { /** * Tests CodeSource.toString() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {} - ) public void testToString() { // Javadoc keeps silence about String's format, // just make sure it can be invoked. @@ -473,12 +388,6 @@ public class CodeSourceTest extends TestCase { /** * must not imply null CodeSource */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "implies", - args = {java.security.CodeSource.class} - ) public void testImplies_00() { CodeSource cs0 = new CodeSource(null, (Certificate[]) null); assertFalse(cs0.implies(null)); @@ -488,12 +397,6 @@ public class CodeSourceTest extends TestCase { * CodeSource with location=null && Certificate[] == null implies any other * CodeSource */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "implies", - args = {java.security.CodeSource.class} - ) public void testImplies_01() throws Exception { CodeSource thizCS = new CodeSource(urlSite, (Certificate[]) null); CodeSource thatCS = new CodeSource(null, (Certificate[]) null); @@ -503,12 +406,6 @@ public class CodeSourceTest extends TestCase { assertFalse(thizCS.implies(thatCS)); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "implies", - args = {java.security.CodeSource.class} - ) public void testImplies_02() throws Exception { CodeSource thizCS = new CodeSource(urlSite, (Certificate[]) null); CodeSource thatCS = new CodeSource(thizCS.getLocation(), @@ -529,12 +426,6 @@ public class CodeSourceTest extends TestCase { assertFalse(thatCS.implies(thizCS)); } */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "implies", - args = {java.security.CodeSource.class} - ) public void testImplies_03_tmp() throws Exception { CodeSource thizCS = new CodeSource(urlDir, (Certificate[]) null); CodeSource thatCS = new CodeSource(urlDir_FileProtocol, @@ -543,12 +434,6 @@ public class CodeSourceTest extends TestCase { assertFalse(thatCS.implies(thizCS)); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "implies", - args = {java.security.CodeSource.class} - ) public void testImplies_04() throws Exception { CodeSource thizCS = new CodeSource(urlDir, (Certificate[]) null); CodeSource thatCS = new CodeSource(urlDirIP, (Certificate[]) null); @@ -574,12 +459,6 @@ public class CodeSourceTest extends TestCase { assertFalse(thatCS.implies(thizCS)); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "implies", - args = {java.security.CodeSource.class} - ) public void testImplies_05() throws Exception { CodeSource thizCS = new CodeSource(urlDir_port80, (Certificate[]) null); CodeSource thatCS = new CodeSource(urlDir, (Certificate[]) null); @@ -601,24 +480,12 @@ public class CodeSourceTest extends TestCase { assertFalse(thizCS.implies(thatCS)); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "implies", - args = {java.security.CodeSource.class} - ) public void testImplies_06() throws Exception { CodeSource thizCS = new CodeSource(urlFile, (Certificate[]) null); CodeSource thatCS = new CodeSource(urlFile, (Certificate[]) null); assertTrue(thizCS.implies(thatCS)); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "implies", - args = {java.security.CodeSource.class} - ) public void testImplies_07() throws Exception { CodeSource thiz = new CodeSource(urlFileDirMinus, (Certificate[]) null); CodeSource that = new CodeSource(urlFile, (Certificate[]) null); @@ -631,12 +498,6 @@ public class CodeSourceTest extends TestCase { assertFalse(thiz.implies(that)); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "implies", - args = {java.security.CodeSource.class} - ) public void testImplies_08() throws Exception { CodeSource thiz = new CodeSource(urlFileDirStar, (Certificate[]) null); CodeSource that = new CodeSource(urlFile, (Certificate[]) null); @@ -652,12 +513,6 @@ public class CodeSourceTest extends TestCase { assertFalse(thiz.implies(that)); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "implies", - args = {java.security.CodeSource.class} - ) public void testImplies_09() throws Exception { CodeSource thizCS = new CodeSource(urlDir, (Certificate[]) null); CodeSource thatCS = new CodeSource(urlDirWithSlash, @@ -666,12 +521,6 @@ public class CodeSourceTest extends TestCase { assertFalse(thatCS.implies(thizCS)); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "implies", - args = {java.security.CodeSource.class} - ) public void testImplies_0A() throws Exception { CodeSource thizCS = new CodeSource(urlRef1, (Certificate[]) null); CodeSource thatCS = new CodeSource(urlRef1, (Certificate[]) null); @@ -687,12 +536,6 @@ public class CodeSourceTest extends TestCase { * If this certificates are not null, then all of this certificates should * be presented in certificates of that codesource. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "implies", - args = {java.security.CodeSource.class} - ) public void testImplies_0B() { Certificate c0 = new TestCertUtils.TestCertificate("00"); @@ -719,12 +562,6 @@ public class CodeSourceTest extends TestCase { * These special URLs have a special processing in implies(), * so they need to be covered and performance need to be checked */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "implies", - args = {java.security.CodeSource.class} - ) public void testImplies_0C() throws Exception { URL url0 = new URL("http://localhost/someDir"); URL url1 = new URL("http://localhost/someOtherDir"); @@ -740,12 +577,6 @@ public class CodeSourceTest extends TestCase { * These special URLs have a special processing in implies(), * so they need to be covered and performance need to be checked */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "implies", - args = {java.security.CodeSource.class} - ) public void testImplies_0D() throws Exception { URL url0 = new URL("file:///" + System.getProperty("java.io.tmpdir") + File.separator + "someDir"); diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/DigestExceptionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/DigestExceptionTest.java index f266498..99dcc6f 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/DigestExceptionTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/DigestExceptionTest.java @@ -22,15 +22,10 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.DigestException; import junit.framework.TestCase; -@TestTargetClass(DigestException.class) + /** * Tests for <code>DigestException</code> class constructors and methods. * @@ -48,12 +43,6 @@ public class DigestExceptionTest extends TestCase { * Test for <code>DigestException()</code> constructor Assertion: * constructs DigestException with no detail message */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "DigestException", - args = {} - ) public void testDigestException01() { DigestException tE = new DigestException(); assertNull("getMessage() must return null.", tE.getMessage()); @@ -65,12 +54,6 @@ public class DigestExceptionTest extends TestCase { * constructs DigestException with detail message msg. Parameter * <code>msg</code> is not null. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies case with differents parameters (parameter is not null)", - method = "DigestException", - args = {java.lang.String.class} - ) public void testDigestException02() { DigestException tE; for (int i = 0; i < msgs.length; i++) { @@ -85,12 +68,6 @@ public class DigestExceptionTest extends TestCase { * Test for <code>DigestException(String)</code> constructor Assertion: * constructs DigestException when <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies case with null parameter", - method = "DigestException", - args = {java.lang.String.class} - ) public void testDigestException03() { String msg = null; DigestException tE = new DigestException(msg); @@ -102,12 +79,6 @@ public class DigestExceptionTest extends TestCase { * Test for <code>DigestException(Throwable)</code> constructor Assertion: * constructs DigestException when <code>cause</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies case with null parameter", - method = "DigestException", - args = {java.lang.Throwable.class} - ) public void testDigestException04() { Throwable cause = null; DigestException tE = new DigestException(cause); @@ -119,12 +90,6 @@ public class DigestExceptionTest extends TestCase { * Test for <code>DigestException(Throwable)</code> constructor Assertion: * constructs DigestException when <code>cause</code> is not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies case with not null parameter", - method = "DigestException", - args = {java.lang.Throwable.class} - ) public void testDigestException05() { DigestException tE = new DigestException(tCause); if (tE.getMessage() != null) { @@ -143,12 +108,6 @@ public class DigestExceptionTest extends TestCase { * Assertion: constructs DigestException when <code>cause</code> is null * <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "DigestException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testDigestException06() { DigestException tE = new DigestException(null, null); assertNull("getMessage() must return null", tE.getMessage()); @@ -160,12 +119,6 @@ public class DigestExceptionTest extends TestCase { * Assertion: constructs DigestException when <code>cause</code> is null * <code>msg</code> is not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "DigestException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testDigestException07() { DigestException tE; for (int i = 0; i < msgs.length; i++) { @@ -181,12 +134,6 @@ public class DigestExceptionTest extends TestCase { * Assertion: constructs DigestException when <code>cause</code> is not * null <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "DigestException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testDigestException08() { DigestException tE = new DigestException(null, tCause); if (tE.getMessage() != null) { @@ -205,12 +152,6 @@ public class DigestExceptionTest extends TestCase { * Assertion: constructs DigestException when <code>cause</code> is not * null <code>msg</code> is not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "DigestException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testDigestException09() { DigestException tE; for (int i = 0; i < msgs.length; i++) { diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/DigestInputStreamTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/DigestInputStreamTest.java index e01adcb..228462a 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/DigestInputStreamTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/DigestInputStreamTest.java @@ -34,11 +34,6 @@ import junit.framework.TestCase; import org.apache.harmony.security.tests.support.MDGoldenData; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; - -@TestTargetClass(DigestInputStream.class) /** * Tests for fields and methods of class <code>DigestInputStream</code> * @@ -82,12 +77,6 @@ public class DigestInputStreamTest extends TestCase { * * @throws NoSuchAlgorithmException */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies both non null parameters", - method = "DigestInputStream", - args = {java.io.InputStream.class, java.security.MessageDigest.class} - ) public final void testDigestInputStream01() { for (int i=0; i<algorithmName.length; i++) { try { @@ -109,12 +98,6 @@ public class DigestInputStreamTest extends TestCase { * Assertion: creates new <code>DigestInputStream</code> instance * using valid parameters (both <code>null</code>) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies both null parameters. Need cases where just one parameter null", - method = "DigestInputStream", - args = {java.io.InputStream.class, java.security.MessageDigest.class} - ) public final void testDigestInputStream02() { InputStream dis = new DigestInputStream(null, null); assertTrue(dis instanceof DigestInputStream); @@ -126,12 +109,6 @@ public class DigestInputStreamTest extends TestCase { * Assertion: returns the byte read<br> * Assertion: updates associated digest<br> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "read", - args = {} - ) public final void testRead01() throws IOException { for (int ii=0; ii<algorithmName.length; ii++) { @@ -165,12 +142,6 @@ public class DigestInputStreamTest extends TestCase { * Assertion: must not update digest if EOS had been * reached but not read before method call<br> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "read", - args = {} - ) public final void testRead02() throws IOException { for (int ii=0; ii<algorithmName.length; ii++) { @@ -206,12 +177,6 @@ public class DigestInputStreamTest extends TestCase { * (if <code>true</code> passed as a parameter) or off (if <code>false</code> * passed) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "read", - args = {} - ) public final void testRead03() throws IOException { for (int ii=0; ii<algorithmName.length; ii++) { @@ -245,12 +210,6 @@ public class DigestInputStreamTest extends TestCase { * <code>InputStream</code> not set. <code>read()</code> must * not work */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "IOException is not tested", - method = "read", - args = {} - ) public final void testRead04() throws IOException { for (int ii=0; ii<algorithmName.length; ii++) { try { @@ -283,12 +242,6 @@ public class DigestInputStreamTest extends TestCase { * <code>read()</code> must not work when digest * functionality is on */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "IOException is not tested", - method = "read", - args = {} - ) public final void testRead05() { InputStream is = new ByteArrayInputStream(myMessage); DigestInputStream dis = new DigestInputStream(is, null); @@ -313,12 +266,6 @@ public class DigestInputStreamTest extends TestCase { * <code>read()</code> must work when digest * functionality is off */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "read", - args = {} - ) public final void testRead06() throws IOException { InputStream is = new ByteArrayInputStream(myMessage); @@ -341,11 +288,6 @@ public class DigestInputStreamTest extends TestCase { * * Assertion: updates associated digest<br> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - method = "read", - args = {byte[].class, int.class, int.class} - ) public final void testReadbyteArrayintint01() throws IOException { for (int ii=0; ii<algorithmName.length; ii++) { @@ -380,11 +322,6 @@ public class DigestInputStreamTest extends TestCase { * * Assertion: updates associated digest<br> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - method = "read", - args = {byte[].class, int.class, int.class} - ) public final void testReadbyteArrayintint02() throws IOException { // check precondition @@ -425,11 +362,6 @@ public class DigestInputStreamTest extends TestCase { * * Assertion: updates associated digest<br> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - method = "read", - args = {byte[].class, int.class, int.class} - ) public final void testReadbyteArrayintint03() throws IOException { // check precondition @@ -477,11 +409,6 @@ public class DigestInputStreamTest extends TestCase { * * Assertion: updates associated digest<br> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - method = "read", - args = {byte[].class, int.class, int.class} - ) public final void testReadbyteArrayintint04() throws IOException { for (int ii=0; ii<algorithmName.length; ii++) { @@ -518,11 +445,6 @@ public class DigestInputStreamTest extends TestCase { * Assertion: does not update associated digest if * digest functionality is off<br> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - method = "read", - args = {byte[].class, int.class, int.class} - ) public final void testReadbyteArrayintint05() throws IOException { // check precondition @@ -557,12 +479,6 @@ public class DigestInputStreamTest extends TestCase { * * Assertion: returns associated message digest<br> */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getMessageDigest", - args = {} - ) public final void testGetMessageDigest() { for (int ii=0; ii<algorithmName.length; ii++) { try { @@ -584,12 +500,6 @@ public class DigestInputStreamTest extends TestCase { * * Assertion: set associated message digest<br> */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Method setMessageDigest is not tested with null parameter", - method = "setMessageDigest", - args = {java.security.MessageDigest.class} - ) public final void testSetMessageDigest() { for (int ii=0; ii<algorithmName.length; ii++) { try { @@ -610,12 +520,6 @@ public class DigestInputStreamTest extends TestCase { * Test for <code>on()</code> method<br> * Assertion: turns digest functionality on or off */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "on", - args = {boolean.class} - ) public final void testOn() throws IOException { for (int ii=0; ii<algorithmName.length; ii++) { try { @@ -655,12 +559,6 @@ public class DigestInputStreamTest extends TestCase { * Test for <code>toString()</code> method<br> * Assertion: returns <code>String</code> representation of this object */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {} - ) public final void testToString() { for (int ii=0; ii<algorithmName.length; ii++) { try { diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/GeneralSecurityExceptionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/GeneralSecurityExceptionTest.java index 218b4fe..0073432 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/GeneralSecurityExceptionTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/GeneralSecurityExceptionTest.java @@ -22,15 +22,10 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.GeneralSecurityException; import junit.framework.TestCase; -@TestTargetClass(GeneralSecurityException.class) + /** * Tests for <code>GeneralSecurityException</code> class constructors and * methods. @@ -49,12 +44,6 @@ public class GeneralSecurityExceptionTest extends TestCase { * Test for <code>GeneralSecurityException()</code> constructor Assertion: * constructs GeneralSecurityException with no detail message */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "GeneralSecurityException", - args = {} - ) public void testGeneralSecurityException01() { GeneralSecurityException tE = new GeneralSecurityException(); assertNull("getMessage() must return null.", tE.getMessage()); @@ -66,12 +55,6 @@ public class GeneralSecurityExceptionTest extends TestCase { * Assertion: constructs GeneralSecurityException with detail message msg. * Parameter <code>msg</code> is not null. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "GeneralSecurityException", - args = {java.lang.String.class} - ) public void testGeneralSecurityException02() { GeneralSecurityException tE; for (int i = 0; i < msgs.length; i++) { @@ -87,12 +70,6 @@ public class GeneralSecurityExceptionTest extends TestCase { * Assertion: constructs GeneralSecurityException when <code>msg</code> is * null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "GeneralSecurityException", - args = {java.lang.String.class} - ) public void testGeneralSecurityException03() { String msg = null; GeneralSecurityException tE = new GeneralSecurityException(msg); @@ -105,12 +82,6 @@ public class GeneralSecurityExceptionTest extends TestCase { * Assertion: constructs GeneralSecurityException when <code>cause</code> * is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "GeneralSecurityException", - args = {java.lang.Throwable.class} - ) public void testGeneralSecurityException04() { Throwable cause = null; GeneralSecurityException tE = new GeneralSecurityException(cause); @@ -123,12 +94,6 @@ public class GeneralSecurityExceptionTest extends TestCase { * Assertion: constructs GeneralSecurityException when <code>cause</code> * is not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "GeneralSecurityException", - args = {java.lang.Throwable.class} - ) public void testGeneralSecurityException05() { GeneralSecurityException tE = new GeneralSecurityException(tCause); if (tE.getMessage() != null) { @@ -147,12 +112,6 @@ public class GeneralSecurityExceptionTest extends TestCase { * constructor Assertion: constructs GeneralSecurityException when * <code>cause</code> is null <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "GeneralSecurityException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testGeneralSecurityException06() { GeneralSecurityException tE = new GeneralSecurityException(null, null); assertNull("getMessage() must return null", tE.getMessage()); @@ -164,12 +123,6 @@ public class GeneralSecurityExceptionTest extends TestCase { * constructor Assertion: constructs GeneralSecurityException when * <code>cause</code> is null <code>msg</code> is not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "GeneralSecurityException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testGeneralSecurityException07() { GeneralSecurityException tE; for (int i = 0; i < msgs.length; i++) { @@ -185,12 +138,6 @@ public class GeneralSecurityExceptionTest extends TestCase { * constructor Assertion: constructs GeneralSecurityException when * <code>cause</code> is not null <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "GeneralSecurityException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testGeneralSecurityException08() { GeneralSecurityException tE = new GeneralSecurityException(null, tCause); if (tE.getMessage() != null) { @@ -209,12 +156,6 @@ public class GeneralSecurityExceptionTest extends TestCase { * constructor Assertion: constructs GeneralSecurityException when * <code>cause</code> is not null <code>msg</code> is not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "GeneralSecurityException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testGeneralSecurityException09() { GeneralSecurityException tE; for (int i = 0; i < msgs.length; i++) { diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/GuardedObjectTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/GuardedObjectTest.java index b30f292..498ca77 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/GuardedObjectTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/GuardedObjectTest.java @@ -22,38 +22,18 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.Guard; import java.security.GuardedObject; import junit.framework.TestCase; -@TestTargetClass(GuardedObject.class) + /** * Tests for <code>GuardedObject</code> * */ - public class GuardedObjectTest extends TestCase { /** Null guard imposes no restriction. */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "GuardedObject", - args = {java.lang.Object.class, java.security.Guard.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getObject", - args = {} - ) - }) public void testNoGuard() { Object obj = null; GuardedObject go = new GuardedObject(obj, null); @@ -65,20 +45,6 @@ public class GuardedObjectTest extends TestCase { } /** Test real guard can both allow and deny access. */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "GuardedObject", - args = {java.lang.Object.class, java.security.Guard.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getObject", - args = {} - ) - }) public void testGuard() { final String message = "test message"; final StringBuffer objBuffer = new StringBuffer("235345 t"); diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/Identity2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/Identity2Test.java index 6ae5424..c1a7ac4 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/Identity2Test.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/Identity2Test.java @@ -34,64 +34,8 @@ import java.security.cert.X509Certificate; import org.apache.harmony.security.tests.java.security.IdentityScope2Test.IdentityScopeSubclass; import dalvik.annotation.AndroidOnly; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; @SuppressWarnings("deprecation") -@TestTargetClass(value=Identity.class, - untestedMethods={ - @TestTargetNew( - level=TestLevel.NOT_NECESSARY, - clazz=Certificate.class, - method="getGuarantor", - args={}, - notes="no implementation" - ), - @TestTargetNew( - level=TestLevel.NOT_NECESSARY, - clazz=Certificate.class, - method="encode", - args={OutputStream.class}, - notes="no implementation" - ), - @TestTargetNew( - level=TestLevel.NOT_NECESSARY, - clazz=Certificate.class, - method="decode", - args={InputStream.class}, - notes="no implementation" - ), - @TestTargetNew( - level=TestLevel.NOT_NECESSARY, - clazz=Certificate.class, - method="toString", - args={boolean.class}, - notes="no implementation" - ), - @TestTargetNew( - level=TestLevel.NOT_NECESSARY, - clazz=Certificate.class, - method="getFormat", - args={}, - notes="no implementation" - ), - @TestTargetNew( - level=TestLevel.NOT_NECESSARY, - clazz=Certificate.class, - method="getPrincipal", - args={}, - notes="no implementation" - ), - @TestTargetNew( - level=TestLevel.NOT_NECESSARY, - clazz=Certificate.class, - method="getPublicKey", - args={}, - notes="no implementation" - ) -}) public class Identity2Test extends junit.framework.TestCase { static PublicKey pubKey; @@ -199,27 +143,15 @@ public class Identity2Test extends junit.framework.TestCase { } /** - * @tests java.security.Identity#Identity() + * java.security.Identity#Identity() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "Identity", - args = {} - ) public void test_Constructor() { new IdentitySubclass(); } /** - * @tests java.security.Identity#Identity(java.lang.String) + * java.security.Identity#Identity(java.lang.String) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "Identity", - args = {java.lang.String.class} - ) public void test_ConstructorLjava_lang_String() { String[] str = {"test", "", null}; IdentitySubclass is; @@ -235,15 +167,9 @@ public class Identity2Test extends junit.framework.TestCase { } /** - * @tests java.security.Identity#Identity(java.lang.String, + * java.security.Identity#Identity(java.lang.String, * java.security.IdentityScope) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "Identity", - args = {java.lang.String.class, java.security.IdentityScope.class} - ) public void test_ConstructorLjava_lang_StringLjava_security_IdentityScope() { String nameNull = null; String[] str = {"test", "", "!@#$%^&*()", "identity name"}; @@ -280,14 +206,8 @@ public class Identity2Test extends junit.framework.TestCase { } /** - * @tests java.security.Identity#getScope() + * java.security.Identity#getScope() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getScope", - args = {} - ) public void test_getScope() throws Exception { IdentityScope scope = new IdentityScopeSubclass(); IdentitySubclass sub = new IdentitySubclass("test", scope); @@ -296,14 +216,8 @@ public class Identity2Test extends junit.framework.TestCase { } /** - * @tests java.security.Identity#getPublicKey() + * java.security.Identity#getPublicKey() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPublicKey", - args = {} - ) public void test_getPublicKey() throws Exception { IdentitySubclass sub = new IdentitySubclass("test", new IdentityScopeSubclass()); @@ -313,14 +227,8 @@ public class Identity2Test extends junit.framework.TestCase { } /** - * @tests java.security.Identity#getName() + * java.security.Identity#getName() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getName", - args = {} - ) public void test_getName() throws Exception { String name = "test"; IdentitySubclass sub = new IdentitySubclass(name, @@ -329,14 +237,8 @@ public class Identity2Test extends junit.framework.TestCase { } /** - * @tests java.security.Identity#getInfo() + * java.security.Identity#getInfo() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getInfo", - args = {} - ) public void test_getInfo() throws Exception { String info = "This is the general information."; IdentitySubclass sub = new IdentitySubclass("test", @@ -346,14 +248,8 @@ public class Identity2Test extends junit.framework.TestCase { } /** - * @tests java.security.Identity#certificates() + * java.security.Identity#certificates() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "certificates", - args = {} - ) public void test_certificates() throws Exception { IdentitySubclass sub = new IdentitySubclass("test", new IdentityScopeSubclass()); @@ -369,20 +265,8 @@ public class Identity2Test extends junit.framework.TestCase { } /** - * @tests java.security.Identity#removeCertificate(java.security.Certificate) + * java.security.Identity#removeCertificate(java.security.Certificate) */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - method = "addCertificate", - args = {java.security.Certificate.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - method = "removeCertificate", - args = {java.security.Certificate.class} - ) - }) @AndroidOnly("Spec says: Removing unknown certificates throw an exception. " + "The RI ignores unknown certificates.") public void test_removeCertificateLjava_security_Certificate() throws Exception { @@ -419,14 +303,8 @@ public class Identity2Test extends junit.framework.TestCase { } /** - * @tests java.security.Identity#equals(java.lang.Object) + * java.security.Identity#equals(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "equals", - args = {java.lang.Object.class} - ) public void test_equalsLjava_lang_Object() throws Exception { IdentitySubclass sub = new IdentitySubclass("test", new IdentityScopeSubclass()); @@ -448,14 +326,8 @@ public class Identity2Test extends junit.framework.TestCase { } /** - * @tests java.security.Identity#identityEquals(java.security.Identity) + * java.security.Identity#identityEquals(java.security.Identity) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Method identityEquals(java.security.Identity) is not tested", - method = "identityEquals", - args = {java.security.Identity.class} - ) public void test_identityEqualsLjava_security_Identity() throws Exception { IdentitySubclass sub = new IdentitySubclass("test", null); CertificateFactory cf = CertificateFactory.getInstance("X.509"); @@ -471,14 +343,8 @@ public class Identity2Test extends junit.framework.TestCase { } /** - * @tests java.security.Identity#toString() + * java.security.Identity#toString() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {} - ) public void test_toString() throws Exception { IdentitySubclass sub = new IdentitySubclass("test", null); assertNotNull(sub.toString()); @@ -489,14 +355,8 @@ public class Identity2Test extends junit.framework.TestCase { } /** - * @tests java.security.Identity#toString(boolean) + * java.security.Identity#toString(boolean) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {boolean.class} - ) public void test_toStringZ() throws Exception { IdentitySubclass sub = new IdentitySubclass("test", null); assertNotNull(sub.toString(true)); @@ -505,14 +365,8 @@ public class Identity2Test extends junit.framework.TestCase { } /** - * @tests java.security.Identity#hashCode() + * java.security.Identity#hashCode() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hashCode", - args = {} - ) public void test_hashCode() throws Exception { IdentitySubclass sub = new IdentitySubclass("test", null); IdentitySubclass sub2 = new IdentitySubclass("test", null); @@ -521,14 +375,8 @@ public class Identity2Test extends junit.framework.TestCase { } /** - * @tests java.security.Identity#setInfo(String) + * java.security.Identity#setInfo(String) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setInfo", - args = {java.lang.String.class} - ) public void testSetInfo() throws Exception{ String[] info = {"This is the general information.", "test", "", null}; IdentitySubclass sub = new IdentitySubclass("test", new IdentityScopeSubclass()); @@ -545,14 +393,8 @@ public class Identity2Test extends junit.framework.TestCase { } /** - * @tests java.security.Identity#setPublicKey(PublicKey key) + * java.security.Identity#setPublicKey(PublicKey key) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "SecurityException is not checked", - method = "setPublicKey", - args = {java.security.PublicKey.class} - ) public void testSetPublicKey() throws Exception{ IdentitySubclass sub = new IdentitySubclass("test", new IdentityScopeSubclass()); diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/IdentityScope2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/IdentityScope2Test.java index 639f074..3562dce 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/IdentityScope2Test.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/IdentityScope2Test.java @@ -27,11 +27,7 @@ import java.util.Hashtable; import org.apache.harmony.security.tests.java.security.Identity2Test.IdentitySubclass; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; @SuppressWarnings("deprecation") -@TestTargetClass(IdentityScope.class) public class IdentityScope2Test extends junit.framework.TestCase { static PublicKey pubKey; @@ -119,27 +115,15 @@ public class IdentityScope2Test extends junit.framework.TestCase { } /** - * @tests java.security.IdentityScope#IdentityScope() + * java.security.IdentityScope#IdentityScope() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "IdentityScope", - args = {} - ) public void test_Constructor() { new IdentityScopeSubclass(); } /** - * @tests java.security.IdentityScope#IdentityScope(java.lang.String) + * java.security.IdentityScope#IdentityScope(java.lang.String) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "IdentityScope", - args = {java.lang.String.class} - ) public void test_ConstructorLjava_lang_String() { String[] str = {"test", "", null}; IdentityScopeSubclass iss; @@ -156,15 +140,9 @@ public class IdentityScope2Test extends junit.framework.TestCase { } /** - * @tests java.security.IdentityScope#IdentityScope(java.lang.String, + * java.security.IdentityScope#IdentityScope(java.lang.String, * java.security.IdentityScope) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "IdentityScope", - args = {java.lang.String.class, java.security.IdentityScope.class} - ) public void test_ConstructorLjava_lang_StringLjava_security_IdentityScope() { String nameNull = null; String[] str = {"test", "", "!@#$%^&*()", "identity name"}; @@ -200,14 +178,8 @@ public class IdentityScope2Test extends junit.framework.TestCase { } /** - * @tests java.security.IdentityScope#addIdentity(java.security.Identity) + * java.security.IdentityScope#addIdentity(java.security.Identity) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "addIdentity", - args = {java.security.Identity.class} - ) public void test_addIdentityLjava_security_Identity() throws Exception { IdentityScopeSubclass sub = new IdentityScopeSubclass("test", new IdentityScopeSubclass()); @@ -225,14 +197,8 @@ public class IdentityScope2Test extends junit.framework.TestCase { } /** - * @tests java.security.IdentityScope#removeIdentity(java.security.Identity) + * java.security.IdentityScope#removeIdentity(java.security.Identity) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "removeIdentity", - args = {java.security.Identity.class} - ) public void test_removeIdentityLjava_security_Identity() throws Exception { IdentityScopeSubclass sub = new IdentityScopeSubclass("test", new IdentityScopeSubclass()); @@ -249,14 +215,8 @@ public class IdentityScope2Test extends junit.framework.TestCase { } /** - * @tests java.security.IdentityScope#identities() + * java.security.IdentityScope#identities() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "identities", - args = {} - ) public void test_identities() throws Exception { IdentityScopeSubclass sub = new IdentityScopeSubclass("test", new IdentityScopeSubclass()); @@ -270,13 +230,8 @@ public class IdentityScope2Test extends junit.framework.TestCase { } /** - * @tests java.security.IdentityScope#getIdentity(java.security.Principal) + * java.security.IdentityScope#getIdentity(java.security.Principal) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getIdentity", - args = {java.security.Principal.class} - ) public void test_getIdentityLjava_security_Principal() throws Exception { Identity id = new IdentitySubclass("principal name"); id.setPublicKey(pubKey); @@ -311,13 +266,8 @@ public class IdentityScope2Test extends junit.framework.TestCase { } /** - * @tests java.security.IdentityScope#getIdentity(java.security.PublicKey) + * java.security.IdentityScope#getIdentity(java.security.PublicKey) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getIdentity", - args = {java.security.PublicKey.class} - ) public void test_getIdentityLjava_security_PublicKey() throws Exception { IdentityScopeSubclass sub = new IdentityScopeSubclass("test", new IdentityScopeSubclass()); @@ -337,14 +287,8 @@ public class IdentityScope2Test extends junit.framework.TestCase { } /** - * @tests java.security.IdentityScope#getIdentity(java.lang.String) + * java.security.IdentityScope#getIdentity(java.lang.String) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getIdentity", - args = {java.lang.String.class} - ) public void test_getIdentityLjava_lang_String() throws Exception { IdentityScopeSubclass sub = new IdentityScopeSubclass("test", new IdentityScopeSubclass()); @@ -357,14 +301,8 @@ public class IdentityScope2Test extends junit.framework.TestCase { } /** - * @tests java.security.IdentityScope#size() + * java.security.IdentityScope#size() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "size", - args = {} - ) public void test_size() throws Exception { IdentityScopeSubclass sub = new IdentityScopeSubclass("test", new IdentityScopeSubclass()); @@ -375,14 +313,8 @@ public class IdentityScope2Test extends junit.framework.TestCase { } /** - * @tests java.security.IdentityScope#toString() + * java.security.IdentityScope#toString() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {} - ) public void test_toString() throws Exception { IdentityScopeSubclass sub = new IdentityScopeSubclass("test", new IdentityScopeSubclass()); @@ -393,12 +325,6 @@ public class IdentityScope2Test extends junit.framework.TestCase { assertTrue("Not a valid String ", sub.toString().length() > 0); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Regression test", - method = "getIdentity", - args = {java.lang.String.class} - ) public void test_getIdentity() throws Exception { //Regression for HARMONY-1173 IdentityScope scope = IdentityScope.getSystemScope(); diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/IdentityScopeTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/IdentityScopeTest.java index 4c7aaa4..6d97caa 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/IdentityScopeTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/IdentityScopeTest.java @@ -22,11 +22,6 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.IdentityScope; import java.security.Permission; import java.security.Permissions; @@ -36,7 +31,7 @@ import java.security.SecurityPermission; import org.apache.harmony.security.tests.support.IdentityScopeStub; import junit.framework.TestCase; -@TestTargetClass(IdentityScope.class) + /** * Tests for <code>IdentityScope</code> * @@ -56,12 +51,6 @@ public class IdentityScopeTest extends TestCase { /** * Class under test for String toString() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {} - ) public final void testToString() { assertNotNull(new IdentityScopeStub("Aleksei Semenov").toString()); } @@ -69,12 +58,6 @@ public class IdentityScopeTest extends TestCase { /** * test default constructor void IdentityScope() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "IdentityScope", - args = {} - ) public final void testIdentityScope() { assertNotNull(new IdentityScopeStub()); } @@ -82,12 +65,6 @@ public class IdentityScopeTest extends TestCase { /** * check that void IdentityScope(String) creates instance with given name */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies just positive case with non null parameter", - method = "IdentityScope", - args = {java.lang.String.class} - ) public final void testIdentityScopeString() { is = new IdentityScopeStub("Aleksei Semenov"); assertNotNull(is); @@ -97,12 +74,6 @@ public class IdentityScopeTest extends TestCase { /** * check that void IdentityScope(String, IdentityScope) creates instance with given name and within given scope */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies just positive test with both non null parameters", - method = "IdentityScope", - args = {java.lang.String.class, java.security.IdentityScope.class} - ) public final void testIdentityScopeStringIdentityScope() throws Exception { IdentityScope scope = new IdentityScopeStub("my scope"); is = new IdentityScopeStub("Aleksei Semenov", scope); @@ -114,12 +85,6 @@ public class IdentityScopeTest extends TestCase { /** * just call IdentityScope.getSystemScope() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSystemScope", - args = {} - ) public final void testGetSystemScope() { String name = Security.getProperty("system.scope"); assertNotNull(name); @@ -133,20 +98,6 @@ public class IdentityScopeTest extends TestCase { * if permission is denied than SecurityException is thrown * */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setSystemScope", - args = {java.security.IdentityScope.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSystemScope", - args = {} - ) - }) public final void testSetSystemScope() { // default implementation is specified by security property system.scope IdentityScope systemScope = IdentityScope.getSystemScope(); diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/InvalidAlgorithmParameterExceptionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/InvalidAlgorithmParameterExceptionTest.java index 5612e30..890419e 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/InvalidAlgorithmParameterExceptionTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/InvalidAlgorithmParameterExceptionTest.java @@ -22,15 +22,10 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.InvalidAlgorithmParameterException; import junit.framework.TestCase; -@TestTargetClass(InvalidAlgorithmParameterException.class) + /** * Tests for <code>InvalidAlgorithmParameterException</code> class * constructors and methods. @@ -50,12 +45,6 @@ public class InvalidAlgorithmParameterExceptionTest extends TestCase { * Assertion: constructs InvalidAlgorithmParameterException with no detail * message */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "InvalidAlgorithmParameterException", - args = {} - ) public void testInvalidAlgorithmParameterException01() { InvalidAlgorithmParameterException tE = new InvalidAlgorithmParameterException(); assertNull("getMessage() must return null.", tE.getMessage()); @@ -67,12 +56,6 @@ public class InvalidAlgorithmParameterExceptionTest extends TestCase { * constructor Assertion: constructs InvalidAlgorithmParameterException with * detail message msg. Parameter <code>msg</code> is not null. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "InvalidAlgorithmParameterException", - args = {java.lang.String.class} - ) public void testInvalidAlgorithmParameterException02() { InvalidAlgorithmParameterException tE; for (int i = 0; i < msgs.length; i++) { @@ -88,12 +71,6 @@ public class InvalidAlgorithmParameterExceptionTest extends TestCase { * constructor Assertion: constructs InvalidAlgorithmParameterException when * <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "InvalidAlgorithmParameterException", - args = {java.lang.String.class} - ) public void testInvalidAlgorithmParameterException03() { String msg = null; InvalidAlgorithmParameterException tE = new InvalidAlgorithmParameterException( @@ -107,12 +84,6 @@ public class InvalidAlgorithmParameterExceptionTest extends TestCase { * constructor Assertion: constructs InvalidAlgorithmParameterException when * <code>cause</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "InvalidAlgorithmParameterException", - args = {java.lang.Throwable.class} - ) public void testInvalidAlgorithmParameterException04() { Throwable cause = null; InvalidAlgorithmParameterException tE = new InvalidAlgorithmParameterException( @@ -126,12 +97,6 @@ public class InvalidAlgorithmParameterExceptionTest extends TestCase { * constructor Assertion: constructs InvalidAlgorithmParameterException when * <code>cause</code> is not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "InvalidAlgorithmParameterException", - args = {java.lang.Throwable.class} - ) public void testInvalidAlgorithmParameterException05() { InvalidAlgorithmParameterException tE = new InvalidAlgorithmParameterException( tCause); @@ -152,12 +117,6 @@ public class InvalidAlgorithmParameterExceptionTest extends TestCase { * constructor Assertion: constructs InvalidAlgorithmParameterException when * <code>cause</code> is null <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "InvalidAlgorithmParameterException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testInvalidAlgorithmParameterException06() { InvalidAlgorithmParameterException tE = new InvalidAlgorithmParameterException( null, null); @@ -171,12 +130,6 @@ public class InvalidAlgorithmParameterExceptionTest extends TestCase { * constructor Assertion: constructs InvalidAlgorithmParameterException when * <code>cause</code> is null <code>msg</code> is not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "InvalidAlgorithmParameterException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testInvalidAlgorithmParameterException07() { InvalidAlgorithmParameterException tE; for (int i = 0; i < msgs.length; i++) { @@ -193,12 +146,6 @@ public class InvalidAlgorithmParameterExceptionTest extends TestCase { * constructor Assertion: constructs InvalidAlgorithmParameterException when * <code>cause</code> is not null <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "InvalidAlgorithmParameterException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testInvalidAlgorithmParameterException08() { InvalidAlgorithmParameterException tE = new InvalidAlgorithmParameterException( null, tCause); @@ -219,12 +166,6 @@ public class InvalidAlgorithmParameterExceptionTest extends TestCase { * constructor Assertion: constructs InvalidAlgorithmParameterException when * <code>cause</code> is not null <code>msg</code> is not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "InvalidAlgorithmParameterException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testInvalidAlgorithmParameterException09() { InvalidAlgorithmParameterException tE; for (int i = 0; i < msgs.length; i++) { diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/InvalidKeyExceptionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/InvalidKeyExceptionTest.java index 2bc6f7e..fa855cf 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/InvalidKeyExceptionTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/InvalidKeyExceptionTest.java @@ -22,15 +22,10 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.InvalidKeyException; import junit.framework.TestCase; -@TestTargetClass(InvalidKeyException.class) + /** * Tests for <code>InvalidKeyException</code> class constructors and methods. * @@ -48,12 +43,6 @@ public class InvalidKeyExceptionTest extends TestCase { * Test for <code>InvalidKeyException()</code> constructor Assertion: * constructs InvalidKeyException with no detail message */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "InvalidKeyException", - args = {} - ) public void testInvalidKeyException01() { InvalidKeyException tE = new InvalidKeyException(); assertNull("getMessage() must return null.", tE.getMessage()); @@ -65,12 +54,6 @@ public class InvalidKeyExceptionTest extends TestCase { * Assertion: constructs InvalidKeyException with detail message msg. * Parameter <code>msg</code> is not null. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "InvalidKeyException", - args = {java.lang.String.class} - ) public void testInvalidKeyException02() { InvalidKeyException tE; for (int i = 0; i < msgs.length; i++) { @@ -85,12 +68,6 @@ public class InvalidKeyExceptionTest extends TestCase { * Test for <code>InvalidKeyException(String)</code> constructor * Assertion: constructs InvalidKeyException when <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "InvalidKeyException", - args = {java.lang.String.class} - ) public void testInvalidKeyException03() { String msg = null; InvalidKeyException tE = new InvalidKeyException(msg); @@ -103,12 +80,6 @@ public class InvalidKeyExceptionTest extends TestCase { * Assertion: constructs InvalidKeyException when <code>cause</code> is * null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "InvalidKeyException", - args = {java.lang.Throwable.class} - ) public void testInvalidKeyException04() { Throwable cause = null; InvalidKeyException tE = new InvalidKeyException(cause); @@ -121,12 +92,6 @@ public class InvalidKeyExceptionTest extends TestCase { * Assertion: constructs InvalidKeyException when <code>cause</code> is * not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "InvalidKeyException", - args = {java.lang.Throwable.class} - ) public void testInvalidKeyException05() { InvalidKeyException tE = new InvalidKeyException(tCause); if (tE.getMessage() != null) { @@ -145,12 +110,6 @@ public class InvalidKeyExceptionTest extends TestCase { * constructor Assertion: constructs InvalidKeyException when * <code>cause</code> is null <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "InvalidKeyException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testInvalidKeyException06() { InvalidKeyException tE = new InvalidKeyException(null, null); assertNull("getMessage() must return null", tE.getMessage()); @@ -162,12 +121,6 @@ public class InvalidKeyExceptionTest extends TestCase { * constructor Assertion: constructs InvalidKeyException when * <code>cause</code> is null <code>msg</code> is not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "InvalidKeyException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testInvalidKeyException07() { InvalidKeyException tE; for (int i = 0; i < msgs.length; i++) { @@ -183,12 +136,6 @@ public class InvalidKeyExceptionTest extends TestCase { * constructor Assertion: constructs InvalidKeyException when * <code>cause</code> is not null <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "InvalidKeyException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testInvalidKeyException08() { InvalidKeyException tE = new InvalidKeyException(null, tCause); if (tE.getMessage() != null) { @@ -207,12 +154,6 @@ public class InvalidKeyExceptionTest extends TestCase { * constructor Assertion: constructs InvalidKeyException when * <code>cause</code> is not null <code>msg</code> is not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "InvalidKeyException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testInvalidKeyException09() { InvalidKeyException tE; for (int i = 0; i < msgs.length; i++) { diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/InvalidParameterExceptionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/InvalidParameterExceptionTest.java index 0359102..1d9b9cc 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/InvalidParameterExceptionTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/InvalidParameterExceptionTest.java @@ -22,15 +22,10 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.InvalidParameterException; import junit.framework.TestCase; -@TestTargetClass(InvalidParameterException.class) + /** * Tests for <code>InvalidParameterException</code> class constructors and * methods. @@ -49,12 +44,6 @@ public class InvalidParameterExceptionTest extends TestCase { * Test for <code>InvalidParameterException()</code> constructor * Assertion: constructs InvalidParameterException with no detail message */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "InvalidParameterException", - args = {} - ) public void testInvalidParameterException01() { InvalidParameterException tE = new InvalidParameterException(); assertNull("getMessage() must return null.", tE.getMessage()); @@ -66,12 +55,6 @@ public class InvalidParameterExceptionTest extends TestCase { * Assertion: constructs InvalidParameterException with detail message msg. * Parameter <code>msg</code> is not null. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "InvalidParameterException", - args = {java.lang.String.class} - ) public void testInvalidParameterException02() { InvalidParameterException tE; for (int i = 0; i < msgs.length; i++) { @@ -87,12 +70,6 @@ public class InvalidParameterExceptionTest extends TestCase { * Assertion: constructs InvalidParameterException when <code>msg</code> * is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "InvalidParameterException", - args = {java.lang.String.class} - ) public void testInvalidParameterException03() { String msg = null; InvalidParameterException tE = new InvalidParameterException(msg); diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KSCallbackHandlerProtectionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KSCallbackHandlerProtectionTest.java index 7ce831c..467444e 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KSCallbackHandlerProtectionTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KSCallbackHandlerProtectionTest.java @@ -22,11 +22,6 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.io.IOException; import java.security.KeyStore; @@ -37,12 +32,11 @@ import javax.security.auth.callback.UnsupportedCallbackException; import org.apache.harmony.security.tests.support.tmpCallbackHandler; import junit.framework.TestCase; -@TestTargetClass(KeyStore.CallbackHandlerProtection.class) + /** * Tests for <code>KeyStore.CallbackHandlerProtection> class constructor and methods * */ - public class KSCallbackHandlerProtectionTest extends TestCase { /** @@ -50,12 +44,6 @@ public class KSCallbackHandlerProtectionTest extends TestCase { * constructor * Assertion: throws NullPointerException when handler is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "CallbackHandlerProtection", - args = {javax.security.auth.callback.CallbackHandler.class} - ) public void testCallbackHandlerProtection() { try { new KeyStore.CallbackHandlerProtection(null); @@ -84,20 +72,6 @@ public class KSCallbackHandlerProtectionTest extends TestCase { * Test for <code>getCallbackHandler()</code> method * Assertion: returns CallbackHandler */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "CallbackHandlerProtection", - args = {javax.security.auth.callback.CallbackHandler.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getCallbackHandler", - args = {} - ) - }) public void testGetCallBackHandler() { CallbackHandler cbh = new tmpCallbackHandler(); KeyStore.CallbackHandlerProtection ksCBH = new KeyStore.CallbackHandlerProtection(cbh); diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KSPasswordProtectionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KSPasswordProtectionTest.java index 5db4e2f..af811b0 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KSPasswordProtectionTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KSPasswordProtectionTest.java @@ -22,22 +22,16 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.KeyStore; import javax.security.auth.DestroyFailedException; import junit.framework.TestCase; -@TestTargetClass(KeyStore.PasswordProtection.class) + /** * Tests for <code>KeyStore.PasswordProtection</code> class constructor and methods * */ - public class KSPasswordProtectionTest extends TestCase { /** @@ -50,32 +44,6 @@ public class KSPasswordProtectionTest extends TestCase { * getPassword() returns password or throws IllegalArgumentException * if PasswordProtection is destroyed */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "PasswordProtection", - args = {char[].class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPassword", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isDestroyed", - args = {} - ), - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "", - method = "destroy", - args = {} - ) - }) public void testGetPassword() throws DestroyFailedException { char [] pass = {'a', 'b', 'c'}; KeyStore.PasswordProtection ksPWP = new KeyStore.PasswordProtection(pass); diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KSPrivateKeyEntryTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KSPrivateKeyEntryTest.java index 8c50763..53956ef 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KSPrivateKeyEntryTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KSPrivateKeyEntryTest.java @@ -22,11 +22,6 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.KeyStore; import java.security.PrivateKey; import java.security.cert.Certificate; @@ -38,12 +33,10 @@ import junit.framework.TestCase; import junit.framework.Test; import junit.framework.TestSuite; -@TestTargetClass(KeyStore.PrivateKeyEntry.class) /** * Tests for <code>KeyStore.PrivateKeyEntry</code> class constructor and methods * */ - public class KSPrivateKeyEntryTest extends TestCase { private PrivateKey testPrivateKey; @@ -66,12 +59,6 @@ public class KSPrivateKeyEntryTest extends TestCase { * constructor * Assertion: throws NullPointerException when privateKey is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "PrivateKeyEntry", - args = {java.security.PrivateKey.class, java.security.cert.Certificate[].class} - ) public void testPrivateKeyEntry01() { Certificate[] certs = new MyCertificate[1];//new Certificate[1]; PrivateKey pk = null; @@ -88,12 +75,6 @@ public class KSPrivateKeyEntryTest extends TestCase { * Assertion: throws NullPointerException when chain is null * and throws IllegalArgumentException when chain length is 0 */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "PrivateKeyEntry", - args = {java.security.PrivateKey.class, java.security.cert.Certificate[].class} - ) public void testPrivateKeyEntry02() { Certificate[] chain = null; PrivateKey pk = new tmpPrivateKey(); @@ -115,12 +96,6 @@ public class KSPrivateKeyEntryTest extends TestCase { * Assertion: throws IllegalArgumentException when chain contains certificates * of different types */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "PrivateKeyEntry", - args = {java.security.PrivateKey.class, java.security.cert.Certificate[].class} - ) public void testPrivateKeyEntry03() { createParams(true, false); try { @@ -136,12 +111,6 @@ public class KSPrivateKeyEntryTest extends TestCase { * Assertion: throws IllegalArgumentException when algorithm of privateKey * does not match the algorithm of PublicKey in the end certificate (with 0 index) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "PrivateKeyEntry", - args = {java.security.PrivateKey.class, java.security.cert.Certificate[].class} - ) public void testPrivateKeyEntry04() { createParams(false, true); try { @@ -155,12 +124,6 @@ public class KSPrivateKeyEntryTest extends TestCase { * Test for <code>getPrivateKey()</code> method * Assertion: returns PrivateKey object */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPrivateKey", - args = {} - ) public void testGetPrivateKey() { createParams(false, false); KeyStore.PrivateKeyEntry ksPKE = new KeyStore.PrivateKeyEntry( @@ -173,12 +136,6 @@ public class KSPrivateKeyEntryTest extends TestCase { * Test for <code>getCertificateChain()</code> method Assertion: returns * array of the Certificates corresponding to chain */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getCertificateChain", - args = {} - ) public void testGetCertificateChain() { createParams(false, false); KeyStore.PrivateKeyEntry ksPKE = new KeyStore.PrivateKeyEntry( @@ -195,12 +152,6 @@ public class KSPrivateKeyEntryTest extends TestCase { * Test for <code>getCertificate()</code> method * Assertion: returns end Certificate (with 0 index in chain) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getCertificate", - args = {} - ) public void testGetCertificate() { createParams(false, false); KeyStore.PrivateKeyEntry ksPKE = new KeyStore.PrivateKeyEntry( @@ -213,12 +164,6 @@ public class KSPrivateKeyEntryTest extends TestCase { * Test for <code>toString()</code> method * Assertion: returns non null String */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {} - ) public void testToString() { createParams(false, false); KeyStore.PrivateKeyEntry ksPKE = new KeyStore.PrivateKeyEntry( diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KSSecretKeyEntryTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KSSecretKeyEntryTest.java index ed8b60d..f85593e 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KSSecretKeyEntryTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KSSecretKeyEntryTest.java @@ -22,34 +22,22 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.KeyStore; import javax.crypto.SecretKey; import junit.framework.TestCase; -@TestTargetClass(KeyStore.SecretKeyEntry.class) + /** * Tests for <code>KeyStore.SecretKeyEntry</code> class constructor and methods * */ - public class KSSecretKeyEntryTest extends TestCase { /** * Test for <code>SecretKeyEntry(SecretKey secretKey)</code> constructor * Assertion: throws NullPointerException when secretKey is null */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "SecretKeyEntry", - args = {javax.crypto.SecretKey.class} - ) public void testSecretKeyEntry() { SecretKey sk = null; try { @@ -73,12 +61,6 @@ public class KSSecretKeyEntryTest extends TestCase { * Test for <code>getSecretKey()</code> method * Assertion: returns SecretKey from the given entry */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSecretKey", - args = {} - ) public void testGetSecretKey() { SecretKey sk = new tmpSecretKey(); KeyStore.SecretKeyEntry ske = new KeyStore.SecretKeyEntry(sk); @@ -89,12 +71,6 @@ public class KSSecretKeyEntryTest extends TestCase { * Test for <code>toString()</code> method * Assertion: returns non null string */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {} - ) public void testToString() { SecretKey sk = new tmpSecretKey(); KeyStore.SecretKeyEntry ske = new KeyStore.SecretKeyEntry(sk); diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KSTrustedCertificateEntryTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KSTrustedCertificateEntryTest.java index 64e4544..5350542 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KSTrustedCertificateEntryTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KSTrustedCertificateEntryTest.java @@ -22,11 +22,6 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.KeyStore; import java.security.cert.Certificate; @@ -34,7 +29,7 @@ import org.apache.harmony.security.tests.support.cert.MyCertificate; import junit.framework.TestCase; -@TestTargetClass(KeyStore.TrustedCertificateEntry.class) + /** * Tests for <code>KeyStore.TrustedCertificateEntry</code> class constructor and methods * @@ -47,12 +42,6 @@ public class KSTrustedCertificateEntryTest extends TestCase { * constructor * Assertion: throws NullPointerException when trustCert is null */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "TrustedCertificateEntry", - args = {java.security.cert.Certificate.class} - ) public void testTrustedCertificateEntry() { Certificate cert = null; try { @@ -75,12 +64,6 @@ public class KSTrustedCertificateEntryTest extends TestCase { * Test for <codfe>getTrustedCertificate()</code> method * Assertion: returns trusted Certificate from goven entry */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getTrustedCertificate", - args = {} - ) public void testGetTrustedCertificate() { Certificate cert = new MyCertificate("TEST", new byte[10]); KeyStore.TrustedCertificateEntry ksTCE = @@ -92,12 +75,6 @@ public class KSTrustedCertificateEntryTest extends TestCase { * Test for <codfe>toString()</code> method * Assertion: returns non null string */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {} - ) public void testToString() { Certificate cert = new MyCertificate("TEST", new byte[10]); KeyStore.TrustedCertificateEntry ksTCE = diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyExceptionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyExceptionTest.java index aff89c6..a6e9183 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyExceptionTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyExceptionTest.java @@ -22,15 +22,10 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.KeyException; import junit.framework.TestCase; -@TestTargetClass(KeyException.class) + /** * Tests for <code>KeyException</code> class constructors and methods. * @@ -48,12 +43,6 @@ public class KeyExceptionTest extends TestCase { * Test for <code>KeyException()</code> constructor Assertion: constructs * KeyException with no detail message */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "KeyException", - args = {} - ) public void testKeyException01() { KeyException tE = new KeyException(); assertNull("getMessage() must return null.", tE.getMessage()); @@ -65,12 +54,6 @@ public class KeyExceptionTest extends TestCase { * constructs KeyException with detail message msg. Parameter * <code>msg</code> is not null. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "KeyException", - args = {java.lang.String.class} - ) public void testKeyException02() { KeyException tE; for (int i = 0; i < msgs.length; i++) { @@ -85,12 +68,6 @@ public class KeyExceptionTest extends TestCase { * Test for <code>KeyException(String)</code> constructor Assertion: * constructs KeyException when <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "KeyException", - args = {java.lang.String.class} - ) public void testKeyException03() { String msg = null; KeyException tE = new KeyException(msg); @@ -102,12 +79,6 @@ public class KeyExceptionTest extends TestCase { * Test for <code>KeyException(Throwable)</code> constructor Assertion: * constructs KeyException when <code>cause</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "KeyException", - args = {java.lang.Throwable.class} - ) public void testKeyException04() { Throwable cause = null; KeyException tE = new KeyException(cause); @@ -119,12 +90,6 @@ public class KeyExceptionTest extends TestCase { * Test for <code>KeyException(Throwable)</code> constructor Assertion: * constructs KeyException when <code>cause</code> is not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "KeyException", - args = {java.lang.Throwable.class} - ) public void testKeyException05() { KeyException tE = new KeyException(tCause); if (tE.getMessage() != null) { @@ -143,12 +108,6 @@ public class KeyExceptionTest extends TestCase { * Assertion: constructs KeyException when <code>cause</code> is null * <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "KeyException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testKeyException06() { KeyException tE = new KeyException(null, null); assertNull("getMessage() must return null", tE.getMessage()); @@ -160,12 +119,6 @@ public class KeyExceptionTest extends TestCase { * Assertion: constructs KeyException when <code>cause</code> is null * <code>msg</code> is not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "KeyException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testKeyException07() { KeyException tE; for (int i = 0; i < msgs.length; i++) { @@ -181,12 +134,6 @@ public class KeyExceptionTest extends TestCase { * Assertion: constructs KeyException when <code>cause</code> is not null * <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "KeyException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testKeyException08() { KeyException tE = new KeyException(null, tCause); if (tE.getMessage() != null) { @@ -205,12 +152,6 @@ public class KeyExceptionTest extends TestCase { * Assertion: constructs KeyException when <code>cause</code> is not null * <code>msg</code> is not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "KeyException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testKeyException09() { KeyException tE; for (int i = 0; i < msgs.length; i++) { diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyFactorySpiTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyFactorySpiTest.java index faced3c..39a367f 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyFactorySpiTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyFactorySpiTest.java @@ -17,11 +17,6 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.KeyFactorySpi; import java.security.PrivateKey; import java.security.spec.KeySpec; @@ -35,45 +30,12 @@ import junit.framework.TestCase; * and methods. * */ -@TestTargetClass(KeyFactorySpi.class) public class KeyFactorySpiTest extends TestCase { /** * Test for <code>KeyFactorySpi</code> constructor * Assertion: constructs KeyFactorySpi */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "KeyFactorySpi", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineGeneratePrivate", - args = {java.security.spec.KeySpec.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineGeneratePublic", - args = {java.security.spec.KeySpec.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineTranslateKey", - args = {java.security.Key.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineGetKeySpec", - args = {java.security.Key.class, java.lang.Class.class} - ) - }) public void testKeyFactorySpi() { MyKeyFactorySpi keyFSpi = new MyKeyFactorySpi(); assertTrue(keyFSpi instanceof KeyFactorySpi); diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyFactoryTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyFactoryTest.java index 67dab34..75617e1 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyFactoryTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyFactoryTest.java @@ -1,9 +1,5 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; - import junit.framework.TestCase; import java.lang.reflect.Constructor; @@ -23,7 +19,6 @@ import java.security.spec.InvalidKeySpecException; import java.security.spec.KeySpec; import java.util.Arrays; -@TestTargetClass(KeyFactory.class) public class KeyFactoryTest extends TestCase { Provider provider; @@ -54,11 +49,6 @@ public class KeyFactoryTest extends TestCase { } @SuppressWarnings("unchecked") - @TestTargetNew( - level=TestLevel.COMPLETE, - method="getInstance", - args={String.class} - ) public void testGetInstanceString() { try { KeyFactory factory = KeyFactory.getInstance(TEST_KEYFACTORY_NAME); @@ -93,11 +83,6 @@ public class KeyFactoryTest extends TestCase { } @SuppressWarnings("unchecked") - @TestTargetNew( - level=TestLevel.COMPLETE, - method="getInstance", - args={String.class, String.class} - ) public void testGetInstanceStringString() { try { KeyFactory factory = KeyFactory.getInstance(TEST_KEYFACTORY_NAME, TEST_PROVIDER_NAME); @@ -141,11 +126,6 @@ public class KeyFactoryTest extends TestCase { } @SuppressWarnings("unchecked") - @TestTargetNew( - level=TestLevel.COMPLETE, - method="getInstance", - args={String.class, Provider.class} - ) public void testGetInstanceStringProvider() { try { KeyFactory factory = KeyFactory.getInstance(TEST_KEYFACTORY_NAME, provider); @@ -195,11 +175,6 @@ public class KeyFactoryTest extends TestCase { } @SuppressWarnings("unchecked") - @TestTargetNew( - level=TestLevel.COMPLETE, - method="generatePublic", - args={KeySpec.class} - ) public void testGeneratePublic() { KeyFactory factory = null; try { @@ -249,11 +224,6 @@ public class KeyFactoryTest extends TestCase { } @SuppressWarnings("unchecked") - @TestTargetNew( - level=TestLevel.COMPLETE, - method="generatePrivate", - args={KeySpec.class} - ) public void testGeneratePrivate() { KeyFactory factory = null; try { @@ -302,11 +272,6 @@ public class KeyFactoryTest extends TestCase { } @SuppressWarnings("unchecked") - @TestTargetNew( - level=TestLevel.COMPLETE, - method="getKeySpec", - args={Key.class, Class.class} - ) public void testGetKeySpec() { KeyFactory factory = null; try { @@ -389,11 +354,6 @@ public class KeyFactoryTest extends TestCase { } @SuppressWarnings("unchecked") - @TestTargetNew( - level=TestLevel.COMPLETE, - method="translateKey", - args={Key.class} - ) public void testTranslateKey() { KeyFactory factory = null; try { diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyManagementExceptionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyManagementExceptionTest.java index b84e940..fb81062 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyManagementExceptionTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyManagementExceptionTest.java @@ -22,15 +22,10 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.KeyManagementException; import junit.framework.TestCase; -@TestTargetClass(KeyManagementException.class) + /** * Tests for <code>KeyManagementException</code> class constructors and * methods. @@ -49,12 +44,6 @@ public class KeyManagementExceptionTest extends TestCase { * Test for <code>KeyManagementException()</code> constructor Assertion: * constructs KeyManagementException with no detail message */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "KeyManagementException", - args = {} - ) public void testKeyManagementException01() { KeyManagementException tE = new KeyManagementException(); assertNull("getMessage() must return null.", tE.getMessage()); @@ -66,12 +55,6 @@ public class KeyManagementExceptionTest extends TestCase { * Assertion: constructs KeyManagementException with detail message msg. * Parameter <code>msg</code> is not null. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "KeyManagementException", - args = {java.lang.String.class} - ) public void testKeyManagementException02() { KeyManagementException tE; for (int i = 0; i < msgs.length; i++) { @@ -87,12 +70,6 @@ public class KeyManagementExceptionTest extends TestCase { * Assertion: constructs KeyManagementException when <code>msg</code> is * null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "KeyManagementException", - args = {java.lang.String.class} - ) public void testKeyManagementException03() { String msg = null; KeyManagementException tE = new KeyManagementException(msg); @@ -105,12 +82,6 @@ public class KeyManagementExceptionTest extends TestCase { * Assertion: constructs KeyManagementException when <code>cause</code> is * null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "KeyManagementException", - args = {java.lang.Throwable.class} - ) public void testKeyManagementException04() { Throwable cause = null; KeyManagementException tE = new KeyManagementException(cause); @@ -123,12 +94,6 @@ public class KeyManagementExceptionTest extends TestCase { * Assertion: constructs KeyManagementException when <code>cause</code> is * not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "KeyManagementException", - args = {java.lang.Throwable.class} - ) public void testKeyManagementException05() { KeyManagementException tE = new KeyManagementException(tCause); if (tE.getMessage() != null) { @@ -147,12 +112,6 @@ public class KeyManagementExceptionTest extends TestCase { * constructor Assertion: constructs KeyManagementException when * <code>cause</code> is null <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "KeyManagementException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testKeyManagementException06() { KeyManagementException tE = new KeyManagementException(null, null); assertNull("getMessage() must return null", tE.getMessage()); @@ -164,12 +123,6 @@ public class KeyManagementExceptionTest extends TestCase { * constructor Assertion: constructs KeyManagementException when * <code>cause</code> is null <code>msg</code> is not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "KeyManagementException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testKeyManagementException07() { KeyManagementException tE; for (int i = 0; i < msgs.length; i++) { @@ -185,12 +138,6 @@ public class KeyManagementExceptionTest extends TestCase { * constructor Assertion: constructs KeyManagementException when * <code>cause</code> is not null <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "KeyManagementException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testKeyManagementException08() { KeyManagementException tE = new KeyManagementException(null, tCause); if (tE.getMessage() != null) { @@ -209,12 +156,6 @@ public class KeyManagementExceptionTest extends TestCase { * constructor Assertion: constructs KeyManagementException when * <code>cause</code> is not null <code>msg</code> is not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "KeyManagementException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testKeyManagementException09() { KeyManagementException tE; for (int i = 0; i < msgs.length; i++) { diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator1Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator1Test.java index b59069e..f706623 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator1Test.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator1Test.java @@ -22,11 +22,6 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.math.BigInteger; import java.security.InvalidAlgorithmParameterException; import java.security.InvalidParameterException; @@ -43,12 +38,11 @@ import org.apache.harmony.security.tests.support.MyKeyPairGenerator2; import org.apache.harmony.security.tests.support.SpiEngUtils; import junit.framework.TestCase; -@TestTargetClass(KeyPairGenerator.class) + /** * Tests for <code>KeyPairGenerator</code> class constructors and methods. * */ - public class KeyPairGenerator1Test extends TestCase { private static String[] invalidValues = SpiEngUtils.invalidValues; @@ -102,12 +96,6 @@ public class KeyPairGenerator1Test extends TestCase { * throws NullPointerException when algorithm is null * throws NoSuchAlgorithmException when algorithm is incorrect; */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class} - ) public void testKeyPairGenerator01() throws NoSuchAlgorithmException { try { KeyPairGenerator.getInstance(null); @@ -129,12 +117,6 @@ public class KeyPairGenerator1Test extends TestCase { * Test for <code>getInstance(String algorithm)</code> method * Assertion: returns KeyPairGenerator object */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class} - ) public void testKeyPairGenerator02() throws NoSuchAlgorithmException { if (!DSASupported) { fail(NotSupportMsg); @@ -153,12 +135,6 @@ public class KeyPairGenerator1Test extends TestCase { * method * Assertion: throws IllegalArgumentException when provider is null or empty */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void testKeyPairGenerator03() throws NoSuchAlgorithmException, NoSuchProviderException { if (!DSASupported) { @@ -186,12 +162,6 @@ public class KeyPairGenerator1Test extends TestCase { * Assertion: * throws NoSuchProviderException when provider is not available */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void testKeyPairGenerator04() throws NoSuchAlgorithmException, IllegalArgumentException { if (!DSASupported) { @@ -219,12 +189,6 @@ public class KeyPairGenerator1Test extends TestCase { * throws NullPointerException when algorithm is null * throws NoSuchAlgorithmException when algorithm is incorrect; */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void testKeyPairGenerator05() throws NoSuchProviderException, IllegalArgumentException { if (!DSASupported) { @@ -254,12 +218,6 @@ public class KeyPairGenerator1Test extends TestCase { * method * Assertion: returns KeyPairGenerator object */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void testKeyPairGenerator06() throws NoSuchProviderException, NoSuchAlgorithmException, IllegalArgumentException { if (!DSASupported) { @@ -281,12 +239,6 @@ public class KeyPairGenerator1Test extends TestCase { * method * Assertion: throws IllegalArgumentException when provider is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.security.Provider.class} - ) public void testKeyPairGenerator07() throws NoSuchAlgorithmException { if (!DSASupported) { fail(NotSupportMsg); @@ -309,12 +261,6 @@ public class KeyPairGenerator1Test extends TestCase { * throws NullPointerException when algorithm is null * throws NoSuchAlgorithmException when algorithm is incorrect; */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.security.Provider.class} - ) public void testKeyPairGenerator08() throws IllegalArgumentException { if (!DSASupported) { fail(NotSupportMsg); @@ -342,12 +288,6 @@ public class KeyPairGenerator1Test extends TestCase { * method * Assertion: returns KeyPairGenerator object */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.security.Provider.class} - ) public void testKeyPairGenerator09() throws NoSuchAlgorithmException, IllegalArgumentException { if (!DSASupported) { @@ -369,20 +309,6 @@ public class KeyPairGenerator1Test extends TestCase { * Assertion: KeyPairGenerator was initialized before the invocation * of these methods */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "generateKeyPair", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "genKeyPair", - args = {} - ) - }) public void testKeyPairGenerator10() throws NoSuchAlgorithmException, NoSuchProviderException, IllegalArgumentException { if (!DSASupported) { @@ -414,32 +340,6 @@ public class KeyPairGenerator1Test extends TestCase { * InvalidAlgorithmParameterException when parameters keysize or param are * incorrect */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "initialize", - args = {java.security.spec.AlgorithmParameterSpec.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "initialize", - args = {java.security.spec.AlgorithmParameterSpec.class, java.security.SecureRandom.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "initialize", - args = {int.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "initialize", - args = {int.class, java.security.SecureRandom.class} - ) - }) public void testKeyPairGenerator11() throws NoSuchAlgorithmException, NoSuchProviderException { if (!DSASupported) { @@ -482,32 +382,6 @@ public class KeyPairGenerator1Test extends TestCase { * incorrect Assertion: generateKeyPair() and genKeyPair() return null * KeyPair Additional class MyKeyPairGenerator1 is used */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "initialize", - args = {java.security.spec.AlgorithmParameterSpec.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "initialize", - args = {java.security.spec.AlgorithmParameterSpec.class, java.security.SecureRandom.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "initialize", - args = {int.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "initialize", - args = {int.class, java.security.SecureRandom.class} - ) - }) public void testKeyPairGenerator12() { int[] keys = { -1, -250, 1, 64, 512, 1024 }; SecureRandom random = new SecureRandom(); @@ -584,32 +458,6 @@ public class KeyPairGenerator1Test extends TestCase { * genKeyPair() return not null KeyPair Additional class MyKeyPairGenerator2 * is used */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "", - method = "initialize", - args = {java.security.spec.AlgorithmParameterSpec.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "", - method = "initialize", - args = {java.security.spec.AlgorithmParameterSpec.class, java.security.SecureRandom.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "", - method = "initialize", - args = {int.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "", - method = "initialize", - args = {int.class, java.security.SecureRandom.class} - ) - }) public void testKeyPairGenerator13() { int[] keys = { -1, -250, 1, 63, -512, -1024 }; SecureRandom random = new SecureRandom(); diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator2Test.java index 6319e47..1c88a08 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator2Test.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator2Test.java @@ -22,11 +22,6 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.InvalidAlgorithmParameterException; import java.security.InvalidParameterException; import java.security.KeyPairGenerator; @@ -42,12 +37,11 @@ import org.apache.harmony.security.tests.support.MyKeyPairGenerator2; import org.apache.harmony.security.tests.support.SpiEngUtils; import junit.framework.TestCase; -@TestTargetClass(KeyPairGenerator.class) + /** * Tests for <code>KeyPairGenerator</code> class constructors and methods. * */ - public class KeyPairGenerator2Test extends TestCase { private String KeyPairGeneratorProviderClass = ""; @@ -322,12 +316,6 @@ public class KeyPairGenerator2Test extends TestCase { } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class} - ) public void testGetInstance01() throws NoSuchAlgorithmException, InvalidAlgorithmParameterException { KeyPairGeneratorProviderClass = KeyPairGeneratorProviderClass1; @@ -337,12 +325,6 @@ public class KeyPairGenerator2Test extends TestCase { GetInstance01(1); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void testGetInstance02() throws NoSuchAlgorithmException, NoSuchProviderException, IllegalArgumentException, InvalidAlgorithmParameterException { @@ -353,12 +335,6 @@ public class KeyPairGenerator2Test extends TestCase { GetInstance02(1); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.security.Provider.class} - ) public void testGetInstance03() throws NoSuchAlgorithmException, IllegalArgumentException, InvalidAlgorithmParameterException { KeyPairGeneratorProviderClass = KeyPairGeneratorProviderClass1; @@ -368,12 +344,6 @@ public class KeyPairGenerator2Test extends TestCase { GetInstance03(1); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class} - ) public void testGetInstance04() throws NoSuchAlgorithmException, InvalidAlgorithmParameterException { KeyPairGeneratorProviderClass = KeyPairGeneratorProviderClass2; @@ -383,12 +353,6 @@ public class KeyPairGenerator2Test extends TestCase { GetInstance01(2); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void testGetInstance05() throws NoSuchAlgorithmException, NoSuchProviderException, IllegalArgumentException, InvalidAlgorithmParameterException { @@ -399,12 +363,6 @@ public class KeyPairGenerator2Test extends TestCase { GetInstance02(2); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.security.Provider.class} - ) public void testGetInstance06() throws NoSuchAlgorithmException, IllegalArgumentException, InvalidAlgorithmParameterException { KeyPairGeneratorProviderClass = KeyPairGeneratorProviderClass2; @@ -414,12 +372,6 @@ public class KeyPairGenerator2Test extends TestCase { GetInstance03(2); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class} - ) public void testGetInstance07() throws NoSuchAlgorithmException, InvalidAlgorithmParameterException { KeyPairGeneratorProviderClass = KeyPairGeneratorProviderClass3; @@ -429,12 +381,6 @@ public class KeyPairGenerator2Test extends TestCase { GetInstance01(3); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void testGetInstance08() throws NoSuchAlgorithmException, NoSuchProviderException, IllegalArgumentException, InvalidAlgorithmParameterException { @@ -445,12 +391,6 @@ public class KeyPairGenerator2Test extends TestCase { GetInstance02(3); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.security.Provider.class} - ) public void testGetInstance09() throws NoSuchAlgorithmException, IllegalArgumentException, InvalidAlgorithmParameterException { KeyPairGeneratorProviderClass = KeyPairGeneratorProviderClass3; @@ -460,12 +400,6 @@ public class KeyPairGenerator2Test extends TestCase { GetInstance03(3); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class} - ) public void testGetInstance10() throws NoSuchAlgorithmException, InvalidAlgorithmParameterException { KeyPairGeneratorProviderClass = KeyPairGeneratorProviderClass4; @@ -475,12 +409,6 @@ public class KeyPairGenerator2Test extends TestCase { GetInstance01(4); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void testGetInstance11() throws NoSuchAlgorithmException, NoSuchProviderException, IllegalArgumentException, InvalidAlgorithmParameterException { @@ -491,12 +419,6 @@ public class KeyPairGenerator2Test extends TestCase { GetInstance02(4); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.security.Provider.class} - ) public void testGetInstance12() throws NoSuchAlgorithmException, IllegalArgumentException, InvalidAlgorithmParameterException { KeyPairGeneratorProviderClass = KeyPairGeneratorProviderClass4; diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator3Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator3Test.java index a48ea43..b4e451d 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator3Test.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator3Test.java @@ -22,11 +22,6 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.AlgorithmParameters; import java.security.AlgorithmParametersSpi; import java.security.KeyPair; @@ -41,12 +36,11 @@ import org.apache.harmony.security.tests.java.security.AlgorithmParametersTest.m import org.apache.harmony.security.tests.support.SpiEngUtils; import junit.framework.TestCase; -@TestTargetClass(KeyPairGenerator.class) + /** * Tests for KeyPairGenerator class * */ - public class KeyPairGenerator3Test extends TestCase { private static String validProviderName = null; @@ -93,20 +87,6 @@ public class KeyPairGenerator3Test extends TestCase { * Assertion: KeyPairGenerator was initialized before the invocation * of these methods */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "generateKeyPair", - args = {} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "genKeyPair", - args = {} - ) - }) public void testGenKeyPair01() throws NoSuchAlgorithmException, NoSuchProviderException, IllegalArgumentException { if (!DSASupported) { @@ -133,20 +113,6 @@ public class KeyPairGenerator3Test extends TestCase { * methods * Assertion: these methods are used without previously initialization */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "generateKeyPair", - args = {} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "genKeyPair", - args = {} - ) - }) public void testGenKeyPair02() throws NoSuchAlgorithmException, NoSuchProviderException, IllegalArgumentException { if (!DSASupported) { @@ -170,12 +136,6 @@ public class KeyPairGenerator3Test extends TestCase { * Test for <code>KeyPairGenerator</code> constructor * Assertion: returns KeyPairGenerator object */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "KeyPairGenerator", - args = {java.lang.String.class} - ) public void testKeyPairGeneratorConst() { String[] alg = {null, "", "AsDfGh!#$*", "DSA", "RSA"}; MykeyPGen kpg; diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator4Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator4Test.java index 4f237b5..2093d66 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator4Test.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGenerator4Test.java @@ -17,11 +17,6 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.KeyPairGenerator; import java.security.Provider; import java.security.SecureRandom; @@ -30,18 +25,11 @@ import java.security.spec.DSAParameterSpec; import java.security.interfaces.DSAPublicKey; import java.security.interfaces.DSAParams; -@TestTargetClass(KeyPairGenerator.class) public class KeyPairGenerator4Test extends junit.framework.TestCase { /** - * @tests java.security.KeyPairGenerator#genKeyPair() + * java.security.KeyPairGenerator#genKeyPair() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "genKeyPair", - args = {} - ) public void test_genKeyPair() throws Exception { KeyPairGenerator gen = KeyPairGenerator.getInstance("DSA"); gen.initialize(1024); @@ -49,42 +37,24 @@ public class KeyPairGenerator4Test extends junit.framework.TestCase { } /** - * @tests java.security.KeyPairGenerator#getAlgorithm() + * java.security.KeyPairGenerator#getAlgorithm() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getAlgorithm", - args = {} - ) public void test_getAlgorithm() throws Exception { String alg = KeyPairGenerator.getInstance("DSA").getAlgorithm(); assertEquals("getAlgorithm returned unexpected value", "DSA", alg); } /** - * @tests java.security.KeyPairGenerator#getInstance(java.lang.String) + * java.security.KeyPairGenerator#getInstance(java.lang.String) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verification of other string parameters and exception cases missed", - method = "getInstance", - args = {java.lang.String.class} - ) public void test_getInstanceLjava_lang_String() throws Exception { KeyPairGenerator.getInstance("DSA"); } /** - * @tests java.security.KeyPairGenerator#getInstance(java.lang.String, + * java.security.KeyPairGenerator#getInstance(java.lang.String, * java.lang.String) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "NoSuchAlgorithmException, NoSuchProviderException checking missed", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void test_getInstanceLjava_lang_StringLjava_lang_String() throws Exception { @@ -106,43 +76,25 @@ public class KeyPairGenerator4Test extends junit.framework.TestCase { } /** - * @tests java.security.KeyPairGenerator#getProvider() + * java.security.KeyPairGenerator#getProvider() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getProvider", - args = {} - ) public void test_getProvider() throws Exception { Provider p = KeyPairGenerator.getInstance("DSA").getProvider(); assertNotNull("provider is null", p); } /** - * @tests java.security.KeyPairGenerator#initialize(int) + * java.security.KeyPairGenerator#initialize(int) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "InvalidParameterException checking missed", - method = "initialize", - args = {int.class} - ) public void test_initializeI() throws Exception { KeyPairGenerator keyPair = KeyPairGenerator.getInstance("DSA"); keyPair.initialize(1024); } /** - * @tests java.security.KeyPairGenerator#initialize(int, + * java.security.KeyPairGenerator#initialize(int, * java.security.SecureRandom) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "InvalidParameterException checking missed", - method = "initialize", - args = {int.class, java.security.SecureRandom.class} - ) public void test_initializeILjava_security_SecureRandom() throws Exception { KeyPairGenerator keyPair = KeyPairGenerator.getInstance("DSA"); keyPair.initialize(1024, new SecureRandom()); @@ -150,14 +102,8 @@ public class KeyPairGenerator4Test extends junit.framework.TestCase { /** - * @tests java.security.KeyPairGenerator#initialize(java.security.spec.AlgorithmParameterSpec) + * java.security.KeyPairGenerator#initialize(java.security.spec.AlgorithmParameterSpec) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "InvalidAlgorithmParameterException checking missed", - method = "initialize", - args = {java.security.spec.AlgorithmParameterSpec.class} - ) public void test_initializeLjava_security_spec_AlgorithmParameterSpec() throws Exception { // create DSAParams @@ -173,15 +119,9 @@ public class KeyPairGenerator4Test extends junit.framework.TestCase { } /** - * @tests java.security.KeyPairGenerator#initialize(java.security.spec.AlgorithmParameterSpec, + * java.security.KeyPairGenerator#initialize(java.security.spec.AlgorithmParameterSpec, * java.security.SecureRandom) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "InvalidAlgorithmParameterException checking missed", - method = "initialize", - args = {java.security.spec.AlgorithmParameterSpec.class, java.security.SecureRandom.class} - ) public void test_initializeLjava_security_spec_AlgorithmParameterSpecLjava_security_SecureRandom() throws Exception { // create DSAParams diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGeneratorSpiTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGeneratorSpiTest.java index 0517430..910da99 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGeneratorSpiTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairGeneratorSpiTest.java @@ -22,11 +22,6 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.InvalidAlgorithmParameterException; import java.security.InvalidParameterException; import java.security.KeyPair; @@ -37,44 +32,17 @@ import java.security.spec.AlgorithmParameterSpec; import org.apache.harmony.security.tests.support.MyKeyPairGeneratorSpi; import junit.framework.TestCase; -@TestTargetClass(KeyPairGeneratorSpi.class) + /** * Tests for <code>KeyPairGeneratorSpi</code> class constructors and methods. * */ - public class KeyPairGeneratorSpiTest extends TestCase { /** * Test for <code>KeyPairGeneratorSpi</code> constructor * Assertion: constructs KeyPairGeneratorSpi */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "KeyPairGeneratorSpi", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "generateKeyPair", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "initialize", - args = {java.security.spec.AlgorithmParameterSpec.class, java.security.SecureRandom.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "initialize", - args = {int.class, java.security.SecureRandom.class} - ) - }) public void testKeyPairGeneratorSpi01() throws InvalidAlgorithmParameterException, InvalidParameterException { diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairTest.java index f4c68f3..afde0fa 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyPairTest.java @@ -22,18 +22,13 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.KeyPair; import java.security.PrivateKey; import java.security.PublicKey; import java.security.spec.InvalidKeySpecException; import junit.framework.TestCase; -@TestTargetClass( KeyPair.class) + /** * Tests for fields and methods of class <code>KeyPair</code> * @@ -75,12 +70,6 @@ public class KeyPairTest extends TestCase { * Assertion: creates new <code>KeyPair</code> instance using valid * parameters (both <code>null</code>) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verification when parameter is null", - method = "KeyPair", - args = {java.security.PublicKey.class, java.security.PrivateKey.class} - ) public final void testKeyPair01() { Object kp = new KeyPair(null, null); assertTrue(kp instanceof KeyPair); @@ -97,12 +86,6 @@ public class KeyPairTest extends TestCase { * parameters (both valid keys) * @throws InvalidKeySpecException */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verification when parameter is not null", - method = "KeyPair", - args = {java.security.PublicKey.class, java.security.PrivateKey.class} - ) public final void testKeyPair02() throws InvalidKeySpecException { Object kp = new KeyPair(TestKeyPair.getPublic(), TestKeyPair.getPrivate()); assertTrue(kp instanceof KeyPair); @@ -112,12 +95,6 @@ public class KeyPairTest extends TestCase { * Test #1 for <code>getPrivate()</code> method<br> * Assertion: returns private key (<code>null</code> in this case) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getPrivate", - args = {} - ) public final void testGetPrivate01() { KeyPair kp = new KeyPair(null, null); assertNull(kp.getPrivate()); @@ -128,12 +105,6 @@ public class KeyPairTest extends TestCase { * Assertion: returns private key (valid private key in this case) * @throws InvalidKeySpecException */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getPrivate", - args = {} - ) public final void testGetPrivate02() throws InvalidKeySpecException { PrivateKey pk = TestKeyPair.getPrivate(); KeyPair kp = new KeyPair(null, pk); @@ -144,12 +115,6 @@ public class KeyPairTest extends TestCase { * Test #1 for <code>getPublic()</code> method<br> * Assertion: returns public key (<code>null</code> in this case) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getPublic", - args = {} - ) public final void testGetPublic01() { KeyPair kp = new KeyPair(null, null); assertNull(kp.getPublic()); @@ -160,12 +125,6 @@ public class KeyPairTest extends TestCase { * Assertion: returns public key (valid public key in this case) * @throws InvalidKeySpecException */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getPublic", - args = {} - ) public final void testGetPublic02() throws InvalidKeySpecException { PublicKey pk = TestKeyPair.getPublic(); KeyPair kp = new KeyPair(pk, null); diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyRepTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyRepTest.java index 65e6755..0dad827 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyRepTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyRepTest.java @@ -22,11 +22,6 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.io.NotSerializableException; import java.io.ObjectStreamException; import java.security.KeyRep; @@ -35,7 +30,7 @@ import java.util.Iterator; import java.util.Set; import junit.framework.TestCase; -@TestTargetClass(KeyRep.class) + /** * * @@ -47,12 +42,6 @@ public class KeyRepTest extends TestCase { keyFactoryAlgorithm = Security.getAlgorithms("KeyFactory"); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "KeyRep", - args = {java.security.KeyRep.Type.class, java.lang.String.class, java.lang.String.class, byte[].class} - ) public final void testKeyRep01() { try { assertNotNull(new KeyRep(KeyRep.Type.SECRET, "", "", new byte[] {})); @@ -73,12 +62,6 @@ public class KeyRepTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "KeyRep", - args = {java.security.KeyRep.Type.class, java.lang.String.class, java.lang.String.class, byte[].class} - ) public final void testKeyRep02() { try { new KeyRep(null, "", "", new byte[] {}); @@ -106,12 +89,6 @@ public class KeyRepTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "readResolve", - args = {} - ) public final void testReadResolve01() throws ObjectStreamException { KeyRepChild kr = new KeyRepChild(KeyRep.Type.SECRET, "", "", new byte[] {}); @@ -139,12 +116,6 @@ public class KeyRepTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "readResolve", - args = {} - ) public final void testReadResolve02() throws ObjectStreamException { KeyRepChild kr = new KeyRepChild(KeyRep.Type.PUBLIC, "", "", new byte[] {}); @@ -173,12 +144,6 @@ public class KeyRepTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "readResolve", - args = {} - ) public final void testReadResolve03() throws ObjectStreamException { KeyRepChild kr = new KeyRepChild(KeyRep.Type.PRIVATE, "", "", new byte[] {}); @@ -207,12 +172,6 @@ public class KeyRepTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "readResolve", - args = {} - ) public final void testReadResolve04() throws ObjectStreamException { if (keyFactoryAlgorithm.isEmpty()) { System.err.println(getName() @@ -232,12 +191,6 @@ public class KeyRepTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "readResolve", - args = {} - ) public final void testReadResolve05() throws ObjectStreamException { if (keyFactoryAlgorithm.isEmpty()) { System.err.println(getName() diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyRepTypeTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyRepTypeTest.java index 0bfbe1f..0609ef4 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyRepTypeTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyRepTypeTest.java @@ -16,16 +16,11 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.KeyRep; import java.util.Arrays; import junit.framework.TestCase; -@TestTargetClass(KeyRep.Type.class) + public class KeyRepTypeTest extends TestCase { protected void setUp() throws Exception { @@ -37,14 +32,8 @@ public class KeyRepTypeTest extends TestCase { } /** - * @tests java.security.KeyRep.Type#valueOf(String) + * java.security.KeyRep.Type#valueOf(String) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "valueOf", - args = {java.lang.String.class} - ) public void testValueOf() { try { KeyRep.Type.valueOf("type"); @@ -67,14 +56,8 @@ public class KeyRepTypeTest extends TestCase { } /** - * @tests java.security.KeyRep.Type#values() + * java.security.KeyRep.Type#values() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "values", - args = {} - ) public void testValues() { KeyRep.Type[] types = new KeyRep.Type[] { KeyRep.Type.SECRET, KeyRep.Type.PUBLIC, KeyRep.Type.PRIVATE }; diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStore3Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStore3Test.java index 801050d..77bf62f 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStore3Test.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStore3Test.java @@ -17,10 +17,6 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; - import junit.framework.TestCase; import org.apache.harmony.security.tests.java.security.AlgorithmParametersTest.MyAlgorithmParameters; @@ -44,7 +40,6 @@ import java.security.cert.CertificateFactory; import java.util.Date; import java.util.Enumeration; -@TestTargetClass(KeyStore.class) public class KeyStore3Test extends TestCase { private KeyStore mockKeyStore; @@ -79,23 +74,11 @@ public class KeyStore3Test extends TestCase { certificate = cf.generateCertificate(certArray); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies method with null parameter only.", - method = "load", - args = {java.security.KeyStore.LoadStoreParameter.class} - ) public void test_load() throws Exception { // No exception should be thrown out. mockKeyStore.load(null); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies method with null parameter only", - method = "store", - args = {java.security.KeyStore.LoadStoreParameter.class} - ) public void test_store() throws Exception { try { mockKeyStore.store(null); @@ -109,36 +92,18 @@ public class KeyStore3Test extends TestCase { mockKeyStore.store(null); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies method with all null parameters only", - method = "setKeyEntry", - args = {java.lang.String.class, java.security.Key.class, char[].class, java.security.cert.Certificate[].class} - ) public void test_setKeyEntry_null() throws Exception { mockKeyStore.load(null, null); // No exception should be thrown out. mockKeyStore.setKeyEntry(null, null, null, null); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies method with null parameters only", - method = "setKeyEntry", - args = {java.lang.String.class, java.security.Key.class, char[].class, java.security.cert.Certificate[].class} - ) public void test_setKeyEntry_key_is_null() throws Exception { mockKeyStore.load(null, null); // No exception should be thrown out. mockKeyStore.setKeyEntry("Alias", null, null, new Certificate[]{certificate}); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies method with null parameters", - method = "setKeyEntry", - args = {java.lang.String.class, java.security.Key.class, char[].class, java.security.cert.Certificate[].class} - ) public void test_setKeyEntry_key_is_private() throws Exception { mockKeyStore.load(null, null); Key key = keyPair.getPrivate(); @@ -160,12 +125,6 @@ public class KeyStore3Test extends TestCase { mockKeyStore.setKeyEntry("Alias", key, null, new Certificate[]{certificate}); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies method with null parameters", - method = "setKeyEntry", - args = {java.lang.String.class, java.security.Key.class, char[].class, java.security.cert.Certificate[].class} - ) public void test_setKeyEntry_key_is_public() throws Exception { mockKeyStore.load(null, null); @@ -176,12 +135,6 @@ public class KeyStore3Test extends TestCase { mockKeyStore.setKeyEntry("Alias3", key, null, new Certificate[]{certificate}); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies method with null parameters", - method = "setCertificateEntry", - args = {java.lang.String.class, java.security.cert.Certificate.class} - ) public void test_setCertificateEntry_null() throws Exception { mockKeyStore.load(null, null); @@ -193,12 +146,6 @@ public class KeyStore3Test extends TestCase { } @SuppressWarnings("cast") - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "KeyStore", - args = {java.security.KeyStoreSpi.class, java.security.Provider.class, java.lang.String.class} - ) public void test_KeyStore() { Provider p = new MyProvider(); try { diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStore4Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStore4Test.java index 77e4314..4178db0 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStore4Test.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStore4Test.java @@ -1,9 +1,5 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; - import junit.framework.TestCase; import org.apache.harmony.security.tests.support.MyProvider; @@ -29,7 +25,6 @@ import java.security.KeyStore.ProtectionParameter; import java.security.cert.Certificate; import java.security.cert.CertificateException; -@TestTargetClass(KeyStore.class) public class KeyStore4Test extends TestCase { Provider provider = new MyProvider(); @@ -66,11 +61,6 @@ public class KeyStore4Test extends TestCase { Security.removeProvider(provider.getName()); } - @TestTargetNew( - level=TestLevel.COMPLETE, - method="getInstance", - args={String.class} - ) public void testGetInstanceString() { try { KeyStore ks = KeyStore.getInstance("TestKeyStore"); @@ -97,11 +87,6 @@ public class KeyStore4Test extends TestCase { } } - @TestTargetNew( - level=TestLevel.COMPLETE, - method="getInstance", - args={String.class, String.class} - ) public void testGetInstanceStringString() { try { KeyStore ks = KeyStore.getInstance("TestKeyStore", provider.getName()); @@ -165,11 +150,6 @@ public class KeyStore4Test extends TestCase { } } - @TestTargetNew( - level=TestLevel.COMPLETE, - method="getInstance", - args={String.class, Provider.class} - ) public void testGetInstanceStringProvider() { try { KeyStore ks = KeyStore.getInstance("TestKeyStore", provider); @@ -206,11 +186,6 @@ public class KeyStore4Test extends TestCase { } - @TestTargetNew( - level=TestLevel.COMPLETE, - method="getKey", - args={String.class, char[].class} - ) public void testGetKey() { try { Key key = keyStore.getKey("keyalias", null); @@ -270,11 +245,6 @@ public class KeyStore4Test extends TestCase { } - @TestTargetNew( - level=TestLevel.COMPLETE, - method="getCertificateAlias", - args={Certificate.class} - ) public void testGetCertificateAlias() { try { String alias = keyStore.getCertificateAlias(TestKeyStoreSpi.CERT); @@ -308,11 +278,6 @@ public class KeyStore4Test extends TestCase { } } - @TestTargetNew( - level=TestLevel.COMPLETE, - method="store", - args={OutputStream.class, char[].class} - ) public void testStoreOutputStreamCharArray() { OutputStream os = new ByteArrayOutputStream(); char[] password = "PASSWORD".toCharArray(); @@ -386,11 +351,6 @@ public class KeyStore4Test extends TestCase { } - @TestTargetNew( - level=TestLevel.COMPLETE, - method="store", - args={KeyStore.LoadStoreParameter.class} - ) public void testStoreLoadStoreParameter() { try { keyStore.store(new KeyStore.LoadStoreParameter() { @@ -486,11 +446,6 @@ public class KeyStore4Test extends TestCase { } } - @TestTargetNew( - level=TestLevel.COMPLETE, - method="load", - args={InputStream.class, char[].class} - ) public void testLoadInputStreamCharArray() { InputStream is = new ByteArrayInputStream("DATA".getBytes()); char[] password = "PASSWORD".toCharArray(); @@ -541,11 +496,6 @@ public class KeyStore4Test extends TestCase { } } - @TestTargetNew( - level=TestLevel.COMPLETE, - method="load", - args={KeyStore.LoadStoreParameter.class} - ) public void testLoadLoadStoreParameter() { try { keyStore.load(null); @@ -609,11 +559,6 @@ public class KeyStore4Test extends TestCase { } } - @TestTargetNew( - level=TestLevel.SUFFICIENT, - method="getEntry", - args={String.class, KeyStore.ProtectionParameter.class} - ) public void testGetEntry() { try { Entry entry = keyStore.getEntry("certalias", null); @@ -681,18 +626,10 @@ public class KeyStore4Test extends TestCase { - @TestTargetNew( - level=TestLevel.COMPLETE, - method="getType" - ) public void testGetType() { assertEquals(KEY_STORE_TYPE, keyStore.getType()); } - @TestTargetNew( - level=TestLevel.COMPLETE, - method="getProvider" - ) public void testGetProvider() { assertNotNull(keyStore.getProvider()); assertEquals("not equal", provider, keyStore.getProvider()); diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreBuilderTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreBuilderTest.java index 421f02b..d14cf23 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreBuilderTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreBuilderTest.java @@ -16,12 +16,6 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.BrokenTest; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; - import junit.framework.TestCase; import org.apache.harmony.security.tests.support.KeyStoreTestSupport; @@ -37,7 +31,7 @@ import java.security.Provider; import java.security.Security; import java.security.cert.CertificateException; import java.util.Enumeration; -@TestTargetClass(KeyStore.Builder.class) + public class KeyStoreBuilderTest extends TestCase { protected void setUp() throws Exception { @@ -76,26 +70,6 @@ public class KeyStoreBuilderTest extends TestCase { /* * test for constructor KeyStoreBuilder */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "Builder", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getKeyStore", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getProtectionParameter", - args = {java.lang.String.class} - ) - }) public void testConstructor() { KeyStoreBuilder ksb; try { @@ -112,12 +86,6 @@ public class KeyStoreBuilderTest extends TestCase { /* * test for method newInstance(KeyStore, KeyStore.ProtectionParameter) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "newInstance", - args = {java.security.KeyStore.class, java.security.KeyStore.ProtectionParameter.class} - ) public void testNewInstanceKeyStoreProtectionParameter() throws KeyStoreException, NoSuchAlgorithmException, IOException, CertificateException { @@ -234,12 +202,6 @@ public class KeyStoreBuilderTest extends TestCase { * ProtectionParameter which is used in newInstance(...) * */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "newInstance", - args = {java.lang.String.class, java.security.Provider.class, java.io.File.class, java.security.KeyStore.ProtectionParameter.class} - ) public void testNewInstanceStringProviderFileProtectionParameter() throws Exception { @@ -418,12 +380,6 @@ public class KeyStoreBuilderTest extends TestCase { * when alias is not available * */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "newInstance", - args = {java.lang.String.class, java.security.Provider.class, java.security.KeyStore.ProtectionParameter.class} - ) public void testNewInstanceStringProviderProtectionParameter() throws KeyStoreException { diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreExceptionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreExceptionTest.java index aa6dc45..64c3a90 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreExceptionTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreExceptionTest.java @@ -22,15 +22,10 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.KeyStoreException; import junit.framework.TestCase; -@TestTargetClass(KeyStoreException.class) + /** * Tests for <code>KeyStoreException</code> class constructors and methods. * @@ -48,12 +43,6 @@ public class KeyStoreExceptionTest extends TestCase { * Test for <code>KeyStoreException()</code> constructor Assertion: * constructs KeyStoreException with no detail message */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "KeyStoreException", - args = {} - ) public void testKeyStoreException01() { KeyStoreException tE = new KeyStoreException(); assertNull("getMessage() must return null.", tE.getMessage()); @@ -65,12 +54,6 @@ public class KeyStoreExceptionTest extends TestCase { * constructs KeyStoreException with detail message msg. Parameter * <code>msg</code> is not null. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "KeyStoreException", - args = {java.lang.String.class} - ) public void testKeyStoreException02() { KeyStoreException tE; for (int i = 0; i < msgs.length; i++) { @@ -85,12 +68,6 @@ public class KeyStoreExceptionTest extends TestCase { * Test for <code>KeyStoreException(String)</code> constructor Assertion: * constructs KeyStoreException when <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "KeyStoreException", - args = {java.lang.String.class} - ) public void testKeyStoreException03() { String msg = null; KeyStoreException tE = new KeyStoreException(msg); @@ -102,12 +79,6 @@ public class KeyStoreExceptionTest extends TestCase { * Test for <code>KeyStoreException(Throwable)</code> constructor * Assertion: constructs KeyStoreException when <code>cause</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "KeyStoreException", - args = {java.lang.Throwable.class} - ) public void testKeyStoreException04() { Throwable cause = null; KeyStoreException tE = new KeyStoreException(cause); @@ -120,12 +91,6 @@ public class KeyStoreExceptionTest extends TestCase { * Assertion: constructs KeyStoreException when <code>cause</code> is not * null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "KeyStoreException", - args = {java.lang.Throwable.class} - ) public void testKeyStoreException05() { KeyStoreException tE = new KeyStoreException(tCause); if (tE.getMessage() != null) { @@ -144,12 +109,6 @@ public class KeyStoreExceptionTest extends TestCase { * Assertion: constructs KeyStoreException when <code>cause</code> is null * <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "KeyStoreException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testKeyStoreException06() { KeyStoreException tE = new KeyStoreException(null, null); assertNull("getMessage() must return null", tE.getMessage()); @@ -161,12 +120,6 @@ public class KeyStoreExceptionTest extends TestCase { * Assertion: constructs KeyStoreException when <code>cause</code> is null * <code>msg</code> is not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "KeyStoreException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testKeyStoreException07() { KeyStoreException tE; for (int i = 0; i < msgs.length; i++) { @@ -182,12 +135,6 @@ public class KeyStoreExceptionTest extends TestCase { * Assertion: constructs KeyStoreException when <code>cause</code> is not * null <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "KeyStoreException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testKeyStoreException08() { KeyStoreException tE = new KeyStoreException(null, tCause); if (tE.getMessage() != null) { @@ -206,12 +153,6 @@ public class KeyStoreExceptionTest extends TestCase { * Assertion: constructs KeyStoreException when <code>cause</code> is not * null <code>msg</code> is not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "KeyStoreException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testKeyStoreException09() { KeyStoreException tE; for (int i = 0; i < msgs.length; i++) { diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreSpiTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreSpiTest.java index c291ee4..4fdddbb 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreSpiTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreSpiTest.java @@ -22,11 +22,6 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; - import junit.framework.TestCase; import org.apache.harmony.security.tests.support.MyKeyStoreSpi; @@ -50,124 +45,13 @@ import java.security.cert.CertificateEncodingException; import java.security.cert.CertificateException; import java.util.Date; -@TestTargetClass(value=KeyStoreSpi.class, - untestedMethods={ - @TestTargetNew( - level = TestLevel.NOT_NECESSARY, - notes = "", - method = "engineAliases", - args = {} - ), - @TestTargetNew( - level = TestLevel.NOT_NECESSARY, - notes = "", - method = "engineContainsAlias", - args = {java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.NOT_NECESSARY, - notes = "", - method = "engineDeleteEntry", - args = {java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.NOT_NECESSARY, - notes = "", - method = "engineGetCertificate", - args = {java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.NOT_NECESSARY, - notes = "", - method = "engineGetCertificateAlias", - args = {java.security.cert.Certificate.class} - ), - @TestTargetNew( - level = TestLevel.NOT_NECESSARY, - notes = "", - method = "engineGetCertificateChain", - args = {java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.NOT_NECESSARY, - notes = "", - method = "engineGetCreationDate", - args = {java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.NOT_NECESSARY, - notes = "", - method = "engineGetKey", - args = {java.lang.String.class, char[].class} - ), - @TestTargetNew( - level = TestLevel.NOT_NECESSARY, - notes = "", - method = "engineIsCertificateEntry", - args = {java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.NOT_NECESSARY, - notes = "", - method = "engineIsKeyEntry", - args = {java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.NOT_NECESSARY, - notes = "", - method = "engineLoad", - args = {java.io.InputStream.class, char[].class} - ), - @TestTargetNew( - level = TestLevel.NOT_NECESSARY, - notes = "", - method = "engineSetCertificateEntry", - args = { - java.lang.String.class, java.security.cert.Certificate.class} - ), - @TestTargetNew( - level = TestLevel.NOT_NECESSARY, - notes = "", - method = "engineSetKeyEntry", - args = { - java.lang.String.class, byte[].class, - java.security.cert.Certificate[].class} - ), - @TestTargetNew( - level = TestLevel.NOT_NECESSARY, - notes = "", - method = "engineSetKeyEntry", - args = { - java.lang.String.class, java.security.Key.class, char[].class, - java.security.cert.Certificate[].class} - ), - @TestTargetNew( - level = TestLevel.NOT_NECESSARY, - notes = "", - method = "engineSize", - args = {} - ), - @TestTargetNew( - level = TestLevel.NOT_NECESSARY, - notes = "", - method = "engineStore", - args = {java.io.OutputStream.class, char[].class} - )} - ) /** * Tests for <code>KeyStoreSpi</code> constructor and methods * */ - public class KeyStoreSpiTest extends TestCase { @SuppressWarnings("cast") - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "KeyStoreSpi", - args = {} - ) public void test_KeyStoreSpi() { try { @@ -180,15 +64,9 @@ public class KeyStoreSpiTest extends TestCase { } /* - * @tests java.security.KeyStore.engineEntryInstanceOf(String, Class<? + * java.security.KeyStore.engineEntryInstanceOf(String, Class<? * extends Entry>) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineEntryInstanceOf", - args = {java.lang.String.class, java.lang.Class.class} - ) public void test_engineEntryInstanceOf() throws Exception { KeyStoreSpi ksSpi = new MyKeyStoreSpi(); @@ -222,36 +100,6 @@ public class KeyStoreSpiTest extends TestCase { } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineLoad", - args = {java.security.KeyStore.LoadStoreParameter.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineStore", - args = {java.security.KeyStore.LoadStoreParameter.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineGetEntry", - args = { - java.lang.String.class, - java.security.KeyStore.ProtectionParameter.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineSetEntry", - args = { - java.lang.String.class, java.security.KeyStore.Entry.class, - java.security.KeyStore.ProtectionParameter.class} - ) - }) public void testKeyStoteSpi01() throws IOException, NoSuchAlgorithmException, CertificateException, UnrecoverableEntryException, KeyStoreException { @@ -293,43 +141,6 @@ public class KeyStoreSpiTest extends TestCase { * Test for <code>KeyStoreSpi()</code> constructor and abstract engine * methods. Assertion: creates new KeyStoreSpi object. */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineSetKeyEntry", - args = { - java.lang.String.class, java.security.Key.class, - char[].class, java.security.cert.Certificate[].class}), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineSetKeyEntry", - args = { - java.lang.String.class, byte[].class, - java.security.cert.Certificate[].class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineSetCertificateEntry", - args = { - java.lang.String.class, - java.security.cert.Certificate.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineDeleteEntry", - args = {java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineStore", - args = {java.io.OutputStream.class, char[].class} - ) - }) public void testKeyStoteSpi02() throws NoSuchAlgorithmException, UnrecoverableKeyException, CertificateException { KeyStoreSpi ksSpi = new MyKeyStoreSpi(); @@ -374,22 +185,8 @@ public class KeyStoreSpiTest extends TestCase { } /** - * @tests java.security.KeyStoreSpi#engineLoad(KeyStore.LoadStoreParameter) + * java.security.KeyStoreSpi#engineLoad(KeyStore.LoadStoreParameter) */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "IllegalArgumentException, NoSuchAlgorithmException, " - + "CertificateException checking missed", - method = "engineLoad", - args = {java.security.KeyStore.LoadStoreParameter.class} - ), - @TestTargetNew( - level=TestLevel.NOT_NECESSARY, - clazz=LoadStoreParameter.class, - method="getProtectionParameter" - ) - }) public void test_engineLoadLjava_security_KeyStore_LoadStoreParameter() throws Exception { diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreTest.java index b26357f..a158c83 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyStoreTest.java @@ -22,11 +22,6 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.io.IOException; import java.security.KeyStore; import java.security.KeyStoreException; @@ -55,12 +50,11 @@ import org.apache.harmony.security.tests.support.MyLoadStoreParams; import org.apache.harmony.security.tests.support.SpiEngUtils; import junit.framework.TestCase; -@TestTargetClass(KeyStore.class) + /** * Tests for <code>KeyStore</code> constructor and methods * */ - public class KeyStoreTest extends TestCase { private static final String KeyStoreProviderClass = "org.apache.harmony.security.tests.support.MyKeyStore"; @@ -113,12 +107,6 @@ public class KeyStoreTest extends TestCase { * methods * Assertions: throw IllegalArgumentException if param is null; */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "NoSuchAlgorithmException, CertificateException checking missed", - method = "load", - args = {java.security.KeyStore.LoadStoreParameter.class} - ) public void testLoadStore02() throws Exception { assertTrue(NotSupportMsg, KSSupported); @@ -155,12 +143,6 @@ public class KeyStoreTest extends TestCase { * method * Assertion: stores KeyEntry. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setKeyEntry", - args = {java.lang.String.class, byte[].class, java.security.cert.Certificate[].class} - ) public void testSetKeyEntry() throws Exception { assertTrue(NotSupportMsg, KSSupported); @@ -201,12 +183,6 @@ public class KeyStoreTest extends TestCase { * Test for <code>getDefaultType()</code> method Assertion: returns * default security key store type or "jks" string */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getDefaultType", - args = {} - ) public void testKeyStore01() { String propName = "keystore.type"; String defKSType = Security.getProperty(propName); @@ -235,12 +211,6 @@ public class KeyStoreTest extends TestCase { * throws KeyStoreException when type is not available * */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verification with valid parameter missed", - method = "getInstance", - args = {java.lang.String.class} - ) public void testKeyStore02() throws KeyStoreException { String[] invalidValues = SpiEngUtils.invalidValues; try { @@ -261,13 +231,6 @@ public class KeyStoreTest extends TestCase { /** * @test java.security.KeyStore.PasswordProtection.getPassword() */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "IllegalStateException checking missed", - clazz = KeyStore.PasswordProtection.class, - method = "getPassword", - args = {} - ) public void testKeyStorePPGetPassword() { // Regression for HARMONY-1539 // no exception expected @@ -281,7 +244,7 @@ public class KeyStoreTest extends TestCase { /* - * @tests java.security.KeyStoreSpi.engineEntryInstanceOf(String, Class<? extends Entry>) + * java.security.KeyStoreSpi.engineEntryInstanceOf(String, Class<? extends Entry>) */ public void testEngineEntryInstanceOf() throws Exception { //Regression for HARMONY-615 @@ -309,15 +272,8 @@ public class KeyStoreTest extends TestCase { } /** - * @tests java.security.KeyStore.TrustedCertificateEntry.toString() + * java.security.KeyStore.TrustedCertificateEntry.toString() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "IllegalStateException checking missed", - clazz = KeyStore.TrustedCertificateEntry.class, - method = "toString", - args = {} - ) public void testKeyStoreTCToString() { // Regression for HARMONY-1542 // no exception expected diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyTest.java index 159030e..65355a1 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/KeyTest.java @@ -22,31 +22,19 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.Key; import junit.framework.TestCase; -@TestTargetClass(Key.class) + /** * Tests for <code>Key</code> class field * */ - public class KeyTest extends TestCase { /** * Test for <code>serialVersionUID</code> field */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Field testing", - method = "!serialVersionUID", - args = {} - ) public void testField() { checkKey mk = new checkKey(); assertEquals("Incorrect serialVersionUID", mk.getSerVerUID(), //Key.serialVersionUID, diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/MessageDigestSpiTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/MessageDigestSpiTest.java index 70835e3..8be5563 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/MessageDigestSpiTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/MessageDigestSpiTest.java @@ -22,11 +22,6 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.nio.ByteBuffer; import java.security.DigestException; import java.security.MessageDigest; @@ -34,7 +29,7 @@ import java.security.MessageDigestSpi; import java.security.NoSuchAlgorithmException; import junit.framework.TestCase; -@TestTargetClass(MessageDigestSpi.class) + /** * Tests for <code>MessageDigestSpi</code> constructor and methods */ @@ -44,38 +39,6 @@ public class MessageDigestSpiTest extends TestCase { * java.security.MessageDigestSpi#MessageDigestSpi() */ @SuppressWarnings("cast") - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "MessageDigestSpi", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineDigest", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineReset", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineUpdate", - args = {byte.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineUpdate", - args = {byte[].class, int.class, int.class} - ) - }) public void test_constructor() { MyMessageDigest mds; try { @@ -101,12 +64,6 @@ public class MessageDigestSpiTest extends TestCase { /** * java.security.MessageDigestSpi#engineDigest(byte[], int, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineDigest", - args = {byte[].class, int.class, int.class} - ) public void test_engineDigestLB$LILI() throws Exception { final int DIGEST_LENGTH = 2; @@ -169,12 +126,6 @@ public class MessageDigestSpiTest extends TestCase { /** * java.security.MessageDigestSpi#engineGetDigestLength() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineGetDigestLength", - args = {} - ) public void test_engineGetDigestLength() { MyMessageDigest md = new MyMessageDigest(); assertEquals(0, md.engineGetDigestLength()); @@ -191,12 +142,6 @@ public class MessageDigestSpiTest extends TestCase { /** * java.security.MessageDigestSpi#engineUpdate(ByteBuffer) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineUpdate", - args = {java.nio.ByteBuffer.class} - ) public void test_engineUpdateLjava_nio_ByteBuffer() { MyMessageDigest md = new MyMessageDigest(); byte[] b = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }; @@ -218,14 +163,8 @@ public class MessageDigestSpiTest extends TestCase { } /** - * @tests java.security.MessageDigestSpi#clone() + * java.security.MessageDigestSpi#clone() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "clone", - args = {} - ) public void test_clone() throws CloneNotSupportedException { MyMessageDigest md = new MyMessageDigest(); try { diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/NoSuchAlgorithmExceptionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/NoSuchAlgorithmExceptionTest.java index 65eb9c0..1897dd4 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/NoSuchAlgorithmExceptionTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/NoSuchAlgorithmExceptionTest.java @@ -22,15 +22,10 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.NoSuchAlgorithmException; import junit.framework.TestCase; -@TestTargetClass(NoSuchAlgorithmException.class) + /** * Tests for <code>NoSuchAlgorithmException</code> class constructors and * methods. @@ -49,12 +44,6 @@ public class NoSuchAlgorithmExceptionTest extends TestCase { * Test for <code>NoSuchAlgorithmException()</code> constructor Assertion: * constructs NoSuchAlgorithmException with no detail message */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "NoSuchAlgorithmException", - args = {} - ) public void testNoSuchAlgorithmException01() { NoSuchAlgorithmException tE = new NoSuchAlgorithmException(); assertNull("getMessage() must return null.", tE.getMessage()); @@ -66,12 +55,6 @@ public class NoSuchAlgorithmExceptionTest extends TestCase { * Assertion: constructs NoSuchAlgorithmException with detail message msg. * Parameter <code>msg</code> is not null. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "NoSuchAlgorithmException", - args = {java.lang.String.class} - ) public void testNoSuchAlgorithmException02() { NoSuchAlgorithmException tE; for (int i = 0; i < msgs.length; i++) { @@ -87,12 +70,6 @@ public class NoSuchAlgorithmExceptionTest extends TestCase { * Assertion: constructs NoSuchAlgorithmException when <code>msg</code> is * null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "NoSuchAlgorithmException", - args = {java.lang.String.class} - ) public void testNoSuchAlgorithmException03() { String msg = null; NoSuchAlgorithmException tE = new NoSuchAlgorithmException(msg); @@ -105,12 +82,6 @@ public class NoSuchAlgorithmExceptionTest extends TestCase { * Assertion: constructs NoSuchAlgorithmException when <code>cause</code> * is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "NoSuchAlgorithmException", - args = {java.lang.Throwable.class} - ) public void testNoSuchAlgorithmException04() { Throwable cause = null; NoSuchAlgorithmException tE = new NoSuchAlgorithmException(cause); @@ -123,12 +94,6 @@ public class NoSuchAlgorithmExceptionTest extends TestCase { * Assertion: constructs NoSuchAlgorithmException when <code>cause</code> * is not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "NoSuchAlgorithmException", - args = {java.lang.Throwable.class} - ) public void testNoSuchAlgorithmException05() { NoSuchAlgorithmException tE = new NoSuchAlgorithmException(tCause); if (tE.getMessage() != null) { @@ -147,12 +112,6 @@ public class NoSuchAlgorithmExceptionTest extends TestCase { * constructor Assertion: constructs NoSuchAlgorithmException when * <code>cause</code> is null <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "NoSuchAlgorithmException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testNoSuchAlgorithmException06() { NoSuchAlgorithmException tE = new NoSuchAlgorithmException(null, null); assertNull("getMessage() must return null", tE.getMessage()); @@ -164,12 +123,6 @@ public class NoSuchAlgorithmExceptionTest extends TestCase { * constructor Assertion: constructs NoSuchAlgorithmException when * <code>cause</code> is null <code>msg</code> is not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "NoSuchAlgorithmException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testNoSuchAlgorithmException07() { NoSuchAlgorithmException tE; for (int i = 0; i < msgs.length; i++) { @@ -185,12 +138,6 @@ public class NoSuchAlgorithmExceptionTest extends TestCase { * constructor Assertion: constructs NoSuchAlgorithmException when * <code>cause</code> is not null <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "NoSuchAlgorithmException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testNoSuchAlgorithmException08() { NoSuchAlgorithmException tE = new NoSuchAlgorithmException(null, tCause); if (tE.getMessage() != null) { @@ -209,12 +156,6 @@ public class NoSuchAlgorithmExceptionTest extends TestCase { * constructor Assertion: constructs NoSuchAlgorithmException when * <code>cause</code> is not null <code>msg</code> is not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "NoSuchAlgorithmException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testNoSuchAlgorithmException09() { NoSuchAlgorithmException tE; for (int i = 0; i < msgs.length; i++) { diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/NoSuchProviderExceptionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/NoSuchProviderExceptionTest.java index f0f0f42..98324f6 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/NoSuchProviderExceptionTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/NoSuchProviderExceptionTest.java @@ -22,15 +22,10 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.NoSuchProviderException; import junit.framework.TestCase; -@TestTargetClass(NoSuchProviderException.class) + /** * Tests for <code>NoSuchProviderException</code> class constructors and * methods. @@ -49,12 +44,6 @@ public class NoSuchProviderExceptionTest extends TestCase { * Test for <code>NoSuchProviderException()</code> constructor Assertion: * constructs NoSuchProviderException with no detail message */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "NoSuchProviderException", - args = {} - ) public void testNoSuchProviderException01() { NoSuchProviderException tE = new NoSuchProviderException(); assertNull("getMessage() must return null.", tE.getMessage()); @@ -66,12 +55,6 @@ public class NoSuchProviderExceptionTest extends TestCase { * Assertion: constructs NoSuchProviderException with detail message msg. * Parameter <code>msg</code> is not null. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "NoSuchProviderException", - args = {java.lang.String.class} - ) public void testNoSuchProviderException02() { NoSuchProviderException tE; for (int i = 0; i < msgs.length; i++) { @@ -87,12 +70,6 @@ public class NoSuchProviderExceptionTest extends TestCase { * Assertion: constructs NoSuchProviderException when <code>msg</code> is * null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "NoSuchProviderException", - args = {java.lang.String.class} - ) public void testNoSuchProviderException03() { String msg = null; NoSuchProviderException tE = new NoSuchProviderException(msg); diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/Permission2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/Permission2Test.java index cf5d85d..12952e5 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/Permission2Test.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/Permission2Test.java @@ -17,16 +17,10 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.Permission; import java.security.PermissionCollection; import java.security.SecurityPermission; -@TestTargetClass(Permission.class) public class Permission2Test extends junit.framework.TestCase { static class ConcretePermission extends Permission { public ConcretePermission() { @@ -51,14 +45,8 @@ public class Permission2Test extends junit.framework.TestCase { } /** - * @tests java.security.Permission#Permission(java.lang.String) + * java.security.Permission#Permission(java.lang.String) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "Permission", - args = {java.lang.String.class} - ) public void test_ConstructorLjava_lang_String() { // test method java.security.permission.Permission(string) try { @@ -87,14 +75,8 @@ public class Permission2Test extends junit.framework.TestCase { } /** - * @tests java.security.Permission#checkGuard(java.lang.Object) + * java.security.Permission#checkGuard(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "checkGuard", - args = {java.lang.Object.class} - ) public void test_checkGuardLjava_lang_Object() { // test method java.security.permission.checkGuard(object) SecurityPermission permi = new SecurityPermission( @@ -108,14 +90,8 @@ public class Permission2Test extends junit.framework.TestCase { } /** - * @tests java.security.Permission#getName() + * java.security.Permission#getName() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getName", - args = {} - ) public void test_getName() { // test method java.security.permission.getName() SecurityPermission permi = new SecurityPermission("testing getName()"); @@ -129,14 +105,8 @@ public class Permission2Test extends junit.framework.TestCase { } /** - * @tests java.security.Permission#newPermissionCollection() + * java.security.Permission#newPermissionCollection() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "newPermissionCollection", - args = {} - ) public void test_newPermissionCollection() { // test method java.security.permission.newPermissionCollection Permission permi = new ConcretePermission(); @@ -147,14 +117,8 @@ public class Permission2Test extends junit.framework.TestCase { } /** - * @tests java.security.Permission#toString() + * java.security.Permission#toString() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {} - ) public void test_toString() { // test method java.security.permission.toString // test for permission with no action @@ -163,4 +127,4 @@ public class Permission2Test extends junit.framework.TestCase { assertNotNull("toString should have returned a string of elements", toString); } -}
\ No newline at end of file +} diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/PermissionCollectionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PermissionCollectionTest.java index 113a264..86b1705 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/PermissionCollectionTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PermissionCollectionTest.java @@ -22,22 +22,16 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.Permission; import java.security.PermissionCollection; import java.util.*; import junit.framework.TestCase; -@TestTargetClass(PermissionCollection.class) + /** * Tests for <code>PermissionCollection</code> * */ - public class PermissionCollectionTest extends TestCase { // Bare extension to instantiate abstract PermissionCollection class @@ -69,20 +63,6 @@ public class PermissionCollectionTest extends TestCase { } /** Test read-only flag. Should be false by default and can be set once forever. */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isReadOnly", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setReadOnly", - args = {} - ) - }) public void testReadOnly() { PermissionCollection pc = new RealPermissionCollection(null); @@ -93,12 +73,6 @@ public class PermissionCollectionTest extends TestCase { assertTrue("more calls to setReadOnly() should not harm", pc.isReadOnly()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {} - ) public void testToString() { Set<Permission> perm = new HashSet<Permission>(); Permission p = new RealPermission("TestPermission"); diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/PermissionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PermissionTest.java index 973e711..e0f280a 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/PermissionTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PermissionTest.java @@ -26,15 +26,10 @@ import java.security.Permission; import java.security.SecurityPermission; import junit.framework.TestCase; -import dalvik.annotation.KnownFailure; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -@TestTargetClass(Permission.class) + /** * Tests for <code>Permission</code> */ - public class PermissionTest extends TestCase { // Bare extension to instantiate abstract Permission class static final class RealPermission extends Permission { @@ -64,12 +59,6 @@ public class PermissionTest extends TestCase { * Test that a permission object is created with the specified name and is * properly converted to String */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Non null string parameter verified", - method = "Permission", - args = {java.lang.String.class} - ) public void testCtor() { String name = "testCtor123^%$#&^ &^$"; Permission test = new RealPermission(name); @@ -79,12 +68,6 @@ public class PermissionTest extends TestCase { } /** newPermissionCollection() should return null */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Returned parameter was tested.", - method = "newPermissionCollection", - args = {} - ) public void testCollection() { assertNull(new RealPermission("123").newPermissionCollection()); } diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/Permissions2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/Permissions2Test.java index 87051a5..2f04ab2 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/Permissions2Test.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/Permissions2Test.java @@ -17,11 +17,6 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.io.File; import java.io.FilePermission; import java.security.AllPermission; @@ -29,7 +24,6 @@ import java.security.Permission; import java.security.Permissions; import java.util.Enumeration; -@TestTargetClass(Permissions.class) public class Permissions2Test extends junit.framework.TestCase { FilePermission readAllFiles = new FilePermission("<<ALL FILES>>", "read"); @@ -44,28 +38,16 @@ public class Permissions2Test extends junit.framework.TestCase { FilePermission readInFile = new FilePermission("aFile.file", "read"); /** - * @tests java.security.Permissions#Permissions() + * java.security.Permissions#Permissions() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "Permissions", - args = {} - ) public void test_Constructor() { // Test for method java.security.Permissions() new Permissions(); } /** - * @tests java.security.Permissions#add(java.security.Permission) + * java.security.Permissions#add(java.security.Permission) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "add", - args = {java.security.Permission.class} - ) public void test_addLjava_security_Permission() { // Test for method void // java.security.Permissions.add(java.security.Permission) @@ -107,14 +89,8 @@ public class Permissions2Test extends junit.framework.TestCase { } /** - * @tests java.security.Permissions#elements() + * java.security.Permissions#elements() */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "elements", - args = {} - ) public void test_elements() { // Test for method java.util.Enumeration // java.security.Permissions.elements() @@ -146,14 +122,8 @@ public class Permissions2Test extends junit.framework.TestCase { } /** - * @tests java.security.Permissions#implies(java.security.Permission) + * java.security.Permissions#implies(java.security.Permission) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "implies", - args = {java.security.Permission.class} - ) public void test_impliesLjava_security_Permission() { // Test for method boolean // java.security.Permissions.implies(java.security.Permission) diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/PermissionsTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PermissionsTest.java index bc5e9c9..f086b6b 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/PermissionsTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PermissionsTest.java @@ -22,11 +22,6 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.AllPermission; import java.security.BasicPermission; import java.security.Permission; @@ -42,22 +37,15 @@ import java.util.NoSuchElementException; import junit.framework.TestCase; -@TestTargetClass(Permissions.class) + /** * Tests for <code>Permissions</code> * */ - public class PermissionsTest extends TestCase { /** * Can add any type of permissions. Cannot add if collection is read-only. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "add", - args = {java.security.Permission.class} - ) public void testAdd() { Permissions ps = new Permissions(); Permission ap = new AllPermission(); @@ -93,12 +81,6 @@ public class PermissionsTest extends TestCase { * non-empty collection, should always return enumeration over unique * elements. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "elements", - args = {} - ) public void testElements() { Permissions ps = new Permissions(); Permission ap = new AllPermission(); @@ -147,14 +129,6 @@ public class PermissionsTest extends TestCase { /** * input parameter is null */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "implies", - args = {java.security.Permission.class} - ) - }) public void testNull(){ Permissions ps = new Permissions(); try { diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/PolicyTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PolicyTest.java index 28dd2da..a708ddb 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/PolicyTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PolicyTest.java @@ -22,11 +22,6 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; - import junit.framework.TestCase; import org.apache.harmony.security.tests.support.SecurityChecker; @@ -48,7 +43,7 @@ import java.security.cert.Certificate; import java.util.Collection; import java.util.Enumeration; import java.util.HashSet; -@TestTargetClass(Policy.class) + /** * Tests for <code>Policy</code> */ @@ -61,29 +56,9 @@ public class PolicyTest extends TestCase { } /** - * @tests constructor Policy() + * constructor Policy() */ @SuppressWarnings("cast") - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "Policy", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPermissions", - args = {java.security.CodeSource.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "refresh", - args = {} - ) - }) public void test_constructor() { TestProvider tp; CodeSource cs = new CodeSource(null, (Certificate[]) null); @@ -119,12 +94,6 @@ public class PolicyTest extends TestCase { /** * Tests that getPermissions() does proper permission evaluation. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPermissions", - args = {java.security.ProtectionDomain.class} - ) public void testGetPermissions() { SecurityPermission sp = new SecurityPermission("abc"); SecurityPermission sp2 = new SecurityPermission("fbdf"); @@ -170,23 +139,9 @@ public class PolicyTest extends TestCase { } /** - * @tests java.security.Policy#getPolicy() - * @tests java.security.Policy#setPolicy() + * java.security.Policy#getPolicy() + * java.security.Policy#setPolicy() */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "setPolicy", - args = {java.security.Policy.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getPolicy", - args = {} - ) - }) public void testResetingPolicyToDefault() { Policy oldPolicy = Policy.getPolicy(); @@ -209,14 +164,8 @@ public class PolicyTest extends TestCase { } /** - * @tests java.security.Policy#implies(ProtectionDomain, Permission) + * java.security.Policy#implies(ProtectionDomain, Permission) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "implies", - args = {java.security.ProtectionDomain.class, java.security.Permission.class} - ) public void test_implies() { Policy policy = Policy.getPolicy(); char s = File.separatorChar; @@ -292,20 +241,6 @@ public class PolicyTest extends TestCase { /** * Test property expansion in policy files */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "setPolicy", - args = {java.security.Policy.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getPolicy", - args = {} - ) - }) public void testPropertyExpansion() throws Exception { // Regression for HARMONY-1963 and HARMONY-2910 diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/PrivateKeyTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PrivateKeyTest.java index eefa460..a951934 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/PrivateKeyTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PrivateKeyTest.java @@ -22,30 +22,19 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; import java.security.PrivateKey; import junit.framework.TestCase; -@TestTargetClass(PrivateKey.class) + /** * Tests for <code>PrivateKey</code> class field * */ - public class PrivateKeyTest extends TestCase { /** * Test for <code>serialVersionUID</code> field */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Field testing", - method = "!serialVersionUID", - args = {} - ) public void testField() { checkPrivateKey cPrKey = new checkPrivateKey(); assertEquals("Incorrect serialVersionUID", cPrKey.getSerVerUID(), //PrivateKey.serialVersionUID, diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedActionException2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedActionException2Test.java index 8d46f1a..c931777 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedActionException2Test.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedActionException2Test.java @@ -17,28 +17,16 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.io.IOException; import java.security.PrivilegedActionException; -@TestTargetClass(PrivilegedActionException.class) public class PrivilegedActionException2Test extends junit.framework.TestCase { private static Throwable tCause = new Throwable("Test cause"); /** - * @tests java.security.PrivilegedActionException#PrivilegedActionException(java.lang.Exception) + * java.security.PrivilegedActionException#PrivilegedActionException(java.lang.Exception) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "PrivilegedActionException", - args = {java.lang.Exception.class} - ) public void test_ConstructorLjava_lang_Exception() { Exception e = new Exception("test exception"); PrivilegedActionException pe = new PrivilegedActionException(e); @@ -52,14 +40,8 @@ public class PrivilegedActionException2Test extends junit.framework.TestCase { } /** - * @tests java.security.PrivilegedActionException#getException() + * java.security.PrivilegedActionException#getException() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getException", - args = {} - ) public void test_getException() { Exception e = new IOException("test IOException"); PrivilegedActionException pe = new PrivilegedActionException(e); @@ -68,14 +50,8 @@ public class PrivilegedActionException2Test extends junit.framework.TestCase { } /** - * @tests java.security.PrivilegedActionException#getCause() + * java.security.PrivilegedActionException#getCause() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getCause", - args = {} - ) public void test_getCause() { Exception ex = new Exception("Test message", tCause); PrivilegedActionException pe = new PrivilegedActionException(ex); @@ -89,4 +65,4 @@ public class PrivilegedActionException2Test extends junit.framework.TestCase { fail("Unexpected exception"); } } -}
\ No newline at end of file +} diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedActionExceptionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedActionExceptionTest.java index d3e165d..67bef5f 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedActionExceptionTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedActionExceptionTest.java @@ -22,30 +22,18 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.PrivilegedActionException; import junit.framework.TestCase; -@TestTargetClass(PrivilegedActionException.class) + /** * Unit test for java.security.PrivilegedActionException. * */ - public class PrivilegedActionExceptionTest extends TestCase { /** * Tests PrivilegedActionException(Exception) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "PrivilegedActionException", - args = {java.lang.Exception.class} - ) public void testPrivilegedActionException() { new PrivilegedActionException(null); Exception ex = new Exception(); @@ -55,12 +43,6 @@ public class PrivilegedActionExceptionTest extends TestCase { /** * Tests PrivilegedActionException.getException() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getException", - args = {} - ) public void testGetException() { assertNull(new PrivilegedActionException(null).getException()); Exception ex = new Exception(); @@ -70,12 +52,6 @@ public class PrivilegedActionExceptionTest extends TestCase { /** * Tests PrivilegedActionException.toString() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {} - ) public void testToString() { assertNotNull(new PrivilegedActionException(null).toString()); assertNotNull(new PrivilegedActionException(new Exception()).toString()); diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedActionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedActionTest.java index fa69236..134d34a 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedActionTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedActionTest.java @@ -1,15 +1,10 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; - import junit.framework.TestCase; import java.security.AccessController; import java.security.PrivilegedAction; -@TestTargetClass(PrivilegedAction.class) public class PrivilegedActionTest extends TestCase { protected void setUp() throws Exception { @@ -35,10 +30,6 @@ public class PrivilegedActionTest extends TestCase { } - @TestTargetNew( - level=TestLevel.COMPLETE, - method="run" - ) public void testRun() { MyPrivilegedAction action = new MyPrivilegedAction(); String result = AccessController.doPrivileged(action); diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedExceptionActionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedExceptionActionTest.java index c9f7425..597ee47 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedExceptionActionTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PrivilegedExceptionActionTest.java @@ -1,9 +1,5 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; - import junit.framework.TestCase; import java.io.IOException; @@ -11,7 +7,6 @@ import java.security.AccessController; import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; -@TestTargetClass(PrivilegedExceptionAction.class) public class PrivilegedExceptionActionTest extends TestCase { protected void setUp() throws Exception { @@ -48,10 +43,6 @@ public class PrivilegedExceptionActionTest extends TestCase { } } - @TestTargetNew( - level=TestLevel.COMPLETE, - method="run" - ) public void testRun() { MyPrivilegedExceptionAction action1 = new MyPrivilegedExceptionAction(); try { diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/ProtectionDomainTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/ProtectionDomainTest.java index a69f072..cdea5c5 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/ProtectionDomainTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/ProtectionDomainTest.java @@ -22,11 +22,6 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.net.URL; import java.net.MalformedURLException; import java.net.URLClassLoader; @@ -40,12 +35,11 @@ import java.security.Principal; import java.security.ProtectionDomain; import junit.framework.TestCase; -@TestTargetClass(ProtectionDomain.class) + /** * Unit tests for java.security.ProtectionDomain. * */ - public class ProtectionDomainTest extends TestCase { private final AllPermission allperm = new AllPermission(); @@ -83,12 +77,6 @@ public class ProtectionDomainTest extends TestCase { * Class under test for void ProtectionDomain(CodeSource, * PermissionCollection) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "ProtectionDomain", - args = {java.security.CodeSource.class, java.security.PermissionCollection.class} - ) public void testProtectionDomainCodeSourcePermissionCollection_00() { new ProtectionDomain(null, null); new ProtectionDomain(cs, null); @@ -99,12 +87,6 @@ public class ProtectionDomainTest extends TestCase { /** * the ctor must set the PermissionCollection read-only */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "ProtectionDomain", - args = {java.security.CodeSource.class, java.security.PermissionCollection.class} - ) public void testProtectionDomainCodeSourcePermissionCollection_01() { assertFalse(perms.isReadOnly()); new ProtectionDomain(null, perms); @@ -114,12 +96,6 @@ public class ProtectionDomainTest extends TestCase { /** * Test for ProtectionDomain(CodeSource, PermissionCollection, ClassLoader, Principal[]) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "ProtectionDomain", - args = {java.security.CodeSource.class, java.security.PermissionCollection.class, java.lang.ClassLoader.class, java.security.Principal[].class} - ) public void testProtectionDomainCodeSourcePermissionCollectionClassLoaderPrincipalArray() { new ProtectionDomain(null, null, null, null); @@ -134,12 +110,6 @@ public class ProtectionDomainTest extends TestCase { /** * Tests for ProtectionDomain.getClassLoader() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getClassLoader", - args = {} - ) public void testGetClassLoader() { assertNull(new ProtectionDomain(null, null).getClassLoader()); assertSame(new ProtectionDomain(null, null, classldr, null) @@ -149,12 +119,6 @@ public class ProtectionDomainTest extends TestCase { /** * Tests for ProtectionDomain.getCodeSource() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getCodeSource", - args = {} - ) public void testGetCodeSource() { assertNull(new ProtectionDomain(null, null).getCodeSource()); assertSame(new ProtectionDomain(cs, null).getCodeSource(), cs); @@ -163,12 +127,6 @@ public class ProtectionDomainTest extends TestCase { /** * Tests for ProtectionDomain.getPermissions() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPermissions", - args = {} - ) public void testGetPermissions() { assertNull(new ProtectionDomain(null, null).getPermissions()); assertSame(new ProtectionDomain(null, perms).getPermissions(), perms); @@ -177,12 +135,6 @@ public class ProtectionDomainTest extends TestCase { /** * getPrincipals() always returns non null array */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getPrincipals", - args = {} - ) public void testGetPrincipals_00() { assertNotNull(new ProtectionDomain(null, null).getPrincipals()); } @@ -190,12 +142,6 @@ public class ProtectionDomainTest extends TestCase { /** * getPrincipals() returns new array each time it's called */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getPrincipals", - args = {} - ) public void testGetPrincipals_01() { ProtectionDomain pd = new ProtectionDomain(null, null, null, principals); Principal[] got = pd.getPrincipals(); @@ -208,12 +154,6 @@ public class ProtectionDomainTest extends TestCase { /** * ProtectionDomain with null Permissions must not imply() permissions. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "implies", - args = {java.security.Permission.class} - ) public void testImplies_00() { assertFalse(new ProtectionDomain(null, null).implies(allperm)); } @@ -222,12 +162,6 @@ public class ProtectionDomainTest extends TestCase { * ProtectionDomain with PermissionCollection which contains AllPermission * must imply() AllPermission. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "implies", - args = {java.security.Permission.class} - ) public void testImplies_01() { assertTrue(new ProtectionDomain(null, perms).implies(allperm)); } @@ -236,12 +170,6 @@ public class ProtectionDomainTest extends TestCase { * ProtectionDomain created with a static set of permissions must not query * policy. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "implies", - args = {java.security.Permission.class} - ) public void testImplies_02() { TestPolicy policy = new TestPolicy(); // null set of permissions [must] force the PD to use Policy - for @@ -261,12 +189,6 @@ public class ProtectionDomainTest extends TestCase { * ProtectionDomain created with dynamic set of permissions must query * policy. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "implies", - args = {java.security.Permission.class} - ) public void testImplies_03() { TestPolicy policy = new TestPolicy(); ProtectionDomain pd = new ProtectionDomain(cs, null, ClassLoader @@ -284,12 +206,6 @@ public class ProtectionDomainTest extends TestCase { /** * Simply checks that it's working somehow */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {} - ) public void testToString() { String res; res = new ProtectionDomain(null, null).toString(); diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/Provider2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/Provider2Test.java index 6fec8da..7f8c723 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/Provider2Test.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/Provider2Test.java @@ -17,17 +17,11 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.security.Provider; import java.security.Security; -@TestTargetClass(Provider.class) public class Provider2Test extends junit.framework.TestCase { class TestProvider extends Provider { @@ -55,14 +49,8 @@ public class Provider2Test extends junit.framework.TestCase { /** - * @tests java.security.Provider#entrySet() + * java.security.Provider#entrySet() */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "UnsupportedOperationException verification", - method = "entrySet", - args = {} - ) public void test_entrySet() { // test method of java.security.provider.entrySet provTest.put("test.prop", "this is a test property"); @@ -76,14 +64,8 @@ public class Provider2Test extends junit.framework.TestCase { } /** - * @tests java.security.Provider#getInfo() + * java.security.Provider#getInfo() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getInfo", - args = {} - ) public void test_getInfo() { // test method of java.security.provider.getInfo assertEquals("the information of the provider is not stored properly", @@ -92,14 +74,8 @@ public class Provider2Test extends junit.framework.TestCase { } /** - * @tests java.security.Provider#getName() + * java.security.Provider#getName() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getName", - args = {} - ) public void test_getName() { // test method of java.security.provider.getName assertEquals("the name of the provider is not stored properly", @@ -107,14 +83,8 @@ public class Provider2Test extends junit.framework.TestCase { } /** - * @tests java.security.Provider#getVersion() + * java.security.Provider#getVersion() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getVersion", - args = {} - ) public void test_getVersion() { // test method of java.security.provider.getVersion assertEquals("the version of the provider is not stored properly", @@ -122,14 +92,8 @@ public class Provider2Test extends junit.framework.TestCase { } /** - * @tests java.security.Provider#keySet() + * java.security.Provider#keySet() */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "UnsupportedOperationException verification", - method = "keySet", - args = {} - ) public void test_keySet() { // test method of java.security.provider.keySet provTest.put("test.prop", "this is a test property"); @@ -142,14 +106,8 @@ public class Provider2Test extends junit.framework.TestCase { } /** - * @tests java.security.Provider#values() + * java.security.Provider#values() */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "UnsupportedOperationException verification", - method = "values", - args = {} - ) public void test_values() { // test method of java.security.provider.values provTest.put("test.prop", "this is a test property"); @@ -163,14 +121,8 @@ public class Provider2Test extends junit.framework.TestCase { /** - * @tests java.security.Provider#toString() + * java.security.Provider#toString() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Regression test", - method = "toString", - args = {} - ) public void test_toString() { // Regression for HARMONY-3734 assertEquals("provTest version 1.2", provTest.toString()); diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/ProviderExceptionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/ProviderExceptionTest.java index d3db218..03a86e7 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/ProviderExceptionTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/ProviderExceptionTest.java @@ -22,15 +22,10 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.ProviderException; import junit.framework.TestCase; -@TestTargetClass(ProviderException.class) + /** * Tests for <code>ProviderException</code> class constructors and methods. * @@ -48,12 +43,6 @@ public class ProviderExceptionTest extends TestCase { * Test for <code>ProviderException()</code> constructor Assertion: * constructs ProviderException with no detail message */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "ProviderException", - args = {} - ) public void testProviderException01() { ProviderException tE = new ProviderException(); assertNull("getMessage() must return null.", tE.getMessage()); @@ -65,12 +54,6 @@ public class ProviderExceptionTest extends TestCase { * constructs ProviderException with detail message msg. Parameter * <code>msg</code> is not null. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "ProviderException", - args = {java.lang.String.class} - ) public void testProviderException02() { ProviderException tE; for (int i = 0; i < msgs.length; i++) { @@ -85,12 +68,6 @@ public class ProviderExceptionTest extends TestCase { * Test for <code>ProviderException(String)</code> constructor Assertion: * constructs ProviderException when <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "ProviderException", - args = {java.lang.String.class} - ) public void testProviderException03() { String msg = null; ProviderException tE = new ProviderException(msg); @@ -102,12 +79,6 @@ public class ProviderExceptionTest extends TestCase { * Test for <code>ProviderException(Throwable)</code> constructor * Assertion: constructs ProviderException when <code>cause</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "ProviderException", - args = {java.lang.Throwable.class} - ) public void testProviderException04() { Throwable cause = null; ProviderException tE = new ProviderException(cause); @@ -120,12 +91,6 @@ public class ProviderExceptionTest extends TestCase { * Assertion: constructs ProviderException when <code>cause</code> is not * null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "ProviderException", - args = {java.lang.Throwable.class} - ) public void testProviderException05() { ProviderException tE = new ProviderException(tCause); if (tE.getMessage() != null) { @@ -144,12 +109,6 @@ public class ProviderExceptionTest extends TestCase { * Assertion: constructs ProviderException when <code>cause</code> is null * <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "ProviderException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testProviderException06() { ProviderException tE = new ProviderException(null, null); assertNull("getMessage() must return null", tE.getMessage()); @@ -161,12 +120,6 @@ public class ProviderExceptionTest extends TestCase { * Assertion: constructs ProviderException when <code>cause</code> is null * <code>msg</code> is not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "ProviderException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testProviderException07() { ProviderException tE; for (int i = 0; i < msgs.length; i++) { @@ -182,12 +135,6 @@ public class ProviderExceptionTest extends TestCase { * Assertion: constructs ProviderException when <code>cause</code> is not * null <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "ProviderException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testProviderException08() { ProviderException tE = new ProviderException(null, tCause); if (tE.getMessage() != null) { @@ -206,12 +153,6 @@ public class ProviderExceptionTest extends TestCase { * Assertion: constructs ProviderException when <code>cause</code> is not * null <code>msg</code> is not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "ProviderException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testProviderException09() { ProviderException tE; for (int i = 0; i < msgs.length; i++) { diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/ProviderServiceTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/ProviderServiceTest.java index d426b20..bef27ba 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/ProviderServiceTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/ProviderServiceTest.java @@ -22,11 +22,6 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.InvalidParameterException; import java.security.Provider; import java.security.Provider.Service; @@ -38,19 +33,13 @@ import java.util.Map; import org.apache.harmony.security.tests.support.RandomImpl; import junit.framework.TestCase; -@TestTargetClass(Service.class) + /** * Tests for <code>Provider.Service</code> constructor and methods * */ public class ProviderServiceTest extends TestCase { - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "Service", - args = {java.security.Provider.class, java.lang.String.class, java.lang.String.class, java.lang.String.class, java.util.List.class, java.util.Map.class} - ) public void testService() { Provider p = new MyProvider(); try { @@ -95,12 +84,6 @@ public class ProviderServiceTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getAttribute", - args = {java.lang.String.class} - ) public void testGetAttribute() { Provider p = new MyProvider(); Provider.Service s = new Provider.Service(p, "type", "algorithm", @@ -132,12 +115,6 @@ public class ProviderServiceTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "newInstance", - args = {java.lang.Object.class} - ) public void testNewInstance() throws Exception { Provider p = new MyProvider(); Provider.Service s = new Provider.Service(p, "SecureRandom", @@ -156,12 +133,6 @@ public class ProviderServiceTest extends TestCase { } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getAlgorithm", - args = {} - ) public void testGetAlgorithm() { Provider p = new MyProvider(); Provider.Service s1 = new Provider.Service(p, "type", "algorithm", @@ -174,12 +145,6 @@ public class ProviderServiceTest extends TestCase { assertTrue(s2.getAlgorithm().equals("algorithm")); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getClassName", - args = {} - ) public void testGetClassName() { Provider p = new MyProvider(); Provider.Service s1 = new Provider.Service(p, "type", "algorithm", @@ -192,12 +157,6 @@ public class ProviderServiceTest extends TestCase { assertTrue(s2.getClassName().equals("tests.java.security.support.RandomImpl")); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getProvider", - args = {} - ) public void testGetProvider() { Provider p = new MyProvider(); Provider.Service s1 = new Provider.Service(p, "type", "algorithm", @@ -210,12 +169,6 @@ public class ProviderServiceTest extends TestCase { assertTrue(s2.getProvider() == p); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getType", - args = {} - ) public void testGetType() { Provider p = new MyProvider(); Provider.Service s1 = new Provider.Service(p, "type", "algorithm", @@ -228,12 +181,6 @@ public class ProviderServiceTest extends TestCase { assertTrue(s2.getType().equals("SecureRandom")); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "supportsParameter", - args = {java.lang.Object.class} - ) public void testSupportsParameter() { Provider p = new MyProvider(); Provider.Service s1 = new Provider.Service(p, "type", "algorithm", @@ -242,12 +189,6 @@ public class ProviderServiceTest extends TestCase { assertTrue(s1.supportsParameter(new Object())); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {} - ) public void testToString() { Provider p = new MyProvider(); Provider.Service s1 = new Provider.Service(p, "type", "algorithm", diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/ProviderTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/ProviderTest.java index 911ede3..9a90424 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/ProviderTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/ProviderTest.java @@ -41,11 +41,7 @@ import java.util.Set; import java.util.Map.Entry; import junit.framework.TestCase; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -@TestTargetClass(Provider.class) /** * Tests for <code>Provider</code> constructor and methods * @@ -93,12 +89,6 @@ public class ProviderTest extends TestCase { /* * Class under test for void Provider() */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies provider object", - method = "Provider", - args = {java.lang.String.class, double.class, java.lang.String.class} - ) public final void testProvider() { if (!p.getProperty("Provider.id name").equals( String.valueOf(p.getName()))) { @@ -118,12 +108,6 @@ public class ProviderTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "clear", - args = {} - ) public final void testClear() { p.clear(); assertNull(p.getProperty("MessageDigest.SHA-1")); @@ -132,12 +116,6 @@ public class ProviderTest extends TestCase { /* * Class under test for void Provider(String, double, String) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies constructor with non null parameters", - method = "Provider", - args = {java.lang.String.class, double.class, java.lang.String.class} - ) public final void testProviderStringdoubleString() { Provider p = new MyProvider("Provider name", 123.456, "Provider info"); assertEquals("Provider name", p.getName()); @@ -149,22 +127,10 @@ public class ProviderTest extends TestCase { assertEquals("MyProvider", p.getName()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getVersion", - args = {} - ) public final void testGetVersion() { assertEquals(1.0, p.getVersion(), 0L); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getInfo", - args = {} - ) public final void testGetInfo() { assertEquals("Provider for testing", p.getInfo()); } @@ -172,12 +138,6 @@ public class ProviderTest extends TestCase { /* * Class under test for void putAll(Map) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "putAll", - args = {java.util.Map.class} - ) public final void testPutAllMap() { HashMap hm = new HashMap(); hm.put("MessageDigest.SHA-1", "aaa.bbb.ccc.ddd"); @@ -196,12 +156,6 @@ public class ProviderTest extends TestCase { /* * Class under test for Set entrySet() */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "entrySet", - args = {} - ) public final void testEntrySet() { p.put("MessageDigest.SHA-256", "aaa.bbb.ccc.ddd"); @@ -249,12 +203,6 @@ public class ProviderTest extends TestCase { /* * Class under test for Set keySet() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "keySet", - args = {} - ) public final void testKeySet() { p.put("MessageDigest.SHA-256", "aaa.bbb.ccc.ddd"); @@ -282,12 +230,6 @@ public class ProviderTest extends TestCase { /* * Class under test for Collection values() */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "values", - args = {} - ) public final void testValues() { p.put("MessageDigest.ASH-256", "aaa.bbb.ccc.ddd"); @@ -314,12 +256,6 @@ public class ProviderTest extends TestCase { /* * Class under test for Object put(Object, Object) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "put", - args = {java.lang.Object.class, java.lang.Object.class} - ) public final void testPutObjectObject() { p.put("MessageDigest.SHA-1", "aaa.bbb.ccc.ddd"); p.put("Type.Algorithm", "className"); @@ -353,12 +289,6 @@ public class ProviderTest extends TestCase { /* * Class under test for Object remove(Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "remove", - args = {java.lang.Object.class} - ) public final void testRemoveObject() { Object o = p.remove("MessageDigest.SHA-1"); @@ -389,12 +319,6 @@ public class ProviderTest extends TestCase { } // Regression for HARMONY-2760. - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Regression test: verifies constructor with two null parameters.", - method = "Provider", - args = {java.lang.String.class, double.class, java.lang.String.class} - ) public void testConstructor() { MyProvider myProvider = new MyProvider(null, 1, null); assertNull(myProvider.getName()); @@ -435,12 +359,6 @@ public class ProviderTest extends TestCase { } // BEGIN android-added - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getService", - args = {java.lang.String.class, java.lang.String.class} - ) public final void testService2() { Provider[] pp = Security.getProviders("MessageDigest.ASH-1"); if (pp == null) { @@ -462,12 +380,6 @@ public class ProviderTest extends TestCase { // END android-added // BEGIN android-added - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getServices", - args = {} - ) public final void testGetServices() { MyProvider myProvider = new MyProvider(null, 1, null); Set<Provider.Service> services = myProvider.getServices(); @@ -508,12 +420,6 @@ public class ProviderTest extends TestCase { // END android-added // BEGIN android-added - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "putService", - args = {java.security.Provider.Service.class} - ) public final void testPutService() { MyProvider myProvider = new MyProvider(null, 1, null); Provider.Service s[] = new Provider.Service[3]; @@ -565,12 +471,6 @@ public class ProviderTest extends TestCase { // END android-added // BEGIN android-added - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "removeService", - args = {java.security.Provider.Service.class} - ) public final void testRemoveService() { MyProvider myProvider = new MyProvider(null, 1, null); try { @@ -639,12 +539,6 @@ public class ProviderTest extends TestCase { // END android-added // BEGIN android-added - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "load", - args = {java.io.InputStream.class} - ) public final void testLoad() throws IOException { InputStream is = new ByteArrayInputStream(writeProperties()); MyProvider myProvider = new MyProvider("name", 1, "info"); @@ -670,12 +564,6 @@ public class ProviderTest extends TestCase { // END android-added // BEGIN android-added - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "load", - args = {java.io.InputStream.class} - ) public final void testLoad2() { class TestInputStream extends InputStream { @Override diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/PublicKeyTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PublicKeyTest.java index fe6e1e7..46d003d 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/PublicKeyTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/PublicKeyTest.java @@ -25,26 +25,16 @@ package org.apache.harmony.security.tests.java.security; import java.security.PublicKey; import junit.framework.TestCase; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -@TestTargetClass(PublicKey.class) + /** * Tests for <code>PublicKey</code> class field * */ - public class PublicKeyTest extends TestCase { /** * Test for <code>serialVersionUID</code> field */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Field testing", - method = "!serialVersionUID", - args = {} - ) public void testField() { checkPublicKey cPK = new checkPublicKey(); assertEquals("Incorrect serialVersionUID", cPK.getSerVerUID(), //PublicKey.serialVersionUID, diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/Security2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/Security2Test.java index 75eeceb..d9f4dd7 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/Security2Test.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/Security2Test.java @@ -17,9 +17,6 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; import java.security.InvalidParameterException; import java.security.Provider; import java.security.Security; @@ -30,18 +27,11 @@ import java.util.Set; import tests.support.Support_ProviderTrust; import tests.support.Support_TestProvider; -@TestTargetClass(Security.class) public class Security2Test extends junit.framework.TestCase { /** - * @tests java.security.Security#getProviders(java.lang.String) + * java.security.Security#getProviders(java.lang.String) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "NullPointerException checking missed", - method = "getProviders", - args = {java.lang.String.class} - ) public void test_getProvidersLjava_lang_String() { // Test for method void // java.security.Security.getProviders(java.lang.String) @@ -215,14 +205,8 @@ public class Security2Test extends junit.framework.TestCase { } /** - * @tests java.security.Security#getProviders(java.util.Map) + * java.security.Security#getProviders(java.util.Map) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "NullPointerException checking missed", - method = "getProviders", - args = {java.util.Map.class} - ) public void test_getProvidersLjava_util_Map() { // Test for method void // java.security.Security.getProviders(java.util.Map) @@ -306,14 +290,8 @@ public class Security2Test extends junit.framework.TestCase { } /** - * @tests java.security.Security#removeProvider(java.lang.String) + * java.security.Security#removeProvider(java.lang.String) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "SecurityException checking missed", - method = "removeProvider", - args = {java.lang.String.class} - ) public void test_removeProviderLjava_lang_String() { // Test for method void // java.security.Security.removeProvider(java.lang.String) diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/SecurityPermission2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SecurityPermission2Test.java index 9194193..f47e2d4 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/SecurityPermission2Test.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SecurityPermission2Test.java @@ -17,25 +17,13 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; - import java.security.SecurityPermission; -@TestTargetClass(SecurityPermission.class) public class SecurityPermission2Test extends junit.framework.TestCase { /** - * @tests java.security.SecurityPermission#SecurityPermission(java.lang.String) + * java.security.SecurityPermission#SecurityPermission(java.lang.String) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verification with valid parameter only", - method = "SecurityPermission", - args = {java.lang.String.class} - ) public void test_ConstructorLjava_lang_String() { // Test for method java.security.SecurityPermission(java.lang.String) assertEquals("create securityPermission constructor(string) failed", @@ -45,15 +33,9 @@ public class SecurityPermission2Test extends junit.framework.TestCase { } /** - * @tests java.security.SecurityPermission#SecurityPermission(java.lang.String, + * java.security.SecurityPermission#SecurityPermission(java.lang.String, * java.lang.String) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verification with valid parameters only", - method = "SecurityPermission", - args = {java.lang.String.class, java.lang.String.class} - ) public void test_ConstructorLjava_lang_StringLjava_lang_String() { // Test for method java.security.SecurityPermission(java.lang.String, // java.lang.String) @@ -62,4 +44,4 @@ public class SecurityPermission2Test extends junit.framework.TestCase { "security.file", sp.getName()); } -}
\ No newline at end of file +} diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/SecurityPermissionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SecurityPermissionTest.java index 6eedf88..99bf0ac 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/SecurityPermissionTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SecurityPermissionTest.java @@ -22,15 +22,10 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; - import java.security.SecurityPermission; import junit.framework.TestCase; -@TestTargetClass(SecurityPermission.class) + /** * Tests for <code>SecurityPermission</code> * @@ -42,20 +37,6 @@ public class SecurityPermissionTest extends TestCase { * If name is empty then IAE should be thrown. * Action is ignored. */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "SecurityPermission", - args = {java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "SecurityPermission", - args = {java.lang.String.class, java.lang.String.class} - ) - }) public void testCtor() { String name = "basic123*$%#"; diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/SecurityTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SecurityTest.java index bb54aed..f50318f 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/SecurityTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SecurityTest.java @@ -22,10 +22,6 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; import java.security.InvalidParameterException; import java.security.Provider; import java.security.Security; @@ -37,18 +33,11 @@ import java.util.Set; import junit.framework.TestCase; -@TestTargetClass(Security.class) public class SecurityTest extends TestCase { /** - * @tests java.security.Security#insertProviderAt(Provider, int) + * java.security.Security#insertProviderAt(Provider, int) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "SecurityException checking missed", - method = "insertProviderAt", - args = {java.security.Provider.class, int.class} - ) public final void test_insertProviderAtLjava_security_ProviderLI() { try { @@ -91,14 +80,8 @@ public class SecurityTest extends TestCase { } /** - * @tests java.security.Security#addProvider(Provider) + * java.security.Security#addProvider(Provider) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "SecurityException checking missed", - method = "addProvider", - args = {java.security.Provider.class} - ) public final void test_addProviderLjava_security_Provider() { try { @@ -124,17 +107,11 @@ public class SecurityTest extends TestCase { } /** - * @tests java.security.Security#getAlgorithmProperty(String algName, String + * java.security.Security#getAlgorithmProperty(String algName, String * propName) * @disabled because Security.getAlgorithmProperty looks for * "propName.algName" instead of "Alg.propName.algName" */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getAlgorithmProperty", - args = {java.lang.String.class, java.lang.String.class} - ) @SuppressWarnings("deprecation") public final void testGetAlgorithmPropertyLjava_lang_String_java_lang_String() { @@ -157,14 +134,8 @@ public class SecurityTest extends TestCase { } /** - * @tests java.security.Security#getAlgorithms(String serviceName) + * java.security.Security#getAlgorithms(String serviceName) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getAlgorithms", - args = {java.lang.String.class} - ) public final void testGetAlgorithmsLjava_lang_String() { String[] servicesNames = { "Signature", "MessageDigest", "Cipher", "Mac", "KeyStore" }; @@ -182,12 +153,6 @@ public class SecurityTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "removeProvider", - args = {java.lang.String.class} - ) public final void testRemoveProvider() { Provider[] providers; Provider[] providers1; @@ -213,22 +178,8 @@ public class SecurityTest extends TestCase { } /** - * @tests java.security.Security#getProvider(String) + * java.security.Security#getProvider(String) */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getProvider", - args = {java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getProviders", - args = {} - ) - }) public final void test_getProviderLjava_lang_String() { // Returns null if no provider with the specified name is installed @@ -258,14 +209,8 @@ public class SecurityTest extends TestCase { } /** - * @tests java.security.Security#getProviders(String) + * java.security.Security#getProviders(String) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getProviders", - args = {java.lang.String.class} - ) public void test_getProvidersLjava_lang_String() { try { Security.getProviders(""); @@ -332,14 +277,8 @@ public class SecurityTest extends TestCase { } /** - * @tests java.security.Security#getProviders(java.util.Map) + * java.security.Security#getProviders(java.util.Map) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getProviders", - args = {java.util.Map.class} - ) public void test_getProvidersLjava_util_Map() { Map<String, String> m = new HashMap<String, String>(); @@ -410,14 +349,8 @@ public class SecurityTest extends TestCase { } /** - * @tests java.security.Security#getProviders() + * java.security.Security#getProviders() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getProviders", - args = {} - ) public void test_getProviders() { Provider[] prv; @@ -445,14 +378,8 @@ public class SecurityTest extends TestCase { } /** - * @tests java.security.Security#getProperty(String) + * java.security.Security#getProperty(String) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verification of null parameter only.", - method = "getProperty", - args = {java.lang.String.class} - ) public void test_getPropertyLjava_lang_String() { try { @@ -466,14 +393,8 @@ public class SecurityTest extends TestCase { } /** - * @tests java.security.Security#setProperty(String,String) + * java.security.Security#setProperty(String,String) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "SecurityException checking missed", - method = "setProperty", - args = {java.lang.String.class, java.lang.String.class} - ) public void test_setPropertyLjava_lang_StringLjava_lang_String() { try { diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/Signature2Test.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/Signature2Test.java index 6355bee..44e956a 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/Signature2Test.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/Signature2Test.java @@ -17,11 +17,6 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; - import java.math.BigInteger; import java.nio.ByteBuffer; import java.security.AlgorithmParameters; @@ -44,7 +39,6 @@ import java.util.Set; import java.security.NoSuchAlgorithmException; import java.security.NoSuchProviderException; -@TestTargetClass(Signature.class) public class Signature2Test extends junit.framework.TestCase { private static final String MESSAGE = "abc"; @@ -66,14 +60,8 @@ public class Signature2Test extends junit.framework.TestCase { } /** - * @tests java.security.Signature#clone() + * java.security.Signature#clone() */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "CloneNotSupportedException checking was tested", - method = "clone", - args = {} - ) public void test_clone() throws Exception { Signature s = Signature.getInstance("DSA"); try { @@ -85,14 +73,8 @@ public class Signature2Test extends junit.framework.TestCase { } /** - * @tests java.security.Signature#getAlgorithm() + * java.security.Signature#getAlgorithm() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getAlgorithm", - args = {} - ) public void test_getAlgorithm() throws Exception { String alg = Signature.getInstance("DSA").getAlgorithm(); assertTrue("getAlgorithm did not get DSA (" + alg + ")", alg @@ -100,14 +82,8 @@ public class Signature2Test extends junit.framework.TestCase { } /** - * @tests java.security.Signature#getInstance(java.lang.String) + * java.security.Signature#getInstance(java.lang.String) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class} - ) public void test_getInstanceLjava_lang_String() { try { Signature.getInstance("DSA"); @@ -124,15 +100,9 @@ public class Signature2Test extends junit.framework.TestCase { } /** - * @tests java.security.Signature#getInstance(java.lang.String, + * java.security.Signature#getInstance(java.lang.String, * java.security.Provider) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.security.Provider.class} - ) public void test_getInstanceLjava_lang_StringLjava_lang_String_java_security_Provider() throws Exception { Provider[] providers = Security.getProviders("Signature.DSA"); @@ -173,15 +143,9 @@ public class Signature2Test extends junit.framework.TestCase { } /** - * @tests java.security.Signature#getInstance(java.lang.String, + * java.security.Signature#getInstance(java.lang.String, * java.lang.String) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void test_getInstanceLjava_lang_StringLjava_lang_String() throws Exception { Provider[] providers = Security.getProviders("Signature.DSA"); @@ -219,14 +183,8 @@ public class Signature2Test extends junit.framework.TestCase { } /** - * @tests java.security.Signature#getParameters() + * java.security.Signature#getParameters() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getParameters", - args = {} - ) public void test_getParameters() throws Exception { Signature sig = Signature.getInstance("DSA"); try { @@ -252,14 +210,8 @@ public class Signature2Test extends junit.framework.TestCase { } /** - * @tests java.security.Signature#getParameter(java.lang.String) + * java.security.Signature#getParameter(java.lang.String) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Just exception case was tested", - method = "getParameter", - args = {java.lang.String.class} - ) @SuppressWarnings("deprecation") public void test_getParameterLjava_lang_String() throws Exception { Signature sig = Signature.getInstance("DSA"); @@ -272,28 +224,16 @@ public class Signature2Test extends junit.framework.TestCase { } /** - * @tests java.security.Signature#getProvider() + * java.security.Signature#getProvider() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getProvider", - args = {} - ) public void test_getProvider() throws Exception { Provider p = Signature.getInstance("DSA").getProvider(); assertNotNull("provider is null", p); } /** - * @tests java.security.Signature#initSign(java.security.PrivateKey) + * java.security.Signature#initSign(java.security.PrivateKey) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "initSign", - args = {java.security.PrivateKey.class} - ) public void test_initSignLjava_security_PrivateKey() throws Exception { try { Signature.getInstance("DSA").initSign(dsaKeys.getPrivate()); @@ -309,11 +249,6 @@ public class Signature2Test extends junit.framework.TestCase { } } - @TestTargetNew ( - level=TestLevel.COMPLETE, - method="initSign", - args={PrivateKey.class, SecureRandom.class} - ) public void test_initSignLjava_security_PrivateKeyLjava_security_SecureRandom() { try { @@ -337,14 +272,8 @@ public class Signature2Test extends junit.framework.TestCase { } /** - * @tests java.security.Signature#initVerify(java.security.PublicKey) + * java.security.Signature#initVerify(java.security.PublicKey) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "initVerify", - args = {java.security.PublicKey.class} - ) public void test_initVerifyLjava_security_PublicKey() throws Exception { Signature.getInstance("DSA").initVerify(dsaKeys.getPublic()); @@ -358,14 +287,8 @@ public class Signature2Test extends junit.framework.TestCase { } /** - * @tests java.security.Signature#initVerify(java.security.cert.Certificate) + * java.security.Signature#initVerify(java.security.cert.Certificate) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "InvalidKeyException checking missed", - method = "initVerify", - args = {java.security.cert.Certificate.class} - ) public void test_initVerifyLjava_security_Certificate() throws Exception { Provider p = new MyProvider(); p.put("DSA", "tests.java.security.support.cert.MyCertificate$1"); @@ -391,15 +314,9 @@ public class Signature2Test extends junit.framework.TestCase { } /** - * @tests java.security.Signature#setParameter(java.lang.String, + * java.security.Signature#setParameter(java.lang.String, * java.lang.Object) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Just exception case was tested", - method = "setParameter", - args = {java.lang.String.class, java.lang.Object.class} - ) @SuppressWarnings("deprecation") public void test_setParameterLjava_lang_StringLjava_lang_Object() throws Exception { @@ -416,14 +333,8 @@ public class Signature2Test extends junit.framework.TestCase { } /** - * @tests java.security.Signature#setParameter(java.security.spec.AlgorithmParameterSpec) + * java.security.Signature#setParameter(java.security.spec.AlgorithmParameterSpec) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Just exception case was tested", - method = "setParameter", - args = {java.security.spec.AlgorithmParameterSpec.class} - ) public void test_setParameterLjava_security_spec_AlgorithmParameterSpec() throws Exception { Signature sig = Signature.getInstance("DSA"); @@ -440,14 +351,8 @@ public class Signature2Test extends junit.framework.TestCase { } /** - * @tests java.security.Signature#sign() + * java.security.Signature#sign() */ - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "Verification of returned value missed. SignatureException checking missed.", - method = "sign", - args = {} - ) public void test_sign() throws Exception { Signature sig = Signature.getInstance("DSA"); sig.initSign(dsaKeys.getPrivate()); @@ -456,28 +361,16 @@ public class Signature2Test extends junit.framework.TestCase { } /** - * @tests java.security.Signature#toString() + * java.security.Signature#toString() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {} - ) public void test_toString() throws Exception { String str = Signature.getInstance("DSA").toString(); assertNotNull("toString is null", str); } /** - * @tests java.security.Signature#update(byte[]) + * java.security.Signature#update(byte[]) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "SignatureException checking missed", - method = "update", - args = {byte[].class} - ) public void test_update$B() throws Exception { Signature sig = Signature.getInstance("DSA"); sig.initSign(dsaKeys.getPrivate()); @@ -495,14 +388,8 @@ public class Signature2Test extends junit.framework.TestCase { } /** - * @tests java.security.Signature#update(byte[], int, int) + * java.security.Signature#update(byte[], int, int) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "SignatureException checking missed. Verification of different values off and len missed.", - method = "update", - args = {byte[].class, int.class, int.class} - ) public void test_update$BII() throws Exception { Signature sig = Signature.getInstance("DSA"); byte[] bytes = MESSAGE.getBytes(); @@ -537,14 +424,8 @@ public class Signature2Test extends junit.framework.TestCase { } /** - * @tests java.security.Signature#update(byte) + * java.security.Signature#update(byte) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "SignatureException checking missed", - method = "update", - args = {byte.class} - ) public void test_updateB() throws Exception { Signature sig = Signature.getInstance("DSA"); sig.initSign(dsaKeys.getPrivate()); @@ -554,14 +435,8 @@ public class Signature2Test extends junit.framework.TestCase { } /** - * @tests java.security.Signature#update(ByteBuffer data) + * java.security.Signature#update(ByteBuffer data) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "update", - args = {java.nio.ByteBuffer.class} - ) public void test_updateLjava_nio_ByteBuffer() throws Exception { Signature sig = Signature.getInstance("DSA"); ByteBuffer buffer = ByteBuffer.allocate(10); @@ -582,14 +457,8 @@ public class Signature2Test extends junit.framework.TestCase { } /** - * @tests java.security.Signature#verify(byte[]) + * java.security.Signature#verify(byte[]) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "verify", - args = {byte[].class} - ) public void test_verify$B() throws Exception { Signature sig = Signature.getInstance("DSA"); @@ -610,14 +479,8 @@ public class Signature2Test extends junit.framework.TestCase { } /** - * @tests java.security.Signature#verify(byte[], int, int) + * java.security.Signature#verify(byte[], int, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "verify", - args = {byte[].class, int.class, int.class} - ) public void test_verify$BII() throws Exception { Signature sig = Signature.getInstance("DSA"); sig.initSign(dsaKeys.getPrivate()); diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/SignatureExceptionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SignatureExceptionTest.java index 40d3d1f..87a9384 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/SignatureExceptionTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SignatureExceptionTest.java @@ -22,15 +22,10 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; - import java.security.SignatureException; import junit.framework.TestCase; -@TestTargetClass(SignatureException.class) + /** * Tests for <code>SignatureException</code> class constructors and methods. * @@ -48,12 +43,6 @@ public class SignatureExceptionTest extends TestCase { * Test for <code>SignatureException()</code> constructor Assertion: * constructs SignatureException with no detail message */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "SignatureException", - args = {} - ) public void testSignatureException01() { SignatureException tE = new SignatureException(); assertNull("getMessage() must return null.", tE.getMessage()); @@ -65,12 +54,6 @@ public class SignatureExceptionTest extends TestCase { * constructs SignatureException with detail message msg. Parameter * <code>msg</code> is not null. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "SignatureException", - args = {java.lang.String.class} - ) public void testSignatureException02() { SignatureException tE; for (int i = 0; i < msgs.length; i++) { @@ -85,12 +68,6 @@ public class SignatureExceptionTest extends TestCase { * Test for <code>SignatureException(String)</code> constructor Assertion: * constructs SignatureException when <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "SignatureException", - args = {java.lang.String.class} - ) public void testSignatureException03() { String msg = null; SignatureException tE = new SignatureException(msg); @@ -103,12 +80,6 @@ public class SignatureExceptionTest extends TestCase { * Assertion: constructs SignatureException when <code>cause</code> is * null */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "SignatureException", - args = {java.lang.Throwable.class} - ) public void testSignatureException04() { Throwable cause = null; SignatureException tE = new SignatureException(cause); @@ -121,12 +92,6 @@ public class SignatureExceptionTest extends TestCase { * Assertion: constructs SignatureException when <code>cause</code> is not * null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "SignatureException", - args = {java.lang.Throwable.class} - ) public void testSignatureException05() { SignatureException tE = new SignatureException(tCause); if (tE.getMessage() != null) { @@ -145,12 +110,6 @@ public class SignatureExceptionTest extends TestCase { * Assertion: constructs SignatureException when <code>cause</code> is * null <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "SignatureException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testSignatureException06() { SignatureException tE = new SignatureException(null, null); assertNull("getMessage() must return null", tE.getMessage()); @@ -162,12 +121,6 @@ public class SignatureExceptionTest extends TestCase { * Assertion: constructs SignatureException when <code>cause</code> is * null <code>msg</code> is not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "SignatureException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testSignatureException07() { SignatureException tE; for (int i = 0; i < msgs.length; i++) { @@ -183,12 +136,6 @@ public class SignatureExceptionTest extends TestCase { * Assertion: constructs SignatureException when <code>cause</code> is not * null <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "SignatureException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testSignatureException08() { SignatureException tE = new SignatureException(null, tCause); if (tE.getMessage() != null) { @@ -207,12 +154,6 @@ public class SignatureExceptionTest extends TestCase { * Assertion: constructs SignatureException when <code>cause</code> is not * null <code>msg</code> is not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "SignatureException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testSignatureException09() { SignatureException tE; for (int i = 0; i < msgs.length; i++) { diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/SignatureSpiTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SignatureSpiTest.java index 2b421e3..ea0bd7f 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/SignatureSpiTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SignatureSpiTest.java @@ -1,10 +1,5 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; - import junit.framework.TestCase; import java.nio.ByteBuffer; @@ -21,7 +16,7 @@ import java.security.SignatureSpi; import java.security.spec.AlgorithmParameterSpec; import java.util.HashSet; import java.util.Set; -@TestTargetClass(SignatureSpi.class) + public class SignatureSpiTest extends TestCase { protected void setUp() throws Exception { @@ -33,12 +28,6 @@ public class SignatureSpiTest extends TestCase { } @SuppressWarnings("cast") - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "SignatureSpi", - args = {} - ) public void testSignatureSpi() { try { MySignatureSpi1 ss1 = new MySignatureSpi1(); @@ -49,12 +38,6 @@ public class SignatureSpiTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "clone", - args = {} - ) public void testClone() { MySignatureSpi1 ss1 = new MySignatureSpi1(); try { @@ -73,56 +56,6 @@ public class SignatureSpiTest extends TestCase { } } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineGetParameter", - args = {java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineInitSign", - args = {java.security.PrivateKey.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineInitVerify", - args = {java.security.PublicKey.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineSetParameter", - args = {java.lang.String.class, java.lang.Object.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineSign", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineUpdate", - args = {byte.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineUpdate", - args = {byte[].class, int.class, int.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineVerify", - args = {byte[].class} - ) - }) public void testAbstractMethods() { MySignatureSpi1 ss1 = new MySignatureSpi1(); byte[] b = {0, 1, 2, 3, 4, 5}; @@ -143,12 +76,6 @@ public class SignatureSpiTest extends TestCase { private boolean engineGetParametersCalled = false; private boolean engineGetParametersExceptionOcurred = false; - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineGetParameters", - args = {} - ) public void testEngineGetParameters() { // or rather test that no UnsupportedOperationException is thrown? @@ -382,11 +309,6 @@ public class SignatureSpiTest extends TestCase { } } - @TestTargetNew( - level=TestLevel.COMPLETE, - method="engineInitSign", - args={PrivateKey.class, SecureRandom.class} - ) public void testEngineInitSign_PrivateKey_SecureRandom() { MySignature signature = new MySignature("dummy"); @@ -399,11 +321,6 @@ public class SignatureSpiTest extends TestCase { } } - @TestTargetNew( - level=TestLevel.COMPLETE, - method="engineSetParameter", - args={AlgorithmParameterSpec.class} - ) public void testEngineSetParameter() { MySignature signature = new MySignature("dummy"); @@ -419,11 +336,6 @@ public class SignatureSpiTest extends TestCase { } } - @TestTargetNew( - level=TestLevel.COMPLETE, - method="engineSign", - args={byte[].class,int.class, int.class} - ) public void testEngineSign_BII() { MySignature signature = new MySignature("dummy"); try { @@ -454,11 +366,6 @@ public class SignatureSpiTest extends TestCase { } } - @TestTargetNew( - level=TestLevel.COMPLETE, - method="engineUpdate", - args={ByteBuffer.class} - ) public void testEngineUpdate_ByteBuffer() { MySignature signature = new MySignature("dummy"); try { @@ -489,11 +396,6 @@ public class SignatureSpiTest extends TestCase { } } - @TestTargetNew( - level=TestLevel.COMPLETE, - method="engineVerify", - args={byte[].class,int.class,int.class} - ) public void testEngineVerify_BII() { MySignature signature = new MySignature("dummy"); diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/SignatureTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SignatureTest.java index fdaaa90..d00e18a 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/SignatureTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SignatureTest.java @@ -23,10 +23,6 @@ package org.apache.harmony.security.tests.java.security; import dalvik.annotation.KnownFailure; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; import java.security.InvalidParameterException; import java.security.NoSuchAlgorithmException; @@ -46,7 +42,7 @@ import java.security.spec.AlgorithmParameterSpec; import org.apache.harmony.security.tests.support.MySignature1; import junit.framework.TestCase; -@TestTargetClass(Signature.class) + /** * Tests for <code>Signature</code> constructor and methods * @@ -56,12 +52,6 @@ public class SignatureTest extends TestCase { /* * Class under test for Signature(String) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "Signature", - args = {java.lang.String.class} - ) public void testConstructor() { String [] algorithms = { "SHA256WITHRSA", "NONEWITHDSA", "SHA384WITHRSA", "MD5ANDSHA1WITHRSA", "SHA512WITHRSA", @@ -87,12 +77,6 @@ public class SignatureTest extends TestCase { /* * Class under test for Object clone() */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Just exception case was tested", - method = "clone", - args = {} - ) public void testClone() { MySignature1 s = new MySignature1("ABC"); try { @@ -110,12 +94,6 @@ public class SignatureTest extends TestCase { } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getProvider", - args = {} - ) public void testGetProvider() { MySignature1 s = new MySignature1("ABC"); @@ -123,12 +101,6 @@ public class SignatureTest extends TestCase { assertNull("provider", s.getProvider()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getAlgorithm", - args = {} - ) public void testGetAlgorithm() { MySignature1 s = new MySignature1("ABC"); @@ -139,12 +111,6 @@ public class SignatureTest extends TestCase { /* * Class under test for void initVerify(PublicKey) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "InvalidKeyException checking missed", - method = "initVerify", - args = {java.security.PublicKey.class} - ) public void testInitVerifyPublicKey() throws InvalidKeyException { MySignature1 s = new MySignature1("ABC"); @@ -165,12 +131,6 @@ public class SignatureTest extends TestCase { /* * Class under test for void initVerify(Certificate) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "initVerify", - args = {java.security.cert.Certificate.class} - ) public void testInitVerifyCertificate() throws InvalidKeyException { MySignature1 s = new MySignature1("ABC"); @@ -192,12 +152,6 @@ public class SignatureTest extends TestCase { /* * Class under test for void initSign(PrivateKey) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "initSign", - args = {java.security.PrivateKey.class} - ) public void testInitSignPrivateKey() throws InvalidKeyException { MySignature1 s = new MySignature1("ABC"); @@ -232,12 +186,6 @@ public class SignatureTest extends TestCase { /* * Class under test for void initSign(PrivateKey, SecureRandom) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "InvalidKeyException checking missed", - method = "initSign", - args = {java.security.PrivateKey.class, java.security.SecureRandom.class} - ) public void testInitSignPrivateKeySecureRandom() throws InvalidKeyException { MySignature1 s = new MySignature1("ABC"); @@ -259,12 +207,6 @@ public class SignatureTest extends TestCase { /* * Class under test for byte[] sign() */ - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "Verification of returned value missed", - method = "sign", - args = {} - ) public void testSign() throws Exception { MySignature1 s = new MySignature1("ABC"); try { @@ -290,12 +232,6 @@ public class SignatureTest extends TestCase { /* * Class under test for sign(byte[], offset, len) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "sign", - args = {byte[].class, int.class, int.class} - ) public void testSignbyteintint() throws Exception { MySignature1 s = new MySignature1("ABC"); byte[] outbuf = new byte [10]; @@ -340,12 +276,6 @@ public class SignatureTest extends TestCase { /* * Class under test for boolean verify(byte[]) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verification of returned value missed", - method = "verify", - args = {byte[].class} - ) public void testVerifybyteArray() throws Exception { MySignature1 s = new MySignature1("ABC"); byte[] b = {1, 2, 3, 4}; @@ -371,12 +301,6 @@ public class SignatureTest extends TestCase { /* * Class under test for boolean verify(byte[], int, int) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verification of returned value missed. Verification of different parameters offset and length missed.", - method = "verify", - args = {byte[].class, int.class, int.class} - ) public void testVerifybyteArrayintint() throws Exception { MySignature1 s = new MySignature1("ABC"); byte[] b = {1, 2, 3, 4}; @@ -410,12 +334,6 @@ public class SignatureTest extends TestCase { /* * Class under test for void update(byte) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "update", - args = {byte.class} - ) public void testUpdatebyte() throws Exception { MySignature1 s = new MySignature1("ABC"); try { @@ -444,12 +362,6 @@ public class SignatureTest extends TestCase { /* * Class under test for void update(byte[]) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "update", - args = {byte[].class} - ) public void testUpdatebyteArray() throws Exception { MySignature1 s = new MySignature1("ABC"); byte[] b = {1, 2, 3, 4}; @@ -489,12 +401,6 @@ public class SignatureTest extends TestCase { /* * Class under test for void update(byte[], int, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "update", - args = {byte[].class, int.class, int.class} - ) public void testUpdatebyteArrayintint() throws Exception { MySignature1 s = new MySignature1("ABC"); byte[] b = {1, 2, 3, 4}; @@ -538,12 +444,6 @@ public class SignatureTest extends TestCase { /* * Class under test for void update(byte[], int, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "update", - args = {byte[].class, int.class, int.class} - ) @KnownFailure("Android throws IllegalArgumentException, RI throws NullpointerException") public void testUpdatebyteArrayintint2() throws Exception { MySignature1 s = new MySignature1("ABC"); @@ -569,12 +469,6 @@ public class SignatureTest extends TestCase { /* * Class under test for void setParameter(String, Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setParameter", - args = {java.lang.String.class, java.lang.Object.class} - ) @SuppressWarnings("deprecation") public void testSetParameterStringObject() { MySignature1 s = new MySignature1("ABC"); @@ -594,12 +488,6 @@ public class SignatureTest extends TestCase { /* * Class under test for void setParameter(AlgorithmParameterSpec) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setParameter", - args = {java.security.spec.AlgorithmParameterSpec.class} - ) public void testSetParameterAlgorithmParameterSpec() throws InvalidAlgorithmParameterException { MySignature1 s = new MySignature1("ABC"); try { @@ -618,12 +506,6 @@ public class SignatureTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getParameter", - args = {java.lang.String.class} - ) @SuppressWarnings("deprecation") public void testGetParameter() { MySignature1 s = new MySignature1("ABC"); diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/SignedObjectTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SignedObjectTest.java index 89d872e..5b98be3 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/SignedObjectTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SignedObjectTest.java @@ -17,11 +17,6 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; - import java.security.NoSuchAlgorithmException; import java.security.Signature; import java.security.SignedObject; @@ -44,44 +39,12 @@ import java.security.SignatureException; import java.security.SignedObject; import java.security.spec.InvalidKeySpecException; import java.util.Properties; -@TestTargetClass(SignedObject.class) + /** * Tests for <code>SignedObject</code> constructor and methods */ public class SignedObjectTest extends TestCase { - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "SignedObject", - args = {java.io.Serializable.class, java.security.PrivateKey.class, java.security.Signature.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getAlgorithm", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getObject", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSignature", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "verify", - args = {java.security.PublicKey.class, java.security.Signature.class} - ) - }) public void testSignedObject() throws Exception { TestKeyPair tkp = null; Properties prop; diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/SignerTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SignerTest.java index f9eea58..018c2c4 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/SignerTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/SignerTest.java @@ -22,11 +22,6 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; - import java.security.IdentityScope; import java.security.InvalidParameterException; import java.security.KeyManagementException; @@ -48,7 +43,6 @@ import junit.framework.TestCase; * */ @SuppressWarnings("deprecation") -@TestTargetClass(Signer.class) public class SignerTest extends TestCase { public static class MySecurityManager extends SecurityManager { @@ -59,14 +53,8 @@ public class SignerTest extends TestCase { } /** - * @tests java.security.Signer#toString() + * java.security.Signer#toString() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {} - ) public void test_toString() throws Exception { Signer s1 = new SignerStub("testToString1"); assertEquals("[Signer]testToString1", s1.toString()); @@ -86,12 +74,6 @@ public class SignerTest extends TestCase { /** * verify Signer() creates instance */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "Signer", - args = {} - ) public void testSigner() { Signer s = new SignerStub(); assertNotNull(s); @@ -102,12 +84,6 @@ public class SignerTest extends TestCase { /** * verify Signer(String) creates instance */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "Signer", - args = {java.lang.String.class} - ) public void testSignerString() throws Exception { Signer s = new SignerStub("sss3"); assertNotNull(s); @@ -122,12 +98,6 @@ public class SignerTest extends TestCase { /** * verify Signer(String, IdentityScope) creates instance */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "Signer", - args = {java.lang.String.class, java.security.IdentityScope.class} - ) public void testSignerStringIdentityScope() throws Exception { Signer s = new SignerStub("sss4", IdentityScope.getSystemScope()); assertNotNull(s); @@ -152,12 +122,6 @@ public class SignerTest extends TestCase { /** * verify Signer.getPrivateKey() returns null or private key */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getPrivateKey", - args = {} - ) public void testGetPrivateKey() throws Exception { byte [] privateKeyData = { 1, 2, 3, 4, 5}; PrivateKeyStub privateKey = new PrivateKeyStub("private", "fff", privateKeyData); @@ -173,14 +137,8 @@ public class SignerTest extends TestCase { } /** - * @tests java.security.Signer#setKeyPair(java.security.KeyPair) + * java.security.Signer#setKeyPair(java.security.KeyPair) */ - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "KeyException checking missed", - method = "setKeyPair", - args = {java.security.KeyPair.class} - ) public void test_setKeyPairLjava_security_KeyPair() throws Exception { // Regression for HARMONY-2408 diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/TimestampTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/TimestampTest.java index 82d4b2a..2ba7a64 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/TimestampTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/TimestampTest.java @@ -22,11 +22,6 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; - import java.security.Timestamp; import java.security.cert.CertPath; import java.util.Date; @@ -34,7 +29,7 @@ import java.util.Date; import org.apache.harmony.security.tests.support.cert.MyCertPath; import junit.framework.TestCase; -@TestTargetClass(Timestamp.class) + /** * Tests for <code>Timestamp</code> class fields and methods * @@ -47,12 +42,6 @@ public class TimestampTest extends TestCase { private CertPath cpath = new MyCertPath(encoding); - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "Timestamp", - args = {java.util.Date.class, java.security.cert.CertPath.class} - ) public void testTimestamp() { try { new Timestamp(null, cpath); @@ -75,12 +64,6 @@ public class TimestampTest extends TestCase { /* * Class under test for boolean equals(Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "equals", - args = {java.lang.Object.class} - ) public void testEqualsObject() { Timestamp one = new Timestamp(now, cpath); Timestamp two = new Timestamp(now, cpath); @@ -96,22 +79,10 @@ public class TimestampTest extends TestCase { assertTrue(two1.equals(two1)); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSignerCertPath", - args = {} - ) public void testGetSignerCertPath() { assertSame(new Timestamp(now, cpath).getSignerCertPath(), cpath); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getTimestamp", - args = {} - ) public void testGetTimestamp() { Timestamp t = new Timestamp(now, cpath); assertEquals(now, t.getTimestamp()); @@ -121,12 +92,6 @@ public class TimestampTest extends TestCase { /* * Class under test for String toString() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {} - ) public void testToString() { try { String tt = new Timestamp(now, cpath).toString(); @@ -138,12 +103,6 @@ public class TimestampTest extends TestCase { /* * Class under test for String hashCode() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hashCode", - args = {} - ) public void testHashCode() { Timestamp one = new Timestamp(now, cpath); Timestamp two = new Timestamp(now, cpath); diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/UnrecoverableEntryExceptionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/UnrecoverableEntryExceptionTest.java index 69b2437..888b3a0 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/UnrecoverableEntryExceptionTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/UnrecoverableEntryExceptionTest.java @@ -22,20 +22,14 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; - import java.security.UnrecoverableEntryException; import junit.framework.TestCase; -@TestTargetClass( UnrecoverableEntryException.class) + /** * Tests for <code>UnrecoverableEntryException</code> class * */ - public class UnrecoverableEntryExceptionTest extends TestCase { static String[] msgs = { @@ -48,12 +42,6 @@ public class UnrecoverableEntryExceptionTest extends TestCase { /* * Class under test for void UnrecoverableEntryException() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "UnrecoverableEntryException", - args = {} - ) public void testUnrecoverableEntryException() { UnrecoverableEntryException tE = new UnrecoverableEntryException(); assertNull("getMessage() must return null.", tE.getMessage()); @@ -63,12 +51,6 @@ public class UnrecoverableEntryExceptionTest extends TestCase { /* * Class under test for void UnrecoverableEntryException(String) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "UnrecoverableEntryException", - args = {java.lang.String.class} - ) public void testUnrecoverableEntryExceptionString() { UnrecoverableEntryException tE; for (int i = 0; i < msgs.length; i++) { diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/UnrecoverableKeyExceptionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/UnrecoverableKeyExceptionTest.java index 127e4e0..3fb028f 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/UnrecoverableKeyExceptionTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/UnrecoverableKeyExceptionTest.java @@ -22,15 +22,10 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; - import java.security.UnrecoverableKeyException; import junit.framework.TestCase; -@TestTargetClass(UnrecoverableKeyException.class) + /** * Tests for <code>UnrecoverableKeyException</code> class constructors and * methods. @@ -49,12 +44,6 @@ public class UnrecoverableKeyExceptionTest extends TestCase { * Test for <code>UnrecoverableKeyException()</code> constructor * Assertion: constructs UnrecoverableKeyException with no detail message */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "UnrecoverableKeyException", - args = {} - ) public void testUnrecoverableKeyException01() { UnrecoverableKeyException tE = new UnrecoverableKeyException(); assertNull("getMessage() must return null.", tE.getMessage()); @@ -66,12 +55,6 @@ public class UnrecoverableKeyExceptionTest extends TestCase { * Assertion: constructs UnrecoverableKeyException with detail message msg. * Parameter <code>msg</code> is not null. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "UnrecoverableKeyException", - args = {java.lang.String.class} - ) public void testUnrecoverableKeyException02() { UnrecoverableKeyException tE; for (int i = 0; i < msgs.length; i++) { @@ -87,12 +70,6 @@ public class UnrecoverableKeyExceptionTest extends TestCase { * Assertion: constructs UnrecoverableKeyException when <code>msg</code> * is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "UnrecoverableKeyException", - args = {java.lang.String.class} - ) public void testUnrecoverableKeyException03() { String msg = null; UnrecoverableKeyException tE = new UnrecoverableKeyException(msg); diff --git a/luni/src/test/java/org/apache/harmony/security/tests/java/security/UnresolvedPermissionTest.java b/luni/src/test/java/org/apache/harmony/security/tests/java/security/UnresolvedPermissionTest.java index 5c7b253..df1c8e4 100644 --- a/luni/src/test/java/org/apache/harmony/security/tests/java/security/UnresolvedPermissionTest.java +++ b/luni/src/test/java/org/apache/harmony/security/tests/java/security/UnresolvedPermissionTest.java @@ -17,10 +17,6 @@ package org.apache.harmony.security.tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestLevel; - import java.io.Serializable; import java.security.AllPermission; import java.security.InvalidKeyException; @@ -49,24 +45,16 @@ import tests.util.SerializationTester; import junit.framework.TestCase; -@TestTargetClass(UnresolvedPermission.class) /** * Tests for <code>UnresolvedPermission</code> class fields and methods * */ - public class UnresolvedPermissionTest extends TestCase { /** * Creates an Object with given name, type, action, certificates. Empty or * null type is not allowed - exception should be thrown. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "UnresolvedPermission", - args = {java.lang.String.class, java.lang.String.class, java.lang.String.class, java.security.cert.Certificate[].class} - ) public void testCtor() { String type = "laskjhlsdk 2345346"; String name = "^%#UHVKU^%V 887y"; @@ -103,12 +91,6 @@ public class UnresolvedPermissionTest extends TestCase { /** * UnresolvedPermission never implies any other permission. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "implies", - args = {java.security.Permission.class} - ) public void testImplies() { UnresolvedPermission up = new UnresolvedPermission( "java.security.SecurityPermission", "a.b.c", null, null); @@ -116,12 +98,6 @@ public class UnresolvedPermissionTest extends TestCase { assertFalse(up.implies(new AllPermission())); assertFalse(up.implies(new SecurityPermission("a.b.c"))); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "!SerializationSelf", - args = {} - ) public void testSerialization() throws Exception { UnresolvedPermission up = new UnresolvedPermission( "java.security.SecurityPermission", "a.b.c", "actions", null); @@ -138,12 +114,6 @@ public class UnresolvedPermissionTest extends TestCase { assertEquals("actions", deserializedUp.getUnresolvedActions()); assertNull(deserializedUp.getUnresolvedCerts()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "!SerializationGolden", - args = {} - ) public void testSerialization_Compatibility() throws Exception { UnresolvedPermission up = new UnresolvedPermission( "java.security.SecurityPermission", "a.b.c", "actions", null); @@ -163,12 +133,6 @@ public class UnresolvedPermissionTest extends TestCase { } }); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "equals", - args = {java.lang.Object.class} - ) public void testEquals() { UnresolvedPermission up1 = new UnresolvedPermission("type1", "name1", "action1", null); @@ -205,12 +169,6 @@ public class UnresolvedPermissionTest extends TestCase { } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getActions", - args = {} - ) public void testGetActions() { UnresolvedPermission up1 = new UnresolvedPermission("type1", "name1", "action1", null); @@ -225,12 +183,6 @@ public class UnresolvedPermissionTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getUnresolvedActions", - args = {} - ) public void testGetUnresolvedActions() { UnresolvedPermission up1 = new UnresolvedPermission("type1", "name1", "action1 @#$%^&*", null); @@ -245,12 +197,6 @@ public class UnresolvedPermissionTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getUnresolvedCerts", - args = {} - ) public void testGetUnresolvedCerts() { Certificate[] certificate = new java.security.cert.Certificate[] { new Certificate(null) { @@ -311,12 +257,6 @@ public class UnresolvedPermissionTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getUnresolvedName", - args = {} - ) public void testGetUnresolvedName() { UnresolvedPermission up1 = new UnresolvedPermission("type1", "name1!@#$%^&&* )(", "action1 @#$%^&*", null); @@ -331,12 +271,6 @@ public class UnresolvedPermissionTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getUnresolvedType", - args = {} - ) public void testGetUnresolvedType() { UnresolvedPermission up1 = new UnresolvedPermission("type1@#$%^&* )(", "name1", "action1", null); @@ -351,12 +285,6 @@ public class UnresolvedPermissionTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hashCode", - args = {} - ) public void testHashCode() { UnresolvedPermission up1 = new UnresolvedPermission("type1", "name1", "action1", null); @@ -379,12 +307,6 @@ public class UnresolvedPermissionTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "newPermissionCollection", - args = {} - ) public void testNewPermissionCollection() { UnresolvedPermission up1 = new UnresolvedPermission("type1", "name1", "action1", null); @@ -411,12 +333,6 @@ public class UnresolvedPermissionTest extends TestCase { } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {} - ) public void testToString() { UnresolvedPermission up1 = new UnresolvedPermission("type1", "name1", "action1", null); diff --git a/luni/src/test/java/tests/api/java/io/ComputeSerialVersionUIDTest.java b/luni/src/test/java/tests/api/java/io/ComputeSerialVersionUIDTest.java index 3288b62..458c27f 100644 --- a/luni/src/test/java/tests/api/java/io/ComputeSerialVersionUIDTest.java +++ b/luni/src/test/java/tests/api/java/io/ComputeSerialVersionUIDTest.java @@ -2,23 +2,11 @@ package tests.api.java.io; import java.io.ObjectInputStream; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - -@TestTargetClass(ObjectInputStream.class) public class ComputeSerialVersionUIDTest extends junit.framework.TestCase { private String path = "/serialization/tests/api/java/io/"; - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Verifies serialization.", - method = "!Serialization", - args = {} - ) public void testComputeSUIDClass() throws Exception { ObjectInputStream ois = new ObjectInputStream(getClass() .getResourceAsStream(path + "testComputeSUIDClass.ser")); @@ -37,12 +25,6 @@ public class ComputeSerialVersionUIDTest extends junit.framework.TestCase { ois.close(); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Verifies serialization.", - method = "!Serialization", - args = {} - ) public void testComputeSUIDInterfaces() throws Exception { ObjectInputStream ois = new ObjectInputStream(getClass() .getResourceAsStream(path + "testComputeSUIDInterfaces.ser")); @@ -75,12 +57,6 @@ public class ComputeSerialVersionUIDTest extends junit.framework.TestCase { ois.close(); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Verifies serialization.", - method = "!Serialization", - args = {} - ) public void testComputeSUIDFields() throws Exception { ObjectInputStream ois = new ObjectInputStream(getClass() .getResourceAsStream(path + "testComputeSUIDFields.ser")); @@ -119,12 +95,6 @@ public class ComputeSerialVersionUIDTest extends junit.framework.TestCase { ois.close(); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Verifies serialization.", - method = "!Serialization", - args = {} - ) public void testComputeSUIDConstructors() throws Exception { ObjectInputStream ois = new ObjectInputStream(getClass() .getResourceAsStream(path + "testComputeSUIDConstructors.ser")); @@ -147,12 +117,6 @@ public class ComputeSerialVersionUIDTest extends junit.framework.TestCase { ois.close(); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Verifies serialization.", - method = "!Serialization", - args = {} - ) public void testComputeSUIDMethods() throws Exception { ObjectInputStream ois = new ObjectInputStream(getClass() .getResourceAsStream(path + "testComputeSUIDMethods.ser")); diff --git a/luni/src/test/java/tests/api/java/lang/Process2Test.java b/luni/src/test/java/tests/api/java/lang/Process2Test.java index 3aed751..5d18d61 100644 --- a/luni/src/test/java/tests/api/java/lang/Process2Test.java +++ b/luni/src/test/java/tests/api/java/lang/Process2Test.java @@ -18,10 +18,6 @@ package tests.api.java.lang; import dalvik.annotation.AndroidOnly; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; @@ -32,34 +28,13 @@ import java.io.OutputStream; import tests.support.Support_Exec; import static tests.support.Support_Exec.javaProcessBuilder; -@TestTargetClass(Process.class) public class Process2Test extends junit.framework.TestCase { /** - * @tests java.lang.Process#getInputStream(), + * java.lang.Process#getInputStream(), * java.lang.Process#getErrorStream() * java.lang.Process#getOutputStream() * Tests if these methods return buffered streams. */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getErrorStream", - args = {} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInputStream", - args = {} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getOutputStream", - args = {} - ) - }) @AndroidOnly("dalvikvm specific") public void test_streams() throws IOException, InterruptedException { @@ -69,12 +44,6 @@ public class Process2Test extends junit.framework.TestCase { assertNotNull(p.getOutputStream()); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getErrorStream", - args = {} - ) public void test_getErrorStream() { String[] commands = {"ls"}; Process process = null; diff --git a/luni/src/test/java/tests/api/java/lang/ProcessManagerTest.java b/luni/src/test/java/tests/api/java/lang/ProcessManagerTest.java index 1f24ff7..99e1df3 100644 --- a/luni/src/test/java/tests/api/java/lang/ProcessManagerTest.java +++ b/luni/src/test/java/tests/api/java/lang/ProcessManagerTest.java @@ -17,9 +17,6 @@ package tests.api.java.lang; import dalvik.annotation.BrokenTest; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; import junit.framework.TestCase; @@ -31,19 +28,12 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStream; -@TestTargetClass(Process.class) public class ProcessManagerTest extends TestCase { Thread thread = null; Process process = null; boolean isThrown = false; - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getOutputStream", - args = {} - ) public void testCat() throws IOException, InterruptedException { String[] commands = { "cat" }; Process process = Runtime.getRuntime().exec(commands, null, null); @@ -57,12 +47,6 @@ public class ProcessManagerTest extends TestCase { assertEquals(greeting, readLine(process)); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "waitFor", - args = {} - ) @BrokenTest("Sporadic failures in CTS, but not in CoreTestRunner") public void testSleep() throws IOException { String[] commands = { "sleep", "1" }; @@ -127,12 +111,6 @@ public class ProcessManagerTest extends TestCase { assertTrue(isThrown); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getInputStream", - args = {} - ) public void testPwd() throws IOException, InterruptedException { String[] commands = { "sh", "-c", "pwd" }; Process process = Runtime.getRuntime().exec( @@ -141,12 +119,6 @@ public class ProcessManagerTest extends TestCase { assertEquals("/", readLine(process)); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getInputStream", - args = {} - ) public void testEnvironment() throws IOException, InterruptedException { String[] commands = { "sh", "-c", "echo $FOO" }; @@ -184,12 +156,6 @@ public class ProcessManagerTest extends TestCase { thread.start(); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Stress test.", - method = "waitFor", - args = {} - ) public void testHeavyLoad() { int i; for (i = 0; i < 100; i++) @@ -212,13 +178,6 @@ public class ProcessManagerTest extends TestCase { InputStream in; - @TestTargetNew( - level = TestLevel.ADDITIONAL, - notes = "Check non standard fd behavior", - clazz = Runtime.class, - method = "exec", - args = {String[].class, String[].class, java.io.File.class} - ) public void testCloseNonStandardFds() throws IOException, InterruptedException { String[] commands = { "ls", "/proc/self/fd" }; @@ -254,13 +213,6 @@ public class ProcessManagerTest extends TestCase { return count; } - @TestTargetNew( - level = TestLevel.ADDITIONAL, - notes = "Check non standard fd behavior", - clazz = Runtime.class, - method = "exec", - args = {String[].class, String[].class, java.io.File.class} - ) public void testInvalidCommand() throws IOException, InterruptedException { try { diff --git a/luni/src/test/java/tests/api/java/lang/ProcessTest.java b/luni/src/test/java/tests/api/java/lang/ProcessTest.java index cb10c34..f875dc0 100644 --- a/luni/src/test/java/tests/api/java/lang/ProcessTest.java +++ b/luni/src/test/java/tests/api/java/lang/ProcessTest.java @@ -18,26 +18,16 @@ package tests.api.java.lang; import dalvik.annotation.BrokenTest; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -@TestTargetClass(Process.class) public class ProcessTest extends junit.framework.TestCase { /** - * @tests java.lang.Process#getInputStream() + * java.lang.Process#getInputStream() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getInputStream", - args = {} - ) public void test_getInputStream() { try { // Test for: @@ -78,14 +68,8 @@ public class ProcessTest extends junit.framework.TestCase { } /** - * @tests java.lang.Process#getOutputStream() + * java.lang.Process#getOutputStream() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getOutputStream", - args = {} - ) public void test_getOutputStream() { try { String[] commands = { "sleep", "1"}; @@ -126,12 +110,6 @@ public class ProcessTest extends junit.framework.TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "exitValue", - args = {} - ) public void test_exitValue() { try { String[] commands = { "ls" }; @@ -163,23 +141,11 @@ public class ProcessTest extends junit.framework.TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "Process", - args = {} - ) public void test_Constructor() { ProcessClass pc = new ProcessClass(); assertTrue(pc.exitValue() == 0); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "destroy", - args = {} - ) @BrokenTest("Sporadic timeouts in CTS, but not in CoreTestRunner") public void test_destroy() { String[] commands = { "ls"}; diff --git a/luni/src/test/java/tests/api/java/lang/StringTest.java b/luni/src/test/java/tests/api/java/lang/StringTest.java index eac3aa0..1e9933d 100644 --- a/luni/src/test/java/tests/api/java/lang/StringTest.java +++ b/luni/src/test/java/tests/api/java/lang/StringTest.java @@ -16,66 +16,30 @@ package tests.api.java.lang; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; /** * Tests for the class {@link String}. */ -@TestTargetClass(String.class) public class StringTest extends TestCase { - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "NullPointerException is not verified.", - method = "contains", - args = {java.lang.CharSequence.class} - ) public void test_contains() { assertTrue("aabc".contains("abc")); assertTrue("abcd".contains("abc")); assertFalse("abcd".contains("cba")); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "IndexOutOfBoundsException is not verified.", - method = "charAt", - args = {int.class} - ) public void test_charAt() { assertTrue("abcd".charAt(0) == 'a'); assertTrue("abcd".charAt(3) == 'd'); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't check empty string, null as a parameter.", - method = "startsWith", - args = {java.lang.String.class} - ) public void test_StartsWith() { assertTrue("abcd".startsWith("abc")); assertFalse("abcd".startsWith("aabc")); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't check empty string, null as a parameter.", - method = "endsWith", - args = {java.lang.String.class} - ) public void test_EndsWith() { assertTrue("abcd".endsWith("bcd")); assertFalse("abcd".endsWith("bcde")); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "!Constants", - args = {} - ) public void test_CASE_INSENSITIVE_ORDER() { String s1 = "ABCDEFG"; String s2 = "abcdefg"; diff --git a/luni/src/test/java/tests/api/java/lang/ref/PhantomReferenceTest.java b/luni/src/test/java/tests/api/java/lang/ref/PhantomReferenceTest.java index d3fcbb3..06221c9 100644 --- a/luni/src/test/java/tests/api/java/lang/ref/PhantomReferenceTest.java +++ b/luni/src/test/java/tests/api/java/lang/ref/PhantomReferenceTest.java @@ -17,11 +17,6 @@ package tests.api.java.lang.ref; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import java.lang.ref.PhantomReference; import java.lang.ref.Reference; import java.lang.ref.ReferenceQueue; @@ -29,7 +24,6 @@ import java.lang.ref.ReferenceQueue; //TODO: write a test to verify that the referent's finalize() happens // before the PhantomReference is enqueued. -@TestTargetClass(PhantomReference.class) public class PhantomReferenceTest extends junit.framework.TestCase { static Boolean bool; public boolean isCalled = false; @@ -38,14 +32,8 @@ public class PhantomReferenceTest extends junit.framework.TestCase { } /** - * @tests java.lang.ref.PhantomReference#get() + * java.lang.ref.PhantomReference#get() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "get", - args = {} - ) public void test_get() { ReferenceQueue rq = new ReferenceQueue(); bool = new Boolean(false); @@ -58,14 +46,8 @@ public class PhantomReferenceTest extends junit.framework.TestCase { } /** - * @tests java.lang.Runtime#gc() + * java.lang.Runtime#gc() */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Interaction test with Runtime.getRuntime().gc().", - method = "get", - args = {} - ) public void test_gcInteraction() { class TestPhantomReference<T> extends PhantomReference<T> { public TestPhantomReference(T referent, @@ -124,15 +106,9 @@ public class PhantomReferenceTest extends junit.framework.TestCase { } /** - * @tests java.lang.ref.PhantomReference#PhantomReference(java.lang.Object, + * java.lang.ref.PhantomReference#PhantomReference(java.lang.Object, * java.lang.ref.ReferenceQueue) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "PhantomReference", - args = {java.lang.Object.class, java.lang.ref.ReferenceQueue.class} - ) public void test_ConstructorLjava_lang_ObjectLjava_lang_ref_ReferenceQueue() { ReferenceQueue rq = new ReferenceQueue(); bool = new Boolean(true); diff --git a/luni/src/test/java/tests/api/java/lang/ref/ReferenceQueueTest.java b/luni/src/test/java/tests/api/java/lang/ref/ReferenceQueueTest.java index ea0b1aa..dc7e738 100644 --- a/luni/src/test/java/tests/api/java/lang/ref/ReferenceQueueTest.java +++ b/luni/src/test/java/tests/api/java/lang/ref/ReferenceQueueTest.java @@ -17,18 +17,12 @@ package tests.api.java.lang.ref; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import java.lang.ref.PhantomReference; import java.lang.ref.Reference; import java.lang.ref.ReferenceQueue; import java.lang.ref.SoftReference; import java.lang.ref.WeakReference; -@TestTargetClass(ReferenceQueue.class) public class ReferenceQueueTest extends junit.framework.TestCase { static Boolean b; @@ -63,14 +57,8 @@ public class ReferenceQueueTest extends junit.framework.TestCase { ReferenceQueue rq; /** - * @tests java.lang.ref.ReferenceQueue#poll() + * java.lang.ref.ReferenceQueue#poll() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "poll", - args = {} - ) public void test_poll() { // store in a static so it won't be gc'ed because the jit // optimized it out @@ -116,14 +104,8 @@ public class ReferenceQueueTest extends junit.framework.TestCase { } /** - * @tests java.lang.ref.ReferenceQueue#remove() + * java.lang.ref.ReferenceQueue#remove() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "remove", - args = {} - ) public void test_remove() { // store in a static so it won't be gc'ed because the jit // optimized it out @@ -169,14 +151,8 @@ public class ReferenceQueueTest extends junit.framework.TestCase { } /** - * @tests java.lang.ref.ReferenceQueue#remove(long) + * java.lang.ref.ReferenceQueue#remove(long) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "remove", - args = {long.class} - ) public void test_removeJ() { try { assertNull("Queue should be empty. (poll)", rq.poll()); @@ -256,14 +232,8 @@ public class ReferenceQueueTest extends junit.framework.TestCase { } /** - * @tests java.lang.ref.ReferenceQueue#ReferenceQueue() + * java.lang.ref.ReferenceQueue#ReferenceQueue() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "ReferenceQueue", - args = {} - ) public void test_Constructor() { ReferenceQueue rq = new ReferenceQueue(); assertNull(rq.poll()); diff --git a/luni/src/test/java/tests/api/java/lang/ref/ReferenceTest.java b/luni/src/test/java/tests/api/java/lang/ref/ReferenceTest.java index cd9b72e..13efbfd 100644 --- a/luni/src/test/java/tests/api/java/lang/ref/ReferenceTest.java +++ b/luni/src/test/java/tests/api/java/lang/ref/ReferenceTest.java @@ -16,11 +16,6 @@ */ package tests.api.java.lang.ref; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.AssertionFailedError; import java.lang.ref.PhantomReference; @@ -30,7 +25,6 @@ import java.lang.ref.SoftReference; import java.lang.ref.WeakReference; import java.util.Vector; -@TestTargetClass(Reference.class) public class ReferenceTest extends junit.framework.TestCase { Object tmpA, tmpB, tmpC, obj; @@ -90,14 +84,8 @@ public class ReferenceTest extends junit.framework.TestCase { } /** - * @tests java.lang.ref.Reference#clear() + * java.lang.ref.Reference#clear() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "clear", - args = {} - ) public void test_clear() { tmpA = new Object(); tmpB = new Object(); @@ -119,22 +107,8 @@ public class ReferenceTest extends junit.framework.TestCase { } /** - * @tests java.lang.ref.Reference#enqueue() + * java.lang.ref.Reference#enqueue() */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "enqueue", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isEnqueued", - args = {} - ) - }) public void test_enqueue() { ReferenceQueue rq = new ReferenceQueue(); obj = new Object(); @@ -170,14 +144,8 @@ public class ReferenceTest extends junit.framework.TestCase { } /** - * @tests java.lang.ref.Reference#enqueue() + * java.lang.ref.Reference#enqueue() */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies positive functionality for WeakReference.", - method = "get", - args = {} - ) public void test_get_WeakReference() { // Test the general/overall functionality of Reference. @@ -245,28 +213,10 @@ public class ReferenceTest extends junit.framework.TestCase { * get called, and that clear/enqueue/finalize happen in the * right order for WeakReferences. * - * @tests java.lang.ref.Reference#clear() - * @tests java.lang.ref.Reference#enqueue() - * @tests java.lang.Object#finalize() + * java.lang.ref.Reference#clear() + * java.lang.ref.Reference#enqueue() + * java.lang.Object#finalize() */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Makes sure that overridden versions of clear() and enqueue() " + - "get called, and that clear/enqueue/finalize happen in the " + - "right order for WeakReferences.", - method = "clear", - args = {} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Makes sure that overridden versions of clear() and enqueue() " + - "get called, and that clear/enqueue/finalize happen in the " + - "right order for WeakReferences.", - method = "enqueue", - args = {} - ) - }) public void test_subclass() { error = null; testObjectFinalized = false; @@ -323,14 +273,8 @@ public class ReferenceTest extends junit.framework.TestCase { } /** - * @tests java.lang.ref.Reference#get() + * java.lang.ref.Reference#get() */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't check that get() can return null.", - method = "get", - args = {} - ) public void test_get() { Vector<StringBuffer> vec = new Vector<StringBuffer>(); @@ -358,14 +302,8 @@ public class ReferenceTest extends junit.framework.TestCase { } /** - * @tests java.lang.ref.Reference#isEnqueued() + * java.lang.ref.Reference#isEnqueued() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isEnqueued", - args = {} - ) public void test_isEnqueued() { ReferenceQueue rq = new ReferenceQueue(); obj = new Object(); @@ -385,15 +323,6 @@ public class ReferenceTest extends junit.framework.TestCase { * Checks to make sure that the referent of the WeakReference * is still pointing to a valid object. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Contrives a situation where the only reference to a string " + - "is a WeakReference from an object that is being finalized. " + - "Checks to make sure that the referent of the WeakReference " + - "is still pointing to a valid object.", - method = "get", - args = {} - ) public void test_finalizeReferenceInteraction() { error = null; testObjectFinalized = false; diff --git a/luni/src/test/java/tests/api/java/lang/ref/SoftReferenceTest.java b/luni/src/test/java/tests/api/java/lang/ref/SoftReferenceTest.java index c126e3d..77c6536 100644 --- a/luni/src/test/java/tests/api/java/lang/ref/SoftReferenceTest.java +++ b/luni/src/test/java/tests/api/java/lang/ref/SoftReferenceTest.java @@ -16,11 +16,6 @@ */ package tests.api.java.lang.ref; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.BrokenTest; import dalvik.annotation.SideEffect; import java.lang.ref.Reference; @@ -28,7 +23,6 @@ import java.lang.ref.ReferenceQueue; import java.lang.ref.SoftReference; import java.util.Vector; -@TestTargetClass(SoftReference.class) public class SoftReferenceTest extends junit.framework.TestCase { static Boolean bool; SoftReference r; @@ -38,15 +32,9 @@ public class SoftReferenceTest extends junit.framework.TestCase { } /** - * @tests java.lang.ref.SoftReference#SoftReference(java.lang.Object, + * java.lang.ref.SoftReference#SoftReference(java.lang.Object, * java.lang.ref.ReferenceQueue) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "SoftReference", - args = {java.lang.Object.class, java.lang.ref.ReferenceQueue.class} - ) public void test_ConstructorLjava_lang_ObjectLjava_lang_ref_ReferenceQueue() { ReferenceQueue rq = new ReferenceQueue(); bool = new Boolean(true); @@ -68,14 +56,8 @@ public class SoftReferenceTest extends junit.framework.TestCase { } /** - * @tests java.lang.ref.SoftReference#SoftReference(java.lang.Object) + * java.lang.ref.SoftReference#SoftReference(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "SoftReference", - args = {java.lang.Object.class} - ) public void test_ConstructorLjava_lang_Object() { bool = new Boolean(true); try { @@ -88,26 +70,14 @@ public class SoftReferenceTest extends junit.framework.TestCase { } /** - * @tests java.lang.ref.SoftReference#get() + * java.lang.ref.SoftReference#get() */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verified that get() can return null.", - method = "get", - args = {} - ) public void test_get() { bool = new Boolean(false); SoftReference sr = new SoftReference(bool); assertTrue("Same object not returned.", bool == sr.get()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "get", - args = {} - ) @SideEffect("Causes OutOfMemoryError to test finalization") public void test_get_SoftReference() { diff --git a/luni/src/test/java/tests/api/java/lang/ref/WeakReferenceTest.java b/luni/src/test/java/tests/api/java/lang/ref/WeakReferenceTest.java index bafa090..2bddc1b 100644 --- a/luni/src/test/java/tests/api/java/lang/ref/WeakReferenceTest.java +++ b/luni/src/test/java/tests/api/java/lang/ref/WeakReferenceTest.java @@ -17,15 +17,9 @@ package tests.api.java.lang.ref; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import java.lang.ref.ReferenceQueue; import java.lang.ref.WeakReference; -@TestTargetClass(WeakReference.class) public class WeakReferenceTest extends junit.framework.TestCase { static Boolean bool; @@ -34,15 +28,9 @@ public class WeakReferenceTest extends junit.framework.TestCase { } /** - * @tests java.lang.ref.WeakReference#WeakReference(java.lang.Object, + * java.lang.ref.WeakReference#WeakReference(java.lang.Object, * java.lang.ref.ReferenceQueue) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "WeakReference", - args = {java.lang.Object.class, java.lang.ref.ReferenceQueue.class} - ) public void test_ConstructorLjava_lang_ObjectLjava_lang_ref_ReferenceQueue() { ReferenceQueue rq = new ReferenceQueue(); bool = new Boolean(true); @@ -67,14 +55,8 @@ public class WeakReferenceTest extends junit.framework.TestCase { } /** - * @tests java.lang.ref.WeakReference#WeakReference(java.lang.Object) + * java.lang.ref.WeakReference#WeakReference(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "WeakReference", - args = {java.lang.Object.class} - ) public void test_ConstructorLjava_lang_Object() { bool = new Boolean(true); try { diff --git a/luni/src/test/java/tests/api/java/lang/reflect/AccessibleObjectTest.java b/luni/src/test/java/tests/api/java/lang/reflect/AccessibleObjectTest.java index 3a433c1..41c9798 100644 --- a/luni/src/test/java/tests/api/java/lang/reflect/AccessibleObjectTest.java +++ b/luni/src/test/java/tests/api/java/lang/reflect/AccessibleObjectTest.java @@ -17,11 +17,6 @@ package tests.api.java.lang.reflect; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import java.lang.annotation.Annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; @@ -33,7 +28,6 @@ import java.lang.reflect.Modifier; import java.util.HashSet; import java.util.Set; -@TestTargetClass(AccessibleObject.class) public class AccessibleObjectTest extends junit.framework.TestCase { public class TestClass { @@ -86,27 +80,15 @@ public class AccessibleObjectTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.AccessibleObject#AccessibleObject() + * java.lang.reflect.AccessibleObject#AccessibleObject() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "The only thing I can do", - method = "AccessibleObject", - args = {} - ) public void test_Constructor() { assertNotNull(new MyAccessibleObject()); } /** - * @tests java.lang.reflect.AccessibleObject#isAccessible() + * java.lang.reflect.AccessibleObject#isAccessible() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isAccessible", - args = {} - ) public void test_isAccessible() { // Test for method boolean // java.lang.reflect.AccessibleObject.isAccessible() @@ -122,15 +104,9 @@ public class AccessibleObjectTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.AccessibleObject#setAccessible(java.lang.reflect.AccessibleObject[], + * java.lang.reflect.AccessibleObject#setAccessible(java.lang.reflect.AccessibleObject[], * boolean) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "SecurityExeption is tested in tests.security.permissions.JavaLangReflectAccessibleObjectTest", - method = "setAccessible", - args = {java.lang.reflect.AccessibleObject[].class, boolean.class} - ) public void test_setAccessible$Ljava_lang_reflect_AccessibleObjectZ() { try { AccessibleObject ao = TestClass.class.getField("aField"); @@ -145,14 +121,8 @@ public class AccessibleObjectTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.AccessibleObject#setAccessible(boolean) + * java.lang.reflect.AccessibleObject#setAccessible(boolean) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "SecurityExeption is tested in tests.security.permissions.JavaLangReflectAccessibleObjectTest", - method = "setAccessible", - args = {boolean.class} - ) public void test_setAccessible() throws Exception { AccessibleObject ao = TestClass.class.getField("aField"); ao.setAccessible(true); @@ -161,12 +131,6 @@ public class AccessibleObjectTest extends junit.framework.TestCase { assertFalse("Returned true to isAccessible", ao.isAccessible()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getAnnotation", - args = {java.lang.Class.class} - ) public void test_getAnnotation() throws Exception{ AccessibleObject ao = SubTestClass.class.getMethod("annotatedMethod"); //test error case @@ -188,12 +152,6 @@ public class AccessibleObjectTest extends junit.framework.TestCase { assertNotNull("AnnotationRuntime0 instance expected", rt0); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getAnnotations", - args = {} - ) public void test_getAnnotations() throws Exception { AccessibleObject ao = SubTestClass.class.getMethod("annotatedMethod"); Annotation[] annotations = ao.getAnnotations(); @@ -209,12 +167,6 @@ public class AccessibleObjectTest extends junit.framework.TestCase { ignoreOrder.contains(AnnotationRuntime1.class)); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getDeclaredAnnotations", - args = {} - ) public void test_getDeclaredAnnotations() throws Exception { AccessibleObject ao = SubTestClass.class.getMethod("annotatedMethod"); Annotation[] annotations = ao.getDeclaredAnnotations(); @@ -230,12 +182,6 @@ public class AccessibleObjectTest extends junit.framework.TestCase { ignoreOrder.contains(AnnotationRuntime1.class)); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isAnnotationPresent", - args = {java.lang.Class.class} - ) public void test_isAnnotationPresent() throws Exception { AccessibleObject ao = SubTestClass.class.getMethod("annotatedMethod"); assertTrue("Missing @AnnotationRuntime0", diff --git a/luni/src/test/java/tests/api/java/lang/reflect/ArrayTest.java b/luni/src/test/java/tests/api/java/lang/reflect/ArrayTest.java index 5d810e0..d9e05fb 100644 --- a/luni/src/test/java/tests/api/java/lang/reflect/ArrayTest.java +++ b/luni/src/test/java/tests/api/java/lang/reflect/ArrayTest.java @@ -17,25 +17,13 @@ package tests.api.java.lang.reflect; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import java.lang.reflect.Array; -@TestTargetClass(Array.class) public class ArrayTest extends junit.framework.TestCase { /** - * @tests java.lang.reflect.Array#get(java.lang.Object, int) + * java.lang.reflect.Array#get(java.lang.Object, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "get", - args = {java.lang.Object.class, int.class} - ) public void test_getLjava_lang_ObjectI() { // Test for method java.lang.Object // java.lang.reflect.Array.get(java.lang.Object, int) @@ -103,14 +91,8 @@ public class ArrayTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Array#getBoolean(java.lang.Object, int) + * java.lang.reflect.Array#getBoolean(java.lang.Object, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getBoolean", - args = {java.lang.Object.class, int.class} - ) public void test_getBooleanLjava_lang_ObjectI() { // Test for method boolean // java.lang.reflect.Array.getBoolean(java.lang.Object, int) @@ -155,14 +137,8 @@ public class ArrayTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Array#getByte(java.lang.Object, int) + * java.lang.reflect.Array#getByte(java.lang.Object, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getByte", - args = {java.lang.Object.class, int.class} - ) public void test_getByteLjava_lang_ObjectI() { // Test for method byte // java.lang.reflect.Array.getByte(java.lang.Object, int) @@ -207,14 +183,8 @@ public class ArrayTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Array#getChar(java.lang.Object, int) + * java.lang.reflect.Array#getChar(java.lang.Object, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getChar", - args = {java.lang.Object.class, int.class} - ) public void test_getCharLjava_lang_ObjectI() { // Test for method char // java.lang.reflect.Array.getChar(java.lang.Object, int) @@ -259,14 +229,8 @@ public class ArrayTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Array#getDouble(java.lang.Object, int) + * java.lang.reflect.Array#getDouble(java.lang.Object, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getDouble", - args = {java.lang.Object.class, int.class} - ) public void test_getDoubleLjava_lang_ObjectI() { // Test for method double // java.lang.reflect.Array.getDouble(java.lang.Object, int) @@ -312,14 +276,8 @@ public class ArrayTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Array#getFloat(java.lang.Object, int) + * java.lang.reflect.Array#getFloat(java.lang.Object, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getFloat", - args = {java.lang.Object.class, int.class} - ) public void test_getFloatLjava_lang_ObjectI() { // Test for method float // java.lang.reflect.Array.getFloat(java.lang.Object, int) @@ -364,14 +322,8 @@ public class ArrayTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Array#getInt(java.lang.Object, int) + * java.lang.reflect.Array#getInt(java.lang.Object, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getInt", - args = {java.lang.Object.class, int.class} - ) public void test_getIntLjava_lang_ObjectI() { // Test for method int java.lang.reflect.Array.getInt(java.lang.Object, // int) @@ -416,14 +368,8 @@ public class ArrayTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Array#getLength(java.lang.Object) + * java.lang.reflect.Array#getLength(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getLength", - args = {java.lang.Object.class} - ) public void test_getLengthLjava_lang_Object() { // Test for method int // java.lang.reflect.Array.getLength(java.lang.Object) @@ -442,14 +388,8 @@ public class ArrayTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Array#getLong(java.lang.Object, int) + * java.lang.reflect.Array#getLong(java.lang.Object, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getLong", - args = {java.lang.Object.class, int.class} - ) public void test_getLongLjava_lang_ObjectI() { // Test for method long // java.lang.reflect.Array.getLong(java.lang.Object, int) @@ -494,14 +434,8 @@ public class ArrayTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Array#getShort(java.lang.Object, int) + * java.lang.reflect.Array#getShort(java.lang.Object, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getShort", - args = {java.lang.Object.class, int.class} - ) public void test_getShortLjava_lang_ObjectI() { // Test for method short // java.lang.reflect.Array.getShort(java.lang.Object, int) @@ -546,14 +480,8 @@ public class ArrayTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Array#newInstance(java.lang.Class, int[]) + * java.lang.reflect.Array#newInstance(java.lang.Class, int[]) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "newInstance", - args = {java.lang.Class.class, int[].class} - ) public void test_newInstanceLjava_lang_Class$I() { // Test for method java.lang.Object // java.lang.reflect.Array.newInstance(java.lang.Class, int []) @@ -598,14 +526,8 @@ public class ArrayTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Array#newInstance(java.lang.Class, int) + * java.lang.reflect.Array#newInstance(java.lang.Class, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "newInstance", - args = {java.lang.Class.class, int.class} - ) public void test_newInstanceLjava_lang_ClassI() { // Test for method java.lang.Object // java.lang.reflect.Array.newInstance(java.lang.Class, int) @@ -638,15 +560,9 @@ public class ArrayTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Array#set(java.lang.Object, int, + * java.lang.reflect.Array#set(java.lang.Object, int, * java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "set", - args = {java.lang.Object.class, int.class, java.lang.Object.class} - ) public void test_setLjava_lang_ObjectILjava_lang_Object() { // Test for method void java.lang.reflect.Array.set(java.lang.Object, // int, java.lang.Object) @@ -702,14 +618,8 @@ public class ArrayTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Array#setBoolean(java.lang.Object, int, boolean) + * java.lang.reflect.Array#setBoolean(java.lang.Object, int, boolean) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setBoolean", - args = {java.lang.Object.class, int.class, boolean.class} - ) public void test_setBooleanLjava_lang_ObjectIZ() { // Test for method void // java.lang.reflect.Array.setBoolean(java.lang.Object, int, boolean) @@ -754,14 +664,8 @@ public class ArrayTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Array#setByte(java.lang.Object, int, byte) + * java.lang.reflect.Array#setByte(java.lang.Object, int, byte) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setByte", - args = {java.lang.Object.class, int.class, byte.class} - ) public void test_setByteLjava_lang_ObjectIB() { // Test for method void // java.lang.reflect.Array.setByte(java.lang.Object, int, byte) @@ -806,14 +710,8 @@ public class ArrayTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Array#setChar(java.lang.Object, int, char) + * java.lang.reflect.Array#setChar(java.lang.Object, int, char) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setChar", - args = {java.lang.Object.class, int.class, char.class} - ) public void test_setCharLjava_lang_ObjectIC() { // Test for method void // java.lang.reflect.Array.setChar(java.lang.Object, int, char) @@ -858,14 +756,8 @@ public class ArrayTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Array#setDouble(java.lang.Object, int, double) + * java.lang.reflect.Array#setDouble(java.lang.Object, int, double) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setDouble", - args = {java.lang.Object.class, int.class, double.class} - ) public void test_setDoubleLjava_lang_ObjectID() { // Test for method void // java.lang.reflect.Array.setDouble(java.lang.Object, int, double) @@ -910,14 +802,8 @@ public class ArrayTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Array#setFloat(java.lang.Object, int, float) + * java.lang.reflect.Array#setFloat(java.lang.Object, int, float) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setFloat", - args = {java.lang.Object.class, int.class, float.class} - ) public void test_setFloatLjava_lang_ObjectIF() { // Test for method void // java.lang.reflect.Array.setFloat(java.lang.Object, int, float) @@ -962,14 +848,8 @@ public class ArrayTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Array#setInt(java.lang.Object, int, int) + * java.lang.reflect.Array#setInt(java.lang.Object, int, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setInt", - args = {java.lang.Object.class, int.class, int.class} - ) public void test_setIntLjava_lang_ObjectII() { // Test for method void java.lang.reflect.Array.setInt(java.lang.Object, // int, int) @@ -1014,14 +894,8 @@ public class ArrayTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Array#setLong(java.lang.Object, int, long) + * java.lang.reflect.Array#setLong(java.lang.Object, int, long) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setLong", - args = {java.lang.Object.class, int.class, long.class} - ) public void test_setLongLjava_lang_ObjectIJ() { // Test for method void // java.lang.reflect.Array.setLong(java.lang.Object, int, long) @@ -1066,14 +940,8 @@ public class ArrayTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Array#setShort(java.lang.Object, int, short) + * java.lang.reflect.Array#setShort(java.lang.Object, int, short) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setShort", - args = {java.lang.Object.class, int.class, short.class} - ) public void test_setShortLjava_lang_ObjectIS() { // Test for method void // java.lang.reflect.Array.setShort(java.lang.Object, int, short) diff --git a/luni/src/test/java/tests/api/java/lang/reflect/BoundedGenericMethodsTests.java b/luni/src/test/java/tests/api/java/lang/reflect/BoundedGenericMethodsTests.java index 9e9bfa3..7949a30 100644 --- a/luni/src/test/java/tests/api/java/lang/reflect/BoundedGenericMethodsTests.java +++ b/luni/src/test/java/tests/api/java/lang/reflect/BoundedGenericMethodsTests.java @@ -16,11 +16,6 @@ package tests.api.java.lang.reflect; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import java.lang.reflect.Method; import java.lang.reflect.Type; import java.lang.reflect.TypeVariable; @@ -28,7 +23,6 @@ import java.lang.reflect.TypeVariable; /** * Tests bounded type parameters declared on methods. */ -@TestTargetClass(Method.class) public class BoundedGenericMethodsTests extends GenericReflectionTestsBase { @SuppressWarnings("unchecked") static class BoundedGenericMethods<S> { @@ -107,54 +101,24 @@ public class BoundedGenericMethodsTests extends GenericReflectionTestsBase { /** * Tests that there are is one Type Parameter on the Class itself. */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't check GenericSignatureFormatError.", - method = "getTypeParameters", - args = {} - ) public void testBoundedGenericMethods() { assertLenghtOne(clazz.getTypeParameters()); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't check GenericSignatureFormatError.", - method = "getTypeParameters", - args = {} - ) public void testNoParamNoReturn() throws SecurityException, NoSuchMethodException { Method method = clazz.getMethod("noParamNoReturn"); checkBoundedTypeParameter(method); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't check GenericSignatureFormatError.", - method = "getTypeParameters", - args = {} - ) public void testUnboundedParamNoReturn() throws SecurityException, NoSuchMethodException { Method method = clazz.getMethod("paramNoReturn", BoundedGenericMethods.class); checkBoundedTypeParameter(method); parameterType(method); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't check GenericSignatureFormatError.", - method = "getTypeParameters", - args = {} - ) public void testNoParamReturn() throws SecurityException, NoSuchMethodException { Method method = clazz.getMethod("noParamReturn"); checkBoundedTypeParameter(method); assertLenghtZero(method.getGenericParameterTypes()); checkReturnType(method); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't check GenericSignatureFormatError.", - method = "getTypeParameters", - args = {} - ) public void testUnboundedParamReturn() throws SecurityException, NoSuchMethodException { Method method = clazz.getMethod("paramReturn", BoundedGenericMethods.class); checkBoundedTypeParameter(method); diff --git a/luni/src/test/java/tests/api/java/lang/reflect/FieldTest.java b/luni/src/test/java/tests/api/java/lang/reflect/FieldTest.java index 7f38a41..a1ca151 100644 --- a/luni/src/test/java/tests/api/java/lang/reflect/FieldTest.java +++ b/luni/src/test/java/tests/api/java/lang/reflect/FieldTest.java @@ -17,10 +17,6 @@ package tests.api.java.lang.reflect; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; import tests.support.Support_Field; import java.lang.annotation.Annotation; @@ -36,7 +32,6 @@ import java.lang.reflect.TypeVariable; import java.util.HashSet; import java.util.Set; -@TestTargetClass(Field.class) public class FieldTest extends junit.framework.TestCase { // BEGIN android-note @@ -159,14 +154,8 @@ public class FieldTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Field#equals(java.lang.Object) + * java.lang.reflect.Field#equals(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "equals", - args = {java.lang.Object.class} - ) public void test_equalsLjava_lang_Object() { // Test for method boolean // java.lang.reflect.Field.equals(java.lang.Object) @@ -189,14 +178,8 @@ public class FieldTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Field#get(java.lang.Object) + * java.lang.reflect.Field#get(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "get", - args = {java.lang.Object.class} - ) public void test_getLjava_lang_Object() throws Throwable { // Test for method java.lang.Object // java.lang.reflect.Field.get(java.lang.Object) @@ -367,129 +350,25 @@ public class FieldTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Field#get(java.lang.Object) - * @tests java.lang.reflect.Field#getByte(java.lang.Object) - * @tests java.lang.reflect.Field#getBoolean(java.lang.Object) - * @tests java.lang.reflect.Field#getShort(java.lang.Object) - * @tests java.lang.reflect.Field#getInt(java.lang.Object) - * @tests java.lang.reflect.Field#getLong(java.lang.Object) - * @tests java.lang.reflect.Field#getFloat(java.lang.Object) - * @tests java.lang.reflect.Field#getDouble(java.lang.Object) - * @tests java.lang.reflect.Field#getChar(java.lang.Object) - * @tests java.lang.reflect.Field#set(java.lang.Object, java.lang.Object) - * @tests java.lang.reflect.Field#setByte(java.lang.Object, byte) - * @tests java.lang.reflect.Field#setBoolean(java.lang.Object, boolean) - * @tests java.lang.reflect.Field#setShort(java.lang.Object, short) - * @tests java.lang.reflect.Field#setInt(java.lang.Object, int) - * @tests java.lang.reflect.Field#setLong(java.lang.Object, long) - * @tests java.lang.reflect.Field#setFloat(java.lang.Object, float) - * @tests java.lang.reflect.Field#setDouble(java.lang.Object, double) - * @tests java.lang.reflect.Field#setChar(java.lang.Object, char) + * java.lang.reflect.Field#get(java.lang.Object) + * java.lang.reflect.Field#getByte(java.lang.Object) + * java.lang.reflect.Field#getBoolean(java.lang.Object) + * java.lang.reflect.Field#getShort(java.lang.Object) + * java.lang.reflect.Field#getInt(java.lang.Object) + * java.lang.reflect.Field#getLong(java.lang.Object) + * java.lang.reflect.Field#getFloat(java.lang.Object) + * java.lang.reflect.Field#getDouble(java.lang.Object) + * java.lang.reflect.Field#getChar(java.lang.Object) + * java.lang.reflect.Field#set(java.lang.Object, java.lang.Object) + * java.lang.reflect.Field#setByte(java.lang.Object, byte) + * java.lang.reflect.Field#setBoolean(java.lang.Object, boolean) + * java.lang.reflect.Field#setShort(java.lang.Object, short) + * java.lang.reflect.Field#setInt(java.lang.Object, int) + * java.lang.reflect.Field#setLong(java.lang.Object, long) + * java.lang.reflect.Field#setFloat(java.lang.Object, float) + * java.lang.reflect.Field#setDouble(java.lang.Object, double) + * java.lang.reflect.Field#setChar(java.lang.Object, char) */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Stress test.", - method = "get", - args = {java.lang.Object.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Stress test.", - method = "getByte", - args = {java.lang.Object.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Stress test.", - method = "getBoolean", - args = {java.lang.Object.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Stress test.", - method = "getShort", - args = {java.lang.Object.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Stress test.", - method = "getInt", - args = {java.lang.Object.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Stress test.", - method = "getFloat", - args = {java.lang.Object.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Stress test.", - method = "getDouble", - args = {java.lang.Object.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Stress test.", - method = "getChar", - args = {java.lang.Object.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Stress test.", - method = "set", - args = {java.lang.Object.class, java.lang.Object.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Stress test.", - method = "setBoolean", - args = {java.lang.Object.class, boolean.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Stress test.", - method = "setByte", - args = {java.lang.Object.class, byte.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Stress test.", - method = "setShort", - args = {java.lang.Object.class, short.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Stress test.", - method = "setInt", - args = {java.lang.Object.class, int.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Stress test.", - method = "setLong", - args = {java.lang.Object.class, long.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Stress test.", - method = "setFloat", - args = {java.lang.Object.class, float.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Stress test.", - method = "setDouble", - args = {java.lang.Object.class, double.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Stress test.", - method = "setChar", - args = {java.lang.Object.class, char.class} - ) - }) public void testProtectedFieldAccess() { Class fieldClass = new Support_Field().getClass(); String fieldName = null; @@ -690,14 +569,8 @@ public class FieldTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Field#getBoolean(java.lang.Object) + * java.lang.reflect.Field#getBoolean(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getBoolean", - args = {java.lang.Object.class} - ) public void test_getBooleanLjava_lang_Object() { TestField x = new TestField(); Field f = null; @@ -761,14 +634,8 @@ public class FieldTest extends junit.framework.TestCase { /** - * @tests java.lang.reflect.Field#getByte(java.lang.Object) + * java.lang.reflect.Field#getByte(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getByte", - args = {java.lang.Object.class} - ) public void test_getByteLjava_lang_Object() { // Test for method byte // java.lang.reflect.Field.getByte(java.lang.Object) @@ -833,14 +700,8 @@ public class FieldTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Field#getChar(java.lang.Object) + * java.lang.reflect.Field#getChar(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getChar", - args = {java.lang.Object.class} - ) public void test_getCharLjava_lang_Object() { // Test for method char // java.lang.reflect.Field.getChar(java.lang.Object) @@ -905,14 +766,8 @@ public class FieldTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Field#getDeclaringClass() + * java.lang.reflect.Field#getDeclaringClass() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getDeclaringClass", - args = {} - ) public void test_getDeclaringClass() { // Test for method java.lang.Class // java.lang.reflect.Field.getDeclaringClass() @@ -934,14 +789,8 @@ public class FieldTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Field#getDouble(java.lang.Object) + * java.lang.reflect.Field#getDouble(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getDouble", - args = {java.lang.Object.class} - ) public void test_getDoubleLjava_lang_Object() { // Test for method double // java.lang.reflect.Field.getDouble(java.lang.Object) @@ -1008,14 +857,8 @@ public class FieldTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Field#getFloat(java.lang.Object) + * java.lang.reflect.Field#getFloat(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getFloat", - args = {java.lang.Object.class} - ) public void test_getFloatLjava_lang_Object() { // Test for method float // java.lang.reflect.Field.getFloat(java.lang.Object) @@ -1082,14 +925,8 @@ public class FieldTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Field#getInt(java.lang.Object) + * java.lang.reflect.Field#getInt(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getInt", - args = {java.lang.Object.class} - ) public void test_getIntLjava_lang_Object() { // Test for method int java.lang.reflect.Field.getInt(java.lang.Object) TestField x = new TestField(); @@ -1156,14 +993,8 @@ public class FieldTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Field#getLong(java.lang.Object) + * java.lang.reflect.Field#getLong(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getLong", - args = {java.lang.Object.class} - ) public void test_getLongLjava_lang_Object() { // Test for method long // java.lang.reflect.Field.getLong(java.lang.Object) @@ -1228,14 +1059,8 @@ public class FieldTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Field#getModifiers() + * java.lang.reflect.Field#getModifiers() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getModifiers", - args = {} - ) public void test_getModifiers() { // Test for method int java.lang.reflect.Field.getModifiers() TestField x = new TestField(); @@ -1254,14 +1079,8 @@ public class FieldTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Field#getName() + * java.lang.reflect.Field#getName() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getName", - args = {} - ) public void test_getName() { // Test for method java.lang.String java.lang.reflect.Field.getName() TestField x = new TestField(); @@ -1276,14 +1095,8 @@ public class FieldTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Field#getShort(java.lang.Object) + * java.lang.reflect.Field#getShort(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getShort", - args = {java.lang.Object.class} - ) public void test_getShortLjava_lang_Object() { // Test for method short // java.lang.reflect.Field.getShort(java.lang.Object) @@ -1351,14 +1164,8 @@ public class FieldTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Field#getType() + * java.lang.reflect.Field#getType() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getType", - args = {} - ) public void test_getType() { // Test for method java.lang.Class java.lang.reflect.Field.getType() TestField x = new TestField(); @@ -1373,14 +1180,8 @@ public class FieldTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Field#set(java.lang.Object, java.lang.Object) + * java.lang.reflect.Field#set(java.lang.Object, java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "set", - args = {java.lang.Object.class, java.lang.Object.class} - ) public void test_setLjava_lang_ObjectLjava_lang_Object() throws Exception{ // Test for method void java.lang.reflect.Field.set(java.lang.Object, // java.lang.Object) @@ -1440,14 +1241,8 @@ public class FieldTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Field#setBoolean(java.lang.Object, boolean) + * java.lang.reflect.Field#setBoolean(java.lang.Object, boolean) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setBoolean", - args = {java.lang.Object.class, boolean.class} - ) public void test_setBooleanLjava_lang_ObjectZ() throws Exception{ // Test for method void // java.lang.reflect.Field.setBoolean(java.lang.Object, boolean) @@ -1507,14 +1302,8 @@ public class FieldTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Field#setByte(java.lang.Object, byte) + * java.lang.reflect.Field#setByte(java.lang.Object, byte) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setByte", - args = {java.lang.Object.class, byte.class} - ) public void test_setByteLjava_lang_ObjectB() throws Exception{ // Test for method void // java.lang.reflect.Field.setByte(java.lang.Object, byte) @@ -1575,14 +1364,8 @@ public class FieldTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Field#setChar(java.lang.Object, char) + * java.lang.reflect.Field#setChar(java.lang.Object, char) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setChar", - args = {java.lang.Object.class, char.class} - ) public void test_setCharLjava_lang_ObjectC() throws Exception{ // Test for method void // java.lang.reflect.Field.setChar(java.lang.Object, char) @@ -1643,14 +1426,8 @@ public class FieldTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Field#setDouble(java.lang.Object, double) + * java.lang.reflect.Field#setDouble(java.lang.Object, double) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setDouble", - args = {java.lang.Object.class, double.class} - ) public void test_setDoubleLjava_lang_ObjectD() throws Exception{ // Test for method void // java.lang.reflect.Field.setDouble(java.lang.Object, double) @@ -1712,14 +1489,8 @@ public class FieldTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Field#setFloat(java.lang.Object, float) + * java.lang.reflect.Field#setFloat(java.lang.Object, float) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setFloat", - args = {java.lang.Object.class, float.class} - ) public void test_setFloatLjava_lang_ObjectF() throws Exception{ // Test for method void // java.lang.reflect.Field.setFloat(java.lang.Object, float) @@ -1781,14 +1552,8 @@ public class FieldTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Field#setInt(java.lang.Object, int) + * java.lang.reflect.Field#setInt(java.lang.Object, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setInt", - args = {java.lang.Object.class, int.class} - ) public void test_setIntLjava_lang_ObjectI() throws Exception{ // Test for method void java.lang.reflect.Field.setInt(java.lang.Object, // int) @@ -1850,14 +1615,8 @@ public class FieldTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Field#setLong(java.lang.Object, long) + * java.lang.reflect.Field#setLong(java.lang.Object, long) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setLong", - args = {java.lang.Object.class, long.class} - ) public void test_setLongLjava_lang_ObjectJ() throws Exception{ // Test for method void // java.lang.reflect.Field.setLong(java.lang.Object, long) @@ -1918,14 +1677,8 @@ public class FieldTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Field#setShort(java.lang.Object, short) + * java.lang.reflect.Field#setShort(java.lang.Object, short) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setShort", - args = {java.lang.Object.class, short.class} - ) public void test_setShortLjava_lang_ObjectS() throws Exception{ // Test for method void // java.lang.reflect.Field.setShort(java.lang.Object, short) @@ -1987,14 +1740,8 @@ public class FieldTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Field#toString() + * java.lang.reflect.Field#toString() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {} - ) public void test_toString() { // Test for method java.lang.String java.lang.reflect.Field.toString() Field f = null; @@ -2009,12 +1756,6 @@ public class FieldTest extends junit.framework.TestCase { f.toString()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getDeclaredAnnotations", - args = {} - ) public void test_getDeclaredAnnotations() throws Exception { Field field = TestClass.class.getField("annotatedField"); Annotation[] annotations = field.getDeclaredAnnotations(); @@ -2030,12 +1771,6 @@ public class FieldTest extends junit.framework.TestCase { .contains(AnnotationRuntime1.class)); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isEnumConstant", - args = {} - ) public void test_isEnumConstant() throws Exception { Field field = TestEnum.class.getDeclaredField("A"); assertTrue("Enum constant not recognized", field.isEnumConstant()); @@ -2049,12 +1784,6 @@ public class FieldTest extends junit.framework.TestCase { .isEnumConstant()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isSynthetic", - args = {} - ) public void test_isSynthetic() throws Exception { Field[] fields = TestClass.Inner.class.getDeclaredFields(); assertEquals("Not exactly one field returned", 1, fields.length); @@ -2071,12 +1800,6 @@ public class FieldTest extends junit.framework.TestCase { } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getGenericType", - args = {} - ) public void test_getGenericType() throws Exception { Field field = GenericField.class.getDeclaredField("field"); Type type = field.getGenericType(); @@ -2096,12 +1819,6 @@ public class FieldTest extends junit.framework.TestCase { } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toGenericString", - args = {} - ) public void test_toGenericString() throws Exception { Field field = GenericField.class.getDeclaredField("field"); assertEquals("Wrong generic string returned", @@ -2123,12 +1840,6 @@ public class FieldTest extends junit.framework.TestCase { } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hashCode", - args = {} - ) public void test_hashCode() throws Exception { Field field = TestClass.class.getDeclaredField("annotatedField"); assertEquals("Wrong hashCode returned", field.getName().hashCode() diff --git a/luni/src/test/java/tests/api/java/lang/reflect/GenericArrayTypeTest.java b/luni/src/test/java/tests/api/java/lang/reflect/GenericArrayTypeTest.java index b1751e0..e48e584 100644 --- a/luni/src/test/java/tests/api/java/lang/reflect/GenericArrayTypeTest.java +++ b/luni/src/test/java/tests/api/java/lang/reflect/GenericArrayTypeTest.java @@ -16,11 +16,6 @@ package tests.api.java.lang.reflect; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import java.lang.reflect.Field; import java.lang.reflect.GenericArrayType; import java.lang.reflect.ParameterizedType; @@ -30,18 +25,11 @@ import java.lang.reflect.TypeVariable; /** * Tests generic reflection on arrays with generic or parameterized component types. */ -@TestTargetClass(GenericArrayType.class) public class GenericArrayTypeTest extends GenericReflectionTestsBase { static class A<T> { T[] array; } - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "Missing tests for TypeNotPresentException, MalformedParameterizedTypeException", - method = "getGenericComponentType", - args = {} - ) public void testGetGenericComponentType() throws Exception { @SuppressWarnings("unchecked") Class<? extends A> clazz = GenericArrayTypeTest.A.class; @@ -59,12 +47,6 @@ public class GenericArrayTypeTest extends GenericReflectionTestsBase { static class B<T> { B<T>[] array; } - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "Missing tests for TypeNotPresentException, MalformedParameterizedTypeException", - method = "getGenericComponentType", - args = {} - ) public void testParameterizedComponentType() throws Exception { @SuppressWarnings("unchecked") Class<? extends B> clazz = GenericArrayTypeTest.B.class; diff --git a/luni/src/test/java/tests/api/java/lang/reflect/GenericMethodsTests.java b/luni/src/test/java/tests/api/java/lang/reflect/GenericMethodsTests.java index cd75eef..0bfc188 100644 --- a/luni/src/test/java/tests/api/java/lang/reflect/GenericMethodsTests.java +++ b/luni/src/test/java/tests/api/java/lang/reflect/GenericMethodsTests.java @@ -17,11 +17,6 @@ package tests.api.java.lang.reflect; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import java.lang.reflect.Method; import java.lang.reflect.Type; import java.lang.reflect.TypeVariable; @@ -30,7 +25,6 @@ import java.lang.reflect.TypeVariable; /** * Tests unbounded type parameters declared on methods. */ -@TestTargetClass(Method.class) public class GenericMethodsTests extends GenericReflectionTestsBase{ static class GenericMethods { @@ -50,12 +44,6 @@ public class GenericMethodsTests extends GenericReflectionTestsBase{ /** * Tests that there are no Type Parameters on the Class itself. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getTypeParameters", - args = {} - ) public void testGenericMethods() { assertLenghtZero(clazz.getTypeParameters()); } @@ -95,95 +83,29 @@ public class GenericMethodsTests extends GenericReflectionTestsBase{ assertInstanceOf(TypeVariable.class, genericReturnType); assertEquals(method, ((TypeVariable<?>) genericReturnType).getGenericDeclaration()); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getTypeParameters", - args = {} - ) public void testNoParamNoReturn() throws Exception { Method method = clazz.getMethod("noParamNoReturn"); checkTypeParameter(method); } - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getTypeParameters", - args = {} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getGenericParameterTypes", - args = {} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getParameterTypes", - args = {} - ) - }) public void testParamNoReturn() throws Exception { Method method = clazz.getMethod("paramNoReturn", Object.class); checkTypeParameter(method); checkParameterType(method); } - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getGenericParameterTypes", - args = {} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getGenericReturnType", - args = {} - ) - }) public void testNoParamReturn() throws Exception { Method method = clazz.getMethod("noParamReturn"); checkTypeParameter(method); assertLenghtZero(method.getGenericParameterTypes()); checkReturnType(method); } - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getTypeParameters", - args = {} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getParameterTypes", - args = {} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getGenericReturnType", - args = {} - ) - }) public void testParamReturn() throws Exception { Method method = clazz.getMethod("paramReturn", Object.class); checkTypeParameter(method); checkParameterType(method); checkReturnType(method); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "", - method = "getTypeParameters", - args = {} - ) public void testIndependencyOfMethodTypeParameters() throws Exception { Method method0 = clazz.getMethod("paramNoReturn", Object.class); TypeVariable<Method> typeParameter0 = method0.getTypeParameters()[0]; diff --git a/luni/src/test/java/tests/api/java/lang/reflect/GenericSignatureFormatErrorTest.java b/luni/src/test/java/tests/api/java/lang/reflect/GenericSignatureFormatErrorTest.java index 53a005c..954073c 100644 --- a/luni/src/test/java/tests/api/java/lang/reflect/GenericSignatureFormatErrorTest.java +++ b/luni/src/test/java/tests/api/java/lang/reflect/GenericSignatureFormatErrorTest.java @@ -2,9 +2,6 @@ package tests.api.java.lang.reflect; import dalvik.annotation.AndroidOnly; import dalvik.annotation.SideEffect; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; import dalvik.system.DexFile; import junit.framework.TestCase; @@ -19,25 +16,12 @@ import java.lang.reflect.TypeVariable; import tests.support.Support_ClassLoader; -@TestTargetClass(GenericSignatureFormatError.class) public class GenericSignatureFormatErrorTest extends TestCase{ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "GenericSignatureFormatError", - args = {} - ) public void test_Constructor() { assertNotNull(new GenericSignatureFormatError()); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "GenericSignatureFormatError", - args = {} - ) public void test_readResource() throws Exception { File tf = File.createTempFile("classes", ".dex"); // System.out.println("GenericSignatureFormatErrorTest:" @@ -48,12 +32,6 @@ public class GenericSignatureFormatErrorTest extends TestCase{ } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "GenericSignatureFormatError", - args = {} - ) @AndroidOnly("Uses Android specific class dalvik.system.DexFile " + "for loading classes.") @SideEffect("strange issue (exception: 'could not open dex file', " + diff --git a/luni/src/test/java/tests/api/java/lang/reflect/InvocationTargetExceptionTest.java b/luni/src/test/java/tests/api/java/lang/reflect/InvocationTargetExceptionTest.java index 057083d..5e699a9 100644 --- a/luni/src/test/java/tests/api/java/lang/reflect/InvocationTargetExceptionTest.java +++ b/luni/src/test/java/tests/api/java/lang/reflect/InvocationTargetExceptionTest.java @@ -17,11 +17,6 @@ package tests.api.java.lang.reflect; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import java.io.ByteArrayOutputStream; import java.io.CharArrayWriter; import java.io.PrintStream; @@ -31,7 +26,6 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -@TestTargetClass(InvocationTargetException.class) public class InvocationTargetExceptionTest extends junit.framework.TestCase { static class TestMethod { @@ -118,14 +112,8 @@ public class InvocationTargetExceptionTest extends junit.framework.TestCase { class SubInvocationTargetException extends InvocationTargetException {} /** - * @tests java.lang.reflect.InvocationTargetException#InvocationTargetException() + * java.lang.reflect.InvocationTargetException#InvocationTargetException() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "InvocationTargetException", - args = {} - ) public void test_Constructor() throws Exception { Constructor<InvocationTargetException> ctor = InvocationTargetException.class .getDeclaredConstructor(); @@ -137,14 +125,8 @@ public class InvocationTargetExceptionTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.InvocationTargetException#InvocationTargetException(java.lang.Throwable) + * java.lang.reflect.InvocationTargetException#InvocationTargetException(java.lang.Throwable) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "InvocationTargetException", - args = {java.lang.Throwable.class} - ) public void test_ConstructorLjava_lang_Throwable() { // Test for method // java.lang.reflect.InvocationTargetException(java.lang.Throwable) @@ -163,15 +145,9 @@ public class InvocationTargetExceptionTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.InvocationTargetException#InvocationTargetException(java.lang.Throwable, + * java.lang.reflect.InvocationTargetException#InvocationTargetException(java.lang.Throwable, * java.lang.String) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "InvocationTargetException", - args = {java.lang.Throwable.class, java.lang.String.class} - ) public void test_ConstructorLjava_lang_ThrowableLjava_lang_String() { // Test for method // java.lang.reflect.InvocationTargetException(java.lang.Throwable, @@ -192,14 +168,8 @@ public class InvocationTargetExceptionTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.InvocationTargetException#getTargetException() + * java.lang.reflect.InvocationTargetException#getTargetException() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getTargetException", - args = {} - ) public void test_getTargetException() { // Test for method java.lang.Throwable // java.lang.reflect.InvocationTargetException.getTargetException() @@ -220,14 +190,8 @@ public class InvocationTargetExceptionTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.InvocationTargetException#getCause() + * java.lang.reflect.InvocationTargetException#getCause() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getCause", - args = {} - ) public void test_getCause() { // java.lang.reflect.InvocationTargetException.getCause() try { @@ -248,14 +212,8 @@ public class InvocationTargetExceptionTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.InvocationTargetException#printStackTrace() + * java.lang.reflect.InvocationTargetException#printStackTrace() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "printStackTrace", - args = {} - ) public void test_printStackTrace() { // Test for method void // java.lang.reflect.InvocationTargetException.printStackTrace() @@ -278,14 +236,8 @@ public class InvocationTargetExceptionTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.InvocationTargetException#printStackTrace(java.io.PrintStream) + * java.lang.reflect.InvocationTargetException#printStackTrace(java.io.PrintStream) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "printStackTrace", - args = {java.io.PrintStream.class} - ) public void test_printStackTraceLjava_io_PrintStream() { // Test for method void // java.lang.reflect.InvocationTargetException.printStackTrace(java.io.PrintStream) @@ -301,14 +253,8 @@ public class InvocationTargetExceptionTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.InvocationTargetException#printStackTrace(java.io.PrintWriter) + * java.lang.reflect.InvocationTargetException#printStackTrace(java.io.PrintWriter) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "printStackTrace", - args = {java.io.PrintWriter.class} - ) public void test_printStackTraceLjava_io_PrintWriter() { // Test for method void // java.lang.reflect.InvocationTargetException.printStackTrace(java.io.PrintWriter) diff --git a/luni/src/test/java/tests/api/java/lang/reflect/MalformedParameterizedTypeExceptionTests.java b/luni/src/test/java/tests/api/java/lang/reflect/MalformedParameterizedTypeExceptionTests.java index 4a05c07..f86403d 100644 --- a/luni/src/test/java/tests/api/java/lang/reflect/MalformedParameterizedTypeExceptionTests.java +++ b/luni/src/test/java/tests/api/java/lang/reflect/MalformedParameterizedTypeExceptionTests.java @@ -1,26 +1,14 @@ package tests.api.java.lang.reflect; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import java.lang.reflect.Constructor; import java.lang.reflect.MalformedParameterizedTypeException; import java.lang.reflect.Modifier; -@TestTargetClass(MalformedParameterizedTypeException.class) public class MalformedParameterizedTypeExceptionTests extends junit.framework.TestCase { /** - * @tests java.lang.reflect.MalformedParameterizedTypeException#MalformedParameterizedTypeException() + * java.lang.reflect.MalformedParameterizedTypeException#MalformedParameterizedTypeException() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Since this constructor is never invoked, this test only verifies its existence.", - method = "MalformedParameterizedTypeException", - args = {} - ) public void test_Constructor() throws Exception { Constructor<MalformedParameterizedTypeException> ctor = MalformedParameterizedTypeException.class .getDeclaredConstructor(); diff --git a/luni/src/test/java/tests/api/java/lang/reflect/MethodTest.java b/luni/src/test/java/tests/api/java/lang/reflect/MethodTest.java index 8e1bf82..e8288d6 100644 --- a/luni/src/test/java/tests/api/java/lang/reflect/MethodTest.java +++ b/luni/src/test/java/tests/api/java/lang/reflect/MethodTest.java @@ -30,11 +30,6 @@ import java.lang.reflect.TypeVariable; import java.util.HashSet; import java.util.Set; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; - -@TestTargetClass(Method.class) public class MethodTest extends junit.framework.TestCase { static class TestMethod { @@ -195,14 +190,8 @@ public class MethodTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Method#equals(java.lang.Object) + * java.lang.reflect.Method#equals(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "equals", - args = {java.lang.Object.class} - ) public void test_equalsLjava_lang_Object() { // Test for method boolean // java.lang.reflect.Method.equals(java.lang.Object) @@ -228,15 +217,8 @@ public class MethodTest extends junit.framework.TestCase { } /** - * @tests java.lang.Class#getMethod(java.lang.String, java.lang.Class[]) + * java.lang.Class#getMethod(java.lang.String, java.lang.Class[]) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getMethod", - args = {java.lang.String.class, java.lang.Class[].class}, - clazz = java.lang.Class.class - ) public void test_getMethod() throws NoSuchMethodException, SecurityException { // Check that getMethod treats null parameterTypes the same as an empty array. Method m1 = TestMethod.class.getMethod("invokeInstanceTest", new Class[0]); @@ -245,15 +227,8 @@ public class MethodTest extends junit.framework.TestCase { } /** - * @tests java.lang.Class#getDeclaredMethod(java.lang.String, java.lang.Class[]) + * java.lang.Class#getDeclaredMethod(java.lang.String, java.lang.Class[]) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getDeclaredMethod", - args = {java.lang.String.class, java.lang.Class[].class}, - clazz = java.lang.Class.class - ) public void test_getDeclaredMethod() throws NoSuchMethodException, SecurityException { // Check that getDeclaredMethod treats null parameterTypes the same as an empty array. Method m1 = TestMethod.class.getDeclaredMethod("invokeInstanceTest", new Class[0]); @@ -262,14 +237,8 @@ public class MethodTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Method#getDeclaringClass() + * java.lang.reflect.Method#getDeclaringClass() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getDeclaringClass", - args = {} - ) public void test_getDeclaringClass() { // Test for method java.lang.Class // java.lang.reflect.Method.getDeclaringClass() @@ -288,14 +257,8 @@ public class MethodTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Method#getExceptionTypes() + * java.lang.reflect.Method#getExceptionTypes() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getExceptionTypes", - args = {} - ) public void test_getExceptionTypes() { // Test for method java.lang.Class [] // java.lang.reflect.Method.getExceptionTypes() @@ -318,14 +281,8 @@ public class MethodTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Method#getModifiers() + * java.lang.reflect.Method#getModifiers() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getModifiers", - args = {} - ) public void test_getModifiers() { // Test for method int java.lang.reflect.Method.getModifiers() @@ -378,14 +335,8 @@ public class MethodTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Method#getName() + * java.lang.reflect.Method#getName() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getName", - args = {} - ) public void test_getName() { // Test for method java.lang.String java.lang.reflect.Method.getName() Method mth = null; @@ -399,14 +350,8 @@ public class MethodTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Method#isVarArgs() + * java.lang.reflect.Method#isVarArgs() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isVarArgs", - args = {} - ) public void test_isVarArgs() throws Exception { Method mth = TestMethod.class.getMethod("publicVoidVarargs", Object[].class); @@ -418,14 +363,8 @@ public class MethodTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Method#isBridge() + * java.lang.reflect.Method#isBridge() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isBridge", - args = {} - ) public void test_isBridge() throws Exception { Method[] declaredMethods = BrigeTest.class.getDeclaredMethods(); assertEquals("Bridge method not generated.", 2, declaredMethods.length); @@ -441,14 +380,8 @@ public class MethodTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Method#isSynthetic() + * java.lang.reflect.Method#isSynthetic() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isSynthetic", - args = {} - ) public void test_isSynthetic() throws Exception { Method[] declaredMethods = BrigeTest.class.getDeclaredMethods(); assertEquals("Synthetic method not generated.", 2, @@ -464,14 +397,8 @@ public class MethodTest extends junit.framework.TestCase { assertTrue("Synthetic method not found.", foundSyntheticMethod); } /** - * @tests java.lang.reflect.Method#getParameterAnnotations() + * java.lang.reflect.Method#getParameterAnnotations() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getParameterAnnotations", - args = {} - ) public void test_getParameterAnnotations() throws Exception { Method method = TestMethod.class.getDeclaredMethod( "annotatedParameter", new Class[] { @@ -502,14 +429,8 @@ public class MethodTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Method#getDeclaredAnnotations() + * java.lang.reflect.Method#getDeclaredAnnotations() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getDeclaredAnnotations", - args = {} - ) public void test_getDeclaredAnnotations() throws Exception { Method method = TestMethod.class.getDeclaredMethod("annotatedMethod"); Annotation[] declaredAnnotations = method.getDeclaredAnnotations(); @@ -525,14 +446,8 @@ public class MethodTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Method#getDefaultValue() + * java.lang.reflect.Method#getDefaultValue() */ - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "Missing tests for TypeNotPresentException", - method = "getDefaultValue", - args = {} - ) public void test_getDefaultValue() throws Exception { Method method = TestAnno.class.getDeclaredMethod("value"); assertEquals("Wrong default value returned", TestAnno.DEFAULT_VALUE, @@ -540,14 +455,8 @@ public class MethodTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Method#getDefaultValue() + * java.lang.reflect.Method#getDefaultValue() */ - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "Missing tests for GenericSignatureFormatError,TypeNotPresentException, MalformedParameterizedTypeException", - method = "getGenericExceptionTypes", - args = {} - ) public void test_getGenericExceptionTypes() throws Exception { Method method = ExceptionTest.class.getDeclaredMethod("exceptionTest"); Type[] genericExceptionTypes = method.getGenericExceptionTypes(); @@ -560,14 +469,8 @@ public class MethodTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Method#getGenericReturnType() + * java.lang.reflect.Method#getGenericReturnType() */ - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "Missing tests for GenericSignatureFormatError,TypeNotPresentException, MalformedParameterizedTypeException", - method = "getGenericReturnType", - args = {} - ) public void test_getGenericReturnType() throws Exception { Method method = GenericReturnType.class .getDeclaredMethod("returnGeneric"); @@ -582,14 +485,8 @@ public class MethodTest extends junit.framework.TestCase { /** - * @tests java.lang.reflect.Method#toGenericString() + * java.lang.reflect.Method#toGenericString() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toGenericString", - args = {} - ) public void test_toGenericString() throws Exception { Method method = GenericString.class.getDeclaredMethod("genericString", Object.class); @@ -603,14 +500,8 @@ public class MethodTest extends junit.framework.TestCase { /** - * @tests java.lang.reflect.Method#hashCode() + * java.lang.reflect.Method#hashCode() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hashCode", - args = {} - ) public void test_hashCode() throws Exception { Method mth0 = TestMethod.class.getMethod("hashCodeTest", String.class); Method mth1 = TestMethod.class.getDeclaredMethod("hashCodeTest", @@ -620,14 +511,8 @@ public class MethodTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Method#getParameterTypes() + * java.lang.reflect.Method#getParameterTypes() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getParameterTypes", - args = {} - ) public void test_getParameterTypes() { // Test for method java.lang.Class [] // java.lang.reflect.Method.getParameterTypes() @@ -680,14 +565,8 @@ public class MethodTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Method#getReturnType() + * java.lang.reflect.Method#getReturnType() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getReturnType", - args = {} - ) public void test_getReturnType() { // Test for method java.lang.Class // java.lang.reflect.Method.getReturnType() @@ -760,15 +639,9 @@ public class MethodTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Method#invoke(java.lang.Object, + * java.lang.reflect.Method#invoke(java.lang.Object, * java.lang.Object[]) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "invoke", - args = {java.lang.Object.class, java.lang.Object[].class} - ) public void test_invokeLjava_lang_Object$Ljava_lang_Object() throws Exception{ // Test for method java.lang.Object // java.lang.reflect.Method.invoke(java.lang.Object, java.lang.Object @@ -969,14 +842,8 @@ public class MethodTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Method#toString() + * java.lang.reflect.Method#toString() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {} - ) public void test_toString() { // Test for method java.lang.String java.lang.reflect.Method.toString() Method mth = null; diff --git a/luni/src/test/java/tests/api/java/lang/reflect/ParameterizedTypeTest.java b/luni/src/test/java/tests/api/java/lang/reflect/ParameterizedTypeTest.java index db771e5..fcb9042 100644 --- a/luni/src/test/java/tests/api/java/lang/reflect/ParameterizedTypeTest.java +++ b/luni/src/test/java/tests/api/java/lang/reflect/ParameterizedTypeTest.java @@ -16,12 +16,6 @@ package tests.api.java.lang.reflect; -import dalvik.annotation.KnownFailure; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import java.lang.reflect.Field; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; @@ -29,32 +23,11 @@ import java.lang.reflect.Type; /** * Tests parameterized types and their properties. */ -@TestTargetClass(ParameterizedType.class) public class ParameterizedTypeTest extends GenericReflectionTestsBase { static class A<T>{} static class B extends A<String>{} - @TestTargets({ - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "Missing tests for TypeNotPresentException, MalformedParametrizedTypeException", - method = "getActualTypeArguments", - args = {} - ), - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "Missing tests for TypeNotPresentException, MalformedParametrizedTypeException", - method = "getOwnerType", - args = {} - ), - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "Missing tests for TypeNotPresentException, MalformedParametrizedTypeException", - method = "getRawType", - args = {} - ) - }) public void testStringParameterizedSuperClass() { Class<? extends B> clazz = B.class; Type genericSuperclass = clazz.getGenericSuperclass(); @@ -71,26 +44,6 @@ public class ParameterizedTypeTest extends GenericReflectionTestsBase { static class C<T>{} static class D<T> extends C<T>{} - @TestTargets({ - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "Missing tests for TypeNotPresentException, MalformedParametrizedTypeException", - method = "getActualTypeArguments", - args = {} - ), - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "Missing tests for TypeNotPresentException, MalformedParametrizedTypeException", - method = "getOwnerType", - args = {} - ), - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "Missing tests for TypeNotPresentException, MalformedParametrizedTypeException", - method = "getRawType", - args = {} - ) - }) public void testTypeParameterizedSuperClass() { Class<? extends D> clazz = D.class; Type genericSuperclass = clazz.getGenericSuperclass(); @@ -109,26 +62,6 @@ public class ParameterizedTypeTest extends GenericReflectionTestsBase { E<T> e; } - @TestTargets({ - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "Missing tests for TypeNotPresentException, MalformedParametrizedTypeException", - method = "getActualTypeArguments", - args = {} - ), - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "Missing tests for TypeNotPresentException, MalformedParametrizedTypeException", - method = "getOwnerType", - args = {} - ), - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "Missing tests for TypeNotPresentException, MalformedParametrizedTypeException", - method = "getRawType", - args = {} - ) - }) public void testParameterizedMemeber() throws Exception{ Class<? extends F> clazz = F.class; Field field = clazz.getDeclaredField("e"); diff --git a/luni/src/test/java/tests/api/java/lang/reflect/ProxyTest.java b/luni/src/test/java/tests/api/java/lang/reflect/ProxyTest.java index 23d2c10..dd496b1 100644 --- a/luni/src/test/java/tests/api/java/lang/reflect/ProxyTest.java +++ b/luni/src/test/java/tests/api/java/lang/reflect/ProxyTest.java @@ -17,10 +17,6 @@ package tests.api.java.lang.reflect; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; @@ -31,19 +27,6 @@ import tests.support.Support_Proxy_I2; import tests.support.Support_Proxy_ParentException; import tests.support.Support_Proxy_SubException; -@TestTargetClass( - value = Proxy.class, - untestedMethods= { - @TestTargetNew( - level = TestLevel.NOT_NECESSARY, - notes = "Interface without implementation. Whether method is " + - "called from proxy is tested by ProxyTest.", - clazz = InvocationHandler.class, - method = "invoke", - args = { Object.class, Method.class, Object[].class } - ) - } -) public class ProxyTest extends junit.framework.TestCase { /* @@ -79,15 +62,9 @@ public class ProxyTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Proxy#getProxyClass(java.lang.ClassLoader, + * java.lang.reflect.Proxy#getProxyClass(java.lang.ClassLoader, * java.lang.Class[]) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getProxyClass", - args = {java.lang.ClassLoader.class, java.lang.Class[].class} - ) public void test_getProxyClassLjava_lang_ClassLoader$Ljava_lang_Class() { Class proxy = Proxy.getProxyClass(Support_Proxy_I1.class .getClassLoader(), new Class[] { Support_Proxy_I1.class }); @@ -117,14 +94,8 @@ public class ProxyTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Proxy#Proxy(java.lang.reflect.InvocationHandler) + * java.lang.reflect.Proxy#Proxy(java.lang.reflect.InvocationHandler) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "Proxy", - args = {java.lang.reflect.InvocationHandler.class} - ) public void test_ProxyLjava_lang_reflect_InvocationHandler() { assertNotNull(new ProxyCoonstructorTest(new InvocationHandler() { public Object invoke(Object proxy, Method method, Object[] args) @@ -137,15 +108,9 @@ public class ProxyTest extends junit.framework.TestCase { /** - * @tests java.lang.reflect.Proxy#newProxyInstance(java.lang.ClassLoader, + * java.lang.reflect.Proxy#newProxyInstance(java.lang.ClassLoader, * java.lang.Class[], java.lang.reflect.InvocationHandler) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "newProxyInstance", - args = {java.lang.ClassLoader.class, java.lang.Class[].class, java.lang.reflect.InvocationHandler.class} - ) public void test_newProxyInstanceLjava_lang_ClassLoader$Ljava_lang_ClassLjava_lang_reflect_InvocationHandler() { Object p = Proxy.newProxyInstance(Support_Proxy_I1.class .getClassLoader(), new Class[] { Support_Proxy_I1.class, @@ -227,14 +192,8 @@ public class ProxyTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Proxy#isProxyClass(java.lang.Class) + * java.lang.reflect.Proxy#isProxyClass(java.lang.Class) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isProxyClass", - args = {java.lang.Class.class} - ) public void test_isProxyClassLjava_lang_Class() { Class proxy = Proxy.getProxyClass(Support_Proxy_I1.class .getClassLoader(), new Class[] { Support_Proxy_I1.class }); @@ -269,14 +228,8 @@ public class ProxyTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.Proxy#getInvocationHandler(java.lang.Object) + * java.lang.reflect.Proxy#getInvocationHandler(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getInvocationHandler", - args = {java.lang.Object.class} - ) public void test_getInvocationHandlerLjava_lang_Object() { InvocationHandler handler = new InvocationHandler() { public Object invoke(Object proxy, Method method, Object[] args) @@ -301,12 +254,6 @@ public class ProxyTest extends junit.framework.TestCase { } //Regression Test for HARMONY-2355 - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Regression test. Exceptions are not verified.", - method = "newProxyInstance", - args = {java.lang.ClassLoader.class, java.lang.Class[].class, java.lang.reflect.InvocationHandler.class} - ) public void test_newProxyInstance_withCompatibleReturnTypes() { Object o = Proxy .newProxyInstance(this.getClass().getClassLoader(), @@ -316,12 +263,6 @@ public class ProxyTest extends junit.framework.TestCase { assertNotNull(o); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "IllegalArgumentException is verified.", - method = "newProxyInstance", - args = {java.lang.ClassLoader.class, java.lang.Class[].class, java.lang.reflect.InvocationHandler.class} - ) public void test_newProxyInstance_withNonCompatibleReturnTypes() { try { Proxy.newProxyInstance(this.getClass().getClassLoader(), diff --git a/luni/src/test/java/tests/api/java/lang/reflect/ReflectPermissionTest.java b/luni/src/test/java/tests/api/java/lang/reflect/ReflectPermissionTest.java index 7724ab7..c5f7f7f 100644 --- a/luni/src/test/java/tests/api/java/lang/reflect/ReflectPermissionTest.java +++ b/luni/src/test/java/tests/api/java/lang/reflect/ReflectPermissionTest.java @@ -17,25 +17,13 @@ package tests.api.java.lang.reflect; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import java.lang.reflect.ReflectPermission; -@TestTargetClass(ReflectPermission.class) public class ReflectPermissionTest extends junit.framework.TestCase { /** - * @tests java.lang.reflect.ReflectPermission#ReflectPermission(java.lang.String) + * java.lang.reflect.ReflectPermission#ReflectPermission(java.lang.String) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "ReflectPermission", - args = {java.lang.String.class} - ) public void test_ConstructorLjava_lang_String() { // Test for method java.lang.reflect.ReflectPermission(java.lang.String) String permString = new ReflectPermission("Blah").toString(); @@ -44,15 +32,9 @@ public class ReflectPermissionTest extends junit.framework.TestCase { } /** - * @tests java.lang.reflect.ReflectPermission#ReflectPermission(java.lang.String, + * java.lang.reflect.ReflectPermission#ReflectPermission(java.lang.String, * java.lang.String) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "ReflectPermission", - args = {java.lang.String.class, java.lang.String.class} - ) public void test_ConstructorLjava_lang_StringLjava_lang_String() { // Test for method java.lang.reflect.ReflectPermission(java.lang.String, // java.lang.String) diff --git a/luni/src/test/java/tests/api/java/lang/reflect/TypeVariableTest.java b/luni/src/test/java/tests/api/java/lang/reflect/TypeVariableTest.java index a8e21f7..cc22852 100644 --- a/luni/src/test/java/tests/api/java/lang/reflect/TypeVariableTest.java +++ b/luni/src/test/java/tests/api/java/lang/reflect/TypeVariableTest.java @@ -16,11 +16,6 @@ package tests.api.java.lang.reflect; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import java.io.Serializable; import java.lang.reflect.Constructor; import java.lang.reflect.Method; @@ -30,16 +25,9 @@ import java.lang.reflect.TypeVariable; /** * Tests type variables and their properties. */ -@TestTargetClass(TypeVariable.class) public class TypeVariableTest extends GenericReflectionTestsBase { static class A<T>{} - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Tests getGenericDeclaration of a type variable on a class.", - method = "getGenericDeclaration", - args = {} - ) public void testSimpleTypeVariableOnClass(){ Class<? extends A> clazz = A.class; TypeVariable[] typeParameters = clazz.getTypeParameters(); @@ -55,12 +43,6 @@ public class TypeVariableTest extends GenericReflectionTestsBase { static class B{ <T> void b(){}; } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Tests getGenericDeclaration of a type variable on a method.", - method = "getGenericDeclaration", - args = {} - ) public void testSimpleTypeVariableOnMethod() throws Exception{ Class<? extends B> clazz = B.class; Method method = clazz.getDeclaredMethod("b"); @@ -77,26 +59,6 @@ public class TypeVariableTest extends GenericReflectionTestsBase { static class C { <T>C(){} } - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Interaction test.", - method = "getGenericDeclaration", - args = {} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Interaction test.", - method = "getBounds", - args = {} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Interaction test.", - method = "getName", - args = {} - ) - }) public void testSimpleTypeVariableOnConstructor() throws Exception{ Class<? extends C> clazz = C.class; Constructor<?> constructor = clazz.getDeclaredConstructor(); @@ -111,12 +73,6 @@ public class TypeVariableTest extends GenericReflectionTestsBase { } static class D<Q,R,S>{} - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Interaction test.", - method = "getGenericDeclaration", - args = {} - ) public void testMultipleTypeVariablesOnClass() throws Exception { Class<? extends D> clazz = D.class; TypeVariable<?>[] typeParameters = clazz.getTypeParameters(); @@ -135,12 +91,6 @@ public class TypeVariableTest extends GenericReflectionTestsBase { static class E { <Q,R,S> void e(){} } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getName", - args = {} - ) public void testMultipleTypeVariablesOnMethod() throws Exception { Class<? extends E> clazz = E.class; Method method = clazz.getDeclaredMethod("e"); @@ -160,12 +110,6 @@ public class TypeVariableTest extends GenericReflectionTestsBase { static class F { <Q,R,S> F(){} } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getName", - args = {} - ) public void testMultipleTypeVariablesOnConstructor() throws Exception { Class<? extends F> clazz = F.class; Constructor<?> constructor = clazz.getDeclaredConstructor(); @@ -184,12 +128,6 @@ public class TypeVariableTest extends GenericReflectionTestsBase { static class G <T extends Number>{} - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Interaction test, Missing tests for TypeNotPresentException, MalformedParametrizedTypeException", - method = "getBounds", - args = {} - ) public void testSingleBound() throws Exception { Class<? extends G> clazz = G.class; TypeVariable[] typeParameters = clazz.getTypeParameters(); @@ -200,12 +138,6 @@ public class TypeVariableTest extends GenericReflectionTestsBase { } static class H <T extends Number & Serializable >{} - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Interaction test., Missing tests for TypeNotPresentException, MalformedParametrizedTypeException", - method = "getBounds", - args = {} - ) public void testMultipleBound() throws Exception { Class<? extends H> clazz = H.class; TypeVariable[] typeParameters = clazz.getTypeParameters(); diff --git a/luni/src/test/java/tests/api/java/lang/reflect/UndeclaredThrowableExceptionTests.java b/luni/src/test/java/tests/api/java/lang/reflect/UndeclaredThrowableExceptionTests.java index 90509fd..8fd2ff3 100644 --- a/luni/src/test/java/tests/api/java/lang/reflect/UndeclaredThrowableExceptionTests.java +++ b/luni/src/test/java/tests/api/java/lang/reflect/UndeclaredThrowableExceptionTests.java @@ -1,29 +1,17 @@ package tests.api.java.lang.reflect; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.io.EOFException; import java.lang.reflect.UndeclaredThrowableException; -@TestTargetClass(UndeclaredThrowableException.class) public class UndeclaredThrowableExceptionTests extends TestCase { private static EOFException throwable = new EOFException(); private static String msg = "TEST_MSG"; /** - * @tests java.lang.reflect.UndeclaredThrowableException#getCause() + * java.lang.reflect.UndeclaredThrowableException#getCause() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getCause", - args = {} - ) public void test_getCause() throws Exception { UndeclaredThrowableException ute = new UndeclaredThrowableException( throwable); @@ -31,14 +19,8 @@ public class UndeclaredThrowableExceptionTests extends TestCase { } /** - * @tests java.lang.reflect.UndeclaredThrowableException#getUndeclaredThrowable() + * java.lang.reflect.UndeclaredThrowableException#getUndeclaredThrowable() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getUndeclaredThrowable", - args = {} - ) public void test_getUndeclaredThrowable() throws Exception { UndeclaredThrowableException ute = new UndeclaredThrowableException( throwable); @@ -47,14 +29,8 @@ public class UndeclaredThrowableExceptionTests extends TestCase { } /** - * @tests java.lang.reflect.UndeclaredThrowableException#UndeclaredThrowableException(java.lang.Throwable) + * java.lang.reflect.UndeclaredThrowableException#UndeclaredThrowableException(java.lang.Throwable) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "UndeclaredThrowableException", - args = {java.lang.Throwable.class} - ) public void test_Constructor_Throwable() throws Exception { UndeclaredThrowableException e = new UndeclaredThrowableException( throwable); @@ -64,14 +40,8 @@ public class UndeclaredThrowableExceptionTests extends TestCase { } /** - * @tests java.lang.reflect.UndeclaredThrowableException#UndeclaredThrowableException(java.lang.Throwable, java.lang.String) + * java.lang.reflect.UndeclaredThrowableException#UndeclaredThrowableException(java.lang.Throwable, java.lang.String) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "UndeclaredThrowableException", - args = {java.lang.Throwable.class, java.lang.String.class} - ) public void test_Constructor_Throwable_String() throws Exception { UndeclaredThrowableException e = new UndeclaredThrowableException( throwable, msg); diff --git a/luni/src/test/java/tests/api/java/lang/reflect/WildcardTypeTest.java b/luni/src/test/java/tests/api/java/lang/reflect/WildcardTypeTest.java index d1abb7a..9f8baeb 100644 --- a/luni/src/test/java/tests/api/java/lang/reflect/WildcardTypeTest.java +++ b/luni/src/test/java/tests/api/java/lang/reflect/WildcardTypeTest.java @@ -23,14 +23,9 @@ import java.lang.reflect.Type; import java.lang.reflect.TypeVariable; import java.lang.reflect.WildcardType; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; - /** * Tests bounded type parameters declared on methods and bounded wildcards. */ -@TestTargetClass(WildcardType.class) public class WildcardTypeTest extends GenericReflectionTestsBase { @SuppressWarnings({"unchecked", "hiding"}) static class BoundedWildcardsGenericMethods<T> { @@ -47,25 +42,9 @@ public class WildcardTypeTest extends GenericReflectionTestsBase { @SuppressWarnings("unchecked") private static Class<? extends BoundedWildcardsGenericMethods> clazz = BoundedWildcardsGenericMethods.class; -// /** -// * Tests that there are is one Type Parameter on the Class itself. -// */ -// @TestInfo( -// level = TestLevel.PARTIAL, -// purpose = "Doesn't check GenericSignatureFormatError.", -// targets = { -// @TestTarget( -// methodName = "getTypeParameters", -// methodArgs = {} -// ) -// }) - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "", - clazz = Class.class, - method = "getTypeParameters", - args = {} - ) + /** + * Tests that there are is one Type Parameter on the Class itself. + */ public void testBoundedGenericMethods() { assertLenghtOne(clazz.getTypeParameters()); } @@ -142,24 +121,12 @@ public class WildcardTypeTest extends GenericReflectionTestsBase { assertEquals(BoundedWildcardsGenericMethods.class, bound); } - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "Missing tests for TypeNotPresentException, MalformedParametrizedTypeException", - method = "getUpperBounds", - args = {} - ) public void testUpperBoundedParamNoReturn() throws Exception { Method method = clazz.getMethod("upperBoundedParamNoReturn", BoundedWildcardsGenericMethods.class); checkBoundedTypeParameter(method); checkUpperBoundedParameter(method); } - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "Missing tests for TypeNotPresentException, MalformedParametrizedTypeException", - method = "getLowerBounds", - args = {} - ) public void testLowerBoundedParamReturn() throws Exception { Method method = clazz.getMethod("lowerBoundedParamReturn", BoundedWildcardsGenericMethods.class); checkBoundedTypeParameter(method); @@ -167,12 +134,6 @@ public class WildcardTypeTest extends GenericReflectionTestsBase { checkReturnType(method); } - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "Missing tests for TypeNotPresentException, MalformedParametrizedTypeException", - method = "getUpperBounds", - args = {} - ) public void testUpperBoundedParamReturn() throws Exception { Method method = clazz.getMethod("upperBoundedParamReturn", BoundedWildcardsGenericMethods.class); checkBoundedTypeParameter(method); @@ -180,12 +141,6 @@ public class WildcardTypeTest extends GenericReflectionTestsBase { checkReturnType(method); } - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "Missing tests for TypeNotPresentException, MalformedParametrizedTypeException", - method = "getLowerBounds", - args = {} - ) public void testLowerBoundedParamNoReturn() throws Exception { Method method = clazz.getMethod("lowerBoundedParamNoReturn", BoundedWildcardsGenericMethods.class); checkBoundedTypeParameter(method); diff --git a/luni/src/test/java/tests/api/java/math/BigIntegerTest.java b/luni/src/test/java/tests/api/java/math/BigIntegerTest.java index f82e4da..2c2c25b 100644 --- a/luni/src/test/java/tests/api/java/math/BigIntegerTest.java +++ b/luni/src/test/java/tests/api/java/math/BigIntegerTest.java @@ -78,7 +78,7 @@ public class BigIntegerTest extends junit.framework.TestCase { BigInteger[][] booleanPairs; /** - * @tests java.math.BigInteger#BigInteger(int, java.util.Random) + * java.math.BigInteger#BigInteger(int, java.util.Random) */ public void test_ConstructorILjava_util_Random() { // regression test for HARMONY-1047 @@ -108,7 +108,7 @@ public class BigIntegerTest extends junit.framework.TestCase { } /** - * @tests java.math.BigInteger#BigInteger(int, int, java.util.Random) + * java.math.BigInteger#BigInteger(int, int, java.util.Random) */ // BIGNUM returns no Primes smaller than 16 bits. public void test_ConstructorIILjava_util_Random() { @@ -148,7 +148,7 @@ public class BigIntegerTest extends junit.framework.TestCase { } /** - * @tests java.math.BigInteger#BigInteger(byte[]) + * java.math.BigInteger#BigInteger(byte[]) */ public void test_Constructor$B() { byte[] myByteArray; @@ -162,7 +162,7 @@ public class BigIntegerTest extends junit.framework.TestCase { } /** - * @tests java.math.BigInteger#BigInteger(int, byte[]) + * java.math.BigInteger#BigInteger(int, byte[]) */ public void test_ConstructorI$B() { byte[] myByteArray; @@ -186,7 +186,7 @@ public class BigIntegerTest extends junit.framework.TestCase { } /** - * @tests java.math.BigInteger#BigInteger(java.lang.String) + * java.math.BigInteger#BigInteger(java.lang.String) */ public void test_constructor_String_empty() { try { @@ -197,7 +197,7 @@ public class BigIntegerTest extends junit.framework.TestCase { } /** - * @tests java.math.BigInteger#toByteArray() + * java.math.BigInteger#toByteArray() */ public void test_toByteArray() { byte[] myByteArray, anotherByteArray; @@ -230,7 +230,7 @@ public class BigIntegerTest extends junit.framework.TestCase { // } /** - * @tests java.math.BigInteger#isProbablePrime(int) + * java.math.BigInteger#isProbablePrime(int) */ public void test_isProbablePrimeI() { int fails = 0; @@ -297,7 +297,7 @@ public class BigIntegerTest extends junit.framework.TestCase { } /** - * @tests java.math.BigInteger#nextProbablePrime() + * java.math.BigInteger#nextProbablePrime() */ public void test_nextProbablePrime() { largePrimesProduct( @@ -328,7 +328,7 @@ public class BigIntegerTest extends junit.framework.TestCase { } /** - * @tests java.math.BigInteger#probablePrime(int, java.util.Random) + * java.math.BigInteger#probablePrime(int, java.util.Random) */ public void test_probablePrime() { for (int bitLength = 50; bitLength <= 1050; bitLength += 100) { @@ -400,7 +400,7 @@ public class BigIntegerTest extends junit.framework.TestCase { /** - * @tests java.math.BigInteger#equals(java.lang.Object) + * java.math.BigInteger#equals(java.lang.Object) */ public void test_equalsLjava_lang_Object() { assertTrue("0=0", zero.equals(BigInteger.valueOf(0))); @@ -415,7 +415,7 @@ public class BigIntegerTest extends junit.framework.TestCase { } /** - * @tests java.math.BigInteger#compareTo(java.math.BigInteger) + * java.math.BigInteger#compareTo(java.math.BigInteger) */ public void test_compareToLjava_math_BigInteger() { assertTrue("Smaller number returned >= 0", one.compareTo(two) < 0); @@ -426,7 +426,7 @@ public class BigIntegerTest extends junit.framework.TestCase { } /** - * @tests java.math.BigInteger#intValue() + * java.math.BigInteger#intValue() */ public void test_intValue() { assertTrue("Incorrect intValue for 2**70", @@ -435,7 +435,7 @@ public class BigIntegerTest extends junit.framework.TestCase { } /** - * @tests java.math.BigInteger#longValue() + * java.math.BigInteger#longValue() */ public void test_longValue() { assertTrue("Incorrect longValue for 2**70", @@ -444,7 +444,7 @@ public class BigIntegerTest extends junit.framework.TestCase { } /** - * @tests java.math.BigInteger#valueOf(long) + * java.math.BigInteger#valueOf(long) */ public void test_valueOfJ() { assertTrue("Incurred number returned for 2", BigInteger.valueOf(2L) @@ -454,7 +454,7 @@ public class BigIntegerTest extends junit.framework.TestCase { } /** - * @tests java.math.BigInteger#add(java.math.BigInteger) + * java.math.BigInteger#add(java.math.BigInteger) */ public void test_addLjava_math_BigInteger() { assertTrue("Incorrect sum--wanted a zillion", aZillion.add(aZillion) @@ -495,7 +495,7 @@ public class BigIntegerTest extends junit.framework.TestCase { } /** - * @tests java.math.BigInteger#negate() + * java.math.BigInteger#negate() */ public void test_negate() { assertTrue("Single negation of zero did not result in zero", zero @@ -523,7 +523,7 @@ public class BigIntegerTest extends junit.framework.TestCase { } /** - * @tests java.math.BigInteger#signum() + * java.math.BigInteger#signum() */ public void test_signum() { assertTrue("Wrong positive signum", two.signum() == 1); @@ -533,7 +533,7 @@ public class BigIntegerTest extends junit.framework.TestCase { } /** - * @tests java.math.BigInteger#abs() + * java.math.BigInteger#abs() */ public void test_abs() { assertTrue("Invalid number returned for zillion", aZillion.negate() @@ -546,7 +546,7 @@ public class BigIntegerTest extends junit.framework.TestCase { } /** - * @tests java.math.BigInteger#pow(int) + * java.math.BigInteger#pow(int) */ public void test_powI() { assertTrue("Incorrect exponent returned for 2**10", two.pow(10).equals( @@ -558,7 +558,7 @@ public class BigIntegerTest extends junit.framework.TestCase { } /** - * @tests java.math.BigInteger#modInverse(java.math.BigInteger) + * java.math.BigInteger#modInverse(java.math.BigInteger) */ public void test_modInverseLjava_math_BigInteger() { BigInteger a = zero, mod, inv; @@ -607,7 +607,7 @@ public class BigIntegerTest extends junit.framework.TestCase { } /** - * @tests java.math.BigInteger#shiftRight(int) + * java.math.BigInteger#shiftRight(int) */ public void test_shiftRightI() { assertTrue("1 >> 0", BigInteger.valueOf(1).shiftRight(0).equals( @@ -664,7 +664,7 @@ public class BigIntegerTest extends junit.framework.TestCase { } /** - * @tests java.math.BigInteger#shiftLeft(int) + * java.math.BigInteger#shiftLeft(int) */ public void test_shiftLeftI() { assertTrue("1 << 0", one.shiftLeft(0).equals(one)); @@ -705,7 +705,7 @@ public class BigIntegerTest extends junit.framework.TestCase { } /** - * @tests java.math.BigInteger#multiply(java.math.BigInteger) + * java.math.BigInteger#multiply(java.math.BigInteger) */ public void test_multiplyLjava_math_BigInteger() { assertTrue("Incorrect sum--wanted three zillion", aZillion @@ -731,7 +731,7 @@ public class BigIntegerTest extends junit.framework.TestCase { } /** - * @tests java.math.BigInteger#divide(java.math.BigInteger) + * java.math.BigInteger#divide(java.math.BigInteger) */ public void test_divideLjava_math_BigInteger() { testAllDivs(bi33, bi3); @@ -789,7 +789,7 @@ public class BigIntegerTest extends junit.framework.TestCase { } /** - * @tests java.math.BigInteger#remainder(java.math.BigInteger) + * java.math.BigInteger#remainder(java.math.BigInteger) */ public void test_remainderLjava_math_BigInteger() { try { @@ -818,7 +818,7 @@ public class BigIntegerTest extends junit.framework.TestCase { } /** - * @tests java.math.BigInteger#mod(java.math.BigInteger) + * java.math.BigInteger#mod(java.math.BigInteger) */ public void test_modLjava_math_BigInteger() { try { @@ -847,7 +847,7 @@ public class BigIntegerTest extends junit.framework.TestCase { } /** - * @tests java.math.BigInteger#divideAndRemainder(java.math.BigInteger) + * java.math.BigInteger#divideAndRemainder(java.math.BigInteger) */ public void test_divideAndRemainderLjava_math_BigInteger() { try { @@ -876,7 +876,7 @@ public class BigIntegerTest extends junit.framework.TestCase { } /** - * @tests java.math.BigInteger#BigInteger(java.lang.String) + * java.math.BigInteger#BigInteger(java.lang.String) */ public void test_ConstructorLjava_lang_String() { assertTrue("new(0)", new BigInteger("0").equals(BigInteger.valueOf(0))); @@ -890,7 +890,7 @@ public class BigIntegerTest extends junit.framework.TestCase { } /** - * @tests java.math.BigInteger#BigInteger(java.lang.String, int) + * java.math.BigInteger#BigInteger(java.lang.String, int) */ public void test_ConstructorLjava_lang_StringI() { assertTrue("new(0,16)", new BigInteger("0", 16).equals(BigInteger @@ -914,7 +914,7 @@ public class BigIntegerTest extends junit.framework.TestCase { } /** - * @tests java.math.BigInteger#toString() + * java.math.BigInteger#toString() */ public void test_toString() { assertTrue("0.toString", "0".equals(BigInteger.valueOf(0).toString())); @@ -928,7 +928,7 @@ public class BigIntegerTest extends junit.framework.TestCase { } /** - * @tests java.math.BigInteger#toString(int) + * java.math.BigInteger#toString(int) */ public void test_toStringI() { assertTrue("0.toString(16)", "0".equals(BigInteger.valueOf(0).toString( @@ -946,7 +946,7 @@ public class BigIntegerTest extends junit.framework.TestCase { } /** - * @tests java.math.BigInteger#and(java.math.BigInteger) + * java.math.BigInteger#and(java.math.BigInteger) */ public void test_andLjava_math_BigInteger() { for (BigInteger[] element : booleanPairs) { @@ -962,7 +962,7 @@ public class BigIntegerTest extends junit.framework.TestCase { } /** - * @tests java.math.BigInteger#or(java.math.BigInteger) + * java.math.BigInteger#or(java.math.BigInteger) */ public void test_orLjava_math_BigInteger() { for (BigInteger[] element : booleanPairs) { @@ -978,7 +978,7 @@ public class BigIntegerTest extends junit.framework.TestCase { } /** - * @tests java.math.BigInteger#xor(java.math.BigInteger) + * java.math.BigInteger#xor(java.math.BigInteger) */ public void test_xorLjava_math_BigInteger() { for (BigInteger[] element : booleanPairs) { @@ -994,7 +994,7 @@ public class BigIntegerTest extends junit.framework.TestCase { } /** - * @tests java.math.BigInteger#not() + * java.math.BigInteger#not() */ public void test_not() { for (BigInteger[] element : booleanPairs) { @@ -1008,7 +1008,7 @@ public class BigIntegerTest extends junit.framework.TestCase { } /** - * @tests java.math.BigInteger#andNot(java.math.BigInteger) + * java.math.BigInteger#andNot(java.math.BigInteger) */ public void test_andNotLjava_math_BigInteger() { for (BigInteger[] element : booleanPairs) { diff --git a/luni/src/test/java/tests/api/java/math/MathContextTest.java b/luni/src/test/java/tests/api/java/math/MathContextTest.java index dadfd12..9e04342 100644 --- a/luni/src/test/java/tests/api/java/math/MathContextTest.java +++ b/luni/src/test/java/tests/api/java/math/MathContextTest.java @@ -24,7 +24,7 @@ import java.math.RoundingMode; public class MathContextTest extends junit.framework.TestCase { /** - * @tests java.math.MathContext#MathContext(...) + * java.math.MathContext#MathContext(...) */ public void test_MathContextConstruction() { String a = "-12380945E+61"; diff --git a/luni/src/test/java/tests/api/java/math/RoundingModeTest.java b/luni/src/test/java/tests/api/java/math/RoundingModeTest.java index 1549301..50a77df 100644 --- a/luni/src/test/java/tests/api/java/math/RoundingModeTest.java +++ b/luni/src/test/java/tests/api/java/math/RoundingModeTest.java @@ -23,7 +23,7 @@ import java.math.RoundingMode; public class RoundingModeTest extends junit.framework.TestCase { /** - * @tests java.math.RoundingMode#valueOf(int) + * java.math.RoundingMode#valueOf(int) */ public void test_valueOfI() { assertEquals("valueOf failed for ROUND_CEILING", RoundingMode.valueOf(BigDecimal.ROUND_CEILING), RoundingMode.CEILING); diff --git a/luni/src/test/java/tests/api/java/security/AccessControlContextTest.java b/luni/src/test/java/tests/api/java/security/AccessControlContextTest.java index d16dbf4..c6b6a8b 100644 --- a/luni/src/test/java/tests/api/java/security/AccessControlContextTest.java +++ b/luni/src/test/java/tests/api/java/security/AccessControlContextTest.java @@ -17,10 +17,6 @@ package tests.api.java.security; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; - import java.io.File; import java.io.FilePermission; import java.security.AccessControlContext; @@ -38,7 +34,6 @@ import java.util.PropertyPermission; import javax.security.auth.Subject; import javax.security.auth.SubjectDomainCombiner; -@TestTargetClass(AccessControlContext.class) public class AccessControlContextTest extends junit.framework.TestCase { private class TestSecurityManager extends SecurityManager { @@ -62,14 +57,8 @@ public class AccessControlContextTest extends junit.framework.TestCase { } /** - * @tests java.security.AccessControlContext#AccessControlContext(java.security.ProtectionDomain[]) + * java.security.AccessControlContext#AccessControlContext(java.security.ProtectionDomain[]) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "AccessControlContext", - args = {java.security.ProtectionDomain[].class} - ) public void test_Constructor$Ljava_security_ProtectionDomain() { // Test for method // java.security.AccessControlContext(java.security.ProtectionDomain []) @@ -118,14 +107,9 @@ public class AccessControlContextTest extends junit.framework.TestCase { } /** - * @tests java.security.AccessControlContext#AccessControlContext(java.security.AccessControlContext, + * java.security.AccessControlContext#AccessControlContext(java.security.AccessControlContext, * java.security.DomainCombiner) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - method = "AccessControlContext", - args = {java.security.AccessControlContext.class, java.security.DomainCombiner.class} - ) public void test_ConstructorLjava_security_AccessControlContextLjava_security_DomainCombiner() { AccessControlContext context = AccessController.getContext(); try { @@ -143,14 +127,8 @@ public class AccessControlContextTest extends junit.framework.TestCase { } /** - * @tests java.security.AccessControlException#checkPermission(Permission) + * java.security.AccessControlException#checkPermission(Permission) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "checkPermission", - args = {java.security.Permission.class} - ) public void test_checkPermission() { char s = File.separatorChar; FilePermission perm[] = new FilePermission[7]; @@ -218,14 +196,8 @@ public class AccessControlContextTest extends junit.framework.TestCase { } /** - * @tests java.security.AccessControlException#equals() + * java.security.AccessControlException#equals() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "equals", - args = {java.lang.Object.class} - ) public void test_equals() { final Permission perm1 = new PropertyPermission("java.class.path", "read"); @@ -275,13 +247,8 @@ public class AccessControlContextTest extends junit.framework.TestCase { } /** - * @tests java.security.AccessControlException#getDomainCombiner() + * java.security.AccessControlException#getDomainCombiner() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getDomainCombiner", - args = {} - ) public void test_getDomainCombiner() { AccessControlContext context = AccessController.getContext(); @@ -305,14 +272,8 @@ public class AccessControlContextTest extends junit.framework.TestCase { } /** - * @tests java.security.AccessControlException#hashCode() + * java.security.AccessControlException#hashCode() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hashCode", - args = {} - ) public void test_hashCode() { final Permission perm1 = new PropertyPermission("java.class.path", "read"); @@ -358,4 +319,4 @@ public class AccessControlContextTest extends junit.framework.TestCase { assertTrue(acc5.hashCode() == acc6.hashCode()); assertTrue(acc6.hashCode() == acc4.hashCode()); } -}
\ No newline at end of file +} diff --git a/luni/src/test/java/tests/api/java/security/PermissionCollectionTest.java b/luni/src/test/java/tests/api/java/security/PermissionCollectionTest.java index 49f100c..edbc2f5 100644 --- a/luni/src/test/java/tests/api/java/security/PermissionCollectionTest.java +++ b/luni/src/test/java/tests/api/java/security/PermissionCollectionTest.java @@ -33,11 +33,7 @@ import static tests.support.Support_Exec.execAndGetOutput; import tests.support.Support_GetLocal; import tests.support.resource.Support_Resources; import dalvik.annotation.KnownFailure; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -@TestTargetClass(PermissionCollection.class) public class PermissionCollectionTest extends junit.framework.TestCase { // The below test is known to fail. Haven't got to the bottom of @@ -60,14 +56,8 @@ public class PermissionCollectionTest extends junit.framework.TestCase { // * the cause of that NPE has still not been determined. Could it be // related to Harmony's current stub implementation of BigInteger ? /** - * @tests java.security.PermissionCollection#implies(java.security.Permission) + * java.security.PermissionCollection#implies(java.security.Permission) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "", - method = "implies", - args = {java.security.Permission.class} - ) @KnownFailure("Android doesn't support protection domains.") public void test_impliesLjava_security_Permission() throws Exception{ @@ -191,14 +181,8 @@ public class PermissionCollectionTest extends junit.framework.TestCase { } /** - * @tests java.security.PermissionCollection#PermissionCollection() + * java.security.PermissionCollection#PermissionCollection() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "PermissionCollection", - args = {} - ) public void test_Constructor() { // test java.security.permissionCollection.PermissionCollection() SecurityPermission permi = new SecurityPermission( @@ -209,14 +193,8 @@ public class PermissionCollectionTest extends junit.framework.TestCase { } /** - * @tests java.security.PermissionCollection#isReadOnly() + * java.security.PermissionCollection#isReadOnly() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isReadOnly", - args = {} - ) public void test_isReadOnly() { // test java.security.permissionCollection.isReadOnly() SecurityPermission permi = new SecurityPermission( @@ -230,14 +208,8 @@ public class PermissionCollectionTest extends junit.framework.TestCase { } /** - * @tests java.security.PermissionCollection#setReadOnly() + * java.security.PermissionCollection#setReadOnly() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setReadOnly", - args = {} - ) public void test_setReadOnly() { // test java.security.permissionCollection.setReadOnly() SecurityPermission permi = new SecurityPermission( @@ -251,14 +223,8 @@ public class PermissionCollectionTest extends junit.framework.TestCase { } /** - * @tests java.security.PermissionCollection#toString() + * java.security.PermissionCollection#toString() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {} - ) public void test_toString() { // test java.security.permissionCollection.toString() SecurityPermission permi = new SecurityPermission( @@ -279,4 +245,4 @@ public class PermissionCollectionTest extends junit.framework.TestCase { return url; } -}
\ No newline at end of file +} diff --git a/luni/src/test/java/tests/api/java/util/AbstractListTest.java b/luni/src/test/java/tests/api/java/util/AbstractListTest.java index f69af8d..3cda30f 100644 --- a/luni/src/test/java/tests/api/java/util/AbstractListTest.java +++ b/luni/src/test/java/tests/api/java/util/AbstractListTest.java @@ -17,11 +17,6 @@ package tests.api.java.util; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; - import java.util.AbstractList; import java.util.ArrayList; import java.util.Arrays; @@ -31,7 +26,6 @@ import java.util.List; import java.util.ListIterator; import java.util.RandomAccess; -@TestTargetClass(AbstractList.class) public class AbstractListTest extends junit.framework.TestCase { static class SimpleList extends AbstractList { @@ -59,14 +53,8 @@ public class AbstractListTest extends junit.framework.TestCase { } /** - * @tests java.util.AbstractList#hashCode() + * java.util.AbstractList#hashCode() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hashCode", - args = {} - ) public void test_hashCode() { List list = new ArrayList(); @@ -86,14 +74,8 @@ public class AbstractListTest extends junit.framework.TestCase { } /** - * @tests java.util.AbstractList#iterator() + * java.util.AbstractList#iterator() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "iterator", - args = {} - ) public void test_iterator() { SimpleList list = new SimpleList(); list.add(new Object()); @@ -105,14 +87,8 @@ public class AbstractListTest extends junit.framework.TestCase { } /** - * @tests java.util.AbstractList#listIterator() + * java.util.AbstractList#listIterator() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "listIterator", - args = {} - ) public void test_listIterator() { Integer tempValue; List list = new ArrayList(); @@ -137,14 +113,8 @@ public class AbstractListTest extends junit.framework.TestCase { } /** - * @tests java.util.AbstractList#subList(int, int) + * java.util.AbstractList#subList(int, int) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies each of the SubList operations to ensure a ConcurrentModificationException does not occur on an AbstractList which does not update modCount.", - method = "subList", - args = {int.class, int.class} - ) public void test_subListII() { // Test each of the SubList operations to ensure a // ConcurrentModificationException does not occur on an AbstractList @@ -197,14 +167,8 @@ public class AbstractListTest extends junit.framework.TestCase { } /** - * @tests java.util.AbstractList#subList(int, int) + * java.util.AbstractList#subList(int, int) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies IndexOutOfBoundsException.", - method = "subList", - args = {int.class, int.class} - ) public void test_subList_empty() { // Regression for HARMONY-389 List al = new ArrayList(); @@ -234,14 +198,8 @@ public class AbstractListTest extends junit.framework.TestCase { } /** - * @tests java.util.AbstractList#subList(int, int) + * java.util.AbstractList#subList(int, int) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify IndexOutOfBoundsException, IllegalArgumentException.", - method = "subList", - args = {int.class, int.class} - ) public void test_subList_addAll() { // Regression for HARMONY-390 List mainList = new ArrayList(); @@ -268,12 +226,6 @@ public class AbstractListTest extends junit.framework.TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "indexOf", - args = {java.lang.Object.class} - ) public void test_indexOfLjava_lang_Object() { AbstractList al = new ArrayList(); al.add(0); @@ -286,12 +238,6 @@ public class AbstractListTest extends junit.framework.TestCase { assertEquals(2, al.indexOf(2)); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "lastIndexOf", - args = {java.lang.Object.class} - ) public void test_lastIndexOfLjava_lang_Object() { AbstractList al = new ArrayList(); al.add(0); @@ -308,12 +254,6 @@ public class AbstractListTest extends junit.framework.TestCase { assertEquals(6, al.lastIndexOf(2)); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "listIterator", - args = {int.class} - ) public void test_listIteratorI() { AbstractList al1 = new ArrayList(); AbstractList al2 = new ArrayList(); diff --git a/luni/src/test/java/tests/api/java/util/AbstractMapTest.java b/luni/src/test/java/tests/api/java/util/AbstractMapTest.java index e431dd0..c8f9ce2 100644 --- a/luni/src/test/java/tests/api/java/util/AbstractMapTest.java +++ b/luni/src/test/java/tests/api/java/util/AbstractMapTest.java @@ -17,10 +17,6 @@ package tests.api.java.util; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; - import java.util.AbstractMap; import java.util.AbstractSet; import java.util.Collection; @@ -38,7 +34,6 @@ import java.util.TreeMap; import java.util.Vector; import java.util.WeakHashMap; -@TestTargetClass(AbstractMap.class) public class AbstractMapTest extends junit.framework.TestCase { static final String specialKey = "specialKey".intern(); @@ -76,14 +71,8 @@ public class AbstractMapTest extends junit.framework.TestCase { } /** - * @tests java.util.AbstractMap#keySet() + * java.util.AbstractMap#keySet() */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify returned set of keys.", - method = "keySet", - args = {} - ) public void test_keySet() { AbstractMap map1 = new HashMap(0); assertSame("HashMap(0)", map1.keySet(), map1.keySet()); @@ -108,14 +97,8 @@ public class AbstractMapTest extends junit.framework.TestCase { } /** - * @tests java.util.AbstractMap#remove(java.lang.Object) + * java.util.AbstractMap#remove(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify UnsupportedOperationException.", - method = "remove", - args = {java.lang.Object.class} - ) public void test_removeLjava_lang_Object() { Object key = new Object(); Object value = new Object(); @@ -152,14 +135,8 @@ public class AbstractMapTest extends junit.framework.TestCase { } /** - * @tests java.util.AbstractMap#values() + * java.util.AbstractMap#values() */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify returned Collection.", - method = "values", - args = {} - ) public void test_values() { AbstractMap map1 = new HashMap(0); assertSame("HashMap(0)", map1.values(), map1.values()); @@ -184,14 +161,8 @@ public class AbstractMapTest extends junit.framework.TestCase { } /** - * @tests java.util.AbstractMap#clone() + * java.util.AbstractMap#clone() */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify CloneNotSupportedException.", - method = "clone", - args = {} - ) public void test_clone() { class MyMap extends AbstractMap implements Cloneable { private Map map = new HashMap(); @@ -286,14 +257,8 @@ public class AbstractMapTest extends junit.framework.TestCase { } /** - * @tests {@link java.util.AbstractMap#putAll(Map)} + * {@link java.util.AbstractMap#putAll(Map)} */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify exceptions.", - method = "putAll", - args = {java.util.Map.class} - ) public void test_putAllLMap() { Hashtable ht = new Hashtable(); AMT amt = new AMT(); diff --git a/luni/src/test/java/tests/api/java/util/AbstractQueueTest.java b/luni/src/test/java/tests/api/java/util/AbstractQueueTest.java index a274fae..5ae490c 100644 --- a/luni/src/test/java/tests/api/java/util/AbstractQueueTest.java +++ b/luni/src/test/java/tests/api/java/util/AbstractQueueTest.java @@ -15,11 +15,6 @@ */ package tests.api.java.util; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; - import java.util.AbstractQueue; import java.util.ArrayList; import java.util.Arrays; @@ -31,7 +26,6 @@ import java.util.Vector; import junit.framework.TestCase; -@TestTargetClass(AbstractQueue.class) public class AbstractQueueTest extends TestCase { private MockAbstractQueue<Object> queue; @@ -112,14 +106,8 @@ public class AbstractQueueTest extends TestCase { } /** - * @tests java.util.AbstractQueue.add(E) + * java.util.AbstractQueue.add(E) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException.", - method = "add", - args = {java.lang.Object.class} - ) public void test_addLE_null() { try { queue.add(null); @@ -130,14 +118,8 @@ public class AbstractQueueTest extends TestCase { } /** - * @tests java.util.AbstractQueue.add(E) + * java.util.AbstractQueue.add(E) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies IllegalStateException.", - method = "add", - args = {java.lang.Object.class} - ) public void test_addLE_Full() { Object o = new Object(); @@ -154,14 +136,8 @@ public class AbstractQueueTest extends TestCase { } /** - * @tests java.util.AbstractQueue#add(E) + * java.util.AbstractQueue#add(E) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify NullPointerException, IllegalStateException.", - method = "add", - args = {java.lang.Object.class} - ) public void test_addLE() { Object o = new Object(); final int LAST_INDEX = 4; @@ -179,14 +155,8 @@ public class AbstractQueueTest extends TestCase { } /** - * @tests java.util.AbstractQueue#addAll(E) + * java.util.AbstractQueue#addAll(E) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException.", - method = "addAll", - args = {java.util.Collection.class} - ) public void test_addAllLE_null() { try { queue.addAll(null); @@ -197,14 +167,8 @@ public class AbstractQueueTest extends TestCase { } /** - * @tests java.util.AbstractQueue#addAll(E) + * java.util.AbstractQueue#addAll(E) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException.", - method = "addAll", - args = {java.util.Collection.class} - ) public void test_addAllLE_with_null() { List list = Arrays.asList("MYTESTSTRING", null, new Float(123.456)); try { @@ -216,14 +180,8 @@ public class AbstractQueueTest extends TestCase { } /** - * @tests java.util.AbstractQueue#addAll(E) + * java.util.AbstractQueue#addAll(E) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies IllegalStateException.", - method = "addAll", - args = {java.util.Collection.class} - ) public void test_addAllLE_full() { List list = Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11); try { @@ -235,14 +193,8 @@ public class AbstractQueueTest extends TestCase { } /** - * @tests java.util.AbstractQueue#addAll(E) + * java.util.AbstractQueue#addAll(E) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Regression test. Doesn't verify returned true value.", - method = "addAll", - args = {java.util.Collection.class} - ) public void test_addAllLE_empty() { // Regression test for HARMONY-1178 List list = new ArrayList<Object>(0); @@ -250,14 +202,8 @@ public class AbstractQueueTest extends TestCase { } /** - * @tests java.util.AbstractQueue#addAll(E) + * java.util.AbstractQueue#addAll(E) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies IllegalArgumentException.", - method = "addAll", - args = {java.util.Collection.class} - ) public void test_addAllLE_this() { try { queue.addAll(queue); @@ -267,12 +213,6 @@ public class AbstractQueueTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Checks functionality", - method = "addAll", - args = {java.util.Collection.class} - ) public void test_addAllLjava_lang_Object() { Collection c = new Vector(); @@ -288,14 +228,8 @@ public class AbstractQueueTest extends TestCase { } /** - * @tests java.util.AbstractQueue#clear() + * java.util.AbstractQueue#clear() */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies clear method for empty queue.", - method = "clear", - args = {} - ) public void test_clear_empty() { queue.clear(); assertTrue(queue.isEmpty()); @@ -303,14 +237,8 @@ public class AbstractQueueTest extends TestCase { } /** - * @tests java.util.AbstractQueue#clear() + * java.util.AbstractQueue#clear() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "clear", - args = {} - ) public void test_clear() { List list = Arrays.asList(123.456, "MYTESTSTRING", new Object(), 'c'); queue.addAll(list); @@ -320,28 +248,16 @@ public class AbstractQueueTest extends TestCase { } /** - * @tests java.util.AbstractQueue#AbstractQueue() + * java.util.AbstractQueue#AbstractQueue() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "AbstractQueue", - args = {} - ) public void test_Constructor() { MockAbstractQueue queue = new MockAbstractQueue(); assertNotNull(queue); } /** - * @tests java.util.AbstractQueue#remove() + * java.util.AbstractQueue#remove() */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NoSuchElementException.", - method = "remove", - args = {} - ) public void test_remove_null() { try { queue.remove(); @@ -353,14 +269,8 @@ public class AbstractQueueTest extends TestCase { } /** - * @tests java.util.AbstractQueue#remove() + * java.util.AbstractQueue#remove() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Verifies positive functionality, NoSuchElementException.", - method = "remove", - args = {} - ) public void test_remove() { char c = 'a'; queue.add(c); @@ -377,14 +287,8 @@ public class AbstractQueueTest extends TestCase { } /** - * @tests java.util.AbstractQueue#element() + * java.util.AbstractQueue#element() */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NoSuchElementException.", - method = "element", - args = {} - ) public void test_element_empty() { try { queue.element(); @@ -395,14 +299,8 @@ public class AbstractQueueTest extends TestCase { } /** - * @tests java.util.AbstractQueue#element() + * java.util.AbstractQueue#element() */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify NoSuchElementException.", - method = "element", - args = {} - ) public void test_element() { String s = "MYTESTSTRING_ONE"; queue.add(s); diff --git a/luni/src/test/java/tests/api/java/util/AbstractSequentialListTest.java b/luni/src/test/java/tests/api/java/util/AbstractSequentialListTest.java index 3d6a841..2068f1b 100644 --- a/luni/src/test/java/tests/api/java/util/AbstractSequentialListTest.java +++ b/luni/src/test/java/tests/api/java/util/AbstractSequentialListTest.java @@ -16,11 +16,6 @@ */ package tests.api.java.util; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; - import java.util.AbstractSequentialList; import java.util.Arrays; import java.util.Collection; @@ -31,7 +26,6 @@ import java.util.Vector; import junit.framework.TestCase; -@TestTargetClass(AbstractSequentialList.class) public class AbstractSequentialListTest extends TestCase { @Override @@ -60,14 +54,8 @@ public class AbstractSequentialListTest extends TestCase { } /** - * @tests {@link java.util.AbstractSequentialList#addAll(int, java.util.Collection)} + * {@link java.util.AbstractSequentialList#addAll(int, java.util.Collection)} */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify all exceptions according to the specification.", - method = "addAll", - args = {int.class, java.util.Collection.class} - ) public void test_addAll_ILCollection() { AbstractSequentialList<String> al = new ASLT<String>(); String[] someList = { "Aardvark" , @@ -154,12 +142,6 @@ public class AbstractSequentialListTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "addAll", - args = {int.class, java.util.Collection.class} - ) public void test_addAllILjava_util_Collection() { AbstractSequentialList asl = new AbstractSequentialList() { @@ -244,12 +226,6 @@ public class AbstractSequentialListTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "add", - args = {int.class, java.lang.Object.class} - ) public void test_addILjava_lang_Object() { AbstractSequentialList asl = new AbstractSequentialList() { @@ -321,12 +297,6 @@ public class AbstractSequentialListTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "get", - args = {int.class} - ) public void test_getI() { final String buff[] = {"0", "1", "2", "3", "4", "5"}; AbstractSequentialList asl = new AbstractSequentialList() { @@ -396,20 +366,6 @@ public class AbstractSequentialListTest extends TestCase { } } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "iterator", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "AbstractSequentialList", - args = {} - ) - }) public void test_iterrator() { AbstractSequentialList asl = new AbstractSequentialList() { @@ -456,12 +412,6 @@ public class AbstractSequentialListTest extends TestCase { assertNull(asl.iterator()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "remove", - args = {int.class} - ) public void test_removeI() { AbstractSequentialList asl = new AbstractSequentialList() { String buff[] = {"0", "1", "2", "3", "4", "5"}; @@ -534,12 +484,6 @@ public class AbstractSequentialListTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "set", - args = {int.class, java.lang.Object.class} - ) public void test_setILjava_lang_Object() { AbstractSequentialList asl = new AbstractSequentialList() { String buff[] = {"0", "1", "2", "3", "4", "5"}; diff --git a/luni/src/test/java/tests/api/java/util/ArrayListTest.java b/luni/src/test/java/tests/api/java/util/ArrayListTest.java index 0356731..50d9aa3 100644 --- a/luni/src/test/java/tests/api/java/util/ArrayListTest.java +++ b/luni/src/test/java/tests/api/java/util/ArrayListTest.java @@ -16,11 +16,6 @@ */ package tests.api.java.util; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -33,7 +28,6 @@ import java.util.Vector; import tests.support.Support_ListTest; -@TestTargetClass(ArrayList.class) public class ArrayListTest extends junit.framework.TestCase { List alist; @@ -41,14 +35,8 @@ public class ArrayListTest extends junit.framework.TestCase { Object[] objArray; /** - * @tests java.util.ArrayList#ArrayList() + * java.util.ArrayList#ArrayList() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "ArrayList", - args = {} - ) public void test_Constructor() { // Test for method java.util.ArrayList() new Support_ListTest("", alist).runTest(); @@ -60,14 +48,8 @@ public class ArrayListTest extends junit.framework.TestCase { } /** - * @tests java.util.ArrayList#ArrayList(int) + * java.util.ArrayList#ArrayList(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "ArrayList", - args = {int.class} - ) public void test_ConstructorI() { // Test for method java.util.ArrayList(int) ArrayList al = new ArrayList(5); @@ -82,14 +64,8 @@ public class ArrayListTest extends junit.framework.TestCase { } /** - * @tests java.util.ArrayList#ArrayList(java.util.Collection) + * java.util.ArrayList#ArrayList(java.util.Collection) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Doesn't verify NullPointerException.", - method = "ArrayList", - args = {java.util.Collection.class} - ) public void test_ConstructorLjava_util_Collection() { // Test for method java.util.ArrayList(java.util.Collection) ArrayList al = new ArrayList(Arrays.asList(objArray)); @@ -109,14 +85,8 @@ public class ArrayListTest extends junit.framework.TestCase { } /** - * @tests java.util.ArrayList#add(int, java.lang.Object) + * java.util.ArrayList#add(int, java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "add", - args = {int.class, java.lang.Object.class} - ) public void test_addILjava_lang_Object() { // Test for method void java.util.ArrayList.add(int, java.lang.Object) Object o; @@ -147,14 +117,8 @@ public class ArrayListTest extends junit.framework.TestCase { } /** - * @tests java.util.ArrayList#add(java.lang.Object) + * java.util.ArrayList#add(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "add", - args = {java.lang.Object.class} - ) public void test_addLjava_lang_Object() { // Test for method boolean java.util.ArrayList.add(java.lang.Object) Object o = new Object(); @@ -165,14 +129,8 @@ public class ArrayListTest extends junit.framework.TestCase { } /** - * @tests java.util.ArrayList#addAll(int, java.util.Collection) + * java.util.ArrayList#addAll(int, java.util.Collection) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "addAll", - args = {int.class, java.util.Collection.class} - ) public void test_addAllILjava_util_Collection() { // Test for method boolean java.util.ArrayList.addAll(int, // java.util.Collection) @@ -233,14 +191,8 @@ public class ArrayListTest extends junit.framework.TestCase { // preference to NullPointerException when the caller desserves both. // // /** -// * @tests java.util.ArrayList#addAll(int, java.util.Collection) +// * java.util.ArrayList#addAll(int, java.util.Collection) // */ -// @TestTargetNew( -// level = TestLevel.PARTIAL_COMPLETE, -// notes = "Verifies IndexOutOfBoundsException.", -// method = "addAll", -// args = {int.class, java.util.Collection.class} -// ) // public void test_addAllILjava_util_Collection_2() { // // Regression for HARMONY-467 // ArrayList obj = new ArrayList(); @@ -253,14 +205,8 @@ public class ArrayListTest extends junit.framework.TestCase { // END android-removed /** - * @tests java.util.ArrayList#addAll(java.util.Collection) + * java.util.ArrayList#addAll(java.util.Collection) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Doesn't verify NullPointerException.", - method = "addAll", - args = {java.util.Collection.class} - ) public void test_addAllLjava_util_Collection() { // Test for method boolean // java.util.ArrayList.addAll(java.util.Collection) @@ -319,14 +265,8 @@ public class ArrayListTest extends junit.framework.TestCase { } /** - * @tests java.util.ArrayList#clear() + * java.util.ArrayList#clear() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "clear", - args = {} - ) public void test_clear() { // Test for method void java.util.ArrayList.clear() alist.clear(); @@ -345,14 +285,8 @@ public class ArrayListTest extends junit.framework.TestCase { } /** - * @tests java.util.ArrayList#clone() + * java.util.ArrayList#clone() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "clone", - args = {} - ) public void test_clone() { // Test for method java.lang.Object java.util.ArrayList.clone() ArrayList x = (ArrayList) (((ArrayList) (alist)).clone()); @@ -373,14 +307,8 @@ public class ArrayListTest extends junit.framework.TestCase { } /** - * @tests java.util.ArrayList#contains(java.lang.Object) + * java.util.ArrayList#contains(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "contains", - args = {java.lang.Object.class} - ) public void test_containsLjava_lang_Object() { // Test for method boolean // java.util.ArrayList.contains(java.lang.Object) @@ -398,14 +326,8 @@ public class ArrayListTest extends junit.framework.TestCase { } /** - * @tests java.util.ArrayList#ensureCapacity(int) + * java.util.ArrayList#ensureCapacity(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "ensureCapacity", - args = {int.class} - ) public void test_ensureCapacityI() { // Test for method void java.util.ArrayList.ensureCapacity(int) // TODO : There is no good way to test this as it only really impacts on @@ -437,14 +359,8 @@ public class ArrayListTest extends junit.framework.TestCase { } /** - * @tests java.util.ArrayList#get(int) + * java.util.ArrayList#get(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "get", - args = {int.class} - ) public void test_getI() { // Test for method java.lang.Object java.util.ArrayList.get(int) assertTrue("Returned incorrect element", alist.get(22) == objArray[22]); @@ -456,14 +372,8 @@ public class ArrayListTest extends junit.framework.TestCase { } /** - * @tests java.util.ArrayList#indexOf(java.lang.Object) + * java.util.ArrayList#indexOf(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "indexOf", - args = {java.lang.Object.class} - ) public void test_indexOfLjava_lang_Object() { // Test for method int java.util.ArrayList.indexOf(java.lang.Object) assertEquals("Returned incorrect index", @@ -477,14 +387,8 @@ public class ArrayListTest extends junit.framework.TestCase { } /** - * @tests java.util.ArrayList#isEmpty() + * java.util.ArrayList#isEmpty() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isEmpty", - args = {} - ) public void test_isEmpty() { // Test for method boolean java.util.ArrayList.isEmpty() assertTrue("isEmpty returned false for new list", new ArrayList() @@ -494,14 +398,8 @@ public class ArrayListTest extends junit.framework.TestCase { } /** - * @tests java.util.ArrayList#lastIndexOf(java.lang.Object) + * java.util.ArrayList#lastIndexOf(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "lastIndexOf", - args = {java.lang.Object.class} - ) public void test_lastIndexOfLjava_lang_Object() { // Test for method int java.util.ArrayList.lastIndexOf(java.lang.Object) alist.add(new Integer(99)); @@ -516,14 +414,8 @@ public class ArrayListTest extends junit.framework.TestCase { } /** - * @tests java.util.ArrayList#remove(int) + * java.util.ArrayList#remove(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "remove", - args = {int.class} - ) public void test_removeI() { // Test for method java.lang.Object java.util.ArrayList.remove(int) alist.remove(10); @@ -569,14 +461,8 @@ public class ArrayListTest extends junit.framework.TestCase { } /** - * @tests java.util.ArrayList#set(int, java.lang.Object) + * java.util.ArrayList#set(int, java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "set", - args = {int.class, java.lang.Object.class} - ) public void test_setILjava_lang_Object() { // Test for method java.lang.Object java.util.ArrayList.set(int, // java.lang.Object) @@ -604,14 +490,8 @@ public class ArrayListTest extends junit.framework.TestCase { } /** - * @tests java.util.ArrayList#size() + * java.util.ArrayList#size() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "size", - args = {} - ) public void test_size() { // Test for method int java.util.ArrayList.size() assertEquals("Returned incorrect size for exiting list", @@ -621,14 +501,8 @@ public class ArrayListTest extends junit.framework.TestCase { } /** - * @tests java.util.ArrayList#toArray() + * java.util.ArrayList#toArray() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toArray", - args = {} - ) public void test_toArray() { // Test for method java.lang.Object [] java.util.ArrayList.toArray() alist.set(25, null); @@ -649,14 +523,8 @@ public class ArrayListTest extends junit.framework.TestCase { } /** - * @tests java.util.ArrayList#toArray(java.lang.Object[]) + * java.util.ArrayList#toArray(java.lang.Object[]) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toArray", - args = {java.lang.Object[].class} - ) public void test_toArray$Ljava_lang_Object() { // Test for method java.lang.Object [] // java.util.ArrayList.toArray(java.lang.Object []) @@ -688,14 +556,8 @@ public class ArrayListTest extends junit.framework.TestCase { } /** - * @tests java.util.ArrayList#trimToSize() + * java.util.ArrayList#trimToSize() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "trimToSize", - args = {} - ) public void test_trimToSize_01() { // Test for method void java.util.ArrayList.trimToSize() for (int i = 99; i > 24; i--) @@ -720,12 +582,6 @@ public class ArrayListTest extends junit.framework.TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "trimToSize", - args = {} - ) public void test_trimToSize_02() { ArrayList list = new ArrayList(Arrays.asList(new String[] { "a", "b", "c", "d", "e", "f", "g" })); @@ -737,12 +593,6 @@ public class ArrayListTest extends junit.framework.TestCase { /** * @test java.util.ArrayList#addAll(int, Collection) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify NullPointerException.", - method = "addAll", - args = {int.class, java.util.Collection.class} - ) public void test_addAll() { ArrayList list = new ArrayList(); list.add("one"); @@ -781,12 +631,6 @@ public class ArrayListTest extends junit.framework.TestCase { assertEquals(14, list.size()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "remove", - args = {java.lang.Object.class} - ) public void test_removeLjava_lang_Object() { List list = new ArrayList(Arrays.asList(new String[] { "a", "b", "c", "d", "e", "f", "g" })); @@ -807,12 +651,6 @@ public class ArrayListTest extends junit.framework.TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "removeRange", - args = {int.class, int.class} - ) public void test_removeRangeII() { Mock_ArrayList mal = new Mock_ArrayList(); mal.add("a"); diff --git a/luni/src/test/java/tests/api/java/util/ArraysTest.java b/luni/src/test/java/tests/api/java/util/ArraysTest.java index 1b22dba..81a5fc2 100644 --- a/luni/src/test/java/tests/api/java/util/ArraysTest.java +++ b/luni/src/test/java/tests/api/java/util/ArraysTest.java @@ -16,10 +16,6 @@ */ package tests.api.java.util; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; - import java.util.Arrays; import java.util.Comparator; import java.util.LinkedList; @@ -28,7 +24,6 @@ import java.util.Random; import tests.support.Support_UnmodifiableCollectionTest; -@TestTargetClass(Arrays.class) public class ArraysTest extends junit.framework.TestCase { public static class ReversedIntegerComparator implements Comparator { @@ -64,14 +59,8 @@ public class ArraysTest extends junit.framework.TestCase { short[] shortArray; /** - * @tests java.util.Arrays#asList(java.lang.Object[]) + * java.util.Arrays#asList(java.lang.Object[]) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "asList", - args = {java.lang.Object[].class} - ) public void test_asList$Ljava_lang_Object() { // Test for method java.util.List // java.util.Arrays.asList(java.lang.Object []) @@ -106,14 +95,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#binarySearch(byte[], byte) + * java.util.Arrays#binarySearch(byte[], byte) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "binarySearch", - args = {byte[].class, byte.class} - ) public void test_binarySearch$BB() { // Test for method int java.util.Arrays.binarySearch(byte [], byte) for (byte counter = 0; counter < arraySize; counter++) @@ -133,14 +116,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#binarySearch(char[], char) + * java.util.Arrays#binarySearch(char[], char) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "binarySearch", - args = {char[].class, char.class} - ) public void test_binarySearch$CC() { // Test for method int java.util.Arrays.binarySearch(char [], char) for (char counter = 0; counter < arraySize; counter++) @@ -155,14 +132,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#binarySearch(double[], double) + * java.util.Arrays#binarySearch(double[], double) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "binarySearch", - args = {double[].class, double.class} - ) public void test_binarySearch$DD() { // Test for method int java.util.Arrays.binarySearch(double [], double) for (int counter = 0; counter < arraySize; counter++) @@ -195,14 +166,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#binarySearch(float[], float) + * java.util.Arrays#binarySearch(float[], float) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "binarySearch", - args = {float[].class, float.class} - ) public void test_binarySearch$FF() { // Test for method int java.util.Arrays.binarySearch(float [], float) for (int counter = 0; counter < arraySize; counter++) @@ -234,14 +199,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#binarySearch(int[], int) + * java.util.Arrays#binarySearch(int[], int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "binarySearch", - args = {int[].class, int.class} - ) public void test_binarySearch$II() { // Test for method int java.util.Arrays.binarySearch(int [], int) for (int counter = 0; counter < arraySize; counter++) @@ -260,14 +219,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#binarySearch(long[], long) + * java.util.Arrays#binarySearch(long[], long) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "binarySearch", - args = {long[].class, long.class} - ) public void test_binarySearch$JJ() { // Test for method int java.util.Arrays.binarySearch(long [], long) for (long counter = 0; counter < arraySize; counter++) @@ -287,15 +240,9 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#binarySearch(java.lang.Object[], + * java.util.Arrays#binarySearch(java.lang.Object[], * java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "binarySearch", - args = {java.lang.Object[].class, java.lang.Object.class} - ) public void test_binarySearch$Ljava_lang_ObjectLjava_lang_Object() { // Test for method int java.util.Arrays.binarySearch(java.lang.Object // [], java.lang.Object) @@ -327,15 +274,9 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#binarySearch(java.lang.Object[], + * java.util.Arrays#binarySearch(java.lang.Object[], * java.lang.Object, java.util.Comparator) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify ClassCastException.", - method = "binarySearch", - args = {java.lang.Object[].class, java.lang.Object.class, java.util.Comparator.class} - ) public void test_binarySearch$Ljava_lang_ObjectLjava_lang_ObjectLjava_util_Comparator() { // Test for method int java.util.Arrays.binarySearch(java.lang.Object // [], java.lang.Object, java.util.Comparator) @@ -355,14 +296,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#binarySearch(short[], short) + * java.util.Arrays#binarySearch(short[], short) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "binarySearch", - args = {short[].class, short.class} - ) public void test_binarySearch$SS() { // Test for method int java.util.Arrays.binarySearch(short [], short) for (short counter = 0; counter < arraySize; counter++) @@ -382,14 +317,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#fill(byte[], byte) + * java.util.Arrays#fill(byte[], byte) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "fill", - args = {byte[].class, byte.class} - ) public void test_fill$BB() { // Test for method void java.util.Arrays.fill(byte [], byte) @@ -401,14 +330,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#fill(byte[], int, int, byte) + * java.util.Arrays#fill(byte[], int, int, byte) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "fill", - args = {byte[].class, int.class, int.class, byte.class} - ) public void test_fill$BIIB() { // Test for method void java.util.Arrays.fill(byte [], int, int, byte) byte val = Byte.MAX_VALUE; @@ -450,14 +373,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#fill(short[], short) + * java.util.Arrays#fill(short[], short) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "fill", - args = {short[].class, short.class} - ) public void test_fill$SS() { // Test for method void java.util.Arrays.fill(short [], short) @@ -469,14 +386,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#fill(short[], int, int, short) + * java.util.Arrays#fill(short[], int, int, short) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "fill", - args = {short[].class, int.class, int.class, short.class} - ) public void test_fill$SIIS() { // Test for method void java.util.Arrays.fill(short [], int, int, short) short val = Short.MAX_VALUE; @@ -510,14 +421,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#fill(char[], char) + * java.util.Arrays#fill(char[], char) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "fill", - args = {char[].class, char.class} - ) public void test_fill$CC() { // Test for method void java.util.Arrays.fill(char [], char) @@ -528,14 +433,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#fill(char[], int, int, char) + * java.util.Arrays#fill(char[], int, int, char) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "fill", - args = {char[].class, int.class, int.class, char.class} - ) public void test_fill$CIIC() { // Test for method void java.util.Arrays.fill(char [], int, int, char) char val = 'T'; @@ -569,14 +468,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#fill(int[], int) + * java.util.Arrays#fill(int[], int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "fill", - args = {int[].class, int.class} - ) public void test_fill$II() { // Test for method void java.util.Arrays.fill(int [], int) @@ -588,14 +481,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#fill(int[], int, int, int) + * java.util.Arrays#fill(int[], int, int, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "fill", - args = {int[].class, int.class, int.class, int.class} - ) public void test_fill$IIII() { // Test for method void java.util.Arrays.fill(int [], int, int, int) int val = Integer.MAX_VALUE; @@ -629,14 +516,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#fill(long[], long) + * java.util.Arrays#fill(long[], long) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "fill", - args = {long[].class, long.class} - ) public void test_fill$JJ() { // Test for method void java.util.Arrays.fill(long [], long) @@ -648,14 +529,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#fill(long[], int, int, long) + * java.util.Arrays#fill(long[], int, int, long) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "fill", - args = {long[].class, int.class, int.class, long.class} - ) public void test_fill$JIIJ() { // Test for method void java.util.Arrays.fill(long [], int, int, long) long d[] = new long[1000]; @@ -689,14 +564,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#fill(float[], float) + * java.util.Arrays#fill(float[], float) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "fill", - args = {float[].class, float.class} - ) public void test_fill$FF() { // Test for method void java.util.Arrays.fill(float [], float) float d[] = new float[1000]; @@ -707,14 +576,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#fill(float[], int, int, float) + * java.util.Arrays#fill(float[], int, int, float) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "fill", - args = {float[].class, int.class, int.class, float.class} - ) public void test_fill$FIIF() { // Test for method void java.util.Arrays.fill(float [], int, int, float) float val = Float.MAX_VALUE; @@ -748,14 +611,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#fill(double[], double) + * java.util.Arrays#fill(double[], double) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "fill", - args = {double[].class, double.class} - ) public void test_fill$DD() { // Test for method void java.util.Arrays.fill(double [], double) @@ -767,14 +624,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#fill(double[], int, int, double) + * java.util.Arrays#fill(double[], int, int, double) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "fill", - args = {double[].class, int.class, int.class, double.class} - ) public void test_fill$DIID() { // Test for method void java.util.Arrays.fill(double [], int, int, // double) @@ -809,14 +660,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#fill(boolean[], boolean) + * java.util.Arrays#fill(boolean[], boolean) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "fill", - args = {boolean[].class, boolean.class} - ) public void test_fill$ZZ() { // Test for method void java.util.Arrays.fill(boolean [], boolean) @@ -827,14 +672,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#fill(boolean[], int, int, boolean) + * java.util.Arrays#fill(boolean[], int, int, boolean) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "fill", - args = {boolean[].class, int.class, int.class, boolean.class} - ) public void test_fill$ZIIZ() { // Test for method void java.util.Arrays.fill(boolean [], int, int, // boolean) @@ -869,14 +708,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#fill(java.lang.Object[], java.lang.Object) + * java.util.Arrays#fill(java.lang.Object[], java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "fill", - args = {java.lang.Object[].class, java.lang.Object.class} - ) public void test_fill$Ljava_lang_ObjectLjava_lang_Object() { // Test for method void java.util.Arrays.fill(java.lang.Object [], // java.lang.Object) @@ -888,15 +721,9 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#fill(java.lang.Object[], int, int, + * java.util.Arrays#fill(java.lang.Object[], int, int, * java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "fill", - args = {java.lang.Object[].class, int.class, int.class, java.lang.Object.class} - ) public void test_fill$Ljava_lang_ObjectIILjava_lang_Object() { // Test for method void java.util.Arrays.fill(java.lang.Object [], int, // int, java.lang.Object) @@ -936,14 +763,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#equals(byte[], byte[]) + * java.util.Arrays#equals(byte[], byte[]) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "equals", - args = {byte[].class, byte[].class} - ) public void test_equals$B$B() { // Test for method boolean java.util.Arrays.equals(byte [], byte []) byte d[] = new byte[1000]; @@ -956,14 +777,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#equals(short[], short[]) + * java.util.Arrays#equals(short[], short[]) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "equals", - args = {short[].class, short[].class} - ) public void test_equals$S$S() { // Test for method boolean java.util.Arrays.equals(short [], short []) short d[] = new short[1000]; @@ -976,14 +791,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#equals(char[], char[]) + * java.util.Arrays#equals(char[], char[]) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "equals", - args = {char[].class, char[].class} - ) public void test_equals$C$C() { // Test for method boolean java.util.Arrays.equals(char [], char []) char d[] = new char[1000]; @@ -997,14 +806,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#equals(int[], int[]) + * java.util.Arrays#equals(int[], int[]) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "equals", - args = {int[].class, int[].class} - ) public void test_equals$I$I() { // Test for method boolean java.util.Arrays.equals(int [], int []) int d[] = new int[1000]; @@ -1022,14 +825,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#equals(long[], long[]) + * java.util.Arrays#equals(long[], long[]) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "equals", - args = {long[].class, long[].class} - ) public void test_equals$J$J() { // Test for method boolean java.util.Arrays.equals(long [], long []) long d[] = new long[1000]; @@ -1046,14 +843,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#equals(float[], float[]) + * java.util.Arrays#equals(float[], float[]) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "equals", - args = {float[].class, float[].class} - ) public void test_equals$F$F() { // Test for method boolean java.util.Arrays.equals(float [], float []) float d[] = new float[1000]; @@ -1071,14 +862,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#equals(double[], double[]) + * java.util.Arrays#equals(double[], double[]) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "equals", - args = {double[].class, double[].class} - ) public void test_equals$D$D() { // Test for method boolean java.util.Arrays.equals(double [], double []) double d[] = new double[1000]; @@ -1099,14 +884,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#equals(boolean[], boolean[]) + * java.util.Arrays#equals(boolean[], boolean[]) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "equals", - args = {boolean[].class, boolean[].class} - ) public void test_equals$Z$Z() { // Test for method boolean java.util.Arrays.equals(boolean [], boolean // []) @@ -1120,14 +899,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#equals(java.lang.Object[], java.lang.Object[]) + * java.util.Arrays#equals(java.lang.Object[], java.lang.Object[]) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "equals", - args = {java.lang.Object[].class, java.lang.Object[].class} - ) public void test_equals$Ljava_lang_Object$Ljava_lang_Object() { // Test for method boolean java.util.Arrays.equals(java.lang.Object [], // java.lang.Object []) @@ -1144,14 +917,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(byte[]) + * java.util.Arrays#sort(byte[]) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "sort", - args = {byte[].class} - ) public void test_sort$B() { // Test for method void java.util.Arrays.sort(byte []) byte[] reversedArray = new byte[arraySize]; @@ -1164,14 +931,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(byte[], int, int) + * java.util.Arrays#sort(byte[], int, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "sort", - args = {byte[].class, int.class, int.class} - ) public void test_sort$BII() { // Test for method void java.util.Arrays.sort(byte [], int, int) int startIndex = arraySize / 4; @@ -1221,14 +982,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(char[]) + * java.util.Arrays#sort(char[]) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "sort", - args = {char[].class} - ) public void test_sort$C() { // Test for method void java.util.Arrays.sort(char []) char[] reversedArray = new char[arraySize]; @@ -1242,14 +997,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(char[], int, int) + * java.util.Arrays#sort(char[], int, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "sort", - args = {char[].class, int.class, int.class} - ) public void test_sort$CII() { // Test for method void java.util.Arrays.sort(char [], int, int) int startIndex = arraySize / 4; @@ -1299,14 +1048,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(double[]) + * java.util.Arrays#sort(double[]) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "sort", - args = {double[].class} - ) public void test_sort$D() { // Test for method void java.util.Arrays.sort(double []) double[] reversedArray = new double[arraySize]; @@ -1343,14 +1086,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(double[], int, int) + * java.util.Arrays#sort(double[], int, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "sort", - args = {double[].class, int.class, int.class} - ) public void test_sort$DII() { // Test for method void java.util.Arrays.sort(double [], int, int) int startIndex = arraySize / 4; @@ -1400,14 +1137,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(float[]) + * java.util.Arrays#sort(float[]) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "sort", - args = {float[].class} - ) public void test_sort$F() { // Test for method void java.util.Arrays.sort(float []) float[] reversedArray = new float[arraySize]; @@ -1444,14 +1175,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(float[], int, int) + * java.util.Arrays#sort(float[], int, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "sort", - args = {float[].class, int.class, int.class} - ) public void test_sort$FII() { // Test for method void java.util.Arrays.sort(float [], int, int) int startIndex = arraySize / 4; @@ -1501,14 +1226,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(int[]) + * java.util.Arrays#sort(int[]) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "sort", - args = {int[].class} - ) public void test_sort$I() { // Test for method void java.util.Arrays.sort(int []) int[] reversedArray = new int[arraySize]; @@ -1521,14 +1240,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(int[], int, int) + * java.util.Arrays#sort(int[], int, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "sort", - args = {int[].class, int.class, int.class} - ) public void test_sort$III() { // Test for method void java.util.Arrays.sort(int [], int, int) int startIndex = arraySize / 4; @@ -1578,14 +1291,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(long[]) + * java.util.Arrays#sort(long[]) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "sort", - args = {long[].class} - ) public void test_sort$J() { // Test for method void java.util.Arrays.sort(long []) long[] reversedArray = new long[arraySize]; @@ -1599,14 +1306,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(long[], int, int) + * java.util.Arrays#sort(long[], int, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "sort", - args = {long[].class, int.class, int.class} - ) public void test_sort$JII() { // Test for method void java.util.Arrays.sort(long [], int, int) int startIndex = arraySize / 4; @@ -1656,14 +1357,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(java.lang.Object[]) + * java.util.Arrays#sort(java.lang.Object[]) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "sort", - args = {java.lang.Object[].class} - ) public void test_sort$Ljava_lang_Object() { // Test for method void java.util.Arrays.sort(java.lang.Object []) Object[] reversedArray = new Object[arraySize]; @@ -1686,14 +1381,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(java.lang.Object[], int, int) + * java.util.Arrays#sort(java.lang.Object[], int, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "sort", - args = {java.lang.Object[].class, int.class, int.class} - ) public void test_sort$Ljava_lang_ObjectII() { // Test for method void java.util.Arrays.sort(java.lang.Object [], int, // int) @@ -1758,15 +1447,9 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(java.lang.Object[], int, int, + * java.util.Arrays#sort(java.lang.Object[], int, int, * java.util.Comparator) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "sort", - args = {java.lang.Object[].class, int.class, int.class, java.util.Comparator.class} - ) public void test_sort$Ljava_lang_ObjectIILjava_util_Comparator() { // Test for method void java.util.Arrays.sort(java.lang.Object [], int, // int, java.util.Comparator) @@ -1822,14 +1505,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(java.lang.Object[], java.util.Comparator) + * java.util.Arrays#sort(java.lang.Object[], java.util.Comparator) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "sort", - args = {java.lang.Object[].class, java.util.Comparator.class} - ) public void test_sort$Ljava_lang_ObjectLjava_util_Comparator() { // Test for method void java.util.Arrays.sort(java.lang.Object [], // java.util.Comparator) @@ -1853,14 +1530,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(short[]) + * java.util.Arrays#sort(short[]) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "sort", - args = {short[].class} - ) public void test_sort$S() { // Test for method void java.util.Arrays.sort(short []) short[] reversedArray = new short[arraySize]; @@ -1873,14 +1544,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(short[], int, int) + * java.util.Arrays#sort(short[], int, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "sort", - args = {short[].class, int.class, int.class} - ) public void test_sort$SII() { // Test for method void java.util.Arrays.sort(short [], int, int) int startIndex = arraySize / 4; @@ -1930,14 +1595,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(byte[], int, int) + * java.util.Arrays#sort(byte[], int, int) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException.", - method = "sort", - args = {byte[].class, int.class, int.class} - ) public void test_java_util_Arrays_sort_byte_array_NPE() { byte[] byte_array_null = null; try { @@ -1956,14 +1615,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(char[], int, int) + * java.util.Arrays#sort(char[], int, int) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException.", - method = "sort", - args = {char[].class, int.class, int.class} - ) public void test_java_util_Arrays_sort_char_array_NPE() { char[] char_array_null = null; try { @@ -1982,14 +1635,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(double[], int, int) + * java.util.Arrays#sort(double[], int, int) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException.", - method = "sort", - args = {double[].class, int.class, int.class} - ) public void test_java_util_Arrays_sort_double_array_NPE() { double[] double_array_null = null; try { @@ -2008,14 +1655,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(float[], int, int) + * java.util.Arrays#sort(float[], int, int) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException.", - method = "sort", - args = {float[].class, int.class, int.class} - ) public void test_java_util_Arrays_sort_float_array_NPE() { float[] float_array_null = null; try { @@ -2034,14 +1675,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(int[], int, int) + * java.util.Arrays#sort(int[], int, int) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException.", - method = "sort", - args = {int[].class, int.class, int.class} - ) public void test_java_util_Arrays_sort_int_array_NPE() { int[] int_array_null = null; try { @@ -2060,14 +1695,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(Object[], int, int) + * java.util.Arrays#sort(Object[], int, int) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException.", - method = "sort", - args = {java.lang.Object[].class, int.class, int.class} - ) public void test_java_util_Arrays_sort_object_array_NPE() { Object[] object_array_null = null; try { @@ -2093,14 +1722,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(long[], int, int) + * java.util.Arrays#sort(long[], int, int) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException.", - method = "sort", - args = {long[].class, int.class, int.class} - ) public void test_java_util_Arrays_sort_long_array_NPE() { long[] long_array_null = null; try { @@ -2119,14 +1742,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#sort(short[], int, int) + * java.util.Arrays#sort(short[], int, int) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException.", - method = "sort", - args = {short[].class, int.class, int.class} - ) public void test_java_util_Arrays_sort_short_array_NPE() { short[] short_array_null = null; try { @@ -2148,13 +1765,8 @@ public class ArraysTest extends junit.framework.TestCase { private static final int[] LENGTHS = { 0, 1, 2, 3, 5, 8, 13, 21, 34, 55, 100, 1000, 10000 }; /** - * @tests java.util.Arrays#sort() + * java.util.Arrays#sort() */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Agressive test of the sort methods for *all* primitive array types", - method = "sort" - ) public void test_sort() { for (int len : LENGTHS) { PrimitiveTypeArrayBuilder.reset(); @@ -2588,14 +2200,8 @@ public class ArraysTest extends junit.framework.TestCase { /** - * @tests java.util.Arrays#deepEquals(Object[], Object[]) + * java.util.Arrays#deepEquals(Object[], Object[]) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "deepEquals", - args = {java.lang.Object[].class, java.lang.Object[].class} - ) public void test_deepEquals$Ljava_lang_ObjectLjava_lang_Object() { int [] a1 = {1, 2, 3}; short [] a2 = {0, 1}; @@ -2618,14 +2224,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#deepHashCode(Object[]) + * java.util.Arrays#deepHashCode(Object[]) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "deepHashCode", - args = {java.lang.Object[].class} - ) public void test_deepHashCode$Ljava_lang_Object() { int [] a1 = {1, 2, 3}; short [] a2 = {0, 1}; @@ -2645,14 +2245,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#hashCode(boolean[] a) + * java.util.Arrays#hashCode(boolean[] a) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hashCode", - args = {boolean[].class} - ) public void test_hashCode$LZ() { int listHashCode; int arrayHashCode; @@ -2668,14 +2262,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#hashCode(int[] a) + * java.util.Arrays#hashCode(int[] a) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hashCode", - args = {int[].class} - ) public void test_hashCode$LI() { int listHashCode; int arrayHashCode; @@ -2695,14 +2283,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#hashCode(char[] a) + * java.util.Arrays#hashCode(char[] a) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hashCode", - args = {char[].class} - ) public void test_hashCode$LC() { int listHashCode; int arrayHashCode; @@ -2718,14 +2300,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#hashCode(byte[] a) + * java.util.Arrays#hashCode(byte[] a) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hashCode", - args = {byte[].class} - ) public void test_hashCode$LB() { int listHashCode; int arrayHashCode; @@ -2741,14 +2317,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#hashCode(long[] a) + * java.util.Arrays#hashCode(long[] a) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hashCode", - args = {long[].class} - ) public void test_hashCode$LJ() { int listHashCode; int arrayHashCode; @@ -2765,14 +2335,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#hashCode(float[] a) + * java.util.Arrays#hashCode(float[] a) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hashCode", - args = {float[].class} - ) public void test_hashCode$LF() { int listHashCode; int arrayHashCode; @@ -2791,14 +2355,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#hashCode(double[] a) + * java.util.Arrays#hashCode(double[] a) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hashCode", - args = {double[].class} - ) public void test_hashCode$LD() { int listHashCode; int arrayHashCode; @@ -2814,14 +2372,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#hashCode(short[] a) + * java.util.Arrays#hashCode(short[] a) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hashCode", - args = {short[].class} - ) public void test_hashCode$LS() { int listHashCode; int arrayHashCode; @@ -2837,14 +2389,8 @@ public class ArraysTest extends junit.framework.TestCase { } /** - * @tests java.util.Arrays#hashCode(Object[] a) + * java.util.Arrays#hashCode(Object[] a) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hashCode", - args = {java.lang.Object[].class} - ) public void test_hashCode$Ljava_lang_Object() { int listHashCode; int arrayHashCode; diff --git a/luni/src/test/java/tests/api/java/util/BitSetTest.java b/luni/src/test/java/tests/api/java/util/BitSetTest.java index 6dcd738..6c910ad 100644 --- a/luni/src/test/java/tests/api/java/util/BitSetTest.java +++ b/luni/src/test/java/tests/api/java/util/BitSetTest.java @@ -17,27 +17,15 @@ package tests.api.java.util; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; - import java.util.BitSet; -@TestTargetClass(BitSet.class) public class BitSetTest extends junit.framework.TestCase { BitSet eightbs; /** - * @tests java.util.BitSet#BitSet() + * java.util.BitSet#BitSet() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "BitSet", - args = {} - ) public void test_Constructor() { // Test for method java.util.BitSet() BitSet bs = new BitSet(); @@ -49,14 +37,8 @@ public class BitSetTest extends junit.framework.TestCase { } /** - * @tests java.util.BitSet#BitSet(int) + * java.util.BitSet#BitSet(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "BitSet", - args = {int.class} - ) public void test_ConstructorI() { // Test for method java.util.BitSet(int) BitSet bs = new BitSet(128); @@ -81,14 +63,8 @@ public class BitSetTest extends junit.framework.TestCase { } /** - * @tests java.util.BitSet#clone() + * java.util.BitSet#clone() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "clone", - args = {} - ) public void test_clone() { // Test for method java.lang.Object java.util.BitSet.clone() BitSet bs; @@ -98,14 +74,8 @@ public class BitSetTest extends junit.framework.TestCase { } /** - * @tests java.util.BitSet#equals(java.lang.Object) + * java.util.BitSet#equals(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "equals", - args = {java.lang.Object.class} - ) public void test_equalsLjava_lang_Object() { // Test for method boolean java.util.BitSet.equals(java.lang.Object) BitSet bs; @@ -127,14 +97,8 @@ public class BitSetTest extends junit.framework.TestCase { } /** - * @tests java.util.BitSet#hashCode() + * java.util.BitSet#hashCode() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hashCode", - args = {} - ) public void test_hashCode() { // Test for method int java.util.BitSet.hashCode() BitSet bs = (BitSet) eightbs.clone(); @@ -149,14 +113,8 @@ public class BitSetTest extends junit.framework.TestCase { } /** - * @tests java.util.BitSet#clear() + * java.util.BitSet#clear() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "clear", - args = {} - ) public void test_clear() { eightbs.clear(); for (int i = 0; i < 8; i++) @@ -175,14 +133,8 @@ public class BitSetTest extends junit.framework.TestCase { } /** - * @tests java.util.BitSet#clear(int) + * java.util.BitSet#clear(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "clear", - args = {int.class} - ) public void test_clearI() { // Test for method void java.util.BitSet.clear(int) @@ -210,14 +162,8 @@ public class BitSetTest extends junit.framework.TestCase { } /** - * @tests java.util.BitSet#clear(int, int) + * java.util.BitSet#clear(int, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "clear", - args = {int.class, int.class} - ) public void test_clearII() { // Test for method void java.util.BitSet.clear(int, int) // pos1 and pos2 are in the same bitset element @@ -353,14 +299,8 @@ public class BitSetTest extends junit.framework.TestCase { } /** - * @tests java.util.BitSet#get(int) + * java.util.BitSet#get(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "get", - args = {int.class} - ) public void test_getI() { // Test for method boolean java.util.BitSet.get(int) @@ -387,14 +327,8 @@ public class BitSetTest extends junit.framework.TestCase { } /** - * @tests java.util.BitSet#get(int, int) + * java.util.BitSet#get(int, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "get", - args = {int.class, int.class} - ) public void test_getII() { // Test for method boolean java.util.BitSet.get(int, int) BitSet bs, resultbs, correctbs; @@ -519,14 +453,8 @@ public class BitSetTest extends junit.framework.TestCase { } /** - * @tests java.util.BitSet#set(int) + * java.util.BitSet#set(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "set", - args = {int.class} - ) public void test_setI() { // Test for method void java.util.BitSet.set(int) @@ -566,14 +494,8 @@ public class BitSetTest extends junit.framework.TestCase { } /** - * @tests java.util.BitSet#set(int, boolean) + * java.util.BitSet#set(int, boolean) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "set", - args = {int.class, boolean.class} - ) public void test_setIZ() { // Test for method void java.util.BitSet.set(int, boolean) eightbs.set(5, false); @@ -591,14 +513,8 @@ public class BitSetTest extends junit.framework.TestCase { } /** - * @tests java.util.BitSet#set(int, int) + * java.util.BitSet#set(int, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "set", - args = {int.class, int.class} - ) public void test_setII() { // Test for method void java.util.BitSet.set(int, int) // pos1 and pos2 are in the same bitset element @@ -709,14 +625,8 @@ public class BitSetTest extends junit.framework.TestCase { } /** - * @tests java.util.BitSet#set(int, int, boolean) + * java.util.BitSet#set(int, int, boolean) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "set", - args = {int.class, int.class, boolean.class} - ) public void test_setIIZ() { // Test for method void java.util.BitSet.set(int, int, boolean) eightbs.set(3, 6, false); @@ -750,14 +660,8 @@ public class BitSetTest extends junit.framework.TestCase { } /** - * @tests java.util.BitSet#flip(int) + * java.util.BitSet#flip(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "flip", - args = {int.class} - ) public void test_flipI() { // Test for method void java.util.BitSet.flip(int) BitSet bs = new BitSet(); @@ -829,14 +733,8 @@ public class BitSetTest extends junit.framework.TestCase { } /** - * @tests java.util.BitSet#flip(int, int) + * java.util.BitSet#flip(int, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "flip", - args = {int.class, int.class} - ) public void test_flipII() { // Test for method void java.util.BitSet.flip(int, int) // pos1 and pos2 are in the same bitset element @@ -961,38 +859,12 @@ public class BitSetTest extends junit.framework.TestCase { } /** - * @tests java.util.BitSet#set(int, int) - * @tests java.util.BitSet#cardinality() - * @tests java.util.BitSet#get(int) - * @tests java.util.BitSet#flip(int, int) - * @tests java.util.BitSet#clear(int,int) + * java.util.BitSet#set(int, int) + * java.util.BitSet#cardinality() + * java.util.BitSet#get(int) + * java.util.BitSet#flip(int, int) + * java.util.BitSet#clear(int,int) */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "flip", - args = {int.class, int.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "get", - args = {int.class, int.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "set", - args = {int.class, int.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "clear", - args = {int.class, int.class} - ) - }) public void test_111478() { // BitSet shouldn't be modified by any of the operations below, // since the affected bits for these methods are defined as inclusive of @@ -1016,14 +888,8 @@ public class BitSetTest extends junit.framework.TestCase { } /** - * @tests java.util.BitSet#intersects(java.util.BitSet) + * java.util.BitSet#intersects(java.util.BitSet) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "intersects", - args = {java.util.BitSet.class} - ) public void test_intersectsLjava_util_BitSet() { // Test for method boolean java.util.BitSet.intersects(java.util.BitSet) BitSet bs = new BitSet(500); @@ -1098,14 +964,8 @@ public class BitSetTest extends junit.framework.TestCase { } /** - * @tests java.util.BitSet#and(java.util.BitSet) + * java.util.BitSet#and(java.util.BitSet) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "and", - args = {java.util.BitSet.class} - ) public void test_andLjava_util_BitSet() { // Test for method void java.util.BitSet.and(java.util.BitSet) BitSet bs = new BitSet(128); @@ -1126,14 +986,8 @@ public class BitSetTest extends junit.framework.TestCase { } /** - * @tests java.util.BitSet#andNot(java.util.BitSet) + * java.util.BitSet#andNot(java.util.BitSet) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "andNot", - args = {java.util.BitSet.class} - ) public void test_andNotLjava_util_BitSet() { BitSet bs = (BitSet) eightbs.clone(); bs.clear(5); @@ -1150,14 +1004,8 @@ public class BitSetTest extends junit.framework.TestCase { } /** - * @tests java.util.BitSet#or(java.util.BitSet) + * java.util.BitSet#or(java.util.BitSet) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "or", - args = {java.util.BitSet.class} - ) public void test_orLjava_util_BitSet() { // Test for method void java.util.BitSet.or(java.util.BitSet) BitSet bs = new BitSet(128); @@ -1177,14 +1025,8 @@ public class BitSetTest extends junit.framework.TestCase { } /** - * @tests java.util.BitSet#xor(java.util.BitSet) + * java.util.BitSet#xor(java.util.BitSet) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "xor", - args = {java.util.BitSet.class} - ) public void test_xorLjava_util_BitSet() { // Test for method void java.util.BitSet.xor(java.util.BitSet) @@ -1208,14 +1050,8 @@ public class BitSetTest extends junit.framework.TestCase { } /** - * @tests java.util.BitSet#size() + * java.util.BitSet#size() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "size", - args = {} - ) public void test_size() { // Test for method int java.util.BitSet.size() assertEquals("Returned incorrect size", 64, eightbs.size()); @@ -1225,14 +1061,8 @@ public class BitSetTest extends junit.framework.TestCase { } /** - * @tests java.util.BitSet#toString() + * java.util.BitSet#toString() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {} - ) public void test_toString() { // Test for method java.lang.String java.util.BitSet.toString() assertEquals("Returned incorrect string representation", "{0, 1, 2, 3, 4, 5, 6, 7}", eightbs @@ -1243,14 +1073,8 @@ public class BitSetTest extends junit.framework.TestCase { } /** - * @tests java.util.BitSet#length() + * java.util.BitSet#length() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "length", - args = {} - ) public void test_length() { BitSet bs = new BitSet(); assertTrue("BitSet returned wrong length--wanted 0, got: " @@ -1270,14 +1094,8 @@ public class BitSetTest extends junit.framework.TestCase { } /** - * @tests java.util.BitSet#nextSetBit(int) + * java.util.BitSet#nextSetBit(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "nextSetBit", - args = {int.class} - ) public void test_nextSetBitI() { // Test for method int java.util.BitSet.nextSetBit() BitSet bs = new BitSet(500); @@ -1357,14 +1175,8 @@ public class BitSetTest extends junit.framework.TestCase { } /** - * @tests java.util.BitSet#nextClearBit(int) + * java.util.BitSet#nextClearBit(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "nextClearBit", - args = {int.class} - ) public void test_nextClearBitI() { // Test for method int java.util.BitSet.nextSetBit() BitSet bs = new BitSet(500); @@ -1454,14 +1266,8 @@ public class BitSetTest extends junit.framework.TestCase { } /** - * @tests java.util.BitSet#isEmpty() + * java.util.BitSet#isEmpty() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isEmpty", - args = {} - ) public void test_isEmpty() { BitSet bs = new BitSet(500); assertTrue("Test: isEmpty() returned wrong value", bs.isEmpty()); @@ -1496,14 +1302,8 @@ public class BitSetTest extends junit.framework.TestCase { } /** - * @tests java.util.BitSet#cardinality() + * java.util.BitSet#cardinality() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "cardinality", - args = {} - ) public void test_cardinality() { // test for method int java.util.BitSet.cardinality() BitSet bs = new BitSet(500); diff --git a/luni/src/test/java/tests/api/java/util/CalendarTest.java b/luni/src/test/java/tests/api/java/util/CalendarTest.java index bca091f..ce31216 100644 --- a/luni/src/test/java/tests/api/java/util/CalendarTest.java +++ b/luni/src/test/java/tests/api/java/util/CalendarTest.java @@ -34,7 +34,7 @@ public class CalendarTest extends junit.framework.TestCase { Locale defaultLocale; /** - * @tests java.util.Calendar#set(int, int) + * java.util.Calendar#set(int, int) */ public void test_setII() { // Test for correct result defined by the last set field @@ -394,7 +394,7 @@ public class CalendarTest extends junit.framework.TestCase { } /** - * @tests java.util.Calendar#setTime(java.util.Date) + * java.util.Calendar#setTime(java.util.Date) */ public void test_setTimeLjava_util_Date() { Calendar cal = Calendar.getInstance(); @@ -409,7 +409,7 @@ public class CalendarTest extends junit.framework.TestCase { } /** - * @tests java.util.Calendar#compareTo(Calendar) + * java.util.Calendar#compareTo(Calendar) */ public void test_compareToLjava_util_Calendar_null() { Calendar cal = Calendar.getInstance(); @@ -422,7 +422,7 @@ public class CalendarTest extends junit.framework.TestCase { } /** - * @tests java.util.Calendar#compareTo(Calendar) + * java.util.Calendar#compareTo(Calendar) */ public void test_compareToLjava_util_Calendar() { Calendar cal = Calendar.getInstance(); @@ -446,7 +446,7 @@ public class CalendarTest extends junit.framework.TestCase { } /** - * @tests java.util.Calendar#clone() + * java.util.Calendar#clone() */ public void test_clone() { // Regression for HARMONY-475 @@ -459,7 +459,7 @@ public class CalendarTest extends junit.framework.TestCase { } /** - * @tests java.util.Calendar#getTimeInMillis() + * java.util.Calendar#getTimeInMillis() */ public void test_getTimeInMillis() { Calendar cal = Calendar.getInstance(); @@ -483,8 +483,8 @@ public class CalendarTest extends junit.framework.TestCase { Locale.CHINA, Locale.CANADA, Locale.FRANCE }; /** - * @tests java.util.Calendar#before(Object) - * @tests java.util.Calendar#after(Object) + * java.util.Calendar#before(Object) + * java.util.Calendar#after(Object) */ public void test_before_after() { Calendar early = Calendar.getInstance(); @@ -563,8 +563,8 @@ public class CalendarTest extends junit.framework.TestCase { } /** - * @tests java.util.Calendar#clear() - * @tests java.util.Calendar#clear(int) + * java.util.Calendar#clear() + * java.util.Calendar#clear(int) */ public void test_clear() { Calendar calendar = Calendar.getInstance(); @@ -621,7 +621,7 @@ public class CalendarTest extends junit.framework.TestCase { } /** - * @tests java.util.Calendar#isSet(int) + * java.util.Calendar#isSet(int) */ public void test_isSet() { Calendar calendar = Calendar.getInstance(); @@ -632,7 +632,7 @@ public class CalendarTest extends junit.framework.TestCase { } /** - * @tests java.util.Calendar#getAvailableLocales() + * java.util.Calendar#getAvailableLocales() */ public void test_getAvailableLocales() { Locale[] locales = Calendar.getAvailableLocales(); @@ -648,8 +648,8 @@ public class CalendarTest extends junit.framework.TestCase { } /** - * @tests java.util.Calendar#getInstance(Locale) - * @tests java.util.Calendar#getInstance(TimeZone, Locale) + * java.util.Calendar#getInstance(Locale) + * java.util.Calendar#getInstance(TimeZone, Locale) */ public void test_getInstance() { // test getInstance(Locale) @@ -672,7 +672,7 @@ public class CalendarTest extends junit.framework.TestCase { } /** - * @tests java.util.Calendar#internalGet(int) + * java.util.Calendar#internalGet(int) */ public void test_internalGet() { MockGregorianCalendar c = new MockGregorianCalendar(); @@ -681,7 +681,7 @@ public class CalendarTest extends junit.framework.TestCase { } /** - * @tests java.util.Calendar#hashCode() + * java.util.Calendar#hashCode() */ public void test_hashcode() { Calendar calendar = Calendar.getInstance(Locale.JAPAN); @@ -689,7 +689,7 @@ public class CalendarTest extends junit.framework.TestCase { } /** - * @tests java.util.Calendar#roll(int, int) + * java.util.Calendar#roll(int, int) */ public void test_roll() { Calendar calendar = Calendar.getInstance(); @@ -715,7 +715,7 @@ public class CalendarTest extends junit.framework.TestCase { } /** - * @tests java.util.Calendar#toString() + * java.util.Calendar#toString() */ public void test_toString() { Calendar calendar = Calendar.getInstance(); @@ -728,7 +728,7 @@ public class CalendarTest extends junit.framework.TestCase { } /** - * @tests serialization/deserialization. + * serialization/deserialization. */ public void testSerializationSelf() throws Exception { Calendar calendar = Calendar.getInstance(); @@ -788,7 +788,7 @@ public class CalendarTest extends junit.framework.TestCase { } /** - * @tests {@link java.util.Calendar#getDisplayName(int, int, Locale)} + * {@link java.util.Calendar#getDisplayName(int, int, Locale)} * @since 1.6 */ public void test_getDisplayNameIILjava_util_Locale() { @@ -941,7 +941,7 @@ public class CalendarTest extends junit.framework.TestCase { } /** - * @tests {@link java.util.Calendar#getDisplayNames(int, int, Locale)} + * {@link java.util.Calendar#getDisplayNames(int, int, Locale)} * @since 1.6 */ public void test_getDisplayNamesIILjava_util_Locale() { @@ -1073,7 +1073,7 @@ public class CalendarTest extends junit.framework.TestCase { } /** - * @tests {@link java.util.Calendar#getActualMaximum(int)} + * {@link java.util.Calendar#getActualMaximum(int)} */ public void test_getActualMaximum_I() { Calendar c = new MockCalendar(); @@ -1081,7 +1081,7 @@ public class CalendarTest extends junit.framework.TestCase { } /** - * @tests {@link java.util.Calendar#getActualMinimum(int)} + * {@link java.util.Calendar#getActualMinimum(int)} */ public void test_getActualMinimum_I() { Calendar c = new MockCalendar(); diff --git a/luni/src/test/java/tests/api/java/util/CollectionsTest.java b/luni/src/test/java/tests/api/java/util/CollectionsTest.java index ad0d11e..c308cf9 100644 --- a/luni/src/test/java/tests/api/java/util/CollectionsTest.java +++ b/luni/src/test/java/tests/api/java/util/CollectionsTest.java @@ -17,11 +17,6 @@ package tests.api.java.util; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; - import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -49,7 +44,6 @@ import tests.support.Support_SetTest; import tests.support.Support_UnmodifiableCollectionTest; import tests.support.Support_UnmodifiableMapTest; -@TestTargetClass(Collections.class) public class CollectionsTest extends junit.framework.TestCase { private LinkedList ll; @@ -268,15 +262,9 @@ public class CollectionsTest extends junit.framework.TestCase { } /** - * @tests java.util.Collections#binarySearch(java.util.List, + * java.util.Collections#binarySearch(java.util.List, * java.lang.Object) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify ClassCastException.", - method = "binarySearch", - args = {java.util.List.class, java.lang.Object.class} - ) public void test_binarySearchLjava_util_ListLjava_lang_Object() { // Test for method int // java.util.Collections.binarySearch(java.util.List, java.lang.Object) @@ -296,15 +284,9 @@ public class CollectionsTest extends junit.framework.TestCase { } /** - * @tests java.util.Collections#binarySearch(java.util.List, + * java.util.Collections#binarySearch(java.util.List, * java.lang.Object, java.util.Comparator) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify ClassCastException.", - method = "binarySearch", - args = {java.util.List.class, java.lang.Object.class, java.util.Comparator.class} - ) public void test_binarySearchLjava_util_ListLjava_lang_ObjectLjava_util_Comparator() { // Test for method int // java.util.Collections.binarySearch(java.util.List, java.lang.Object, @@ -338,14 +320,8 @@ public class CollectionsTest extends junit.framework.TestCase { } /** - * @tests java.util.Collections#copy(java.util.List, java.util.List) + * java.util.Collections#copy(java.util.List, java.util.List) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "copy", - args = {java.util.List.class, java.util.List.class} - ) public void test_copyLjava_util_ListLjava_util_List() { // Test for method void java.util.Collections.copy(java.util.List, // java.util.List) @@ -414,14 +390,8 @@ public class CollectionsTest extends junit.framework.TestCase { } /** - * @tests java.util.Collections#copy(java.util.List, java.util.List) + * java.util.Collections#copy(java.util.List, java.util.List) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies IndexOutOfBoundsException. Doesn't verify UnsupportedOperationException.", - method = "copy", - args = {java.util.List.class, java.util.List.class} - ) public void test_copy_check_index() { ArrayList a1 = new ArrayList(); a1.add("one"); @@ -440,14 +410,8 @@ public class CollectionsTest extends junit.framework.TestCase { } /** - * @tests java.util.Collections#enumeration(java.util.Collection) + * java.util.Collections#enumeration(java.util.Collection) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "enumeration", - args = {java.util.Collection.class} - ) public void test_enumerationLjava_util_Collection() { // Test for method java.util.Enumeration // java.util.Collections.enumeration(java.util.Collection) @@ -463,14 +427,8 @@ public class CollectionsTest extends junit.framework.TestCase { } /** - * @tests java.util.Collections#fill(java.util.List, java.lang.Object) + * java.util.Collections#fill(java.util.List, java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "fill", - args = {java.util.List.class, java.lang.Object.class} - ) public void test_fillLjava_util_ListLjava_lang_Object() { // Test for method void java.util.Collections.fill(java.util.List, // java.lang.Object) @@ -506,14 +464,8 @@ public class CollectionsTest extends junit.framework.TestCase { } /** - * @tests java.util.Collections#max(java.util.Collection) + * java.util.Collections#max(java.util.Collection) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "max", - args = {java.util.Collection.class} - ) public void test_maxLjava_util_Collection() { // Test for method java.lang.Object // java.util.Collections.max(java.util.Collection) @@ -543,15 +495,9 @@ public class CollectionsTest extends junit.framework.TestCase { } /** - * @tests java.util.Collections#max(java.util.Collection, + * java.util.Collections#max(java.util.Collection, * java.util.Comparator) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "max", - args = {java.util.Collection.class, java.util.Comparator.class} - ) public void test_maxLjava_util_CollectionLjava_util_Comparator() { // Test for method java.lang.Object // java.util.Collections.max(java.util.Collection, java.util.Comparator) @@ -586,14 +532,8 @@ public class CollectionsTest extends junit.framework.TestCase { } /** - * @tests java.util.Collections#min(java.util.Collection) + * java.util.Collections#min(java.util.Collection) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "min", - args = {java.util.Collection.class} - ) public void test_minLjava_util_Collection() { // Test for method java.lang.Object // java.util.Collections.min(java.util.Collection) @@ -622,15 +562,9 @@ public class CollectionsTest extends junit.framework.TestCase { } /** - * @tests java.util.Collections#min(java.util.Collection, + * java.util.Collections#min(java.util.Collection, * java.util.Comparator) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "min", - args = {java.util.Collection.class, java.util.Comparator.class} - ) public void test_minLjava_util_CollectionLjava_util_Comparator() { // Test for method java.lang.Object // java.util.Collections.min(java.util.Collection, java.util.Comparator) @@ -666,14 +600,8 @@ public class CollectionsTest extends junit.framework.TestCase { } /** - * @tests java.util.Collections#nCopies(int, java.lang.Object) + * java.util.Collections#nCopies(int, java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "nCopies", - args = {int.class, java.lang.Object.class} - ) public void test_nCopiesILjava_lang_Object() { // Test for method java.util.List java.util.Collections.nCopies(int, // java.lang.Object) @@ -711,14 +639,8 @@ public class CollectionsTest extends junit.framework.TestCase { } /** - * @tests java.util.Collections#reverse(java.util.List) + * java.util.Collections#reverse(java.util.List) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "reverse", - args = {java.util.List.class} - ) public void test_reverseLjava_util_List() { // Test for method void java.util.Collections.reverse(java.util.List) try { @@ -757,14 +679,8 @@ public class CollectionsTest extends junit.framework.TestCase { } /** - * @tests java.util.Collections#reverseOrder() + * java.util.Collections#reverseOrder() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "reverseOrder", - args = {} - ) public void test_reverseOrder() { // Test for method java.util.Comparator // java.util.Collections.reverseOrder() @@ -779,14 +695,8 @@ public class CollectionsTest extends junit.framework.TestCase { } /** - * @tests java.util.Collections#shuffle(java.util.List) + * java.util.Collections#shuffle(java.util.List) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "shuffle", - args = {java.util.List.class} - ) public void test_shuffleLjava_util_List() { // Test for method void java.util.Collections.shuffle(java.util.List) // Assumes ll is sorted and has no duplicate keys and is large ( > 20 @@ -849,14 +759,8 @@ public class CollectionsTest extends junit.framework.TestCase { } /** - * @tests java.util.Collections#shuffle(java.util.List, java.util.Random) + * java.util.Collections#shuffle(java.util.List, java.util.Random) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "shuffle", - args = {java.util.List.class, java.util.Random.class} - ) public void test_shuffleLjava_util_ListLjava_util_Random() { // Test for method void java.util.Collections.shuffle(java.util.List, // java.util.Random) @@ -893,14 +797,8 @@ public class CollectionsTest extends junit.framework.TestCase { } /** - * @tests java.util.Collections#singleton(java.lang.Object) + * java.util.Collections#singleton(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "singleton", - args = {java.lang.Object.class} - ) public void test_singletonLjava_lang_Object() { // Test for method java.util.Set // java.util.Collections.singleton(java.lang.Object) @@ -923,14 +821,8 @@ public class CollectionsTest extends junit.framework.TestCase { } /** - * @tests java.util.Collections#sort(java.util.List) + * java.util.Collections#sort(java.util.List) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "sort", - args = {java.util.List.class} - ) public void test_sortLjava_util_List() { // Test for method void java.util.Collections.sort(java.util.List) // assumes no duplicate keys in ll @@ -983,14 +875,8 @@ public class CollectionsTest extends junit.framework.TestCase { } /** - * @tests java.util.Collections#sort(java.util.List, java.util.Comparator) + * java.util.Collections#sort(java.util.List, java.util.Comparator) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "sort", - args = {java.util.List.class, java.util.Comparator.class} - ) public void test_sortLjava_util_ListLjava_util_Comparator() { // Test for method void java.util.Collections.sort(java.util.List, // java.util.Comparator) @@ -1038,14 +924,8 @@ public class CollectionsTest extends junit.framework.TestCase { } /** - * @tests java.util.Collections#swap(java.util.List, int, int) + * java.util.Collections#swap(java.util.List, int, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "swap", - args = {java.util.List.class, int.class, int.class} - ) public void test_swapLjava_util_ListII() { // Test for method swap(java.util.List, int, int) @@ -1102,15 +982,9 @@ public class CollectionsTest extends junit.framework.TestCase { } /** - * @tests java.util.Collections#replaceAll(java.util.List, java.lang.Object, + * java.util.Collections#replaceAll(java.util.List, java.lang.Object, * java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "replaceAll", - args = {java.util.List.class, java.lang.Object.class, java.lang.Object.class} - ) public void test_replaceAllLjava_util_ListLjava_lang_ObjectLjava_lang_Object() { // Test for method replaceAll(java.util.List, java.lang.Object, // java.lang.Object) @@ -1208,14 +1082,8 @@ public class CollectionsTest extends junit.framework.TestCase { } /** - * @tests java.util.Collections#rotate(java.util.List, int) + * java.util.Collections#rotate(java.util.List, int) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies functionality, and UnsupportedOperationException.", - method = "rotate", - args = {java.util.List.class, int.class} - ) public void test_rotateLjava_util_ListI() { // Test for method rotate(java.util.List, int) @@ -1296,14 +1164,8 @@ public class CollectionsTest extends junit.framework.TestCase { } /** - * @tests java.util.Collections#rotate(java.util.List, int) + * java.util.Collections#rotate(java.util.List, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "rotate", - args = {java.util.List.class, int.class} - ) public void test_rotate2() { List list = new ArrayList(); try { @@ -1333,15 +1195,9 @@ public class CollectionsTest extends junit.framework.TestCase { } /** - * @tests java.util.Collections#indexOfSubList(java.util.List, + * java.util.Collections#indexOfSubList(java.util.List, * java.util.List) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies boundary conditions, and NullPointerException.", - method = "indexOfSubList", - args = {java.util.List.class, java.util.List.class} - ) public void test_indexOfSubListLjava_util_ListLjava_util_List() { // Test for method int indexOfSubList(java.util.List, java.util.List) List list = new ArrayList(); @@ -1371,15 +1227,9 @@ public class CollectionsTest extends junit.framework.TestCase { } /** - * @tests java.util.Collections#indexOfSubList(java.util.List, + * java.util.Collections#indexOfSubList(java.util.List, * java.util.List) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "indexOfSubList", - args = {java.util.List.class, java.util.List.class} - ) public void test_indexOfSubList2() { ArrayList sub = new ArrayList(); sub.add(new Integer(1)); @@ -1460,15 +1310,9 @@ public class CollectionsTest extends junit.framework.TestCase { } /** - * @tests java.util.Collections#lastIndexOfSubList(java.util.List, + * java.util.Collections#lastIndexOfSubList(java.util.List, * java.util.List) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException, and boundary conditions.", - method = "lastIndexOfSubList", - args = {java.util.List.class, java.util.List.class} - ) public void test_lastIndexOfSubListLjava_util_ListLjava_util_List() { // Test for method int lastIndexOfSubList(java.util.List, // java.util.List) @@ -1499,15 +1343,9 @@ public class CollectionsTest extends junit.framework.TestCase { } /** - * @tests java.util.Collections#lastIndexOfSubList(java.util.List, + * java.util.Collections#lastIndexOfSubList(java.util.List, * java.util.List) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "lastIndexOfSubList", - args = {java.util.List.class, java.util.List.class} - ) public void test_lastIndexOfSubList2() { ArrayList sub = new ArrayList(); sub.add(new Integer(1)); @@ -1578,14 +1416,8 @@ public class CollectionsTest extends junit.framework.TestCase { } /** - * @tests java.util.Collections#list(java.util.Enumeration) + * java.util.Collections#list(java.util.Enumeration) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "list", - args = {java.util.Enumeration.class} - ) public void test_listLjava_util_Enumeration() { // Test for method java.util.ArrayList list(java.util.Enumeration) @@ -1602,14 +1434,8 @@ public class CollectionsTest extends junit.framework.TestCase { } /** - * @tests java.util.Collections#synchronizedCollection(java.util.Collection) + * java.util.Collections#synchronizedCollection(java.util.Collection) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "synchronizedCollection", - args = {java.util.Collection.class} - ) public void test_synchronizedCollectionLjava_util_Collection() { // Test for method java.util.Collection // java.util.Collections.synchronizedCollection(java.util.Collection) @@ -1663,14 +1489,8 @@ public class CollectionsTest extends junit.framework.TestCase { } /** - * @tests java.util.Collections#synchronizedList(java.util.List) + * java.util.Collections#synchronizedList(java.util.List) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "synchronizedList", - args = {java.util.List.class} - ) public void test_synchronizedListLjava_util_List() { try { Collections.synchronizedList(null); @@ -1752,14 +1572,8 @@ public class CollectionsTest extends junit.framework.TestCase { } /** - * @tests java.util.Collections#synchronizedMap(java.util.Map) + * java.util.Collections#synchronizedMap(java.util.Map) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "synchronizedMap", - args = {java.util.Map.class} - ) public void test_synchronizedMapLjava_util_Map() { // Test for method java.util.Map // java.util.Collections.synchronizedMap(java.util.Map) @@ -1823,14 +1637,8 @@ public class CollectionsTest extends junit.framework.TestCase { } /** - * @tests java.util.Collections#synchronizedSet(java.util.Set) + * java.util.Collections#synchronizedSet(java.util.Set) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "synchronizedSet", - args = {java.util.Set.class} - ) public void test_synchronizedSetLjava_util_Set() { // Test for method java.util.Set // java.util.Collections.synchronizedSet(java.util.Set) @@ -1883,14 +1691,8 @@ public class CollectionsTest extends junit.framework.TestCase { } /** - * @tests java.util.Collections#synchronizedSortedMap(java.util.SortedMap) + * java.util.Collections#synchronizedSortedMap(java.util.SortedMap) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "synchronizedSortedMap", - args = {java.util.SortedMap.class} - ) public void test_synchronizedSortedMapLjava_util_SortedMap() { // Test for method java.util.SortedMap // java.util.Collections.synchronizedSortedMap(java.util.SortedMap) @@ -1946,14 +1748,8 @@ public class CollectionsTest extends junit.framework.TestCase { } /** - * @tests java.util.Collections#synchronizedSortedSet(java.util.SortedSet) + * java.util.Collections#synchronizedSortedSet(java.util.SortedSet) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "synchronizedSortedSet", - args = {java.util.SortedSet.class} - ) public void test_synchronizedSortedSetLjava_util_SortedSet() { // Test for method java.util.SortedSet // java.util.Collections.synchronizedSortedSet(java.util.SortedSet) @@ -1995,14 +1791,8 @@ public class CollectionsTest extends junit.framework.TestCase { } /** - * @tests java.util.Collections#unmodifiableCollection(java.util.Collection) + * java.util.Collections#unmodifiableCollection(java.util.Collection) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "unmodifiableCollection", - args = {java.util.Collection.class} - ) public void test_unmodifiableCollectionLjava_util_Collection() { // Test for method java.util.Collection // java.util.Collections.unmodifiableCollection(java.util.Collection) @@ -2047,14 +1837,8 @@ public class CollectionsTest extends junit.framework.TestCase { } /** - * @tests java.util.Collections#unmodifiableList(java.util.List) + * java.util.Collections#unmodifiableList(java.util.List) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "unmodifiableList", - args = {java.util.List.class} - ) public void test_unmodifiableListLjava_util_List() { // Test for method java.util.List // java.util.Collections.unmodifiableList(java.util.List) @@ -2126,14 +1910,8 @@ public class CollectionsTest extends junit.framework.TestCase { } /** - * @tests java.util.Collections#unmodifiableMap(java.util.Map) + * java.util.Collections#unmodifiableMap(java.util.Map) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "unmodifiableMap", - args = {java.util.Map.class} - ) public void test_unmodifiableMapLjava_util_Map() { // Test for method java.util.Map // java.util.Collections.unmodifiableMap(java.util.Map) @@ -2215,14 +1993,8 @@ public class CollectionsTest extends junit.framework.TestCase { } /** - * @tests java.util.Collections#unmodifiableSet(java.util.Set) + * java.util.Collections#unmodifiableSet(java.util.Set) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "unmodifiableSet", - args = {java.util.Set.class} - ) public void test_unmodifiableSetLjava_util_Set() { // Test for method java.util.Set // java.util.Collections.unmodifiableSet(java.util.Set) @@ -2262,14 +2034,8 @@ public class CollectionsTest extends junit.framework.TestCase { } /** - * @tests java.util.Collections#unmodifiableSortedMap(java.util.SortedMap) + * java.util.Collections#unmodifiableSortedMap(java.util.SortedMap) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "unmodifiableSortedMap", - args = {java.util.SortedMap.class} - ) public void test_unmodifiableSortedMapLjava_util_SortedMap() { // Test for method java.util.SortedMap // java.util.Collections.unmodifiableSortedMap(java.util.SortedMap) @@ -2304,14 +2070,8 @@ public class CollectionsTest extends junit.framework.TestCase { } /** - * @tests java.util.Collections#unmodifiableSortedSet(java.util.SortedSet) + * java.util.Collections#unmodifiableSortedSet(java.util.SortedSet) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "unmodifiableSortedSet", - args = {java.util.SortedSet.class} - ) public void test_unmodifiableSortedSetLjava_util_SortedSet() { // Test for method java.util.SortedSet // java.util.Collections.unmodifiableSortedSet(java.util.SortedSet) @@ -2344,26 +2104,6 @@ public class CollectionsTest extends junit.framework.TestCase { /** * Test unmodifiable objects toString methods */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "toString", - args = {} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "unmodifiableCollection", - args = {java.util.Collection.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "unmodifiableMap", - args = {java.util.Map.class} - ) - }) public void test_unmodifiable_toString_methods() { // Regression for HARMONY-552 ArrayList al = new ArrayList(); @@ -2380,12 +2120,6 @@ public class CollectionsTest extends junit.framework.TestCase { } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "singletonList", - args = {java.lang.Object.class} - ) public void test_singletonListLjava_lang_Object() { // Test for method java.util.Set // java.util.Collections.singleton(java.lang.Object) @@ -2406,12 +2140,6 @@ public class CollectionsTest extends junit.framework.TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "singletonMap", - args = {java.lang.Object.class, java.lang.Object.class} - ) public void test_singletonMapLjava_lang_Object() { // Test for method java.util.Set // java.util.Collections.singleton(java.lang.Object) diff --git a/luni/src/test/java/tests/api/java/util/ConcurrentModTest.java b/luni/src/test/java/tests/api/java/util/ConcurrentModTest.java index ae55c7c..3750e81 100644 --- a/luni/src/test/java/tests/api/java/util/ConcurrentModTest.java +++ b/luni/src/test/java/tests/api/java/util/ConcurrentModTest.java @@ -17,11 +17,6 @@ package tests.api.java.util; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; - import java.util.AbstractList; import java.util.ArrayList; import java.util.Collection; @@ -31,18 +26,11 @@ import java.util.Vector; import junit.framework.TestCase; -@TestTargetClass(AbstractList.class) public class ConcurrentModTest extends TestCase { /* * Test method for 'java.util.AbstractList.subList(int, int)' */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Doesn't verify IndexOutOfBoundsException.", - method = "get", - args = {int.class} - ) public void testGet() { AbstractList al = new ArrayList(); Double one = new Double(1.0); @@ -87,12 +75,6 @@ public class ConcurrentModTest extends TestCase { /* * Test method for 'java.util.AbstractList.subList(int, int)' */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify UnsupportedOperationException, ClassCastException, IllegalArgumentException, IndexOutOfBoundsException.", - method = "set", - args = {int.class, java.lang.Object.class} - ) public void testSet() { AbstractList al = new ArrayList(); Double one = new Double(1.0); @@ -123,12 +105,6 @@ public class ConcurrentModTest extends TestCase { /* * Test method for 'java.util.AbstractList.subList(int, int)' */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify UnsupportedOperationException, ClassCastException, IllegalArgumentException, IndexOutOfBoundsException.", - method = "add", - args = {java.lang.Object.class} - ) public void testAdd() { AbstractList al = new ArrayList(); Double one = new Double(1.0); @@ -159,12 +135,6 @@ public class ConcurrentModTest extends TestCase { /* * Test method for 'java.util.AbstractList.subList(int, int)' */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "remove", - args = {int.class} - ) public void testRemove() { AbstractList al = new ArrayList(); Double one = new Double(1.0); @@ -231,12 +201,6 @@ public class ConcurrentModTest extends TestCase { /* * Test method for 'java.util.AbstractList.subList(int, int)' */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify UnsupportedOperationException, ClassCastException, IllegalArgumentException, NullPointerException.", - method = "addAll", - args = {int.class, java.util.Collection.class} - ) public void testAddAll() { AbstractList al = new ArrayList(); Double one = new Double(1.0); @@ -267,12 +231,6 @@ public class ConcurrentModTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Class is abstract - test testing simplest implementation.", - method = "add", - args = {java.lang.Object.class} - ) public void test_addLjava_lang_Object() { AbstractList abstr = new AbstractList() { @@ -348,20 +306,6 @@ public class ConcurrentModTest extends TestCase { } } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "add", - args = {int.class, java.lang.Object.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "AbstractList", - args = {} - ) - }) public void test_addILjava_lang_Object() { AbstractList abstr = new AbstractList() { @@ -456,12 +400,6 @@ public class ConcurrentModTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "addAll", - args = {int.class, java.util.Collection.class} - ) public void test_addAllILjava_util_Collection() { Collection c = new Vector(); c.add(new Double(33)); @@ -571,12 +509,6 @@ public class ConcurrentModTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "clear", - args = {} - ) public void test_clear() { AbstractList abstr = new ArrayList(); @@ -590,12 +522,6 @@ public class ConcurrentModTest extends TestCase { assertEquals(0, abstr.size()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "equals", - args = {java.lang.Object.class} - ) public void test_equalsLjava_lang_Object() { Collection c = new Vector(); c.add(new Double(33)); @@ -614,12 +540,6 @@ public class ConcurrentModTest extends TestCase { assertTrue(abstr.equals(abstr1)); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "set", - args = {int.class, java.lang.Object.class} - ) public void test_setILjava_lang_Object() { Collection c = new Vector(); c.add(new Double(33)); @@ -729,12 +649,6 @@ public class ConcurrentModTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "removeRange", - args = {int.class, int.class} - ) public void test_removeRangeII() { Mock_ArrayList al1 = new Mock_ArrayList(); al1.add(1); diff --git a/luni/src/test/java/tests/api/java/util/ConcurrentModificationExceptionTest.java b/luni/src/test/java/tests/api/java/util/ConcurrentModificationExceptionTest.java index 1a655d4..0cd4076 100644 --- a/luni/src/test/java/tests/api/java/util/ConcurrentModificationExceptionTest.java +++ b/luni/src/test/java/tests/api/java/util/ConcurrentModificationExceptionTest.java @@ -17,17 +17,11 @@ package tests.api.java.util; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; - import java.util.Collection; import java.util.ConcurrentModificationException; import java.util.Iterator; import java.util.LinkedList; -@TestTargetClass(ConcurrentModificationException.class) public class ConcurrentModificationExceptionTest extends junit.framework.TestCase { @@ -54,14 +48,8 @@ public class ConcurrentModificationExceptionTest extends } /** - * @tests java.util.ConcurrentModificationException#ConcurrentModificationException() + * java.util.ConcurrentModificationException#ConcurrentModificationException() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "ConcurrentModificationException", - args = {} - ) public void test_Constructor() { // Test for method java.util.ConcurrentModificationException() Collection myCollection = new LinkedList(); @@ -85,14 +73,8 @@ public class ConcurrentModificationExceptionTest extends } /** - * @tests java.util.ConcurrentModificationException#ConcurrentModificationException(java.lang.String) + * java.util.ConcurrentModificationException#ConcurrentModificationException(java.lang.String) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "ConcurrentModificationException", - args = {java.lang.String.class} - ) public void test_ConstructorLjava_lang_String() { // Test for method // java.util.ConcurrentModificationException(java.lang.String) diff --git a/luni/src/test/java/tests/api/java/util/CurrencyTest.java b/luni/src/test/java/tests/api/java/util/CurrencyTest.java index 7d7069f..9e9ca66 100644 --- a/luni/src/test/java/tests/api/java/util/CurrencyTest.java +++ b/luni/src/test/java/tests/api/java/util/CurrencyTest.java @@ -18,9 +18,6 @@ package tests.api.java.util; import tests.support.Support_Locale; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; import dalvik.annotation.AndroidOnly; import java.util.Arrays; @@ -29,33 +26,20 @@ import java.util.Currency; import java.util.Iterator; import java.util.Locale; -@TestTargetClass(Currency.class) public class CurrencyTest extends junit.framework.TestCase { private static Locale defaultLocale = Locale.getDefault(); /** - * @tests java.util.Currency#getInstance(java.lang.String) + * java.util.Currency#getInstance(java.lang.String) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "getInstance(String) method is tested in test_getInstanceLjava_util_Locale() test.", - method = "getInstance", - args = {java.lang.String.class} - ) public void test_getInstanceLjava_lang_String() { // see test_getInstanceLjava_util_Locale() tests } /** - * @tests java.util.Currency#getInstance(java.util.Locale) + * java.util.Currency#getInstance(java.util.Locale) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getInstance", - args = {java.util.Locale.class} - ) public void test_getInstanceLjava_util_Locale() { /* * the behaviour in all these three cases should be the same since this @@ -139,14 +123,8 @@ public class CurrencyTest extends junit.framework.TestCase { } /** - * @tests java.util.Currency#getSymbol() + * java.util.Currency#getSymbol() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSymbol", - args = {} - ) @AndroidOnly("icu and the RI have different data. Because Android" + "only defines a few locales as a must have, it was not possible" + "to find a set of combinations where no differences between" @@ -185,14 +163,8 @@ public class CurrencyTest extends junit.framework.TestCase { } /** - * @tests java.util.Currency#getSymbol(java.util.Locale) + * java.util.Currency#getSymbol(java.util.Locale) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSymbol", - args = {java.util.Locale.class} - ) @AndroidOnly("specification doesn't include strong requirements for returnig symbol. On android platform used wrong character for yen sign: \u00a5 instead of \uffe5. Both of them give correct image though") public void test_getSymbolLjava_util_Locale() { //Tests was simplified because java specification not @@ -321,14 +293,8 @@ public class CurrencyTest extends junit.framework.TestCase { } /** - * @tests java.util.Currency#getDefaultFractionDigits() + * java.util.Currency#getDefaultFractionDigits() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getDefaultFractionDigits", - args = {} - ) public void test_getDefaultFractionDigits() { Currency c1 = Currency.getInstance("TND"); @@ -357,17 +323,11 @@ public class CurrencyTest extends junit.framework.TestCase { } /** - * @tests java.util.Currency#getCurrencyCode() Note: lines under remarks + * java.util.Currency#getCurrencyCode() Note: lines under remarks * (Locale.CHINESE, Locale.ENGLISH, Locale.FRENCH, Locale.GERMAN, * Locale.ITALIAN, Locale.JAPANESE, Locale.KOREAN) raises exception * on SUN VM */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getCurrencyCode", - args = {} - ) public void test_getCurrencyCode() { final Collection<Locale> locVal = Arrays.asList( Locale.CANADA, @@ -398,17 +358,11 @@ public class CurrencyTest extends junit.framework.TestCase { } /** - * @tests java.util.Currency#toString() Note: lines under remarks + * java.util.Currency#toString() Note: lines under remarks * (Locale.CHINESE, Locale.ENGLISH, Locale.FRENCH, Locale.GERMAN, * Locale.ITALIAN, Locale.JAPANESE, Locale.KOREAN) raises exception * on SUN VM */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {} - ) public void test_toString() { final Collection<Locale> locVal = Arrays.asList( Locale.CANADA, diff --git a/luni/src/test/java/tests/api/java/util/DateTest.java b/luni/src/test/java/tests/api/java/util/DateTest.java index a6e7718..6100527 100644 --- a/luni/src/test/java/tests/api/java/util/DateTest.java +++ b/luni/src/test/java/tests/api/java/util/DateTest.java @@ -17,29 +17,17 @@ package tests.api.java.util; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; - import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; import java.util.Locale; import java.util.TimeZone; -@TestTargetClass(Date.class) public class DateTest extends junit.framework.TestCase { /** - * @tests java.util.Date#Date() + * java.util.Date#Date() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "Date", - args = {} - ) public void test_Constructor() { // Test for method java.util.Date() GregorianCalendar gc = new GregorianCalendar(1998, Calendar.OCTOBER, @@ -51,14 +39,8 @@ public class DateTest extends junit.framework.TestCase { } /** - * @tests java.util.Date#Date(int, int, int) + * java.util.Date#Date(int, int, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "Date", - args = {int.class, int.class, int.class} - ) public void test_ConstructorIII() { // Test for method java.util.Date(int, int, int) Date d1 = new Date(70, 0, 1); // the epoch + local time @@ -74,14 +56,8 @@ public class DateTest extends junit.framework.TestCase { } /** - * @tests java.util.Date#Date(int, int, int, int, int) + * java.util.Date#Date(int, int, int, int, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "Date", - args = {int.class, int.class, int.class, int.class, int.class} - ) public void test_ConstructorIIIII() { // Test for method java.util.Date(int, int, int, int, int) @@ -96,14 +72,8 @@ public class DateTest extends junit.framework.TestCase { } /** - * @tests java.util.Date#Date(int, int, int, int, int, int) + * java.util.Date#Date(int, int, int, int, int, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "Date", - args = {int.class, int.class, int.class, int.class, int.class, int.class} - ) public void test_ConstructorIIIIII() { // Test for method java.util.Date(int, int, int, int, int, int) @@ -118,28 +88,16 @@ public class DateTest extends junit.framework.TestCase { } /** - * @tests java.util.Date#Date(long) + * java.util.Date#Date(long) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "Date", - args = {long.class} - ) public void test_ConstructorJ() { // Test for method java.util.Date(long) assertTrue("Used to test", true); } /** - * @tests java.util.Date#Date(java.lang.String) + * java.util.Date#Date(java.lang.String) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "Date", - args = {java.lang.String.class} - ) public void test_ConstructorLjava_lang_String() { // Test for method java.util.Date(java.lang.String) Date d1 = new Date("January 1, 1970, 00:00:00 GMT"); // the epoch @@ -157,14 +115,8 @@ public class DateTest extends junit.framework.TestCase { } /** - * @tests java.util.Date#after(java.util.Date) + * java.util.Date#after(java.util.Date) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "after", - args = {java.util.Date.class} - ) public void test_afterLjava_util_Date() { // Test for method boolean java.util.Date.after(java.util.Date) Date d1 = new Date(0); @@ -181,14 +133,8 @@ public class DateTest extends junit.framework.TestCase { } /** - * @tests java.util.Date#before(java.util.Date) + * java.util.Date#before(java.util.Date) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "before", - args = {java.util.Date.class} - ) public void test_beforeLjava_util_Date() { // Test for method boolean java.util.Date.before(java.util.Date) Date d1 = new Date(0); @@ -205,14 +151,8 @@ public class DateTest extends junit.framework.TestCase { } /** - * @tests java.util.Date#clone() + * java.util.Date#clone() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "clone", - args = {} - ) public void test_clone() { // Test for method java.lang.Object java.util.Date.clone() Date d1 = new Date(100000); @@ -224,14 +164,8 @@ public class DateTest extends junit.framework.TestCase { } /** - * @tests java.util.Date#compareTo(java.util.Date) + * java.util.Date#compareTo(java.util.Date) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "compareTo", - args = {java.util.Date.class} - ) public void test_compareToLjava_util_Date() { // Test for method int java.util.Date.compareTo(java.util.Date) final int someNumber = 10000; @@ -257,14 +191,8 @@ public class DateTest extends junit.framework.TestCase { } /** - * @tests java.util.Date#equals(java.lang.Object) + * java.util.Date#equals(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "equals", - args = {java.lang.Object.class} - ) public void test_equalsLjava_lang_Object() { // Test for method boolean java.util.Date.equals(java.lang.Object) Date d1 = new Date(0); @@ -275,14 +203,8 @@ public class DateTest extends junit.framework.TestCase { } /** - * @tests java.util.Date#getDate() + * java.util.Date#getDate() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getDate", - args = {} - ) public void test_getDate() { // Test for method int java.util.Date.getDate() Date d = new GregorianCalendar(1998, Calendar.OCTOBER, 13, 19, 9) @@ -291,14 +213,8 @@ public class DateTest extends junit.framework.TestCase { } /** - * @tests java.util.Date#getDay() + * java.util.Date#getDay() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getDay", - args = {} - ) public void test_getDay() { // Test for method int java.util.Date.getDay() Date d = new GregorianCalendar(1998, Calendar.OCTOBER, 13, 19, 9) @@ -307,14 +223,8 @@ public class DateTest extends junit.framework.TestCase { } /** - * @tests java.util.Date#getHours() + * java.util.Date#getHours() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getHours", - args = {} - ) public void test_getHours() { // Test for method int java.util.Date.getHours() Date d = new GregorianCalendar(1998, Calendar.OCTOBER, 13, 19, 9) @@ -323,14 +233,8 @@ public class DateTest extends junit.framework.TestCase { } /** - * @tests java.util.Date#getMinutes() + * java.util.Date#getMinutes() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getMinutes", - args = {} - ) public void test_getMinutes() { // Test for method int java.util.Date.getMinutes() Date d = new GregorianCalendar(1998, Calendar.OCTOBER, 13, 19, 9) @@ -339,14 +243,8 @@ public class DateTest extends junit.framework.TestCase { } /** - * @tests java.util.Date#getMonth() + * java.util.Date#getMonth() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getMonth", - args = {} - ) public void test_getMonth() { // Test for method int java.util.Date.getMonth() Date d = new GregorianCalendar(1998, Calendar.OCTOBER, 13, 19, 9) @@ -355,14 +253,8 @@ public class DateTest extends junit.framework.TestCase { } /** - * @tests java.util.Date#getSeconds() + * java.util.Date#getSeconds() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSeconds", - args = {} - ) public void test_getSeconds() { // Test for method int java.util.Date.getSeconds() Date d = new GregorianCalendar(1998, Calendar.OCTOBER, 13, 19, 9) @@ -371,14 +263,8 @@ public class DateTest extends junit.framework.TestCase { } /** - * @tests java.util.Date#getTime() + * java.util.Date#getTime() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getTime", - args = {} - ) public void test_getTime() { // Test for method long java.util.Date.getTime() Date d1 = new Date(0); @@ -388,14 +274,8 @@ public class DateTest extends junit.framework.TestCase { } /** - * @tests java.util.Date#getTimezoneOffset() + * java.util.Date#getTimezoneOffset() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getTimezoneOffset", - args = {} - ) public void test_getTimezoneOffset() { // Test for method int java.util.Date.getTimezoneOffset() assertTrue("Used to test", true); @@ -404,14 +284,8 @@ public class DateTest extends junit.framework.TestCase { } /** - * @tests java.util.Date#getYear() + * java.util.Date#getYear() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getYear", - args = {} - ) public void test_getYear() { // Test for method int java.util.Date.getYear() Date d = new GregorianCalendar(1998, Calendar.OCTOBER, 13, 19, 9) @@ -420,14 +294,8 @@ public class DateTest extends junit.framework.TestCase { } /** - * @tests java.util.Date#hashCode() + * java.util.Date#hashCode() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hashCode", - args = {} - ) public void test_hashCode() { // Test for method int java.util.Date.hashCode() Date d1 = new Date(0); @@ -437,14 +305,8 @@ public class DateTest extends junit.framework.TestCase { } /** - * @tests java.util.Date#parse(java.lang.String) + * java.util.Date#parse(java.lang.String) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "parse", - args = {java.lang.String.class} - ) public void test_parseLjava_lang_String() { // Test for method long java.util.Date.parse(java.lang.String) Date d = new Date(Date.parse("13 October 1998")); @@ -486,14 +348,8 @@ public class DateTest extends junit.framework.TestCase { } /** - * @tests java.util.Date#setDate(int) + * java.util.Date#setDate(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setDate", - args = {int.class} - ) public void test_setDateI() { // Test for method void java.util.Date.setDate(int) Date d = new GregorianCalendar(1998, Calendar.OCTOBER, 13, 19, 9) @@ -503,14 +359,8 @@ public class DateTest extends junit.framework.TestCase { } /** - * @tests java.util.Date#setHours(int) + * java.util.Date#setHours(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setHours", - args = {int.class} - ) public void test_setHoursI() { // Test for method void java.util.Date.setHours(int) Date d = new GregorianCalendar(1998, Calendar.OCTOBER, 13, 19, 9) @@ -520,14 +370,8 @@ public class DateTest extends junit.framework.TestCase { } /** - * @tests java.util.Date#setMinutes(int) + * java.util.Date#setMinutes(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setMinutes", - args = {int.class} - ) public void test_setMinutesI() { // Test for method void java.util.Date.setMinutes(int) Date d = new GregorianCalendar(1998, Calendar.OCTOBER, 13, 19, 9) @@ -537,14 +381,8 @@ public class DateTest extends junit.framework.TestCase { } /** - * @tests java.util.Date#setMonth(int) + * java.util.Date#setMonth(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setMonth", - args = {int.class} - ) public void test_setMonthI() { // Test for method void java.util.Date.setMonth(int) Date d = new GregorianCalendar(1998, Calendar.OCTOBER, 13, 19, 9) @@ -554,14 +392,8 @@ public class DateTest extends junit.framework.TestCase { } /** - * @tests java.util.Date#setSeconds(int) + * java.util.Date#setSeconds(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setSeconds", - args = {int.class} - ) public void test_setSecondsI() { // Test for method void java.util.Date.setSeconds(int) Date d = new GregorianCalendar(1998, Calendar.OCTOBER, 13, 19, 9) @@ -571,14 +403,8 @@ public class DateTest extends junit.framework.TestCase { } /** - * @tests java.util.Date#setTime(long) + * java.util.Date#setTime(long) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setTime", - args = {long.class} - ) public void test_setTimeJ() { // Test for method void java.util.Date.setTime(long) Date d1 = new Date(0); @@ -590,14 +416,8 @@ public class DateTest extends junit.framework.TestCase { } /** - * @tests java.util.Date#setYear(int) + * java.util.Date#setYear(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setYear", - args = {int.class} - ) public void test_setYearI() { // Test for method void java.util.Date.setYear(int) Date d = new GregorianCalendar(1998, Calendar.OCTOBER, 13, 19, 9) @@ -607,14 +427,8 @@ public class DateTest extends junit.framework.TestCase { } /** - * @tests java.util.Date#toGMTString() + * java.util.Date#toGMTString() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toGMTString", - args = {} - ) public void test_toGMTString() { // Test for method java.lang.String java.util.Date.toGMTString() assertEquals("Did not convert epoch to GMT string correctly", "1 Jan 1970 00:00:00 GMT", new Date(0) @@ -625,14 +439,8 @@ public class DateTest extends junit.framework.TestCase { } /** - * @tests java.util.Date#toString() + * java.util.Date#toString() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {} - ) public void test_toString() { // Test for method java.lang.String java.util.Date.toString() Calendar cal = Calendar.getInstance(); @@ -660,14 +468,8 @@ public class DateTest extends junit.framework.TestCase { } /** - * @tests java.util.Date#UTC(int, int, int, int, int, int) + * java.util.Date#UTC(int, int, int, int, int, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "UTC", - args = {int.class, int.class, int.class, int.class, int.class, int.class} - ) public void test_UTCIIIIII() { // Test for method long java.util.Date.UTC(int, int, int, int, int, int) assertTrue("Returned incorrect UTC value for epoch", Date.UTC(70, 0, 1, @@ -676,15 +478,9 @@ public class DateTest extends junit.framework.TestCase { 0, 1, 0, 0, 0) == (long) 365 * 24 * 60 * 60 * 1000); } /** - * @tests java.util.Date#toLocaleString() Test for method java.lang.String + * java.util.Date#toLocaleString() Test for method java.lang.String * java.util.Date.toGMTString() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toLocaleString", - args = {} - ) public void test_toLocaleString() { Locale loc = Locale.getDefault(); Locale.setDefault(Locale.US); diff --git a/luni/src/test/java/tests/api/java/util/EmptyStackExceptionTest.java b/luni/src/test/java/tests/api/java/util/EmptyStackExceptionTest.java index 9f8b3bd..31ee1e2 100644 --- a/luni/src/test/java/tests/api/java/util/EmptyStackExceptionTest.java +++ b/luni/src/test/java/tests/api/java/util/EmptyStackExceptionTest.java @@ -17,29 +17,17 @@ package tests.api.java.util; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; - import java.util.EmptyStackException; import java.util.Stack; -@TestTargetClass(EmptyStackException.class) public class EmptyStackExceptionTest extends junit.framework.TestCase { Object[] objArray = new Object[10]; Stack s; /** - * @tests java.util.EmptyStackException#EmptyStackException() + * java.util.EmptyStackException#EmptyStackException() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "EmptyStackException", - args = {} - ) public void test_Constructor() { // Test for method java.util.EmptyStackException() try { diff --git a/luni/src/test/java/tests/api/java/util/EnumMapTest.java b/luni/src/test/java/tests/api/java/util/EnumMapTest.java index 27ad10d..05826d1 100644 --- a/luni/src/test/java/tests/api/java/util/EnumMapTest.java +++ b/luni/src/test/java/tests/api/java/util/EnumMapTest.java @@ -16,10 +16,6 @@ package tests.api.java.util; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; import dalvik.annotation.AndroidOnly; import java.util.ArrayList; @@ -35,7 +31,6 @@ import org.apache.harmony.testframework.serialization.SerializationTest; import junit.framework.TestCase; -@TestTargetClass(EnumMap.class) public class EnumMapTest extends TestCase { enum Size { Small, Middle, Big {}; @@ -81,14 +76,8 @@ public class EnumMapTest extends TestCase { } /** - * @tests java.util.EnumMap#EnumMap(Class) + * java.util.EnumMap#EnumMap(Class) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "EnumMap", - args = {java.lang.Class.class} - ) @SuppressWarnings({ "unchecked", "boxing" }) public void test_ConstructorLjava_lang_Class() { try { @@ -153,14 +142,8 @@ public class EnumMapTest extends TestCase { } /** - * @tests java.util.EnumMap#EnumMap(EnumMap) + * java.util.EnumMap#EnumMap(EnumMap) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "EnumMap", - args = {java.util.EnumMap.class} - ) @SuppressWarnings({ "unchecked", "boxing" }) public void test_ConstructorLjava_util_EnumMap() { EnumMap enumMap; @@ -193,14 +176,8 @@ public class EnumMapTest extends TestCase { } /** - * @tests java.util.EnumMap#EnumMap(Map) + * java.util.EnumMap#EnumMap(Map) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "EnumMap", - args = {java.util.Map.class} - ) @SuppressWarnings({ "unchecked", "boxing" }) public void test_ConstructorLjava_util_Map() { EnumMap enumMap; @@ -257,14 +234,8 @@ public class EnumMapTest extends TestCase { } /** - * @tests java.util.EnumMap#clear() + * java.util.EnumMap#clear() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "clear", - args = {} - ) @SuppressWarnings({ "unchecked", "boxing" }) public void test_clear() { EnumMap enumSizeMap = new EnumMap(Size.class); @@ -274,14 +245,8 @@ public class EnumMapTest extends TestCase { } /** - * @tests java.util.EnumMap#containsKey(Object) + * java.util.EnumMap#containsKey(Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "containsKey", - args = {java.lang.Object.class} - ) @SuppressWarnings( { "unchecked", "boxing" }) public void test_containsKeyLjava_lang_Object() { EnumMap enumSizeMap = new EnumMap(Size.class); @@ -304,14 +269,8 @@ public class EnumMapTest extends TestCase { } /** - * @tests java.util.EnumMap#clone() + * java.util.EnumMap#clone() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "clone", - args = {} - ) @SuppressWarnings( { "unchecked", "boxing" }) public void test_clone() { EnumMap enumSizeMap = new EnumMap(Size.class); @@ -332,14 +291,8 @@ public class EnumMapTest extends TestCase { } /** - * @tests java.util.EnumMap#containsValue(Object) + * java.util.EnumMap#containsValue(Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "containsValue", - args = {java.lang.Object.class} - ) @SuppressWarnings( { "unchecked", "boxing" }) public void test_containsValueLjava_lang_Object() { EnumMap enumSizeMap = new EnumMap(Size.class); @@ -367,14 +320,8 @@ public class EnumMapTest extends TestCase { } /** - * @tests java.util.EnumMap#entrySet() + * java.util.EnumMap#entrySet() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "entrySet", - args = {} - ) @AndroidOnly("Map.Entry is indirectly modified on RI when Iterator.next() is invoked") @SuppressWarnings({ "unchecked", "boxing" }) public void test_entrySet() { @@ -603,14 +550,8 @@ public class EnumMapTest extends TestCase { } /** - * @tests java.util.EnumMap#equals(Object) + * java.util.EnumMap#equals(Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "equals", - args = {java.lang.Object.class} - ) @SuppressWarnings( { "unchecked", "boxing" }) public void test_equalsLjava_lang_Object() { EnumMap enumMap = new EnumMap(Size.class); @@ -649,14 +590,8 @@ public class EnumMapTest extends TestCase { } /** - * @tests java.util.EnumMap#keySet() + * java.util.EnumMap#keySet() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "keySet", - args = {} - ) @SuppressWarnings( { "unchecked", "boxing" }) public void test_keySet() { EnumMap enumSizeMap = new EnumMap(Size.class); @@ -812,14 +747,8 @@ public class EnumMapTest extends TestCase { } /** - * @tests java.util.EnumMap#get(Object) + * java.util.EnumMap#get(Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "get", - args = {java.lang.Object.class} - ) @SuppressWarnings({ "unchecked", "boxing" }) public void test_getLjava_lang_Object() { EnumMap enumSizeMap = new EnumMap(Size.class); @@ -862,14 +791,8 @@ public class EnumMapTest extends TestCase { } /** - * @tests java.util.EnumMap#put(Object,Object) + * java.util.EnumMap#put(Object,Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "put", - args = {Enum.class, java.lang.Object.class} - ) public void test_putLjava_lang_ObjectLjava_lang_Object() { EnumMap enumSizeMap = new EnumMap(Size.class); try { @@ -912,14 +835,8 @@ public class EnumMapTest extends TestCase { } /** - * @tests java.util.EnumMap#putAll(Map) + * java.util.EnumMap#putAll(Map) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "putAll", - args = {java.util.Map.class} - ) @SuppressWarnings({ "unchecked", "boxing" }) public void test_putAllLjava_util_Map() { EnumMap enumColorMap = new EnumMap<Color, Double>(Color.class); @@ -985,14 +902,8 @@ public class EnumMapTest extends TestCase { } /** - * @tests java.util.EnumMap#remove(Object) + * java.util.EnumMap#remove(Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "remove", - args = {java.lang.Object.class} - ) @SuppressWarnings({ "unchecked", "boxing" }) public void test_removeLjava_lang_Object() { EnumMap enumSizeMap = new EnumMap(Size.class); @@ -1032,14 +943,8 @@ public class EnumMapTest extends TestCase { } /** - * @tests java.util.EnumMap#size() + * java.util.EnumMap#size() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "size", - args = {} - ) @SuppressWarnings({ "unchecked", "boxing" }) public void test_size() { EnumMap enumSizeMap = new EnumMap(Size.class); @@ -1076,14 +981,8 @@ public class EnumMapTest extends TestCase { } /** - * @tests java.util.EnumMap#values() + * java.util.EnumMap#values() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "values", - args = {} - ) @SuppressWarnings( { "unchecked", "boxing" }) public void test_values() { EnumMap enumColorMap = new EnumMap<Color, Double>(Color.class); @@ -1238,14 +1137,8 @@ public class EnumMapTest extends TestCase { } /** - * @tests serialization/deserialization. + * serialization/deserialization. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Verifies serialization/deserialization compatibility.", - method = "!SerializationSelf", - args = {} - ) @SuppressWarnings({ "unchecked", "boxing" }) public void testSerializationSelf() throws Exception { EnumMap enumColorMap = new EnumMap<Color, Double>(Color.class); @@ -1254,14 +1147,8 @@ public class EnumMapTest extends TestCase { } /** - * @tests serialization/deserialization compatibility with RI. + * serialization/deserialization compatibility with RI. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Verifies serialization/deserialization compatibility.", - method = "!SerializationGolden", - args = {} - ) @SuppressWarnings({ "unchecked", "boxing" }) public void testSerializationCompatibility() throws Exception { EnumMap enumColorMap = new EnumMap<Color, Double>(Color.class); diff --git a/luni/src/test/java/tests/api/java/util/EnumSetTest.java b/luni/src/test/java/tests/api/java/util/EnumSetTest.java index d082569..2b33877 100644 --- a/luni/src/test/java/tests/api/java/util/EnumSetTest.java +++ b/luni/src/test/java/tests/api/java/util/EnumSetTest.java @@ -16,11 +16,6 @@ package tests.api.java.util; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; - import java.util.ArrayList; import java.util.Collection; import java.util.EnumSet; @@ -32,7 +27,6 @@ import junit.framework.TestCase; import org.apache.harmony.testframework.serialization.SerializationTest; -@TestTargetClass(EnumSet.class) public class EnumSetTest extends TestCase { static final boolean disableRIBugs = true; @@ -73,14 +67,8 @@ public class EnumSetTest extends TestCase { } /** - * @tests java.util.EnumSet#noneOf(java.lang.Class) + * java.util.EnumSet#noneOf(java.lang.Class) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "noneOf", - args = {java.lang.Class.class} - ) @SuppressWarnings("unchecked") public void test_NoneOf_LClass() { try { @@ -126,7 +114,7 @@ public class EnumSetTest extends TestCase { } /** - * @tests java.util.HugeEnumSet#iterator() + * java.util.HugeEnumSet#iterator() */ public void test_iterator_HugeEnumSet() { EnumSet<HugeEnumCount> set; @@ -169,14 +157,8 @@ public class EnumSetTest extends TestCase { } /** - * @tests java.util.EnumSet#allOf(java.lang.Class) + * java.util.EnumSet#allOf(java.lang.Class) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "allOf", - args = {java.lang.Class.class} - ) @SuppressWarnings("unchecked") public void test_AllOf_LClass() { try { @@ -228,14 +210,8 @@ public class EnumSetTest extends TestCase { } /** - * @tests java.util.EnumSet#add(E) + * java.util.EnumSet#add(E) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "add", - args = {java.lang.Object.class} - ) @SuppressWarnings("unchecked") public void test_add_E() { Set<EnumFoo> set = EnumSet.noneOf(EnumFoo.class); @@ -338,14 +314,8 @@ public class EnumSetTest extends TestCase { } /** - * @tests java.util.EnumSet#addAll(Collection) + * java.util.EnumSet#addAll(Collection) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "addAll", - args = {java.util.Collection.class} - ) @SuppressWarnings( { "unchecked", "boxing" }) public void test_addAll_LCollection() { @@ -502,14 +472,8 @@ public class EnumSetTest extends TestCase { } /** - * @tests java.util.EnumSet#remove(Object) + * java.util.EnumSet#remove(Object) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify exceptions.", - method = "remove", - args = {java.lang.Object.class} - ) public void test_remove_LOject() { Set<EnumFoo> set = EnumSet.noneOf(EnumFoo.class); Enum[] elements = EnumFoo.class.getEnumConstants(); @@ -552,14 +516,8 @@ public class EnumSetTest extends TestCase { } /** - * @tests java.util.EnumSet#equals(Object) + * java.util.EnumSet#equals(Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "equals", - args = {java.lang.Object.class} - ) public void test_equals_LObject() { Set<EnumFoo> set = EnumSet.noneOf(EnumFoo.class); Enum[] elements = EnumFoo.class.getEnumConstants(); @@ -617,14 +575,8 @@ public class EnumSetTest extends TestCase { } /** - * @tests java.util.EnumSet#clear() + * java.util.EnumSet#clear() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "clear", - args = {} - ) public void test_clear() { Set<EnumFoo> set = EnumSet.noneOf(EnumFoo.class); set.add(EnumFoo.a); @@ -649,14 +601,8 @@ public class EnumSetTest extends TestCase { } /** - * @tests java.util.EnumSet#size() + * java.util.EnumSet#size() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "size", - args = {} - ) public void test_size() { Set<EnumFoo> set = EnumSet.noneOf(EnumFoo.class); set.add(EnumFoo.a); @@ -671,14 +617,8 @@ public class EnumSetTest extends TestCase { } /** - * @tests java.util.EnumSet#complementOf(java.util.EnumSet) + * java.util.EnumSet#complementOf(java.util.EnumSet) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "complementOf", - args = {java.util.EnumSet.class} - ) public void test_ComplementOf_LEnumSet() { try { @@ -727,14 +667,8 @@ public class EnumSetTest extends TestCase { } /** - * @tests java.util.EnumSet#contains(Object) + * java.util.EnumSet#contains(Object) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify ClassCastException, and NullPointerException.", - method = "contains", - args = {java.lang.Object.class} - ) public void test_contains_LObject() { Set<EnumFoo> set = EnumSet.noneOf(EnumFoo.class); Enum[] elements = EnumFoo.class.getEnumConstants(); @@ -804,14 +738,8 @@ public class EnumSetTest extends TestCase { } /** - * @tests java.util.EnumSet#containsAll(Collection) + * java.util.EnumSet#containsAll(Collection) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "containsAll", - args = {java.util.Collection.class} - ) @SuppressWarnings( { "unchecked", "boxing" }) public void test_containsAll_LCollection() { EnumSet<EnumFoo> set = EnumSet.noneOf(EnumFoo.class); @@ -961,14 +889,8 @@ public class EnumSetTest extends TestCase { } /** - * @tests java.util.EnumSet#copyOf(java.util.Collection) + * java.util.EnumSet#copyOf(java.util.Collection) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "copyOf", - args = {java.util.Collection.class} - ) @SuppressWarnings("unchecked") public void test_CopyOf_LCollection() { try { @@ -1054,14 +976,8 @@ public class EnumSetTest extends TestCase { } /** - * @tests java.util.EnumSet#copyOf(java.util.EnumSet) + * java.util.EnumSet#copyOf(java.util.EnumSet) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "copyOf", - args = {java.util.EnumSet.class} - ) @SuppressWarnings("unchecked") public void test_CopyOf_LEnumSet() { EnumSet<EnumWithInnerClass> enumSet = EnumSet @@ -1107,14 +1023,8 @@ public class EnumSetTest extends TestCase { } /** - * @tests java.util.EnumSet#removeAll(Collection) + * java.util.EnumSet#removeAll(Collection) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify UnsupportedOperationException, ClassCastException.", - method = "removeAll", - args = {java.util.Collection.class} - ) @SuppressWarnings("unchecked") public void test_removeAll_LCollection() { Set<EnumFoo> set = EnumSet.noneOf(EnumFoo.class); @@ -1287,14 +1197,8 @@ public class EnumSetTest extends TestCase { } /** - * @tests java.util.EnumSet#retainAll(Collection) + * java.util.EnumSet#retainAll(Collection) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify UnsupportedOperationException, ClassCastException.", - method = "retainAll", - args = {java.util.Collection.class} - ) @SuppressWarnings("unchecked") public void test_retainAll_LCollection() { Set<EnumFoo> set = EnumSet.allOf(EnumFoo.class); @@ -1482,14 +1386,8 @@ public class EnumSetTest extends TestCase { } /** - * @tests java.util.EnumSet#iterator() + * java.util.EnumSet#iterator() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "iterator", - args = {} - ) public void test_iterator() { Set<EnumFoo> set = EnumSet.noneOf(EnumFoo.class); set.add(EnumFoo.a); @@ -1709,14 +1607,8 @@ public class EnumSetTest extends TestCase { } /** - * @tests java.util.EnumSet#of(E) + * java.util.EnumSet#of(E) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "of", - args = {java.lang.Enum.class} - ) public void test_Of_E() { EnumSet<EnumWithInnerClass> enumSet = EnumSet.of(EnumWithInnerClass.a); assertEquals("enumSet should have length 1:", 1, enumSet.size()); @@ -1739,14 +1631,8 @@ public class EnumSetTest extends TestCase { } /** - * @tests java.util.EnumSet#of(E, E) + * java.util.EnumSet#of(E, E) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "of", - args = {java.lang.Enum.class, java.lang.Enum.class} - ) public void test_Of_EE() { EnumSet<EnumWithInnerClass> enumSet = EnumSet.of(EnumWithInnerClass.a, EnumWithInnerClass.b); @@ -1816,14 +1702,8 @@ public class EnumSetTest extends TestCase { } /** - * @tests java.util.EnumSet#of(E, E, E) + * java.util.EnumSet#of(E, E, E) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "of", - args = {java.lang.Enum.class, java.lang.Enum.class, java.lang.Enum.class} - ) public void test_Of_EEE() { EnumSet<EnumWithInnerClass> enumSet = EnumSet.of(EnumWithInnerClass.a, EnumWithInnerClass.b, EnumWithInnerClass.c); @@ -1865,14 +1745,8 @@ public class EnumSetTest extends TestCase { } /** - * @tests java.util.EnumSet#of(E, E, E, E) + * java.util.EnumSet#of(E, E, E, E) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "of", - args = {java.lang.Enum.class, java.lang.Enum.class, java.lang.Enum.class, java.lang.Enum.class} - ) public void test_Of_EEEE() { EnumSet<EnumWithInnerClass> enumSet = EnumSet.of(EnumWithInnerClass.a, EnumWithInnerClass.b, EnumWithInnerClass.c, @@ -1909,14 +1783,8 @@ public class EnumSetTest extends TestCase { } /** - * @tests java.util.EnumSet#of(E, E, E, E, E) + * java.util.EnumSet#of(E, E, E, E, E) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "of", - args = {java.lang.Enum.class, java.lang.Enum.class, java.lang.Enum.class, java.lang.Enum.class, java.lang.Enum.class} - ) public void test_Of_EEEEE() { EnumSet<EnumWithInnerClass> enumSet = EnumSet.of(EnumWithInnerClass.a, EnumWithInnerClass.b, EnumWithInnerClass.c, @@ -1951,14 +1819,8 @@ public class EnumSetTest extends TestCase { } /** - * @tests java.util.EnumSet#of(E, E...) + * java.util.EnumSet#of(E, E...) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "of", - args = {java.lang.Enum.class, java.lang.Enum[].class} - ) public void test_Of_EEArray() { EnumWithInnerClass[] enumArray = new EnumWithInnerClass[] { EnumWithInnerClass.b, EnumWithInnerClass.c }; @@ -2009,14 +1871,8 @@ public class EnumSetTest extends TestCase { } /** - * @tests java.util.EnumSet#range(E, E) + * java.util.EnumSet#range(E, E) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "range", - args = {java.lang.Enum.class, java.lang.Enum.class} - ) public void test_Range_EE() { try { EnumSet.range(EnumWithInnerClass.c, null); @@ -2101,14 +1957,8 @@ public class EnumSetTest extends TestCase { } /** - * @tests java.util.EnumSet#clone() + * java.util.EnumSet#clone() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "clone", - args = {} - ) public void test_Clone() { EnumSet<EnumFoo> enumSet = EnumSet.allOf(EnumFoo.class); EnumSet<EnumFoo> clonedEnumSet = enumSet.clone(); @@ -2135,28 +1985,16 @@ public class EnumSetTest extends TestCase { } /** - * @tests java.util.EnumSet#Serialization() + * java.util.EnumSet#Serialization() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Verifies serialization/deserialization compatibility.", - method = "!SerializationSelf", - args = {} - ) public void test_serialization() throws Exception { EnumSet<EnumFoo> set = EnumSet.allOf(EnumFoo.class); SerializationTest.verifySelf(set); } /** - * @tests serialization/deserialization compatibility with RI. + * serialization/deserialization compatibility with RI. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Verifies serialization/deserialization compatibility.", - method = "!SerializationGolden", - args = {} - ) @SuppressWarnings( { "unchecked", "boxing" }) public void testSerializationCompatibility() throws Exception { EnumSet<EnumFoo> set = EnumSet.allOf(EnumFoo.class); diff --git a/luni/src/test/java/tests/api/java/util/EventObjectTest.java b/luni/src/test/java/tests/api/java/util/EventObjectTest.java index e70f1fa..201d9f3 100644 --- a/luni/src/test/java/tests/api/java/util/EventObjectTest.java +++ b/luni/src/test/java/tests/api/java/util/EventObjectTest.java @@ -17,14 +17,8 @@ package tests.api.java.util; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; - import java.util.EventObject; -@TestTargetClass(EventObject.class) public class EventObjectTest extends junit.framework.TestCase { Object myObject; @@ -32,14 +26,8 @@ public class EventObjectTest extends junit.framework.TestCase { EventObject myEventObject; /** - * @tests java.util.EventObject#EventObject(java.lang.Object) + * java.util.EventObject#EventObject(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "See setUp method.", - method = "EventObject", - args = {java.lang.Object.class} - ) public void test_ConstructorLjava_lang_Object() { try { new EventObject(null); @@ -50,14 +38,8 @@ public class EventObjectTest extends junit.framework.TestCase { } /** - * @tests java.util.EventObject#getSource() + * java.util.EventObject#getSource() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSource", - args = {} - ) public void test_getSource() { // Test for method java.lang.Object java.util.EventObject.getSource() assertTrue("Wrong source returned", @@ -65,14 +47,8 @@ public class EventObjectTest extends junit.framework.TestCase { } /** - * @tests java.util.EventObject#toString() + * java.util.EventObject#toString() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {} - ) public void test_toString() { // Test for method java.lang.String java.util.EventObject.toString() assertTrue("Incorrect toString returned: " + myEventObject.toString(), diff --git a/luni/src/test/java/tests/api/java/util/FormattableFlagsTest.java b/luni/src/test/java/tests/api/java/util/FormattableFlagsTest.java index a7de317..2aa4954 100644 --- a/luni/src/test/java/tests/api/java/util/FormattableFlagsTest.java +++ b/luni/src/test/java/tests/api/java/util/FormattableFlagsTest.java @@ -15,26 +15,14 @@ */ package tests.api.java.util; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; - import java.util.FormattableFlags; import junit.framework.TestCase; -@TestTargetClass(FormattableFlags.class) public class FormattableFlagsTest extends TestCase { /** * @test java.util.FormattableFlags ConstantFieldValues */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Verifies fields.", - method = "!Constants", - args = {} - ) public void test_ConstantFieldValues() { assertEquals(1, FormattableFlags.LEFT_JUSTIFY); assertEquals(2, FormattableFlags.UPPERCASE); diff --git a/luni/src/test/java/tests/api/java/util/GregorianCalendarTest.java b/luni/src/test/java/tests/api/java/util/GregorianCalendarTest.java index 1b360f7..6628030 100644 --- a/luni/src/test/java/tests/api/java/util/GregorianCalendarTest.java +++ b/luni/src/test/java/tests/api/java/util/GregorianCalendarTest.java @@ -18,10 +18,6 @@ package tests.api.java.util; import dalvik.annotation.AndroidOnly; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.KnownFailure; import tests.support.Support_Locale; import java.util.BitSet; @@ -34,18 +30,11 @@ import java.util.TimeZone; import java.util.Vector; -@TestTargetClass(GregorianCalendar.class) public class GregorianCalendarTest extends junit.framework.TestCase { /** - * @tests java.util.GregorianCalendar#GregorianCalendar() + * java.util.GregorianCalendar#GregorianCalendar() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "GregorianCalendar", - args = {} - ) public void test_Constructor() { // Test for method java.util.GregorianCalendar() assertTrue("Constructed incorrect calendar", (new GregorianCalendar() @@ -53,14 +42,8 @@ public class GregorianCalendarTest extends junit.framework.TestCase { } /** - * @tests java.util.GregorianCalendar#GregorianCalendar(int, int, int) + * java.util.GregorianCalendar#GregorianCalendar(int, int, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "GregorianCalendar", - args = {int.class, int.class, int.class} - ) public void test_ConstructorIII() { // Test for method java.util.GregorianCalendar(int, int, int) GregorianCalendar gc = new GregorianCalendar(1972, Calendar.OCTOBER, 13); @@ -75,15 +58,9 @@ public class GregorianCalendarTest extends junit.framework.TestCase { } /** - * @tests java.util.GregorianCalendar#GregorianCalendar(int, int, int, int, + * java.util.GregorianCalendar#GregorianCalendar(int, int, int, int, * int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "GregorianCalendar", - args = {int.class, int.class, int.class, int.class, int.class} - ) public void test_ConstructorIIIII() { // Test for method java.util.GregorianCalendar(int, int, int, int, int) GregorianCalendar gc = new GregorianCalendar(1972, Calendar.OCTOBER, @@ -109,15 +86,9 @@ public class GregorianCalendarTest extends junit.framework.TestCase { } /** - * @tests java.util.GregorianCalendar#GregorianCalendar(int, int, int, int, + * java.util.GregorianCalendar#GregorianCalendar(int, int, int, int, * int, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "GregorianCalendar", - args = {int.class, int.class, int.class, int.class, int.class, int.class} - ) public void test_ConstructorIIIIII() { // Test for method java.util.GregorianCalendar(int, int, int, int, int, // int) @@ -141,14 +112,8 @@ public class GregorianCalendarTest extends junit.framework.TestCase { } /** - * @tests java.util.GregorianCalendar#GregorianCalendar(java.util.Locale) + * java.util.GregorianCalendar#GregorianCalendar(java.util.Locale) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "GregorianCalendar", - args = {java.util.Locale.class} - ) public void test_ConstructorLjava_util_Locale() { Locale[] requiredLocales = {Locale.US, Locale.FRANCE}; if (!Support_Locale.areLocalesAvailable(requiredLocales)) { @@ -168,14 +133,8 @@ public class GregorianCalendarTest extends junit.framework.TestCase { } /** - * @tests java.util.GregorianCalendar#GregorianCalendar(java.util.TimeZone) + * java.util.GregorianCalendar#GregorianCalendar(java.util.TimeZone) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "GregorianCalendar", - args = {java.util.TimeZone.class} - ) public void test_ConstructorLjava_util_TimeZone() { // Test for method java.util.GregorianCalendar(java.util.TimeZone) Date date = new Date(); @@ -205,15 +164,9 @@ public class GregorianCalendarTest extends junit.framework.TestCase { } /** - * @tests java.util.GregorianCalendar#GregorianCalendar(java.util.TimeZone, + * java.util.GregorianCalendar#GregorianCalendar(java.util.TimeZone, * java.util.Locale) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "GregorianCalendar", - args = {java.util.TimeZone.class, java.util.Locale.class} - ) public void test_ConstructorLjava_util_TimeZoneLjava_util_Locale() { // Test for method java.util.GregorianCalendar(java.util.TimeZone, // java.util.Locale) @@ -245,14 +198,8 @@ public class GregorianCalendarTest extends junit.framework.TestCase { } /** - * @tests java.util.GregorianCalendar#add(int, int) + * java.util.GregorianCalendar#add(int, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "add", - args = {int.class, int.class} - ) @AndroidOnly("This test fails on the RI with version 1.5 but succeeds" + "on the RI with version 1.6") public void test_addII() { @@ -337,14 +284,8 @@ public class GregorianCalendarTest extends junit.framework.TestCase { } /** - * @tests java.util.GregorianCalendar#equals(java.lang.Object) + * java.util.GregorianCalendar#equals(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "equals", - args = {java.lang.Object.class} - ) public void test_equalsLjava_lang_Object() { // Test for method boolean // java.util.GregorianCalendar.equals(java.lang.Object) @@ -358,14 +299,8 @@ public class GregorianCalendarTest extends junit.framework.TestCase { } /** - * @tests java.util.GregorianCalendar#getActualMaximum(int) + * java.util.GregorianCalendar#getActualMaximum(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getActualMaximum", - args = {int.class} - ) public void test_getActualMaximumI() { // Test for method int java.util.GregorianCalendar.getActualMaximum(int) GregorianCalendar gc1 = new GregorianCalendar(1900, 1, 1); @@ -419,14 +354,8 @@ public class GregorianCalendarTest extends junit.framework.TestCase { } /** - * @tests java.util.GregorianCalendar#getActualMinimum(int) + * java.util.GregorianCalendar#getActualMinimum(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getActualMinimum", - args = {int.class} - ) public void test_getActualMinimumI() { // Test for method int java.util.GregorianCalendar.getActualMinimum(int) GregorianCalendar gc1 = new GregorianCalendar(1900, 1, 1); @@ -448,14 +377,8 @@ public class GregorianCalendarTest extends junit.framework.TestCase { } /** - * @tests java.util.GregorianCalendar#getGreatestMinimum(int) + * java.util.GregorianCalendar#getGreatestMinimum(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getGreatestMinimum", - args = {int.class} - ) public void test_getGreatestMinimumI() { // Test for method int // java.util.GregorianCalendar.getGreatestMinimum(int) @@ -480,14 +403,8 @@ public class GregorianCalendarTest extends junit.framework.TestCase { } /** - * @tests java.util.GregorianCalendar#getGregorianChange() + * java.util.GregorianCalendar#getGregorianChange() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getGregorianChange", - args = {} - ) public void test_getGregorianChange() { // Test for method java.util.Date // java.util.GregorianCalendar.getGregorianChange() @@ -504,14 +421,8 @@ public class GregorianCalendarTest extends junit.framework.TestCase { } /** - * @tests java.util.GregorianCalendar#getLeastMaximum(int) + * java.util.GregorianCalendar#getLeastMaximum(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getLeastMaximum", - args = {int.class} - ) public void test_getLeastMaximumI() { // Test for method int java.util.GregorianCalendar.getLeastMaximum(int) GregorianCalendar gc = new GregorianCalendar(); @@ -547,14 +458,8 @@ public class GregorianCalendarTest extends junit.framework.TestCase { } /** - * @tests java.util.GregorianCalendar#getMaximum(int) + * java.util.GregorianCalendar#getMaximum(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getMaximum", - args = {int.class} - ) public void test_getMaximumI() { // Test for method int java.util.GregorianCalendar.getMaximum(int) GregorianCalendar gc = new GregorianCalendar(); @@ -582,14 +487,8 @@ public class GregorianCalendarTest extends junit.framework.TestCase { } /** - * @tests java.util.GregorianCalendar#getMinimum(int) + * java.util.GregorianCalendar#getMinimum(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getMinimum", - args = {int.class} - ) public void test_getMinimumI() { // Test for method int java.util.GregorianCalendar.getMinimum(int) GregorianCalendar gc = new GregorianCalendar(); @@ -613,14 +512,8 @@ public class GregorianCalendarTest extends junit.framework.TestCase { } /** - * @tests java.util.GregorianCalendar#isLeapYear(int) + * java.util.GregorianCalendar#isLeapYear(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isLeapYear", - args = {int.class} - ) public void test_isLeapYearI() { // Test for method boolean java.util.GregorianCalendar.isLeapYear(int) GregorianCalendar gc = new GregorianCalendar(1998, 11, 6); @@ -632,14 +525,8 @@ public class GregorianCalendarTest extends junit.framework.TestCase { } /** - * @tests java.util.GregorianCalendar#roll(int, int) + * java.util.GregorianCalendar#roll(int, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "roll", - args = {int.class, int.class} - ) public void test_rollII() { // Test for method void java.util.GregorianCalendar.roll(int, int) GregorianCalendar gc = new GregorianCalendar(1972, Calendar.OCTOBER, 8, @@ -661,14 +548,8 @@ public class GregorianCalendarTest extends junit.framework.TestCase { } /** - * @tests java.util.GregorianCalendar#roll(int, boolean) + * java.util.GregorianCalendar#roll(int, boolean) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "roll", - args = {int.class, boolean.class} - ) public void test_rollIZ() { // Test for method void java.util.GregorianCalendar.roll(int, boolean) GregorianCalendar gc = new GregorianCalendar(1972, Calendar.OCTOBER, @@ -715,14 +596,8 @@ public class GregorianCalendarTest extends junit.framework.TestCase { } /** - * @tests java.util.GregorianCalendar#setGregorianChange(java.util.Date) + * java.util.GregorianCalendar#setGregorianChange(java.util.Date) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setGregorianChange", - args = {java.util.Date.class} - ) public void test_setGregorianChangeLjava_util_Date() { // Test for method void // java.util.GregorianCalendar.setGregorianChange(java.util.Date) @@ -736,14 +611,8 @@ public class GregorianCalendarTest extends junit.framework.TestCase { } /** - * @tests java.util.GregorianCalendar#clone() + * java.util.GregorianCalendar#clone() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "clone", - args = {} - ) public void test_clone() { // Regression for HARMONY-498 @@ -762,14 +631,8 @@ public class GregorianCalendarTest extends junit.framework.TestCase { } /** - * @tests java.util.GregorianCalendar#getMinimalDaysInFirstWeek() + * java.util.GregorianCalendar#getMinimalDaysInFirstWeek() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getMinimalDaysInFirstWeek", - args = {} - ) public void test_getMinimalDaysInFirstWeek() { // Regression for Harmony-1037 GregorianCalendar g = new GregorianCalendar(TimeZone @@ -789,14 +652,8 @@ public class GregorianCalendarTest extends junit.framework.TestCase { } /** - * @tests java.util.GregorianCalendar#computeTime() + * java.util.GregorianCalendar#computeTime() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Checks computeTime indirectly.", - method = "computeTime", - args = {} - ) public void test_computeTime() { // Regression for Harmony-493 @@ -832,12 +689,6 @@ public class GregorianCalendarTest extends junit.framework.TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Checks computeFields indirectly.", - method = "computeFields", - args = {} - ) public void test_computeFields() { GregorianCalendar g = new GregorianCalendar( TimeZone.getTimeZone("Europe/London"), @@ -854,14 +705,8 @@ public class GregorianCalendarTest extends junit.framework.TestCase { } /** - * @tests java.util.GregorianCalendar#get(int) + * java.util.GregorianCalendar#get(int) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify ArrayIndexOutOfBoundsException.", - method = "get", - args = {int.class} - ) @SuppressWarnings("deprecation") public void test_getI() { // Regression test for HARMONY-2959 @@ -880,12 +725,6 @@ public class GregorianCalendarTest extends junit.framework.TestCase { assertEquals(11, gc.get(Calendar.MONTH)); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hashCode", - args = {} - ) public void test_hashCode() { GregorianCalendar g = new GregorianCalendar( TimeZone.getTimeZone("Europe/London"), @@ -901,12 +740,6 @@ public class GregorianCalendarTest extends junit.framework.TestCase { assertNotSame(g.hashCode(), g1.hashCode()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setFirstDayOfWeek", - args = {int.class} - ) public void test_setFirstDayOfWeekI() { GregorianCalendar g = new GregorianCalendar( TimeZone.getTimeZone("Europe/London"), @@ -921,12 +754,6 @@ public class GregorianCalendarTest extends junit.framework.TestCase { g.setFirstDayOfWeek(-10); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setMinimalDaysInFirstWeek", - args = {int.class} - ) public void test_setMinimalDaysInFirstWeekI() { GregorianCalendar g = new GregorianCalendar( TimeZone.getTimeZone("Europe/London"), diff --git a/luni/src/test/java/tests/api/java/util/HashMapTest.java b/luni/src/test/java/tests/api/java/util/HashMapTest.java index 7d1e1f4..b37e813 100644 --- a/luni/src/test/java/tests/api/java/util/HashMapTest.java +++ b/luni/src/test/java/tests/api/java/util/HashMapTest.java @@ -17,17 +17,11 @@ package tests.api.java.util; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; - import java.util.*; import tests.support.Support_MapTest2; import tests.support.Support_UnmodifiableCollectionTest; -@TestTargetClass(HashMap.class) public class HashMapTest extends junit.framework.TestCase { class MockMap extends AbstractMap { public Set entrySet() { @@ -57,14 +51,8 @@ public class HashMapTest extends junit.framework.TestCase { Object[] objArray2; /** - * @tests java.util.HashMap#HashMap() + * java.util.HashMap#HashMap() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "HashMap", - args = {} - ) public void test_Constructor() { // Test for method java.util.HashMap() new Support_MapTest2(new HashMap()).runTest(); @@ -74,14 +62,8 @@ public class HashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.HashMap#HashMap(int) + * java.util.HashMap#HashMap(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "HashMap", - args = {int.class} - ) public void test_ConstructorI() { // Test for method java.util.HashMap(int) HashMap hm2 = new HashMap(5); @@ -100,14 +82,8 @@ public class HashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.HashMap#HashMap(int, float) + * java.util.HashMap#HashMap(int, float) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "HashMap", - args = {int.class, float.class} - ) public void test_ConstructorIF() { // Test for method java.util.HashMap(int, float) HashMap hm2 = new HashMap(5, (float) 0.5); @@ -126,14 +102,8 @@ public class HashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.HashMap#HashMap(java.util.Map) + * java.util.HashMap#HashMap(java.util.Map) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "HashMap", - args = {java.util.Map.class} - ) public void test_ConstructorLjava_util_Map() { // Test for method java.util.HashMap(java.util.Map) Map myMap = new TreeMap(); @@ -150,14 +120,8 @@ public class HashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.HashMap#clear() + * java.util.HashMap#clear() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "clear", - args = {} - ) public void test_clear() { // Test for method void java.util.HashMap.clear() hm.clear(); @@ -169,14 +133,8 @@ public class HashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.HashMap#clone() + * java.util.HashMap#clone() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "clone", - args = {} - ) public void test_clone() { // Test for method java.lang.Object java.util.HashMap.clone() HashMap hm2 = (HashMap) hm.clone(); @@ -221,14 +179,8 @@ public class HashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.HashMap#containsKey(java.lang.Object) + * java.util.HashMap#containsKey(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "containsKey", - args = {java.lang.Object.class} - ) public void test_containsKeyLjava_lang_Object() { // Test for method boolean // java.util.HashMap.containsKey(java.lang.Object) @@ -244,14 +196,8 @@ public class HashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.HashMap#containsValue(java.lang.Object) + * java.util.HashMap#containsValue(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "containsValue", - args = {java.lang.Object.class} - ) public void test_containsValueLjava_lang_Object() { // Test for method boolean // java.util.HashMap.containsValue(java.lang.Object) @@ -262,14 +208,8 @@ public class HashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.HashMap#entrySet() + * java.util.HashMap#entrySet() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "entrySet", - args = {} - ) public void test_entrySet() { // Test for method java.util.Set java.util.HashMap.entrySet() Set s = hm.entrySet(); @@ -284,14 +224,8 @@ public class HashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.HashMap#entrySet() + * java.util.HashMap#entrySet() */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "entrySet", - args = {} - ) public void test_entrySetEquals() { Set s1 = hm.entrySet(); Set s2 = new HashMap(hm).entrySet(); @@ -299,14 +233,8 @@ public class HashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.HashMap#entrySet() + * java.util.HashMap#entrySet() */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "entrySet", - args = {} - ) public void test_removeFromViews() { hm.put("A", null); hm.put("B", null); @@ -318,14 +246,8 @@ public class HashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.HashMap#get(java.lang.Object) + * java.util.HashMap#get(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "get", - args = {java.lang.Object.class} - ) public void test_getLjava_lang_Object() { // Test for method java.lang.Object // java.util.HashMap.get(java.lang.Object) @@ -355,14 +277,8 @@ public class HashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.HashMap#isEmpty() + * java.util.HashMap#isEmpty() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isEmpty", - args = {} - ) public void test_isEmpty() { // Test for method boolean java.util.HashMap.isEmpty() assertTrue("Returned false for new map", new HashMap().isEmpty()); @@ -370,14 +286,8 @@ public class HashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.HashMap#keySet() + * java.util.HashMap#keySet() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "keySet", - args = {} - ) public void test_keySet() { // Test for method java.util.Set java.util.HashMap.keySet() Set s = hm.keySet(); @@ -429,14 +339,8 @@ public class HashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.HashMap#put(java.lang.Object, java.lang.Object) + * java.util.HashMap#put(java.lang.Object, java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "put", - args = {java.lang.Object.class, java.lang.Object.class} - ) public void test_putLjava_lang_ObjectLjava_lang_Object() { // Test for method java.lang.Object // java.util.HashMap.put(java.lang.Object, java.lang.Object) @@ -455,14 +359,8 @@ public class HashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.HashMap#putAll(java.util.Map) + * java.util.HashMap#putAll(java.util.Map) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify NullPointerException.", - method = "putAll", - args = {java.util.Map.class} - ) public void test_putAllLjava_util_Map() { // Test for method void java.util.HashMap.putAll(java.util.Map) HashMap hm2 = new HashMap(); @@ -478,14 +376,8 @@ public class HashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.HashMap#putAll(java.util.Map) + * java.util.HashMap#putAll(java.util.Map) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException.", - method = "putAll", - args = {java.util.Map.class} - ) public void test_putAllLjava_util_Map_Null() { HashMap hashMap = new HashMap(); try { @@ -503,12 +395,6 @@ public class HashMapTest extends junit.framework.TestCase { } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Checks putAll that causes map to resize", - method = "putAll", - args = {java.util.Map.class} - ) public void test_putAllLjava_util_Map_Resize() { Random rnd = new Random(666); @@ -536,14 +422,8 @@ public class HashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.HashMap#remove(java.lang.Object) + * java.util.HashMap#remove(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "remove", - args = {java.lang.Object.class} - ) public void test_removeLjava_lang_Object() { // Test for method java.lang.Object // java.util.HashMap.remove(java.lang.Object) @@ -564,14 +444,8 @@ public class HashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.HashMap#size() + * java.util.HashMap#size() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "size", - args = {} - ) public void test_size() { // Test for method int java.util.HashMap.size() assertTrue("Returned incorrect size", @@ -579,14 +453,8 @@ public class HashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.HashMap#values() + * java.util.HashMap#values() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "values", - args = {} - ) public void test_values() { // Test for method java.util.Collection java.util.HashMap.values() Collection c = hm.values(); @@ -631,12 +499,6 @@ public class HashMapTest extends junit.framework.TestCase { return key == ((ReusableKey) o).key; } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hashCode", - args = {} - ) public void test_Map_Entry_hashCode() { //Related to HARMONY-403 HashMap<Integer, Integer> map = new HashMap<Integer, Integer>(10); diff --git a/luni/src/test/java/tests/api/java/util/HashSetTest.java b/luni/src/test/java/tests/api/java/util/HashSetTest.java index 493dc9c..e4a65b7 100644 --- a/luni/src/test/java/tests/api/java/util/HashSetTest.java +++ b/luni/src/test/java/tests/api/java/util/HashSetTest.java @@ -17,11 +17,6 @@ package tests.api.java.util; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; - import java.util.Arrays; import java.util.HashSet; import java.util.Iterator; @@ -35,7 +30,6 @@ import java.lang.reflect.InvocationTargetException; import org.apache.harmony.testframework.serialization.SerializationTest; -@TestTargetClass(HashSet.class) public class HashSetTest extends junit.framework.TestCase { HashSet hs; @@ -43,14 +37,8 @@ public class HashSetTest extends junit.framework.TestCase { Object[] objArray; /** - * @tests java.util.HashSet#HashSet() + * java.util.HashSet#HashSet() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "HashSet", - args = {} - ) public void test_Constructor() { // Test for method java.util.HashSet() HashSet hs2 = new HashSet(); @@ -58,14 +46,8 @@ public class HashSetTest extends junit.framework.TestCase { } /** - * @tests java.util.HashSet#HashSet(int) + * java.util.HashSet#HashSet(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "HashSet", - args = {int.class} - ) public void test_ConstructorI() { // Test for method java.util.HashSet(int) HashSet hs2 = new HashSet(5); @@ -80,14 +62,8 @@ public class HashSetTest extends junit.framework.TestCase { } /** - * @tests java.util.HashSet#HashSet(int, float) + * java.util.HashSet#HashSet(int, float) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "HashSet", - args = {int.class, float.class} - ) public void test_ConstructorIF() { // Test for method java.util.HashSet(int, float) HashSet hs2 = new HashSet(5, (float) 0.5); @@ -102,14 +78,8 @@ public class HashSetTest extends junit.framework.TestCase { } /** - * @tests java.util.HashSet#HashSet(java.util.Collection) + * java.util.HashSet#HashSet(java.util.Collection) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "HashSet", - args = {java.util.Collection.class} - ) public void test_ConstructorLjava_util_Collection() { // Test for method java.util.HashSet(java.util.Collection) HashSet hs2 = new HashSet(Arrays.asList(objArray)); @@ -128,14 +98,8 @@ public class HashSetTest extends junit.framework.TestCase { } /** - * @tests java.util.HashSet#add(java.lang.Object) + * java.util.HashSet#add(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "add", - args = {java.lang.Object.class} - ) public void test_addLjava_lang_Object() { // Test for method boolean java.util.HashSet.add(java.lang.Object) int size = hs.size(); @@ -148,14 +112,8 @@ public class HashSetTest extends junit.framework.TestCase { } /** - * @tests java.util.HashSet#clear() + * java.util.HashSet#clear() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "clear", - args = {} - ) public void test_clear() { // Test for method void java.util.HashSet.clear() Set orgSet = (Set) hs.clone(); @@ -167,14 +125,8 @@ public class HashSetTest extends junit.framework.TestCase { } /** - * @tests java.util.HashSet#clone() + * java.util.HashSet#clone() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "clone", - args = {} - ) public void test_clone() { // Test for method java.lang.Object java.util.HashSet.clone() HashSet hs2 = (HashSet) hs.clone(); @@ -183,14 +135,8 @@ public class HashSetTest extends junit.framework.TestCase { } /** - * @tests java.util.HashSet#contains(java.lang.Object) + * java.util.HashSet#contains(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "contains", - args = {java.lang.Object.class} - ) public void test_containsLjava_lang_Object() { // Test for method boolean java.util.HashSet.contains(java.lang.Object) assertTrue("Returned false for valid object", hs.contains(objArray[90])); @@ -203,14 +149,8 @@ public class HashSetTest extends junit.framework.TestCase { } /** - * @tests java.util.HashSet#isEmpty() + * java.util.HashSet#isEmpty() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isEmpty", - args = {} - ) public void test_isEmpty() { // Test for method boolean java.util.HashSet.isEmpty() assertTrue("Empty set returned false", new HashSet().isEmpty()); @@ -218,14 +158,8 @@ public class HashSetTest extends junit.framework.TestCase { } /** - * @tests java.util.HashSet#iterator() + * java.util.HashSet#iterator() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "iterator", - args = {} - ) public void test_iterator() { // Test for method java.util.Iterator java.util.HashSet.iterator() Iterator i = hs.iterator(); @@ -243,14 +177,8 @@ public class HashSetTest extends junit.framework.TestCase { } /** - * @tests java.util.HashSet#remove(java.lang.Object) + * java.util.HashSet#remove(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "remove", - args = {java.lang.Object.class} - ) public void test_removeLjava_lang_Object() { // Test for method boolean java.util.HashSet.remove(java.lang.Object) int size = hs.size(); @@ -265,14 +193,8 @@ public class HashSetTest extends junit.framework.TestCase { } /** - * @tests java.util.HashSet#size() + * java.util.HashSet#size() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "size", - args = {} - ) public void test_size() { // Test for method int java.util.HashSet.size() assertTrue("Returned incorrect size", hs.size() == (objArray.length + 1)); @@ -281,22 +203,8 @@ public class HashSetTest extends junit.framework.TestCase { } /** - * @tests java.util.HashSet#SerializationTest + * java.util.HashSet#SerializationTest */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Verifies serialization/deserialization compatibility.", - method = "!SerializationSelf", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Verifies serialization/deserialization compatibility.", - method = "!SerializationGolden", - args = {} - ) - }) public void test_Serialization() throws Exception{ HashSet<String> hs = new HashSet<String>(); hs.add("hello"); diff --git a/luni/src/test/java/tests/api/java/util/HashtableTest.java b/luni/src/test/java/tests/api/java/util/HashtableTest.java index 5cd9db8..9c97c7b 100644 --- a/luni/src/test/java/tests/api/java/util/HashtableTest.java +++ b/luni/src/test/java/tests/api/java/util/HashtableTest.java @@ -17,11 +17,6 @@ package tests.api.java.util; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -41,7 +36,6 @@ import tests.api.java.util.HashMapTest.ReusableKey; import tests.support.Support_MapTest2; import tests.support.Support_UnmodifiableCollectionTest; -@TestTargetClass(Hashtable.class) public class HashtableTest extends junit.framework.TestCase { private Hashtable ht10; @@ -57,14 +51,8 @@ public class HashtableTest extends junit.framework.TestCase { private String h10sVal; /** - * @tests java.util.Hashtable#Hashtable() + * java.util.Hashtable#Hashtable() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "Hashtable", - args = {} - ) public void test_Constructor() { // Test for method java.util.Hashtable() new Support_MapTest2(new Hashtable()).runTest(); @@ -75,14 +63,8 @@ public class HashtableTest extends junit.framework.TestCase { } /** - * @tests java.util.Hashtable#Hashtable(int) + * java.util.Hashtable#Hashtable(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "Hashtable", - args = {int.class} - ) public void test_ConstructorI() { // Test for method java.util.Hashtable(int) Hashtable h = new Hashtable(9); @@ -103,14 +85,8 @@ public class HashtableTest extends junit.framework.TestCase { } /** - * @tests java.util.Hashtable#Hashtable(int, float) + * java.util.Hashtable#Hashtable(int, float) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "Hashtable", - args = {int.class, float.class} - ) public void test_ConstructorIF() { // Test for method java.util.Hashtable(int, float) Hashtable h = new java.util.Hashtable(10, 0.5f); @@ -137,14 +113,8 @@ public class HashtableTest extends junit.framework.TestCase { } /** - * @tests java.util.Hashtable#Hashtable(java.util.Map) + * java.util.Hashtable#Hashtable(java.util.Map) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "Hashtable", - args = {java.util.Map.class} - ) public void test_ConstructorLjava_util_Map() { // Test for method java.util.Hashtable(java.util.Map) Map map = new TreeMap(); @@ -167,14 +137,8 @@ public class HashtableTest extends junit.framework.TestCase { } /** - * @tests java.util.Hashtable#Hashtable(java.util.Map) + * java.util.Hashtable#Hashtable(java.util.Map) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "Hashtable", - args = {java.util.Map.class} - ) public void test_ConversionConstructorNullValue() { Map<String, Void> map = Collections.singletonMap("Dog", null); try { @@ -185,14 +149,8 @@ public class HashtableTest extends junit.framework.TestCase { } } /** - * @tests java.util.Hashtable#clear() + * java.util.Hashtable#clear() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "clear", - args = {} - ) public void test_clear() { // Test for method void java.util.Hashtable.clear() Hashtable h = hashtableClone(htfull); @@ -205,14 +163,8 @@ public class HashtableTest extends junit.framework.TestCase { } /** - * @tests java.util.Hashtable#clone() + * java.util.Hashtable#clone() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "clone", - args = {} - ) public void test_clone() { // Test for method java.lang.Object java.util.Hashtable.clone() @@ -234,14 +186,8 @@ public class HashtableTest extends junit.framework.TestCase { } /** - * @tests java.util.Hashtable#contains(java.lang.Object) + * java.util.Hashtable#contains(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "contains", - args = {java.lang.Object.class} - ) public void test_containsLjava_lang_Object() { // Test for method boolean // java.util.Hashtable.contains(java.lang.Object) @@ -257,14 +203,8 @@ public class HashtableTest extends junit.framework.TestCase { } /** - * @tests java.util.Hashtable#containsKey(java.lang.Object) + * java.util.Hashtable#containsKey(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "containsKey", - args = {java.lang.Object.class} - ) public void test_containsKeyLjava_lang_Object() { // Test for method boolean // java.util.Hashtable.containsKey(java.lang.Object) @@ -281,14 +221,8 @@ public class HashtableTest extends junit.framework.TestCase { } /** - * @tests java.util.Hashtable#containsValue(java.lang.Object) + * java.util.Hashtable#containsValue(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "containsValue", - args = {java.lang.Object.class} - ) public void test_containsValueLjava_lang_Object() { // Test for method boolean // java.util.Hashtable.containsValue(java.lang.Object) @@ -308,14 +242,8 @@ public class HashtableTest extends junit.framework.TestCase { } /** - * @tests java.util.Hashtable#elements() + * java.util.Hashtable#elements() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "elements", - args = {} - ) public void test_elements() { // Test for method java.util.Enumeration java.util.Hashtable.elements() Enumeration elms = ht10.elements(); @@ -332,14 +260,8 @@ public class HashtableTest extends junit.framework.TestCase { // BEGIN android-removed // implementation dependent // /** -// * @tests java.util.Hashtable#elements() +// * java.util.Hashtable#elements() // */ -// @TestTargetNew( -// level = TestLevel.COMPLETE, -// notes = "", -// method = "elements", -// args = {} -// ) // public void test_elements_subtest0() { // // this is the reference implementation behavior // final Hashtable ht = new Hashtable(7); @@ -374,14 +296,8 @@ public class HashtableTest extends junit.framework.TestCase { // END android-removed /** - * @tests java.util.Hashtable#entrySet() + * java.util.Hashtable#entrySet() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "entrySet", - args = {} - ) public void test_entrySet() { // Test for method java.util.Set java.util.Hashtable.entrySet() Set s = ht10.entrySet(); @@ -411,14 +327,8 @@ public class HashtableTest extends junit.framework.TestCase { } /** - * @tests java.util.Hashtable#equals(java.lang.Object) + * java.util.Hashtable#equals(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "equals", - args = {java.lang.Object.class} - ) public void test_equalsLjava_lang_Object() { // Test for method boolean java.util.Hashtable.equals(java.lang.Object) Hashtable h = hashtableClone(ht10); @@ -427,14 +337,8 @@ public class HashtableTest extends junit.framework.TestCase { } /** - * @tests java.util.Hashtable#get(java.lang.Object) + * java.util.Hashtable#get(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "get", - args = {java.lang.Object.class} - ) public void test_getLjava_lang_Object() { // Test for method java.lang.Object // java.util.Hashtable.get(java.lang.Object) @@ -466,14 +370,8 @@ public class HashtableTest extends junit.framework.TestCase { } /** - * @tests java.util.Hashtable#hashCode() + * java.util.Hashtable#hashCode() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hashCode", - args = {} - ) public void test_hashCode() { // Test for method int java.util.Hashtable.hashCode() Set entrySet = ht10.entrySet(); @@ -487,14 +385,8 @@ public class HashtableTest extends junit.framework.TestCase { } /** - * @tests java.util.Hashtable#isEmpty() + * java.util.Hashtable#isEmpty() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isEmpty", - args = {} - ) public void test_isEmpty() { // Test for method boolean java.util.Hashtable.isEmpty() @@ -530,14 +422,8 @@ public class HashtableTest extends junit.framework.TestCase { } /** - * @tests java.util.Hashtable#keys() + * java.util.Hashtable#keys() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "keys", - args = {} - ) public void test_keys() { // Test for method java.util.Enumeration java.util.Hashtable.keys() @@ -553,14 +439,8 @@ public class HashtableTest extends junit.framework.TestCase { } /** - * @tests java.util.Hashtable#keys() + * java.util.Hashtable#keys() */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "keys", - args = {} - ) public void test_keys_subtest0() { // this is the reference implementation behavior final Hashtable ht = new Hashtable(3); @@ -579,14 +459,8 @@ public class HashtableTest extends junit.framework.TestCase { } /** - * @tests java.util.Hashtable#keySet() + * java.util.Hashtable#keySet() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "keySet", - args = {} - ) public void test_keySet() { // Test for method java.util.Set java.util.Hashtable.keySet() Set s = ht10.keySet(); @@ -638,14 +512,8 @@ public class HashtableTest extends junit.framework.TestCase { } /** - * @tests java.util.Hashtable#keySet() + * java.util.Hashtable#keySet() */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "keySet", - args = {} - ) public void test_keySet_subtest0() { Set s1 = ht10.keySet(); assertTrue("should contain key", s1.remove("Key 0")); @@ -683,14 +551,8 @@ public class HashtableTest extends junit.framework.TestCase { // BEGIN android-removed // implementation dependent // /** -// * @tests java.util.Hashtable#keySet() +// * java.util.Hashtable#keySet() // */ -// @TestTargetNew( -// level = TestLevel.PARTIAL_COMPLETE, -// notes = "", -// method = "keySet", -// args = {} -// ) // public void test_keySet_subtest1() { // // this is the reference implementation behavior // final Hashtable ht = new Hashtable(7); @@ -733,14 +595,8 @@ public class HashtableTest extends junit.framework.TestCase { // END android-removed /** - * @tests java.util.Hashtable#put(java.lang.Object, java.lang.Object) + * java.util.Hashtable#put(java.lang.Object, java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "put", - args = {java.lang.Object.class, java.lang.Object.class} - ) public void test_putLjava_lang_ObjectLjava_lang_Object() { // Test for method java.lang.Object // java.util.Hashtable.put(java.lang.Object, java.lang.Object) @@ -771,14 +627,8 @@ public class HashtableTest extends junit.framework.TestCase { } /** - * @tests java.util.Hashtable#putAll(java.util.Map) + * java.util.Hashtable#putAll(java.util.Map) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "putAll", - args = {java.util.Map.class} - ) public void test_putAllLjava_util_Map() { // Test for method void java.util.Hashtable.putAll(java.util.Map) Hashtable h = new Hashtable(); @@ -799,14 +649,8 @@ public class HashtableTest extends junit.framework.TestCase { } /** - * @tests java.util.Hashtable#remove(java.lang.Object) + * java.util.Hashtable#remove(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "remove", - args = {java.lang.Object.class} - ) public void test_removeLjava_lang_Object() { // Test for method java.lang.Object // java.util.Hashtable.remove(java.lang.Object) @@ -824,14 +668,8 @@ public class HashtableTest extends junit.framework.TestCase { } /** - * @tests java.util.Hashtable#size() + * java.util.Hashtable#size() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "size", - args = {} - ) public void test_size() { // Test for method int java.util.Hashtable.size() assertTrue("Returned invalid size", ht10.size() == 10 @@ -865,14 +703,8 @@ public class HashtableTest extends junit.framework.TestCase { } /** - * @tests java.util.Hashtable#toString() + * java.util.Hashtable#toString() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {} - ) public void test_toString() { // Test for method java.lang.String java.util.Hashtable.toString() Hashtable h = new Hashtable(); @@ -888,14 +720,8 @@ public class HashtableTest extends junit.framework.TestCase { } /** - * @tests java.util.Hashtable#values() + * java.util.Hashtable#values() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "values", - args = {} - ) public void test_values() { // Test for method java.util.Collection java.util.Hashtable.values() Collection c = ht10.values(); @@ -925,20 +751,6 @@ public class HashtableTest extends junit.framework.TestCase { /** * Regression Test for JIRA 2181 */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "entrySet", - args = {} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "remove", - args = {java.lang.Object.class} - ) - }) public void test_entrySet_remove() { Hashtable<String,String> hashtable = new Hashtable<String,String>(); @@ -976,12 +788,6 @@ public class HashtableTest extends junit.framework.TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "rehash", - args = {} - ) public void test_rehash() { Mock_Hashtable mht = new Mock_Hashtable(5); diff --git a/luni/src/test/java/tests/api/java/util/IdentityHashMapTest.java b/luni/src/test/java/tests/api/java/util/IdentityHashMapTest.java index f17e55d..3bf1257 100644 --- a/luni/src/test/java/tests/api/java/util/IdentityHashMapTest.java +++ b/luni/src/test/java/tests/api/java/util/IdentityHashMapTest.java @@ -17,11 +17,6 @@ package tests.api.java.util; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; - import java.io.Serializable; import java.util.AbstractMap; import java.util.ArrayList; @@ -38,7 +33,6 @@ import tests.support.Support_MapTest2; import org.apache.harmony.testframework.serialization.SerializationTest; -@TestTargetClass(IdentityHashMap.class) public class IdentityHashMapTest extends junit.framework.TestCase { private static final String ID = "hello"; @@ -64,14 +58,8 @@ public class IdentityHashMapTest extends junit.framework.TestCase { Object[] objArray2; /** - * @tests java.util.IdentityHashMap#IdentityHashMap() + * java.util.IdentityHashMap#IdentityHashMap() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "IdentityHashMap", - args = {} - ) public void test_Constructor() { // Test for method java.util.IdentityHashMap() new Support_MapTest2(new IdentityHashMap()).runTest(); @@ -81,14 +69,8 @@ public class IdentityHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.IdentityHashMap#IdentityHashMap(int) + * java.util.IdentityHashMap#IdentityHashMap(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "IdentityHashMap", - args = {int.class} - ) public void test_ConstructorI() { // Test for method java.util.IdentityHashMap(int) IdentityHashMap hm2 = new IdentityHashMap(5); @@ -107,14 +89,8 @@ public class IdentityHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.IdentityHashMap#IdentityHashMap(java.util.Map) + * java.util.IdentityHashMap#IdentityHashMap(java.util.Map) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "IdentityHashMap", - args = {java.util.Map.class} - ) public void test_ConstructorLjava_util_Map() { // Test for method java.util.IdentityHashMap(java.util.Map) Map myMap = new TreeMap(); @@ -138,14 +114,8 @@ public class IdentityHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.IdentityHashMap#clear() + * java.util.IdentityHashMap#clear() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "clear", - args = {} - ) public void test_clear() { // Test for method void java.util.IdentityHashMap.clear() hm.clear(); @@ -157,14 +127,8 @@ public class IdentityHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.IdentityHashMap#clone() + * java.util.IdentityHashMap#clone() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "clone", - args = {} - ) public void test_clone() { // Test for method java.lang.Object java.util.IdentityHashMap.clone() IdentityHashMap hm2 = (IdentityHashMap) hm.clone(); @@ -198,14 +162,8 @@ public class IdentityHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.IdentityHashMap#containsKey(java.lang.Object) + * java.util.IdentityHashMap#containsKey(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "containsKey", - args = {java.lang.Object.class} - ) public void test_containsKeyLjava_lang_Object() { // Test for method boolean // java.util.IdentityHashMap.containsKey(java.lang.Object) @@ -223,14 +181,8 @@ public class IdentityHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.IdentityHashMap#containsValue(java.lang.Object) + * java.util.IdentityHashMap#containsValue(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "containsValue", - args = {java.lang.Object.class} - ) public void test_containsValueLjava_lang_Object() { // Test for method boolean // java.util.IdentityHashMap.containsValue(java.lang.Object) @@ -241,14 +193,8 @@ public class IdentityHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.IdentityHashMap#entrySet() + * java.util.IdentityHashMap#entrySet() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "entrySet", - args = {} - ) public void test_entrySet() { // Test for method java.util.Set java.util.IdentityHashMap.entrySet() Set s = hm.entrySet(); @@ -263,14 +209,8 @@ public class IdentityHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.IdentityHashMap#get(java.lang.Object) + * java.util.IdentityHashMap#get(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "get", - args = {java.lang.Object.class} - ) public void test_getLjava_lang_Object() { // Test for method java.lang.Object // java.util.IdentityHashMap.get(java.lang.Object) @@ -288,14 +228,8 @@ public class IdentityHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.IdentityHashMap#isEmpty() + * java.util.IdentityHashMap#isEmpty() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isEmpty", - args = {} - ) public void test_isEmpty() { // Test for method boolean java.util.IdentityHashMap.isEmpty() assertTrue("Returned false for new map", new IdentityHashMap() @@ -304,14 +238,8 @@ public class IdentityHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.IdentityHashMap#keySet() + * java.util.IdentityHashMap#keySet() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "keySet", - args = {} - ) public void test_keySet() { // Test for method java.util.Set java.util.IdentityHashMap.keySet() Set s = hm.keySet(); @@ -364,14 +292,8 @@ public class IdentityHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.IdentityHashMap#put(java.lang.Object, java.lang.Object) + * java.util.IdentityHashMap#put(java.lang.Object, java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "put", - args = {java.lang.Object.class, java.lang.Object.class} - ) public void test_putLjava_lang_ObjectLjava_lang_Object() { // Test for method java.lang.Object // java.util.IdentityHashMap.put(java.lang.Object, java.lang.Object) @@ -392,14 +314,8 @@ public class IdentityHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.IdentityHashMap#putAll(java.util.Map) + * java.util.IdentityHashMap#putAll(java.util.Map) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "putAll", - args = {java.util.Map.class} - ) public void test_putAllLjava_util_Map() { // Test for method void java.util.IdentityHashMap.putAll(java.util.Map) IdentityHashMap hm2 = new IdentityHashMap(); @@ -422,14 +338,8 @@ public class IdentityHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.IdentityHashMap#remove(java.lang.Object) + * java.util.IdentityHashMap#remove(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "remove", - args = {java.lang.Object.class} - ) public void test_removeLjava_lang_Object() { // Test for method java.lang.Object // java.util.IdentityHashMap.remove(java.lang.Object) @@ -449,14 +359,8 @@ public class IdentityHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.IdentityHashMap#size() + * java.util.IdentityHashMap#size() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "size", - args = {} - ) public void test_size() { // Test for method int java.util.IdentityHashMap.size() assertEquals("Returned incorrect size, ", (objArray.length + 2), hm @@ -464,14 +368,8 @@ public class IdentityHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.IdentityHashMap#equals(java.lang.Object) + * java.util.IdentityHashMap#equals(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "equals", - args = {java.lang.Object.class} - ) public void test_equalsLjava_lang_Object() { IdentityHashMap mapOne = new IdentityHashMap(); IdentityHashMap mapTwo = new IdentityHashMap(); @@ -514,14 +412,8 @@ public class IdentityHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.IdentityHashMap#values() + * java.util.IdentityHashMap#values() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "values", - args = {} - ) public void test_values() { // Test for method java.util.Collection // java.util.IdentityHashMap.values() @@ -544,22 +436,8 @@ public class IdentityHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.IdentityHashMap#Serialization() + * java.util.IdentityHashMap#Serialization() */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Verifies serialization/deserialization compatibility.", - method = "!SerializationSelf", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Verifies serialization/deserialization compatibility.", - method = "!SerializationGolden", - args = {} - ) - }) public void test_Serialization() throws Exception { IdentityHashMap<String, String> map = new IdentityHashMap<String, String>(); map.put(ID, "world"); diff --git a/luni/src/test/java/tests/api/java/util/InvalidPropertiesFormatExceptionTest.java b/luni/src/test/java/tests/api/java/util/InvalidPropertiesFormatExceptionTest.java index cf484ed..0b144a4 100644 --- a/luni/src/test/java/tests/api/java/util/InvalidPropertiesFormatExceptionTest.java +++ b/luni/src/test/java/tests/api/java/util/InvalidPropertiesFormatExceptionTest.java @@ -15,29 +15,17 @@ */ package tests.api.java.util; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; - import java.io.NotSerializableException; import java.util.InvalidPropertiesFormatException; import org.apache.harmony.testframework.serialization.SerializationTest; -@TestTargetClass(InvalidPropertiesFormatException.class) public class InvalidPropertiesFormatExceptionTest extends junit.framework.TestCase { /** - * @tests java.util.InvalidPropertiesFormatException#SerializationTest() + * java.util.InvalidPropertiesFormatException#SerializationTest() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Verifies serialization/deserialization compatibility.", - method = "!SerializationSelf", - args = {} - ) public void test_Serialization() throws Exception { InvalidPropertiesFormatException ipfe = new InvalidPropertiesFormatException( "Hey, this is InvalidPropertiesFormatException"); diff --git a/luni/src/test/java/tests/api/java/util/LinkedHashMapTest.java b/luni/src/test/java/tests/api/java/util/LinkedHashMapTest.java index d5223fe..eff9493 100644 --- a/luni/src/test/java/tests/api/java/util/LinkedHashMapTest.java +++ b/luni/src/test/java/tests/api/java/util/LinkedHashMapTest.java @@ -17,11 +17,6 @@ package tests.api.java.util; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; - import java.util.AbstractMap; import java.util.ArrayList; import java.util.Arrays; @@ -36,9 +31,8 @@ import tests.support.Support_MapTest2; import tests.support.Support_UnmodifiableCollectionTest; /** - * @tests java.util.LinkedHashMap + * java.util.LinkedHashMap */ -@TestTargetClass(LinkedHashMap.class) public class LinkedHashMapTest extends junit.framework.TestCase { LinkedHashMap hm; @@ -68,14 +62,8 @@ public class LinkedHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashMap#LinkedHashMap() + * java.util.LinkedHashMap#LinkedHashMap() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "LinkedHashMap", - args = {} - ) public void test_Constructor() { // Test for method java.util.LinkedHashMap() new Support_MapTest2(new LinkedHashMap()).runTest(); @@ -85,14 +73,8 @@ public class LinkedHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashMap#LinkedHashMap(int) + * java.util.LinkedHashMap#LinkedHashMap(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Need to improve code.", - method = "LinkedHashMap", - args = {int.class} - ) public void test_ConstructorI() { // Test for method java.util.LinkedHashMap(int) LinkedHashMap hm2 = new LinkedHashMap(5); @@ -112,14 +94,8 @@ public class LinkedHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashMap#LinkedHashMap(int, float) + * java.util.LinkedHashMap#LinkedHashMap(int, float) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Need to improve code.", - method = "LinkedHashMap", - args = {int.class, float.class} - ) public void test_ConstructorIF() { // Test for method java.util.LinkedHashMap(int, float) LinkedHashMap hm2 = new LinkedHashMap(5, (float) 0.5); @@ -139,14 +115,8 @@ public class LinkedHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashMap#LinkedHashMap(java.util.Map) + * java.util.LinkedHashMap#LinkedHashMap(java.util.Map) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify IllegalArgumentException.", - method = "LinkedHashMap", - args = {java.util.Map.class} - ) public void test_ConstructorLjava_util_Map() { // Test for method java.util.LinkedHashMap(java.util.Map) Map myMap = new TreeMap(); @@ -159,14 +129,8 @@ public class LinkedHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashMap#get(java.lang.Object) + * java.util.LinkedHashMap#get(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify ClassCastException, NullPointerException.", - method = "get", - args = {java.lang.Object.class} - ) public void test_getLjava_lang_Object() { // Test for method java.lang.Object // java.util.LinkedHashMap.get(java.lang.Object) @@ -184,14 +148,8 @@ public class LinkedHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashMap#put(java.lang.Object, java.lang.Object) + * java.util.LinkedHashMap#put(java.lang.Object, java.lang.Object) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify that put returns null if there was no mapping for key, or associated null with the specified key.", - method = "put", - args = {java.lang.Object.class, java.lang.Object.class} - ) public void test_putLjava_lang_ObjectLjava_lang_Object() { // Test for method java.lang.Object // java.util.LinkedHashMap.put(java.lang.Object, java.lang.Object) @@ -210,12 +168,6 @@ public class LinkedHashMapTest extends junit.framework.TestCase { } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "test that put on an already present key causes entry to move to tail.", - method = "put", - args = {java.lang.Object.class, java.lang.Object.class} - ) public void test_putPresent() { Map<String, String> m = new LinkedHashMap<String, String>(8, .75f, true); m.put("KEY", "VALUE"); @@ -230,14 +182,8 @@ public class LinkedHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashMap#putAll(java.util.Map) + * java.util.LinkedHashMap#putAll(java.util.Map) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "putAll", - args = {java.util.Map.class} - ) public void test_putAllLjava_util_Map() { // Test for method void java.util.LinkedHashMap.putAll(java.util.Map) LinkedHashMap hm2 = new LinkedHashMap(); @@ -248,14 +194,8 @@ public class LinkedHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashMap#putAll(java.util.Map) + * java.util.LinkedHashMap#putAll(java.util.Map) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException.", - method = "putAll", - args = {java.util.Map.class} - ) public void test_putAll_Ljava_util_Map_Null() { LinkedHashMap linkedHashMap = new LinkedHashMap(); try { @@ -274,14 +214,8 @@ public class LinkedHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashMap#entrySet() + * java.util.LinkedHashMap#entrySet() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "entrySet", - args = {} - ) public void test_entrySet() { // Test for method java.util.Set java.util.LinkedHashMap.entrySet() Set s = hm.entrySet(); @@ -295,12 +229,6 @@ public class LinkedHashMapTest extends junit.framework.TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Test that remove removes the entry from the linked list", - method = "entrySet", - args = {} - ) public void test_entrySetRemove() { entrySetRemoveHelper("military", "intelligence"); entrySetRemoveHelper(null, "hypothesis"); @@ -316,14 +244,8 @@ public class LinkedHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashMap#keySet() + * java.util.LinkedHashMap#keySet() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "keySet", - args = {} - ) public void test_keySet() { // Test for method java.util.Set java.util.LinkedHashMap.keySet() Set s = hm.keySet(); @@ -375,14 +297,8 @@ public class LinkedHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashMap#values() + * java.util.LinkedHashMap#values() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "values", - args = {} - ) public void test_values() { // Test for method java.util.Collection java.util.LinkedHashMap.values() Collection c = hm.values(); @@ -407,14 +323,8 @@ public class LinkedHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashMap#remove(java.lang.Object) + * java.util.LinkedHashMap#remove(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "remove", - args = {java.lang.Object.class} - ) public void test_removeLjava_lang_Object() { // Test for method java.lang.Object // java.util.LinkedHashMap.remove(java.lang.Object) @@ -435,14 +345,8 @@ public class LinkedHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashMap#clear() + * java.util.LinkedHashMap#clear() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "clear", - args = {} - ) public void test_clear() { // Test for method void java.util.LinkedHashMap.clear() hm.clear(); @@ -454,14 +358,8 @@ public class LinkedHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashMap#clone() + * java.util.LinkedHashMap#clone() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "clone", - args = {} - ) public void test_clone() { // Test for method java.lang.Object java.util.LinkedHashMap.clone() LinkedHashMap hm2 = (LinkedHashMap) hm.clone(); @@ -496,14 +394,8 @@ public class LinkedHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashMap#clone() + * java.util.LinkedHashMap#clone() */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "clone", - args = {} - ) public void test_clone_ordered() { // Test for method java.lang.Object java.util.LinkedHashMap.clone() LinkedHashMap<String, String> hm1 = new LinkedHashMap<String, String>(10, 0.75f, true); @@ -526,12 +418,6 @@ public class LinkedHashMapTest extends junit.framework.TestCase { assertEquals("c", iterator.next().getKey()); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Regression test.", - method = "clone", - args = {} - ) // regresion test for HARMONY-4603 public void test_clone_Mock() { LinkedHashMap hashMap = new MockMap(); @@ -560,15 +446,9 @@ public class LinkedHashMapTest extends junit.framework.TestCase { } /** - * @tests put/get interaction in access-order map where removeEldest + * put/get interaction in access-order map where removeEldest * returns true. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Regression for bug Google Bug 2121546", - method = "get", - args = {java.lang.Object.class} - ) public void test_removeEldestFromSameBucketAsNewEntry() { LinkedHashMap<String, String> map = new LinkedHashMap<String, String>(6, 0.75F, true) { @@ -583,14 +463,8 @@ public class LinkedHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashMap#containsKey(java.lang.Object) + * java.util.LinkedHashMap#containsKey(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify ClassCastException, NullPointerException.", - method = "containsKey", - args = {java.lang.Object.class} - ) public void test_containsKeyLjava_lang_Object() { // Test for method boolean // java.util.LinkedHashMap.containsKey(java.lang.Object) @@ -606,14 +480,8 @@ public class LinkedHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashMap#containsValue(java.lang.Object) + * java.util.LinkedHashMap#containsValue(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify ClassCastException, NullPointerException.", - method = "containsValue", - args = {java.lang.Object.class} - ) public void test_containsValueLjava_lang_Object() { // Test for method boolean // java.util.LinkedHashMap.containsValue(java.lang.Object) @@ -624,14 +492,8 @@ public class LinkedHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashMap#isEmpty() + * java.util.LinkedHashMap#isEmpty() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isEmpty", - args = {} - ) public void test_isEmpty() { // Test for method boolean java.util.LinkedHashMap.isEmpty() assertTrue("Returned false for new map", new LinkedHashMap().isEmpty()); @@ -639,14 +501,8 @@ public class LinkedHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashMap#size() + * java.util.LinkedHashMap#size() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "size", - args = {} - ) public void test_size() { // Test for method int java.util.LinkedHashMap.size() assertTrue("Returned incorrect size", @@ -654,14 +510,8 @@ public class LinkedHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashMap#entrySet() + * java.util.LinkedHashMap#entrySet() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "entrySet", - args = {} - ) public void test_ordered_entrySet() { int i; int sz = 100; @@ -722,14 +572,8 @@ public class LinkedHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashMap#keySet() + * java.util.LinkedHashMap#keySet() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "keySet", - args = {} - ) public void test_ordered_keySet() { int i; int sz = 100; @@ -784,14 +628,8 @@ public class LinkedHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashMap#values() + * java.util.LinkedHashMap#values() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "values", - args = {} - ) public void test_ordered_values() { int i; int sz = 100; @@ -846,14 +684,8 @@ public class LinkedHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashMap#removeEldestEntry(java.util.Map$Entry) + * java.util.LinkedHashMap#removeEldestEntry(java.util.Map$Entry) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "removeEldestEntry", - args = {java.util.Map.Entry.class} - ) public void test_remove_eldest() { int i; int sz = 10; diff --git a/luni/src/test/java/tests/api/java/util/LinkedHashSetTest.java b/luni/src/test/java/tests/api/java/util/LinkedHashSetTest.java index 3826ca5..f54d01d 100644 --- a/luni/src/test/java/tests/api/java/util/LinkedHashSetTest.java +++ b/luni/src/test/java/tests/api/java/util/LinkedHashSetTest.java @@ -16,11 +16,6 @@ package tests.api.java.util; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; - import java.util.Arrays; import java.util.Collection; import java.util.Iterator; @@ -29,10 +24,9 @@ import java.util.Set; import java.util.Vector; /** - * @tests java.util.LinkedHashSet + * java.util.LinkedHashSet */ -@TestTargetClass(java.util.LinkedHashSet.class) public class LinkedHashSetTest extends junit.framework.TestCase { LinkedHashSet hs; @@ -40,14 +34,8 @@ public class LinkedHashSetTest extends junit.framework.TestCase { Object[] objArray; /** - * @tests java.util.LinkedHashSet#LinkedHashSet() + * java.util.LinkedHashSet#LinkedHashSet() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "LinkedHashSet", - args = {} - ) public void test_Constructor() { // Test for method java.util.LinkedHashSet() LinkedHashSet hs2 = new LinkedHashSet(); @@ -55,14 +43,8 @@ public class LinkedHashSetTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashSet#LinkedHashSet(int) + * java.util.LinkedHashSet#LinkedHashSet(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "LinkedHashSet", - args = {int.class} - ) public void test_ConstructorI() { // Test for method java.util.LinkedHashSet(int) LinkedHashSet hs2 = new LinkedHashSet(5); @@ -76,14 +58,8 @@ public class LinkedHashSetTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashSet#LinkedHashSet(int, float) + * java.util.LinkedHashSet#LinkedHashSet(int, float) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "LinkedHashSet", - args = {int.class, float.class} - ) public void test_ConstructorIF() { // Test for method java.util.LinkedHashSet(int, float) LinkedHashSet hs2 = new LinkedHashSet(5, (float) 0.5); @@ -112,14 +88,8 @@ public class LinkedHashSetTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashSet#LinkedHashSet(java.util.Collection) + * java.util.LinkedHashSet#LinkedHashSet(java.util.Collection) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "LinkedHashSet", - args = {java.util.Collection.class} - ) public void test_ConstructorLjava_util_Collection() { // Test for method java.util.LinkedHashSet(java.util.Collection) LinkedHashSet hs2 = new LinkedHashSet(Arrays.asList(objArray)); @@ -138,14 +108,8 @@ public class LinkedHashSetTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashSet#add(java.lang.Object) + * java.util.LinkedHashSet#add(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "add", - args = {java.lang.Object.class} - ) public void test_addLjava_lang_Object() { // Test for method boolean java.util.LinkedHashSet.add(java.lang.Object) int size = hs.size(); @@ -158,14 +122,8 @@ public class LinkedHashSetTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashSet#clear() + * java.util.LinkedHashSet#clear() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "clear", - args = {} - ) public void test_clear() { // Test for method void java.util.LinkedHashSet.clear() Set orgSet = (Set) hs.clone(); @@ -177,14 +135,8 @@ public class LinkedHashSetTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashSet#clone() + * java.util.LinkedHashSet#clone() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "clone", - args = {} - ) public void test_clone() { // Test for method java.lang.Object java.util.LinkedHashSet.clone() LinkedHashSet hs2 = (LinkedHashSet) hs.clone(); @@ -194,14 +146,8 @@ public class LinkedHashSetTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashSet#contains(java.lang.Object) + * java.util.LinkedHashSet#contains(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as a parameter.", - method = "contains", - args = {java.lang.Object.class} - ) public void test_containsLjava_lang_Object() { // Test for method boolean // java.util.LinkedHashSet.contains(java.lang.Object) @@ -215,14 +161,8 @@ public class LinkedHashSetTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashSet#isEmpty() + * java.util.LinkedHashSet#isEmpty() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isEmpty", - args = {} - ) public void test_isEmpty() { // Test for method boolean java.util.LinkedHashSet.isEmpty() assertTrue("Empty set returned false", new LinkedHashSet().isEmpty()); @@ -230,14 +170,8 @@ public class LinkedHashSetTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashSet#iterator() + * java.util.LinkedHashSet#iterator() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "iterator", - args = {} - ) public void test_iterator() { // Test for method java.util.Iterator java.util.LinkedHashSet.iterator() Iterator i = hs.iterator(); @@ -261,14 +195,8 @@ public class LinkedHashSetTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashSet#remove(java.lang.Object) + * java.util.LinkedHashSet#remove(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify ClassCastException, NullPointerException, UnsupportedOperationException.", - method = "remove", - args = {java.lang.Object.class} - ) public void test_removeLjava_lang_Object() { // Test for method boolean // java.util.LinkedHashSet.remove(java.lang.Object) @@ -283,14 +211,8 @@ public class LinkedHashSetTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedHashSet#size() + * java.util.LinkedHashSet#size() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "size", - args = {} - ) public void test_size() { // Test for method int java.util.LinkedHashSet.size() assertTrue("Returned incorrect size", hs.size() == (objArray.length + 1)); @@ -305,12 +227,6 @@ public class LinkedHashSetTest extends junit.framework.TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "retainAll", - args = {java.util.Collection.class} - ) public void test_retainAllLjava_util_Collection() { LinkedHashSet<Integer> lhs = new LinkedHashSet<Integer>(); Vector v = new Vector<Float>(); @@ -356,12 +272,6 @@ public class LinkedHashSetTest extends junit.framework.TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toArray", - args = {} - ) public void test_toArray() { LinkedHashSet<Integer> lhs = new LinkedHashSet<Integer>(); lhs.add(new Integer(1)); @@ -381,12 +291,6 @@ public class LinkedHashSetTest extends junit.framework.TestCase { assertEquals(lhs.size(), o.length); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toArray", - args = {java.lang.Object[].class} - ) public void test_toArray$Ljava_lang_Object() { LinkedHashSet<Integer> lhs = new LinkedHashSet<Integer>(); lhs.add(new Integer(1)); diff --git a/luni/src/test/java/tests/api/java/util/LinkedListTest.java b/luni/src/test/java/tests/api/java/util/LinkedListTest.java index ad3c212..c0cec45 100644 --- a/luni/src/test/java/tests/api/java/util/LinkedListTest.java +++ b/luni/src/test/java/tests/api/java/util/LinkedListTest.java @@ -17,11 +17,6 @@ package tests.api.java.util; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -34,7 +29,6 @@ import java.util.NoSuchElementException; import tests.support.Support_ListTest; -@TestTargetClass(LinkedList.class) public class LinkedListTest extends junit.framework.TestCase { LinkedList ll; @@ -42,14 +36,8 @@ public class LinkedListTest extends junit.framework.TestCase { Object[] objArray; /** - * @tests java.util.LinkedList#LinkedList() + * java.util.LinkedList#LinkedList() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "LinkedList", - args = {} - ) public void test_Constructor() { // Test for method java.util.LinkedList() new Support_ListTest("", ll).runTest(); @@ -61,14 +49,8 @@ public class LinkedListTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedList#LinkedList(java.util.Collection) + * java.util.LinkedList#LinkedList(java.util.Collection) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "LinkedList", - args = {java.util.Collection.class} - ) public void test_ConstructorLjava_util_Collection() { // Test for method java.util.LinkedList(java.util.Collection) assertTrue("Incorrect LinkedList constructed", new LinkedList(ll) @@ -83,14 +65,8 @@ public class LinkedListTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedList#add(int, java.lang.Object) + * java.util.LinkedList#add(int, java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "add", - args = {int.class, java.lang.Object.class} - ) public void test_addILjava_lang_Object() { // Test for method void java.util.LinkedList.add(int, java.lang.Object) Object o; @@ -104,14 +80,8 @@ public class LinkedListTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedList#add(java.lang.Object) + * java.util.LinkedList#add(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "add", - args = {java.lang.Object.class} - ) public void test_addLjava_lang_Object() { // Test for method boolean java.util.LinkedList.add(java.lang.Object) Object o; @@ -122,14 +92,8 @@ public class LinkedListTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedList#addAll(int, java.util.Collection) + * java.util.LinkedList#addAll(int, java.util.Collection) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "addAll", - args = {int.class, java.util.Collection.class} - ) public void test_addAllILjava_util_Collection() { // Test for method boolean java.util.LinkedList.addAll(int, // java.util.Collection) @@ -182,14 +146,8 @@ public class LinkedListTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedList#addAll(int, java.util.Collection) + * java.util.LinkedList#addAll(int, java.util.Collection) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies IndexOutOfBoundsException.", - method = "addAll", - args = {int.class, java.util.Collection.class} - ) public void test_addAllILjava_util_Collection_2() { // Regression for HARMONY-467 LinkedList obj = new LinkedList(); @@ -201,14 +159,8 @@ public class LinkedListTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedList#addAll(java.util.Collection) + * java.util.LinkedList#addAll(java.util.Collection) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "addAll", - args = {java.util.Collection.class} - ) public void test_addAllLjava_util_Collection() { // Test for method boolean // java.util.LinkedList.addAll(java.util.Collection) @@ -250,14 +202,8 @@ public class LinkedListTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedList#addFirst(java.lang.Object) + * java.util.LinkedList#addFirst(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "addFirst", - args = {java.lang.Object.class} - ) public void test_addFirstLjava_lang_Object() { // Test for method void java.util.LinkedList.addFirst(java.lang.Object) Object o; @@ -268,14 +214,8 @@ public class LinkedListTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedList#addLast(java.lang.Object) + * java.util.LinkedList#addLast(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "addLast", - args = {java.lang.Object.class} - ) public void test_addLastLjava_lang_Object() { // Test for method void java.util.LinkedList.addLast(java.lang.Object) Object o; @@ -286,14 +226,8 @@ public class LinkedListTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedList#clear() + * java.util.LinkedList#clear() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "clear", - args = {} - ) public void test_clear() { // Test for method void java.util.LinkedList.clear() ll.clear(); @@ -302,14 +236,8 @@ public class LinkedListTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedList#clone() + * java.util.LinkedList#clone() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "clone", - args = {} - ) public void test_clone() { // Test for method java.lang.Object java.util.LinkedList.clone() Object x = ll.clone(); @@ -323,14 +251,8 @@ public class LinkedListTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedList#contains(java.lang.Object) + * java.util.LinkedList#contains(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "contains", - args = {java.lang.Object.class} - ) public void test_containsLjava_lang_Object() { // Test for method boolean // java.util.LinkedList.contains(java.lang.Object) @@ -346,14 +268,8 @@ public class LinkedListTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedList#get(int) + * java.util.LinkedList#get(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "get", - args = {int.class} - ) public void test_getI() { // Test for method java.lang.Object java.util.LinkedList.get(int) assertTrue("Returned incorrect element", ll.get(22) == objArray[22]); @@ -365,14 +281,8 @@ public class LinkedListTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedList#getFirst() + * java.util.LinkedList#getFirst() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getFirst", - args = {} - ) public void test_getFirst() { // Test for method java.lang.Object java.util.LinkedList.getFirst() assertTrue("Returned incorrect first element", ll.getFirst().equals( @@ -388,14 +298,8 @@ public class LinkedListTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedList#getLast() + * java.util.LinkedList#getLast() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getLast", - args = {} - ) public void test_getLast() { // Test for method java.lang.Object java.util.LinkedList.getLast() assertTrue("Returned incorrect first element", ll.getLast().equals( @@ -411,14 +315,8 @@ public class LinkedListTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedList#indexOf(java.lang.Object) + * java.util.LinkedList#indexOf(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "indexOf", - args = {java.lang.Object.class} - ) public void test_indexOfLjava_lang_Object() { // Test for method int java.util.LinkedList.indexOf(java.lang.Object) assertEquals("Returned incorrect index", 87, ll.indexOf(objArray[87])); @@ -431,14 +329,8 @@ public class LinkedListTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedList#lastIndexOf(java.lang.Object) + * java.util.LinkedList#lastIndexOf(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "lastIndexOf", - args = {java.lang.Object.class} - ) public void test_lastIndexOfLjava_lang_Object() { // Test for method int // java.util.LinkedList.lastIndexOf(java.lang.Object) @@ -454,14 +346,8 @@ public class LinkedListTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedList#listIterator(int) + * java.util.LinkedList#listIterator(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "listIterator", - args = {int.class} - ) public void test_listIteratorI() { // Test for method java.util.ListIterator // java.util.LinkedList.listIterator(int) @@ -531,14 +417,8 @@ public class LinkedListTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedList#remove(int) + * java.util.LinkedList#remove(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "remove", - args = {int.class} - ) public void test_removeI() { // Test for method java.lang.Object java.util.LinkedList.remove(int) ll.remove(10); @@ -556,14 +436,8 @@ public class LinkedListTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedList#remove(java.lang.Object) + * java.util.LinkedList#remove(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "remove", - args = {java.lang.Object.class} - ) public void test_removeLjava_lang_Object() { // Test for method boolean java.util.LinkedList.remove(java.lang.Object) assertTrue("Failed to remove valid Object", ll.remove(objArray[87])); @@ -575,14 +449,8 @@ public class LinkedListTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedList#removeFirst() + * java.util.LinkedList#removeFirst() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "removeFirst", - args = {} - ) public void test_removeFirst() { // Test for method java.lang.Object java.util.LinkedList.removeFirst() ll.removeFirst(); @@ -599,14 +467,8 @@ public class LinkedListTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedList#removeLast() + * java.util.LinkedList#removeLast() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "removeLast", - args = {} - ) public void test_removeLast() { // Test for method java.lang.Object java.util.LinkedList.removeLast() ll.removeLast(); @@ -623,14 +485,8 @@ public class LinkedListTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedList#set(int, java.lang.Object) + * java.util.LinkedList#set(int, java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "set", - args = {int.class, java.lang.Object.class} - ) public void test_setILjava_lang_Object() { // Test for method java.lang.Object java.util.LinkedList.set(int, // java.lang.Object) @@ -654,14 +510,8 @@ public class LinkedListTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedList#size() + * java.util.LinkedList#size() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "size", - args = {} - ) public void test_size() { // Test for method int java.util.LinkedList.size() assertTrue("Returned incorrect size", ll.size() == objArray.length); @@ -670,14 +520,8 @@ public class LinkedListTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedList#toArray() + * java.util.LinkedList#toArray() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toArray", - args = {} - ) public void test_toArray() { // Test for method java.lang.Object [] java.util.LinkedList.toArray() ll.add(null); @@ -691,14 +535,8 @@ public class LinkedListTest extends junit.framework.TestCase { } /** - * @tests java.util.LinkedList#toArray(java.lang.Object[]) + * java.util.LinkedList#toArray(java.lang.Object[]) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toArray", - args = {java.lang.Object[].class} - ) public void test_toArray$Ljava_lang_Object() { // Test for method java.lang.Object [] // java.util.LinkedList.toArray(java.lang.Object []) @@ -748,23 +586,11 @@ public class LinkedListTest extends junit.framework.TestCase { //expected } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "offer", - args = {java.lang.Object.class} - ) public void test_offer() { int origSize = ll.size(); assertTrue("offer() should return true'", ll.offer(objArray[0])); assertEquals("offer() should add an element as the last one", origSize, ll.lastIndexOf(objArray[0])); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "poll", - args = {} - ) public void test_poll() { for (int i = 0; i < objArray.length; i++) { assertEquals("should remove the head", objArray[i], ll.poll()); @@ -772,12 +598,6 @@ public class LinkedListTest extends junit.framework.TestCase { assertEquals("should be empty", 0, ll.size()); assertNull("should return 'null' if list is empty", ll.poll()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "remove", - args = {} - ) public void test_remove() { for (int i = 0; i < objArray.length; i++) { assertEquals("should remove the head", objArray[i], ll.remove()); @@ -790,12 +610,6 @@ public class LinkedListTest extends junit.framework.TestCase { //-- expected } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "element", - args = {} - ) public void test_element() { assertEquals("should return the head", objArray[0], ll.element()); assertEquals("element() should remove nothing", objArray.length, ll.size()); @@ -807,12 +621,6 @@ public class LinkedListTest extends junit.framework.TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "peek", - args = {} - ) public void test_peek() { assertEquals("should remove the head", objArray[0], ll.peek()); assertEquals("should remove the head", objArray[0], ll.peek()); diff --git a/luni/src/test/java/tests/api/java/util/ListResourceBundleTest.java b/luni/src/test/java/tests/api/java/util/ListResourceBundleTest.java index 396b097..8be04db 100644 --- a/luni/src/test/java/tests/api/java/util/ListResourceBundleTest.java +++ b/luni/src/test/java/tests/api/java/util/ListResourceBundleTest.java @@ -17,43 +17,17 @@ package tests.api.java.util; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; - import java.util.Enumeration; import java.util.ListResourceBundle; import java.util.Locale; import java.util.ResourceBundle; import java.util.Vector; -@TestTargetClass(java.util.ListResourceBundle.class) public class ListResourceBundleTest extends junit.framework.TestCase { /** - * @tests java.util.ListResourceBundle#getKeys() + * java.util.ListResourceBundle#getKeys() */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getKeys", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "ListResourceBundle", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getContents", - args = {} - ) - }) public void test_getKeys() { ResourceBundle bundle; String name = "tests.support.Support_TestResource"; @@ -74,26 +48,6 @@ public class ListResourceBundleTest extends junit.framework.TestCase { } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "handleGetObject", - args = {java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "ListResourceBundle", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getContents", - args = {} - ) - }) public void test_handleGetObjectLjava_lang_String() { ListResourceBundle bundle; String name = "tests.support.Support_TestResource"; diff --git a/luni/src/test/java/tests/api/java/util/LocaleTest.java b/luni/src/test/java/tests/api/java/util/LocaleTest.java index 384ecf8..08e2e6e 100644 --- a/luni/src/test/java/tests/api/java/util/LocaleTest.java +++ b/luni/src/test/java/tests/api/java/util/LocaleTest.java @@ -17,10 +17,6 @@ package tests.api.java.util; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; import dalvik.annotation.AndroidOnly; import tests.support.Support_Locale; @@ -32,7 +28,6 @@ import java.util.Locale; import java.util.MissingResourceException; import java.util.Set; -@TestTargetClass(Locale.class) public class LocaleTest extends junit.framework.TestCase { Locale testLocale; @@ -42,14 +37,8 @@ public class LocaleTest extends junit.framework.TestCase { Locale defaultLocale; /** - * @tests java.util.Locale#Locale(java.lang.String, java.lang.String) + * java.util.Locale#Locale(java.lang.String, java.lang.String) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "Locale", - args = {java.lang.String.class} - ) public void test_ConstructorLjava_lang_String() { // Test for method java.util.Locale(java.lang.String) Locale x = new Locale("xx"); @@ -64,14 +53,8 @@ public class LocaleTest extends junit.framework.TestCase { } /** - * @tests java.util.Locale#Locale(java.lang.String, java.lang.String) + * java.util.Locale#Locale(java.lang.String, java.lang.String) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "Locale", - args = {java.lang.String.class, java.lang.String.class} - ) public void test_ConstructorLjava_lang_StringLjava_lang_String() { // Test for method java.util.Locale(java.lang.String, java.lang.String) Locale x = new Locale("xx", "CV"); @@ -94,15 +77,9 @@ public class LocaleTest extends junit.framework.TestCase { } /** - * @tests java.util.Locale#Locale(java.lang.String, java.lang.String, + * java.util.Locale#Locale(java.lang.String, java.lang.String, * java.lang.String) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "Locale", - args = {java.lang.String.class, java.lang.String.class, java.lang.String.class} - ) public void test_ConstructorLjava_lang_StringLjava_lang_StringLjava_lang_String() { // Test for method java.util.Locale(java.lang.String, java.lang.String, // java.lang.String) @@ -129,28 +106,16 @@ public class LocaleTest extends junit.framework.TestCase { } /** - * @tests java.util.Locale#clone() + * java.util.Locale#clone() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "clone", - args = {} - ) public void test_clone() { // Test for method java.lang.Object java.util.Locale.clone() assertTrue("Clone failed", l.clone().equals(l)); } /** - * @tests java.util.Locale#equals(java.lang.Object) + * java.util.Locale#equals(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "equals", - args = {java.lang.Object.class} - ) public void test_equalsLjava_lang_Object() { // Test for method boolean java.util.Locale.equals(java.lang.Object) Locale l2 = new Locale("en", "CA", "WIN32"); @@ -161,14 +126,8 @@ public class LocaleTest extends junit.framework.TestCase { } /** - * @tests java.util.Locale#getAvailableLocales() + * java.util.Locale#getAvailableLocales() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getAvailableLocales", - args = {} - ) public void test_getAvailableLocales() { // BEGIN android-changed // Test for method java.util.Locale [] @@ -189,14 +148,8 @@ public class LocaleTest extends junit.framework.TestCase { } /** - * @tests java.util.Locale#getCountry() + * java.util.Locale#getCountry() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getCountry", - args = {} - ) public void test_getCountry() { // Test for method java.lang.String java.util.Locale.getCountry() assertTrue("Returned incorrect country: " + testLocale.getCountry(), @@ -204,14 +157,8 @@ public class LocaleTest extends junit.framework.TestCase { } /** - * @tests java.util.Locale#getDefault() + * java.util.Locale#getDefault() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getDefault", - args = {} - ) public void test_getDefault() { // Test for method java.util.Locale java.util.Locale.getDefault() assertTrue("returns copy", Locale.getDefault() == Locale.getDefault()); @@ -223,14 +170,8 @@ public class LocaleTest extends junit.framework.TestCase { } /** - * @tests java.util.Locale#getDisplayCountry() + * java.util.Locale#getDisplayCountry() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getDisplayCountry", - args = {} - ) @AndroidOnly("ICU has different display name for countries") public void test_getDisplayCountry() { // Test for method java.lang.String java.util.Locale.getDisplayCountry() @@ -250,14 +191,8 @@ public class LocaleTest extends junit.framework.TestCase { } /** - * @tests java.util.Locale#getDisplayCountry(java.util.Locale) + * java.util.Locale#getDisplayCountry(java.util.Locale) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getDisplayCountry", - args = {java.util.Locale.class} - ) public void test_getDisplayCountryLjava_util_Locale() { Locale[] requiredLocales = {Locale.ITALY}; if (!Support_Locale.areLocalesAvailable(requiredLocales)) { @@ -271,14 +206,8 @@ public class LocaleTest extends junit.framework.TestCase { } /** - * @tests java.util.Locale#getDisplayLanguage() + * java.util.Locale#getDisplayLanguage() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getDisplayLanguage", - args = {} - ) public void test_getDisplayLanguage() { // Test for method java.lang.String // java.util.Locale.getDisplayLanguage() @@ -292,14 +221,8 @@ public class LocaleTest extends junit.framework.TestCase { } /** - * @tests java.util.Locale#getDisplayLanguage(java.util.Locale) + * java.util.Locale#getDisplayLanguage(java.util.Locale) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getDisplayLanguage", - args = {java.util.Locale.class} - ) public void test_getDisplayLanguageLjava_util_Locale() { Locale[] requiredLocales = {testLocale}; if (!Support_Locale.areLocalesAvailable(requiredLocales)) { @@ -314,14 +237,8 @@ public class LocaleTest extends junit.framework.TestCase { } /** - * @tests java.util.Locale#getDisplayName() + * java.util.Locale#getDisplayName() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getDisplayName", - args = {} - ) public void test_getDisplayName() { // Test for method java.lang.String java.util.Locale.getDisplayName() assertTrue("Returned incorrect name: " + testLocale.getDisplayName(), @@ -329,14 +246,8 @@ public class LocaleTest extends junit.framework.TestCase { } /** - * @tests java.util.Locale#getDisplayName(java.util.Locale) + * java.util.Locale#getDisplayName(java.util.Locale) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getDisplayName", - args = {java.util.Locale.class} - ) public void test_getDisplayNameLjava_util_Locale() { Locale[] requiredLocales = {testLocale}; if (!Support_Locale.areLocalesAvailable(requiredLocales)) { @@ -350,14 +261,8 @@ public class LocaleTest extends junit.framework.TestCase { } /** - * @tests java.util.Locale#getDisplayVariant() + * java.util.Locale#getDisplayVariant() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getDisplayVariant", - args = {} - ) public void test_getDisplayVariant() { // Test for method java.lang.String java.util.Locale.getDisplayVariant() assertTrue("Returned incorrect variant: " @@ -366,14 +271,8 @@ public class LocaleTest extends junit.framework.TestCase { } /** - * @tests java.util.Locale#getDisplayVariant(java.util.Locale) + * java.util.Locale#getDisplayVariant(java.util.Locale) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getDisplayVariant", - args = {java.util.Locale.class} - ) public void test_getDisplayVariantLjava_util_Locale() { // Test for method java.lang.String // java.util.Locale.getDisplayVariant(java.util.Locale) @@ -383,14 +282,8 @@ public class LocaleTest extends junit.framework.TestCase { } /** - * @tests java.util.Locale#getISO3Country() + * java.util.Locale#getISO3Country() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getISO3Country", - args = {} - ) public void test_getISO3Country() { // Test for method java.lang.String java.util.Locale.getISO3Country() assertTrue("Returned incorrect ISO3 country: " @@ -409,14 +302,8 @@ public class LocaleTest extends junit.framework.TestCase { } /** - * @tests java.util.Locale#getISO3Language() + * java.util.Locale#getISO3Language() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getISO3Language", - args = {} - ) public void test_getISO3Language() { // Test for method java.lang.String java.util.Locale.getISO3Language() assertTrue("Returned incorrect ISO3 language: " @@ -443,14 +330,8 @@ public class LocaleTest extends junit.framework.TestCase { } /** - * @tests java.util.Locale#getISOCountries() + * java.util.Locale#getISOCountries() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getISOCountries", - args = {} - ) public void test_getISOCountries() { // Test for method java.lang.String [] // java.util.Locale.getISOCountries() @@ -472,14 +353,8 @@ public class LocaleTest extends junit.framework.TestCase { } /** - * @tests java.util.Locale#getISOLanguages() + * java.util.Locale#getISOLanguages() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getISOLanguages", - args = {} - ) public void test_getISOLanguages() { // Test for method java.lang.String [] // java.util.Locale.getISOLanguages() @@ -500,14 +375,8 @@ public class LocaleTest extends junit.framework.TestCase { } /** - * @tests java.util.Locale#getLanguage() + * java.util.Locale#getLanguage() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getLanguage", - args = {} - ) public void test_getLanguage() { // Test for method java.lang.String java.util.Locale.getLanguage() assertTrue("Returned incorrect language: " + testLocale.getLanguage(), @@ -515,14 +384,8 @@ public class LocaleTest extends junit.framework.TestCase { } /** - * @tests java.util.Locale#getVariant() + * java.util.Locale#getVariant() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getVariant", - args = {} - ) public void test_getVariant() { // Test for method java.lang.String java.util.Locale.getVariant() assertTrue("Returned incorrect variant: " + testLocale.getVariant(), @@ -539,14 +402,8 @@ public class LocaleTest extends junit.framework.TestCase { } }; /** - * @tests java.util.Locale#setDefault(java.util.Locale) + * java.util.Locale#setDefault(java.util.Locale) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setDefault", - args = {java.util.Locale.class} - ) public void test_setDefaultLjava_util_Locale() { // Test for method void java.util.Locale.setDefault(java.util.Locale) @@ -572,14 +429,8 @@ public class LocaleTest extends junit.framework.TestCase { } /** - * @tests java.util.Locale#toString() + * java.util.Locale#toString() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {} - ) public void test_toString() { // Test for method java.lang.String java.util.Locale.toString() assertEquals("Returned incorrect string representation", "en_CA_WIN32", testLocale @@ -603,12 +454,6 @@ public class LocaleTest extends junit.framework.TestCase { } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hashCode", - args = {} - ) public void test_hashCode() { Locale l1 = new Locale("en", "US"); Locale l2 = new Locale("fr", "CA"); diff --git a/luni/src/test/java/tests/api/java/util/MissingResourceExceptionTest.java b/luni/src/test/java/tests/api/java/util/MissingResourceExceptionTest.java index 2e132fc..fc7189e 100644 --- a/luni/src/test/java/tests/api/java/util/MissingResourceExceptionTest.java +++ b/luni/src/test/java/tests/api/java/util/MissingResourceExceptionTest.java @@ -17,28 +17,16 @@ package tests.api.java.util; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; - import java.util.Locale; import java.util.MissingResourceException; import java.util.ResourceBundle; -@TestTargetClass(MissingResourceException.class) public class MissingResourceExceptionTest extends junit.framework.TestCase { /** - * @tests java.util.MissingResourceException#MissingResourceException(java.lang.String, + * java.util.MissingResourceException#MissingResourceException(java.lang.String, * java.lang.String, java.lang.String) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "MissingResourceException", - args = {java.lang.String.class, java.lang.String.class, java.lang.String.class} - ) public void test_ConstructorLjava_lang_StringLjava_lang_StringLjava_lang_String() { // Test for method java.util.MissingResourceException(java.lang.String, // java.lang.String, java.lang.String) @@ -55,14 +43,8 @@ public class MissingResourceExceptionTest extends junit.framework.TestCase { } /** - * @tests java.util.MissingResourceException#getClassName() + * java.util.MissingResourceException#getClassName() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getClassName", - args = {} - ) public void test_getClassName() { // Test for method java.lang.String // java.util.MissingResourceException.getClassName() @@ -75,14 +57,8 @@ public class MissingResourceExceptionTest extends junit.framework.TestCase { } /** - * @tests java.util.MissingResourceException#getKey() + * java.util.MissingResourceException#getKey() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getKey", - args = {} - ) public void test_getKey() { // Test for method java.lang.String // java.util.MissingResourceException.getKey() diff --git a/luni/src/test/java/tests/api/java/util/NoSuchElementExceptionTest.java b/luni/src/test/java/tests/api/java/util/NoSuchElementExceptionTest.java index ba2b4d2..cfda941 100644 --- a/luni/src/test/java/tests/api/java/util/NoSuchElementExceptionTest.java +++ b/luni/src/test/java/tests/api/java/util/NoSuchElementExceptionTest.java @@ -17,26 +17,14 @@ package tests.api.java.util; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; - import java.util.NoSuchElementException; import java.util.Vector; -@TestTargetClass(NoSuchElementException.class) public class NoSuchElementExceptionTest extends junit.framework.TestCase { /** - * @tests java.util.NoSuchElementException#NoSuchElementException() + * java.util.NoSuchElementException#NoSuchElementException() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "NoSuchElementException", - args = {} - ) public void test_Constructor() { // Test for method java.util.NoSuchElementException() @@ -52,14 +40,8 @@ public class NoSuchElementExceptionTest extends junit.framework.TestCase { } /** - * @tests java.util.NoSuchElementException#NoSuchElementException(java.lang.String) + * java.util.NoSuchElementException#NoSuchElementException(java.lang.String) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "NoSuchElementException", - args = {java.lang.String.class} - ) public void test_ConstructorLjava_lang_String() { // Test for method java.util.NoSuchElementException(java.lang.String) diff --git a/luni/src/test/java/tests/api/java/util/ObservableTest.java b/luni/src/test/java/tests/api/java/util/ObservableTest.java index a4dd43e..3a0d31c 100644 --- a/luni/src/test/java/tests/api/java/util/ObservableTest.java +++ b/luni/src/test/java/tests/api/java/util/ObservableTest.java @@ -17,16 +17,10 @@ package tests.api.java.util; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; - import java.util.Observable; import java.util.Observer; import java.util.Vector; -@TestTargetClass(Observable.class) public class ObservableTest extends junit.framework.TestCase { static class TestObserver implements Observer { @@ -83,14 +77,8 @@ public class ObservableTest extends junit.framework.TestCase { TestObservable observable; /** - * @tests java.util.Observable#Observable() + * java.util.Observable#Observable() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "Observable", - args = {} - ) public void test_Constructor() { // Test for method java.util.Observable() try { @@ -103,14 +91,8 @@ public class ObservableTest extends junit.framework.TestCase { } /** - * @tests java.util.Observable#addObserver(java.util.Observer) + * java.util.Observable#addObserver(java.util.Observer) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "addObserver", - args = {java.util.Observer.class} - ) public void test_addObserverLjava_util_Observer() { // Test for method void // java.util.Observable.addObserver(java.util.Observer) @@ -133,14 +115,8 @@ public class ObservableTest extends junit.framework.TestCase { } /** - * @tests java.util.Observable#countObservers() + * java.util.Observable#countObservers() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "countObservers", - args = {} - ) public void test_countObservers() { // Test for method int java.util.Observable.countObservers() assertEquals("New observable had > 0 observers", 0, observable @@ -151,14 +127,8 @@ public class ObservableTest extends junit.framework.TestCase { } /** - * @tests java.util.Observable#deleteObserver(java.util.Observer) + * java.util.Observable#deleteObserver(java.util.Observer) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "deleteObserver", - args = {java.util.Observer.class} - ) public void test_deleteObserverLjava_util_Observer() { // Test for method void // java.util.Observable.deleteObserver(java.util.Observer) @@ -171,14 +141,8 @@ public class ObservableTest extends junit.framework.TestCase { } /** - * @tests java.util.Observable#deleteObservers() + * java.util.Observable#deleteObservers() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "deleteObservers", - args = {} - ) public void test_deleteObservers() { // Test for method void java.util.Observable.deleteObservers() observable.addObserver(new TestObserver()); @@ -195,22 +159,8 @@ public class ObservableTest extends junit.framework.TestCase { } /** - * @tests java.util.Observable#hasChanged() + * java.util.Observable#hasChanged() */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hasChanged", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setChanged", - args = {} - ) - }) public void test_hasChanged() { assertFalse(observable.hasChanged()); observable.addObserver(observer = new TestObserver()); @@ -218,20 +168,6 @@ public class ObservableTest extends junit.framework.TestCase { assertTrue(observable.hasChanged()); } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setChanged", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "clearChanged", - args = {} - ) - }) public void test_clearChanged() { assertFalse(observable.hasChanged()); observable.addObserver(observer = new TestObserver()); @@ -242,14 +178,8 @@ public class ObservableTest extends junit.framework.TestCase { } /** - * @tests java.util.Observable#notifyObservers() + * java.util.Observable#notifyObservers() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "notifyObservers", - args = {} - ) public void test_notifyObservers() { // Test for method void java.util.Observable.notifyObservers() observable.addObserver(observer = new TestObserver()); @@ -281,14 +211,8 @@ public class ObservableTest extends junit.framework.TestCase { } /** - * @tests java.util.Observable#notifyObservers(java.lang.Object) + * java.util.Observable#notifyObservers(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "notifyObservers", - args = {java.lang.Object.class} - ) public void test_notifyObserversLjava_lang_Object() { // Test for method void // java.util.Observable.notifyObservers(java.lang.Object) diff --git a/luni/src/test/java/tests/api/java/util/PropertyPermissionTest.java b/luni/src/test/java/tests/api/java/util/PropertyPermissionTest.java index aa9426e..64b8529 100644 --- a/luni/src/test/java/tests/api/java/util/PropertyPermissionTest.java +++ b/luni/src/test/java/tests/api/java/util/PropertyPermissionTest.java @@ -17,11 +17,6 @@ package tests.api.java.util; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; - import java.io.Serializable; import java.util.Enumeration; import java.util.PropertyPermission; @@ -29,7 +24,6 @@ import java.util.PropertyPermission; import org.apache.harmony.testframework.serialization.SerializationTest; import org.apache.harmony.testframework.serialization.SerializationTest.SerializableAssert; -@TestTargetClass(PropertyPermission.class) public class PropertyPermissionTest extends junit.framework.TestCase { static PropertyPermission javaPP = new PropertyPermission("java.*", "read"); @@ -38,15 +32,9 @@ public class PropertyPermissionTest extends junit.framework.TestCase { "read,write"); /** - * @tests java.util.PropertyPermission#PropertyPermission(java.lang.String, + * java.util.PropertyPermission#PropertyPermission(java.lang.String, * java.lang.String) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "PropertyPermission", - args = {java.lang.String.class, java.lang.String.class} - ) public void test_ConstructorLjava_lang_StringLjava_lang_String() { // Test for method java.util.PropertyPermission(java.lang.String, // java.lang.String) @@ -54,14 +42,8 @@ public class PropertyPermissionTest extends junit.framework.TestCase { } /** - * @tests java.util.PropertyPermission#equals(java.lang.Object) + * java.util.PropertyPermission#equals(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "equals", - args = {java.lang.Object.class} - ) public void test_equalsLjava_lang_Object() { // Test for method boolean // java.util.PropertyPermission.equals(java.lang.Object) @@ -82,14 +64,8 @@ public class PropertyPermissionTest extends junit.framework.TestCase { } /** - * @tests java.util.PropertyPermission#getActions() + * java.util.PropertyPermission#getActions() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getActions", - args = {} - ) public void test_getActions() { // Test for method java.lang.String // java.util.PropertyPermission.getActions() @@ -100,14 +76,8 @@ public class PropertyPermissionTest extends junit.framework.TestCase { } /** - * @tests java.util.PropertyPermission#hashCode() + * java.util.PropertyPermission#hashCode() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hashCode", - args = {} - ) public void test_hashCode() { // Test for method int java.util.PropertyPermission.hashCode() assertTrue("javaPP returned wrong hashCode", @@ -117,14 +87,8 @@ public class PropertyPermissionTest extends junit.framework.TestCase { } /** - * @tests java.util.PropertyPermission#implies(java.security.Permission) + * java.util.PropertyPermission#implies(java.security.Permission) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "implies", - args = {java.security.Permission.class} - ) public void test_impliesLjava_security_Permission() { // Test for method boolean // java.util.PropertyPermission.implies(java.security.Permission) @@ -147,14 +111,8 @@ public class PropertyPermissionTest extends junit.framework.TestCase { } /** - * @tests java.util.PropertyPermission#newPermissionCollection() + * java.util.PropertyPermission#newPermissionCollection() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "newPermissionCollection", - args = {} - ) public void test_newPermissionCollection() { // Test for method java.security.PermissionCollection // java.util.PropertyPermission.newPermissionCollection() @@ -167,23 +125,9 @@ public class PropertyPermissionTest extends junit.framework.TestCase { } /** - * @tests java.util.PropertyPermission#readObject(ObjectInputStream) - * @tests java.util.PropertyPermission#writeObject(ObjectOutputStream) + * java.util.PropertyPermission#readObject(ObjectInputStream) + * java.util.PropertyPermission#writeObject(ObjectOutputStream) */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Verifies serialization/deserialization.", - method = "!SerializationSelf", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Verifies serialization/deserialization.", - method = "!SerializationGolden", - args = {} - ) - }) public void test_serialization() throws Exception{ PropertyPermission pp = new PropertyPermission("test", "read"); SerializationTest.verifySelf(pp, comparator); diff --git a/luni/src/test/java/tests/api/java/util/PropertyResourceBundleTest.java b/luni/src/test/java/tests/api/java/util/PropertyResourceBundleTest.java index f7f59c0..bc6a4fe 100644 --- a/luni/src/test/java/tests/api/java/util/PropertyResourceBundleTest.java +++ b/luni/src/test/java/tests/api/java/util/PropertyResourceBundleTest.java @@ -17,44 +17,26 @@ package tests.api.java.util; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; - import java.util.Enumeration; import java.util.MissingResourceException; import java.util.PropertyResourceBundle; import java.util.Vector; -@TestTargetClass(PropertyResourceBundle.class) public class PropertyResourceBundleTest extends junit.framework.TestCase { static PropertyResourceBundle prb; /** - * @tests java.util.PropertyResourceBundle#PropertyResourceBundle(java.io.InputStream) + * java.util.PropertyResourceBundle#PropertyResourceBundle(java.io.InputStream) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "PropertyResourceBundle", - args = {java.io.InputStream.class} - ) public void test_ConstructorLjava_io_InputStream() { // Test for method java.util.PropertyResourceBundle(java.io.InputStream) assertTrue("Used to test", true); } /** - * @tests java.util.PropertyResourceBundle#getKeys() + * java.util.PropertyResourceBundle#getKeys() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getKeys", - args = {} - ) public void test_getKeys() { Enumeration keyEnum = prb.getKeys(); Vector test = new Vector(); @@ -70,14 +52,8 @@ public class PropertyResourceBundleTest extends junit.framework.TestCase { } /** - * @tests java.util.PropertyResourceBundle#handleGetObject(java.lang.String) + * java.util.PropertyResourceBundle#handleGetObject(java.lang.String) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "handleGetObject", - args = {java.lang.String.class} - ) public void test_handleGetObjectLjava_lang_String() { // Test for method java.lang.Object // java.util.PropertyResourceBundle.handleGetObject(java.lang.String) diff --git a/luni/src/test/java/tests/api/java/util/RandomTest.java b/luni/src/test/java/tests/api/java/util/RandomTest.java index a759c3f..bb72191 100644 --- a/luni/src/test/java/tests/api/java/util/RandomTest.java +++ b/luni/src/test/java/tests/api/java/util/RandomTest.java @@ -17,41 +17,23 @@ package tests.api.java.util; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; - import java.util.Random; -@TestTargetClass(Random.class) public class RandomTest extends junit.framework.TestCase { Random r; /** - * @tests java.util.Random#Random() + * java.util.Random#Random() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "Random", - args = {} - ) public void test_Constructor() { // Test for method java.util.Random() assertTrue("Used to test", true); } /** - * @tests java.util.Random#Random(long) + * java.util.Random#Random(long) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "Random", - args = {long.class} - ) public void test_ConstructorJ() { Random r = new Random(8409238L); Random r2 = new Random(8409238L); @@ -61,14 +43,8 @@ public class RandomTest extends junit.framework.TestCase { } /** - * @tests java.util.Random#nextBoolean() + * java.util.Random#nextBoolean() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "nextBoolean", - args = {} - ) public void test_nextBoolean() { // Test for method boolean java.util.Random.nextBoolean() boolean falseAppeared = false, trueAppeared = false; @@ -84,14 +60,8 @@ public class RandomTest extends junit.framework.TestCase { } /** - * @tests java.util.Random#nextBytes(byte[]) + * java.util.Random#nextBytes(byte[]) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "nextBytes", - args = {byte[].class} - ) public void test_nextBytes$B() { // Test for method void java.util.Random.nextBytes(byte []) boolean someDifferent = false; @@ -107,14 +77,8 @@ public class RandomTest extends junit.framework.TestCase { } /** - * @tests java.util.Random#nextDouble() + * java.util.Random#nextDouble() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "nextDouble", - args = {} - ) public void test_nextDouble() { // Test for method double java.util.Random.nextDouble() double lastNum = r.nextDouble(); @@ -137,14 +101,8 @@ public class RandomTest extends junit.framework.TestCase { } /** - * @tests java.util.Random#nextFloat() + * java.util.Random#nextFloat() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "nextFloat", - args = {} - ) public void test_nextFloat() { // Test for method float java.util.Random.nextFloat() float lastNum = r.nextFloat(); @@ -166,14 +124,8 @@ public class RandomTest extends junit.framework.TestCase { } /** - * @tests java.util.Random#nextGaussian() + * java.util.Random#nextGaussian() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "nextGaussian", - args = {} - ) public void test_nextGaussian() { // Test for method double java.util.Random.nextGaussian() double lastNum = r.nextGaussian(); @@ -196,14 +148,8 @@ public class RandomTest extends junit.framework.TestCase { } /** - * @tests java.util.Random#nextInt() + * java.util.Random#nextInt() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "nextInt", - args = {} - ) public void test_nextInt() { // Test for method int java.util.Random.nextInt() int lastNum = r.nextInt(); @@ -220,14 +166,8 @@ public class RandomTest extends junit.framework.TestCase { } /** - * @tests java.util.Random#nextInt(int) + * java.util.Random#nextInt(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "nextInt", - args = {int.class} - ) public void test_nextIntI() { // Test for method int java.util.Random.nextInt(int) final int range = 10; @@ -252,14 +192,8 @@ public class RandomTest extends junit.framework.TestCase { } /** - * @tests java.util.Random#nextLong() + * java.util.Random#nextLong() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "nextLong", - args = {} - ) public void test_nextLong() { // Test for method long java.util.Random.nextLong() long lastNum = r.nextLong(); @@ -276,14 +210,8 @@ public class RandomTest extends junit.framework.TestCase { } /** - * @tests java.util.Random#setSeed(long) + * java.util.Random#setSeed(long) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setSeed", - args = {long.class} - ) public void test_setSeedJ() { // Test for method void java.util.Random.setSeed(long) long[] randomArray = new long[100]; @@ -332,12 +260,6 @@ public class RandomTest extends junit.framework.TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "next", - args = {int.class} - ) public void test_next() { Mock_Random mr = new Mock_Random(); assertFalse(mr.getFlag()); diff --git a/luni/src/test/java/tests/api/java/util/ResourceBundleTest.java b/luni/src/test/java/tests/api/java/util/ResourceBundleTest.java index a9f5082..f1fd484 100644 --- a/luni/src/test/java/tests/api/java/util/ResourceBundleTest.java +++ b/luni/src/test/java/tests/api/java/util/ResourceBundleTest.java @@ -18,10 +18,6 @@ package tests.api.java.util; import dalvik.annotation.KnownFailure; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; import java.io.File; import java.net.MalformedURLException; import java.net.URL; @@ -35,19 +31,12 @@ import java.util.Vector; import tests.api.java.util.support.B; import tests.support.resource.Support_Resources; -@TestTargetClass(ResourceBundle.class) public class ResourceBundleTest extends junit.framework.TestCase { /** - * @tests java.util.ResourceBundle#getBundle(java.lang.String, + * java.util.ResourceBundle#getBundle(java.lang.String, * java.util.Locale) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getBundle", - args = {java.lang.String.class, java.util.Locale.class} - ) public void test_getBundleLjava_lang_StringLjava_util_Locale() { ResourceBundle bundle; String name = "tests.support.Support_TestResource"; @@ -96,15 +85,9 @@ public class ResourceBundleTest extends junit.framework.TestCase { } /** - * @tests java.util.ResourceBundle#getBundle(java.lang.String, + * java.util.ResourceBundle#getBundle(java.lang.String, * java.util.Locale, java.lang.ClassLoader) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getBundle", - args = {java.lang.String.class, java.util.Locale.class, java.lang.ClassLoader.class} - ) @KnownFailure("It's not allowed to pass null as parent class loader to" + " a new ClassLoader anymore. Maybe we need to change" + " URLClassLoader to allow this? It's not specified.") @@ -175,14 +158,8 @@ public class ResourceBundleTest extends junit.framework.TestCase { } /** - * @tests java.util.ResourceBundle#getString(java.lang.String) + * java.util.ResourceBundle#getString(java.lang.String) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getString", - args = {java.lang.String.class} - ) public void test_getStringLjava_lang_String() { ResourceBundle bundle; String name = "tests.support.Support_TestResource"; @@ -224,12 +201,6 @@ public class ResourceBundleTest extends junit.framework.TestCase { //expected } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Regression test. Doesn't verify NullPointerException.", - method = "getBundle", - args = {java.lang.String.class} - ) public void test_getBundle_getClassName() { // Regression test for Harmony-1759 Locale locale = Locale.GERMAN; @@ -270,22 +241,10 @@ public class ResourceBundleTest extends junit.framework.TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "ResourceBundle", - args = {} - ) public void test_constructor() { assertNotNull(new Mock_ResourceBundle()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getLocale", - args = {} - ) public void test_getLocale() { ResourceBundle bundle; String name = "tests.support.Support_TestResource"; @@ -313,12 +272,6 @@ public class ResourceBundleTest extends junit.framework.TestCase { Locale.setDefault(loc); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getObject", - args = {java.lang.String.class} - ) public void test_getObjectLjava_lang_String() { ResourceBundle bundle; String name = "tests.support.Support_TestResource"; @@ -356,20 +309,6 @@ public class ResourceBundleTest extends junit.framework.TestCase { } } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getStringArray", - args = {java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setParent", - args = {java.util.ResourceBundle.class} - ) - }) public void test_getStringArrayLjava_lang_String() { ResourceBundle bundle; String name = "tests.support.Support_TestResource"; @@ -403,12 +342,6 @@ public class ResourceBundleTest extends junit.framework.TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getBundle", - args = {java.lang.String.class} - ) public void test_getBundleLjava_lang_String() { ResourceBundle bundle; String name = "tests.support.Support_TestResource"; diff --git a/luni/src/test/java/tests/api/java/util/SimpleTimeZoneTest.java b/luni/src/test/java/tests/api/java/util/SimpleTimeZoneTest.java index e9cda6e..e27ec0d 100644 --- a/luni/src/test/java/tests/api/java/util/SimpleTimeZoneTest.java +++ b/luni/src/test/java/tests/api/java/util/SimpleTimeZoneTest.java @@ -17,18 +17,12 @@ package tests.api.java.util; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; - import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; import java.util.SimpleTimeZone; import java.util.TimeZone; -@TestTargetClass(SimpleTimeZone.class) public class SimpleTimeZoneTest extends junit.framework.TestCase { SimpleTimeZone st1; @@ -36,14 +30,8 @@ public class SimpleTimeZoneTest extends junit.framework.TestCase { SimpleTimeZone st2; /** - * @tests java.util.SimpleTimeZone#SimpleTimeZone(int, java.lang.String) + * java.util.SimpleTimeZone#SimpleTimeZone(int, java.lang.String) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "SimpleTimeZone", - args = {int.class, java.lang.String.class} - ) public void test_ConstructorILjava_lang_String() { // Test for method java.util.SimpleTimeZone(int, java.lang.String) @@ -56,15 +44,9 @@ public class SimpleTimeZoneTest extends junit.framework.TestCase { } /** - * @tests java.util.SimpleTimeZone#SimpleTimeZone(int, java.lang.String, + * java.util.SimpleTimeZone#SimpleTimeZone(int, java.lang.String, * int, int, int, int, int, int, int, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "SimpleTimeZone", - args = {int.class, java.lang.String.class, int.class, int.class, int.class, int.class, int.class, int.class, int.class, int.class} - ) public void test_ConstructorILjava_lang_StringIIIIIIII() { // Test for method java.util.SimpleTimeZone(int, java.lang.String, int, // int, int, int, int, int, int, int) @@ -119,15 +101,9 @@ public class SimpleTimeZoneTest extends junit.framework.TestCase { } /** - * @tests java.util.SimpleTimeZone#SimpleTimeZone(int, java.lang.String, + * java.util.SimpleTimeZone#SimpleTimeZone(int, java.lang.String, * int, int, int, int, int, int, int, int, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "SimpleTimeZone", - args = {int.class, java.lang.String.class, int.class, int.class, int.class, int.class, int.class, int.class, int.class, int.class, int.class} - ) public void test_ConstructorILjava_lang_StringIIIIIIIII() { // Test for method java.util.SimpleTimeZone(int, java.lang.String, int, // int, int, int, int, int, int, int, int) @@ -184,15 +160,9 @@ public class SimpleTimeZoneTest extends junit.framework.TestCase { } /** - * @tests java.util.SimpleTimeZone#SimpleTimeZone(int, java.lang.String, + * java.util.SimpleTimeZone#SimpleTimeZone(int, java.lang.String, * int, int, int, int, int, int, int, int, int, int, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "SimpleTimeZone", - args = {int.class, java.lang.String.class, int.class, int.class, int.class, int.class, int.class, int.class, int.class, int.class, int.class, int.class, int.class} - ) public void test_ConstructorILjava_lang_StringIIIIIIIIIII() { // Test for method java.util.SimpleTimeZone(int, java.lang.String, int, // int, int, int, int, int, int, int, int, int, int) @@ -267,14 +237,8 @@ public class SimpleTimeZoneTest extends junit.framework.TestCase { } /** - * @tests java.util.SimpleTimeZone#clone() + * java.util.SimpleTimeZone#clone() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "clone", - args = {} - ) public void test_clone() { // Test for method java.lang.Object java.util.SimpleTimeZone.clone() SimpleTimeZone st1 = new SimpleTimeZone(1000, "TEST", @@ -290,14 +254,8 @@ public class SimpleTimeZoneTest extends junit.framework.TestCase { } /** - * @tests java.util.SimpleTimeZone#equals(java.lang.Object) + * java.util.SimpleTimeZone#equals(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "equals", - args = {java.lang.Object.class} - ) public void test_equalsLjava_lang_Object() { // Test for method boolean // java.util.SimpleTimeZone.equals(java.lang.Object) @@ -310,14 +268,8 @@ public class SimpleTimeZoneTest extends junit.framework.TestCase { } /** - * @tests java.util.SimpleTimeZone#getDSTSavings() + * java.util.SimpleTimeZone#getDSTSavings() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getDSTSavings", - args = {} - ) public void test_getDSTSavings() { // Test for method int java.util.SimpleTimeZone.getDSTSavings() st1 = new SimpleTimeZone(0, "TEST"); @@ -338,14 +290,8 @@ public class SimpleTimeZoneTest extends junit.framework.TestCase { } /** - * @tests java.util.SimpleTimeZone#getOffset(int, int, int, int, int, int) + * java.util.SimpleTimeZone#getOffset(int, int, int, int, int, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getOffset", - args = {int.class, int.class, int.class, int.class, int.class, int.class} - ) public void test_getOffsetIIIIII() { // Test for method int java.util.SimpleTimeZone.getOffset(int, int, int, // int, int, int) @@ -403,14 +349,8 @@ public class SimpleTimeZoneTest extends junit.framework.TestCase { } /** - * @tests java.util.SimpleTimeZone#getRawOffset() + * java.util.SimpleTimeZone#getRawOffset() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getRawOffset", - args = {} - ) public void test_getRawOffset() { // Test for method int java.util.SimpleTimeZone.getRawOffset() st1 = new SimpleTimeZone(TimeZone.getTimeZone("EST").getRawOffset(), "EST"); @@ -420,14 +360,8 @@ public class SimpleTimeZoneTest extends junit.framework.TestCase { } /** - * @tests java.util.SimpleTimeZone#hashCode() + * java.util.SimpleTimeZone#hashCode() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hashCode", - args = {} - ) public void test_hashCode() { // Test for method int java.util.SimpleTimeZone.hashCode() // For lack of a better test. @@ -439,14 +373,8 @@ public class SimpleTimeZoneTest extends junit.framework.TestCase { } /** - * @tests java.util.SimpleTimeZone#hasSameRules(java.util.TimeZone) + * java.util.SimpleTimeZone#hasSameRules(java.util.TimeZone) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hasSameRules", - args = {java.util.TimeZone.class} - ) public void test_hasSameRulesLjava_util_TimeZone() { // Test for method boolean // java.util.SimpleTimeZone.hasSameRules(java.util.TimeZone) @@ -466,14 +394,8 @@ public class SimpleTimeZoneTest extends junit.framework.TestCase { } /** - * @tests java.util.SimpleTimeZone#inDaylightTime(java.util.Date) + * java.util.SimpleTimeZone#inDaylightTime(java.util.Date) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "inDaylightTime", - args = {java.util.Date.class} - ) public void test_inDaylightTimeLjava_util_Date() { // Test for method boolean // java.util.SimpleTimeZone.inDaylightTime(java.util.Date) @@ -512,14 +434,8 @@ public class SimpleTimeZoneTest extends junit.framework.TestCase { } /** - * @tests java.util.SimpleTimeZone#setDSTSavings(int) + * java.util.SimpleTimeZone#setDSTSavings(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setDSTSavings", - args = {int.class} - ) public void test_setDSTSavingsI() { // Test for method void java.util.SimpleTimeZone.setDSTSavings(int) SimpleTimeZone st = new SimpleTimeZone(1000, "Test_TZ"); @@ -530,14 +446,8 @@ public class SimpleTimeZoneTest extends junit.framework.TestCase { } /** - * @tests java.util.SimpleTimeZone#setEndRule(int, int, int) + * java.util.SimpleTimeZone#setEndRule(int, int, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setEndRule", - args = {int.class, int.class, int.class} - ) public void test_setEndRuleIII() { SimpleTimeZone st = new SimpleTimeZone(1000, "Test_TZ"); st.setStartRule(Calendar.NOVEMBER, 1, 0); @@ -573,14 +483,8 @@ public class SimpleTimeZoneTest extends junit.framework.TestCase { } /** - * @tests java.util.SimpleTimeZone#setEndRule(int, int, int, int) + * java.util.SimpleTimeZone#setEndRule(int, int, int, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setEndRule", - args = {int.class, int.class, int.class, int.class} - ) public void test_setEndRuleIIII() { // Test for method void java.util.SimpleTimeZone.setEndRule(int, int, // int, int) @@ -627,14 +531,8 @@ public class SimpleTimeZoneTest extends junit.framework.TestCase { } /** - * @tests java.util.SimpleTimeZone#setEndRule(int, int, int, int, boolean) + * java.util.SimpleTimeZone#setEndRule(int, int, int, int, boolean) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setEndRule", - args = {int.class, int.class, int.class, int.class, boolean.class} - ) public void test_setEndRuleIIIIZ() { // Test for method void java.util.SimpleTimeZone.setEndRule(int, int, // int, int, boolean) @@ -687,14 +585,8 @@ public class SimpleTimeZoneTest extends junit.framework.TestCase { } /** - * @tests java.util.SimpleTimeZone#setRawOffset(int) + * java.util.SimpleTimeZone#setRawOffset(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setRawOffset", - args = {int.class} - ) public void test_setRawOffsetI() { // Test for method void java.util.SimpleTimeZone.setRawOffset(int) @@ -707,14 +599,8 @@ public class SimpleTimeZoneTest extends junit.framework.TestCase { } /** - * @tests java.util.SimpleTimeZone#setStartRule(int, int, int) + * java.util.SimpleTimeZone#setStartRule(int, int, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setStartRule", - args = {int.class, int.class, int.class} - ) public void test_setStartRuleIII() { // Test for method void java.util.SimpleTimeZone.setStartRule(int, int, // int) @@ -754,14 +640,8 @@ public class SimpleTimeZoneTest extends junit.framework.TestCase { } /** - * @tests java.util.SimpleTimeZone#setStartRule(int, int, int, int) + * java.util.SimpleTimeZone#setStartRule(int, int, int, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setStartRule", - args = {int.class, int.class, int.class, int.class} - ) public void test_setStartRuleIIII() { // Test for method void java.util.SimpleTimeZone.setStartRule(int, int, // int, int) @@ -808,14 +688,8 @@ public class SimpleTimeZoneTest extends junit.framework.TestCase { } /** - * @tests java.util.SimpleTimeZone#setStartRule(int, int, int, int, boolean) + * java.util.SimpleTimeZone#setStartRule(int, int, int, int, boolean) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setStartRule", - args = {int.class, int.class, int.class, int.class, boolean.class} - ) public void test_setStartRuleIIIIZ() { // Test for method void java.util.SimpleTimeZone.setStartRule(int, int, // int, int, boolean) @@ -868,14 +742,8 @@ public class SimpleTimeZoneTest extends junit.framework.TestCase { } /** - * @tests java.util.SimpleTimeZone#setStartYear(int) + * java.util.SimpleTimeZone#setStartYear(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setStartYear", - args = {int.class} - ) public void test_setStartYearI() { // Test for method void java.util.SimpleTimeZone.setStartYear(int) SimpleTimeZone st = new SimpleTimeZone(1000, "Test_TZ"); @@ -894,14 +762,8 @@ public class SimpleTimeZoneTest extends junit.framework.TestCase { } /** - * @tests java.util.SimpleTimeZone#toString() + * java.util.SimpleTimeZone#toString() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {} - ) public void test_toString() { // Test for method java.lang.String java.util.SimpleTimeZone.toString() String string = TimeZone.getTimeZone("EST").toString(); @@ -910,14 +772,8 @@ public class SimpleTimeZoneTest extends junit.framework.TestCase { } /** - * @tests java.util.SimpleTimeZone#useDaylightTime() + * java.util.SimpleTimeZone#useDaylightTime() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "useDaylightTime", - args = {} - ) public void test_useDaylightTime() { // Test for method boolean java.util.SimpleTimeZone.useDaylightTime() SimpleTimeZone st = new SimpleTimeZone(1000, "Test_TZ"); @@ -931,12 +787,6 @@ public class SimpleTimeZoneTest extends junit.framework.TestCase { .useDaylightTime()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getOffset", - args = {long.class} - ) public void test_getOffsetJ() { Calendar cal = Calendar.getInstance(); cal.set(1998, Calendar.NOVEMBER, 11, 0, 0); diff --git a/luni/src/test/java/tests/api/java/util/StackTest.java b/luni/src/test/java/tests/api/java/util/StackTest.java index 01d2f9e..465df13 100644 --- a/luni/src/test/java/tests/api/java/util/StackTest.java +++ b/luni/src/test/java/tests/api/java/util/StackTest.java @@ -17,42 +17,24 @@ package tests.api.java.util; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; - import java.util.EmptyStackException; import java.util.Stack; -@TestTargetClass(Stack.class) public class StackTest extends junit.framework.TestCase { Stack s; /** - * @tests java.util.Stack#Stack() + * java.util.Stack#Stack() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "Stack", - args = {} - ) public void test_Constructor() { // Test for method java.util.Stack() assertEquals("Stack creation failed", 0, s.size()); } /** - * @tests java.util.Stack#empty() + * java.util.Stack#empty() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "empty", - args = {} - ) public void test_empty() { // Test for method boolean java.util.Stack.empty() assertTrue("New stack answers non-empty", s.empty()); @@ -66,14 +48,8 @@ public class StackTest extends junit.framework.TestCase { } /** - * @tests java.util.Stack#peek() + * java.util.Stack#peek() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "peek", - args = {} - ) public void test_peek() { // Test for method java.lang.Object java.util.Stack.peek() String item1 = "Ichi"; @@ -102,14 +78,8 @@ public class StackTest extends junit.framework.TestCase { } /** - * @tests java.util.Stack#pop() + * java.util.Stack#pop() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "pop", - args = {} - ) public void test_pop() { // Test for method java.lang.Object java.util.Stack.pop() String item1 = "Ichi"; @@ -154,14 +124,8 @@ public class StackTest extends junit.framework.TestCase { } /** - * @tests java.util.Stack#push(java.lang.Object) + * java.util.Stack#push(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "push", - args = {java.lang.Object.class} - ) public void test_pushLjava_lang_Object() { Object [] array = {new Integer(0), new Object(), new Float(0), new String()}; @@ -176,14 +140,8 @@ public class StackTest extends junit.framework.TestCase { } /** - * @tests java.util.Stack#search(java.lang.Object) + * java.util.Stack#search(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "search", - args = {java.lang.Object.class} - ) public void test_searchLjava_lang_Object() { // Test for method int java.util.Stack.search(java.lang.Object) String item1 = "Ichi"; diff --git a/luni/src/test/java/tests/api/java/util/StringTokenizerTest.java b/luni/src/test/java/tests/api/java/util/StringTokenizerTest.java index b2261f9..809ed99 100644 --- a/luni/src/test/java/tests/api/java/util/StringTokenizerTest.java +++ b/luni/src/test/java/tests/api/java/util/StringTokenizerTest.java @@ -17,26 +17,14 @@ package tests.api.java.util; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; - import java.util.NoSuchElementException; import java.util.StringTokenizer; -@TestTargetClass(StringTokenizer.class) public class StringTokenizerTest extends junit.framework.TestCase { /** - * @tests java.util.StringTokenizer#StringTokenizer(java.lang.String) + * java.util.StringTokenizer#StringTokenizer(java.lang.String) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "StringTokenizer", - args = {java.lang.String.class} - ) public void test_ConstructorLjava_lang_String() { // Test for method java.util.StringTokenizer(java.lang.String) try { @@ -48,15 +36,9 @@ public class StringTokenizerTest extends junit.framework.TestCase { } /** - * @tests java.util.StringTokenizer#StringTokenizer(java.lang.String, + * java.util.StringTokenizer#StringTokenizer(java.lang.String, * java.lang.String) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "StringTokenizer", - args = {java.lang.String.class, java.lang.String.class} - ) public void test_ConstructorLjava_lang_StringLjava_lang_String() { // Test for method java.util.StringTokenizer(java.lang.String, // java.lang.String) @@ -74,15 +56,9 @@ public class StringTokenizerTest extends junit.framework.TestCase { } /** - * @tests java.util.StringTokenizer#StringTokenizer(java.lang.String, + * java.util.StringTokenizer#StringTokenizer(java.lang.String, * java.lang.String, boolean) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "StringTokenizer", - args = {java.lang.String.class, java.lang.String.class, boolean.class} - ) public void test_ConstructorLjava_lang_StringLjava_lang_StringZ() { // Test for method java.util.StringTokenizer(java.lang.String, // java.lang.String, boolean) @@ -103,14 +79,8 @@ public class StringTokenizerTest extends junit.framework.TestCase { } /** - * @tests java.util.StringTokenizer#countTokens() + * java.util.StringTokenizer#countTokens() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "countTokens", - args = {} - ) public void test_countTokens() { // Test for method int java.util.StringTokenizer.countTokens() StringTokenizer st = new StringTokenizer("This is a test String"); @@ -119,14 +89,8 @@ public class StringTokenizerTest extends junit.framework.TestCase { } /** - * @tests java.util.StringTokenizer#hasMoreElements() + * java.util.StringTokenizer#hasMoreElements() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hasMoreElements", - args = {} - ) public void test_hasMoreElements() { // Test for method boolean java.util.StringTokenizer.hasMoreElements() @@ -143,14 +107,8 @@ public class StringTokenizerTest extends junit.framework.TestCase { } /** - * @tests java.util.StringTokenizer#hasMoreTokens() + * java.util.StringTokenizer#hasMoreTokens() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hasMoreTokens", - args = {} - ) public void test_hasMoreTokens() { // Test for method boolean java.util.StringTokenizer.hasMoreTokens() StringTokenizer st = new StringTokenizer("This is a test String"); @@ -165,14 +123,8 @@ public class StringTokenizerTest extends junit.framework.TestCase { } /** - * @tests java.util.StringTokenizer#nextElement() + * java.util.StringTokenizer#nextElement() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "nextElement", - args = {} - ) public void test_nextElement() { // Test for method java.lang.Object // java.util.StringTokenizer.nextElement() @@ -197,14 +149,8 @@ public class StringTokenizerTest extends junit.framework.TestCase { } /** - * @tests java.util.StringTokenizer#nextToken() + * java.util.StringTokenizer#nextToken() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "nextToken", - args = {} - ) public void test_nextToken() { // Test for method java.lang.String // java.util.StringTokenizer.nextToken() @@ -229,14 +175,8 @@ public class StringTokenizerTest extends junit.framework.TestCase { } /** - * @tests java.util.StringTokenizer#nextToken(java.lang.String) + * java.util.StringTokenizer#nextToken(java.lang.String) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "nextToken", - args = {java.lang.String.class} - ) public void test_nextTokenLjava_lang_String() { // Test for method java.lang.String // java.util.StringTokenizer.nextToken(java.lang.String) diff --git a/luni/src/test/java/tests/api/java/util/TimerTaskTest.java b/luni/src/test/java/tests/api/java/util/TimerTaskTest.java index b91b742..97ff8ea 100644 --- a/luni/src/test/java/tests/api/java/util/TimerTaskTest.java +++ b/luni/src/test/java/tests/api/java/util/TimerTaskTest.java @@ -17,15 +17,9 @@ package tests.api.java.util; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; - import java.util.Timer; import java.util.TimerTask; -@TestTargetClass(TimerTask.class) public class TimerTaskTest extends junit.framework.TestCase { /** * Warning: These tests have the possibility to leave a VM hanging if the @@ -71,28 +65,16 @@ public class TimerTaskTest extends junit.framework.TestCase { } /** - * @tests java.util.TimerTask#TimerTask() + * java.util.TimerTask#TimerTask() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "TimerTask", - args = {} - ) public void test_Constructor() { // Ensure the constructor does not fail new TimerTestTask(); } /** - * @tests java.util.TimerTask#cancel() + * java.util.TimerTask#cancel() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "cancel", - args = {} - ) public void test_cancel() { Timer t = null; try { @@ -186,14 +168,8 @@ public class TimerTaskTest extends junit.framework.TestCase { } /** - * @tests java.util.TimerTask#scheduledExecutionTime() + * java.util.TimerTask#scheduledExecutionTime() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "scheduledExecutionTime", - args = {} - ) public void test_scheduledExecutionTime() { Timer t = null; try { @@ -237,14 +213,8 @@ public class TimerTaskTest extends junit.framework.TestCase { } /** - * @tests java.util.TimerTask#run() + * java.util.TimerTask#run() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "run", - args = {} - ) public void test_run() { Timer t = null; try { diff --git a/luni/src/test/java/tests/api/java/util/TimerTest.java b/luni/src/test/java/tests/api/java/util/TimerTest.java index 844c3ca..26d88ba 100644 --- a/luni/src/test/java/tests/api/java/util/TimerTest.java +++ b/luni/src/test/java/tests/api/java/util/TimerTest.java @@ -17,17 +17,12 @@ package tests.api.java.util; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; - import java.lang.Thread.UncaughtExceptionHandler; import java.util.Date; import java.util.Timer; import java.util.TimerTask; import java.util.concurrent.atomic.AtomicReference; -@TestTargetClass(Timer.class) public class TimerTest extends junit.framework.TestCase { int timerCounter = 0; @@ -97,14 +92,8 @@ public class TimerTest extends junit.framework.TestCase { } /** - * @tests java.util.Timer#Timer(boolean) + * java.util.Timer#Timer(boolean) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "Timer", - args = {boolean.class} - ) public void test_ConstructorZ() { Timer t = null; try { @@ -129,14 +118,8 @@ public class TimerTest extends junit.framework.TestCase { } /** - * @tests java.util.Timer#Timer() + * java.util.Timer#Timer() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "Timer", - args = {} - ) public void test_Constructor() { Timer t = null; try { @@ -161,14 +144,8 @@ public class TimerTest extends junit.framework.TestCase { } /** - * @tests java.util.Timer#Timer(String, boolean) + * java.util.Timer#Timer(String, boolean) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "Timer", - args = {java.lang.String.class, boolean.class} - ) public void test_ConstructorSZ() { Timer t = null; try { @@ -205,14 +182,8 @@ public class TimerTest extends junit.framework.TestCase { } /** - * @tests java.util.Timer#Timer(String) + * java.util.Timer#Timer(String) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "Timer", - args = {java.lang.String.class} - ) public void test_ConstructorS() { Timer t = null; try { @@ -242,14 +213,8 @@ public class TimerTest extends junit.framework.TestCase { } /** - * @tests java.util.Timer#cancel() + * java.util.Timer#cancel() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "cancel", - args = {} - ) public void test_cancel() { Timer t = null; try { @@ -346,14 +311,8 @@ public class TimerTest extends junit.framework.TestCase { } /** - * @tests java.util.Timer#purge() + * java.util.Timer#purge() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "purge", - args = {} - ) public void test_purge() throws Exception { Timer t = null; try { @@ -386,14 +345,8 @@ public class TimerTest extends junit.framework.TestCase { } /** - * @tests java.util.Timer#schedule(java.util.TimerTask, java.util.Date) + * java.util.Timer#schedule(java.util.TimerTask, java.util.Date) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "schedule", - args = {java.util.TimerTask.class, java.util.Date.class} - ) public void test_scheduleLjava_util_TimerTaskLjava_util_Date() { Timer t = null; try { @@ -534,14 +487,8 @@ public class TimerTest extends junit.framework.TestCase { } /** - * @tests java.util.Timer#schedule(java.util.TimerTask, long) + * java.util.Timer#schedule(java.util.TimerTask, long) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "schedule", - args = {java.util.TimerTask.class, long.class} - ) public void test_scheduleLjava_util_TimerTaskJ() { Timer t = null; try { @@ -658,14 +605,8 @@ public class TimerTest extends junit.framework.TestCase { } /** - * @tests java.util.Timer#schedule(java.util.TimerTask, long, long) + * java.util.Timer#schedule(java.util.TimerTask, long, long) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "schedule", - args = {java.util.TimerTask.class, long.class, long.class} - ) public void test_scheduleLjava_util_TimerTaskJJ() { Timer t = null; try { @@ -813,15 +754,9 @@ public class TimerTest extends junit.framework.TestCase { } /** - * @tests java.util.Timer#schedule(java.util.TimerTask, java.util.Date, + * java.util.Timer#schedule(java.util.TimerTask, java.util.Date, * long) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "schedule", - args = {java.util.TimerTask.class, java.util.Date.class, long.class} - ) public void test_scheduleLjava_util_TimerTaskLjava_util_DateJ() { Timer t = null; try { @@ -979,15 +914,9 @@ public class TimerTest extends junit.framework.TestCase { } /** - * @tests java.util.Timer#scheduleAtFixedRate(java.util.TimerTask, long, + * java.util.Timer#scheduleAtFixedRate(java.util.TimerTask, long, * long) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "scheduleAtFixedRate", - args = {java.util.TimerTask.class, long.class, long.class} - ) public void test_scheduleAtFixedRateLjava_util_TimerTaskJJ() { Timer t = null; try { @@ -1099,15 +1028,9 @@ public class TimerTest extends junit.framework.TestCase { } /** - * @tests java.util.Timer#scheduleAtFixedRate(java.util.TimerTask, + * java.util.Timer#scheduleAtFixedRate(java.util.TimerTask, * java.util.Date, long) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "scheduleAtFixedRate", - args = {java.util.TimerTask.class, java.util.Date.class, long.class} - ) public void test_scheduleAtFixedRateLjava_util_TimerTaskLjava_util_DateJ() { Timer t = null; try { diff --git a/luni/src/test/java/tests/api/java/util/TooManyListenersExceptionTest.java b/luni/src/test/java/tests/api/java/util/TooManyListenersExceptionTest.java index 0479f29..48df5fd 100644 --- a/luni/src/test/java/tests/api/java/util/TooManyListenersExceptionTest.java +++ b/luni/src/test/java/tests/api/java/util/TooManyListenersExceptionTest.java @@ -17,25 +17,13 @@ package tests.api.java.util; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; - import java.util.TooManyListenersException; -@TestTargetClass(TooManyListenersException.class) public class TooManyListenersExceptionTest extends junit.framework.TestCase { /** - * @tests java.util.TooManyListenersException#TooManyListenersException() + * java.util.TooManyListenersException#TooManyListenersException() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "TooManyListenersException", - args = {} - ) public void test_Constructor() { // Test for method java.util.TooManyListenersException() try { @@ -48,14 +36,8 @@ public class TooManyListenersExceptionTest extends junit.framework.TestCase { } /** - * @tests java.util.TooManyListenersException#TooManyListenersException(java.lang.String) + * java.util.TooManyListenersException#TooManyListenersException(java.lang.String) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "TooManyListenersException", - args = {java.lang.String.class} - ) public void test_ConstructorLjava_lang_String() { // Test for method java.util.TooManyListenersException(java.lang.String) try { diff --git a/luni/src/test/java/tests/api/java/util/VectorTest.java b/luni/src/test/java/tests/api/java/util/VectorTest.java index dceb203..6228cb3 100644 --- a/luni/src/test/java/tests/api/java/util/VectorTest.java +++ b/luni/src/test/java/tests/api/java/util/VectorTest.java @@ -17,11 +17,6 @@ package tests.api.java.util; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; - import java.util.Arrays; import java.util.Collection; import java.util.Enumeration; @@ -34,7 +29,6 @@ import java.util.Vector; import tests.support.Support_ListTest; -@TestTargetClass(Vector.class) public class VectorTest extends junit.framework.TestCase { private Vector tVector = new Vector(); @@ -44,14 +38,8 @@ public class VectorTest extends junit.framework.TestCase { private String vString = "[Test 0, Test 1, Test 2, Test 3, Test 4, Test 5, Test 6, Test 7, Test 8, Test 9, Test 10, Test 11, Test 12, Test 13, Test 14, Test 15, Test 16, Test 17, Test 18, Test 19, Test 20, Test 21, Test 22, Test 23, Test 24, Test 25, Test 26, Test 27, Test 28, Test 29, Test 30, Test 31, Test 32, Test 33, Test 34, Test 35, Test 36, Test 37, Test 38, Test 39, Test 40, Test 41, Test 42, Test 43, Test 44, Test 45, Test 46, Test 47, Test 48, Test 49, Test 50, Test 51, Test 52, Test 53, Test 54, Test 55, Test 56, Test 57, Test 58, Test 59, Test 60, Test 61, Test 62, Test 63, Test 64, Test 65, Test 66, Test 67, Test 68, Test 69, Test 70, Test 71, Test 72, Test 73, Test 74, Test 75, Test 76, Test 77, Test 78, Test 79, Test 80, Test 81, Test 82, Test 83, Test 84, Test 85, Test 86, Test 87, Test 88, Test 89, Test 90, Test 91, Test 92, Test 93, Test 94, Test 95, Test 96, Test 97, Test 98, Test 99]"; /** - * @tests java.util.Vector#Vector() + * java.util.Vector#Vector() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "Vector", - args = {} - ) public void test_Constructor() { // Test for method java.util.Vector() @@ -71,14 +59,8 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#Vector(int) + * java.util.Vector#Vector(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "Vector", - args = {int.class} - ) public void test_ConstructorI() { // Test for method java.util.Vector(int) @@ -95,14 +77,8 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#Vector(int, int) + * java.util.Vector#Vector(int, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "Vector", - args = {int.class, int.class} - ) public void test_ConstructorII() { // Test for method java.util.Vector(int, int) @@ -131,14 +107,8 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#Vector(java.util.Collection) + * java.util.Vector#Vector(java.util.Collection) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "Vector", - args = {java.util.Collection.class} - ) public void test_ConstructorLjava_util_Collection() { // Test for method java.util.Vector(java.util.Collection) Collection l = new LinkedList(); @@ -160,14 +130,8 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#add(int, java.lang.Object) + * java.util.Vector#add(int, java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "add", - args = {int.class, java.lang.Object.class} - ) public void test_addILjava_lang_Object() { // Test for method void java.util.Vector.add(int, java.lang.Object) Object o = new Object(); @@ -200,14 +164,8 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#add(java.lang.Object) + * java.util.Vector#add(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "add", - args = {java.lang.Object.class} - ) public void test_addLjava_lang_Object() { // Test for method boolean java.util.Vector.add(java.lang.Object) Object o = new Object(); @@ -221,14 +179,8 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#addAll(int, java.util.Collection) + * java.util.Vector#addAll(int, java.util.Collection) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "addAll", - args = {int.class, java.util.Collection.class} - ) public void test_addAllILjava_util_Collection() { // Test for method boolean java.util.Vector.addAll(int, // java.util.Collection) @@ -286,14 +238,8 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#addAll(java.util.Collection) + * java.util.Vector#addAll(java.util.Collection) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "addAll", - args = {java.util.Collection.class} - ) public void test_addAllLjava_util_Collection() { // Test for method boolean java.util.Vector.addAll(java.util.Collection) Vector v = new Vector(); @@ -330,14 +276,8 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#addElement(java.lang.Object) + * java.util.Vector#addElement(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "addElement", - args = {java.lang.Object.class} - ) public void test_addElementLjava_lang_Object() { // Test for method void java.util.Vector.addElement(java.lang.Object) Vector v = vectorClone(tVector); @@ -351,14 +291,8 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#addElement(java.lang.Object) + * java.util.Vector#addElement(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "addElement", - args = {java.lang.Object.class} - ) public void test_addElementLjava_lang_Object_subtest0() { // Test for method void java.util.Vector.addElement(java.lang.Object) Vector v = vectorClone(tVector); @@ -372,14 +306,8 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#capacity() + * java.util.Vector#capacity() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "capacity", - args = {} - ) public void test_capacity() { // Test for method int java.util.Vector.capacity() @@ -388,14 +316,8 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#clear() + * java.util.Vector#clear() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "clear", - args = {} - ) public void test_clear() { // Test for method void java.util.Vector.clear() Vector orgVector = vectorClone(tVector); @@ -416,14 +338,8 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#clone() + * java.util.Vector#clone() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "clone", - args = {} - ) public void test_clone() { // Test for method java.lang.Object java.util.Vector.clone() tVector.add(25, null); @@ -442,14 +358,8 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#contains(java.lang.Object) + * java.util.Vector#contains(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "contains", - args = {java.lang.Object.class} - ) public void test_containsLjava_lang_Object() { // Test for method boolean java.util.Vector.contains(java.lang.Object) assertTrue("Did not find element", tVector.contains("Test 42")); @@ -464,14 +374,8 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#containsAll(java.util.Collection) + * java.util.Vector#containsAll(java.util.Collection) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "containsAll", - args = {java.util.Collection.class} - ) public void test_containsAllLjava_util_Collection() { // Test for method boolean // java.util.Vector.containsAll(java.util.Collection) @@ -501,14 +405,8 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#copyInto(java.lang.Object[]) + * java.util.Vector#copyInto(java.lang.Object[]) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "copyInto", - args = {java.lang.Object[].class} - ) public void test_copyInto$Ljava_lang_Object() { // Test for method void java.util.Vector.copyInto(java.lang.Object []) @@ -528,14 +426,8 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#elementAt(int) + * java.util.Vector#elementAt(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "elementAt", - args = {int.class} - ) public void test_elementAtI() { // Test for method java.lang.Object java.util.Vector.elementAt(int) assertEquals("Incorrect element returned", "Test 18", ((String) tVector @@ -560,14 +452,8 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#elements() + * java.util.Vector#elements() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "elements", - args = {} - ) public void test_elements() { // Test for method java.util.Enumeration java.util.Vector.elements() tVector.insertElementAt(null, 20); @@ -582,14 +468,8 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#elements() + * java.util.Vector#elements() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "elements", - args = {} - ) public void test_elements_subtest0() { final int iterations = 10000; final Vector v = new Vector(); @@ -619,14 +499,8 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#ensureCapacity(int) + * java.util.Vector#ensureCapacity(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "ensureCapacity", - args = {int.class} - ) public void test_ensureCapacityI() { // Test for method void java.util.Vector.ensureCapacity(int) @@ -639,14 +513,8 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#equals(java.lang.Object) + * java.util.Vector#equals(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "equals", - args = {java.lang.Object.class} - ) public void test_equalsLjava_lang_Object() { // Test for method boolean java.util.Vector.equals(java.lang.Object) Vector v = new Vector(); @@ -662,14 +530,8 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#firstElement() + * java.util.Vector#firstElement() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "firstElement", - args = {} - ) public void test_firstElement() { // Test for method java.lang.Object java.util.Vector.firstElement() assertEquals("Returned incorrect firstElement", "Test 0", tVector.firstElement() @@ -689,14 +551,8 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#get(int) + * java.util.Vector#get(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "get", - args = {int.class} - ) public void test_getI() { // Test for method java.lang.Object java.util.Vector.get(int) assertEquals("Get returned incorrect object", @@ -721,14 +577,8 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#hashCode() + * java.util.Vector#hashCode() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hashCode", - args = {} - ) public void test_hashCode() { // Test for method int java.util.Vector.hashCode() int hashCode = 1; // one @@ -742,14 +592,8 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#indexOf(java.lang.Object) + * java.util.Vector#indexOf(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "indexOf", - args = {java.lang.Object.class} - ) public void test_indexOfLjava_lang_Object() { // Test for method int java.util.Vector.indexOf(java.lang.Object) assertEquals("Incorrect index returned", 10, tVector.indexOf("Test 10")); @@ -762,14 +606,8 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#indexOf(java.lang.Object, int) + * java.util.Vector#indexOf(java.lang.Object, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "indexOf", - args = {java.lang.Object.class, int.class} - ) public void test_indexOfLjava_lang_ObjectI() { // Test for method int java.util.Vector.indexOf(java.lang.Object, int) assertTrue("Failed to find correct index", (tVector.indexOf("Test 98", @@ -793,14 +631,8 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#insertElementAt(java.lang.Object, int) + * java.util.Vector#insertElementAt(java.lang.Object, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "insertElementAt", - args = {java.lang.Object.class, int.class} - ) public void test_insertElementAtLjava_lang_ObjectI() { // Test for method void // java.util.Vector.insertElementAt(java.lang.Object, int) @@ -830,14 +662,8 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#isEmpty() + * java.util.Vector#isEmpty() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isEmpty", - args = {} - ) public void test_isEmpty() { // Test for method boolean java.util.Vector.isEmpty()Vector Vector v = new java.util.Vector(); @@ -847,14 +673,8 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#isEmpty() + * java.util.Vector#isEmpty() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isEmpty", - args = {} - ) public void test_isEmpty_subtest0() { final Vector v = new Vector(); v.addElement("initial"); @@ -884,14 +704,8 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#lastElement() + * java.util.Vector#lastElement() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "lastElement", - args = {} - ) public void test_lastElement() { // Test for method java.lang.Object java.util.Vector.lastElement() assertEquals("Incorrect last element returned", "Test 99", tVector.lastElement() @@ -911,14 +725,8 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#lastIndexOf(java.lang.Object) + * java.util.Vector#lastIndexOf(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "lastIndexOf", - args = {java.lang.Object.class} - ) public void test_lastIndexOfLjava_lang_Object() { // Test for method int java.util.Vector.lastIndexOf(java.lang.Object) Vector v = new Vector(9); @@ -933,14 +741,8 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#lastIndexOf(java.lang.Object, int) + * java.util.Vector#lastIndexOf(java.lang.Object, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "lastIndexOf", - args = {java.lang.Object.class, int.class} - ) public void test_lastIndexOfLjava_lang_ObjectI() { // Test for method int java.util.Vector.lastIndexOf(java.lang.Object, // int) @@ -967,14 +769,8 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#remove(int) + * java.util.Vector#remove(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "remove", - args = {int.class} - ) public void test_removeI() { // Test for method java.lang.Object java.util.Vector.remove(int) tVector.remove(36); @@ -1006,14 +802,8 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#remove(java.lang.Object) + * java.util.Vector#remove(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "remove", - args = {java.lang.Object.class} - ) public void test_removeLjava_lang_Object() { // Test for method boolean java.util.Vector.remove(java.lang.Object) tVector.remove("Test 0"); @@ -1029,14 +819,8 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#removeAll(java.util.Collection) + * java.util.Vector#removeAll(java.util.Collection) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "removeAll", - args = {java.util.Collection.class} - ) public void test_removeAllLjava_util_Collection() { // Test for method boolean // java.util.Vector.removeAll(java.util.Collection) @@ -1074,14 +858,8 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#removeAllElements() + * java.util.Vector#removeAllElements() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "removeAllElements", - args = {} - ) public void test_removeAllElements() { // Test for method void java.util.Vector.removeAllElements() Vector v = vectorClone(tVector); @@ -1090,14 +868,8 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#removeElement(java.lang.Object) + * java.util.Vector#removeElement(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Doesn't check negative case.", - method = "removeElement", - args = {java.lang.Object.class} - ) public void test_removeElementLjava_lang_Object() { // Test for method boolean // java.util.Vector.removeElement(java.lang.Object) @@ -1114,14 +886,8 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#removeElementAt(int) + * java.util.Vector#removeElementAt(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "removeElementAt", - args = {int.class} - ) public void test_removeElementAtI() { // Test for method void java.util.Vector.removeElementAt(int) Vector v = vectorClone(tVector); @@ -1148,14 +914,8 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#retainAll(java.util.Collection) + * java.util.Vector#retainAll(java.util.Collection) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "retainAll", - args = {java.util.Collection.class} - ) public void test_retainAllLjava_util_Collection() { // Test for method boolean // java.util.Vector.retainAll(java.util.Collection) @@ -1183,14 +943,8 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#set(int, java.lang.Object) + * java.util.Vector#set(int, java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "set", - args = {int.class, java.lang.Object.class} - ) public void test_setILjava_lang_Object() { // Test for method java.lang.Object java.util.Vector.set(int, // java.lang.Object) @@ -1214,14 +968,8 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#setElementAt(java.lang.Object, int) + * java.util.Vector#setElementAt(java.lang.Object, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setElementAt", - args = {java.lang.Object.class, int.class} - ) public void test_setElementAtLjava_lang_ObjectI() { // Test for method void java.util.Vector.setElementAt(java.lang.Object, // int) @@ -1246,14 +994,8 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#setSize(int) + * java.util.Vector#setSize(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setSize", - args = {int.class} - ) public void test_setSizeI() { // Test for method void java.util.Vector.setSize(int) Vector v = vectorClone(tVector); @@ -1269,14 +1011,8 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#size() + * java.util.Vector#size() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "size", - args = {} - ) public void test_size() { // Test for method int java.util.Vector.size() assertEquals("Returned incorrect size", 100, tVector.size()); @@ -1309,14 +1045,8 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#subList(int, int) + * java.util.Vector#subList(int, int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "subList", - args = {int.class, int.class} - ) public void test_subListII() { // Test for method java.util.List java.util.Vector.subList(int, int) List sl = tVector.subList(10, 25); @@ -1351,14 +1081,8 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#toArray() + * java.util.Vector#toArray() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toArray", - args = {} - ) public void test_toArray() { // Test for method java.lang.Object [] java.util.Vector.toArray() assertTrue("Returned incorrect array", Arrays.equals(objArray, tVector @@ -1366,14 +1090,8 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#toArray(java.lang.Object[]) + * java.util.Vector#toArray(java.lang.Object[]) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toArray", - args = {java.lang.Object[].class} - ) public void test_toArray$Ljava_lang_Object() { // Test for method java.lang.Object [] // java.util.Vector.toArray(java.lang.Object []) @@ -1405,14 +1123,8 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#toString() + * java.util.Vector#toString() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {} - ) public void test_toString() { // Test for method java.lang.String java.util.Vector.toString() assertTrue("Incorrect String returned", tVector.toString().equals( @@ -1429,14 +1141,8 @@ public class VectorTest extends junit.framework.TestCase { } /** - * @tests java.util.Vector#trimToSize() + * java.util.Vector#trimToSize() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "trimToSize", - args = {} - ) public void test_trimToSize() { // Test for method void java.util.Vector.trimToSize() Vector v = new Vector(10); @@ -1452,12 +1158,6 @@ public class VectorTest extends junit.framework.TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "removeRange", - args = {int.class, int.class} - ) public void test_removeRangeII() { Mock_Vector mv = new Mock_Vector(); mv.add("First"); diff --git a/luni/src/test/java/tests/api/java/util/WeakHashMapTest.java b/luni/src/test/java/tests/api/java/util/WeakHashMapTest.java index 2ed2318..0e43bf6 100644 --- a/luni/src/test/java/tests/api/java/util/WeakHashMapTest.java +++ b/luni/src/test/java/tests/api/java/util/WeakHashMapTest.java @@ -17,11 +17,6 @@ package tests.api.java.util; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; - import java.util.AbstractMap; import java.util.Arrays; import java.util.Collection; @@ -33,7 +28,6 @@ import java.util.WeakHashMap; import tests.support.Support_MapTest2; -@TestTargetClass(WeakHashMap.class) public class WeakHashMapTest extends junit.framework.TestCase { class MockMap extends AbstractMap { public Set entrySet() { @@ -51,22 +45,8 @@ public class WeakHashMapTest extends junit.framework.TestCase { WeakHashMap whm; /** - * @tests java.util.WeakHashMap#WeakHashMap() + * java.util.WeakHashMap#WeakHashMap() */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "WeakHashMap", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "get", - args = {java.lang.Object.class} - ) - }) public void test_Constructor() { // Test for method java.util.WeakHashMap() new Support_MapTest2(new WeakHashMap()).runTest(); @@ -81,22 +61,8 @@ public class WeakHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.WeakHashMap#WeakHashMap(int) + * java.util.WeakHashMap#WeakHashMap(int) */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "WeakHashMap", - args = {int.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "get", - args = {java.lang.Object.class} - ) - }) public void test_ConstructorI() { // Test for method java.util.WeakHashMap(int) whm = new WeakHashMap(50); @@ -120,22 +86,8 @@ public class WeakHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.WeakHashMap#WeakHashMap(int, float) + * java.util.WeakHashMap#WeakHashMap(int, float) */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "WeakHashMap", - args = {int.class, float.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "get", - args = {java.lang.Object.class} - ) - }) public void test_ConstructorIF() { // Test for method java.util.WeakHashMap(int, float) whm = new WeakHashMap(50, 0.5f); @@ -166,14 +118,8 @@ public class WeakHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.WeakHashMap#WeakHashMap(java.util.Map) + * java.util.WeakHashMap#WeakHashMap(java.util.Map) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "WeakHashMap", - args = {java.util.Map.class} - ) public void test_ConstructorLjava_util_Map() { Map mockMap = new MockMap(); WeakHashMap map = new WeakHashMap(mockMap); @@ -188,22 +134,8 @@ public class WeakHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.WeakHashMap#clear() + * java.util.WeakHashMap#clear() */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "clear", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "get", - args = {java.lang.Object.class} - ) - }) public void test_clear() { // Test for method boolean java.util.WeakHashMap.clear() whm = new WeakHashMap(); @@ -218,14 +150,8 @@ public class WeakHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.WeakHashMap#containsKey(java.lang.Object) + * java.util.WeakHashMap#containsKey(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "containsKey", - args = {java.lang.Object.class} - ) public void test_containsKeyLjava_lang_Object() { // Test for method boolean java.util.WeakHashMap.containsKey() whm = new WeakHashMap(); @@ -239,14 +165,8 @@ public class WeakHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.WeakHashMap#containsValue(java.lang.Object) + * java.util.WeakHashMap#containsValue(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "containsValue", - args = {java.lang.Object.class} - ) public void test_containsValueLjava_lang_Object() { // Test for method boolean java.util.WeakHashMap.containsValue() whm = new WeakHashMap(); @@ -260,14 +180,8 @@ public class WeakHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.WeakHashMap#entrySet() + * java.util.WeakHashMap#entrySet() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "entrySet", - args = {} - ) public void test_entrySet() { // Test for method java.util.Set java.util.WeakHashMap.entrySet() whm = new WeakHashMap(); @@ -304,14 +218,8 @@ public class WeakHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.WeakHashMap#isEmpty() + * java.util.WeakHashMap#isEmpty() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isEmpty", - args = {} - ) public void test_isEmpty() { // Test for method boolean java.util.WeakHashMap.isEmpty() whm = new WeakHashMap(); @@ -324,14 +232,8 @@ public class WeakHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.WeakHashMap#put(java.lang.Object, java.lang.Object) + * java.util.WeakHashMap#put(java.lang.Object, java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "put", - args = {java.lang.Object.class, java.lang.Object.class} - ) public void test_putLjava_lang_ObjectLjava_lang_Object() { // Test for method java.lang.Object // java.util.WeakHashMap.put(java.lang.Object, java.lang.Object) @@ -344,14 +246,8 @@ public class WeakHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.WeakHashMap#putAll(java.util.Map) + * java.util.WeakHashMap#putAll(java.util.Map) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "putAll", - args = {java.util.Map.class} - ) public void test_putAllLjava_util_Map() { Map mockMap=new MockMap(); WeakHashMap map = new WeakHashMap(); @@ -367,14 +263,8 @@ public class WeakHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.WeakHashMap#remove(java.lang.Object) + * java.util.WeakHashMap#remove(java.lang.Object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "remove", - args = {java.lang.Object.class} - ) public void test_removeLjava_lang_Object() { // Test for method java.lang.Object // java.util.WeakHashMap.remove(java.lang.Object) @@ -390,36 +280,16 @@ public class WeakHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.WeakHashMap#size() + * java.util.WeakHashMap#size() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "size", - args = {} - ) public void test_size() { whm = new WeakHashMap(); assertEquals(0, whm.size()); } /** - * @tests java.util.WeakHashMap#keySet() + * java.util.WeakHashMap#keySet() */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "keySet", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "size", - args = {} - ) - }) public void test_keySet() { // Test for method java.util.Set java.util.WeakHashMap.keySet() whm = new WeakHashMap(); @@ -454,22 +324,8 @@ public class WeakHashMapTest extends junit.framework.TestCase { } /** - * @tests java.util.WeakHashMap#values() + * java.util.WeakHashMap#values() */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "values", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "size", - args = {} - ) - }) public void test_values() { // Test for method java.util.Set java.util.WeakHashMap.values() whm = new WeakHashMap(); diff --git a/luni/src/test/java/tests/api/javax/net/ServerSocketFactoryTest.java b/luni/src/test/java/tests/api/javax/net/ServerSocketFactoryTest.java index 39c3a68..053200f 100644 --- a/luni/src/test/java/tests/api/javax/net/ServerSocketFactoryTest.java +++ b/luni/src/test/java/tests/api/javax/net/ServerSocketFactoryTest.java @@ -22,10 +22,6 @@ package tests.api.javax.net; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.io.IOException; import java.net.InetAddress; import java.net.ServerSocket; @@ -40,18 +36,11 @@ import tests.support.Support_PortManager; /** * Tests for <code>ServerSocketFactory</code> class constructors and methods. */ -@TestTargetClass(ServerSocketFactory.class) public class ServerSocketFactoryTest extends TestCase { /** - * @tests javax.net.SocketFactory#SocketFactory() + * javax.net.SocketFactory#SocketFactory() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "ServerSocketFactory", - args = {} - ) public void test_Constructor() { try { ServerSocketFactory sf = new MyServerSocketFactory(); @@ -61,14 +50,8 @@ public class ServerSocketFactoryTest extends TestCase { } /** - * @tests javax.net.ServerSocketFactory#createServerSocket() + * javax.net.ServerSocketFactory#createServerSocket() */ - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "IOException checking missed", - method = "createServerSocket", - args = {} - ) public final void test_createServerSocket_01() { ServerSocketFactory sf = ServerSocketFactory.getDefault(); try { @@ -81,14 +64,8 @@ public class ServerSocketFactoryTest extends TestCase { } /** - * @tests javax.net.ServerSocketFactory#createServerSocket(int port) + * javax.net.ServerSocketFactory#createServerSocket(int port) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "createServerSocket", - args = {int.class} - ) public final void test_createServerSocket_02() { ServerSocketFactory sf = ServerSocketFactory.getDefault(); int portNumber = Support_PortManager.getNextPort(); @@ -120,14 +97,8 @@ public class ServerSocketFactoryTest extends TestCase { } /** - * @tests javax.net.ServerSocketFactory#createServerSocket(int port, int backlog) + * javax.net.ServerSocketFactory#createServerSocket(int port, int backlog) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "createServerSocket", - args = {int.class, int.class} - ) public final void test_createServerSocket_03() { ServerSocketFactory sf = ServerSocketFactory.getDefault(); int portNumber = Support_PortManager.getNextPort(); @@ -159,14 +130,8 @@ public class ServerSocketFactoryTest extends TestCase { } /** - * @tests javax.net.ServerSocketFactory#createServerSocket(int port, int backlog, InetAddress ifAddress) + * javax.net.ServerSocketFactory#createServerSocket(int port, int backlog, InetAddress ifAddress) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "createServerSocket", - args = {int.class, int.class, InetAddress.class} - ) public final void test_createServerSocket_04() { ServerSocketFactory sf = ServerSocketFactory.getDefault(); int portNumber = Support_PortManager.getNextPort(); @@ -198,14 +163,8 @@ public class ServerSocketFactoryTest extends TestCase { } /** - * @tests javax.net.ServerSocketFactory#getDefault() + * javax.net.ServerSocketFactory#getDefault() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getDefault", - args = {} - ) public final void test_getDefault() { ServerSocketFactory sf = ServerSocketFactory.getDefault(); ServerSocket s; @@ -248,4 +207,4 @@ class MyServerSocketFactory extends ServerSocketFactory { InetAddress address) throws IOException { return null; } -}
\ No newline at end of file +} diff --git a/luni/src/test/java/tests/api/javax/net/SocketFactoryTest.java b/luni/src/test/java/tests/api/javax/net/SocketFactoryTest.java index c254095..2250602 100644 --- a/luni/src/test/java/tests/api/javax/net/SocketFactoryTest.java +++ b/luni/src/test/java/tests/api/javax/net/SocketFactoryTest.java @@ -22,10 +22,6 @@ package tests.api.javax.net; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.io.IOException; import java.net.InetAddress; import java.net.ServerSocket; @@ -43,18 +39,11 @@ import tests.support.Support_PortManager; /** * Tests for <code>SocketFactory</code> class methods. */ -@TestTargetClass(SocketFactory.class) public class SocketFactoryTest extends TestCase { /** - * @tests javax.net.SocketFactory#SocketFactory() + * javax.net.SocketFactory#SocketFactory() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "SocketFactory", - args = {} - ) public void test_Constructor() { try { MySocketFactory sf = new MySocketFactory(); @@ -64,14 +53,8 @@ public class SocketFactoryTest extends TestCase { } /** - * @tests javax.net.SocketFactory#createSocket() + * javax.net.SocketFactory#createSocket() */ - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "IOException check missed", - method = "createSocket", - args = {} - ) public final void test_createSocket_01() { SocketFactory sf = SocketFactory.getDefault(); @@ -95,14 +78,8 @@ public class SocketFactoryTest extends TestCase { } /** - * @tests javax.net.SocketFactory#createSocket(String host, int port) + * javax.net.SocketFactory#createSocket(String host, int port) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "createSocket", - args = {String.class, int.class} - ) public final void test_createSocket_02() { SocketFactory sf = SocketFactory.getDefault(); int portNumber = Support_PortManager.getNextPort(); @@ -153,14 +130,8 @@ public class SocketFactoryTest extends TestCase { } /** - * @tests javax.net.SocketFactory#createSocket(InetAddress host, int port) + * javax.net.SocketFactory#createSocket(InetAddress host, int port) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "createSocket", - args = {InetAddress.class, int.class} - ) public final void test_createSocket_03() { SocketFactory sf = SocketFactory.getDefault(); int portNumber = Support_PortManager.getNextPort(); @@ -202,15 +173,9 @@ public class SocketFactoryTest extends TestCase { } /** - * @tests javax.net.SocketFactory#createSocket(InetAddress address, int port, + * javax.net.SocketFactory#createSocket(InetAddress address, int port, * InetAddress localAddress, int localPort) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "createSocket", - args = {InetAddress.class, int.class, InetAddress.class, int.class} - ) public final void test_createSocket_04() { SocketFactory sf = SocketFactory.getDefault(); int portNumber = Support_PortManager.getNextPort(); @@ -266,15 +231,9 @@ public class SocketFactoryTest extends TestCase { } /** - * @tests javax.net.SocketFactory#createSocket(String host, int port, + * javax.net.SocketFactory#createSocket(String host, int port, * InetAddress localHost, int localPort) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "createSocket", - args = {String.class, int.class, InetAddress.class, int.class} - ) public final void test_createSocket_05() { SocketFactory sf = SocketFactory.getDefault(); int portNumber = Support_PortManager.getNextPort(); @@ -332,14 +291,8 @@ public class SocketFactoryTest extends TestCase { } /** - * @tests javax.net.SocketFactory#getDefault() + * javax.net.SocketFactory#getDefault() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getDefault", - args = {} - ) public final void test_getDefault() { SocketFactory sf = SocketFactory.getDefault(); Socket s; diff --git a/luni/src/test/java/tests/api/javax/net/ssl/CertPathTrustManagerParametersTest.java b/luni/src/test/java/tests/api/javax/net/ssl/CertPathTrustManagerParametersTest.java index df4083d..41407e8 100644 --- a/luni/src/test/java/tests/api/javax/net/ssl/CertPathTrustManagerParametersTest.java +++ b/luni/src/test/java/tests/api/javax/net/ssl/CertPathTrustManagerParametersTest.java @@ -17,11 +17,6 @@ package tests.api.javax.net.ssl; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.cert.CertPathParameters; import javax.net.ssl.CertPathTrustManagerParameters; @@ -32,21 +27,14 @@ import junit.framework.TestCase; * and methods. * */ -@TestTargetClass(CertPathTrustManagerParameters.class) public class CertPathTrustManagerParametersTest extends TestCase { /** - * @tests javax.net.ssl.CertPathTrustManagerParameters# + * javax.net.ssl.CertPathTrustManagerParameters# * CertPathTrustManagerParameters(java.security.cert.CertPathParameters) * Case 1: Try to construct object. * Case 2: Check NullPointerException. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "CertPathTrustManagerParameters", - args = {java.security.cert.CertPathParameters.class} - ) public void test_ConstructorLjava_security_cert_CertPathParameters() { // case 1: Try to construct object. try { @@ -69,14 +57,8 @@ public class CertPathTrustManagerParametersTest extends TestCase { } /** - * @tests javax.net.ssl.CertPathTrustManagerParameters#getParameters() + * javax.net.ssl.CertPathTrustManagerParameters#getParameters() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getParameters", - args = {} - ) public void test_getParameters() { CertPathParameters parameters = new MyCertPathParameters(); CertPathTrustManagerParameters p = new CertPathTrustManagerParameters( diff --git a/luni/src/test/java/tests/api/javax/net/ssl/HandshakeCompletedEventTest.java b/luni/src/test/java/tests/api/javax/net/ssl/HandshakeCompletedEventTest.java index 9aa9612..14e2f2f 100644 --- a/luni/src/test/java/tests/api/javax/net/ssl/HandshakeCompletedEventTest.java +++ b/luni/src/test/java/tests/api/javax/net/ssl/HandshakeCompletedEventTest.java @@ -18,10 +18,6 @@ package tests.api.javax.net.ssl; import dalvik.annotation.AndroidOnly; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -57,7 +53,6 @@ import tests.support.Support_PortManager; * Tests for <code>HandshakeCompletedEvent</code> class constructors and methods. * */ -@TestTargetClass(HandshakeCompletedEvent.class) public class HandshakeCompletedEventTest extends TestCase { String certificate = "-----BEGIN CERTIFICATE-----\n" @@ -79,14 +74,8 @@ public class HandshakeCompletedEventTest extends TestCase { /** * @throws IOException - * @tests javax.net.ssl.HandshakeCompletedEvent#HandshakeCompletedEvent(SSLSocket sock, SSLSession s) + * javax.net.ssl.HandshakeCompletedEvent#HandshakeCompletedEvent(SSLSocket sock, SSLSession s) */ - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "Exceptions for null/incorrect parameters are not provided", - method = "HandshakeCompletedEvent", - args = {javax.net.ssl.SSLSocket.class, javax.net.ssl.SSLSession.class} - ) public final void test_Constructor() throws IOException { mySSLSession session = new mySSLSession(); SSLSocket socket = (SSLSocket) SSLSocketFactory.getDefault().createSocket(); @@ -105,14 +94,8 @@ public class HandshakeCompletedEventTest extends TestCase { /** * @throws IOException - * @tests javax.net.ssl.HandshakeCompletedEvent#getCipherSuite() + * javax.net.ssl.HandshakeCompletedEvent#getCipherSuite() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getCipherSuite", - args = {} - ) public final void test_getCipherSuite() throws IOException { mySSLSession session = new mySSLSession("localhost", 1080, null); SSLSocket socket = (SSLSocket) SSLSocketFactory.getDefault().createSocket(); @@ -126,14 +109,8 @@ public class HandshakeCompletedEventTest extends TestCase { /** * @throws IOException - * @tests javax.net.ssl.HandshakeCompletedEvent#getLocalCertificates() + * javax.net.ssl.HandshakeCompletedEvent#getLocalCertificates() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getLocalCertificates", - args = {} - ) public final void test_getLocalCertificates() throws IOException { mySSLSession session = new mySSLSession("localhost", 1080, null); SSLSocket socket = (SSLSocket) SSLSocketFactory.getDefault().createSocket(); @@ -147,14 +124,8 @@ public class HandshakeCompletedEventTest extends TestCase { /** * @throws IOException - * @tests javax.net.ssl.HandshakeCompletedEvent#getLocalPrincipal() + * javax.net.ssl.HandshakeCompletedEvent#getLocalPrincipal() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getLocalPrincipal", - args = {} - ) public final void test_getLocalPrincipal() throws IOException { mySSLSession session = new mySSLSession("localhost", 1080, null); SSLSocket socket = (SSLSocket) SSLSocketFactory.getDefault().createSocket(); @@ -168,14 +139,8 @@ public class HandshakeCompletedEventTest extends TestCase { /** * @throws IOException - * @tests javax.net.ssl.HandshakeCompletedEvent#getPeerCertificateChain() + * javax.net.ssl.HandshakeCompletedEvent#getPeerCertificateChain() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPeerCertificateChain", - args = {} - ) public final void test_getPeerCertificateChain() throws IOException { ByteArrayInputStream bis = new ByteArrayInputStream(certificate.getBytes()); mySSLSession session = new mySSLSession((X509Certificate[]) null); @@ -206,14 +171,8 @@ public class HandshakeCompletedEventTest extends TestCase { /** * @throws IOException - * @tests javax.net.ssl.HandshakeCompletedEvent#getPeerCertificates() + * javax.net.ssl.HandshakeCompletedEvent#getPeerCertificates() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPeerCertificates", - args = {} - ) public final void test_getPeerCertificates() throws IOException { mySSLSession session = new mySSLSession("localhost", 1080, null); SSLSocket socket = (SSLSocket) SSLSocketFactory.getDefault().createSocket(); @@ -237,14 +196,8 @@ public class HandshakeCompletedEventTest extends TestCase { /** * @throws IOException - * @tests javax.net.ssl.HandshakeCompletedEvent#getPeerPrincipal() + * javax.net.ssl.HandshakeCompletedEvent#getPeerPrincipal() */ - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "", - method = "getPeerPrincipal", - args = {} - ) public final void test_getPeerPrincipal() throws IOException { mySSLSession session = new mySSLSession("localhost", 1080, null); SSLSocket socket = (SSLSocket) SSLSocketFactory.getDefault().createSocket(); @@ -258,14 +211,8 @@ public class HandshakeCompletedEventTest extends TestCase { /** * @throws IOException - * @tests javax.net.ssl.HandshakeCompletedEvent#getSession() + * javax.net.ssl.HandshakeCompletedEvent#getSession() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSession", - args = {} - ) public final void test_getSession() throws IOException { mySSLSession session = new mySSLSession("localhost", 1080, null); SSLSocket socket = (SSLSocket) SSLSocketFactory.getDefault().createSocket(); @@ -281,14 +228,8 @@ public class HandshakeCompletedEventTest extends TestCase { /** * @throws IOException - * @tests javax.net.ssl.HandshakeCompletedEvent#getSocket() + * javax.net.ssl.HandshakeCompletedEvent#getSocket() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSocket", - args = {} - ) public final void test_getSocket() throws IOException { SSLSocket socket = (SSLSocket) SSLSocketFactory.getDefault().createSocket(); HandshakeCompletedEvent event = new HandshakeCompletedEvent(socket, null); @@ -442,22 +383,6 @@ public class HandshakeCompletedEventTest extends TestCase { * because our self-signed test certificates are not valid.) */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - clazz = SSLSocket.class, - method = "addHandshakeCompletedListener", - args = {HandshakeCompletedListener.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - clazz = HandshakeCompletedListener.class, - method = "handshakeCompleted", - args = {HandshakeCompletedEvent.class} - ) - }) @AndroidOnly("Uses bks key store. Change useBKS to false to run on the RI") public void testClientAuth() { diff --git a/luni/src/test/java/tests/api/javax/net/ssl/HttpsURLConnectionTest.java b/luni/src/test/java/tests/api/javax/net/ssl/HttpsURLConnectionTest.java index 3fd8285..3c49fc4 100644 --- a/luni/src/test/java/tests/api/javax/net/ssl/HttpsURLConnectionTest.java +++ b/luni/src/test/java/tests/api/javax/net/ssl/HttpsURLConnectionTest.java @@ -18,10 +18,6 @@ package tests.api.javax.net.ssl; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.io.ByteArrayInputStream; import java.net.URL; import java.security.Principal; @@ -45,18 +41,11 @@ import junit.framework.TestCase; * Tests for <code>HttpsURLConnection</code> class constructors and methods. * */ -@TestTargetClass(HttpsURLConnection.class) public class HttpsURLConnectionTest extends TestCase { /** - * @tests javax.net.ssl.HttpsURLConnection#HttpsURLConnection(java_net_URL) + * javax.net.ssl.HttpsURLConnection#HttpsURLConnection(java_net_URL) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "HttpsURLConnection", - args = {java.net.URL.class} - ) public final void test_Constructor() { try { MyHttpsURLConnection huc = new MyHttpsURLConnection(new URL("https://www.fortify.net/")); @@ -71,14 +60,8 @@ public class HttpsURLConnectionTest extends TestCase { } /** - * @tests javax.net.ssl.HttpsURLConnection#getCipherSuite() + * javax.net.ssl.HttpsURLConnection#getCipherSuite() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getCipherSuite", - args = {} - ) public final void test_getCipherSuite() { try { URL url = new URL("https://localhost:55555"); @@ -102,14 +85,8 @@ public class HttpsURLConnectionTest extends TestCase { } /** - * @tests javax.net.ssl.HttpsURLConnection#getLocalCertificates() + * javax.net.ssl.HttpsURLConnection#getLocalCertificates() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getLocalCertificates", - args = {} - ) public final void test_getLocalCertificates() { try { URL url = new URL("https://localhost:55555"); @@ -137,14 +114,8 @@ public class HttpsURLConnectionTest extends TestCase { } /** - * @tests javax.net.ssl.HttpsURLConnection#getDefaultHostnameVerifier() + * javax.net.ssl.HttpsURLConnection#getDefaultHostnameVerifier() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getDefaultHostnameVerifier", - args = {} - ) public final void test_getDefaultHostnameVerifier() { HostnameVerifier verifyer = HttpsURLConnection.getDefaultHostnameVerifier(); @@ -152,14 +123,8 @@ public class HttpsURLConnectionTest extends TestCase { } /** - * @tests javax.net.ssl.HttpsURLConnection#getDefaultSSLSocketFactory() + * javax.net.ssl.HttpsURLConnection#getDefaultSSLSocketFactory() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getDefaultSSLSocketFactory", - args = {} - ) public final void test_getDefaultSSLSocketFactory() { SSLSocketFactory sf = HttpsURLConnection.getDefaultSSLSocketFactory(); if (!sf.equals(SSLSocketFactory.getDefault())) { @@ -168,14 +133,8 @@ public class HttpsURLConnectionTest extends TestCase { } /** - * @tests javax.net.ssl.HttpsURLConnection#getHostnameVerifier() + * javax.net.ssl.HttpsURLConnection#getHostnameVerifier() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getHostnameVerifier", - args = {} - ) public final void test_getHostnameVerifier() throws Exception { HttpsURLConnection con = new MyHttpsURLConnection( @@ -187,14 +146,8 @@ public class HttpsURLConnectionTest extends TestCase { } /** - * @tests javax.net.ssl.HttpsURLConnection#getLocalPrincipal() + * javax.net.ssl.HttpsURLConnection#getLocalPrincipal() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getLocalPrincipal", - args = {} - ) public final void test_getLocalPrincipal() { try { URL url = new URL("https://localhost:55555"); @@ -220,14 +173,8 @@ public class HttpsURLConnectionTest extends TestCase { } /** - * @tests javax.net.ssl.HttpsURLConnection#getPeerPrincipal() + * javax.net.ssl.HttpsURLConnection#getPeerPrincipal() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPeerPrincipal", - args = {} - ) public final void test_getPeerPrincipal() throws Exception { try { URL url = new URL("https://localhost:55555"); @@ -259,14 +206,8 @@ public class HttpsURLConnectionTest extends TestCase { } /** - * @tests javax.net.ssl.HttpsURLConnection#getServerCertificates() + * javax.net.ssl.HttpsURLConnection#getServerCertificates() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getServerCertificates", - args = {} - ) public final void test_getServerCertificates() throws Exception { try { URL url = new URL("https://localhost:55555"); @@ -300,14 +241,8 @@ public class HttpsURLConnectionTest extends TestCase { } /** - * @tests javax.net.ssl.HttpsURLConnection#getSSLSocketFactory() + * javax.net.ssl.HttpsURLConnection#getSSLSocketFactory() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSSLSocketFactory", - args = {} - ) public final void test_getSSLSocketFactory() { HttpsURLConnection con = new MyHttpsURLConnection(null); SSLSocketFactory sf = con.getSSLSocketFactory(); @@ -317,14 +252,8 @@ public class HttpsURLConnectionTest extends TestCase { } /** - * @tests javax.net.ssl.HttpsURLConnection#setDefaultHostnameVerifier() + * javax.net.ssl.HttpsURLConnection#setDefaultHostnameVerifier() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setDefaultHostnameVerifier", - args = {javax.net.ssl.HostnameVerifier.class} - ) public final void test_setDefaultHostnameVerifier() { try { HttpsURLConnection.setDefaultHostnameVerifier(null); @@ -345,14 +274,8 @@ public class HttpsURLConnectionTest extends TestCase { } /** - * @tests javax.net.ssl.HttpsURLConnection#setHostnameVerifier() + * javax.net.ssl.HttpsURLConnection#setHostnameVerifier() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setHostnameVerifier", - args = {javax.net.ssl.HostnameVerifier.class} - ) public final void test_setHostnameVerifier() { HttpsURLConnection con = new MyHttpsURLConnection(null); try { @@ -369,14 +292,8 @@ public class HttpsURLConnectionTest extends TestCase { } /** - * @tests javax.net.ssl.HttpsURLConnection#setDefaultSSLSocketFactory() + * javax.net.ssl.HttpsURLConnection#setDefaultSSLSocketFactory() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setDefaultSSLSocketFactory", - args = {javax.net.ssl.SSLSocketFactory.class} - ) public final void test_setDefaultSSLSocketFactory() { try { HttpsURLConnection.setDefaultSSLSocketFactory(null); @@ -393,14 +310,8 @@ public class HttpsURLConnectionTest extends TestCase { } /** - * @tests javax.net.ssl.HttpsURLConnection#setSSLSocketFactory() + * javax.net.ssl.HttpsURLConnection#setSSLSocketFactory() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setSSLSocketFactory", - args = {javax.net.ssl.SSLSocketFactory.class} - ) public final void test_setSSLSocketFactory() { HttpsURLConnection con = new MyHttpsURLConnection(null); try { diff --git a/luni/src/test/java/tests/api/javax/net/ssl/KeyManagerFactory1Test.java b/luni/src/test/java/tests/api/javax/net/ssl/KeyManagerFactory1Test.java index f265044..b369ed9 100644 --- a/luni/src/test/java/tests/api/javax/net/ssl/KeyManagerFactory1Test.java +++ b/luni/src/test/java/tests/api/javax/net/ssl/KeyManagerFactory1Test.java @@ -17,11 +17,6 @@ package tests.api.javax.net.ssl; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.KnownFailure; - import java.io.IOException; import java.security.InvalidAlgorithmParameterException; import java.security.KeyStore; @@ -48,7 +43,6 @@ import junit.framework.TestCase; * Tests for <code>KeyManagerFactory</code> class constructors and methods. * */ -@TestTargetClass(KeyManagerFactory.class) public class KeyManagerFactory1Test extends TestCase { private static final String srvKeyManagerFactory = "KeyManagerFactory"; @@ -101,14 +95,8 @@ public class KeyManagerFactory1Test extends TestCase { } /** - * @tests avax.net.ssl.KeyManagerFactory#getAlgorithm() + * avax.net.ssl.KeyManagerFactory#getAlgorithm() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getAlgorithm", - args = {} - ) public void test_getAlgorithm() throws NoSuchAlgorithmException, NoSuchProviderException { if (!DEFSupported) fail(NotSupportedMsg); @@ -131,12 +119,6 @@ public class KeyManagerFactory1Test extends TestCase { * Test for <code>getDefaultAlgorithm()</code> method * Assertion: returns value which is specifoed in security property */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getDefaultAlgorithm", - args = {} - ) public void test_getDefaultAlgorithm() { if (!DEFSupported) { fail(NotSupportedMsg); @@ -166,12 +148,6 @@ public class KeyManagerFactory1Test extends TestCase { * returns security property "ssl.KeyManagerFactory.algorithm"; * returns instance of KeyManagerFactory */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class} - ) public void test_getInstanceLjava_lang_String01() throws NoSuchAlgorithmException { if (!DEFSupported) { fail(NotSupportedMsg); @@ -192,12 +168,6 @@ public class KeyManagerFactory1Test extends TestCase { * throws NullPointerException when algorithm is null; * throws NoSuchAlgorithmException when algorithm is not correct; */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class} - ) public void test_getInstanceLjava_lang_String02() { try { KeyManagerFactory.getInstance(null); @@ -220,12 +190,6 @@ public class KeyManagerFactory1Test extends TestCase { * method * Assertion: throws IllegalArgumentException when provider is null or empty */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void test_getInstanceLjava_lang_StringLjava_lang_String01() throws NoSuchProviderException, NoSuchAlgorithmException { if (!DEFSupported) { @@ -254,12 +218,6 @@ public class KeyManagerFactory1Test extends TestCase { * throws NullPointerException when algorithm is null; * throws NoSuchAlgorithmException when algorithm is not correct; */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void test_getInstanceLjava_lang_StringLjava_lang_String02() throws NoSuchProviderException { if (!DEFSupported) { fail(NotSupportedMsg); @@ -288,12 +246,6 @@ public class KeyManagerFactory1Test extends TestCase { * Assertion: throws NoSuchProviderException when provider has * invalid value */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void test_getInstanceLjava_lang_StringLjava_lang_String03() throws NoSuchAlgorithmException { if (!DEFSupported) { @@ -318,12 +270,6 @@ public class KeyManagerFactory1Test extends TestCase { * Test for <code>getInstance(String algorithm, String provider)</code> * method Assertion: returns instance of KeyManagerFactory */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void test_getInstanceLjava_lang_StringLjava_lang_String04() throws NoSuchProviderException, NoSuchAlgorithmException { @@ -348,12 +294,6 @@ public class KeyManagerFactory1Test extends TestCase { * method * Assertion: throws IllegalArgumentException when provider is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.security.Provider.class} - ) public void test_getInstanceLjava_lang_StringLjava_security_Provider01() throws NoSuchAlgorithmException { if (!DEFSupported) { @@ -377,12 +317,6 @@ public class KeyManagerFactory1Test extends TestCase { * throws NullPointerException when algorithm is null; * throws NoSuchAlgorithmException when algorithm is not correct; */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.security.Provider.class} - ) public void test_getInstanceLjava_lang_StringLjava_security_Provider02() { if (!DEFSupported) { fail(NotSupportedMsg); @@ -409,12 +343,6 @@ public class KeyManagerFactory1Test extends TestCase { * method * Assertion: returns instance of KeyManagerFactory */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.security.Provider.class} - ) public void test_getInstanceLjava_lang_StringLjava_security_Provider03() throws NoSuchAlgorithmException, IllegalArgumentException { @@ -436,12 +364,6 @@ public class KeyManagerFactory1Test extends TestCase { * Test for <code>KeyManagerFactory</code> constructor * Assertion: returns KeyManagerFactory object */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "KeyManagerFactory", - args = {javax.net.ssl.KeyManagerFactorySpi.class, java.security.Provider.class, java.lang.String.class} - ) public void test_Constructor() throws NoSuchAlgorithmException { if (!DEFSupported) { fail(NotSupportedMsg); @@ -470,19 +392,13 @@ public class KeyManagerFactory1Test extends TestCase { } /** - * @tests avax.net.ssl.KeyManagerFactory#getKeyManagers() + * avax.net.ssl.KeyManagerFactory#getKeyManagers() * @throws NoSuchAlgorithmException * @throws KeyStoreException * @throws IOException * @throws CertificateException * @throws UnrecoverableKeyException */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getKeyManagers", - args = {} - ) public void test_getKeyManagers() throws Exception { if (!DEFSupported) fail(NotSupportedMsg); @@ -495,14 +411,8 @@ public class KeyManagerFactory1Test extends TestCase { } /** - * @tests avax.net.ssl.KeyManagerFactory#getProvider() + * avax.net.ssl.KeyManagerFactory#getProvider() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getProvider", - args = {} - ) public void test_getProvider() throws Exception { if (!DEFSupported) fail(NotSupportedMsg); @@ -526,12 +436,6 @@ public class KeyManagerFactory1Test extends TestCase { * <code>getKeyManagers()</code> * Assertion: returns not empty KeyManager array */ - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "KeyStoreException, NoSuchAlgorithmException, UnrecoverableKeyException checking missed", - method = "init", - args = {java.security.KeyStore.class, char[].class} - ) public void test_initLjava_security_KeyStore$C() throws NoSuchAlgorithmException, KeyStoreException, UnrecoverableKeyException { @@ -579,12 +483,6 @@ public class KeyManagerFactory1Test extends TestCase { * Assertion: * throws InvalidAlgorithmParameterException when params is null */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "functionality is not implemented in org.apache.harmony.xnet.provider.jsse.engineInit(ManagerFactoryParameters)", - method = "init", - args = {javax.net.ssl.ManagerFactoryParameters.class} - ) public void test_initLjavax_net_ssl_ManagerFactoryParameters() throws NoSuchAlgorithmException { @@ -631,4 +529,4 @@ class myKeyManagerFactory extends KeyManagerFactory { class ProtectionParameterImpl implements KeyStore.ProtectionParameter { ProtectionParameterImpl(){} -}
\ No newline at end of file +} diff --git a/luni/src/test/java/tests/api/javax/net/ssl/KeyManagerFactory2Test.java b/luni/src/test/java/tests/api/javax/net/ssl/KeyManagerFactory2Test.java index 2a819cf..3d44396 100644 --- a/luni/src/test/java/tests/api/javax/net/ssl/KeyManagerFactory2Test.java +++ b/luni/src/test/java/tests/api/javax/net/ssl/KeyManagerFactory2Test.java @@ -17,11 +17,6 @@ package tests.api.javax.net.ssl; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.InvalidAlgorithmParameterException; import java.security.KeyStore; import java.security.KeyStoreException; @@ -42,7 +37,6 @@ import junit.framework.TestCase; * Tests for KeyManagerFactory class constructors and methods * */ -@TestTargetClass(KeyManagerFactory.class) public class KeyManagerFactory2Test extends TestCase { private static final String srvKeyManagerFactory = "KeyManagerFactory"; @@ -130,12 +124,6 @@ public class KeyManagerFactory2Test extends TestCase { * throws NoSuchAlgorithmException when algorithm is not correct; * returns KeyManagerFactory object */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class} - ) public void test_getInstanceLjava_lang_String() throws Exception { try { KeyManagerFactory.getInstance(null); @@ -171,12 +159,6 @@ public class KeyManagerFactory2Test extends TestCase { * throws NoSuchProviderException when provider is available; * returns KeyManagerFactory object */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void test_getInstanceLjava_lang_StringLjava_lang_String() throws Exception { @@ -243,12 +225,6 @@ public class KeyManagerFactory2Test extends TestCase { * throws IllegalArgumentException when provider is null; * returns KeyManagerFactory object */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.security.Provider.class} - ) public void test_getInstanceLjava_lang_StringLjava_security_Provider() throws Exception { @@ -284,4 +260,4 @@ public class KeyManagerFactory2Test extends TestCase { checkResult(keyMF); } } -}
\ No newline at end of file +} diff --git a/luni/src/test/java/tests/api/javax/net/ssl/KeyManagerFactorySpiTest.java b/luni/src/test/java/tests/api/javax/net/ssl/KeyManagerFactorySpiTest.java index c8b5674..fd44fda 100644 --- a/luni/src/test/java/tests/api/javax/net/ssl/KeyManagerFactorySpiTest.java +++ b/luni/src/test/java/tests/api/javax/net/ssl/KeyManagerFactorySpiTest.java @@ -15,10 +15,6 @@ */ package tests.api.javax.net.ssl; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.InvalidAlgorithmParameterException; import java.security.KeyStore; import java.security.KeyStoreException; @@ -32,18 +28,11 @@ import junit.framework.TestCase; import org.apache.harmony.xnet.tests.support.KeyManagerFactorySpiImpl; -@TestTargetClass(KeyManagerFactorySpi.class) public class KeyManagerFactorySpiTest extends TestCase { /** - * @tests javax.net.ssl.KeyManagerFactorySpi#KeyManagerFactorySpi() + * javax.net.ssl.KeyManagerFactorySpi#KeyManagerFactorySpi() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "KeyManagerFactorySpi", - args = {} - ) public void test_Constructor() { try { KeyManagerFactorySpiImpl kmf = new KeyManagerFactorySpiImpl(); @@ -54,14 +43,8 @@ public class KeyManagerFactorySpiTest extends TestCase { } /** - * @tests javax.net.ssl.KeyManagerFactorySpi#KengineInit(KeyStore ks, char[] password) + * javax.net.ssl.KeyManagerFactorySpi#KengineInit(KeyStore ks, char[] password) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineInit", - args = {java.security.KeyStore.class, char[].class} - ) public void test_engineInit_01() { KeyManagerFactorySpiImpl kmf = new KeyManagerFactorySpiImpl(); KeyStore ks; @@ -105,14 +88,8 @@ public class KeyManagerFactorySpiTest extends TestCase { } /** - * @tests javax.net.ssl.KeyManagerFactorySpi#KengineInit(ManagerFactoryParameters spec) + * javax.net.ssl.KeyManagerFactorySpi#KengineInit(ManagerFactoryParameters spec) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineInit", - args = {javax.net.ssl.ManagerFactoryParameters.class} - ) public void test_engineInit_02() { KeyManagerFactorySpiImpl kmf = new KeyManagerFactorySpiImpl(); @@ -135,14 +112,8 @@ public class KeyManagerFactorySpiTest extends TestCase { } /** - * @tests javax.net.ssl.KeyManagerFactorySpi#engineGetKeyManagers() + * javax.net.ssl.KeyManagerFactorySpi#engineGetKeyManagers() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineGetKeyManagers", - args = {} - ) public void test_engineGetKeyManagers() { KeyManagerFactorySpiImpl kmf = new KeyManagerFactorySpiImpl(); diff --git a/luni/src/test/java/tests/api/javax/net/ssl/KeyStoreBuilderParametersTest.java b/luni/src/test/java/tests/api/javax/net/ssl/KeyStoreBuilderParametersTest.java index 341342e..762850b 100644 --- a/luni/src/test/java/tests/api/javax/net/ssl/KeyStoreBuilderParametersTest.java +++ b/luni/src/test/java/tests/api/javax/net/ssl/KeyStoreBuilderParametersTest.java @@ -15,11 +15,6 @@ */ package tests.api.javax.net.ssl; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import javax.net.ssl.KeyManagerFactorySpi; import javax.net.ssl.KeyStoreBuilderParameters; import java.security.KeyStore; @@ -28,18 +23,11 @@ import java.util.List; import junit.framework.TestCase; -@TestTargetClass(KeyStoreBuilderParameters.class) public class KeyStoreBuilderParametersTest extends TestCase { /** - * @tests javax.net.ssl.KeyStoreBuilderParameters#KeyStoreBuilderParameters(KeyStore.Builder builder) + * javax.net.ssl.KeyStoreBuilderParameters#KeyStoreBuilderParameters(KeyStore.Builder builder) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "KeyStoreBuilderParameters", - args = {java.security.KeyStore.Builder.class} - ) public void test_Constructor01() { KeyStore.Builder bld = null; @@ -64,14 +52,8 @@ public class KeyStoreBuilderParametersTest extends TestCase { } /** - * @tests javax.net.ssl.KeyStoreBuilderParameters#KeyStoreBuilderParameters(List parameters) + * javax.net.ssl.KeyStoreBuilderParameters#KeyStoreBuilderParameters(List parameters) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "KeyStoreBuilderParameters", - args = {java.util.List.class} - ) public void test_Constructor02() { //Null parameter @@ -105,14 +87,8 @@ public class KeyStoreBuilderParametersTest extends TestCase { } /** - * @tests javax.net.ssl.KeyStoreBuilderParameters#getParameters() + * javax.net.ssl.KeyStoreBuilderParameters#getParameters() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getParameters", - args = {} - ) public void test_getParameters() { String[] param = {"Parameter1", "Parameter2", "Parameter3"}; List ls = new ArrayList<String>(); diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLContext1Test.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLContext1Test.java index 62b2d95..ee51cc0 100644 --- a/luni/src/test/java/tests/api/javax/net/ssl/SSLContext1Test.java +++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLContext1Test.java @@ -43,15 +43,10 @@ import junit.framework.TestCase; import org.apache.harmony.security.tests.support.SpiEngUtils; import org.apache.harmony.xnet.tests.support.MySSLContextSpi; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; - /** * Tests for <code>SSLContext</code> class constructors and methods. * */ -@TestTargetClass(SSLContext.class) public class SSLContext1Test extends TestCase { private static String srvSSLContext = "SSLContext"; @@ -98,12 +93,6 @@ public class SSLContext1Test extends TestCase { * Test for <code>SSLContext</code> constructor Assertion: returns * SSLContext object */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "SSLContext", - args = {javax.net.ssl.SSLContextSpi.class, java.security.Provider.class, java.lang.String.class} - ) public void test_ConstructorLjavax_net_ssl_SSLContextSpiLjava_security_ProviderLjava_lang_String() throws NoSuchAlgorithmException, KeyManagementException { @@ -149,14 +138,8 @@ public class SSLContext1Test extends TestCase { /** * @throws KeyManagementException - * @tests javax.net.ssl.SSLContext#createSSLEngine() + * javax.net.ssl.SSLContext#createSSLEngine() */ - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "UnsupportedOperationException checking missed", - method = "createSSLEngine", - args = {} - ) public void test_createSSLEngine() throws KeyManagementException { if (!DEFSupported) fail(NotSupportMsg); SSLContextSpi spi = new MySSLContextSpi(); @@ -169,14 +152,8 @@ public class SSLContext1Test extends TestCase { /** * @throws KeyManagementException - * @tests javax.net.ssl.SSLContext#createSSLEngine(java.lang.String, int) + * javax.net.ssl.SSLContext#createSSLEngine(java.lang.String, int) */ - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "UnsupportedOperationException checking missed", - method = "createSSLEngine", - args = {java.lang.String.class, int.class} - ) public void test_createSSLEngineLjava_lang_StringI() throws KeyManagementException { if (!DEFSupported) fail(NotSupportMsg); @@ -194,12 +171,6 @@ public class SSLContext1Test extends TestCase { * methods Assertion: returns correspondent object * @throws KeyManagementException */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getClientSessionContext", - args = {} - ) public void test_getClientSessionContext() throws NoSuchAlgorithmException, KeyManagementException { if (!DEFSupported) { fail(NotSupportMsg); @@ -220,12 +191,6 @@ public class SSLContext1Test extends TestCase { * Test for <code>getInstance(String protocol)</code> method Assertion: * returns SSLContext object */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class} - ) public void test_getInstanceLjava_lang_String01() throws NoSuchAlgorithmException { if (!DEFSupported) { @@ -246,12 +211,6 @@ public class SSLContext1Test extends TestCase { * throws NullPointerException when protocol is null; throws * NoSuchAlgorithmException when protocol is not correct; */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class} - ) public void test_getInstanceLjava_lang_String02() { try { SSLContext.getInstance(null); @@ -274,12 +233,6 @@ public class SSLContext1Test extends TestCase { * method Assertion: throws IllegalArgumentException when provider is null * or empty */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void test_getInstanceLjava_lang_StringLjava_lang_String01() throws NoSuchProviderException, NoSuchAlgorithmException { if (!DEFSupported) { @@ -306,12 +259,6 @@ public class SSLContext1Test extends TestCase { * method Assertion: throws NullPointerException when protocol is null; * throws NoSuchAlgorithmException when protocol is not correct; */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void test_getInstanceLjava_lang_StringLjava_lang_String02() throws NoSuchProviderException { if (!DEFSupported) { fail(NotSupportMsg); @@ -338,12 +285,6 @@ public class SSLContext1Test extends TestCase { * method Assertion: throws NoSuchProviderException when provider has * invalid value */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void test_getInstanceLjava_lang_StringLjava_lang_String03() throws NoSuchAlgorithmException { if (!DEFSupported) { fail(NotSupportMsg); @@ -366,12 +307,6 @@ public class SSLContext1Test extends TestCase { * Test for <code>getInstance(String protocol, String provider)</code> * method Assertion: returns instance of SSLContext */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void test_getInstanceLjava_lang_StringLjava_lang_String04() throws NoSuchAlgorithmException, NoSuchProviderException { if (!DEFSupported) { @@ -394,12 +329,6 @@ public class SSLContext1Test extends TestCase { * Test for <code>getInstance(String protocol, Provider provider)</code> * method Assertion: throws IllegalArgumentException when provider is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.security.Provider.class} - ) public void test_getInstanceLjava_lang_StringLjava_security_Provider01() throws NoSuchAlgorithmException { if (!DEFSupported) { fail(NotSupportMsg); @@ -420,12 +349,6 @@ public class SSLContext1Test extends TestCase { * method Assertion: throws NullPointerException when protocol is null; * throws NoSuchAlgorithmException when protocol is not correct; */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.security.Provider.class} - ) public void test_getInstanceLjava_lang_StringLjava_security_Provider02() { if (!DEFSupported) { fail(NotSupportMsg); @@ -450,12 +373,6 @@ public class SSLContext1Test extends TestCase { * Test for <code>getInstance(String protocol, Provider provider)</code> * method Assertion: returns instance of SSLContext */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.security.Provider.class} - ) public void test_getInstanceLjava_lang_StringLjava_security_Provider03() throws NoSuchAlgorithmException { if (!DEFSupported) { fail(NotSupportMsg); @@ -474,14 +391,8 @@ public class SSLContext1Test extends TestCase { /** * @throws NoSuchAlgorithmException * @throws NoSuchProviderException - * @tests javax.net.ssl.SSLContext#getProtocol() + * javax.net.ssl.SSLContext#getProtocol() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getProtocol", - args = {} - ) public void test_getProtocol() throws NoSuchAlgorithmException, NoSuchProviderException { if (!DEFSupported) fail(NotSupportMsg); @@ -507,14 +418,8 @@ public class SSLContext1Test extends TestCase { /** * @throws NoSuchAlgorithmException * @throws NoSuchProviderException - * @tests javax.net.ssl.SSLContext#getProvider() + * javax.net.ssl.SSLContext#getProvider() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getProvider", - args = {} - ) public void test_getProvider() throws NoSuchAlgorithmException, NoSuchProviderException { if (!DEFSupported) fail(NotSupportMsg); @@ -532,14 +437,8 @@ public class SSLContext1Test extends TestCase { } /** - * @tests javax.net.ssl.SSLContext#getServletSessionContext() + * javax.net.ssl.SSLContext#getServletSessionContext() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getServerSessionContext", - args = {} - ) public void test_getServerSessionContext() throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException, UnrecoverableKeyException { @@ -572,12 +471,6 @@ public class SSLContext1Test extends TestCase { * methods Assertion: returns correspondent object * */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getServerSocketFactory", - args = {} - ) public void test_getServerSocketFactory() throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException, UnrecoverableKeyException { @@ -619,14 +512,8 @@ public class SSLContext1Test extends TestCase { } /** - * @tests javax.net.ssl.SSLContext#getSocketFactory() + * javax.net.ssl.SSLContext#getSocketFactory() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSocketFactory", - args = {} - ) public void test_getSocketFactory() throws NoSuchAlgorithmException, KeyManagementException, KeyStoreException, UnrecoverableKeyException { @@ -657,16 +544,10 @@ public class SSLContext1Test extends TestCase { * @throws KeyStoreException * @throws FileNotFoundException * @throws KeyManagementException - * @tests javax.net.ssl.SSLContext# + * javax.net.ssl.SSLContext# * init(javax.net.ssl.KeyManager[], javax.net.ssl.TrustManager[], * java.security.SecureRandom) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "init", - args = {javax.net.ssl.KeyManager[].class, javax.net.ssl.TrustManager[].class, java.security.SecureRandom.class} - ) public void test_init$Ljavax_net_ssl_KeyManager$Ljavax_net_ssl_TrustManagerLjava_security_SecureRandom() throws Exception { if (!DEFSupported) fail(NotSupportMsg); diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLContextSpiTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLContextSpiTest.java index c47730f..45a1c14 100644 --- a/luni/src/test/java/tests/api/javax/net/ssl/SSLContextSpiTest.java +++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLContextSpiTest.java @@ -15,11 +15,6 @@ */ package tests.api.javax.net.ssl; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.SSLContextSpi; import javax.net.ssl.SSLEngine; @@ -39,18 +34,11 @@ import junit.framework.TestCase; import org.apache.harmony.xnet.tests.support.SSLContextSpiImpl; -@TestTargetClass(SSLContextSpi.class) public class SSLContextSpiTest extends TestCase { /** - * @tests javax.net.ssl.SSLContextSpi#SSLContextSpi() + * javax.net.ssl.SSLContextSpi#SSLContextSpi() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "SSLContextSpi", - args = {} - ) public void test_Constructor() { try { SSLContextSpiImpl ssl = new SSLContextSpiImpl(); @@ -61,15 +49,9 @@ public class SSLContextSpiTest extends TestCase { } /** - * @tests javax.net.ssl.SSLContextSpi#engineCreateSSLEngine() + * javax.net.ssl.SSLContextSpi#engineCreateSSLEngine() * Verify exception when SSLContextSpi object wasn't initialiazed. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "engineCreateSSLEngine", - args = {} - ) public void test_engineCreateSSLEngine_01() { SSLContextSpiImpl ssl = new SSLContextSpiImpl(); try { @@ -85,15 +67,9 @@ public class SSLContextSpiTest extends TestCase { } /** - * @tests javax.net.ssl.SSLContextSpi#engineCreateSSLEngine(String host, int port) + * javax.net.ssl.SSLContextSpi#engineCreateSSLEngine(String host, int port) * Verify exception when SSLContextSpi object wasn't initialiazed. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "engineCreateSSLEngine", - args = {java.lang.String.class, int.class} - ) public void test_engineCreateSSLEngine_02() { int[] invalid_port = {Integer.MIN_VALUE, -65535, -1, 65536, Integer.MAX_VALUE}; SSLContextSpiImpl ssl = new SSLContextSpiImpl(); @@ -119,38 +95,12 @@ public class SSLContextSpiTest extends TestCase { } /** - * @tests SSLContextSpi#engineGetClientSessionContext() - * @tests SSLContextSpi#engineGetServerSessionContext() - * @tests SSLContextSpi#engineGetServerSocketFactory() - * @tests SSLContextSpi#engineGetSocketFactory() + * SSLContextSpi#engineGetClientSessionContext() + * SSLContextSpi#engineGetServerSessionContext() + * SSLContextSpi#engineGetServerSocketFactory() + * SSLContextSpi#engineGetSocketFactory() * Verify exception when SSLContextSpi object wasn't initialiazed. */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "engineGetClientSessionContext", - args = {} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "engineGetServerSessionContext", - args = {} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "engineGetServerSocketFactory", - args = {} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "engineGetSocketFactory", - args = {} - ) - }) public void test_commonTest_01() { SSLContextSpiImpl ssl = new SSLContextSpiImpl(); @@ -200,14 +150,8 @@ public class SSLContextSpiTest extends TestCase { } /** - * @tests SSLContextSpi#engineInit(KeyManager[] km, TrustManager[] tm, SecureRandom sr) + * SSLContextSpi#engineInit(KeyManager[] km, TrustManager[] tm, SecureRandom sr) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineInit", - args = {javax.net.ssl.KeyManager[].class, javax.net.ssl.TrustManager[].class, java.security.SecureRandom.class} - ) public void test_engineInit() { SSLContextSpiImpl ssl = new SSLContextSpiImpl(); String defaultAlgorithm = Security.getProperty("ssl.KeyManagerFactory.algorithm"); @@ -240,51 +184,13 @@ public class SSLContextSpiTest extends TestCase { } /** - * @tests SSLContextSpi#engineCreateSSLEngine() - * @tests SSLContextSpi#engineCreateSSLEngine(String host, int port) - * @tests SSLContextSpi#engineGetClientSessionContext() - * @tests SSLContextSpi#engineGetServerSessionContext() - * @tests SSLContextSpi#engineGetServerSocketFactory() - * @tests SSLContextSpi#engineGetSocketFactory() + * SSLContextSpi#engineCreateSSLEngine() + * SSLContextSpi#engineCreateSSLEngine(String host, int port) + * SSLContextSpi#engineGetClientSessionContext() + * SSLContextSpi#engineGetServerSessionContext() + * SSLContextSpi#engineGetServerSocketFactory() + * SSLContextSpi#engineGetSocketFactory() */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "engineCreateSSLEngine", - args = {} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "engineCreateSSLEngine", - args = {java.lang.String.class, int.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "engineGetClientSessionContext", - args = {} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "engineGetServerSessionContext", - args = {} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "engineGetServerSocketFactory", - args = {} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "engineGetSocketFactory", - args = {} - ) - }) public void test_commonTest_02() { SSLContextSpiImpl ssl = new SSLContextSpiImpl(); String defaultAlgorithm = Security.getProperty("ssl.KeyManagerFactory.algorithm"); diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineResultHandshakeStatusTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineResultHandshakeStatusTest.java index bc835a1..3b13673 100644 --- a/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineResultHandshakeStatusTest.java +++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineResultHandshakeStatusTest.java @@ -16,10 +16,6 @@ */ package tests.api.javax.net.ssl; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import javax.net.ssl.SSLEngineResult; import junit.framework.TestCase; @@ -28,18 +24,11 @@ import junit.framework.TestCase; * Tests for SSLEngineResult.Status class * */ -@TestTargetClass(SSLEngineResult.HandshakeStatus.class) public class SSLEngineResultHandshakeStatusTest extends TestCase { /** * Test for <code> SSLEngineResult.HandshakeStatus.values() </code> */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "values", - args = {} - ) public void test_SSLEngineResultHandshakeStatus_values() { String[] str = {"NOT_HANDSHAKING", "FINISHED", "NEED_TASK", "NEED_WRAP", "NEED_UNWRAP"}; SSLEngineResult.HandshakeStatus[] enS = SSLEngineResult.HandshakeStatus.values(); @@ -56,12 +45,6 @@ public class SSLEngineResultHandshakeStatusTest extends TestCase { /** * Test for <code> SSLEngineResult.HandshakeStatus.valueOf(String name) </code> */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "valueOf", - args = {String.class} - ) public void test_SSLEngineResultStatus_valueOf() { String[] str = {"FINISHED", "NEED_TASK", "NEED_UNWRAP", "NEED_WRAP", "NOT_HANDSHAKING"}; String[] str_invalid = {"", "FINISHED1", "NEED_task", "NEED_UN", @@ -97,4 +80,4 @@ public class SSLEngineResultHandshakeStatusTest extends TestCase { } catch (IllegalArgumentException iae) { } } -}
\ No newline at end of file +} diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineResultStatusTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineResultStatusTest.java index 3e7def5..05c8f03 100644 --- a/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineResultStatusTest.java +++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineResultStatusTest.java @@ -16,10 +16,6 @@ */ package tests.api.javax.net.ssl; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import javax.net.ssl.SSLEngineResult; import junit.framework.TestCase; @@ -28,18 +24,11 @@ import junit.framework.TestCase; * Tests for SSLEngineResult.Status class * */ -@TestTargetClass(SSLEngineResult.Status.class) public class SSLEngineResultStatusTest extends TestCase { /** * Test for <code> SSLEngineResult.Status.values() </code> */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "values", - args = {} - ) public void test_SSLEngineResultStatus_values() { boolean flag = false; String[] str = {"BUFFER_OVERFLOW", "BUFFER_UNDERFLOW", "CLOSED", "OK"}; @@ -63,12 +52,6 @@ public class SSLEngineResultStatusTest extends TestCase { /** * Test for <code> SSLEngineResult.Status.valueOf(String name) </code> */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "valueOf", - args = {String.class} - ) public void test_SSLEngineResultStatus_valueOf() { String[] str = {"BUFFER_OVERFLOW", "BUFFER_UNDERFLOW", "CLOSED", "OK"}; String[] str_invalid = {"", "OK1", "BUFFER_overflow", "BUFFER_UND", @@ -104,4 +87,4 @@ public class SSLEngineResultStatusTest extends TestCase { } catch (IllegalArgumentException iae) { } } -}
\ No newline at end of file +} diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineResultTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineResultTest.java index 486da1a..7a2ac78 100644 --- a/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineResultTest.java +++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineResultTest.java @@ -17,11 +17,6 @@ package tests.api.javax.net.ssl; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import javax.net.ssl.SSLEngineResult; import junit.framework.TestCase; @@ -30,7 +25,6 @@ import junit.framework.TestCase; * Tests for SSLEngineResult class * */ -@TestTargetClass(SSLEngineResult.class) public class SSLEngineResultTest extends TestCase { /** @@ -50,12 +44,6 @@ public class SSLEngineResultTest extends TestCase { * is null * */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "SSLEngineResult", - args = {javax.net.ssl.SSLEngineResult.Status.class, javax.net.ssl.SSLEngineResult.HandshakeStatus.class, int.class, int.class} - ) public void test_ConstructorLjavax_net_ssl_SSLEngineResult_StatusLjavax_net_ssl_SSLEngineResult_HandshakeStatusII() { int[] neg = { -1, -10, -1000, Integer.MIN_VALUE, @@ -103,12 +91,6 @@ public class SSLEngineResultTest extends TestCase { /** * Test for <code>bytesConsumed()</code> method */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "bytesConsumed", - args = {} - ) public void test_bytesConsumed() { int[] pos = { 0, 1, 1000, Integer.MAX_VALUE, (Integer.MAX_VALUE - 1) }; SSLEngineResult.Status [] enS = @@ -132,12 +114,6 @@ public class SSLEngineResultTest extends TestCase { /** * Test for <code>bytesProduced()</code> method */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "bytesProduced", - args = {} - ) public void test_bytesProduced() { int[] pos = { 0, 1, 1000, Integer.MAX_VALUE, (Integer.MAX_VALUE - 1) }; SSLEngineResult.Status [] enS = @@ -161,12 +137,6 @@ public class SSLEngineResultTest extends TestCase { /** * Test for <code>getHandshakeStatus()</code> method */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getHandshakeStatus", - args = {} - ) public void test_getHandshakeStatus() { int[] pos = { 0, 1, 1000, Integer.MAX_VALUE, (Integer.MAX_VALUE - 1) }; SSLEngineResult.Status [] enS = @@ -190,12 +160,6 @@ public class SSLEngineResultTest extends TestCase { /** * Test for <code>getStatus()</code> method */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getStatus", - args = {} - ) public void test_getStatus() { int[] pos = { 0, 1, 1000, Integer.MAX_VALUE, (Integer.MAX_VALUE - 1) }; SSLEngineResult.Status [] enS = @@ -219,12 +183,6 @@ public class SSLEngineResultTest extends TestCase { /** * Test for <code>toString()</code> method */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {} - ) public void test_toString() { int[] pos = { 0, 1, 1000, Integer.MAX_VALUE, (Integer.MAX_VALUE - 1) }; SSLEngineResult.Status [] enS = diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineTest.java index a34977b..31d0a12 100644 --- a/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineTest.java +++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineTest.java @@ -38,17 +38,12 @@ import javax.net.ssl.SSLEngineResult.HandshakeStatus; import junit.framework.TestCase; import dalvik.annotation.AndroidOnly; import dalvik.annotation.KnownFailure; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; /** * Tests for SSLEngine class * */ -@TestTargetClass(SSLEngine.class) public class SSLEngineTest extends TestCase { private HandshakeHandler clientEngine; @@ -63,12 +58,6 @@ public class SSLEngineTest extends TestCase { * SSLEngine object with null host and -1 port * @throws NoSuchAlgorithmException */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "SSLEngine", - args = {} - ) public void test_Constructor() throws NoSuchAlgorithmException { SSLEngine e = getEngine(); assertNull(e.getPeerHost()); @@ -82,12 +71,6 @@ public class SSLEngineTest extends TestCase { * Test for <code>SSLEngine(String host, int port)</code> constructor * @throws NoSuchAlgorithmException */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verification with incorrect parameters missed", - method = "SSLEngine", - args = {java.lang.String.class, int.class} - ) public void test_ConstructorLjava_lang_StringI01() throws NoSuchAlgorithmException { int port = 1010; SSLEngine e = getEngine(null, port); @@ -120,12 +103,6 @@ public class SSLEngineTest extends TestCase { * Test for <code>SSLEngine(String host, int port)</code> constructor * @throws NoSuchAlgorithmException */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verification with incorrect parameters missed", - method = "SSLEngine", - args = {java.lang.String.class, int.class} - ) public void test_ConstructorLjava_lang_StringI02() throws NoSuchAlgorithmException { String host = "new host"; int port = 8080; @@ -143,12 +120,6 @@ public class SSLEngineTest extends TestCase { * Test for <code>getPeerHost()</code> method * @throws NoSuchAlgorithmException */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPeerHost", - args = {} - ) public void test_getPeerHost() throws NoSuchAlgorithmException { SSLEngine e = getEngine(); assertNull(e.getPeerHost()); @@ -160,12 +131,6 @@ public class SSLEngineTest extends TestCase { * Test for <code>getPeerPort()</code> method * @throws NoSuchAlgorithmException */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPeerPort", - args = {} - ) public void test_getPeerPort() throws NoSuchAlgorithmException { SSLEngine e = getEngine(); assertEquals("Incorrect default value of peer port", @@ -176,14 +141,8 @@ public class SSLEngineTest extends TestCase { /** * @throws NoSuchAlgorithmException - * @tests javax.net.ssl.SSLEngine#getSupportedProtocols() + * javax.net.ssl.SSLEngine#getSupportedProtocols() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSupportedProtocols", - args = {} - ) public void test_getSupportedProtocols() throws NoSuchAlgorithmException { SSLEngine sse = getEngine(); try { @@ -197,23 +156,9 @@ public class SSLEngineTest extends TestCase { /** * @throws NoSuchAlgorithmException - * @tests javax.net.ssl.SSLEngine#setEnabledProtocols(String[] protocols) - * @tests javax.net.ssl.SSLEngine#getEnabledProtocols() + * javax.net.ssl.SSLEngine#setEnabledProtocols(String[] protocols) + * javax.net.ssl.SSLEngine#getEnabledProtocols() */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getEnabledProtocols", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setEnabledProtocols", - args = {String[].class} - ) - }) public void test_EnabledProtocols() throws NoSuchAlgorithmException { SSLEngine sse = getEngine(); String[] pr = sse.getSupportedProtocols(); @@ -236,14 +181,8 @@ public class SSLEngineTest extends TestCase { /** * @throws NoSuchAlgorithmException - * @tests javax.net.ssl.SSLEngine#getSupportedCipherSuites() + * javax.net.ssl.SSLEngine#getSupportedCipherSuites() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSupportedCipherSuites", - args = {} - ) public void test_getSupportedCipherSuites() throws NoSuchAlgorithmException { SSLEngine sse = getEngine(); try { @@ -257,23 +196,9 @@ public class SSLEngineTest extends TestCase { /** * @throws NoSuchAlgorithmException - * @tests javax.net.ssl.SSLEngine#setEnabledCipherSuites(String[] suites) - * @tests javax.net.ssl.SSLEngine#getEnabledCipherSuites() + * javax.net.ssl.SSLEngine#setEnabledCipherSuites(String[] suites) + * javax.net.ssl.SSLEngine#getEnabledCipherSuites() */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setEnabledCipherSuites", - args = {String[].class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getEnabledCipherSuites", - args = {} - ) - }) public void test_EnabledCipherSuites() throws NoSuchAlgorithmException { SSLEngine sse = getEngine(); String[] st = sse.getSupportedCipherSuites(); @@ -296,23 +221,9 @@ public class SSLEngineTest extends TestCase { /** * @throws NoSuchAlgorithmException - * @tests javax.net.ssl.SSLEngine#setEnableSessionCreation(boolean flag) - * @tests javax.net.ssl.SSLEngine#getEnableSessionCreation() + * javax.net.ssl.SSLEngine#setEnableSessionCreation(boolean flag) + * javax.net.ssl.SSLEngine#getEnableSessionCreation() */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setEnableSessionCreation", - args = {boolean.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getEnableSessionCreation", - args = {} - ) - }) public void test_EnableSessionCreation() throws NoSuchAlgorithmException { SSLEngine sse = getEngine(); try { @@ -328,23 +239,9 @@ public class SSLEngineTest extends TestCase { /** * @throws NoSuchAlgorithmException - * @tests javax.net.ssl.SSLEngine#setNeedClientAuth(boolean need) - * @tests javax.net.ssl.SSLEngine#getNeedClientAuth() + * javax.net.ssl.SSLEngine#setNeedClientAuth(boolean need) + * javax.net.ssl.SSLEngine#getNeedClientAuth() */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setNeedClientAuth", - args = {boolean.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getNeedClientAuth", - args = {} - ) - }) public void test_NeedClientAuth() throws NoSuchAlgorithmException { SSLEngine sse = getEngine(); try { @@ -359,23 +256,9 @@ public class SSLEngineTest extends TestCase { /** * @throws NoSuchAlgorithmException - * @tests javax.net.ssl.SSLEngine#setWantClientAuth(boolean want) - * @tests javax.net.ssl.SSLEngine#getWantClientAuth() + * javax.net.ssl.SSLEngine#setWantClientAuth(boolean want) + * javax.net.ssl.SSLEngine#getWantClientAuth() */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setWantClientAuth", - args = {boolean.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getWantClientAuth", - args = {} - ) - }) public void test_WantClientAuth() throws NoSuchAlgorithmException { SSLEngine sse = getEngine(); try { @@ -390,14 +273,8 @@ public class SSLEngineTest extends TestCase { /** * @throws NoSuchAlgorithmException - * @tests javax.net.ssl.SSLEngine#beginHandshake() + * javax.net.ssl.SSLEngine#beginHandshake() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "beginHandshake", - args = {} - ) public void test_beginHandshake() throws NoSuchAlgorithmException { SSLEngine sse = getEngine(); try { @@ -428,23 +305,9 @@ public class SSLEngineTest extends TestCase { /** * @throws NoSuchAlgorithmException - * @tests javax.net.ssl.SSLEngine#setUseClientMode(boolean mode) - * @tests javax.net.ssl.SSLEngine#getUseClientMode() + * javax.net.ssl.SSLEngine#setUseClientMode(boolean mode) + * javax.net.ssl.SSLEngine#getUseClientMode() */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setUseClientMode", - args = {boolean.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getUseClientMode", - args = {} - ) - }) @AndroidOnly("The RI doesn't throw the expected IllegalStateException.") public void test_UseClientMode() throws NoSuchAlgorithmException { SSLEngine sse = getEngine(); @@ -474,14 +337,8 @@ public class SSLEngineTest extends TestCase { /** * @throws NoSuchAlgorithmException - * @tests javax.net.ssl.SSLEngine#getSession() + * javax.net.ssl.SSLEngine#getSession() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSession", - args = {} - ) public void test_getSession() throws NoSuchAlgorithmException { SSLEngine sse = getEngine(); try { @@ -493,14 +350,8 @@ public class SSLEngineTest extends TestCase { /** * @throws NoSuchAlgorithmException - * @tests javax.net.ssl.SSLEngine#getHandshakeStatus() + * javax.net.ssl.SSLEngine#getHandshakeStatus() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getHandshakeStatus", - args = {} - ) public void test_getHandshakeStatus() throws NoSuchAlgorithmException { SSLEngine sse = getEngine(); try { @@ -515,14 +366,8 @@ public class SSLEngineTest extends TestCase { /** * @throws NoSuchAlgorithmException - * @tests javax.net.ssl.SSLEngine#getDelegatedTask() + * javax.net.ssl.SSLEngine#getDelegatedTask() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getDelegatedTask", - args = {} - ) @KnownFailure("org.apache.harmony.xnet.provider.jsse.SSLEngineImpl#getDelegatedTask() throws NPE instead of returning null") public void test_getDelegatedTask() throws NoSuchAlgorithmException { SSLEngine sse = getEngine(); @@ -536,16 +381,10 @@ public class SSLEngineTest extends TestCase { /** * @throws IOException * @throws InterruptedException - * @tests javax.net.ssl.SSLEngine#unwrap(ByteBuffer src, ByteBuffer[] dsts, + * javax.net.ssl.SSLEngine#unwrap(ByteBuffer src, ByteBuffer[] dsts, * int offset, int length) * Exception case: SSLException should be thrown. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "unwrap", - args = {ByteBuffer.class, ByteBuffer[].class, int.class, int.class} - ) public void test_unwrap_01() throws IOException, InterruptedException { prepareEngines(); doHandshake(); @@ -561,16 +400,10 @@ public class SSLEngineTest extends TestCase { } /** - * @tests javax.net.ssl.SSLEngine#unwrap(ByteBuffer src, ByteBuffer[] dsts, + * javax.net.ssl.SSLEngine#unwrap(ByteBuffer src, ByteBuffer[] dsts, * int offset, int length) * Exception case: IndexOutOfBoundsException should be thrown. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "unwrap", - args = {ByteBuffer.class, ByteBuffer[].class, int.class, int.class} - ) @KnownFailure("Fixed in DonutBurger, boundary checks missing") public void test_unwrap_02() throws SSLException { String host = "new host"; @@ -608,16 +441,10 @@ public class SSLEngineTest extends TestCase { } /** - * @tests javax.net.ssl.SSLEngine#unwrap(ByteBuffer src, ByteBuffer[] dsts, + * javax.net.ssl.SSLEngine#unwrap(ByteBuffer src, ByteBuffer[] dsts, * int offset, int length) * Exception case: ReadOnlyBufferException should be thrown. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "unwrap", - args = {ByteBuffer.class, ByteBuffer[].class, int.class, int.class} - ) @KnownFailure("Fixed on DonutBurger, Wrong Exception thrown") public void test_unwrap_03() { String host = "new host"; @@ -640,16 +467,10 @@ public class SSLEngineTest extends TestCase { } /** - * @tests javax.net.ssl.SSLEngine#unwrap(ByteBuffer src, ByteBuffer[] dsts, + * javax.net.ssl.SSLEngine#unwrap(ByteBuffer src, ByteBuffer[] dsts, * int offset, int length) * Exception case: IllegalArgumentException should be thrown. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "IllegalArgumentException should be thrown", - method = "unwrap", - args = {ByteBuffer.class, ByteBuffer[].class, int.class, int.class} - ) @KnownFailure("Fixed on DonutBurger, Wrong Exception thrown") public void test_unwrap_04() { String host = "new host"; @@ -702,16 +523,10 @@ public class SSLEngineTest extends TestCase { } /** - * @tests javax.net.ssl.SSLEngine#unwrap(ByteBuffer src, ByteBuffer[] dsts, + * javax.net.ssl.SSLEngine#unwrap(ByteBuffer src, ByteBuffer[] dsts, * int offset, int length) * Exception case: IllegalStateException should be thrown. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "unwrap", - args = {ByteBuffer.class, ByteBuffer[].class, int.class, int.class} - ) @AndroidOnly("The RI doesn't throw the IllegalStateException.") public void test_unwrap_05() { String host = "new host"; @@ -732,15 +547,9 @@ public class SSLEngineTest extends TestCase { } /** - * @tests javax.net.ssl.SSLEngine#unwrap(ByteBuffer src, ByteBuffer[] dsts, + * javax.net.ssl.SSLEngine#unwrap(ByteBuffer src, ByteBuffer[] dsts, * int offset, int length) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "unwrap", - args = {ByteBuffer.class, ByteBuffer[].class, int.class, int.class} - ) public void test_unwrap_06() { String host = "new host"; int port = 8080; @@ -768,16 +577,10 @@ public class SSLEngineTest extends TestCase { } /** - * @tests javax.net.ssl.SSLEngine#wrap(ByteBuffer[] srcs, int offset, + * javax.net.ssl.SSLEngine#wrap(ByteBuffer[] srcs, int offset, * int length, ByteBuffer dst) * Exception case: IndexOutOfBoundsException should be thrown. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "wrap", - args = {ByteBuffer[].class, int.class, int.class, ByteBuffer.class} - ) @KnownFailure("Fixed in DonutBurger, boundary checks missing") public void test_wrap_02() throws SSLException { String host = "new host"; @@ -814,16 +617,10 @@ public class SSLEngineTest extends TestCase { } /** - * @tests javax.net.ssl.SSLEngine#wrap(ByteBuffer[] srcs, int offset, + * javax.net.ssl.SSLEngine#wrap(ByteBuffer[] srcs, int offset, * int length, ByteBuffer dst) * Exception case: ReadOnlyBufferException should be thrown. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "wrap", - args = {ByteBuffer[].class, int.class, int.class, ByteBuffer.class} - ) public void test_wrap_03() throws SSLException { String host = "new host"; int port = 8080; @@ -841,16 +638,10 @@ public class SSLEngineTest extends TestCase { } /** - * @tests javax.net.ssl.SSLEngine#wrap(ByteBuffer[] srcs, int offset, + * javax.net.ssl.SSLEngine#wrap(ByteBuffer[] srcs, int offset, * int length, ByteBuffer dst) * Exception case: IllegalArgumentException should be thrown. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "IllegalArgumentException must be thrown", - method = "wrap", - args = {ByteBuffer[].class, int.class, int.class, ByteBuffer.class} - ) @KnownFailure("Fixed on DonutBurger, Wrong Exception thrown") public void test_wrap_04() { String host = "new host"; @@ -881,16 +672,10 @@ public class SSLEngineTest extends TestCase { } /** - * @tests javax.net.ssl.SSLEngine#wrap(ByteBuffer[] srcs, int offset, + * javax.net.ssl.SSLEngine#wrap(ByteBuffer[] srcs, int offset, * int length, ByteBuffer dst) * Exception case: IllegalStateException should be thrown. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "wrap", - args = {ByteBuffer[].class, int.class, int.class, ByteBuffer.class} - ) @AndroidOnly("The RI doesn't throw the IllegalStateException.") public void test_wrap_05() throws SSLException { String host = "new host"; @@ -908,15 +693,9 @@ public class SSLEngineTest extends TestCase { } /** - * @tests javax.net.ssl.SSLEngine#wrap(ByteBuffer[] srcs, int offset, + * javax.net.ssl.SSLEngine#wrap(ByteBuffer[] srcs, int offset, * int length, ByteBuffer dst) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "wrap", - args = {ByteBuffer[].class, int.class, int.class, ByteBuffer.class} - ) public void test_wrap_06() { String host = "new host"; int port = 8080; @@ -934,23 +713,9 @@ public class SSLEngineTest extends TestCase { /** * @throws NoSuchAlgorithmException - * @tests javax.net.ssl.SSLEngine#closeOutbound() - * @tests javax.net.ssl.SSLEngine#isOutboundDone() + * javax.net.ssl.SSLEngine#closeOutbound() + * javax.net.ssl.SSLEngine#isOutboundDone() */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "closeOutbound", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isOutboundDone", - args = {} - ) - }) public void test_closeOutbound() throws NoSuchAlgorithmException { SSLEngine sse = getEngine(); @@ -965,23 +730,9 @@ public class SSLEngineTest extends TestCase { /** * @throws NoSuchAlgorithmException - * @tests javax.net.ssl.SSLEngine#closeInbound() - * @tests javax.net.ssl.SSLEngine#isInboundDone() + * javax.net.ssl.SSLEngine#closeInbound() + * javax.net.ssl.SSLEngine#isInboundDone() */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "", - method = "closeInbound", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isInboundDone", - args = {} - ) - }) public void test_closeInbound() throws NoSuchAlgorithmException { SSLEngine sse = getEngine(); @@ -995,15 +746,9 @@ public class SSLEngineTest extends TestCase { } /** - * @tests javax.net.ssl.SSLEngine#unwrap(ByteBuffer src, ByteBuffer dst) + * javax.net.ssl.SSLEngine#unwrap(ByteBuffer src, ByteBuffer dst) * SSLException should be thrown. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "unwrap", - args = {ByteBuffer.class, ByteBuffer.class} - ) public void test_unwrap_ByteBuffer_ByteBuffer_01() throws InterruptedException, IOException { prepareEngines(); doHandshake(); @@ -1019,15 +764,9 @@ public class SSLEngineTest extends TestCase { } /** - * @tests javax.net.ssl.SSLEngine#unwrap(ByteBuffer src, ByteBuffer dst) + * javax.net.ssl.SSLEngine#unwrap(ByteBuffer src, ByteBuffer dst) * ReadOnlyBufferException should be thrown. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "unwrap", - args = {ByteBuffer.class, ByteBuffer.class} - ) @KnownFailure("Fixed on DonutBurger, Wrong Exception thrown") public void test_unwrap_ByteBuffer_ByteBuffer_02() { String host = "new host"; @@ -1048,15 +787,9 @@ public class SSLEngineTest extends TestCase { } /** - * @tests javax.net.ssl.SSLEngine#unwrap(ByteBuffer src, ByteBuffer dst) + * javax.net.ssl.SSLEngine#unwrap(ByteBuffer src, ByteBuffer dst) * IllegalArgumentException should be thrown. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "unwrap", - args = {ByteBuffer.class, ByteBuffer.class} - ) @KnownFailure("Fixed on DonutBurger, Wrong Exception thrown") public void test_unwrap_ByteBuffer_ByteBuffer_03() { String host = "new host"; @@ -1100,15 +833,9 @@ public class SSLEngineTest extends TestCase { } /** - * @tests javax.net.ssl.SSLEngine#unwrap(ByteBuffer src, ByteBuffer dst) + * javax.net.ssl.SSLEngine#unwrap(ByteBuffer src, ByteBuffer dst) * IllegalStateException should be thrown. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "unwrap", - args = {ByteBuffer.class, ByteBuffer.class} - ) @AndroidOnly("The RI doesn't throw the IllegalStateException.") public void test_unwrap_ByteBuffer_ByteBuffer_04() { String host = "new host"; @@ -1128,14 +855,8 @@ public class SSLEngineTest extends TestCase { } /** - * @tests javax.net.ssl.SSLEngine#unwrap(ByteBuffer src, ByteBuffer dst) + * javax.net.ssl.SSLEngine#unwrap(ByteBuffer src, ByteBuffer dst) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "unwrap", - args = {ByteBuffer.class, ByteBuffer.class} - ) public void test_unwrap_ByteBuffer_ByteBuffer_05() { String host = "new host"; int port = 8080; @@ -1154,15 +875,9 @@ public class SSLEngineTest extends TestCase { } /** - * @tests javax.net.ssl.SSLEngine#unwrap(ByteBuffer src, ByteBuffer[] dsts) + * javax.net.ssl.SSLEngine#unwrap(ByteBuffer src, ByteBuffer[] dsts) * SSLException should be thrown. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "unwrap", - args = {ByteBuffer.class, ByteBuffer[].class} - ) public void test_unwrap_ByteBuffer$ByteBuffer_01() throws IOException, InterruptedException { prepareEngines(); doHandshake(); @@ -1179,15 +894,9 @@ public class SSLEngineTest extends TestCase { } /** - * @tests javax.net.ssl.SSLEngine#unwrap(ByteBuffer src, ByteBuffer[] dsts) + * javax.net.ssl.SSLEngine#unwrap(ByteBuffer src, ByteBuffer[] dsts) * ReadOnlyBufferException should be thrown. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "unwrap", - args = {ByteBuffer.class, ByteBuffer[].class} - ) @KnownFailure("Fixed on DonutBurger, Wrong Exception thrown") public void test_unwrap_ByteBuffer$ByteBuffer_02() { String host = "new host"; @@ -1209,15 +918,9 @@ public class SSLEngineTest extends TestCase { } /** - * @tests javax.net.ssl.SSLEngine#unwrap(ByteBuffer src, ByteBuffer[] dsts) + * javax.net.ssl.SSLEngine#unwrap(ByteBuffer src, ByteBuffer[] dsts) * IllegalArgumentException should be thrown. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "unwrap", - args = {ByteBuffer.class, ByteBuffer[].class} - ) @KnownFailure("Fixed on DonutBurger, Wrong Exception thrown") public void test_unwrap_ByteBuffer$ByteBuffer_03() { String host = "new host"; @@ -1272,15 +975,9 @@ public class SSLEngineTest extends TestCase { } /** - * @tests javax.net.ssl.SSLEngine#unwrap(ByteBuffer src, ByteBuffer[] dsts) + * javax.net.ssl.SSLEngine#unwrap(ByteBuffer src, ByteBuffer[] dsts) * IllegalStateException should be thrown. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "unwrap", - args = {ByteBuffer.class, ByteBuffer[].class} - ) @AndroidOnly("The RI doesn't throw the IllegalStateException.") public void test_unwrap_ByteBuffer$ByteBuffer_04() { String host = "new host"; @@ -1300,14 +997,8 @@ public class SSLEngineTest extends TestCase { } /** - * @tests javax.net.ssl.SSLEngine#unwrap(ByteBuffer src, ByteBuffer[] dsts) + * javax.net.ssl.SSLEngine#unwrap(ByteBuffer src, ByteBuffer[] dsts) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "unwrap", - args = {ByteBuffer.class, ByteBuffer[].class} - ) public void test_unwrap_ByteBuffer$ByteBuffer_05() { String host = "new host"; int port = 8080; @@ -1334,15 +1025,9 @@ public class SSLEngineTest extends TestCase { } /** - * @tests javax.net.ssl.SSLEngine#wrap(ByteBuffer src, ByteBuffer dst) + * javax.net.ssl.SSLEngine#wrap(ByteBuffer src, ByteBuffer dst) * ReadOnlyBufferException should be thrown. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "wrap", - args = {ByteBuffer.class, ByteBuffer.class} - ) public void test_wrap_ByteBuffer_ByteBuffer_02() { String host = "new host"; int port = 8080; @@ -1362,15 +1047,9 @@ public class SSLEngineTest extends TestCase { } /** - * @tests javax.net.ssl.SSLEngine#wrap(ByteBuffer src, ByteBuffer dst) + * javax.net.ssl.SSLEngine#wrap(ByteBuffer src, ByteBuffer dst) * IllegalArgumentException should be thrown. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "wrap", - args = {ByteBuffer.class, ByteBuffer.class} - ) @KnownFailure("Fixed on DonutBurger, Wrong Exception thrown") public void test_wrap_ByteBuffer_ByteBuffer_03() { String host = "new host"; @@ -1414,15 +1093,9 @@ public class SSLEngineTest extends TestCase { } /** - * @tests javax.net.ssl.SSLEngine#wrap(ByteBuffer src, ByteBuffer dst) + * javax.net.ssl.SSLEngine#wrap(ByteBuffer src, ByteBuffer dst) * IllegalStateException should be thrown. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "wrap", - args = {ByteBuffer.class, ByteBuffer.class} - ) @AndroidOnly("The RI doesn't throw the IllegalStateException.") public void test_wrap_ByteBuffer_ByteBuffer_04() { String host = "new host"; @@ -1442,14 +1115,8 @@ public class SSLEngineTest extends TestCase { } /** - * @tests javax.net.ssl.SSLEngine#wrap(ByteBuffer src, ByteBuffer dst) + * javax.net.ssl.SSLEngine#wrap(ByteBuffer src, ByteBuffer dst) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "wrap", - args = {ByteBuffer.class, ByteBuffer.class} - ) public void test_wrap_ByteBuffer_ByteBuffer_05() { String host = "new host"; int port = 8080; @@ -1469,15 +1136,9 @@ public class SSLEngineTest extends TestCase { /** * @throws IOException * @throws InterruptedException - * @tests javax.net.ssl.SSLEngine#wrap(ByteBuffer[] srcs, ByteBuffer dst) + * javax.net.ssl.SSLEngine#wrap(ByteBuffer[] srcs, ByteBuffer dst) * SSLException should be thrown. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "wrap cannot be forced to throw SSLException", - method = "wrap", - args = {ByteBuffer[].class, ByteBuffer.class} - ) public void test_wrap_ByteBuffer$ByteBuffer_01() throws IOException, InterruptedException { prepareEngines(); doHandshake(); @@ -1494,15 +1155,9 @@ public class SSLEngineTest extends TestCase { } /** - * @tests javax.net.ssl.SSLEngine#wrap(ByteBuffer[] srcs, ByteBuffer dst) + * javax.net.ssl.SSLEngine#wrap(ByteBuffer[] srcs, ByteBuffer dst) * ReadOnlyBufferException should be thrown. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "wrap", - args = {ByteBuffer[].class, ByteBuffer.class} - ) public void test_wrap_ByteBuffer$ByteBuffer_02() { String host = "new host"; int port = 8080; @@ -1522,15 +1177,9 @@ public class SSLEngineTest extends TestCase { } /** - * @tests javax.net.ssl.SSLEngine#wrap(ByteBuffer[] srcs, ByteBuffer dst) + * javax.net.ssl.SSLEngine#wrap(ByteBuffer[] srcs, ByteBuffer dst) * IllegalArgumentException should be thrown. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "wrap", - args = {ByteBuffer[].class, ByteBuffer.class} - ) @KnownFailure("Fixed on DonutBurger, Wrong Exception thrown") public void test_wrap_ByteBuffer$ByteBuffer_03() { String host = "new host"; @@ -1574,15 +1223,9 @@ public class SSLEngineTest extends TestCase { } /** - * @tests javax.net.ssl.SSLEngine#wrap(ByteBuffer[] srcs, ByteBuffer dst) + * javax.net.ssl.SSLEngine#wrap(ByteBuffer[] srcs, ByteBuffer dst) * IllegalStateException should be thrown. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "wrap", - args = {ByteBuffer[].class, ByteBuffer.class} - ) @AndroidOnly("The RI doesn't throw the IllegalStateException.") public void test_wrap_ByteBuffer$ByteBuffer_04() { String host = "new host"; @@ -1602,14 +1245,8 @@ public class SSLEngineTest extends TestCase { } /** - * @tests javax.net.ssl.SSLEngine#wrap(ByteBuffer[] srcs, ByteBuffer dst) + * javax.net.ssl.SSLEngine#wrap(ByteBuffer[] srcs, ByteBuffer dst) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "wrap", - args = {ByteBuffer[].class, ByteBuffer.class} - ) public void test_wrap_ByteBuffer$ByteBuffer_05() { String host = "new host"; int port = 8080; @@ -1787,44 +1424,6 @@ public class SSLEngineTest extends TestCase { } } - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "wrap", - args = {ByteBuffer.class, ByteBuffer.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "unwrap", - args = {ByteBuffer.class, ByteBuffer.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "beginHandshake", - args = {} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getHandshakeStatus", - args = {} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "wrap", - args = {ByteBuffer[].class, ByteBuffer.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getDelegatedTask", - args = {} - ) - }) @KnownFailure("Handshake Status is never finished. NPE in " + "ClientSessionContext$HostAndPort.hashCode() when host is null") public void testHandshake() throws IOException, InterruptedException { diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLExceptionTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLExceptionTest.java index 6cff581..9b4ae35 100644 --- a/luni/src/test/java/tests/api/javax/net/ssl/SSLExceptionTest.java +++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLExceptionTest.java @@ -17,15 +17,10 @@ package tests.api.javax.net.ssl; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import javax.net.ssl.SSLException; import junit.framework.TestCase; -@TestTargetClass(SSLException.class) + /** * Tests for <code>SSLException</code> class constructors and methods. * @@ -44,12 +39,6 @@ public class SSLExceptionTest extends TestCase { * constructs SSLException with detail message msg. Parameter * <code>msg</code> is not null. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "SSLException", - args = {java.lang.String.class} - ) public void testSSLException01() { SSLException sE; for (int i = 0; i < msgs.length; i++) { @@ -63,12 +52,6 @@ public class SSLExceptionTest extends TestCase { * Test for <code>SSLException(String)</code> constructor Assertion: * constructs SSLException when <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "SSLException", - args = {java.lang.String.class} - ) public void testSSLException02() { String msg = null; SSLException sE = new SSLException(msg); @@ -80,12 +63,6 @@ public class SSLExceptionTest extends TestCase { * Test for <code>SSLException(Throwable)</code> constructor * Assertion: constructs SSLException when <code>cause</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "SSLException", - args = {java.lang.Throwable.class} - ) public void testSSLException03() { Throwable cause = null; SSLException sE = new SSLException(cause); @@ -98,12 +75,6 @@ public class SSLExceptionTest extends TestCase { * Assertion: constructs SSLException when <code>cause</code> is not * null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "SSLException", - args = {java.lang.Throwable.class} - ) public void testSSLException04() { SSLException sE = new SSLException(tCause); if (sE.getMessage() != null) { @@ -121,12 +92,6 @@ public class SSLExceptionTest extends TestCase { * Assertion: constructs SSLException when <code>cause</code> is null * <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "SSLException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testSSLException05() { SSLException sE = new SSLException(null, null); assertNull("getMessage() must return null", sE.getMessage()); @@ -138,12 +103,6 @@ public class SSLExceptionTest extends TestCase { * Assertion: constructs SSLException when <code>cause</code> is null * <code>msg</code> is not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "SSLException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testSSLException06() { SSLException sE; for (int i = 0; i < msgs.length; i++) { @@ -159,12 +118,6 @@ public class SSLExceptionTest extends TestCase { * Assertion: constructs SSLException when <code>cause</code> is not * null <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "SSLException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testSSLException07() { SSLException sE = new SSLException(null, tCause); if (sE.getMessage() != null) { @@ -183,12 +136,6 @@ public class SSLExceptionTest extends TestCase { * Assertion: constructs SSLException when <code>cause</code> is not * null <code>msg</code> is not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "SSLException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testSSLException08() { SSLException sE; for (int i = 0; i < msgs.length; i++) { @@ -208,4 +155,4 @@ public class SSLExceptionTest extends TestCase { sE.getCause(), tCause); } } -}
\ No newline at end of file +} diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLHandshakeExceptionTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLHandshakeExceptionTest.java index d6f44fe..a2d0ec5 100644 --- a/luni/src/test/java/tests/api/javax/net/ssl/SSLHandshakeExceptionTest.java +++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLHandshakeExceptionTest.java @@ -15,16 +15,10 @@ */ package tests.api.javax.net.ssl; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import javax.net.ssl.SSLHandshakeException; import junit.framework.TestCase; -@TestTargetClass(SSLHandshakeException.class) public class SSLHandshakeExceptionTest extends TestCase { private static String[] msgs = { @@ -38,12 +32,6 @@ public class SSLHandshakeExceptionTest extends TestCase { * constructs SSLHandshakeException with detail message msg. Parameter * <code>msg</code> is not null. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "SSLHandshakeException", - args = {java.lang.String.class} - ) public void test_Constructor01() { SSLHandshakeException sslE; for (int i = 0; i < msgs.length; i++) { @@ -58,16 +46,10 @@ public class SSLHandshakeExceptionTest extends TestCase { * constructs SSLHandshakeException with detail message msg. Parameter * <code>msg</code> is null. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "SSLHandshakeException", - args = {java.lang.String.class} - ) public void test_Constructor02() { String msg = null; SSLHandshakeException sslE = new SSLHandshakeException(msg); assertNull("getMessage() must return null.", sslE.getMessage()); assertNull("getCause() must return null", sslE.getCause()); } -}
\ No newline at end of file +} diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLKeyExceptionTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLKeyExceptionTest.java index 05ad4dc..d6ba998 100644 --- a/luni/src/test/java/tests/api/javax/net/ssl/SSLKeyExceptionTest.java +++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLKeyExceptionTest.java @@ -15,16 +15,10 @@ */ package tests.api.javax.net.ssl; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import javax.net.ssl.SSLKeyException; import junit.framework.TestCase; -@TestTargetClass(SSLKeyException.class) public class SSLKeyExceptionTest extends TestCase { private static String[] msgs = { @@ -38,12 +32,6 @@ public class SSLKeyExceptionTest extends TestCase { * constructs SSLKeyException with detail message msg. Parameter * <code>msg</code> is not null. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "SSLKeyException", - args = {java.lang.String.class} - ) public void test_Constructor01() { SSLKeyException skE; for (int i = 0; i < msgs.length; i++) { @@ -58,16 +46,10 @@ public class SSLKeyExceptionTest extends TestCase { * constructs SSLPeerUnverifiedException with detail message msg. Parameter * <code>msg</code> is null. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "SSLKeyException", - args = {java.lang.String.class} - ) public void test_Constructor02() { String msg = null; SSLKeyException skE = new SSLKeyException(msg); assertNull("getMessage() must return null.", skE.getMessage()); assertNull("getCause() must return null", skE.getCause()); } -}
\ No newline at end of file +} diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLPeerUnverifiedExceptionTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLPeerUnverifiedExceptionTest.java index fe760ad..a8b9ac4 100644 --- a/luni/src/test/java/tests/api/javax/net/ssl/SSLPeerUnverifiedExceptionTest.java +++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLPeerUnverifiedExceptionTest.java @@ -15,16 +15,10 @@ */ package tests.api.javax.net.ssl; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import javax.net.ssl.SSLPeerUnverifiedException; import junit.framework.TestCase; -@TestTargetClass(SSLPeerUnverifiedException.class) public class SSLPeerUnverifiedExceptionTest extends TestCase { private static String[] msgs = { @@ -38,12 +32,6 @@ public class SSLPeerUnverifiedExceptionTest extends TestCase { * constructs SSLPeerUnverifiedException with detail message msg. Parameter * <code>msg</code> is not null. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "SSLPeerUnverifiedException", - args = {java.lang.String.class} - ) public void test_Constructor01() { SSLPeerUnverifiedException sslE; for (int i = 0; i < msgs.length; i++) { @@ -58,12 +46,6 @@ public class SSLPeerUnverifiedExceptionTest extends TestCase { * constructs SSLPeerUnverifiedException with detail message msg. Parameter * <code>msg</code> is null. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "SSLPeerUnverifiedException", - args = {java.lang.String.class} - ) public void test_Constructor02() { String msg = null; SSLPeerUnverifiedException sslE = new SSLPeerUnverifiedException(msg); diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLPermissionTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLPermissionTest.java index 81fb0f2..313eace 100644 --- a/luni/src/test/java/tests/api/javax/net/ssl/SSLPermissionTest.java +++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLPermissionTest.java @@ -17,10 +17,6 @@ package tests.api.javax.net.ssl; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import javax.net.ssl.SSLPermission; import junit.framework.TestCase; @@ -29,18 +25,11 @@ import junit.framework.TestCase; * Tests for <code>SSLPermission</code> class constructors. * */ -@TestTargetClass(SSLPermission.class) public class SSLPermissionTest extends TestCase { /* * Class under test for void SSLPermission(String) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "SSLPermission", - args = {String.class} - ) public void test_ConstructorLjava_lang_String() { try { SSLPermission p = new SSLPermission("name"); @@ -58,12 +47,6 @@ public class SSLPermissionTest extends TestCase { /* * Class under test for void SSLPermission(String, String) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "SSLPermission", - args = {String.class, String.class} - ) public void test_ConstructorLjava_lang_StringLjava_lang_String() { try { SSLPermission p = new SSLPermission("name", "value"); diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLProtocolExceptionTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLProtocolExceptionTest.java index 47ac731..14b562d 100644 --- a/luni/src/test/java/tests/api/javax/net/ssl/SSLProtocolExceptionTest.java +++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLProtocolExceptionTest.java @@ -15,16 +15,10 @@ */ package tests.api.javax.net.ssl; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import javax.net.ssl.SSLProtocolException; import junit.framework.TestCase; -@TestTargetClass(SSLProtocolException.class) public class SSLProtocolExceptionTest extends TestCase { private static String[] msgs = { @@ -38,12 +32,6 @@ public class SSLProtocolExceptionTest extends TestCase { * constructs SSLProtocolException with detail message msg. Parameter * <code>msg</code> is not null. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "SSLProtocolException", - args = {java.lang.String.class} - ) public void test_Constructor01() { SSLProtocolException sslE; for (int i = 0; i < msgs.length; i++) { @@ -58,16 +46,10 @@ public class SSLProtocolExceptionTest extends TestCase { * constructs SSLProtocolException with detail message msg. Parameter * <code>msg</code> is null. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "SSLProtocolException", - args = {java.lang.String.class} - ) public void test_Constructor02() { String msg = null; SSLProtocolException sslE = new SSLProtocolException(msg); assertNull("getMessage() must return null.", sslE.getMessage()); assertNull("getCause() must return null", sslE.getCause()); } -}
\ No newline at end of file +} diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLServerSocketFactoryTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLServerSocketFactoryTest.java index 979d574..5958ecb 100644 --- a/luni/src/test/java/tests/api/javax/net/ssl/SSLServerSocketFactoryTest.java +++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLServerSocketFactoryTest.java @@ -16,10 +16,6 @@ package tests.api.javax.net.ssl; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.io.IOException; import java.net.InetAddress; import java.net.ServerSocket; @@ -28,7 +24,6 @@ import javax.net.ssl.SSLServerSocketFactory; import junit.framework.TestCase; -@TestTargetClass(SSLServerSocketFactory.class) public class SSLServerSocketFactoryTest extends TestCase { private class MockSSLServerSocketFactory extends SSLServerSocketFactory { @@ -65,14 +60,8 @@ public class SSLServerSocketFactoryTest extends TestCase { } /** - * @tests javax.net.ssl.SSLServerSocketFactory#SSLServerSocketFactory() + * javax.net.ssl.SSLServerSocketFactory#SSLServerSocketFactory() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "SSLServerSocketFactory", - args = {} - ) public void test_Constructor() { try { MockSSLServerSocketFactory ssf = new MockSSLServerSocketFactory(); @@ -82,28 +71,16 @@ public class SSLServerSocketFactoryTest extends TestCase { } /** - * @tests javax.net.ssl.SSLServerSocketFactory#getDefault() + * javax.net.ssl.SSLServerSocketFactory#getDefault() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getDefault", - args = {} - ) public void test_getDefault() { assertNotNull("Incorrect default socket factory", SSLServerSocketFactory.getDefault()); } /** - * @tests javax.net.ssl.SSLServerSocketFactory#getDefaultCipherSuites() + * javax.net.ssl.SSLServerSocketFactory#getDefaultCipherSuites() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getDefaultCipherSuites", - args = {} - ) public void test_getDefaultCipherSuites() { SSLServerSocketFactory ssf = (SSLServerSocketFactory) SSLServerSocketFactory .getDefault(); @@ -115,14 +92,8 @@ public class SSLServerSocketFactoryTest extends TestCase { } /** - * @tests javax.net.ssl.SSLServerSocketFactory#getSupportedCipherSuites() + * javax.net.ssl.SSLServerSocketFactory#getSupportedCipherSuites() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSupportedCipherSuites", - args = {} - ) public void test_getSupportedCipherSuites() { SSLServerSocketFactory ssf = (SSLServerSocketFactory) SSLServerSocketFactory .getDefault(); diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLServerSocketTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLServerSocketTest.java index 20ce035..6c8e657 100644 --- a/luni/src/test/java/tests/api/javax/net/ssl/SSLServerSocketTest.java +++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLServerSocketTest.java @@ -16,11 +16,6 @@ package tests.api.javax.net.ssl; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; - import junit.framework.TestCase; import org.apache.harmony.luni.util.Base64; @@ -40,7 +35,6 @@ import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLServerSocket; -@TestTargetClass(SSLServerSocket.class) public class SSLServerSocketTest extends TestCase { // set to true if on Android, false if on RI @@ -124,14 +118,8 @@ public class SSLServerSocketTest extends TestCase { } /** - * @tests javax.net.ssl.SSLServerSocket#SSLServerSocket() + * javax.net.ssl.SSLServerSocket#SSLServerSocket() */ - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "IOException wasn't implemented", - method = "SSLServerSocket", - args = {} - ) public void testConstructor_01() { try { SSLServerSocket ssl = new mySSLServerSocket(); @@ -141,14 +129,8 @@ public class SSLServerSocketTest extends TestCase { } /** - * @tests javax.net.ssl.SSLServerSocket#SSLServerSocket(int port) + * javax.net.ssl.SSLServerSocket#SSLServerSocket(int port) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "SSLServerSocket", - args = {int.class} - ) public void testConstructor_02() { SSLServerSocket ssl; int portNumber = Support_PortManager.getNextPort(); @@ -184,14 +166,8 @@ public class SSLServerSocketTest extends TestCase { } /** - * @tests javax.net.ssl.SSLServerSocket#SSLServerSocket(int port, int backlog) + * javax.net.ssl.SSLServerSocket#SSLServerSocket(int port, int backlog) */ - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "Invalid values for backlog weren't checked", - method = "SSLServerSocket", - args = {int.class, int.class} - ) public void testConstructor_03() { mySSLServerSocket ssl; int portNumber = Support_PortManager.getNextPort(); @@ -225,14 +201,8 @@ public class SSLServerSocketTest extends TestCase { } /** - * @tests javax.net.ssl.SSLServerSocket#SSLServerSocket(int port, int backlog, InetAddress address) + * javax.net.ssl.SSLServerSocket#SSLServerSocket(int port, int backlog, InetAddress address) */ - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "Invalid values for backlog weren\'t checked", - method = "SSLServerSocket", - args = {int.class, int.class, InetAddress.class} - ) public void testConstructor_04() { mySSLServerSocket ssl; InetAddress ia = null; @@ -276,14 +246,8 @@ public class SSLServerSocketTest extends TestCase { /** * @throws Exception - * @tests javax.net.ssl.SSLServerSocket#getSupportedCipherSuites() + * javax.net.ssl.SSLServerSocket#getSupportedCipherSuites() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSupportedCipherSuites", - args = {} - ) public void test_getSupportedCipherSuites() throws Exception { SSLServerSocket sss = getSSLServerSocket(); String[] res = sss.getSupportedCipherSuites(); @@ -293,23 +257,9 @@ public class SSLServerSocketTest extends TestCase { /** * @throws IOException - * @tests javax.net.ssl.SSLServerSocket#getEnabledCipherSuites() - * @tests javax.net.ssl.SSLServerSocket#setEnabledCipherSuites(String[] suites) + * javax.net.ssl.SSLServerSocket#getEnabledCipherSuites() + * javax.net.ssl.SSLServerSocket#setEnabledCipherSuites(String[] suites) */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getEnabledCipherSuites", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setEnabledCipherSuites", - args = {String[].class} - ) - }) public void test_EnabledCipherSuites() throws Exception { SSLServerSocket sss = getSSLServerSocket(); try { @@ -335,14 +285,8 @@ public class SSLServerSocketTest extends TestCase { /** * @throws IOException - * @tests javax.net.ssl.SSLServerSocket#getSupportedProtocols() + * javax.net.ssl.SSLServerSocket#getSupportedProtocols() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSupportedProtocols", - args = {} - ) public void test_getSupportedProtocols() throws Exception { SSLServerSocket sss = getSSLServerSocket(); String[] res = sss.getSupportedCipherSuites(); @@ -352,23 +296,9 @@ public class SSLServerSocketTest extends TestCase { /** * @throws IOException - * @tests javax.net.ssl.SSLServerSocket#getEnabledProtocols() - * @tests javax.net.ssl.SSLServerSocket#setEnabledProtocols(String[] protocols) + * javax.net.ssl.SSLServerSocket#getEnabledProtocols() + * javax.net.ssl.SSLServerSocket#setEnabledProtocols(String[] protocols) */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setEnabledProtocols", - args = {String[].class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getEnabledProtocols", - args = {} - ) - }) public void test_EnabledProtocols() throws Exception { SSLServerSocket sss = getSSLServerSocket(); try { @@ -392,23 +322,9 @@ public class SSLServerSocketTest extends TestCase { /** * @throws IOException - * @tests javax.net.ssl.SSLServerSocket#setEnableSessionCreation(boolean flag) - * @tests javax.net.ssl.SSLServerSocket#getEnableSessionCreation() + * javax.net.ssl.SSLServerSocket#setEnableSessionCreation(boolean flag) + * javax.net.ssl.SSLServerSocket#getEnableSessionCreation() */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getEnableSessionCreation", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setEnableSessionCreation", - args = {boolean.class} - ) - }) public void test_EnableSessionCreation() throws Exception { SSLServerSocket sss = getSSLServerSocket(); assertTrue(sss.getEnableSessionCreation()); @@ -420,23 +336,9 @@ public class SSLServerSocketTest extends TestCase { /** * @throws IOException - * @tests javax.net.ssl.SSLServerSocket#setNeedClientAuth(boolean need) - * @tests javax.net.ssl.SSLServerSocket#getNeedClientAuthCreation() + * javax.net.ssl.SSLServerSocket#setNeedClientAuth(boolean need) + * javax.net.ssl.SSLServerSocket#getNeedClientAuthCreation() */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setNeedClientAuth", - args = {boolean.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getNeedClientAuth", - args = {} - ) - }) public void test_NeedClientAuth() throws Exception { SSLServerSocket sss = getSSLServerSocket(); sss.setNeedClientAuth(true); @@ -447,23 +349,9 @@ public class SSLServerSocketTest extends TestCase { /** * @throws IOException - * @tests javax.net.ssl.SSLServerSocket#getUseClientMode() - * @tests javax.net.ssl.SSLServerSocket#setUseClientMode(boolean mode) + * javax.net.ssl.SSLServerSocket#getUseClientMode() + * javax.net.ssl.SSLServerSocket#setUseClientMode(boolean mode) */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getUseClientMode", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setUseClientMode", - args = {boolean.class} - ) - }) public void test_UseClientMode() throws Exception { SSLServerSocket sss = getSSLServerSocket(); sss.setUseClientMode(false); @@ -474,23 +362,9 @@ public class SSLServerSocketTest extends TestCase { /** * @throws IOException - * @tests javax.net.ssl.SSLServerSocket#setWantClientAuth(boolean want) - * @tests javax.net.ssl.SSLServerSocket#getWantClientAuthCreation() + * javax.net.ssl.SSLServerSocket#setWantClientAuth(boolean want) + * javax.net.ssl.SSLServerSocket#getWantClientAuthCreation() */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getWantClientAuth", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setWantClientAuth", - args = {boolean.class} - ) - }) public void test_WantClientAuth() throws Exception { SSLServerSocket sss = getSSLServerSocket(); sss.setWantClientAuth(true); @@ -590,12 +464,6 @@ public class SSLServerSocketTest extends TestCase { return sss; } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Guard against native resource leakage.", - method = "SSLSocket", - args = {} - ) public void test_creationStressTest() throws Exception { KeyManager[] keyManagers = getKeyManagers(); // Test the default codepath, which uses /dev/urandom. diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLSessionBindingEventTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLSessionBindingEventTest.java index a3bc79a..dfccf68 100644 --- a/luni/src/test/java/tests/api/javax/net/ssl/SSLSessionBindingEventTest.java +++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLSessionBindingEventTest.java @@ -17,11 +17,6 @@ package tests.api.javax.net.ssl; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.Principal; import java.security.cert.Certificate; @@ -37,15 +32,8 @@ import junit.framework.TestCase; * Tests for <code>SSLSessionBindingEvent</code> class constructors and methods. * */ -@TestTargetClass(SSLSessionBindingEvent.class) public class SSLSessionBindingEventTest extends TestCase { - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "SSLSessionBindingEvent", - args = {javax.net.ssl.SSLSession.class, java.lang.String.class} - ) public final void test_ConstructorLjavax_net_ssl_SSLSessionLjava_lang_String() { SSLSession ses = new MySSLSession(); @@ -76,14 +64,8 @@ public class SSLSessionBindingEventTest extends TestCase { } /** - * @tests javax.net.ssl.SSLSessionBindingEvent#getName() + * javax.net.ssl.SSLSessionBindingEvent#getName() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getName", - args = {} - ) public void test_getName() { SSLSession ses = new MySSLSession(); SSLSessionBindingEvent event = new SSLSessionBindingEvent(ses, "test"); @@ -93,14 +75,8 @@ public class SSLSessionBindingEventTest extends TestCase { } /** - * @tests javax.net.ssl.SSLSessionBindingEvent#getSession() + * javax.net.ssl.SSLSessionBindingEvent#getSession() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSession", - args = {} - ) public void test_getSession() { SSLSession ses = new MySSLSession(); SSLSessionBindingEvent event = new SSLSessionBindingEvent(ses, "test"); diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLSessionBindingListenerTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLSessionBindingListenerTest.java index 2538c87..a006a83 100644 --- a/luni/src/test/java/tests/api/javax/net/ssl/SSLSessionBindingListenerTest.java +++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLSessionBindingListenerTest.java @@ -17,11 +17,6 @@ package tests.api.javax.net.ssl; -import dalvik.annotation.KnownFailure; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import javax.net.ssl.SSLServerSocket; import javax.net.ssl.SSLServerSocketFactory; import javax.net.ssl.SSLSession; @@ -39,7 +34,6 @@ import junit.framework.TestCase; * Tests for SSLSessionBindingListener class * */ -@TestTargetClass(SSLSessionBindingListener.class) public class SSLSessionBindingListenerTest extends TestCase { public class mySSLSessionBindingListener implements SSLSessionBindingListener { @@ -62,14 +56,8 @@ public class SSLSessionBindingListenerTest extends TestCase { * @throws IOException * @throws UnknownHostException * @throws InterruptedException - * @tests javax.net.ssl.SSLSessionBindingListener#valueBound(SSLSessionBindingEvent event) + * javax.net.ssl.SSLSessionBindingListener#valueBound(SSLSessionBindingEvent event) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "valueBound", - args = {SSLSessionBindingEvent.class} - ) public void test_valueBound() throws UnknownHostException, IOException, InterruptedException { SSLSocket sock = (SSLSocket) SSLSocketFactory.getDefault() @@ -83,14 +71,8 @@ public class SSLSessionBindingListenerTest extends TestCase { /** * @throws IOException * @throws UnknownHostException - * @tests javax.net.ssl.SSLSessionBindingListener#valueUnbound(SSLSessionBindingEvent event) + * javax.net.ssl.SSLSessionBindingListener#valueUnbound(SSLSessionBindingEvent event) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "valueUnbound", - args = {SSLSessionBindingEvent.class} - ) public void test_valueUnbound() throws UnknownHostException, IOException { SSLSocket sock = (SSLSocket) SSLSocketFactory.getDefault() .createSocket(); diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLSessionContextTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLSessionContextTest.java index 9e3eac1..aa95eb8 100644 --- a/luni/src/test/java/tests/api/javax/net/ssl/SSLSessionContextTest.java +++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLSessionContextTest.java @@ -1,10 +1,5 @@ package tests.api.javax.net.ssl; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import javax.net.ssl.SSLContext; @@ -16,29 +11,14 @@ import java.security.NoSuchAlgorithmException; /** * Tests for <code>SSLSessionContext</code> class constructors and methods. */ -@TestTargetClass(SSLSessionContext.class) public class SSLSessionContextTest extends TestCase { /** * @throws NoSuchAlgorithmException * @throws KeyManagementException - * @tests javax.net.ssl.SSLSessionContex#getSessionCacheSize() - * @tests javax.net.ssl.SSLSessionContex#setSessionCacheSize(int size) + * javax.net.ssl.SSLSessionContex#getSessionCacheSize() + * javax.net.ssl.SSLSessionContex#setSessionCacheSize(int size) */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSessionCacheSize", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setSessionCacheSize", - args = {int.class} - ) - }) public final void test_sessionCacheSize() throws NoSuchAlgorithmException, KeyManagementException { SSLContext context = SSLContext.getInstance("TLS"); context.init(null, null, null); @@ -60,23 +40,9 @@ public class SSLSessionContextTest extends TestCase { /** * @throws NoSuchAlgorithmException * @throws KeyManagementException - * @tests javax.net.ssl.SSLSessionContex#getSessionTimeout() - * @tests javax.net.ssl.SSLSessionContex#setSessionTimeout(int seconds) + * javax.net.ssl.SSLSessionContex#getSessionTimeout() + * javax.net.ssl.SSLSessionContex#setSessionTimeout(int seconds) */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSessionTimeout", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setSessionTimeout", - args = {int.class} - ) - }) public final void test_sessionTimeout() throws NoSuchAlgorithmException, KeyManagementException { SSLContext context = SSLContext.getInstance("TLS"); context.init(null, null, null); @@ -98,14 +64,8 @@ public class SSLSessionContextTest extends TestCase { /** * @throws NoSuchAlgorithmException * @throws KeyManagementException - * @tests javax.net.ssl.SSLSessionContex#getSession(byte[] sessionId) + * javax.net.ssl.SSLSessionContex#getSession(byte[] sessionId) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSession", - args = {byte[].class} - ) public final void test_getSession() throws NoSuchAlgorithmException, KeyManagementException { SSLContext context = SSLContext.getInstance("TLS"); context.init(null, null, null); @@ -122,14 +82,8 @@ public class SSLSessionContextTest extends TestCase { /** * @throws NoSuchAlgorithmException * @throws KeyManagementException - * @tests javax.net.ssl.SSLSessionContex#getIds() + * javax.net.ssl.SSLSessionContex#getIds() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getIds", - args = {} - ) public final void test_getIds() throws NoSuchAlgorithmException, KeyManagementException { SSLContext context = SSLContext.getInstance("TLS"); context.init(null, null, null); @@ -138,4 +92,4 @@ public class SSLSessionContextTest extends TestCase { assertFalse(sc.getIds().hasMoreElements()); } -}
\ No newline at end of file +} diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLSocketFactoryTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLSocketFactoryTest.java index 112e251..02abcc2 100644 --- a/luni/src/test/java/tests/api/javax/net/ssl/SSLSocketFactoryTest.java +++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLSocketFactoryTest.java @@ -15,11 +15,6 @@ */ package tests.api.javax.net.ssl; -import dalvik.annotation.BrokenTest; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.io.IOException; import java.net.ServerSocket; import java.net.Socket; @@ -32,7 +27,6 @@ import junit.framework.TestCase; import tests.support.Support_PortManager; -@TestTargetClass(SSLSocketFactory.class) public class SSLSocketFactoryTest extends TestCase { private ServerSocket ss; @@ -48,14 +42,8 @@ public class SSLSocketFactoryTest extends TestCase { } /** - * @tests javax.net.ssl.SSLSocketFactory#SSLSocketFactory() + * javax.net.ssl.SSLSocketFactory#SSLSocketFactory() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "SSLSocketFactory", - args = {} - ) public void test_Constructor() { try { SocketFactory sf = SSLSocketFactory.getDefault(); @@ -66,28 +54,16 @@ public class SSLSocketFactoryTest extends TestCase { } /** - * @tests javax.net.ssl.SSLSocketFactory#getDefault() + * javax.net.ssl.SSLSocketFactory#getDefault() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getDefault", - args = {} - ) public void test_getDefault() { assertNotNull("Incorrect default socket factory", SSLSocketFactory.getDefault()); } /** - * @tests javax.net.ssl.SSLSocketFactory#createSocket(Socket s, String host, int port, boolean autoClose) + * javax.net.ssl.SSLSocketFactory#createSocket(Socket s, String host, int port, boolean autoClose) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "createSocket", - args = {java.net.Socket.class, java.lang.String.class, int.class, boolean.class} - ) public void test_createSocket() { SSLSocketFactory sf = (SSLSocketFactory)SSLSocketFactory.getDefault(); int sport = startServer("test_createSocket()"); @@ -138,14 +114,8 @@ public class SSLSocketFactoryTest extends TestCase { } /** - * @tests javax.net.ssl.SSLSocketFactory#getDefaultCipherSuites() + * javax.net.ssl.SSLSocketFactory#getDefaultCipherSuites() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getDefaultCipherSuites", - args = {} - ) public void test_getDefaultCipherSuites() { try { SSLSocketFactory sf = (SSLSocketFactory) SSLSocketFactory.getDefault(); @@ -157,14 +127,8 @@ public class SSLSocketFactoryTest extends TestCase { } /** - * @tests javax.net.ssl.SSLSocketFactory#getSupportedCipherSuites() + * javax.net.ssl.SSLSocketFactory#getSupportedCipherSuites() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSupportedCipherSuites", - args = {} - ) public void test_getSupportedCipherSuites() { try { SSLSocketFactory sf = (SSLSocketFactory) SSLSocketFactory.getDefault(); diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLSocketTest.java b/luni/src/test/java/tests/api/javax/net/ssl/SSLSocketTest.java index 0742a23..84ac212 100644 --- a/luni/src/test/java/tests/api/javax/net/ssl/SSLSocketTest.java +++ b/luni/src/test/java/tests/api/javax/net/ssl/SSLSocketTest.java @@ -16,10 +16,6 @@ package tests.api.javax.net.ssl; import dalvik.annotation.AndroidOnly; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; import javax.net.ssl.*; import javax.security.cert.X509Certificate; @@ -39,7 +35,6 @@ import org.apache.harmony.luni.util.Base64; import tests.api.javax.net.ssl.HandshakeCompletedEventTest.TestTrustManager; import tests.support.Support_PortManager; -@TestTargetClass(SSLSocket.class) public class SSLSocketTest extends TestCase { public class HandshakeCL implements HandshakeCompletedListener { @@ -51,14 +46,8 @@ public class SSLSocketTest extends TestCase { } /** - * @tests javax.net.ssl.SSLSocket#SSLSocket() + * javax.net.ssl.SSLSocket#SSLSocket() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "SSLSocket", - args = {} - ) public void testConstructor_01() { try { SSLSocket ssl = getSSLSocket(); @@ -70,14 +59,8 @@ public class SSLSocketTest extends TestCase { /** * @throws IOException * @throws UnknownHostException - * @tests javax.net.ssl.SSLSocket#SSLSocket(InetAddress address, int port) + * javax.net.ssl.SSLSocket#SSLSocket(InetAddress address, int port) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "SSLSocket", - args = {java.net.InetAddress.class, int.class} - ) public void testConstructor_02() throws UnknownHostException, IOException { SSLSocket ssl; int sport = startServer("Cons InetAddress,I"); @@ -109,15 +92,9 @@ public class SSLSocketTest extends TestCase { /** * @throws IOException * @throws UnknownHostException - * @tests javax.net.ssl.SSLSocket#SSLSocket(InetAddress address, int port, + * javax.net.ssl.SSLSocket#SSLSocket(InetAddress address, int port, * InetAddress clientAddress, int clientPort) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "SSLSocket", - args = {java.net.InetAddress.class, int.class, java.net.InetAddress.class, int.class} - ) public void testConstructor_03() throws UnknownHostException, IOException { SSLSocket ssl; int sport = startServer("Cons InetAddress,I,InetAddress,I"); @@ -228,14 +205,8 @@ public class SSLSocketTest extends TestCase { /** * @throws IOException * @throws UnknownHostException - * @tests javax.net.ssl.SSLSocket#SSLSocket(String host, int port) + * javax.net.ssl.SSLSocket#SSLSocket(String host, int port) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "SSLSocket", - args = {java.lang.String.class, int.class} - ) public void testConstructor_04() throws UnknownHostException, IOException { SSLSocket ssl; int sport = startServer("Cons String,I"); @@ -276,15 +247,9 @@ public class SSLSocketTest extends TestCase { /** * @throws IOException * @throws UnknownHostException - * @tests javax.net.ssl.SSLSocket#SSLSocket(String host, int port, InetAddress clientAddress, + * javax.net.ssl.SSLSocket#SSLSocket(String host, int port, InetAddress clientAddress, * int clientPort) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "SSLSocket", - args = {java.lang.String.class, int.class, java.net.InetAddress.class, int.class} - ) public void testConstructor_05() throws UnknownHostException, IOException { SSLSocket ssl; int sport = startServer("Cons String,I,InetAddress,I"); @@ -337,12 +302,6 @@ public class SSLSocketTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Guard against native resource leakage.", - method = "SSLSocket", - args = {} - ) public void test_creationStressTest() throws Exception { // Test the default codepath, which uses /dev/urandom. SSLContext sslContext = SSLContext.getInstance("TLS"); @@ -360,14 +319,8 @@ public class SSLSocketTest extends TestCase { /** * @throws IOException - * @tests javax.net.ssl.SSLSocket#addHandshakeCompletedListener(HandshakeCompletedListener listener) + * javax.net.ssl.SSLSocket#addHandshakeCompletedListener(HandshakeCompletedListener listener) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "addHandshakeCompletedListener", - args = {javax.net.ssl.HandshakeCompletedListener.class} - ) @AndroidOnly("RI doesn't throw the specified IAE") public void test_addHandshakeCompletedListener() throws IOException { SSLSocket ssl = getSSLSocket(); @@ -387,14 +340,8 @@ public class SSLSocketTest extends TestCase { /** * @throws IOException - * @tests javax.net.ssl.SSLSocket#removeHandshakeCompletedListener(HandshakeCompletedListener listener) + * javax.net.ssl.SSLSocket#removeHandshakeCompletedListener(HandshakeCompletedListener listener) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "removeHandshakeCompletedListener", - args = {javax.net.ssl.HandshakeCompletedListener.class} - ) public void test_removeHandshakeCompletedListener() throws IOException { SSLSocket ssl = getSSLSocket(); HandshakeCompletedListener ls = new HandshakeCL(); @@ -423,23 +370,9 @@ public class SSLSocketTest extends TestCase { /** * @throws IOException - * @tests javax.net.ssl.SSLSocket#setEnableSessionCreation(boolean flag) - * @tests javax.net.ssl.SSLSocket#getEnableSessionCreation() + * javax.net.ssl.SSLSocket#setEnableSessionCreation(boolean flag) + * javax.net.ssl.SSLSocket#getEnableSessionCreation() */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getEnableSessionCreation", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setEnableSessionCreation", - args = {boolean.class} - ) - }) public void test_EnableSessionCreation() throws IOException { SSLSocket ssl = getSSLSocket(); assertTrue(ssl.getEnableSessionCreation()); @@ -452,23 +385,9 @@ public class SSLSocketTest extends TestCase { /** * @throws IOException * @throws UnknownHostException - * @tests javax.net.ssl.SSLSocket#setNeedClientAuth(boolean need) - * @tests javax.net.ssl.SSLSocket#getNeedClientAuthCreation() + * javax.net.ssl.SSLSocket#setNeedClientAuth(boolean need) + * javax.net.ssl.SSLSocket#getNeedClientAuthCreation() */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setNeedClientAuth", - args = {boolean.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getNeedClientAuth", - args = {} - ) - }) public void test_NeedClientAuth() throws UnknownHostException, IOException { SSLSocket ssl = getSSLSocket(); ssl.setNeedClientAuth(true); @@ -480,23 +399,9 @@ public class SSLSocketTest extends TestCase { /** * @throws IOException * @throws UnknownHostException - * @tests javax.net.ssl.SSLSocket#setWantClientAuth(boolean want) - * @tests javax.net.ssl.SSLSocket#getWantClientAuthCreation() + * javax.net.ssl.SSLSocket#setWantClientAuth(boolean want) + * javax.net.ssl.SSLSocket#getWantClientAuthCreation() */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setWantClientAuth", - args = {boolean.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getWantClientAuth", - args = {} - ) - }) public void test_WantClientAuth() throws UnknownHostException, IOException { SSLSocket ssl = getSSLSocket(); ssl.setWantClientAuth(true); @@ -507,14 +412,8 @@ public class SSLSocketTest extends TestCase { /** * @throws IOException - * @tests javax.net.ssl.SSLSocket#getSupportedProtocols() + * javax.net.ssl.SSLSocket#getSupportedProtocols() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSupportedProtocols", - args = {} - ) public void test_getSupportedProtocols() throws IOException { SSLSocket ssl = getSSLSocket(); String[] res = ssl.getSupportedProtocols(); @@ -523,23 +422,9 @@ public class SSLSocketTest extends TestCase { /** * @throws IOException - * @tests javax.net.ssl.SSLSocket#getEnabledProtocols() - * @tests javax.net.ssl.SSLSocket#setEnabledProtocols(String[] protocols) + * javax.net.ssl.SSLSocket#getEnabledProtocols() + * javax.net.ssl.SSLSocket#setEnabledProtocols(String[] protocols) */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setEnabledProtocols", - args = {java.lang.String[].class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getEnabledProtocols", - args = {} - ) - }) public void test_EnabledProtocols() throws IOException { SSLSocket ssl = getSSLSocket(); try { @@ -565,14 +450,8 @@ public class SSLSocketTest extends TestCase { /** * @throws IOException - * @tests javax.net.ssl.SSLSocket#getSession() + * javax.net.ssl.SSLSocket#getSession() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSession", - args = {} - ) public void test_getSession() throws IOException { SSLSocket ssl = getSSLSocket(); try { @@ -584,14 +463,8 @@ public class SSLSocketTest extends TestCase { /** * @throws IOException - * @tests javax.net.ssl.SSLSocket#getSupportedCipherSuites() + * javax.net.ssl.SSLSocket#getSupportedCipherSuites() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSupportedCipherSuites", - args = {} - ) public void test_getSupportedCipherSuites() throws IOException { SSLSocket ssl = getSSLSocket(); String[] res = ssl.getSupportedCipherSuites(); @@ -600,23 +473,9 @@ public class SSLSocketTest extends TestCase { /** * @throws IOException - * @tests javax.net.ssl.SSLSocket#getEnabledCipherSuites() - * @tests javax.net.ssl.SSLSocket#setEnabledCipherSuites(String[] suites) + * javax.net.ssl.SSLSocket#getEnabledCipherSuites() + * javax.net.ssl.SSLSocket#setEnabledCipherSuites(String[] suites) */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getEnabledCipherSuites", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setEnabledCipherSuites", - args = {java.lang.String[].class} - ) - }) public void test_EnabledCipherSuites() throws IOException { SSLSocket ssl = getSSLSocket(); try { @@ -644,23 +503,9 @@ public class SSLSocketTest extends TestCase { /** * @throws IOException - * @tests javax.net.ssl.SSLSocket#getUseClientMode() - * @tests javax.net.ssl.SSLSocket#setUseClientMode(boolean mode) + * javax.net.ssl.SSLSocket#getUseClientMode() + * javax.net.ssl.SSLSocket#setUseClientMode(boolean mode) */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getUseClientMode", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setUseClientMode", - args = {boolean.class} - ) - }) public void test_UseClientMode() throws IOException { SSLSocket ssl = getSSLSocket(); assertTrue(ssl.getUseClientMode()); @@ -685,14 +530,8 @@ public class SSLSocketTest extends TestCase { /** * @throws IOException - * @tests javax.net.ssl.SSLSocket#startHandshake() + * javax.net.ssl.SSLSocket#startHandshake() */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "startHandshake", - args = {} - ) public void test_startHandshake() throws IOException { SSLSocket ssl = getSSLSocket(); try { diff --git a/luni/src/test/java/tests/api/javax/net/ssl/TrustManagerFactory1Test.java b/luni/src/test/java/tests/api/javax/net/ssl/TrustManagerFactory1Test.java index 2fab2ed..1140984 100644 --- a/luni/src/test/java/tests/api/javax/net/ssl/TrustManagerFactory1Test.java +++ b/luni/src/test/java/tests/api/javax/net/ssl/TrustManagerFactory1Test.java @@ -17,9 +17,6 @@ package tests.api.javax.net.ssl; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; import dalvik.annotation.KnownFailure; import java.io.IOException; @@ -56,7 +53,6 @@ import java.util.Set; * Tests for <code>TrustManagerFactory</code> class constructors and methods. * */ -@TestTargetClass(TrustManagerFactory.class) public class TrustManagerFactory1Test extends TestCase { private static final String srvTrustManagerFactory = "TrustManagerFactory"; @@ -114,12 +110,6 @@ public class TrustManagerFactory1Test extends TestCase { * constructor * Assertion: created new TrustManagerFactory object */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "TrustManagerFactory", - args = {javax.net.ssl.TrustManagerFactorySpi.class, java.security.Provider.class, java.lang.String.class} - ) public void test_ConstructorLjavax_net_ssl_TrustManagerFactorySpiLjava_security_ProviderLjava_lang_String() throws NoSuchAlgorithmException { if (!DEFSupported) { @@ -152,12 +142,6 @@ public class TrustManagerFactory1Test extends TestCase { * @throws NoSuchAlgorithmException * @throws NoSuchProviderException */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getAlgorithm", - args = {} - ) public void test_getAlgorithm() throws NoSuchAlgorithmException, NoSuchProviderException { if (!DEFSupported) fail(NotSupportedMsg); @@ -180,12 +164,6 @@ public class TrustManagerFactory1Test extends TestCase { * Test for <code>getDefaultAlgorithm()</code> method * Assertion: returns value which is specifoed in security property */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getDefaultAlgorithm", - args = {} - ) public void test_getDefaultAlgorithm() { if (!DEFSupported) { fail(NotSupportedMsg); @@ -214,12 +192,6 @@ public class TrustManagerFactory1Test extends TestCase { * Assertions: returns security property "ssl.TrustManagerFactory.algorithm"; * returns instance of TrustManagerFactory */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class} - ) public void test_getInstanceLjava_lang_String01() throws NoSuchAlgorithmException { if (!DEFSupported) { fail(NotSupportedMsg); @@ -241,12 +213,6 @@ public class TrustManagerFactory1Test extends TestCase { * throws NullPointerException when algorithm is null; * throws NoSuchAlgorithmException when algorithm is not correct; */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class} - ) public void test_getInstanceLjava_lang_String02() { try { TrustManagerFactory.getInstance(null); @@ -270,12 +236,6 @@ public class TrustManagerFactory1Test extends TestCase { * Assertion: throws IllegalArgumentException when provider is null * or empty */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void test_getInstanceLjava_lang_StringLjava_lang_String01() throws NoSuchProviderException, NoSuchAlgorithmException { if (!DEFSupported) { @@ -304,12 +264,6 @@ public class TrustManagerFactory1Test extends TestCase { * throws NullPointerException when algorithm is null; * throws NoSuchAlgorithmException when algorithm is not correct; */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void test_getInstanceLjava_lang_StringLjava_lang_String02() throws NoSuchProviderException { if (!DEFSupported) { fail(NotSupportedMsg); @@ -338,12 +292,6 @@ public class TrustManagerFactory1Test extends TestCase { * Assertion: throws NoSuchProviderException when provider has * invalid value */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void test_getInstanceLjava_lang_StringLjava_lang_String03() throws NoSuchAlgorithmException { if (!DEFSupported) { fail(NotSupportedMsg); @@ -368,12 +316,6 @@ public class TrustManagerFactory1Test extends TestCase { * method * Assertion: returns instance of TrustManagerFactory */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void test_getInstanceLjava_lang_StringLjava_lang_String04() throws NoSuchAlgorithmException, NoSuchProviderException { if (!DEFSupported) { @@ -398,12 +340,6 @@ public class TrustManagerFactory1Test extends TestCase { * method * Assertion: throws IllegalArgumentException when provider is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.security.Provider.class} - ) public void test_getInstanceLjava_lang_StringLjava_security_Provider01() throws NoSuchAlgorithmException { if (!DEFSupported) { fail(NotSupportedMsg); @@ -426,12 +362,6 @@ public class TrustManagerFactory1Test extends TestCase { * throws NullPointerException when algorithm is null; * throws NoSuchAlgorithmException when algorithm is not correct; */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.security.Provider.class} - ) public void test_getInstanceLjava_lang_StringLjava_security_Provider02() { if (!DEFSupported) { fail(NotSupportedMsg); @@ -459,12 +389,6 @@ public class TrustManagerFactory1Test extends TestCase { * method * Assertion: returns instance of TrustManagerFactory */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.security.Provider.class} - ) public void test_getInstanceLjava_lang_StringLjava_security_Provider03() throws NoSuchAlgorithmException { if (!DEFSupported) { fail(NotSupportedMsg); @@ -488,12 +412,6 @@ public class TrustManagerFactory1Test extends TestCase { * @throws NoSuchAlgorithmException * @throws NoSuchProviderException */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getProvider", - args = {} - ) public void test_getProvider() throws NoSuchAlgorithmException, NoSuchProviderException { if (!DEFSupported) fail(NotSupportedMsg); @@ -519,12 +437,6 @@ public class TrustManagerFactory1Test extends TestCase { * @throws CertificateException * @throws NoSuchAlgorithmException */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getTrustManagers", - args = {} - ) public void test_getTrustManagers() { try { TrustManagerFactory trustMF = TrustManagerFactory.getInstance(defaultAlgorithm); @@ -544,12 +456,6 @@ public class TrustManagerFactory1Test extends TestCase { * Test for <code>init(KeyStore keyStore)</code> * Assertion: call method with null parameter */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "init", - args = {java.security.KeyStore.class} - ) public void test_initLjava_security_KeyStore_01() { if (!DEFSupported) { fail(NotSupportedMsg); @@ -571,12 +477,6 @@ public class TrustManagerFactory1Test extends TestCase { * Test for <code>init(KeyStore keyStore)</code> * Assertion: call method with not null parameter */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "init", - args = {java.security.KeyStore.class} - ) public void test_initLjava_security_KeyStore_02() throws KeyStoreException { if (!DEFSupported) { fail(NotSupportedMsg); @@ -601,12 +501,6 @@ public class TrustManagerFactory1Test extends TestCase { * Assertion: * throws InvalidAlgorithmParameterException when params is null */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "init", - args = {javax.net.ssl.ManagerFactoryParameters.class} - ) @KnownFailure("ManagerFactoryParameters object is not supported " + "and InvalidAlgorithmParameterException was thrown.") public void test_initLjavax_net_ssl_ManagerFactoryParameters() { diff --git a/luni/src/test/java/tests/api/javax/net/ssl/TrustManagerFactory2Test.java b/luni/src/test/java/tests/api/javax/net/ssl/TrustManagerFactory2Test.java index 20d4de3..0c0760f 100644 --- a/luni/src/test/java/tests/api/javax/net/ssl/TrustManagerFactory2Test.java +++ b/luni/src/test/java/tests/api/javax/net/ssl/TrustManagerFactory2Test.java @@ -17,11 +17,6 @@ package tests.api.javax.net.ssl; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.InvalidAlgorithmParameterException; import java.security.KeyStore; import java.security.KeyStoreException; @@ -41,7 +36,6 @@ import junit.framework.TestCase; * Tests for TrustManagerFactory class constructors and methods * */ -@TestTargetClass(TrustManagerFactory.class) public class TrustManagerFactory2Test extends TestCase { private static final String srvTrustManagerFactory = "TrustManagerFactory"; private static final String defaultAlg = "TMF"; @@ -120,12 +114,6 @@ public class TrustManagerFactory2Test extends TestCase { * throws NoSuchAlgorithmException when algorithm is not correct; * returns TrustManagerFactory object */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class} - ) public void test_getInstanceLjava_lang_String() throws Exception { try { TrustManagerFactory.getInstance(null); @@ -163,12 +151,6 @@ public class TrustManagerFactory2Test extends TestCase { * throws NoSuchProviderException when provider is available; * returns TrustManagerFactory object */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void test_getInstanceLjava_lang_StringLjava_lang_String() throws Exception { try { TrustManagerFactory.getInstance(null, mProv.getName()); @@ -235,12 +217,6 @@ public class TrustManagerFactory2Test extends TestCase { * throws IllegalArgumentException when provider is null; * returns TrustManagerFactory object */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.security.Provider.class} - ) public void testLjava_lang_StringLjava_security_Provider() throws Exception { try { TrustManagerFactory.getInstance(null, mProv); @@ -276,4 +252,4 @@ public class TrustManagerFactory2Test extends TestCase { checkResult(tmf); } } -}
\ No newline at end of file +} diff --git a/luni/src/test/java/tests/api/javax/net/ssl/TrustManagerFactorySpiTest.java b/luni/src/test/java/tests/api/javax/net/ssl/TrustManagerFactorySpiTest.java index 56cb2a9..7bdeb45 100644 --- a/luni/src/test/java/tests/api/javax/net/ssl/TrustManagerFactorySpiTest.java +++ b/luni/src/test/java/tests/api/javax/net/ssl/TrustManagerFactorySpiTest.java @@ -15,10 +15,6 @@ */ package tests.api.javax.net.ssl; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.AccessController; import java.security.InvalidAlgorithmParameterException; import java.security.KeyStore; @@ -35,19 +31,12 @@ import junit.framework.TestCase; import org.apache.harmony.xnet.tests.support.TrustManagerFactorySpiImpl; import org.apache.harmony.xnet.tests.support.MyTrustManagerFactorySpi.Parameters; -@TestTargetClass(TrustManagerFactorySpi.class) public class TrustManagerFactorySpiTest extends TestCase { private TrustManagerFactorySpiImpl factory = new TrustManagerFactorySpiImpl(); /** - * @tests javax.net.ssl.TrustManagerFactorySpi#TrustManagerFactorySpi() + * javax.net.ssl.TrustManagerFactorySpi#TrustManagerFactorySpi() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "TrustManagerFactorySpi", - args = {} - ) public void test_Constructor() { try { TrustManagerFactorySpiImpl tmf = new TrustManagerFactorySpiImpl(); @@ -59,14 +48,8 @@ public class TrustManagerFactorySpiTest extends TestCase { /** * @throws NoSuchAlgorithmException * @throws KeyStoreException - * @tests javax.net.ssl.TrustManagerFactorySpi#engineInit(KeyStore ks) + * javax.net.ssl.TrustManagerFactorySpi#engineInit(KeyStore ks) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineInit", - args = {java.security.KeyStore.class} - ) public void test_engineInit_01() throws NoSuchAlgorithmException, KeyStoreException { factory.reset(); @@ -92,14 +75,8 @@ public class TrustManagerFactorySpiTest extends TestCase { /** * @throws InvalidAlgorithmParameterException * @throws NoSuchAlgorithmException - * @tests javax.net.ssl.TrustManagerFactorySpi#engineInit(ManagerFactoryParameters spec) + * javax.net.ssl.TrustManagerFactorySpi#engineInit(ManagerFactoryParameters spec) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineInit", - args = {javax.net.ssl.ManagerFactoryParameters.class} - ) public void test_engineInit_02() throws InvalidAlgorithmParameterException, NoSuchAlgorithmException { factory.reset(); @@ -125,14 +102,8 @@ public class TrustManagerFactorySpiTest extends TestCase { /** * @throws NoSuchAlgorithmException - * @tests javax.net.ssl.TrustManagerFactorySpi#engineGetTrustManagers() + * javax.net.ssl.TrustManagerFactorySpi#engineGetTrustManagers() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineGetTrustManagers", - args = {} - ) public void test_engineGetTrustManagers() throws NoSuchAlgorithmException { factory.reset(); Provider provider = new MyProvider(); diff --git a/luni/src/test/java/tests/api/javax/net/ssl/X509ExtendedKeyManagerTest.java b/luni/src/test/java/tests/api/javax/net/ssl/X509ExtendedKeyManagerTest.java index 9ae8d58..514fed8 100644 --- a/luni/src/test/java/tests/api/javax/net/ssl/X509ExtendedKeyManagerTest.java +++ b/luni/src/test/java/tests/api/javax/net/ssl/X509ExtendedKeyManagerTest.java @@ -17,11 +17,6 @@ package tests.api.javax.net.ssl; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.net.Socket; import java.security.Principal; import java.security.PrivateKey; @@ -35,7 +30,6 @@ import junit.framework.TestCase; * Tests for <code>X509ExtendedKeyManager</code> class constructors and methods. * */ -@TestTargetClass(X509ExtendedKeyManager.class) public class X509ExtendedKeyManagerTest extends TestCase { private class MockX509ExtendedKeyManager extends X509ExtendedKeyManager { @@ -93,14 +87,8 @@ public class X509ExtendedKeyManagerTest extends TestCase { } /** - * @tests javax.net.ssl.X509ExtendedKeyManager#X509ExtendedKeyManager() + * javax.net.ssl.X509ExtendedKeyManager#X509ExtendedKeyManager() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "X509ExtendedKeyManager", - args = {} - ) public final void test_Constructor() { try { new MockX509ExtendedKeyManager(); @@ -110,16 +98,10 @@ public class X509ExtendedKeyManagerTest extends TestCase { } /** - * @tests javax.net.ssl.X509ExtendedKeyManager + * javax.net.ssl.X509ExtendedKeyManager * #chooseEngineClientAlias(java.lang.String[], * java.security.Principal[], javax.net.ssl.SSLEngine) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "chooseEngineClientAlias", - args = {java.lang.String[].class, java.security.Principal[].class, javax.net.ssl.SSLEngine.class} - ) public final void test_chooseEngineClientAlias() { X509ExtendedKeyManager km = new MyX509ExtendedKeyManager(); if (km.chooseEngineClientAlias(null, null, null) != null) { @@ -128,16 +110,10 @@ public class X509ExtendedKeyManagerTest extends TestCase { } /** - * @tests javax.net.ssl.X509ExtendedKeyManager + * javax.net.ssl.X509ExtendedKeyManager * #chooseEngineServerAlias(java.lang.String, * java.security.Principal[], javax.net.ssl.SSLEngine) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "chooseEngineServerAlias", - args = {java.lang.String.class, java.security.Principal[].class, javax.net.ssl.SSLEngine.class} - ) public final void test_chooseEngineServerAlias() { X509ExtendedKeyManager km = new MyX509ExtendedKeyManager(); if (km.chooseEngineServerAlias(null, null, null) != null) { diff --git a/luni/src/test/java/tests/api/javax/net/ssl/X509TrustManagerTest.java b/luni/src/test/java/tests/api/javax/net/ssl/X509TrustManagerTest.java index d426648..ebe57de 100644 --- a/luni/src/test/java/tests/api/javax/net/ssl/X509TrustManagerTest.java +++ b/luni/src/test/java/tests/api/javax/net/ssl/X509TrustManagerTest.java @@ -1,10 +1,5 @@ package tests.api.javax.net.ssl; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.io.ByteArrayInputStream; import java.security.cert.CertificateFactory; import java.security.cert.CertificateException; @@ -19,7 +14,6 @@ import org.apache.harmony.xnet.tests.support.X509TrustManagerImpl; /** * Tests for <code>X509TrustManager</code> class constructors and methods. */ -@TestTargetClass(X509TrustManager.class) public class X509TrustManagerTest extends TestCase { private X509Certificate[] setX509Certificate() { @@ -51,14 +45,8 @@ public class X509TrustManagerTest extends TestCase { } /** - * @tests javax.net.ssl.X509TrustManager#checkClientTrusted(X509Certificate[] chain, String authType) + * javax.net.ssl.X509TrustManager#checkClientTrusted(X509Certificate[] chain, String authType) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "checkClientTrusted", - args = {java.security.cert.X509Certificate[].class, java.lang.String.class} - ) public void test_checkClientTrusted_01() { X509TrustManagerImpl xtm = new X509TrustManagerImpl(); X509Certificate[] xcert = null; @@ -103,14 +91,8 @@ public class X509TrustManagerTest extends TestCase { } /** - * @tests javax.net.ssl.X509TrustManager#checkClientTrusted(X509Certificate[] chain, String authType) + * javax.net.ssl.X509TrustManager#checkClientTrusted(X509Certificate[] chain, String authType) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "checkClientTrusted", - args = {java.security.cert.X509Certificate[].class, java.lang.String.class} - ) public void test_checkClientTrusted_02() { X509TrustManagerImpl xtm = new X509TrustManagerImpl(); X509Certificate[] xcert = setInvalid(); @@ -124,14 +106,8 @@ public class X509TrustManagerTest extends TestCase { } /** - * @tests javax.net.ssl.X509TrustManager#checkClientTrusted(X509Certificate[] chain, String authType) + * javax.net.ssl.X509TrustManager#checkClientTrusted(X509Certificate[] chain, String authType) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "checkClientTrusted", - args = {java.security.cert.X509Certificate[].class, java.lang.String.class} - ) public void test_checkClientTrusted_03() { X509TrustManagerImpl xtm = new X509TrustManagerImpl(); X509Certificate[] xcert = setX509Certificate(); @@ -144,14 +120,8 @@ public class X509TrustManagerTest extends TestCase { } /** - * @tests javax.net.ssl.X509TrustManager#checkServerTrusted(X509Certificate[] chain, String authType) + * javax.net.ssl.X509TrustManager#checkServerTrusted(X509Certificate[] chain, String authType) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "checkServerTrusted", - args = {java.security.cert.X509Certificate[].class, java.lang.String.class} - ) public void test_checkServerTrusted_01() { X509TrustManagerImpl xtm = new X509TrustManagerImpl(); X509Certificate[] xcert = null; @@ -196,14 +166,8 @@ public class X509TrustManagerTest extends TestCase { } /** - * @tests javax.net.ssl.X509TrustManager#checkServerTrusted(X509Certificate[] chain, String authType) + * javax.net.ssl.X509TrustManager#checkServerTrusted(X509Certificate[] chain, String authType) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "checkServerTrusted", - args = {java.security.cert.X509Certificate[].class, java.lang.String.class} - ) public void test_checkServerTrusted_02() { X509TrustManagerImpl xtm = new X509TrustManagerImpl(); X509Certificate[] xcert = setInvalid(); @@ -217,14 +181,8 @@ public class X509TrustManagerTest extends TestCase { } /** - * @tests javax.net.ssl.X509TrustManager#checkServerTrusted(X509Certificate[] chain, String authType) + * javax.net.ssl.X509TrustManager#checkServerTrusted(X509Certificate[] chain, String authType) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "checkServerTrusted", - args = {java.security.cert.X509Certificate[].class, java.lang.String.class} - ) public void test_checkServerTrusted_03() { X509TrustManagerImpl xtm = new X509TrustManagerImpl(); X509Certificate[] xcert = setX509Certificate(); @@ -237,14 +195,8 @@ public class X509TrustManagerTest extends TestCase { } /** - * @tests javax.net.ssl.X509TrustManager#getAcceptedIssuers() + * javax.net.ssl.X509TrustManager#getAcceptedIssuers() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getAcceptedIssuers", - args = {} - ) public void test_getAcceptedIssuers() { X509TrustManagerImpl xtm = new X509TrustManagerImpl(); diff --git a/luni/src/test/java/tests/api/javax/security/auth/AuthPermissionTest.java b/luni/src/test/java/tests/api/javax/security/auth/AuthPermissionTest.java index 80198d2..c951700 100644 --- a/luni/src/test/java/tests/api/javax/security/auth/AuthPermissionTest.java +++ b/luni/src/test/java/tests/api/javax/security/auth/AuthPermissionTest.java @@ -17,10 +17,6 @@ package tests.api.javax.security.auth; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; - import junit.framework.TestCase; import javax.security.auth.AuthPermission; @@ -30,18 +26,11 @@ import javax.security.auth.AuthPermission; * Tests for <code>AuthPermission</code> class constructors and methods. * */ -@TestTargetClass(AuthPermission.class) public class AuthPermissionTest extends TestCase { /** - * @tests javax.security.auth.AuthPermission#AuthPermission(String name) + * javax.security.auth.AuthPermission#AuthPermission(String name) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "AuthPermission", - args = {String.class} - ) public void test_Constructor_01() { String[] strParam = {"", null}; @@ -62,14 +51,8 @@ public class AuthPermissionTest extends TestCase { } /** - * @tests javax.security.auth.AuthPermission#AuthPermission(String name, String actions) + * javax.security.auth.AuthPermission#AuthPermission(String name, String actions) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "AuthPermission", - args = {String.class, String.class} - ) public void test_Constructor_02() { String[] strParam = {"", null}; String[] actionParam = {"", null, "ActionName"}; diff --git a/luni/src/test/java/tests/api/javax/security/auth/CallbackHandlerTest.java b/luni/src/test/java/tests/api/javax/security/auth/CallbackHandlerTest.java index 7d63fa8..76c860a 100644 --- a/luni/src/test/java/tests/api/javax/security/auth/CallbackHandlerTest.java +++ b/luni/src/test/java/tests/api/javax/security/auth/CallbackHandlerTest.java @@ -17,11 +17,6 @@ package tests.api.javax.security.auth; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; - import junit.framework.TestCase; import javax.security.auth.callback.Callback; @@ -31,18 +26,11 @@ import javax.security.auth.callback.CallbackHandler; * Tests for <code>CallbackHandler</code> class constructors and methods. * */ -@TestTargetClass(CallbackHandler.class) public class CallbackHandlerTest extends TestCase { /** - * @tests javax.security.auth.callback.CallbackHandler#handle(Callback[] callbacks) + * javax.security.auth.callback.CallbackHandler#handle(Callback[] callbacks) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "handle", - args = {Callback[].class} - ) public void test_CallbackHandler() { CallbackHandlerImpl ch = new CallbackHandlerImpl(); assertFalse(ch.called); diff --git a/luni/src/test/java/tests/api/javax/security/auth/DestroyFailedExceptionTest.java b/luni/src/test/java/tests/api/javax/security/auth/DestroyFailedExceptionTest.java index b3fa113..3fb3d97 100644 --- a/luni/src/test/java/tests/api/javax/security/auth/DestroyFailedExceptionTest.java +++ b/luni/src/test/java/tests/api/javax/security/auth/DestroyFailedExceptionTest.java @@ -17,10 +17,6 @@ package tests.api.javax.security.auth; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; - import junit.framework.TestCase; import javax.security.auth.DestroyFailedException; @@ -29,7 +25,6 @@ import javax.security.auth.DestroyFailedException; * Tests for <code>DestroyFailedException</code> class constructors and methods. * */ -@TestTargetClass(DestroyFailedException.class) public class DestroyFailedExceptionTest extends TestCase { public static void main(String[] args) { @@ -51,15 +46,9 @@ public class DestroyFailedExceptionTest extends TestCase { /** - * @tests javax.security.auth.DestroyFailedException#DestroyFailedException() + * javax.security.auth.DestroyFailedException#DestroyFailedException() * Assertion: constructs DestroyFailedException with no detail message */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "DestroyFailedException", - args = {} - ) public void testDestroyFailedException01() { DestroyFailedException dfE = new DestroyFailedException(); assertNull("getMessage() must return null.", dfE.getMessage()); @@ -67,15 +56,9 @@ public class DestroyFailedExceptionTest extends TestCase { } /** - * @tests javax.security.auth.DestroyFailedException#DestroyFailedException(String msg) + * javax.security.auth.DestroyFailedException#DestroyFailedException(String msg) * Assertion: constructs with not null parameter. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "DestroyFailedException", - args = {String.class} - ) public void testDestroyFailedException02() { DestroyFailedException dfE; for (int i = 0; i < msgs.length; i++) { @@ -86,15 +69,9 @@ public class DestroyFailedExceptionTest extends TestCase { } /** - * @tests javax.security.auth.DestroyFailedException#DestroyFailedException(String msg) + * javax.security.auth.DestroyFailedException#DestroyFailedException(String msg) * Assertion: constructs with null parameter. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "DestroyFailedException", - args = {String.class} - ) public void testDestroyFailedException03() { String msg = null; DestroyFailedException dfE = new DestroyFailedException(msg); diff --git a/luni/src/test/java/tests/api/javax/security/auth/DestroyableTest.java b/luni/src/test/java/tests/api/javax/security/auth/DestroyableTest.java index fec876b..4ae47ce 100644 --- a/luni/src/test/java/tests/api/javax/security/auth/DestroyableTest.java +++ b/luni/src/test/java/tests/api/javax/security/auth/DestroyableTest.java @@ -17,11 +17,6 @@ package tests.api.javax.security.auth; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; - import junit.framework.TestCase; import javax.security.auth.Destroyable; @@ -32,27 +27,12 @@ import javax.security.auth.DestroyFailedException; * Tests for <code>Destroyable</code> class constructors and methods. * */ -@TestTargetClass(Destroyable.class) public class DestroyableTest extends TestCase { /** - * @tests javax.security.auth.Destroyable#destroy() - * @tests javax.security.auth.Destroyable#isDestroyed() + * javax.security.auth.Destroyable#destroy() + * javax.security.auth.Destroyable#isDestroyed() */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "", - method = "destroy", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isDestroyed", - args = {} - ) - }) public void test_destroy() { myDestroyable md = new myDestroyable(); try { diff --git a/luni/src/test/java/tests/api/javax/security/auth/LoginExceptionTest.java b/luni/src/test/java/tests/api/javax/security/auth/LoginExceptionTest.java index 0fa9364..ef53a98 100644 --- a/luni/src/test/java/tests/api/javax/security/auth/LoginExceptionTest.java +++ b/luni/src/test/java/tests/api/javax/security/auth/LoginExceptionTest.java @@ -17,10 +17,6 @@ package tests.api.javax.security.auth; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; - import junit.framework.TestCase; import javax.security.auth.login.LoginException; @@ -29,7 +25,6 @@ import javax.security.auth.login.LoginException; * Tests for <code>LoginException</code> class constructors and methods. * */ -@TestTargetClass(LoginException.class) public class LoginExceptionTest extends TestCase { public static void main(String[] args) { @@ -51,15 +46,9 @@ public class LoginExceptionTest extends TestCase { /** - * @tests javax.security.auth.login.LoginException#LoginException() + * javax.security.auth.login.LoginException#LoginException() * Assertion: constructs LoginException with no detail message */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "LoginException", - args = {} - ) public void testLoginException01() { LoginException lE = new LoginException(); assertNull("getMessage() must return null.", lE.getMessage()); @@ -67,15 +56,9 @@ public class LoginExceptionTest extends TestCase { } /** - * @tests javax.security.auth.login.LoginException#LoginException(String msg) + * javax.security.auth.login.LoginException#LoginException(String msg) * Assertion: constructs with not null parameter. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "LoginException", - args = {String.class} - ) public void testLoginException02() { LoginException lE; for (int i = 0; i < msgs.length; i++) { @@ -86,15 +69,9 @@ public class LoginExceptionTest extends TestCase { } /** - * @tests javax.security.auth.login.LoginException#LoginException(String msg) + * javax.security.auth.login.LoginException#LoginException(String msg) * Assertion: constructs with null parameter. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "LoginException", - args = {String.class} - ) public void testLoginException03() { String msg = null; LoginException lE = new LoginException(msg); diff --git a/luni/src/test/java/tests/api/javax/security/auth/PasswordCallbackTest.java b/luni/src/test/java/tests/api/javax/security/auth/PasswordCallbackTest.java index bdc5f25..cdd992b 100644 --- a/luni/src/test/java/tests/api/javax/security/auth/PasswordCallbackTest.java +++ b/luni/src/test/java/tests/api/javax/security/auth/PasswordCallbackTest.java @@ -17,11 +17,6 @@ package tests.api.javax.security.auth; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; - import junit.framework.TestCase; import javax.security.auth.callback.PasswordCallback; @@ -30,34 +25,13 @@ import javax.security.auth.callback.PasswordCallback; * Tests for <code>PasswordCallback</code> class constructors and methods. * */ -@TestTargetClass(PasswordCallback.class) public class PasswordCallbackTest extends TestCase { /** - * @tests javax.security.auth.callback.PasswordCallback#PasswordCallback(String prompt, boolean echoOn) - * @tests javax.security.auth.callback.PasswordCallback#getPrompt() - * @tests javax.security.auth.callback.PasswordCallback#isEchoOn() + * javax.security.auth.callback.PasswordCallback#PasswordCallback(String prompt, boolean echoOn) + * javax.security.auth.callback.PasswordCallback#getPrompt() + * javax.security.auth.callback.PasswordCallback#isEchoOn() */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "PasswordCallback", - args = {String.class, boolean.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPrompt", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isEchoOn", - args = {} - ) - }) public void test_PasswordCallback() { String prompt = "promptTest"; @@ -93,30 +67,10 @@ public class PasswordCallbackTest extends TestCase { } /** - * @tests javax.security.auth.callback.PasswordCallback#getPassword() - * @tests javax.security.auth.callback.PasswordCallback#setPassword(char[] password) - * @tests javax.security.auth.callback.PasswordCallback#clearPassword() + * javax.security.auth.callback.PasswordCallback#getPassword() + * javax.security.auth.callback.PasswordCallback#setPassword(char[] password) + * javax.security.auth.callback.PasswordCallback#clearPassword() */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPassword", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setPassword", - args = {char[].class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "clearPassword", - args = {} - ) - }) public void test_Password() { String prompt = "promptTest"; char[] psw1 = "testPassword".toCharArray(); diff --git a/luni/src/test/java/tests/api/javax/security/auth/PrivateCredentialPermissionTest.java b/luni/src/test/java/tests/api/javax/security/auth/PrivateCredentialPermissionTest.java index 825dd06..6426a26 100644 --- a/luni/src/test/java/tests/api/javax/security/auth/PrivateCredentialPermissionTest.java +++ b/luni/src/test/java/tests/api/javax/security/auth/PrivateCredentialPermissionTest.java @@ -19,10 +19,6 @@ package tests.api.javax.security.auth; import java.security.Permission; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; - import junit.framework.TestCase; import javax.security.auth.PrivateCredentialPermission; @@ -32,7 +28,6 @@ import javax.security.auth.PrivateCredentialPermission; * Tests for <code>PrivateCredentialPermission</code> class constructors and methods. * */ -@TestTargetClass(PrivateCredentialPermission.class) public class PrivateCredentialPermissionTest extends TestCase { private final static String cred_class1 = "a.b.Credential"; @@ -48,14 +43,8 @@ public class PrivateCredentialPermissionTest extends TestCase { private final static String name3 = cred_class1 + " " + pc1 + " \"" + pn1 + "\" " + pc2 + " \"" + pn2 + "\""; /** - * @tests javax.security.auth.PrivateCredentialPermission#PrivateCredentialPermission(String name, String actions) + * javax.security.auth.PrivateCredentialPermission#PrivateCredentialPermission(String name, String actions) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "PrivateCredentialPermission", - args = {String.class, String.class} - ) public void test_Constructor_01() { PrivateCredentialPermission ap = new PrivateCredentialPermission(name1, "read"); @@ -94,28 +83,16 @@ public class PrivateCredentialPermissionTest extends TestCase { } /** - * @tests javax.security.auth.PrivateCredentialPermission#getActions() + * javax.security.auth.PrivateCredentialPermission#getActions() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getActions", - args = {} - ) public void test_getActions() { PrivateCredentialPermission ap = new PrivateCredentialPermission(name1, "read"); assertEquals("getActions() must alway return \"read\"", "read", ap.getActions()); } /** - * @tests javax.security.auth.PrivateCredentialPermission#implies() + * javax.security.auth.PrivateCredentialPermission#implies() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "implies", - args = { Permission.class } - ) public void test_implies() { PrivateCredentialPermission p1 = new PrivateCredentialPermission("* P1 \"abc\"", "read"); PrivateCredentialPermission p2 = new PrivateCredentialPermission("a.b.Credential P1 \"abc\"", "read"); @@ -142,28 +119,16 @@ public class PrivateCredentialPermissionTest extends TestCase { } /** - * @tests javax.security.auth.PrivateCredentialPermission#getCredentialClass() + * javax.security.auth.PrivateCredentialPermission#getCredentialClass() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getCredentialClass", - args = {} - ) public void test_getCredentialClass() { PrivateCredentialPermission ap = new PrivateCredentialPermission(name1, "read"); assertEquals("getCredentialClass() returned wrong name", cred_class1, ap.getCredentialClass()); } /** - * @tests javax.security.auth.PrivateCredentialPermission#getPrincipals() + * javax.security.auth.PrivateCredentialPermission#getPrincipals() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPrincipals", - args = {} - ) public void test_getPrincipals() { PrivateCredentialPermission ap = new PrivateCredentialPermission(name3, "read"); @@ -179,14 +144,8 @@ public class PrivateCredentialPermissionTest extends TestCase { } /** - * @tests javax.security.auth.PrivateCredentialPermission#equals() + * javax.security.auth.PrivateCredentialPermission#equals() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "equals", - args = { Object.class } - ) public void test_equals() { PrivateCredentialPermission p1 = new PrivateCredentialPermission(name3, "read"); PrivateCredentialPermission p2 = new PrivateCredentialPermission(name3, "read"); @@ -214,14 +173,8 @@ public class PrivateCredentialPermissionTest extends TestCase { } /** - * @tests javax.security.auth.PrivateCredentialPermission#hashCode() + * javax.security.auth.PrivateCredentialPermission#hashCode() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hashCode", - args = {} - ) public void test_hashCode() { PrivateCredentialPermission p1 = new PrivateCredentialPermission(name1, "read"); PrivateCredentialPermission p2 = new PrivateCredentialPermission(name1, "read"); @@ -244,14 +197,8 @@ public class PrivateCredentialPermissionTest extends TestCase { } /** - * @tests javax.security.auth.PrivateCredentialPermission#newPermissionCollection() + * javax.security.auth.PrivateCredentialPermission#newPermissionCollection() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "newPermissionCollection", - args = {} - ) public void test_newPermissionCollection() { PrivateCredentialPermission ap = new PrivateCredentialPermission(name1, "read"); assertNull("newPermissionCollection must always return null", ap.newPermissionCollection()); diff --git a/luni/src/test/java/tests/api/javax/security/auth/SubjectDomainCombinerTest.java b/luni/src/test/java/tests/api/javax/security/auth/SubjectDomainCombinerTest.java index f077ec8..b860b1a 100644 --- a/luni/src/test/java/tests/api/javax/security/auth/SubjectDomainCombinerTest.java +++ b/luni/src/test/java/tests/api/javax/security/auth/SubjectDomainCombinerTest.java @@ -32,10 +32,6 @@ import java.util.Enumeration; import java.util.HashSet; import java.util.Set; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; - import junit.framework.TestCase; import javax.security.auth.AuthPermission; @@ -49,19 +45,12 @@ import javax.security.auth.x500.X500Principal; * Tests for <code>SubjectDomainCombiner</code> class constructors and methods. * */ -@TestTargetClass(SubjectDomainCombiner.class) public class SubjectDomainCombinerTest extends TestCase { private final static boolean DEBUG = true; /** - * @tests javax.security.auth.SubjectDomainCombiner#SubjectDomainCombiner(Subject subject) + * javax.security.auth.SubjectDomainCombiner#SubjectDomainCombiner(Subject subject) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "SubjectDomainCombiner", - args = {Subject.class} - ) public void test_Constructor_01() { Subject s = new Subject(); SubjectDomainCombiner c = new SubjectDomainCombiner(s); @@ -74,14 +63,8 @@ public class SubjectDomainCombinerTest extends TestCase { } /** - * @tests javax.security.auth.SubjectDomainCombiner#getSubject() + * javax.security.auth.SubjectDomainCombiner#getSubject() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Verifies that Subject associated with this SubjectDomainCombiner is returned", - method = "getSubject", - args = {} - ) public void test_getSubject_01() { Subject s = new Subject(); SubjectDomainCombiner c = new SubjectDomainCombiner(s); @@ -107,14 +90,8 @@ public class SubjectDomainCombinerTest extends TestCase { protected final static String subjectPvtPerm1 = "writeFileDescriptor"; /** - * @tests javax.security.auth.SubjectDomainCombiner#combine() + * javax.security.auth.SubjectDomainCombiner#combine() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "both currentDomains and assignedDomains are not null", - method = "combine", - args = {ProtectionDomain[].class, ProtectionDomain[].class} - ) public void test_combine_01() { URL url; @@ -203,14 +180,8 @@ public class SubjectDomainCombinerTest extends TestCase { } /** - * @tests javax.security.auth.SubjectDomainCombiner#combine() + * javax.security.auth.SubjectDomainCombiner#combine() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "assignedDomains is null", - method = "combine", - args = {ProtectionDomain[].class, ProtectionDomain[].class} - ) public void test_combine_02() { URL url; @@ -285,14 +256,8 @@ public class SubjectDomainCombinerTest extends TestCase { } /** - * @tests javax.security.auth.SubjectDomainCombiner#combine() + * javax.security.auth.SubjectDomainCombiner#combine() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "currentDomains is null", - method = "combine", - args = {ProtectionDomain[].class, ProtectionDomain[].class} - ) public void test_combine_03() { URL url; diff --git a/luni/src/test/java/tests/api/javax/security/auth/SubjectTest.java b/luni/src/test/java/tests/api/javax/security/auth/SubjectTest.java index 5ef39a3..05741a9 100644 --- a/luni/src/test/java/tests/api/javax/security/auth/SubjectTest.java +++ b/luni/src/test/java/tests/api/javax/security/auth/SubjectTest.java @@ -17,11 +17,6 @@ package tests.api.javax.security.auth; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; - import junit.framework.TestCase; import javax.security.auth.AuthPermission; @@ -43,18 +38,11 @@ import java.security.ProtectionDomain; * Tests for <code>Subject</code> class constructors and methods. * */ -@TestTargetClass(Subject.class) public class SubjectTest extends TestCase { /** - * @tests javax.security.auth.Subject#Subject() + * javax.security.auth.Subject#Subject() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "Subject", - args = {} - ) public void test_Constructor_01() { try { Subject s = new Subject(); @@ -68,14 +56,8 @@ public class SubjectTest extends TestCase { } /** - * @tests javax.security.auth.Subject#doAs(Subject subject, PrivilegedAction action) + * javax.security.auth.Subject#doAs(Subject subject, PrivilegedAction action) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "doAs", - args = {Subject.class, PrivilegedAction.class} - ) public void test_doAs_01() { Subject subj = new Subject(); PrivilegedAction<Object> pa = new myPrivilegedAction(); @@ -101,14 +83,8 @@ public class SubjectTest extends TestCase { } /** - * @tests javax.security.auth.Subject#doAs(Subject subject, PrivilegedExceptionAction action) + * javax.security.auth.Subject#doAs(Subject subject, PrivilegedExceptionAction action) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "doAs", - args = {Subject.class, PrivilegedExceptionAction.class} - ) public void test_doAs_02() { Subject subj = new Subject(); PrivilegedExceptionAction<Object> pea = new myPrivilegedExceptionAction(); @@ -146,16 +122,10 @@ public class SubjectTest extends TestCase { } /** - * @tests javax.security.auth.Subject#doAsPrivileged(Subject subject, + * javax.security.auth.Subject#doAsPrivileged(Subject subject, * PrivilegedAction action, * AccessControlContext acc) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "doAsPrivileged", - args = {Subject.class, PrivilegedAction.class, AccessControlContext.class} - ) public void test_doAsPrivileged_01() { Subject subj = new Subject(); PrivilegedAction<Object> pa = new myPrivilegedAction(); @@ -182,16 +152,10 @@ public class SubjectTest extends TestCase { } /** - * @tests javax.security.auth.Subject#doAsPrivileged(Subject subject, + * javax.security.auth.Subject#doAsPrivileged(Subject subject, * PrivilegedExceptionAction action, * AccessControlContext acc) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "doAsPrivileged", - args = {Subject.class, PrivilegedExceptionAction.class, AccessControlContext.class} - ) public void test_doAsPrivileged_02() { Subject subj = new Subject(); PrivilegedExceptionAction<Object> pea = new myPrivilegedExceptionAction(); @@ -230,14 +194,8 @@ public class SubjectTest extends TestCase { } /** - * @tests javax.security.auth.Subject#getSubject(AccessControlContext acc) + * javax.security.auth.Subject#getSubject(AccessControlContext acc) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSubject", - args = {AccessControlContext.class} - ) public void test_getSubject() { Subject subj = new Subject(); AccessControlContext acc = new AccessControlContext(new ProtectionDomain[0]); @@ -250,14 +208,8 @@ public class SubjectTest extends TestCase { } /** - * @tests javax.security.auth.Subject#toString() + * javax.security.auth.Subject#toString() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {} - ) public void test_toString() { Subject subj = new Subject(); @@ -269,14 +221,8 @@ public class SubjectTest extends TestCase { } /** - * @tests javax.security.auth.Subject#hashCode() + * javax.security.auth.Subject#hashCode() */ - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "SecurityException wasn't tested", - method = "hashCode", - args = {} - ) public void test_hashCode() { Subject subj = new Subject(); diff --git a/luni/src/test/java/tests/api/javax/security/auth/UnsupportedCallbackExceptionTest.java b/luni/src/test/java/tests/api/javax/security/auth/UnsupportedCallbackExceptionTest.java index 4cdad92..ac41d69 100644 --- a/luni/src/test/java/tests/api/javax/security/auth/UnsupportedCallbackExceptionTest.java +++ b/luni/src/test/java/tests/api/javax/security/auth/UnsupportedCallbackExceptionTest.java @@ -17,11 +17,6 @@ package tests.api.javax.security.auth; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; - import junit.framework.TestCase; import javax.security.auth.callback.UnsupportedCallbackException; @@ -31,7 +26,6 @@ import javax.security.auth.callback.Callback; * Tests for <code>UnsupportedCallbackException</code> class constructors and methods. * */ -@TestTargetClass(UnsupportedCallbackException.class) public class UnsupportedCallbackExceptionTest extends TestCase { public static void main(String[] args) { @@ -53,24 +47,10 @@ public class UnsupportedCallbackExceptionTest extends TestCase { /** - * @tests javax.security.auth.callback.UnsupportedCallbackExceptionTest#UnsupportedCallbackException(Callback callback) - * @tests javax.security.auth.callback.UnsupportedCallbackExceptionTest#getCallback() + * javax.security.auth.callback.UnsupportedCallbackExceptionTest#UnsupportedCallbackException(Callback callback) + * javax.security.auth.callback.UnsupportedCallbackExceptionTest#getCallback() * Assertion: constructs with null parameter. */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "UnsupportedCallbackException", - args = {Callback.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getCallback", - args = {} - ) - }) public void testUnsupportedCallbackException01() { Callback c = null; UnsupportedCallbackException ucE = new UnsupportedCallbackException(c); @@ -79,24 +59,10 @@ public class UnsupportedCallbackExceptionTest extends TestCase { } /** - * @tests javax.security.auth.callback.UnsupportedCallbackExceptionTest#UnsupportedCallbackException(Callback callback) - * @tests javax.security.auth.callback.UnsupportedCallbackExceptionTest#getCallback() + * javax.security.auth.callback.UnsupportedCallbackExceptionTest#UnsupportedCallbackException(Callback callback) + * javax.security.auth.callback.UnsupportedCallbackExceptionTest#getCallback() * Assertion: constructs with not null parameter. */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "UnsupportedCallbackException", - args = {Callback.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getCallback", - args = {} - ) - }) public void testUnsupportedCallbackException02() { myCallback c = new myCallback(); assertNotNull("Callback object is null", c); @@ -106,15 +72,9 @@ public class UnsupportedCallbackExceptionTest extends TestCase { } /** - * @tests javax.security.auth.callback.UnsupportedCallbackExceptionTest#UnsupportedCallbackException(Callback callback, String msg) + * javax.security.auth.callback.UnsupportedCallbackExceptionTest#UnsupportedCallbackException(Callback callback, String msg) * Assertion: constructs with null callback parameter and null message. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "UnsupportedCallbackException", - args = {Callback.class, String.class} - ) public void testUnsupportedCallbackException03() { UnsupportedCallbackException ucE = new UnsupportedCallbackException(null, null); assertNull("getMessage() must return null.", ucE.getMessage()); @@ -122,15 +82,9 @@ public class UnsupportedCallbackExceptionTest extends TestCase { } /** - * @tests javax.security.auth.callback.UnsupportedCallbackExceptionTest#UnsupportedCallbackException(Callback callback, String msg) + * javax.security.auth.callback.UnsupportedCallbackExceptionTest#UnsupportedCallbackException(Callback callback, String msg) * Assertion: constructs with null callback parameter and not null message. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "UnsupportedCallbackException", - args = {Callback.class, String.class} - ) public void testUnsupportedCallbackException04() { UnsupportedCallbackException ucE; for (int i = 0; i < msgs.length; i++) { @@ -141,15 +95,9 @@ public class UnsupportedCallbackExceptionTest extends TestCase { } /** - * @tests javax.security.auth.callback.UnsupportedCallbackExceptionTest#UnsupportedCallbackException(Callback callback, String msg) + * javax.security.auth.callback.UnsupportedCallbackExceptionTest#UnsupportedCallbackException(Callback callback, String msg) * Assertion: constructs with not null callback parameter and null message. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "UnsupportedCallbackException", - args = {Callback.class, String.class} - ) public void testUnsupportedCallbackException05() { myCallback c = new myCallback(); assertNotNull("Callback object is null", c); @@ -159,15 +107,9 @@ public class UnsupportedCallbackExceptionTest extends TestCase { } /** - * @tests javax.security.auth.callback.UnsupportedCallbackExceptionTest#UnsupportedCallbackException(Callback callback, String msg) + * javax.security.auth.callback.UnsupportedCallbackExceptionTest#UnsupportedCallbackException(Callback callback, String msg) * Assertion: constructs with not null parameters. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "UnsupportedCallbackException", - args = {Callback.class, String.class} - ) public void testUnsupportedCallbackException06() { myCallback c = new myCallback(); assertNotNull("Callback object is null", c); diff --git a/luni/src/test/java/tests/api/javax/security/auth/X500PrincipalTest.java b/luni/src/test/java/tests/api/javax/security/auth/X500PrincipalTest.java index 34bd207..7cb81bb 100644 --- a/luni/src/test/java/tests/api/javax/security/auth/X500PrincipalTest.java +++ b/luni/src/test/java/tests/api/javax/security/auth/X500PrincipalTest.java @@ -17,10 +17,6 @@ package tests.api.javax.security.auth; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; - import junit.framework.TestCase; import javax.security.auth.x500.X500Principal; @@ -35,18 +31,11 @@ import org.apache.harmony.security.tests.support.cert.TestUtils; * Tests for <code>X500Principal</code> class constructors and methods. * */ -@TestTargetClass(X500Principal.class) public class X500PrincipalTest extends TestCase { /** - * @tests javax.security.auth.x500.X500Principal#X500Principal(String name) + * javax.security.auth.x500.X500Principal#X500Principal(String name) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "X500Principal", - args = {String.class} - ) public void test_X500Principal_01() { String name = "CN=Duke,OU=JavaSoft,O=Sun Microsystems,C=US"; @@ -77,14 +66,8 @@ public class X500PrincipalTest extends TestCase { } /** - * @tests javax.security.auth.x500.X500Principal#X500Principal(InputStream is) + * javax.security.auth.x500.X500Principal#X500Principal(InputStream is) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "X500Principal", - args = {InputStream.class} - ) public void test_X500Principal_02() { String name = "CN=Duke,OU=JavaSoft,O=Sun Microsystems,C=US"; byte[] ba = getByteArray(TestUtils.getX509Certificate_v1()); @@ -119,14 +102,8 @@ public class X500PrincipalTest extends TestCase { } /** - * @tests javax.security.auth.x500.X500Principal#X500Principal(byte[] name) + * javax.security.auth.x500.X500Principal#X500Principal(byte[] name) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "X500Principal", - args = {byte[].class} - ) public void test_X500Principal_03() { String name = "CN=Duke,OU=JavaSoft,O=Sun Microsystems,C=US"; byte[] ba = getByteArray(TestUtils.getX509Certificate_v1()); @@ -160,14 +137,8 @@ public class X500PrincipalTest extends TestCase { } /** - * @tests javax.security.auth.x500.X500Principal#getName() + * javax.security.auth.x500.X500Principal#getName() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getName", - args = {} - ) public void test_getName() { String name = "CN=Duke,OU=JavaSoft,O=Sun Microsystems,C=US"; X500Principal xpr = new X500Principal(name); @@ -180,14 +151,8 @@ public class X500PrincipalTest extends TestCase { } /** - * @tests javax.security.auth.x500.X500Principal#getName(String format) + * javax.security.auth.x500.X500Principal#getName(String format) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getName", - args = {String.class} - ) public void test_getName_Format() { String name = "CN=Duke,OU=JavaSoft,O=Sun Microsystems,C=US"; String expectedName = "cn=duke,ou=javasoft,o=sun microsystems,c=us"; @@ -227,14 +192,8 @@ public class X500PrincipalTest extends TestCase { } /** - * @tests javax.security.auth.x500.X500Principal#hashCode() + * javax.security.auth.x500.X500Principal#hashCode() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hashCode", - args = {} - ) public void test_hashCode() { String name = "CN=Duke,OU=JavaSoft,O=Sun Microsystems,C=US"; X500Principal xpr = new X500Principal(name); @@ -247,14 +206,8 @@ public class X500PrincipalTest extends TestCase { } /** - * @tests javax.security.auth.x500.X500Principal#toString() + * javax.security.auth.x500.X500Principal#toString() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {} - ) public void test_toString() { String name = "CN=Duke, OU=JavaSoft, O=Sun Microsystems, C=US"; X500Principal xpr = new X500Principal(name); @@ -268,14 +221,8 @@ public class X500PrincipalTest extends TestCase { } /** - * @tests javax.security.auth.x500.X500Principal#getEncoded() + * javax.security.auth.x500.X500Principal#getEncoded() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getEncoded", - args = {} - ) public void test_getEncoded() { byte[] ba = getByteArray(TestUtils.getX509Certificate_v1()); X500Principal xpr = new X500Principal(ba); @@ -289,14 +236,8 @@ public class X500PrincipalTest extends TestCase { } /** - * @tests javax.security.auth.x500.X500Principal#equals(Object o) + * javax.security.auth.x500.X500Principal#equals(Object o) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "equals", - args = {Object.class} - ) public void test_equals() { String name1 = "CN=Duke, OU=JavaSoft, O=Sun Microsystems, C=US"; String name2 = "cn=duke,ou=javasoft,o=sun microsystems,c=us"; diff --git a/luni/src/test/java/tests/api/javax/security/cert/CertificateEncodingExceptionTest.java b/luni/src/test/java/tests/api/javax/security/cert/CertificateEncodingExceptionTest.java index d79cb96..53fbd9f 100644 --- a/luni/src/test/java/tests/api/javax/security/cert/CertificateEncodingExceptionTest.java +++ b/luni/src/test/java/tests/api/javax/security/cert/CertificateEncodingExceptionTest.java @@ -22,11 +22,6 @@ package tests.api.javax.security.cert; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import javax.security.cert.CertificateEncodingException; @@ -35,7 +30,6 @@ import javax.security.cert.CertificateEncodingException; * Tests for <code>DigestException</code> class constructors and methods. * */ -@TestTargetClass(CertificateEncodingException.class) public class CertificateEncodingExceptionTest extends TestCase { static String[] msgs = { @@ -49,12 +43,6 @@ public class CertificateEncodingExceptionTest extends TestCase { * Test for <code>CertificateEncodingException()</code> constructor * Assertion: constructs CertificateEncodingException with no detail message */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "CertificateEncodingException", - args = {} - ) public void testCertificateEncodingException01() { CertificateEncodingException tE = new CertificateEncodingException(); assertNull("getMessage() must return null.", tE.getMessage()); @@ -66,12 +54,6 @@ public class CertificateEncodingExceptionTest extends TestCase { * Assertion: constructs CertificateEncodingException with detail message * msg. Parameter <code>msg</code> is not null. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies CertificateEncodingException with valid parameters.", - method = "CertificateEncodingException", - args = {java.lang.String.class} - ) public void testCertificateEncodingException02() { CertificateEncodingException tE; for (int i = 0; i < msgs.length; i++) { @@ -87,12 +69,6 @@ public class CertificateEncodingExceptionTest extends TestCase { * Assertion: constructs CertificateEncodingException when <code>msg</code> * is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as a parameter.", - method = "CertificateEncodingException", - args = {java.lang.String.class} - ) public void testCertificateEncodingException03() { String msg = null; CertificateEncodingException tE = new CertificateEncodingException(msg); diff --git a/luni/src/test/java/tests/api/javax/security/cert/CertificateExceptionTest.java b/luni/src/test/java/tests/api/javax/security/cert/CertificateExceptionTest.java index 625e5ec..ccc3a2c 100644 --- a/luni/src/test/java/tests/api/javax/security/cert/CertificateExceptionTest.java +++ b/luni/src/test/java/tests/api/javax/security/cert/CertificateExceptionTest.java @@ -22,11 +22,6 @@ package tests.api.javax.security.cert; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import javax.security.cert.CertificateException; @@ -36,7 +31,6 @@ import javax.security.cert.CertificateException; * Tests for <code>DigestException</code> class constructors and methods. * */ -@TestTargetClass(CertificateException.class) public class CertificateExceptionTest extends TestCase { static String[] msgs = { @@ -50,12 +44,6 @@ public class CertificateExceptionTest extends TestCase { * Test for <code>CertificateException()</code> constructor Assertion: * constructs CertificateException with no detail message */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "CertificateException", - args = {} - ) public void testCertificateException01() { CertificateException tE = new CertificateException(); assertNull("getMessage() must return null.", tE.getMessage()); @@ -67,12 +55,6 @@ public class CertificateExceptionTest extends TestCase { * Assertion: constructs CertificateException with detail message msg. * Parameter <code>msg</code> is not null. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies constructor with valid parameter.", - method = "CertificateException", - args = {java.lang.String.class} - ) public void testCertificateException02() { CertificateException tE; for (int i = 0; i < msgs.length; i++) { @@ -88,12 +70,6 @@ public class CertificateExceptionTest extends TestCase { * Assertion: constructs CertificateException when <code>msg</code> is * null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as a parameter.", - method = "CertificateException", - args = {java.lang.String.class} - ) public void testCertificateException03() { String msg = null; CertificateException tE = new CertificateException(msg); diff --git a/luni/src/test/java/tests/api/javax/security/cert/CertificateExpiredExceptionTest.java b/luni/src/test/java/tests/api/javax/security/cert/CertificateExpiredExceptionTest.java index 7a6c7bb..d0e94e3 100644 --- a/luni/src/test/java/tests/api/javax/security/cert/CertificateExpiredExceptionTest.java +++ b/luni/src/test/java/tests/api/javax/security/cert/CertificateExpiredExceptionTest.java @@ -22,11 +22,6 @@ package tests.api.javax.security.cert; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import javax.security.cert.CertificateExpiredException; @@ -36,7 +31,6 @@ import javax.security.cert.CertificateExpiredException; * Tests for <code>DigestException</code> class constructors and methods. * */ -@TestTargetClass(CertificateExpiredException.class) public class CertificateExpiredExceptionTest extends TestCase { static String[] msgs = { @@ -50,12 +44,6 @@ public class CertificateExpiredExceptionTest extends TestCase { * Test for <code>CertificateExpiredException()</code> constructor * Assertion: constructs CertificateExpiredException with no detail message */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "CertificateExpiredException", - args = {} - ) public void testCertificateExpiredException01() { CertificateExpiredException tE = new CertificateExpiredException(); assertNull("getMessage() must return null.", tE.getMessage()); @@ -67,12 +55,6 @@ public class CertificateExpiredExceptionTest extends TestCase { * Assertion: constructs CertificateExpiredException with detail message * msg. Parameter <code>msg</code> is not null. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies constructor with valid parameter.", - method = "CertificateExpiredException", - args = {java.lang.String.class} - ) public void testCertificateExpiredException02() { CertificateExpiredException tE; for (int i = 0; i < msgs.length; i++) { @@ -88,12 +70,6 @@ public class CertificateExpiredExceptionTest extends TestCase { * Assertion: constructs CertificateExpiredException when <code>msg</code> * is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies constructor with null as a parameter.", - method = "CertificateExpiredException", - args = {java.lang.String.class} - ) public void testCertificateExpiredException03() { String msg = null; CertificateExpiredException tE = new CertificateExpiredException(msg); diff --git a/luni/src/test/java/tests/api/javax/security/cert/CertificateNotYetValidExceptionTest.java b/luni/src/test/java/tests/api/javax/security/cert/CertificateNotYetValidExceptionTest.java index 311c2ce..c746648 100644 --- a/luni/src/test/java/tests/api/javax/security/cert/CertificateNotYetValidExceptionTest.java +++ b/luni/src/test/java/tests/api/javax/security/cert/CertificateNotYetValidExceptionTest.java @@ -22,11 +22,6 @@ package tests.api.javax.security.cert; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import javax.security.cert.CertificateNotYetValidException; @@ -36,7 +31,6 @@ import javax.security.cert.CertificateNotYetValidException; * Tests for <code>DigestException</code> class constructors and methods. * */ -@TestTargetClass(CertificateNotYetValidException.class) public class CertificateNotYetValidExceptionTest extends TestCase { static String[] msgs = { @@ -51,12 +45,6 @@ public class CertificateNotYetValidExceptionTest extends TestCase { * Assertion: constructs CertificateNotYetValidException with no detail * message */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "CertificateNotYetValidException", - args = {} - ) public void testCertificateNotYetValidException01() { CertificateNotYetValidException tE = new CertificateNotYetValidException(); assertNull("getMessage() must return null.", tE.getMessage()); @@ -68,12 +56,6 @@ public class CertificateNotYetValidExceptionTest extends TestCase { * constructor Assertion: constructs CertificateNotYetValidException with * detail message msg. Parameter <code>msg</code> is not null. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies CertificateNotYetValidException constructor with valid parameters.", - method = "CertificateNotYetValidException", - args = {java.lang.String.class} - ) public void testCertificateNotYetValidException02() { CertificateNotYetValidException tE; for (int i = 0; i < msgs.length; i++) { @@ -89,12 +71,6 @@ public class CertificateNotYetValidExceptionTest extends TestCase { * constructor Assertion: constructs CertificateNotYetValidException when * <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies CertificateNotYetValidException constructor with null as a parameter.", - method = "CertificateNotYetValidException", - args = {java.lang.String.class} - ) public void testCertificateNotYetValidException03() { String msg = null; CertificateNotYetValidException tE = new CertificateNotYetValidException( diff --git a/luni/src/test/java/tests/api/javax/security/cert/CertificateParsingExceptionTest.java b/luni/src/test/java/tests/api/javax/security/cert/CertificateParsingExceptionTest.java index eb9ea95..bc07ff6 100644 --- a/luni/src/test/java/tests/api/javax/security/cert/CertificateParsingExceptionTest.java +++ b/luni/src/test/java/tests/api/javax/security/cert/CertificateParsingExceptionTest.java @@ -22,11 +22,6 @@ package tests.api.javax.security.cert; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import javax.security.cert.CertificateParsingException; @@ -36,7 +31,6 @@ import javax.security.cert.CertificateParsingException; * Tests for <code>DigestException</code> class constructors and methods. * */ -@TestTargetClass(CertificateParsingException.class) public class CertificateParsingExceptionTest extends TestCase { @@ -51,12 +45,6 @@ public class CertificateParsingExceptionTest extends TestCase { * Test for <code>CertificateParsingException()</code> constructor * Assertion: constructs CertificateParsingException with no detail message */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "CertificateParsingException", - args = {} - ) public void testCertificateParsingException01() { CertificateParsingException tE = new CertificateParsingException(); assertNull("getMessage() must return null.", tE.getMessage()); @@ -68,12 +56,6 @@ public class CertificateParsingExceptionTest extends TestCase { * Assertion: constructs CertificateParsingException with detail message * msg. Parameter <code>msg</code> is not null. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies CertificateParsingException cobstructor with valid parameters.", - method = "CertificateParsingException", - args = {java.lang.String.class} - ) public void testCertificateParsingException02() { CertificateParsingException tE; for (int i = 0; i < msgs.length; i++) { @@ -89,12 +71,6 @@ public class CertificateParsingExceptionTest extends TestCase { * Assertion: constructs CertificateParsingException when <code>msg</code> * is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies CertificateParsingException constructor with null as a parameter.", - method = "CertificateParsingException", - args = {java.lang.String.class} - ) public void testCertificateParsingException03() { String msg = null; CertificateParsingException tE = new CertificateParsingException(msg); diff --git a/luni/src/test/java/tests/api/javax/security/cert/CertificateTest.java b/luni/src/test/java/tests/api/javax/security/cert/CertificateTest.java index 852a052..da1c7a0 100644 --- a/luni/src/test/java/tests/api/javax/security/cert/CertificateTest.java +++ b/luni/src/test/java/tests/api/javax/security/cert/CertificateTest.java @@ -22,10 +22,6 @@ package tests.api.javax.security.cert; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; - import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; @@ -73,12 +69,6 @@ public class CertificateTest extends TestCase { /** * Test for <code>Certificate()</code> constructor<br> */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "Certificate", - args = {} - ) public final void testCertificate() { TBTCert tbt_cert = new TBTCert(); @@ -91,12 +81,6 @@ public class CertificateTest extends TestCase { * operation: it should be reflexive, symmetric, transitive, consistent and * should be false on null object. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "equals", - args = {java.lang.Object.class} - ) public void testEquals() { TBTCert tbt_cert = new TBTCert() { public byte[] getEncoded() { @@ -153,12 +137,6 @@ public class CertificateTest extends TestCase { /** * hashCode() method testing. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hashCode", - args = {} - ) public void testHashCode() { TBTCert tbt_cert = new TBTCert() { public byte[] getEncoded() { diff --git a/luni/src/test/java/tests/api/javax/security/cert/X509CertificateTest.java b/luni/src/test/java/tests/api/javax/security/cert/X509CertificateTest.java index f0ba1ea..996c94d 100644 --- a/luni/src/test/java/tests/api/javax/security/cert/X509CertificateTest.java +++ b/luni/src/test/java/tests/api/javax/security/cert/X509CertificateTest.java @@ -23,9 +23,6 @@ package tests.api.javax.security.cert; import dalvik.annotation.BrokenTest; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; import dalvik.annotation.SideEffect; import junit.framework.Test; @@ -66,14 +63,9 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; import tests.targets.security.cert.CertificateFactoryTestX509; -import dalvik.annotation.BrokenTest; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; /** */ -@TestTargetClass(X509Certificate.class) public class X509CertificateTest extends TestCase { // Testing data was generated by using of classes @@ -179,14 +171,8 @@ public class X509CertificateTest extends TestCase { /** * X509Certificate() constructor testing. - * @tests {@link X509Certificate#X509Certificate() } + * {@link X509Certificate#X509Certificate() } */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "X509Certificate", - args = {} - ) public void testConstructor() { //Direct constructor, check if it throws an exception X509Certificate cert = new MyCertificate(); @@ -195,12 +181,6 @@ public class X509CertificateTest extends TestCase { /** * getInstance(InputStream inStream) method testing. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getInstance", - args = {java.io.InputStream.class} - ) public void testGetInstance1() { if (this.cert == null) { // The requested certificate type is not available. @@ -235,12 +215,6 @@ public class X509CertificateTest extends TestCase { * @throws CertificateEncodingException * @throws java.security.cert.CertificateEncodingException */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Verifies CertificateException.", - method = "getInstance", - args = {byte[].class} - ) public void testGetInstance2() throws java.security.cert.CertificateEncodingException, CertificateEncodingException { boolean certificateException = false; X509Certificate c = null; @@ -288,12 +262,6 @@ public class X509CertificateTest extends TestCase { * @throws java.security.cert.CertificateExpiredException * @throws java.security.cert.CertificateNotYetValidException */ - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "Doesn't verify exceptions.", - method = "checkValidity", - args = {} - ) public void testCheckValidity1() throws CertificateExpiredException, CertificateNotYetValidException, java.security.cert.CertificateExpiredException, java.security.cert.CertificateNotYetValidException { if (this.cert == null) { // The requested certificate type is not available. @@ -336,12 +304,6 @@ public class X509CertificateTest extends TestCase { * @throws CertificateNotYetValidException * @throws CertificateExpiredException */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Doesn't verify exceptions.", - method = "checkValidity", - args = {java.util.Date.class} - ) public void testCheckValidity2() throws CertificateNotYetValidException, CertificateExpiredException { if (this.cert == null) { // The requested certificate type is not available. @@ -394,12 +356,6 @@ public class X509CertificateTest extends TestCase { /** * getVersion() method testing. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getVersion", - args = {} - ) public void testGetVersion() { if (this.cert == null) { // The requested certificate type is not available. @@ -412,12 +368,6 @@ public class X509CertificateTest extends TestCase { /** * getSerialNumber() method testing. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSerialNumber", - args = {} - ) public void testGetSerialNumber() { if (this.cert == null) { // The requested certificate type is not available. @@ -431,12 +381,6 @@ public class X509CertificateTest extends TestCase { /** * getIssuerDN() method testing. */ - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "Denigrated API", - method = "getIssuerDN", - args = {} - ) public void testGetIssuerDN() { if (this.cert == null) { // The requested certificate type is not available. @@ -450,12 +394,6 @@ public class X509CertificateTest extends TestCase { /** * getSubjectDN() method testing. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSubjectDN", - args = {} - ) public void testGetSubjectDN() { if (this.cert == null) { // The requested certificate type is not available. @@ -469,12 +407,6 @@ public class X509CertificateTest extends TestCase { /** * getNotBefore() method testing. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getNotBefore", - args = {} - ) public void testGetNotBefore() { if (this.cert == null) { // The requested certificate type is not available. @@ -488,12 +420,6 @@ public class X509CertificateTest extends TestCase { /** * getNotAfter() method testing. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getNotAfter", - args = {} - ) public void testGetNotAfter() { if (this.cert == null) { // The requested certificate type is not available. @@ -507,12 +433,6 @@ public class X509CertificateTest extends TestCase { /** * getSigAlgName() method testing. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSigAlgName", - args = {} - ) public void testGetSigAlgName() { if (this.cert == null) { // The requested certificate type is not available. @@ -526,12 +446,6 @@ public class X509CertificateTest extends TestCase { /** * getSigAlgOID() method testing. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSigAlgOID", - args = {} - ) public void testGetSigAlgOID() { if (this.cert == null) { // The requested certificate type is not available. @@ -545,12 +459,6 @@ public class X509CertificateTest extends TestCase { /** * getSigAlgParams() method testing. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSigAlgParams", - args = {} - ) public void testGetSigAlgParams() { if (this.cert == null) { // The requested certificate type is not available. @@ -719,14 +627,8 @@ public class X509CertificateTest extends TestCase { /** * @throws CertificateEncodingException - * @tests {@link Certificate#getEncoded()} + * {@link Certificate#getEncoded()} */ - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "No ASN1/DER encoder available. Exception is not supported.", - method = "getEncoded", - args = {} - ) public void testGetEncoded() throws CertificateEncodingException, java.security.cert.CertificateException { // cert = DER encoding of the ASN1.0 structure @@ -735,14 +637,8 @@ public class X509CertificateTest extends TestCase { } /** - * @tests {@link Certificate#getPublicKey()} + * {@link Certificate#getPublicKey()} */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPublicKey", - args = {} - ) public void testGetPublicKey() { PublicKey key = javaxCert.getPublicKey(); assertNotNull(key); @@ -763,17 +659,8 @@ public class X509CertificateTest extends TestCase { * @throws NoSuchAlgorithmException * @throws InvalidKeyException * @throws CertificateException - * @tests {@link Certificate#verify(PublicKey)} + * {@link Certificate#verify(PublicKey)} */ - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = " CertificateException not supported."+ - "NoSuchAlgorithmException, NoSuchProviderException can be "+ - "implemented only with working Cert. Verification fails "+ - "(see failing) precondition assertions", - method = "verify", - args = {java.security.PublicKey.class} - ) @SideEffect("Destroys MD5 provider, hurts succeeding tests") public void testVerifyPublicKey() throws InvalidKeyException, NoSuchAlgorithmException, NoSuchProviderException, @@ -855,14 +742,8 @@ public class X509CertificateTest extends TestCase { * @throws InvalidKeyException * @throws IOException * @throws CertificateException - * @tests {@link Certificate#verify(PublicKey, String)} + * {@link Certificate#verify(PublicKey, String)} */ - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "", - method = "verify", - args = {java.security.PublicKey.class, java.lang.String.class} - ) @SideEffect("Destroys MD5 provider, hurts succeeding tests") public void testVerifyPublicKeyString() throws InvalidKeyException, java.security.cert.CertificateException, NoSuchAlgorithmException, diff --git a/luni/src/test/java/tests/api/javax/xml/parsers/DocumentBuilderFactoryTest.java b/luni/src/test/java/tests/api/javax/xml/parsers/DocumentBuilderFactoryTest.java index f911c69..7d79560 100644 --- a/luni/src/test/java/tests/api/javax/xml/parsers/DocumentBuilderFactoryTest.java +++ b/luni/src/test/java/tests/api/javax/xml/parsers/DocumentBuilderFactoryTest.java @@ -15,11 +15,6 @@ */ package tests.api.javax.xml.parsers; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import org.w3c.dom.Document; @@ -40,7 +35,6 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.FactoryConfigurationError; import javax.xml.parsers.ParserConfigurationException; -@TestTargetClass(DocumentBuilderFactory.class) public class DocumentBuilderFactoryTest extends TestCase { DocumentBuilderFactory dbf; @@ -69,14 +63,8 @@ public class DocumentBuilderFactoryTest extends TestCase { } /** - * @tests javax.xml.parsers.DocumentBuilderFactory#DocumentBuilderFactory(). + * javax.xml.parsers.DocumentBuilderFactory#DocumentBuilderFactory(). */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "DocumentBuilderFactory", - args = {} - ) public void test_Constructor() { try { new DocumentBuilderFactoryChild(); @@ -86,7 +74,7 @@ public class DocumentBuilderFactoryTest extends TestCase { } /** - * @tests javax.xml.parsers.DocumentBuilderFactory#getAttribute(String). + * javax.xml.parsers.DocumentBuilderFactory#getAttribute(String). */ // public void test_getAttributeLjava_lang_String() { // String[] attributes = { @@ -126,7 +114,7 @@ public class DocumentBuilderFactoryTest extends TestCase { // } /** - * @tests javax.xml.parsers.DocumentBuilderFactory#getFeature(String). + * javax.xml.parsers.DocumentBuilderFactory#getFeature(String). */ // TODO Fails on JDK. Why? // public void test_getFeatureLjava_lang_String() { @@ -175,7 +163,7 @@ public class DocumentBuilderFactoryTest extends TestCase { // } /** - * @tests javax.xml.parsers.DocumentBuilderFactory#getSchema(). + * javax.xml.parsers.DocumentBuilderFactory#getSchema(). * TBD getSchemas() IS NOT SUPPORTED */ /* public void test_getSchema() { @@ -193,14 +181,8 @@ public class DocumentBuilderFactoryTest extends TestCase { */ /** - * @tests javax.xml.parsers.DocumentBuilderFactory#isCoalescing(). + * javax.xml.parsers.DocumentBuilderFactory#isCoalescing(). */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isCoalescing", - args = {} - ) public void test_isCoalescing() { dbf.setCoalescing(true); assertTrue(dbf.isCoalescing()); @@ -210,14 +192,8 @@ public class DocumentBuilderFactoryTest extends TestCase { } /** - * @tests javax.xml.parsers.DocumentBuilderFactory#isExpandEntityReferences(). + * javax.xml.parsers.DocumentBuilderFactory#isExpandEntityReferences(). */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isExpandEntityReferences", - args = {} - ) public void test_isExpandEntityReferences() { dbf.setExpandEntityReferences(true); assertTrue(dbf.isExpandEntityReferences()); @@ -227,14 +203,8 @@ public class DocumentBuilderFactoryTest extends TestCase { } /** - * @tests javax.xml.parsers.DocumentBuilderFactory#isIgnoringComments(). + * javax.xml.parsers.DocumentBuilderFactory#isIgnoringComments(). */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isIgnoringComments", - args = {} - ) public void test_isIgnoringComments() { dbf.setIgnoringComments(true); assertTrue(dbf.isIgnoringComments()); @@ -244,14 +214,8 @@ public class DocumentBuilderFactoryTest extends TestCase { } /** - * @tests javax.xml.parsers.DocumentBuilderFactory#isIgnoringElementContentWhitespace(). + * javax.xml.parsers.DocumentBuilderFactory#isIgnoringElementContentWhitespace(). */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isIgnoringElementContentWhitespace", - args = {} - ) public void test_isIgnoringElementContentWhitespace() { dbf.setIgnoringElementContentWhitespace(true); assertTrue(dbf.isIgnoringElementContentWhitespace()); @@ -261,14 +225,8 @@ public class DocumentBuilderFactoryTest extends TestCase { } /** - * @tests javax.xml.parsers.DocumentBuilderFactory#isNamespaceAware(). + * javax.xml.parsers.DocumentBuilderFactory#isNamespaceAware(). */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isNamespaceAware", - args = {} - ) public void test_isNamespaceAware() { dbf.setNamespaceAware(true); assertTrue(dbf.isNamespaceAware()); @@ -277,20 +235,6 @@ public class DocumentBuilderFactoryTest extends TestCase { assertFalse(dbf.isNamespaceAware()); } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isValidating", - args = {} - ), - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "", - method = "setValidating", - args = {boolean.class} - ) - }) public void test_setIsValidating() { dbf.setValidating(true); assertTrue(dbf.isValidating()); @@ -299,20 +243,6 @@ public class DocumentBuilderFactoryTest extends TestCase { assertFalse(dbf.isValidating()); } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isXIncludeAware", - args = {} - ), - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "", - method = "setXIncludeAware", - args = {boolean.class} - ) - }) public void test_isSetXIncludeAware() { dbf.setXIncludeAware(true); assertTrue(dbf.isXIncludeAware()); @@ -322,14 +252,8 @@ public class DocumentBuilderFactoryTest extends TestCase { } /** - * @tests javax.xml.parsers.DocumentBuilderFactory#newInstance(). + * javax.xml.parsers.DocumentBuilderFactory#newInstance(). */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "newInstance", - args = {} - ) public void test_newInstance() { String className = null; try { @@ -380,12 +304,6 @@ public class DocumentBuilderFactoryTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "SAXException untested; unused on Android", - method = "newDocumentBuilder", - args = {} - ) public void test_newDocumentBuilder() { // Ordinary case try { @@ -406,7 +324,7 @@ public class DocumentBuilderFactoryTest extends TestCase { } /** - * @tests javax.xml.parsers.DocumentBuilderFactory#setAttribute(java.lang.String, + * javax.xml.parsers.DocumentBuilderFactory#setAttribute(java.lang.String, * java.lang.Object). */ // public void test_setAttributeLjava_lang_StringLjava_lang_Object() { @@ -447,14 +365,8 @@ public class DocumentBuilderFactoryTest extends TestCase { // } /** - * @tests javax.xml.parsers.DocumentBuilderFactory#setCoalescing(boolean). + * javax.xml.parsers.DocumentBuilderFactory#setCoalescing(boolean). */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setCoalescing", - args = {boolean.class} - ) public void test_setCoalescingZ() { dbf.setCoalescing(true); assertTrue(dbf.isCoalescing()); @@ -518,14 +430,8 @@ public class DocumentBuilderFactoryTest extends TestCase { } /** - * @tests javax.xml.parsers.DocumentBuilderFactory#setExpandEntityReferences(boolean). + * javax.xml.parsers.DocumentBuilderFactory#setExpandEntityReferences(boolean). */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setExpandEntityReferences", - args = {boolean.class} - ) public void test_setExpandEntityReferencesZ() { dbf.setExpandEntityReferences(true); assertTrue(dbf.isExpandEntityReferences()); @@ -579,22 +485,8 @@ public class DocumentBuilderFactoryTest extends TestCase { } /** - * @tests javax.xml.parsers.DocumentBuilderFactory#setFeature(java.lang.String). + * javax.xml.parsers.DocumentBuilderFactory#setFeature(java.lang.String). */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getFeature", - args = {java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setFeature", - args = {java.lang.String.class, boolean.class} - ) - }) public void test_getSetFeatureLjava_lang_String() { String[] features = { "http://xml.org/sax/features/namespaces", "http://xml.org/sax/features/validation" }; @@ -639,14 +531,8 @@ public class DocumentBuilderFactoryTest extends TestCase { } /** - * @tests javax.xml.parsers.DocumentBuilderFactory#setIgnoringComments(boolean). + * javax.xml.parsers.DocumentBuilderFactory#setIgnoringComments(boolean). */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setIgnoringComments", - args = {boolean.class} - ) public void test_setIgnoringCommentsZ() { commentElements.clear(); @@ -696,14 +582,8 @@ public class DocumentBuilderFactoryTest extends TestCase { } /** - * @tests javax.xml.parsers.DocumentBuilderFactory#setIgnoringElementContentWhitespace(boolean). + * javax.xml.parsers.DocumentBuilderFactory#setIgnoringElementContentWhitespace(boolean). */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setIgnoringElementContentWhitespace", - args = {boolean.class} - ) public void test_setIgnoringElementContentWhitespaceZ() { dbf.setIgnoringElementContentWhitespace(true); assertTrue(dbf.isIgnoringElementContentWhitespace()); @@ -745,14 +625,8 @@ public class DocumentBuilderFactoryTest extends TestCase { } /** - * @tests javax.xml.parsers.DocumentBuilderFactory#setNamespaceAware(boolean). + * javax.xml.parsers.DocumentBuilderFactory#setNamespaceAware(boolean). */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setNamespaceAware", - args = {boolean.class} - ) public void test_setNamespaceAwareZ() { dbf.setNamespaceAware(true); assertTrue(dbf.isNamespaceAware()); @@ -793,20 +667,6 @@ public class DocumentBuilderFactoryTest extends TestCase { } } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getAttribute", - args = {java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setAttribute", - args = {java.lang.String.class, Object.class} - ) - }) public void test_getSetAttribute() { // Android SAX implementation doesn't support attributes, so // we can only make sure the expected exception is thrown. @@ -826,7 +686,7 @@ public class DocumentBuilderFactoryTest extends TestCase { } /** - * @tests javax.xml.parsers.DocumentBuilderFactory#setSchema(javax.xml.validation.Schema). + * javax.xml.parsers.DocumentBuilderFactory#setSchema(javax.xml.validation.Schema). */ /* public void test_setSchemaLjavax_xml_validation_Schema() { SchemaFactory sf = @@ -841,7 +701,7 @@ public class DocumentBuilderFactoryTest extends TestCase { } */ /** - * @tests javax.xml.parsers.DocumentBuilderFactory#setValidating(boolean). + * javax.xml.parsers.DocumentBuilderFactory#setValidating(boolean). */ // public void test_setValidatingZ() { // Exception parseException = null; @@ -956,7 +816,7 @@ public class DocumentBuilderFactoryTest extends TestCase { // } /** - * @tests javax.xml.parsers.DocumentBuilderFactory#setXIncludeAware(). + * javax.xml.parsers.DocumentBuilderFactory#setXIncludeAware(). */ // public void test_setXIncludeAware() { // dbf.setXIncludeAware(true); diff --git a/luni/src/test/java/tests/api/javax/xml/parsers/DocumentBuilderTest.java b/luni/src/test/java/tests/api/javax/xml/parsers/DocumentBuilderTest.java index a6a3042..66ce621 100644 --- a/luni/src/test/java/tests/api/javax/xml/parsers/DocumentBuilderTest.java +++ b/luni/src/test/java/tests/api/javax/xml/parsers/DocumentBuilderTest.java @@ -16,9 +16,6 @@ package tests.api.javax.xml.parsers; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; import junit.framework.TestCase; import org.w3c.dom.DOMImplementation; import org.w3c.dom.Document; @@ -44,7 +41,6 @@ import java.io.IOException; import java.io.InputStream; import java.net.URL; -@TestTargetClass(DocumentBuilder.class) public class DocumentBuilderTest extends TestCase { private class MockDocumentBuilder extends DocumentBuilder { @@ -139,12 +135,6 @@ public class DocumentBuilderTest extends TestCase { super.tearDown(); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "DocumentBuilder", - args = {} - ) public void testDocumentBuilder() { try { new MockDocumentBuilder(); @@ -154,7 +144,7 @@ public class DocumentBuilderTest extends TestCase { } /** - * @tests javax.xml.parsers.DocumentBuilder#getSchema() + * javax.xml.parsers.DocumentBuilder#getSchema() * TBD getSchema() is not supported */ /* public void test_getSchema() { @@ -172,12 +162,6 @@ public class DocumentBuilderTest extends TestCase { } } */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "newDocument", - args = { } - ) public void testNewDocument() { Document d; @@ -193,12 +177,6 @@ public class DocumentBuilderTest extends TestCase { assertNull(d.getNamespaceURI()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getDOMImplementation", - args = { } - ) public void testGetImplementation() { DOMImplementation d; @@ -211,12 +189,6 @@ public class DocumentBuilderTest extends TestCase { assertNotNull(d); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isNamespaceAware", - args = {} - ) public void testIsNamespaceAware() { try { dbf.setNamespaceAware(true); @@ -228,12 +200,6 @@ public class DocumentBuilderTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "No validating parser in Android, hence not tested", - method = "isValidating", - args = {} - ) public void testIsValidating() { try { dbf.setValidating(false); @@ -243,12 +209,6 @@ public class DocumentBuilderTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "No XInclude-aware parser in Android, hence not tested", - method = "isXIncludeAware", - args = {} - ) public void testIsXIncludeAware() { try { dbf.setXIncludeAware(false); @@ -261,12 +221,6 @@ public class DocumentBuilderTest extends TestCase { /** * Tests that the Base URI for the document is populated with the file URI. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "parse", - args = {java.io.File.class} - ) public void testGetBaseURI() throws IOException, SAXException { File f = Support_Resources.resourceToTempFile("/simple.xml"); Document d = db.parse(f); @@ -274,18 +228,12 @@ public class DocumentBuilderTest extends TestCase { } /** - * @tests javax.xml.parsers.DocumentBuilder#parse(java.io.File) + * javax.xml.parsers.DocumentBuilder#parse(java.io.File) * Case 1: Try to parse correct xml document. * Case 2: Try to call parse() with null argument. * Case 3: Try to parse a non-existent file. * Case 4: Try to parse incorrect xml file. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "parse", - args = {java.io.File.class} - ) public void test_parseLjava_io_File() throws IOException { File f = Support_Resources.resourceToTempFile("/simple.xml"); @@ -341,18 +289,12 @@ public class DocumentBuilderTest extends TestCase { } /** - * @tests javax.xml.parsers.DocumentBuilder#parse(java.io.InputStream) + * javax.xml.parsers.DocumentBuilder#parse(java.io.InputStream) * Case 1: Try to parse correct xml document. * Case 2: Try to call parse() with null argument. * Case 3: Try to parse a non-existent file. * Case 4: Try to parse incorrect xml file. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "parse", - args = {java.io.InputStream.class} - ) public void test_parseLjava_io_InputStream() { InputStream is = getClass().getResourceAsStream("/simple.xml"); // case 1: Trivial use. @@ -407,18 +349,12 @@ public class DocumentBuilderTest extends TestCase { } /** - * @tests javax.xml.parsers.DocumentBuilder#parse(java.io.InputStream) + * javax.xml.parsers.DocumentBuilder#parse(java.io.InputStream) * Case 1: Try to parse correct xml document. * Case 2: Try to call parse() with null argument. * Case 3: Try to parse a non-existent file. * Case 4: Try to parse incorrect xml file. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "parse", - args = { InputSource.class } - ) public void testParseInputSource() { InputStream stream = getClass().getResourceAsStream("/simple.xml"); InputSource is = new InputSource(stream); @@ -475,19 +411,13 @@ public class DocumentBuilderTest extends TestCase { } /** - * @tests javax.xml.parsers.DocumentBuilder#parse(java.io.InputStream, + * javax.xml.parsers.DocumentBuilder#parse(java.io.InputStream, * java.lang.String) * Case 1: Try to parse correct xml document. * Case 2: Try to call parse() with null argument. * Case 3: Try to parse a non-existent file. * Case 4: Try to parse incorrect xml file. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "parse", - args = {java.io.InputStream.class, java.lang.String.class} - ) public void test_parseLjava_io_InputStreamLjava_lang_String() { InputStream is = getClass().getResourceAsStream("/systemid.xml"); // case 1: Trivial use. @@ -547,18 +477,12 @@ public class DocumentBuilderTest extends TestCase { } /** - * @tests javax.xml.parsers.DocumentBuilder#parse(java.lang.String) + * javax.xml.parsers.DocumentBuilder#parse(java.lang.String) * Case 1: Try to parse correct xml document. * Case 2: Try to call parse() with null argument. * Case 3: Try to parse a non-existent uri. * Case 4: Try to parse incorrect xml file. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "parse", - args = {java.lang.String.class} - ) public void test_parseLjava_lang_String() throws Exception { // case 1: Trivial use. URL resource = getClass().getResource("/simple.xml"); @@ -598,11 +522,6 @@ public class DocumentBuilderTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "reset", - args = { } - ) public void testReset() { // Make sure EntityResolver gets reset InputStream source = new ByteArrayInputStream("<a>&foo;</a>".getBytes()); @@ -645,11 +564,6 @@ public class DocumentBuilderTest extends TestCase { assertEquals(0, logger.size()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "setErrorHandler", - args = { ErrorHandler.class } - ) public void testSetErrorHandler() { // Ordinary case InputStream source = new ByteArrayInputStream("</a>".getBytes()); @@ -684,11 +598,6 @@ public class DocumentBuilderTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "setEntityResolver", - args = { EntityResolver.class } - ) public void testSetEntityResolver() { // Ordinary case InputStream source = new ByteArrayInputStream("<a>&foo;</a>".getBytes()); diff --git a/luni/src/test/java/tests/api/javax/xml/parsers/FactoryConfigurationErrorTest.java b/luni/src/test/java/tests/api/javax/xml/parsers/FactoryConfigurationErrorTest.java index 4678212..cdef4e2 100644 --- a/luni/src/test/java/tests/api/javax/xml/parsers/FactoryConfigurationErrorTest.java +++ b/luni/src/test/java/tests/api/javax/xml/parsers/FactoryConfigurationErrorTest.java @@ -18,19 +18,9 @@ package tests.api.javax.xml.parsers; import javax.xml.parsers.FactoryConfigurationError; import junit.framework.TestCase; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -@TestTargetClass(FactoryConfigurationError.class) public class FactoryConfigurationErrorTest extends TestCase { - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "FactoryConfigurationError", - args = {} - ) public void test_Constructor() { FactoryConfigurationError fce = new FactoryConfigurationError(); assertNull(fce.getMessage()); @@ -38,12 +28,6 @@ public class FactoryConfigurationErrorTest extends TestCase { assertNull(fce.getCause()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "FactoryConfigurationError", - args = {java.lang.Exception.class} - ) public void test_ConstructorLjava_lang_Exception() { Exception e = new Exception(); // case 1: Try to create FactoryConfigurationError @@ -62,12 +46,6 @@ public class FactoryConfigurationErrorTest extends TestCase { assertEquals(e.getCause(), fce.getCause()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "FactoryConfigurationError", - args = {java.lang.Exception.class, java.lang.String.class} - ) public void test_ConstructorLjava_lang_ExceptionLjava_lang_String() { Exception e = new Exception(); // case 1: Try to create FactoryConfigurationError @@ -86,12 +64,6 @@ public class FactoryConfigurationErrorTest extends TestCase { assertEquals(e.getCause(), fce.getCause()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "FactoryConfigurationError", - args = {java.lang.String.class} - ) public void test_ConstructorLjava_lang_String() { FactoryConfigurationError fce = new FactoryConfigurationError("Oops!"); assertEquals("Oops!", fce.getMessage()); @@ -99,12 +71,6 @@ public class FactoryConfigurationErrorTest extends TestCase { assertNull(fce.getCause()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getException", - args = {} - ) public void test_getException() { FactoryConfigurationError fce = new FactoryConfigurationError(); assertNull(fce.getException()); @@ -118,12 +84,6 @@ public class FactoryConfigurationErrorTest extends TestCase { assertEquals(npe, fce.getException()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getMessage", - args = {} - ) public void test_getMessage() { assertNull(new FactoryConfigurationError().getMessage()); assertEquals("msg1", diff --git a/luni/src/test/java/tests/api/javax/xml/parsers/ParserConfigurationExceptionTest.java b/luni/src/test/java/tests/api/javax/xml/parsers/ParserConfigurationExceptionTest.java index 078d3b6..d1feb9f 100644 --- a/luni/src/test/java/tests/api/javax/xml/parsers/ParserConfigurationExceptionTest.java +++ b/luni/src/test/java/tests/api/javax/xml/parsers/ParserConfigurationExceptionTest.java @@ -18,19 +18,9 @@ package tests.api.javax.xml.parsers; import javax.xml.parsers.ParserConfigurationException; import junit.framework.TestCase; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -@TestTargetClass(ParserConfigurationException.class) public class ParserConfigurationExceptionTest extends TestCase{ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "ParserConfigurationException", - args = {} - ) public void test_Constructor() { ParserConfigurationException pce = new ParserConfigurationException(); assertNull(pce.getMessage()); @@ -38,12 +28,6 @@ public class ParserConfigurationExceptionTest extends TestCase{ assertNull(pce.getCause()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "ParserConfigurationException", - args = {java.lang.String.class} - ) public void test_ConstructorLjava_lang_String() { ParserConfigurationException pce = new ParserConfigurationException("Oops!"); diff --git a/luni/src/test/java/tests/api/javax/xml/parsers/SAXParserFactoryTest.java b/luni/src/test/java/tests/api/javax/xml/parsers/SAXParserFactoryTest.java index e358670..614b9d8 100644 --- a/luni/src/test/java/tests/api/javax/xml/parsers/SAXParserFactoryTest.java +++ b/luni/src/test/java/tests/api/javax/xml/parsers/SAXParserFactoryTest.java @@ -37,12 +37,7 @@ import org.xml.sax.helpers.DefaultHandler; import dalvik.annotation.AndroidOnly; import dalvik.annotation.KnownFailure; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; -@TestTargetClass(SAXParserFactory.class) public class SAXParserFactoryTest extends TestCase { SAXParserFactory spf; @@ -70,12 +65,6 @@ public class SAXParserFactoryTest extends TestCase { super.tearDown(); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "SAXParserFactory", - args = {} - ) @AndroidOnly("Android SAX implementation is non-validating") public void test_Constructor() { MySAXParserFactory mpf = new MySAXParserFactory(); @@ -84,7 +73,7 @@ public class SAXParserFactoryTest extends TestCase { } /** - * @tests javax.xml.parsers.SAXParserFactory#getSchema(). + * javax.xml.parsers.SAXParserFactory#getSchema(). * TBD getSchema() IS NOT SUPPORTED */ /* public void test_getSchema() { @@ -101,20 +90,6 @@ public class SAXParserFactoryTest extends TestCase { } */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isNamespaceAware", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setNamespaceAware", - args = {boolean.class} - ) - }) public void test_setIsNamespaceAware() { spf.setNamespaceAware(true); assertTrue(spf.isNamespaceAware()); @@ -124,20 +99,6 @@ public class SAXParserFactoryTest extends TestCase { assertTrue(spf.isNamespaceAware()); } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isValidating", - args = {} - ), - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "", - method = "setValidating", - args = {boolean.class} - ) - }) public void test_setIsValidating() { spf.setValidating(true); assertTrue(spf.isValidating()); @@ -147,20 +108,6 @@ public class SAXParserFactoryTest extends TestCase { assertTrue(spf.isValidating()); } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isXIncludeAware", - args = {} - ), - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "", - method = "setXIncludeAware", - args = {boolean.class} - ) - }) public void test_setIsXIncludeAware() { spf.setXIncludeAware(true); assertTrue(spf.isXIncludeAware()); @@ -168,12 +115,6 @@ public class SAXParserFactoryTest extends TestCase { assertFalse(spf.isXIncludeAware()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "newInstance", - args = {} - ) @KnownFailure("Dalvik doesn't honor system properties when choosing a SAX implementation") public void test_newInstance() { try { @@ -206,12 +147,6 @@ public class SAXParserFactoryTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "SAXException untested; unused on Android", - method = "newSAXParser", - args = {} - ) public void test_newSAXParser() { // Ordinary case try { @@ -233,20 +168,6 @@ public class SAXParserFactoryTest extends TestCase { } } - @TestTargets({ - @TestTargetNew( - level = TestLevel.SUFFICIENT, - method = "setFeature", - notes = "ParserConfigurationException untested; unused on Android", - args = {java.lang.String.class, boolean.class} - ), - @TestTargetNew( - level = TestLevel.SUFFICIENT, - method = "getFeature", - notes = "ParserConfigurationException untested; unused on Android", - args = {java.lang.String.class} - ) - }) public void test_setFeatureLjava_lang_StringZ() { // We can't verify ParserConfigurationException and // SAXNotSupportedException since these are never @@ -309,11 +230,6 @@ public class SAXParserFactoryTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "setNamespaceAware", - args = {boolean.class} - ) public void test_setNamespaceAwareZ() throws Exception { MyHandler mh = new MyHandler(); diff --git a/luni/src/test/java/tests/api/javax/xml/parsers/SAXParserTest.java b/luni/src/test/java/tests/api/javax/xml/parsers/SAXParserTest.java index 5bcc7ac..3586162 100644 --- a/luni/src/test/java/tests/api/javax/xml/parsers/SAXParserTest.java +++ b/luni/src/test/java/tests/api/javax/xml/parsers/SAXParserTest.java @@ -16,10 +16,6 @@ package tests.api.javax.xml.parsers; import dalvik.annotation.KnownFailure; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -48,7 +44,6 @@ import tests.api.org.xml.sax.support.MockHandler; import tests.support.resource.Support_Resources; @SuppressWarnings("deprecation") -@TestTargetClass(SAXParser.class) public class SAXParserTest extends TestCase { private class MockSAXParser extends SAXParser { @@ -249,12 +244,6 @@ public class SAXParserTest extends TestCase { // } // } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "SAXParser", - args = {} - ) public void testSAXParser() { try { new MockSAXParser(); @@ -264,7 +253,7 @@ public class SAXParserTest extends TestCase { } /** - * @tests javax.xml.parser.SAXParser#getSchema(). + * javax.xml.parser.SAXParser#getSchema(). * TODO getSchema() IS NOT SUPPORTED */ /* public void test_getSchema() { @@ -283,12 +272,6 @@ public class SAXParserTest extends TestCase { } */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isNamespaceAware", - args = {} - ) public void testIsNamespaceAware() { try { spf.setNamespaceAware(true); @@ -300,12 +283,6 @@ public class SAXParserTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "No validating parser in Android, hence not tested", - method = "isValidating", - args = {} - ) public void testIsValidating() { try { spf.setValidating(false); @@ -315,12 +292,6 @@ public class SAXParserTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "No XInclude-aware parser in Android, hence not tested", - method = "isXIncludeAware", - args = {} - ) public void testIsXIncludeAware() { try { spf.setXIncludeAware(false); @@ -334,12 +305,6 @@ public class SAXParserTest extends TestCase { * @test javax.xml.parsers.SAXParser#parse(java.io.File, * org.xml.sax.helpers.DefaultHandler) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify positive functionality properly; not all exceptions are verified.", - method = "parse", - args = {java.io.File.class, org.xml.sax.helpers.DefaultHandler.class} - ) public void test_parseLjava_io_FileLorg_xml_sax_helpers_DefaultHandler() throws Exception { @@ -376,12 +341,6 @@ public class SAXParserTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "Sufficient while XML parser situation is still unclear", - method = "parse", - args = {java.io.File.class, org.xml.sax.HandlerBase.class} - ) public void testParseFileHandlerBase() { for(int i = 0; i < list_wf.length; i++) { try { @@ -441,12 +400,6 @@ public class SAXParserTest extends TestCase { * @test javax.xml.parsers.SAXParser#parse(org.xml.sax.InputSource, * org.xml.sax.helpers.DefaultHandler) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify IOException.", - method = "parse", - args = {org.xml.sax.InputSource.class, org.xml.sax.helpers.DefaultHandler.class} - ) public void test_parseLorg_xml_sax_InputSourceLorg_xml_sax_helpers_DefaultHandler() throws Exception { for(int i = 0; i < list_wf.length; i++) { @@ -490,12 +443,6 @@ public class SAXParserTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "Sufficient while XML parser situation is still unclear", - method = "parse", - args = {org.xml.sax.InputSource.class, org.xml.sax.HandlerBase.class} - ) public void testParseInputSourceHandlerBase() throws Exception { for(int i = 0; i < list_wf.length; i++) { HashMap<String, String> hm = sp.readFile(list_out_hb[i].getPath()); @@ -549,12 +496,6 @@ public class SAXParserTest extends TestCase { * @test javax.xml.parsers.SAXParser#parse(java.io.InputStream, * org.xml.sax.helpers.DefaultHandler) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify IOException.", - method = "parse", - args = {java.io.InputStream.class, org.xml.sax.helpers.DefaultHandler.class} - ) public void test_parseLjava_io_InputStreamLorg_xml_sax_helpers_DefaultHandler() throws Exception { @@ -599,12 +540,6 @@ public class SAXParserTest extends TestCase { * @test javax.xml.parsers.SAXParser#parse(java.io.InputStream, * org.xml.sax.helpers.DefaultHandler, java.lang.String) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify IOException.", - method = "parse", - args = {java.io.InputStream.class, org.xml.sax.helpers.DefaultHandler.class, java.lang.String.class} - ) @KnownFailure("We supply optional qnames, but this test doesn't expect them") public void test_parseLjava_io_InputStreamLorg_xml_sax_helpers_DefaultHandlerLjava_lang_String() { for(int i = 0; i < list_wf.length; i++) { @@ -715,12 +650,6 @@ public class SAXParserTest extends TestCase { // }*/ } - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "Sufficient while XML parser situation is still unclear", - method = "parse", - args = {java.io.InputStream.class, org.xml.sax.HandlerBase.class} - ) public void testParseInputStreamHandlerBase() throws Exception { for(int i = 0; i < list_wf.length; i++) { HashMap<String, String> hm = sp.readFile(list_out_hb[i].getPath()); @@ -762,12 +691,6 @@ public class SAXParserTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "Sufficient while XML parser situation is still unclear", - method = "parse", - args = {java.io.InputStream.class, org.xml.sax.HandlerBase.class, java.lang.String.class} - ) public void testParseInputStreamHandlerBaseString() throws Exception { for(int i = 0; i < list_wf.length; i++) { HashMap<String, String> hm = sp.readFile(list_out_hb[i].getPath()); @@ -812,12 +735,6 @@ public class SAXParserTest extends TestCase { * @test javax.xml.parsers.SAXParser#parse(java.lang.String, * org.xml.sax.helpers.DefaultHandler) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify IOException.", - method = "parse", - args = {java.lang.String.class, org.xml.sax.helpers.DefaultHandler.class} - ) public void test_parseLjava_lang_StringLorg_xml_sax_helpers_DefaultHandler() throws Exception { @@ -855,12 +772,6 @@ public class SAXParserTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "Sufficient while XML parser situation is still unclear", - method = "parse", - args = {java.lang.String.class, org.xml.sax.HandlerBase.class} - ) public void testParseStringHandlerBase() { for(int i = 0; i < list_wf.length; i++) { try { @@ -916,11 +827,6 @@ public class SAXParserTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "reset", - args = { } - ) public void testReset() { try { spf = SAXParserFactory.newInstance(); @@ -934,11 +840,6 @@ public class SAXParserTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getParser", - args = { } - ) public void testGetParser() { spf = SAXParserFactory.newInstance(); try { @@ -949,11 +850,6 @@ public class SAXParserTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getXMLReader", - args = { } - ) public void testGetReader() { spf = SAXParserFactory.newInstance(); try { @@ -964,18 +860,6 @@ public class SAXParserTest extends TestCase { } } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getProperty", - args = { String.class } - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "setProperty", - args = { String.class, Object.class } - ) - }) public void testSetGetProperty() { // Ordinary case String validName = "http://xml.org/sax/properties/lexical-handler"; diff --git a/luni/src/test/java/tests/api/org/xml/sax/HandlerBaseTest.java b/luni/src/test/java/tests/api/org/xml/sax/HandlerBaseTest.java index 25d1d43..8dfe38b 100644 --- a/luni/src/test/java/tests/api/org/xml/sax/HandlerBaseTest.java +++ b/luni/src/test/java/tests/api/org/xml/sax/HandlerBaseTest.java @@ -16,10 +16,6 @@ package tests.api.org.xml.sax; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; - import junit.framework.TestCase; import org.xml.sax.AttributeList; @@ -30,7 +26,6 @@ import org.xml.sax.helpers.AttributeListImpl; import org.xml.sax.helpers.LocatorImpl; @SuppressWarnings("deprecation") -@TestTargetClass(HandlerBase.class) public class HandlerBaseTest extends TestCase { /* @@ -40,11 +35,6 @@ public class HandlerBaseTest extends TestCase { private HandlerBase h = new HandlerBase(); - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "resolveEntity", - args = { String.class, String.class } - ) public void testResolveEntity() { try { h.resolveEntity("publicID", "systemID"); @@ -53,38 +43,18 @@ public class HandlerBaseTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "notationDecl", - args = { String.class, String.class, String.class } - ) public void testNotationDecl() { h.notationDecl("name", "publicID", "systemID"); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "unparsedEntityDecl", - args = { String.class, String.class, String.class, String.class } - ) public void testUnparsedEntityDecl() { h.unparsedEntityDecl("name", "publicID", "systemID", "notationName"); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "setDocumentLocator", - args = { org.xml.sax.Locator.class } - ) public void testSetDocumentLocator() { h.setDocumentLocator(new LocatorImpl()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "startDocument", - args = { } - ) public void testStartDocument() { try { h.startDocument(); @@ -93,11 +63,6 @@ public class HandlerBaseTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "endDocument", - args = { } - ) public void testEndDocument() { try { h.endDocument(); @@ -106,11 +71,6 @@ public class HandlerBaseTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "startElement", - args = { String.class, AttributeList.class } - ) public void testStartElement() { try { h.startElement("name", new AttributeListImpl()); @@ -119,11 +79,6 @@ public class HandlerBaseTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "endElement", - args = { String.class } - ) public void testEndElement() { try { h.endElement("name"); @@ -132,11 +87,6 @@ public class HandlerBaseTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "characters", - args = { char[].class, int.class, int.class } - ) public void testCharacters() { try { h.characters("The quick brown fox".toCharArray(), 4, 11); @@ -145,11 +95,6 @@ public class HandlerBaseTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "ignorableWhitespace", - args = { char[].class, int.class, int.class } - ) public void testIgnorableWhitespace() { try { h.ignorableWhitespace(" ".toCharArray(), 4, 11); @@ -158,11 +103,6 @@ public class HandlerBaseTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "processingInstruction", - args = { String.class, String.class } - ) public void testProcessingInstruction() { try { h.processingInstruction("target", "data"); @@ -171,11 +111,6 @@ public class HandlerBaseTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "warning", - args = { org.xml.sax.SAXParseException.class } - ) public void testWarning() { try { h.warning(new SAXParseException("Foo", new LocatorImpl())); @@ -184,11 +119,6 @@ public class HandlerBaseTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "error", - args = { org.xml.sax.SAXParseException.class } - ) public void testError() { try { h.error(new SAXParseException("Foo", new LocatorImpl())); @@ -197,11 +127,6 @@ public class HandlerBaseTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "fatalError", - args = { org.xml.sax.SAXParseException.class } - ) public void testFatalError() { // Ordinary case try { diff --git a/luni/src/test/java/tests/api/org/xml/sax/InputSourceTest.java b/luni/src/test/java/tests/api/org/xml/sax/InputSourceTest.java index ccb807e..f9040f0 100644 --- a/luni/src/test/java/tests/api/org/xml/sax/InputSourceTest.java +++ b/luni/src/test/java/tests/api/org/xml/sax/InputSourceTest.java @@ -25,19 +25,8 @@ import junit.framework.TestCase; import org.xml.sax.InputSource; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; - -@TestTargetClass(InputSource.class) public class InputSourceTest extends TestCase { - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "InputSource", - args = { } - ) public void testInputSource() { InputSource i = new InputSource(); @@ -48,11 +37,6 @@ public class InputSourceTest extends TestCase { assertNull(i.getSystemId()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "InputSource", - args = { String.class } - ) public void testInputSourceString() { InputSource i = new InputSource("Foo"); @@ -63,11 +47,6 @@ public class InputSourceTest extends TestCase { assertEquals("Foo", i.getSystemId()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "InputSource", - args = { InputStream.class } - ) public void testInputSourceInputStream() { ByteArrayInputStream bais = new ByteArrayInputStream(new byte[0]); @@ -90,11 +69,6 @@ public class InputSourceTest extends TestCase { assertNull(i.getSystemId()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "InputSource", - args = { Reader.class } - ) public void testInputSourceReader() { StringReader sr = new StringReader("Hello, world."); @@ -117,18 +91,6 @@ public class InputSourceTest extends TestCase { assertNull(i.getSystemId()); } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "setPublicId", - args = { String.class } - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getPublicId", - args = { } - ) - }) public void testSetPublicIdGetPublicId() { InputSource i = new InputSource(); @@ -139,18 +101,6 @@ public class InputSourceTest extends TestCase { assertNull(i.getPublicId()); } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "setSystemId", - args = { String.class } - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getSystemId", - args = { } - ) - }) public void testSetSystemIdGetSystemId() { InputSource i = new InputSource(); @@ -161,18 +111,6 @@ public class InputSourceTest extends TestCase { assertNull(i.getSystemId()); } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "setByteStream", - args = { InputStream.class } - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getByteStream", - args = { } - ) - }) public void testSetByteStreamGetByteStream() { ByteArrayInputStream bais = new ByteArrayInputStream(new byte[0]); @@ -189,18 +127,6 @@ public class InputSourceTest extends TestCase { assertNull(i.getByteStream()); } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "setEncoding", - args = { String.class } - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getEncoding", - args = { } - ) - }) public void testSetEncodingGetEncoding() { InputSource i = new InputSource(); @@ -215,18 +141,6 @@ public class InputSourceTest extends TestCase { assertNull(i.getEncoding()); } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "setCharacterStream", - args = { Reader.class } - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getCharacterStream", - args = { } - ) - }) public void testSetCharacterStreamGetCharacterStream() { StringReader sr = new StringReader("Hello, world."); diff --git a/luni/src/test/java/tests/api/org/xml/sax/SAXExceptionTest.java b/luni/src/test/java/tests/api/org/xml/sax/SAXExceptionTest.java index 6d2eceb..11d00e7 100644 --- a/luni/src/test/java/tests/api/org/xml/sax/SAXExceptionTest.java +++ b/luni/src/test/java/tests/api/org/xml/sax/SAXExceptionTest.java @@ -21,20 +21,10 @@ import junit.framework.TestCase; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; - -@TestTargetClass(SAXException.class) public class SAXExceptionTest extends TestCase { public static final String ERR = "Houston, we have a problem"; - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "SAXException", - args = { } - ) public void testSAXParseException() { SAXException e = new SAXException(); @@ -42,11 +32,6 @@ public class SAXExceptionTest extends TestCase { assertNull(e.getException()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "SAXException", - args = { String.class, Exception.class } - ) public void testSAXException_String_Exception() { Exception c = new Exception(); @@ -69,11 +54,6 @@ public class SAXExceptionTest extends TestCase { assertNull(e.getException()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "SAXException", - args = { String.class } - ) public void testSAXException_String() { // Ordinary case SAXException e = new SAXException(ERR); @@ -88,11 +68,6 @@ public class SAXExceptionTest extends TestCase { assertNull(e.getException()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "SAXException", - args = { Exception.class } - ) public void testSAXException_Exception() { Exception c = new Exception(); @@ -109,11 +84,6 @@ public class SAXExceptionTest extends TestCase { assertNull(e.getException()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "toString", - args = { } - ) public void testToString() { // Ordinary case SAXException e = new SAXException(ERR); @@ -128,4 +98,4 @@ public class SAXExceptionTest extends TestCase { assertFalse(s.contains(ERR)); } -}
\ No newline at end of file +} diff --git a/luni/src/test/java/tests/api/org/xml/sax/SAXNotRecognizedExceptionTest.java b/luni/src/test/java/tests/api/org/xml/sax/SAXNotRecognizedExceptionTest.java index da86cc8..3c73b56 100644 --- a/luni/src/test/java/tests/api/org/xml/sax/SAXNotRecognizedExceptionTest.java +++ b/luni/src/test/java/tests/api/org/xml/sax/SAXNotRecognizedExceptionTest.java @@ -20,30 +20,15 @@ import junit.framework.TestCase; import org.xml.sax.SAXNotRecognizedException; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; - -@TestTargetClass(SAXNotRecognizedException.class) public class SAXNotRecognizedExceptionTest extends TestCase { public static final String ERR = "Houston, we have a problem"; - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "SAXNotRecognizedException", - args = { } - ) public void testSAXNotRecognizedException() { SAXNotRecognizedException e = new SAXNotRecognizedException(); assertNull(e.getMessage()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "SAXNotRecognizedException", - args = { String.class } - ) public void testSAXNotRecognizedException_String() { SAXNotRecognizedException e = new SAXNotRecognizedException(ERR); assertEquals(ERR, e.getMessage()); diff --git a/luni/src/test/java/tests/api/org/xml/sax/SAXNotSupportedExceptionTest.java b/luni/src/test/java/tests/api/org/xml/sax/SAXNotSupportedExceptionTest.java index c51d280..71ea455 100644 --- a/luni/src/test/java/tests/api/org/xml/sax/SAXNotSupportedExceptionTest.java +++ b/luni/src/test/java/tests/api/org/xml/sax/SAXNotSupportedExceptionTest.java @@ -16,34 +16,19 @@ package tests.api.org.xml.sax; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; - import junit.framework.TestCase; import org.xml.sax.SAXNotSupportedException; -@TestTargetClass(SAXNotSupportedException.class) public class SAXNotSupportedExceptionTest extends TestCase { public static final String ERR = "Houston, we have a problem"; - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "SAXNotSupportedException", - args = { } - ) public void testSAXNotSupportedException() { SAXNotSupportedException e = new SAXNotSupportedException(); assertNull(e.getMessage()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "SAXNotSupportedException", - args = { String.class } - ) public void testSAXNotSupportedException_String() { SAXNotSupportedException e = new SAXNotSupportedException(ERR); assertEquals(ERR, e.getMessage()); diff --git a/luni/src/test/java/tests/api/org/xml/sax/SAXParseExceptionTest.java b/luni/src/test/java/tests/api/org/xml/sax/SAXParseExceptionTest.java index 235c432..bfc48d4 100644 --- a/luni/src/test/java/tests/api/org/xml/sax/SAXParseExceptionTest.java +++ b/luni/src/test/java/tests/api/org/xml/sax/SAXParseExceptionTest.java @@ -22,12 +22,6 @@ import org.xml.sax.Locator; import org.xml.sax.SAXParseException; import org.xml.sax.helpers.LocatorImpl; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; - -@TestTargetClass(SAXParseException.class) public class SAXParseExceptionTest extends TestCase { public static final String ERR = "Houston, we have a problem"; @@ -40,43 +34,6 @@ public class SAXParseExceptionTest extends TestCase { public static final int COL = 2; - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "SAXParseException", - args = { String.class, Locator.class, Exception.class } - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getMessage", - args = { } - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getException", - args = { } - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getPublicId", - args = { } - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getSystemId", - args = { } - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getLineNumber", - args = { } - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getColumnNumber", - args = { } - ) - }) public void testSAXParseException_String_Locator_Exception() { LocatorImpl l = new LocatorImpl(); l.setPublicId(PUB); @@ -131,11 +88,6 @@ public class SAXParseExceptionTest extends TestCase { assertEquals(COL, e.getColumnNumber()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "SAXParseException", - args = { String.class, Locator.class } - ) public void testSAXParseException_String_Locator() { LocatorImpl l = new LocatorImpl(); l.setPublicId(PUB); @@ -178,12 +130,6 @@ public class SAXParseExceptionTest extends TestCase { } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "SAXParseException", - args = { String.class, String.class, String.class, int.class, int.class, - Exception.class } - ) public void testSAXParseException_String_String_String_int_int_Exception() { Exception c = new Exception(); @@ -232,12 +178,6 @@ public class SAXParseExceptionTest extends TestCase { assertEquals(COL, e.getColumnNumber()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "SAXParseException", - args = { String.class, String.class, String.class, int.class, - int.class } - ) public void testSAXParseException_String_String_String_int_int() { // Ordinary case SAXParseException e = new SAXParseException(ERR, PUB, SYS, ROW, COL); @@ -273,4 +213,4 @@ public class SAXParseExceptionTest extends TestCase { assertEquals(-1, e.getColumnNumber()); } -}
\ No newline at end of file +} diff --git a/luni/src/test/java/tests/api/org/xml/sax/ext/Attributes2ImplTest.java b/luni/src/test/java/tests/api/org/xml/sax/ext/Attributes2ImplTest.java index e236ba1..348bef5 100644 --- a/luni/src/test/java/tests/api/org/xml/sax/ext/Attributes2ImplTest.java +++ b/luni/src/test/java/tests/api/org/xml/sax/ext/Attributes2ImplTest.java @@ -22,12 +22,6 @@ import org.xml.sax.Attributes; import org.xml.sax.ext.Attributes2Impl; import org.xml.sax.helpers.AttributesImpl; -import dalvik.annotation.KnownFailure; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; - -@TestTargetClass(Attributes2Impl.class) public class Attributes2ImplTest extends TestCase { // Note: The original SAX2 implementation of Attributes2Impl is @@ -67,11 +61,6 @@ public class Attributes2ImplTest extends TestCase { "CDATA", "hey"); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "setAttributes", - args = { Attributes.class } - ) public void testSetAttributes() { // Ordinary case with Attributes2Impl Attributes2Impl attrs = new Attributes2Impl(); @@ -123,12 +112,6 @@ public class Attributes2ImplTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "addAttribute", - args = { String.class, String.class, String.class, String.class, - String.class } - ) public void testAddAttribute() { Attributes2Impl attrs = new Attributes2Impl(); @@ -163,11 +146,6 @@ public class Attributes2ImplTest extends TestCase { assertEquals(true, attrs.isSpecified(1)); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "removeAttribute", - args = { int.class } - ) public void testRemoveAttribute() { Attributes2Impl attrs = new Attributes2Impl(multi); @@ -208,20 +186,10 @@ public class Attributes2ImplTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "Attributes2Impl", - args = { } - ) public void testAttributes2Impl() { assertEquals(0, empty.getLength()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "Attributes2Impl", - args = { Attributes.class } - ) public void testAttributes2ImplAttributes() { // Ordinary case with Attributes2Impl Attributes2Impl attrs = new Attributes2Impl(multi); @@ -269,11 +237,6 @@ public class Attributes2ImplTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "isDeclared", - args = { int.class } - ) public void testIsDeclaredInt() { // Ordinary cases assertEquals(false, multi.isDeclared(0)); @@ -295,11 +258,6 @@ public class Attributes2ImplTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "isDeclared", - args = { String.class, String.class } - ) public void testIsDeclaredStringString() { // Ordinary cases assertEquals(false, multi.isDeclared("http://some.uri", "foo")); @@ -314,11 +272,6 @@ public class Attributes2ImplTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "isDeclared", - args = { String.class } - ) public void testIsDeclaredString() { // Ordinary cases assertEquals(false, multi.isDeclared("ns1:foo")); @@ -333,11 +286,6 @@ public class Attributes2ImplTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "isSpecified", - args = { int.class } - ) public void testIsSpecifiedInt() { // Ordinary cases assertEquals(false, multi.isSpecified(1)); @@ -359,11 +307,6 @@ public class Attributes2ImplTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "isSpecified", - args = { String.class, String.class } - ) public void testIsSpecifiedStringString() { // Ordinary cases assertEquals(false, multi.isSpecified("http://some.uri", "bar")); @@ -378,11 +321,6 @@ public class Attributes2ImplTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "isSpecified", - args = { String.class } - ) public void testIsSpecifiedString() { // Ordinary cases assertEquals(false, multi.isSpecified("ns1:bar")); @@ -397,11 +335,6 @@ public class Attributes2ImplTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "setDeclared", - args = { int.class, boolean.class } - ) public void testSetDeclared() { // Ordinary cases multi.setSpecified(0, false); @@ -429,11 +362,6 @@ public class Attributes2ImplTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "setSpecified", - args = { int.class, boolean.class } - ) public void testSetSpecified() { // Ordinary cases multi.setSpecified(0, false); diff --git a/luni/src/test/java/tests/api/org/xml/sax/ext/DefaultHandler2Test.java b/luni/src/test/java/tests/api/org/xml/sax/ext/DefaultHandler2Test.java index e8ee71b..0e6c245 100644 --- a/luni/src/test/java/tests/api/org/xml/sax/ext/DefaultHandler2Test.java +++ b/luni/src/test/java/tests/api/org/xml/sax/ext/DefaultHandler2Test.java @@ -16,10 +16,6 @@ package tests.api.org.xml.sax.ext; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; - import junit.framework.TestCase; import org.xml.sax.SAXException; @@ -27,25 +23,14 @@ import org.xml.sax.ext.DefaultHandler2; import java.io.IOException; -@TestTargetClass(DefaultHandler2.class) public class DefaultHandler2Test extends TestCase { private DefaultHandler2 h = new DefaultHandler2(); - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "DefaultHandler2", - args = { } - ) public void testDefaultHandler2() { new DefaultHandler2(); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "startCDATA", - args = { } - ) public void testStartCDATA() { try { h.startCDATA(); @@ -54,11 +39,6 @@ public class DefaultHandler2Test extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "endCDATA", - args = { } - ) public void testEndCDATA() { try { h.endCDATA(); @@ -67,11 +47,6 @@ public class DefaultHandler2Test extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "startDTD", - args = { String.class, String.class, String.class } - ) public void testStartDTD() { try { h.startDTD("name", "publicId", "systemId"); @@ -80,11 +55,6 @@ public class DefaultHandler2Test extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "endDTD", - args = { } - ) public void testEndDTD() { try { h.endDTD(); @@ -93,11 +63,6 @@ public class DefaultHandler2Test extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "startEntity", - args = { String.class } - ) public void testStartEntity() { try { h.startEntity("name"); @@ -106,11 +71,6 @@ public class DefaultHandler2Test extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "endEntity", - args = { String.class } - ) public void testEndEntity() { try { h.endEntity("name"); @@ -119,11 +79,6 @@ public class DefaultHandler2Test extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "comment", - args = { char[].class, int.class, int.class } - ) public void testComment() { try { h.comment("<!-- Comment -->".toCharArray(), 0, 15); @@ -132,12 +87,6 @@ public class DefaultHandler2Test extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "attributeDecl", - args = { String.class, String.class, String.class, String.class, - String.class } - ) public void testAttributeDecl() { try { h.attributeDecl("eName", "aName", "type", "mode", "value"); @@ -146,11 +95,6 @@ public class DefaultHandler2Test extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "elementDecl", - args = { String.class, String.class } - ) public void testElementDecl() { try { h.elementDecl("name", "model"); @@ -159,11 +103,6 @@ public class DefaultHandler2Test extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "externalEntityDecl", - args = { String.class, String.class, String.class } - ) public void testExternalEntityDecl() { try { h.externalEntityDecl("name", "publicId", "systemId"); @@ -172,11 +111,6 @@ public class DefaultHandler2Test extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "internalEntityDecl", - args = { String.class, String.class } - ) public void testInternalEntityDecl() { try { h.internalEntityDecl("name", "value"); @@ -185,11 +119,6 @@ public class DefaultHandler2Test extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getExternalSubset", - args = { String.class, String.class } - ) public void testGetExternalSubset() { try { assertNull(h.getExternalSubset("name", "http://some.uri")); @@ -200,11 +129,6 @@ public class DefaultHandler2Test extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "resolveEntity", - args = { String.class, String.class } - ) public void testResolveEntityStringString() { try { assertNull(h.resolveEntity("publicId", "systemId")); @@ -215,11 +139,6 @@ public class DefaultHandler2Test extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "resolveEntity", - args = { String.class, String.class, String.class, String.class } - ) public void testResolveEntityStringStringStringString() { try { assertNull(h.resolveEntity("name", "publicId", "http://some.uri", diff --git a/luni/src/test/java/tests/api/org/xml/sax/ext/Locator2ImplTest.java b/luni/src/test/java/tests/api/org/xml/sax/ext/Locator2ImplTest.java index c696a26..dbed1de 100644 --- a/luni/src/test/java/tests/api/org/xml/sax/ext/Locator2ImplTest.java +++ b/luni/src/test/java/tests/api/org/xml/sax/ext/Locator2ImplTest.java @@ -16,18 +16,12 @@ package tests.api.org.xml.sax.ext; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; - import junit.framework.TestCase; import org.xml.sax.Locator; import org.xml.sax.ext.Locator2Impl; import org.xml.sax.helpers.LocatorImpl; -@TestTargetClass(Locator2Impl.class) public class Locator2ImplTest extends TestCase { public static final String SYS = "mySystemID"; @@ -42,11 +36,6 @@ public class Locator2ImplTest extends TestCase { public static final String XML = "1.0"; - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "Locator2Impl", - args = { } - ) public void testLocatorImpl() { Locator2Impl l = new Locator2Impl(); @@ -59,11 +48,6 @@ public class Locator2ImplTest extends TestCase { assertEquals(null, l.getXMLVersion()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "Locator2Impl", - args = { Locator.class } - ) public void testLocatorImplLocator() { Locator2Impl inner = new Locator2Impl(); @@ -106,18 +90,6 @@ public class Locator2ImplTest extends TestCase { } } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "setXMLVersion", - args = { String.class } - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getXMLVersion", - args = { } - ) - }) public void testSetXMLVersionGetXMLVersion() { Locator2Impl l = new Locator2Impl(); @@ -128,18 +100,6 @@ public class Locator2ImplTest extends TestCase { assertEquals(null, l.getXMLVersion()); } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "setEncoding", - args = { String.class } - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getEncoding", - args = { } - ) - }) public void testSetEncodingGetEncoding() { Locator2Impl l = new Locator2Impl(); diff --git a/luni/src/test/java/tests/api/org/xml/sax/helpers/AttributeListImplTest.java b/luni/src/test/java/tests/api/org/xml/sax/helpers/AttributeListImplTest.java index c091225..27f36ae 100644 --- a/luni/src/test/java/tests/api/org/xml/sax/helpers/AttributeListImplTest.java +++ b/luni/src/test/java/tests/api/org/xml/sax/helpers/AttributeListImplTest.java @@ -21,12 +21,7 @@ import junit.framework.TestCase; import org.xml.sax.AttributeList; import org.xml.sax.helpers.AttributeListImpl; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; - @SuppressWarnings("deprecation") -@TestTargetClass(AttributeListImpl.class) public class AttributeListImplTest extends TestCase { private AttributeListImpl empty = new AttributeListImpl(); @@ -40,21 +35,11 @@ public class AttributeListImplTest extends TestCase { multi.addAttribute("answer", "int", "42"); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "AttributeListImpl", - args = { } - ) public void testAttributeListImpl() { assertEquals(0, empty.getLength()); assertEquals(3, multi.getLength()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "AttributeListImpl", - args = { AttributeList.class } - ) public void testAttributeListImplAttributeList() { // Ordinary case AttributeListImpl ai = new AttributeListImpl(empty); @@ -74,11 +59,6 @@ public class AttributeListImplTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "setAttributeList", - args = { AttributeList.class } - ) public void testSetAttributeList() { // Ordinary cases AttributeListImpl attrs = new AttributeListImpl(); @@ -106,11 +86,6 @@ public class AttributeListImplTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "addAttribute", - args = { String.class, String.class, String.class } - ) public void testAddAttribute() { // Ordinary case multi.addAttribute("doe", "boolean", "false"); @@ -133,11 +108,6 @@ public class AttributeListImplTest extends TestCase { assertEquals(null, multi.getValue(5)); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "removeAttribute", - args = { String.class } - ) public void testRemoveAttribute() { // Ordinary case multi.removeAttribute("foo"); @@ -154,22 +124,12 @@ public class AttributeListImplTest extends TestCase { assertEquals(2, multi.getLength()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "clear", - args = { } - ) public void testClear() { assertEquals(3, multi.getLength()); multi.clear(); assertEquals(0, multi.getLength()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getLength", - args = { } - ) public void testGetLength() { AttributeListImpl ai = new AttributeListImpl(empty); assertEquals(0, ai.getLength()); @@ -183,11 +143,6 @@ public class AttributeListImplTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getName", - args = { int.class } - ) public void testGetName() { // Ordinary cases assertEquals("foo", multi.getName(0)); @@ -199,11 +154,6 @@ public class AttributeListImplTest extends TestCase { assertEquals(null, multi.getName(3)); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getType", - args = { int.class } - ) public void testGetTypeInt() { // Ordinary cases assertEquals("string", multi.getType(0)); @@ -215,11 +165,6 @@ public class AttributeListImplTest extends TestCase { assertEquals(null, multi.getType(3)); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getValue", - args = { int.class } - ) public void testGetValueInt() { // Ordinary cases assertEquals("abc", multi.getValue(0)); @@ -231,11 +176,6 @@ public class AttributeListImplTest extends TestCase { assertEquals(null, multi.getValue(5)); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getType", - args = { String.class } - ) public void testGetTypeString() { // Ordinary cases assertEquals("string", multi.getType("foo")); @@ -249,11 +189,6 @@ public class AttributeListImplTest extends TestCase { assertEquals(null, multi.getType(null)); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getValue", - args = { String.class } - ) public void testGetValueString() { // Ordinary cases assertEquals("abc", multi.getValue("foo")); diff --git a/luni/src/test/java/tests/api/org/xml/sax/helpers/AttributesImplTest.java b/luni/src/test/java/tests/api/org/xml/sax/helpers/AttributesImplTest.java index 409d52b..1cc77ee 100644 --- a/luni/src/test/java/tests/api/org/xml/sax/helpers/AttributesImplTest.java +++ b/luni/src/test/java/tests/api/org/xml/sax/helpers/AttributesImplTest.java @@ -21,11 +21,6 @@ import junit.framework.TestCase; import org.xml.sax.Attributes; import org.xml.sax.helpers.AttributesImpl; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; - -@TestTargetClass(AttributesImpl.class) public class AttributesImplTest extends TestCase { private AttributesImpl empty = new AttributesImpl(); @@ -45,21 +40,11 @@ public class AttributesImplTest extends TestCase { multi.addAttribute("", "", "gabba:hey", "string", "1-2-3-4"); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "AttributesImpl", - args = { } - ) public void testAttributesImpl() { assertEquals(0, empty.getLength()); assertEquals(5, multi.getLength()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "AttributesImpl", - args = { Attributes.class } - ) public void testAttributesImplAttributes() { // Ordinary case AttributesImpl ai = new AttributesImpl(empty); @@ -79,11 +64,6 @@ public class AttributesImplTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getLength", - args = { } - ) public void testGetLength() { AttributesImpl ai = new AttributesImpl(empty); assertEquals(0, ai.getLength()); @@ -97,11 +77,6 @@ public class AttributesImplTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getURI", - args = { int.class } - ) public void testGetURI() { // Ordinary cases assertEquals("http://some.uri", multi.getURI(0)); @@ -115,11 +90,6 @@ public class AttributesImplTest extends TestCase { assertEquals(null, multi.getURI(5)); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getLocalName", - args = { int.class } - ) public void testGetLocalName() { // Ordinary cases assertEquals("foo", multi.getLocalName(0)); @@ -133,11 +103,6 @@ public class AttributesImplTest extends TestCase { assertEquals(null, multi.getLocalName(5)); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getQName", - args = { int.class } - ) public void testGetQName() { // Ordinary cases assertEquals("ns1:foo", multi.getQName(0)); @@ -151,11 +116,6 @@ public class AttributesImplTest extends TestCase { assertEquals(null, multi.getQName(5)); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getType", - args = { int.class } - ) public void testGetTypeInt() { // Ordinary cases assertEquals("string", multi.getType(0)); @@ -169,11 +129,6 @@ public class AttributesImplTest extends TestCase { assertEquals(null, multi.getType(5)); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getValue", - args = { int.class } - ) public void testGetValueInt() { // Ordinary cases assertEquals("abc", multi.getValue(0)); @@ -187,11 +142,6 @@ public class AttributesImplTest extends TestCase { assertEquals(null, multi.getValue(5)); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getIndex", - args = { String.class, String.class } - ) public void testGetIndexStringString() { // Ordinary cases assertEquals(0, multi.getIndex("http://some.uri", "foo")); @@ -206,11 +156,6 @@ public class AttributesImplTest extends TestCase { assertEquals(-1, multi.getIndex(null, "foo")); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getIndex", - args = { String.class } - ) public void testGetIndexString() { // Ordinary cases assertEquals(0, multi.getIndex("ns1:foo")); @@ -225,11 +170,6 @@ public class AttributesImplTest extends TestCase { assertEquals(-1, multi.getIndex(null)); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getType", - args = { String.class, String.class } - ) public void testGetTypeStringString() { // Ordinary cases assertEquals("string", multi.getType("http://some.uri", "foo")); @@ -244,11 +184,6 @@ public class AttributesImplTest extends TestCase { assertEquals(null, multi.getType(null, "foo")); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getType", - args = { String.class } - ) public void testGetTypeString() { // Ordinary cases assertEquals("string", multi.getType("ns1:foo")); @@ -263,11 +198,6 @@ public class AttributesImplTest extends TestCase { assertEquals(null, multi.getType(null)); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getValue", - args = { String.class, String.class } - ) public void testGetValueStringString() { // Ordinary cases assertEquals("abc", multi.getValue("http://some.uri", "foo")); @@ -282,11 +212,6 @@ public class AttributesImplTest extends TestCase { assertEquals(null, multi.getValue(null, "foo")); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getValue", - args = { String.class } - ) public void testGetValueString() { // Ordinary cases assertEquals("abc", multi.getValue("ns1:foo")); @@ -301,22 +226,12 @@ public class AttributesImplTest extends TestCase { assertEquals(null, multi.getValue(null)); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "clear", - args = { } - ) public void testClear() { assertEquals(5, multi.getLength()); multi.clear(); assertEquals(0, multi.getLength()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "setAttributes", - args = { Attributes.class } - ) public void testSetAttributes() { // Ordinary cases AttributesImpl attrs = new AttributesImpl(); @@ -347,12 +262,6 @@ public class AttributesImplTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "addAttribute", - args = { String.class, String.class, String.class, String.class, - String.class } - ) public void testAddAttribute() { // Ordinary case multi.addAttribute("http://yet.another.uri", "doe", "john:doe", @@ -383,12 +292,6 @@ public class AttributesImplTest extends TestCase { assertEquals(null, multi.getValue(7)); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "setAttribute", - args = { int.class, String.class, String.class, String.class, - String.class, String.class } - ) public void testSetAttribute() { // Ordinary case multi.setAttribute(0, "http://yet.another.uri", "doe", "john:doe", @@ -425,11 +328,6 @@ public class AttributesImplTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "removeAttribute", - args = { int.class } - ) public void testRemoveAttribute() { // Ordinary case multi.removeAttribute(0); @@ -455,11 +353,6 @@ public class AttributesImplTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "setURI", - args = { int.class, String.class } - ) public void testSetURI() { // Ordinary case multi.setURI(0, "http://yet.another.uri"); @@ -485,11 +378,6 @@ public class AttributesImplTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "setLocalName", - args = { int.class, String.class } - ) public void testSetLocalName() { // Ordinary case multi.setLocalName(0, "john"); @@ -515,11 +403,6 @@ public class AttributesImplTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "setQName", - args = { int.class, String.class } - ) public void testSetQName() { // Ordinary case multi.setQName(0, "john:doe"); @@ -545,11 +428,6 @@ public class AttributesImplTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "setType", - args = { int.class, String.class } - ) public void testSetType() { // Ordinary case multi.setType(0, "float"); @@ -575,11 +453,6 @@ public class AttributesImplTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "setValue", - args = { int.class, String.class } - ) public void testSetValue() { // Ordinary case multi.setValue(0, "too much"); diff --git a/luni/src/test/java/tests/api/org/xml/sax/helpers/DefaultHandlerTest.java b/luni/src/test/java/tests/api/org/xml/sax/helpers/DefaultHandlerTest.java index 7cc0e70..a9530f2 100644 --- a/luni/src/test/java/tests/api/org/xml/sax/helpers/DefaultHandlerTest.java +++ b/luni/src/test/java/tests/api/org/xml/sax/helpers/DefaultHandlerTest.java @@ -16,10 +16,6 @@ package tests.api.org.xml.sax.helpers; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; - import junit.framework.TestCase; import org.xml.sax.Attributes; @@ -31,7 +27,6 @@ import org.xml.sax.helpers.LocatorImpl; import java.io.IOException; -@TestTargetClass(DefaultHandler.class) public class DefaultHandlerTest extends TestCase { /* @@ -41,11 +36,6 @@ public class DefaultHandlerTest extends TestCase { private DefaultHandler h = new DefaultHandler(); - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "resolveEntity", - args = { String.class, String.class } - ) public void testResolveEntity() { try { h.resolveEntity("publicID", "systemID"); @@ -56,11 +46,6 @@ public class DefaultHandlerTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "notationDecl", - args = { String.class, String.class, String.class } - ) public void testNotationDecl() { try { h.notationDecl("name", "publicID", "systemID"); @@ -69,11 +54,6 @@ public class DefaultHandlerTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "unparsedEntityDecl", - args = { String.class, String.class, String.class, String.class } - ) public void testUnparsedEntityDecl() { try { h.unparsedEntityDecl("name", "publicID", "systemID", @@ -83,20 +63,10 @@ public class DefaultHandlerTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "setDocumentLocator", - args = { org.xml.sax.Locator.class } - ) public void testSetDocumentLocator() { h.setDocumentLocator(new LocatorImpl()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "startDocument", - args = { } - ) public void testStartDocument() { try { h.startDocument(); @@ -105,11 +75,6 @@ public class DefaultHandlerTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "endDocument", - args = { } - ) public void testEndDocument() { try { h.endDocument(); @@ -118,11 +83,6 @@ public class DefaultHandlerTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "startPrefixMapping", - args = { String.class, String.class } - ) public void testStartPrefixMapping() { try { h.startPrefixMapping("prefix", "uri"); @@ -131,11 +91,6 @@ public class DefaultHandlerTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "endPrefixMapping", - args = { String.class } - ) public void testEndPrefixMapping() { try { h.endPrefixMapping("prefix"); @@ -144,12 +99,6 @@ public class DefaultHandlerTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "startElement", - args = { String.class, String.class, String.class, - Attributes.class } - ) public void testStartElement() { try { h.startElement("uri", "name", "qname", new AttributesImpl()); @@ -158,11 +107,6 @@ public class DefaultHandlerTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "endElement", - args = { String.class, String.class, String.class } - ) public void testEndElement() { try { h.endElement("uri", "name", "qname"); @@ -171,11 +115,6 @@ public class DefaultHandlerTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "characters", - args = { char[].class, int.class, int.class } - ) public void testCharacters() { try { h.characters("The quick brown fox".toCharArray(), 4, 11); @@ -184,11 +123,6 @@ public class DefaultHandlerTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "ignorableWhitespace", - args = { char[].class, int.class, int.class } - ) public void testIgnorableWhitespace() { try { h.ignorableWhitespace(" ".toCharArray(), 4, 11); @@ -197,11 +131,6 @@ public class DefaultHandlerTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "processingInstruction", - args = { String.class, String.class } - ) public void testProcessingInstruction() { try { h.processingInstruction("target", "data"); @@ -210,11 +139,6 @@ public class DefaultHandlerTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "skippedEntity", - args = { String.class } - ) public void testSkippedEntity() { try { h.skippedEntity("name"); @@ -223,11 +147,6 @@ public class DefaultHandlerTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "warning", - args = { org.xml.sax.SAXParseException.class } - ) public void testWarning() { try { h.warning(new SAXParseException("Foo", new LocatorImpl())); @@ -236,11 +155,6 @@ public class DefaultHandlerTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "error", - args = { org.xml.sax.SAXParseException.class } - ) public void testError() { try { h.error(new SAXParseException("Foo", new LocatorImpl())); @@ -249,11 +163,6 @@ public class DefaultHandlerTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "fatalError", - args = { org.xml.sax.SAXParseException.class } - ) public void testFatalError() { // Ordinary case try { diff --git a/luni/src/test/java/tests/api/org/xml/sax/helpers/LocatorImplTest.java b/luni/src/test/java/tests/api/org/xml/sax/helpers/LocatorImplTest.java index 40dab3f..8aa9c11 100644 --- a/luni/src/test/java/tests/api/org/xml/sax/helpers/LocatorImplTest.java +++ b/luni/src/test/java/tests/api/org/xml/sax/helpers/LocatorImplTest.java @@ -21,12 +21,6 @@ import junit.framework.TestCase; import org.xml.sax.Locator; import org.xml.sax.helpers.LocatorImpl; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; - -@TestTargetClass(LocatorImpl.class) public class LocatorImplTest extends TestCase { public static final String SYS = "mySystemID"; @@ -37,11 +31,6 @@ public class LocatorImplTest extends TestCase { public static final int COL = 2; - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "LocatorImpl", - args = { } - ) public void testLocatorImpl() { LocatorImpl l = new LocatorImpl(); @@ -51,11 +40,6 @@ public class LocatorImplTest extends TestCase { assertEquals(0, l.getColumnNumber()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "LocatorImpl", - args = { Locator.class } - ) public void testLocatorImplLocator() { LocatorImpl inner = new LocatorImpl(); @@ -81,18 +65,6 @@ public class LocatorImplTest extends TestCase { } } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "setPublicId", - args = { String.class } - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getPublicId", - args = { } - ) - }) public void testSetPublicIdGetPublicId() { LocatorImpl l = new LocatorImpl(); @@ -103,18 +75,6 @@ public class LocatorImplTest extends TestCase { assertEquals(null, l.getPublicId()); } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "setSystemId", - args = { String.class } - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getSystemId", - args = { } - ) - }) public void testSetSystemIdGetSystemId() { LocatorImpl l = new LocatorImpl(); @@ -125,18 +85,6 @@ public class LocatorImplTest extends TestCase { assertEquals(null, l.getSystemId()); } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "setLineNumber", - args = { int.class } - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getLineNumber", - args = { } - ) - }) public void testSetLineNumberGetLineNumber() { LocatorImpl l = new LocatorImpl(); @@ -147,18 +95,6 @@ public class LocatorImplTest extends TestCase { assertEquals(0, l.getLineNumber()); } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "setColumnNumber", - args = { int.class } - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getColumnNumber", - args = { } - ) - }) public void testSetColumnNumberGetColumnNumber() { LocatorImpl l = new LocatorImpl(); diff --git a/luni/src/test/java/tests/api/org/xml/sax/helpers/NamespaceSupportTest.java b/luni/src/test/java/tests/api/org/xml/sax/helpers/NamespaceSupportTest.java index 8cb8834..2f1ff8d 100644 --- a/luni/src/test/java/tests/api/org/xml/sax/helpers/NamespaceSupportTest.java +++ b/luni/src/test/java/tests/api/org/xml/sax/helpers/NamespaceSupportTest.java @@ -25,16 +25,6 @@ import junit.framework.TestCase; import org.xml.sax.helpers.NamespaceSupport; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; - -@TestTargetClass( - value = NamespaceSupport.class, - untestedMethods = { - } -) public class NamespaceSupportTest extends TestCase { final static String defaultUri = "http://www.android.com"; @@ -58,20 +48,6 @@ public class NamespaceSupportTest extends TestCase { } @SuppressWarnings("unchecked") - @TestTargets ({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Checks that a new NamespaceSupport object contains a " + - "default context with two predefined prefixes.", - method = "NamespaceSupport", - args = {} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - method = "popContext", - args = {} - ) - }) public void testConstructor() { String prefix; boolean xmlPrefixExists = false; @@ -95,18 +71,6 @@ public class NamespaceSupportTest extends TestCase { } } - @TestTargets ({ - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "pushContext", - args = {} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - method = "popContext", - args = {} - ) - }) public void testPush_PopContext() { int count; @@ -131,18 +95,6 @@ public class NamespaceSupportTest extends TestCase { } } - @TestTargets ({ - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "reset", - args = {} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - method = "popContext", - args = {} - ) - }) public void testReset() { int count; @@ -168,18 +120,6 @@ public class NamespaceSupportTest extends TestCase { } } - @TestTargets ({ - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "declarePrefix", - args = {String.class, String.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getPrefix", - args = {String.class} - ) - }) public void testDeclare_GetPrefix() { ns.pushContext(); @@ -217,11 +157,6 @@ public class NamespaceSupportTest extends TestCase { } @SuppressWarnings("unchecked") - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getPrefixes", - args = {String.class} - ) public void testGetPrefixesLjava_lang_String() { ArrayList<String> prefixes; @@ -243,11 +178,6 @@ public class NamespaceSupportTest extends TestCase { } @SuppressWarnings("unchecked") - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getPrefixes", - args = {} - ) public void testGetPrefixes() { ArrayList<String> prefixes; @@ -259,11 +189,6 @@ public class NamespaceSupportTest extends TestCase { } @SuppressWarnings("unchecked") - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getDeclaredPrefixes", - args = {} - ) public void testGetDeclaredPrefixes() { ArrayList<String> prefixes; @@ -274,18 +199,6 @@ public class NamespaceSupportTest extends TestCase { expected.containsAll(prefixes) && prefixes.containsAll(expected)); } - @TestTargets ({ - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getURI", - args = {String.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - method = "popContext", - args = {} - ) - }) public void testGetUri() { assertEquals("Test 1: Incorrect URI returned;", marketUri, ns.getURI("bk")); @@ -301,18 +214,6 @@ public class NamespaceSupportTest extends TestCase { NamespaceSupport.XMLNS, ns.getURI("xml")); } - @TestTargets ({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - method = "setNamespaceDeclUris", - args = {boolean.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "isNamespaceDeclUris", - args = {} - ) - }) public void testNamespaceDeclUris() { assertFalse("Test 1: Incorrect default value returned by isNamespaceDeclUris().", @@ -335,11 +236,6 @@ public class NamespaceSupportTest extends TestCase { ns.isNamespaceDeclUris()); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - method = "processName", - args = {String.class, String[].class, boolean.class} - ) public void testProcessName_Element() { String[] parts = new String[3]; @@ -376,18 +272,6 @@ public class NamespaceSupportTest extends TestCase { assertEquals("Test 18: Incorrect raw name;", "world", parts[2]); } - @TestTargets ({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - method = "setNamespaceDeclUris", - args = {boolean.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - method = "processName", - args = {String.class, String[].class, boolean.class} - ) - }) public void testProcessName_Attribute() { String[] parts = new String[3]; diff --git a/luni/src/test/java/tests/api/org/xml/sax/helpers/ParserAdapterTest.java b/luni/src/test/java/tests/api/org/xml/sax/helpers/ParserAdapterTest.java index c8fa52e..2344736 100644 --- a/luni/src/test/java/tests/api/org/xml/sax/helpers/ParserAdapterTest.java +++ b/luni/src/test/java/tests/api/org/xml/sax/helpers/ParserAdapterTest.java @@ -40,13 +40,8 @@ import tests.api.org.xml.sax.support.MethodLogger; import tests.api.org.xml.sax.support.MockHandler; import tests.api.org.xml.sax.support.MockParser; import tests.api.org.xml.sax.support.MockResolver; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; @SuppressWarnings("deprecation") -@TestTargetClass(ParserAdapter.class) public class ParserAdapterTest extends TestCase { // Note: In many cases we can only test that delegation works @@ -88,11 +83,6 @@ public class ParserAdapterTest extends TestCase { super.tearDown(); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "ParserAdapter", - args = { } - ) public void testParserAdapter() { System.setProperty("org.xml.sax.parser", "tests.api.org.xml.sax.support.DoNothingParser"); @@ -104,11 +94,6 @@ public class ParserAdapterTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "ParserAdapter", - args = { Parser.class } - ) public void testParserAdapterParser() { // Ordinary case @SuppressWarnings("unused") @@ -123,18 +108,6 @@ public class ParserAdapterTest extends TestCase { } } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getFeature", - args = { String.class } - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "setFeature", - args = { String.class, boolean.class } - ) - }) public void testGetSetFeature() { String[] features = new String[] { NAMESPACES, NAMESPACE_PREFIXES, XMLNS_URIs }; @@ -161,18 +134,6 @@ public class ParserAdapterTest extends TestCase { } } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getProperty", - args = { String.class } - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "setProperty", - args = { String.class, Object.class } - ) - }) public void testGetSetProperty() { try { adapter.setProperty("http://argle.bargle", ":)"); @@ -193,18 +154,6 @@ public class ParserAdapterTest extends TestCase { } } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getEntityResolver", - args = { } - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "setEntityResolver", - args = { EntityResolver.class } - ) - }) public void testGetSetEntityResolver() { EntityResolver resolver = new MockResolver(); @@ -215,18 +164,6 @@ public class ParserAdapterTest extends TestCase { assertEquals(null, adapter.getEntityResolver()); } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getDTDHandler", - args = { } - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "setDTDHandler", - args = { DTDHandler.class } - ) - }) public void testGetSetDTDHandler() { adapter.setDTDHandler(null); assertEquals(null, adapter.getDTDHandler()); @@ -235,18 +172,6 @@ public class ParserAdapterTest extends TestCase { assertEquals(handler, adapter.getDTDHandler()); } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getContentHandler", - args = { } - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "setContentHandler", - args = { ContentHandler.class } - ) - }) public void testGetSetContentHandler() { adapter.setContentHandler(null); assertEquals(null, adapter.getContentHandler()); @@ -255,18 +180,6 @@ public class ParserAdapterTest extends TestCase { assertEquals(handler, adapter.getContentHandler()); } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getErrorHandler", - args = { } - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "setErrorHandler", - args = { ErrorHandler.class } - ) - }) public void testGetSetErrorHandler() { adapter.setErrorHandler(null); assertEquals(null, adapter.getErrorHandler()); @@ -275,11 +188,6 @@ public class ParserAdapterTest extends TestCase { assertEquals(handler, adapter.getErrorHandler()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "parse", - args = { String.class } - ) public void testParseString() { try { adapter.parse("foo"); @@ -295,11 +203,6 @@ public class ParserAdapterTest extends TestCase { assertEquals(InputSource.class, logger.getArgs()[0].getClass()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "parse", - args = { InputSource.class } - ) public void testParseInputSource() { InputSource source = new InputSource("foo"); @@ -315,11 +218,6 @@ public class ParserAdapterTest extends TestCase { assertEquals(new Object[] { source }, logger.getArgs()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "setDocumentLocator", - args = { Locator.class } - ) public void testSetDocumentLocator() { Locator l = new LocatorImpl(); @@ -336,11 +234,6 @@ public class ParserAdapterTest extends TestCase { assertEquals(new Object[] { null }, logger.getArgs()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "startDocument", - args = { } - ) public void testStartDocument() { try { adapter.startDocument(); @@ -353,11 +246,6 @@ public class ParserAdapterTest extends TestCase { assertEquals(new Object[] {}, logger.getArgs()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "endDocument", - args = { } - ) public void testEndDocument() { try { adapter.endDocument(); @@ -370,11 +258,6 @@ public class ParserAdapterTest extends TestCase { assertEquals(new Object[] {}, logger.getArgs()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "startElement", - args = { String.class, AttributeList.class } - ) public void testStartElement() { AttributeListImpl atts = new AttributeListImpl(); atts.addAttribute("john:doe", "int", "42"); @@ -393,11 +276,6 @@ public class ParserAdapterTest extends TestCase { assertEquals("john:doe", ((Attributes)logger.getArgs()[3]).getQName(0)); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "endElement", - args = { String.class } - ) public void testEndElement() { AttributeListImpl atts = new AttributeListImpl(); atts.addAttribute("john:doe", "int", "42"); @@ -414,11 +292,6 @@ public class ParserAdapterTest extends TestCase { assertEquals(new String[] { "", "", "foo:bar" }, logger.getArgs()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "characters", - args = { char[].class, int.class, int.class } - ) public void testCharacters() { char[] ch = "Android".toCharArray(); @@ -433,11 +306,6 @@ public class ParserAdapterTest extends TestCase { assertEquals(new Object[] { ch, 2, 5 }, logger.getArgs()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "ignorableWhitespace", - args = { char[].class, int.class, int.class } - ) public void testIgnorableWhitespace() { char[] ch = " ".toCharArray(); @@ -452,11 +320,6 @@ public class ParserAdapterTest extends TestCase { assertEquals(new Object[] { ch, 0, 5 }, logger.getArgs()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "processingInstruction", - args = { String.class, String.class } - ) public void testProcessingInstruction() { try { adapter.processingInstruction("foo", "bar"); diff --git a/luni/src/test/java/tests/api/org/xml/sax/helpers/ParserFactoryTest.java b/luni/src/test/java/tests/api/org/xml/sax/helpers/ParserFactoryTest.java index c3897ba..b59ce50 100644 --- a/luni/src/test/java/tests/api/org/xml/sax/helpers/ParserFactoryTest.java +++ b/luni/src/test/java/tests/api/org/xml/sax/helpers/ParserFactoryTest.java @@ -16,28 +16,17 @@ package tests.api.org.xml.sax.helpers; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; - import junit.framework.TestCase; import org.xml.sax.helpers.ParserFactory; @SuppressWarnings("deprecation") -@TestTargetClass(ParserFactory.class) public class ParserFactoryTest extends TestCase { @Override protected void tearDown() throws Exception { super.tearDown(); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "makeParser", - args = { }, - notes = "Checks everything except META-INF case" - ) public void testMakeParser() throws ClassNotFoundException, IllegalAccessException, InstantiationException { @@ -102,11 +91,6 @@ public class ParserFactoryTest extends TestCase { } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "makeParser", - args = { String.class } - ) public void testMakeParserString() throws ClassNotFoundException, IllegalAccessException, InstantiationException { // No class diff --git a/luni/src/test/java/tests/api/org/xml/sax/helpers/XMLFilterImplTest.java b/luni/src/test/java/tests/api/org/xml/sax/helpers/XMLFilterImplTest.java index 1d98f72..d00879b 100644 --- a/luni/src/test/java/tests/api/org/xml/sax/helpers/XMLFilterImplTest.java +++ b/luni/src/test/java/tests/api/org/xml/sax/helpers/XMLFilterImplTest.java @@ -40,12 +40,7 @@ import tests.api.org.xml.sax.support.MethodLogger; import tests.api.org.xml.sax.support.MockFilter; import tests.api.org.xml.sax.support.MockHandler; import tests.api.org.xml.sax.support.MockResolver; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; -@TestTargetClass(XMLFilterImpl.class) public class XMLFilterImplTest extends TestCase { // Note: In many cases we can only test that delegation works @@ -79,20 +74,10 @@ public class XMLFilterImplTest extends TestCase { child.setErrorHandler(handler); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "XMLFilterImpl", - args = { } - ) public void testXMLFilterImpl() { assertEquals(null, parent.getParent()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "XMLFilterImpl", - args = { XMLReader.class } - ) public void testXMLFilterImplXMLReader() { // Ordinary case assertEquals(null, parent.getParent()); @@ -102,18 +87,6 @@ public class XMLFilterImplTest extends TestCase { assertEquals(null, filter.getParent()); } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getParent", - args = { } - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "setParent", - args = { XMLReader.class } - ) - }) public void testGetSetParent() { child.setParent(null); assertEquals(null, child.getParent()); @@ -122,18 +95,6 @@ public class XMLFilterImplTest extends TestCase { assertEquals(parent, child.getParent()); } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getFeature", - args = { String.class } - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "setFeature", - args = { String.class, boolean.class } - ) - }) public void testGetSetFeature() { // Ordinary case try { @@ -159,18 +120,6 @@ public class XMLFilterImplTest extends TestCase { } } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getProperty", - args = { String.class } - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "setProperty", - args = { String.class, Object.class } - ) - }) public void testGetSetProperty() { // Ordinary case try { @@ -196,18 +145,6 @@ public class XMLFilterImplTest extends TestCase { } } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getEntityResolver", - args = { } - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "setEntityResolver", - args = { EntityResolver.class } - ) - }) public void testGetSetEntityResolver() { EntityResolver resolver = new MockResolver(); @@ -218,18 +155,6 @@ public class XMLFilterImplTest extends TestCase { assertEquals(null, parent.getEntityResolver()); } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getDTDHandler", - args = { } - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "setDTDHandler", - args = { DTDHandler.class } - ) - }) public void testGetSetDTDHandler() { parent.setDTDHandler(null); assertEquals(null, parent.getDTDHandler()); @@ -238,18 +163,6 @@ public class XMLFilterImplTest extends TestCase { assertEquals(handler, parent.getDTDHandler()); } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getContentHandler", - args = { } - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "setContentHandler", - args = { ContentHandler.class } - ) - }) public void testGetSetContentHandler() { parent.setContentHandler(null); assertEquals(null, parent.getContentHandler()); @@ -258,18 +171,6 @@ public class XMLFilterImplTest extends TestCase { assertEquals(handler, parent.getContentHandler()); } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getErrorHandler", - args = { } - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "setErrorHandler", - args = { ErrorHandler.class } - ) - }) public void testGetSetErrorHandler() { parent.setErrorHandler(null); assertEquals(null, parent.getErrorHandler()); @@ -278,11 +179,6 @@ public class XMLFilterImplTest extends TestCase { assertEquals(handler, parent.getErrorHandler()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "parse", - args = { InputSource.class } - ) public void testParseInputSource() { InputSource is = new InputSource(); @@ -311,11 +207,6 @@ public class XMLFilterImplTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "parse", - args = { String.class } - ) public void testParseString() { // Ordinary case try { @@ -342,11 +233,6 @@ public class XMLFilterImplTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "resolveEntity", - args = { String.class, String.class } - ) public void testResolveEntity() { InputSource expected = new InputSource(); @@ -382,11 +268,6 @@ public class XMLFilterImplTest extends TestCase { assertEquals(null, result); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "notationDecl", - args = { String.class, String.class, String.class } - ) public void testNotationDecl() { try { parent.notationDecl("foo", "bar", "foobar"); @@ -400,11 +281,6 @@ public class XMLFilterImplTest extends TestCase { logger.getArgs()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "unparsedEntityDecl", - args = { String.class, String.class, String.class, String.class } - ) public void testUnparsedEntityDecl() { try { parent.unparsedEntityDecl("foo", "bar", "gabba", "hey"); @@ -418,11 +294,6 @@ public class XMLFilterImplTest extends TestCase { logger.getArgs()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "setDocumentLocator", - args = { Locator.class } - ) public void testSetDocumentLocator() { Locator l = new LocatorImpl(); @@ -439,11 +310,6 @@ public class XMLFilterImplTest extends TestCase { assertEquals(new Object[] { null }, logger.getArgs()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "startDocument", - args = { } - ) public void testStartDocument() { try { parent.startDocument(); @@ -456,11 +322,6 @@ public class XMLFilterImplTest extends TestCase { assertEquals(new Object[] {}, logger.getArgs()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "endDocument", - args = { } - ) public void testEndDocument() { try { parent.endDocument(); @@ -473,11 +334,6 @@ public class XMLFilterImplTest extends TestCase { assertEquals(new Object[] {}, logger.getArgs()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "startPrefixMapping", - args = { String.class, String.class } - ) public void testStartPrefixMapping() { try { parent.startPrefixMapping("foo", "http://some.uri"); @@ -491,11 +347,6 @@ public class XMLFilterImplTest extends TestCase { logger.getArgs()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "endPrefixMapping", - args = { String.class } - ) public void testEndPrefixMapping() { try { parent.endPrefixMapping("foo"); @@ -508,11 +359,6 @@ public class XMLFilterImplTest extends TestCase { assertEquals(new Object[] { "foo" }, logger.getArgs()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "startElement", - args = { String.class, String.class, String.class, Attributes.class } - ) public void testStartElement() { Attributes atts = new AttributesImpl(); @@ -528,11 +374,6 @@ public class XMLFilterImplTest extends TestCase { logger.getArgs()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "endElement", - args = { String.class, String.class, String.class } - ) public void testEndElement() { try { parent.endElement("http://some.uri", "bar", "foo:bar"); @@ -546,11 +387,6 @@ public class XMLFilterImplTest extends TestCase { logger.getArgs()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "characters", - args = { char[].class, int.class, int.class } - ) public void testCharacters() { char[] ch = "Android".toCharArray(); @@ -565,11 +401,6 @@ public class XMLFilterImplTest extends TestCase { assertEquals(new Object[] { ch, 2, 5 }, logger.getArgs()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "ignorableWhitespace", - args = { char[].class, int.class, int.class } - ) public void testIgnorableWhitespace() { char[] ch = " ".toCharArray(); @@ -584,11 +415,6 @@ public class XMLFilterImplTest extends TestCase { assertEquals(new Object[] { ch, 0, 5 }, logger.getArgs()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "processingInstruction", - args = { String.class, String.class } - ) public void testProcessingInstruction() { try { parent.processingInstruction("foo", "bar"); @@ -601,11 +427,6 @@ public class XMLFilterImplTest extends TestCase { assertEquals(new Object[] { "foo", "bar" }, logger.getArgs()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "skippedEntity", - args = { String.class } - ) public void testSkippedEntity() { try { parent.skippedEntity("foo"); @@ -618,11 +439,6 @@ public class XMLFilterImplTest extends TestCase { assertEquals(new Object[] { "foo" }, logger.getArgs()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "warning", - args = { SAXParseException.class } - ) public void testWarning() { SAXParseException exception = new SAXParseException("Oops!", null); @@ -637,11 +453,6 @@ public class XMLFilterImplTest extends TestCase { assertEquals(new Object[] { exception }, logger.getArgs()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "error", - args = { SAXParseException.class } - ) public void testError() { SAXParseException exception = new SAXParseException("Oops!", null); @@ -656,11 +467,6 @@ public class XMLFilterImplTest extends TestCase { assertEquals(new Object[] { exception }, logger.getArgs()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "fatalError", - args = { SAXParseException.class } - ) public void testFatalError() { SAXParseException exception = new SAXParseException("Oops!", null); diff --git a/luni/src/test/java/tests/api/org/xml/sax/helpers/XMLReaderAdapterTest.java b/luni/src/test/java/tests/api/org/xml/sax/helpers/XMLReaderAdapterTest.java index 52e308f..16104b3 100644 --- a/luni/src/test/java/tests/api/org/xml/sax/helpers/XMLReaderAdapterTest.java +++ b/luni/src/test/java/tests/api/org/xml/sax/helpers/XMLReaderAdapterTest.java @@ -39,12 +39,8 @@ import tests.api.org.xml.sax.support.MethodLogger; import tests.api.org.xml.sax.support.MockHandler; import tests.api.org.xml.sax.support.MockReader; import tests.api.org.xml.sax.support.MockResolver; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; @SuppressWarnings("deprecation") -@TestTargetClass(XMLReaderAdapter.class) public class XMLReaderAdapterTest extends TestCase { // Note: In many cases we can only test that delegation works @@ -77,11 +73,6 @@ public class XMLReaderAdapterTest extends TestCase { super.tearDown(); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "XMLReaderAdapter", - args = { } - ) public void testXMLReaderAdapter() { System.setProperty("org.xml.sax.driver", "tests.api.org.xml.sax.support.DoNothingXMLReader"); @@ -93,11 +84,6 @@ public class XMLReaderAdapterTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "XMLReaderAdapter", - args = { XMLReader.class } - ) public void testXMLReaderAdapterXMLReader() { // Ordinary case @SuppressWarnings("unused") @@ -112,11 +98,6 @@ public class XMLReaderAdapterTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "setLocale", - args = { Locale.class } - ) public void testSetLocale() { // SAX RI does not support this, hence always expect exception try { @@ -127,11 +108,6 @@ public class XMLReaderAdapterTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "setEntityResolver", - args = { EntityResolver.class } - ) public void testSetEntityResolver() { EntityResolver resolver = new MockResolver(); @@ -144,11 +120,6 @@ public class XMLReaderAdapterTest extends TestCase { assertEquals(null, reader.getEntityResolver()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "setDTDHandler", - args = { DTDHandler.class } - ) public void testSetDTDHandler() { // Ordinary case assertEquals(handler, reader.getDTDHandler()); @@ -158,11 +129,6 @@ public class XMLReaderAdapterTest extends TestCase { assertEquals(null, reader.getDTDHandler()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "setDocumentHandler", - args = { DocumentHandler.class } - ) public void testSetDocumentHandler() { // There is no getter for the DocumentHandler, so we can only test // indirectly whether is has been set correctly. @@ -179,11 +145,6 @@ public class XMLReaderAdapterTest extends TestCase { adapter.setDocumentHandler(null); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "setErrorHandler", - args = { ErrorHandler.class } - ) public void testSetErrorHandler() { // Ordinary case assertEquals(handler, reader.getErrorHandler()); @@ -193,11 +154,6 @@ public class XMLReaderAdapterTest extends TestCase { assertEquals(null, reader.getErrorHandler()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "parse", - args = { String.class } - ) public void testParseString() { try { adapter.parse("foo"); @@ -213,11 +169,6 @@ public class XMLReaderAdapterTest extends TestCase { assertEquals(InputSource.class, logger.getArgs(0)[0].getClass()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "parse", - args = { InputSource.class } - ) public void testParseInputSource() { InputSource source = new InputSource("foo"); @@ -233,11 +184,6 @@ public class XMLReaderAdapterTest extends TestCase { assertEquals(new Object[] { source }, logger.getArgs()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "setDocumentLocator", - args = { Locator.class } - ) public void testSetDocumentLocator() { // Ordinary case LocatorImpl locator = new LocatorImpl(); @@ -251,11 +197,6 @@ public class XMLReaderAdapterTest extends TestCase { adapter.setDocumentLocator(locator); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "startDocument", - args = { } - ) public void testStartDocument() { try { adapter.startDocument(); @@ -268,11 +209,6 @@ public class XMLReaderAdapterTest extends TestCase { assertEquals(new Object[] {}, logger.getArgs()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "endDocument", - args = { } - ) public void testEndDocument() { try { adapter.endDocument(); @@ -285,31 +221,16 @@ public class XMLReaderAdapterTest extends TestCase { assertEquals(new Object[] {}, logger.getArgs()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "startPrefixMapping", - args = { String.class, String.class } - ) public void testStartPrefixMapping() { adapter.startPrefixMapping("foo", "http://some.uri"); assertEquals(logger.size(), 0); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "endPrefixMapping", - args = { String.class } - ) public void testEndPrefixMapping() { adapter.endPrefixMapping("foo"); assertEquals(logger.size(), 0); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "startElement", - args = { String.class, String.class, String.class, Attributes.class } - ) public void testStartElement() { AttributesImpl atts = new AttributesImpl(); atts.addAttribute("http://some.other.uri", "gabba", "gabba:hey", @@ -328,11 +249,6 @@ public class XMLReaderAdapterTest extends TestCase { ((AttributeList)logger.getArgs()[1]).getName(0)); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "endElement", - args = { String.class, String.class, String.class } - ) public void testEndElement() { try { adapter.endElement("http://some.uri", "bar", "foo:bar"); @@ -345,11 +261,6 @@ public class XMLReaderAdapterTest extends TestCase { assertEquals(new Object[] { "foo:bar" }, logger.getArgs()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "characters", - args = { char[].class, int.class, int.class } - ) public void testCharacters() { char[] ch = "Android".toCharArray(); @@ -364,11 +275,6 @@ public class XMLReaderAdapterTest extends TestCase { assertEquals(new Object[] { ch, 2, 5 }, logger.getArgs()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "ignorableWhitespace", - args = { char[].class, int.class, int.class } - ) public void testIgnorableWhitespace() { char[] ch = " ".toCharArray(); @@ -383,11 +289,6 @@ public class XMLReaderAdapterTest extends TestCase { assertEquals(new Object[] { ch, 0, 5 }, logger.getArgs()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "processingInstruction", - args = { String.class, String.class } - ) public void testProcessingInstruction() { try { adapter.processingInstruction("foo", "bar"); @@ -400,11 +301,6 @@ public class XMLReaderAdapterTest extends TestCase { assertEquals(new Object[] { "foo" , "bar" }, logger.getArgs()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "skippedEntity", - args = { String.class } - ) public void testSkippedEntity() { try { adapter.skippedEntity("foo"); diff --git a/luni/src/test/java/tests/api/org/xml/sax/helpers/XMLReaderFactoryTest.java b/luni/src/test/java/tests/api/org/xml/sax/helpers/XMLReaderFactoryTest.java index 4876b13..8205dfd 100644 --- a/luni/src/test/java/tests/api/org/xml/sax/helpers/XMLReaderFactoryTest.java +++ b/luni/src/test/java/tests/api/org/xml/sax/helpers/XMLReaderFactoryTest.java @@ -16,16 +16,11 @@ package tests.api.org.xml.sax.helpers; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; - import junit.framework.TestCase; import org.xml.sax.SAXException; import org.xml.sax.helpers.XMLReaderFactory; -@TestTargetClass(XMLReaderFactory.class) public class XMLReaderFactoryTest extends TestCase { @Override protected void setUp() throws Exception { @@ -36,12 +31,6 @@ public class XMLReaderFactoryTest extends TestCase { super.tearDown(); } - @TestTargetNew( - level = TestLevel.SUFFICIENT, - method = "createXMLReader", - args = { }, - notes = "Checks everything except META-INF case" - ) public void testCreateXMLReader() { // Property not set at all try { @@ -103,11 +92,6 @@ public class XMLReaderFactoryTest extends TestCase { } - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "createXMLReader", - args = { String.class } - ) public void testMakeParserString() { // No class try { diff --git a/luni/src/test/java/tests/java/lang/String/Tests.java b/luni/src/test/java/tests/java/lang/String/Tests.java index 15fe1b6..e5ab269 100644 --- a/luni/src/test/java/tests/java/lang/String/Tests.java +++ b/luni/src/test/java/tests/java/lang/String/Tests.java @@ -16,65 +16,29 @@ package tests.java.lang.String; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; /** * Tests for the class {@link String}. */ -@TestTargetClass(String.class) public class Tests extends TestCase { - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't check NullPointerException.", - method = "contains", - args = {java.lang.CharSequence.class} - ) public void test_contains() { assertTrue("aabc".contains("abc")); assertTrue("abcd".contains("abc")); assertFalse("abcd".contains("cba")); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies positive functionality.", - method = "charAt", - args = {int.class} - ) public void test_charAt() { assertTrue("abcd".charAt(0) == 'a'); assertTrue("abcd".charAt(3) == 'd'); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't check specific cases.", - method = "startsWith", - args = {java.lang.String.class} - ) public void test_StartsWith() { assertTrue("abcd".startsWith("abc")); assertFalse("abcd".startsWith("aabc")); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't check specific cases.", - method = "endsWith", - args = {java.lang.String.class} - ) public void test_EndsWith() { assertTrue("abcd".endsWith("bcd")); assertFalse("abcd".endsWith("bcde")); } - @TestTargetNew( - level = TestLevel.TODO, - notes = "Verifies nothing.", - method = "!Constants", - args = {} - ) public void test_CASE_INSENSITIVE_ORDER() { String s1 = "ABCDEFG"; String s2 = "abcdefg"; diff --git a/luni/src/test/java/tests/java/security/AlgorithmParameterGeneratorSpiTest.java b/luni/src/test/java/tests/java/security/AlgorithmParameterGeneratorSpiTest.java index 81fde6d..47b9ed6 100644 --- a/luni/src/test/java/tests/java/security/AlgorithmParameterGeneratorSpiTest.java +++ b/luni/src/test/java/tests/java/security/AlgorithmParameterGeneratorSpiTest.java @@ -22,11 +22,6 @@ package tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.AlgorithmParameters; import java.security.InvalidAlgorithmParameterException; import java.security.SecureRandom; @@ -41,39 +36,12 @@ import junit.framework.TestCase; * and methods. * */ -@TestTargetClass(java.security.AlgorithmParameterGeneratorSpi.class) public class AlgorithmParameterGeneratorSpiTest extends TestCase { /** * Test for <code>AlgorithmParameterGeneratorSpi</code> constructor * Assertion: constructs AlgorithmParameterGeneratorSpi */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "AlgorithmParameterGeneratorSpi", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineGenerateParameters", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineInit", - args = {java.security.spec.AlgorithmParameterSpec.class, java.security.SecureRandom.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineInit", - args = {int.class, java.security.SecureRandom.class} - ) - }) public void testAlgorithmParameterGeneratorSpi01() throws InvalidAlgorithmParameterException { MyAlgorithmParameterGeneratorSpi algParGen = new MyAlgorithmParameterGeneratorSpi(); diff --git a/luni/src/test/java/tests/java/security/AllPermissionTest.java b/luni/src/test/java/tests/java/security/AllPermissionTest.java index 40f0c71..32056d8 100644 --- a/luni/src/test/java/tests/java/security/AllPermissionTest.java +++ b/luni/src/test/java/tests/java/security/AllPermissionTest.java @@ -22,18 +22,12 @@ package tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.AllPermission; import java.security.BasicPermission; import java.security.PermissionCollection; import java.security.UnresolvedPermission; import junit.framework.TestCase; -@TestTargetClass(AllPermission.class) /** * Tests for <code>AllPermission</code> * @@ -43,20 +37,6 @@ public class AllPermissionTest extends TestCase { /** * Test all constructors: an object is created, name and actions are ignored */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "AllPermission", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "AllPermission", - args = {java.lang.String.class, java.lang.String.class} - ) - }) public void testCtor() { AllPermission a1 = new AllPermission(); @@ -73,12 +53,6 @@ public class AllPermissionTest extends TestCase { } /** Any of AllPermission instances are equal and have the same hash code */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "equals", - args = {java.lang.Object.class} - ) public void testEquals() { AllPermission a1 = new AllPermission(); @@ -90,12 +64,6 @@ public class AllPermissionTest extends TestCase { } /** AllPermission implies any other permission */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Null parameter checking missed", - method = "implies", - args = {java.security.Permission.class} - ) public void testImplies() { AllPermission a1 = new AllPermission(); @@ -105,12 +73,6 @@ public class AllPermissionTest extends TestCase { } /** newPermissionCollection() returns a new AllPermissionCollection on every invocation. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "newPermissionCollection", - args = {} - ) public void testCollection() { AllPermission a1 = new AllPermission(); diff --git a/luni/src/test/java/tests/java/security/BasicPermissionTest.java b/luni/src/test/java/tests/java/security/BasicPermissionTest.java index 28eeee4..703a947 100644 --- a/luni/src/test/java/tests/java/security/BasicPermissionTest.java +++ b/luni/src/test/java/tests/java/security/BasicPermissionTest.java @@ -22,11 +22,6 @@ package tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.BasicPermission; import java.security.PermissionCollection; @@ -36,7 +31,6 @@ import junit.framework.TestCase; * Tests for <code>BasicPermission</code> * */ -@TestTargetClass(BasicPermission.class) public class BasicPermissionTest extends TestCase { /** * Check all constructors: an object is created with the specified valid name. @@ -44,20 +38,6 @@ public class BasicPermissionTest extends TestCase { * If name is empty then IAE should be thrown. * Action is ignored. */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "BasicPermission", - args = {java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "BasicPermission", - args = {java.lang.String.class, java.lang.String.class} - ) - }) public void testCtor() { String name = "basic123*$%#"; @@ -103,12 +83,6 @@ public class BasicPermissionTest extends TestCase { * two BasicPermissions are equal if name and class are equal; * equal permissions should have the same hash code */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "equals", - args = {java.lang.Object.class} - ) public void testEquals() { BasicPermission b1 = new BasicPermissionImpl("abc"); @@ -127,12 +101,6 @@ public class BasicPermissionTest extends TestCase { * implies() should return true if a permission is equal to or is implied * by wildcarded permission, false otherwise. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "implies", - args = {java.security.Permission.class} - ) public void testImplies() { BasicPermission b1 = new BasicPermissionImpl("a.b.c"); @@ -152,12 +120,6 @@ public class BasicPermissionTest extends TestCase { /** * newPermissionCollection() should return new BasicPermissionCollection on every invocation */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "newPermissionCollection", - args = {} - ) public void testCollection() { BasicPermission b1 = new BasicPermissionImpl("a.b.c"); diff --git a/luni/src/test/java/tests/java/security/IdentityTest.java b/luni/src/test/java/tests/java/security/IdentityTest.java index 38f52ee..405b100 100644 --- a/luni/src/test/java/tests/java/security/IdentityTest.java +++ b/luni/src/test/java/tests/java/security/IdentityTest.java @@ -22,11 +22,6 @@ package tests.java.security; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.security.Identity; import java.security.IdentityScope; import java.security.KeyManagementException; @@ -46,7 +41,6 @@ import junit.framework.TestCase; * */ @SuppressWarnings("deprecation") -@TestTargetClass(Identity.class) public class IdentityTest extends TestCase { public static class MySecurityManager extends SecurityManager { @@ -56,22 +50,10 @@ public class IdentityTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Method's returned variable is not checked", - method = "hashCode", - args = {} - ) public void testHashCode() { new IdentityStub("testHashCode").hashCode(); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "equals", - args = {java.lang.Object.class} - ) public void testEquals() throws Exception { IdentityStub i1 = new IdentityStub("testEquals"); Object value[] = { @@ -96,12 +78,6 @@ public class IdentityTest extends TestCase { /** * verify Identity.toString() */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "toString", - args = {} - ) public void testToString2() { assertNotNull(new IdentityStub("testToString2").toString()); } @@ -109,12 +85,6 @@ public class IdentityTest extends TestCase { /** * verify Identity() creates instance */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "Identity", - args = {} - ) public void testIdentity() { assertNotNull(new IdentityStub()); } @@ -122,12 +92,6 @@ public class IdentityTest extends TestCase { /* * verify Identity(String) creates instance with given name */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Empty string for parameter is not tested", - method = "Identity", - args = {java.lang.String.class} - ) public void testIdentityString() { Identity i = new IdentityStub("iii"); assertNotNull(i); @@ -140,12 +104,6 @@ public class IdentityTest extends TestCase { /** * verify Identity(String, IdentityScope) creates instance with given name and in give scope */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "KeyManagementException checking missed. Null parameters are not checked.", - method = "Identity", - args = {java.lang.String.class, java.security.IdentityScope.class} - ) public void testIdentityStringIdentityScope() throws Exception { IdentityScope s = IdentityScope.getSystemScope(); Identity i = new IdentityStub("iii2", s); @@ -160,12 +118,6 @@ public class IdentityTest extends TestCase { * If the identity has a public key, the public key in the certificate must be the same * */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "addCertificate", - args = {java.security.Certificate.class} - ) public void testAddCertificate1() throws Exception { Identity i = new IdentityStub("iii"); PublicKeyStub pk1 = new PublicKeyStub("kkk", "fff", new byte[]{1,2,3,4,5}); @@ -185,12 +137,6 @@ public class IdentityTest extends TestCase { * verify addCertificate(Certificate certificate) adds a certificate for this identity. * if the identity does not have a public key, the identity's public key is set to be that specified in the certificate. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "addCertificate", - args = {java.security.Certificate.class} - ) public void testAddCertificate2() throws Exception { Identity i = new IdentityStub("iii"); PublicKeyStub pk1 = new PublicKeyStub("kkk", "fff", null); @@ -204,12 +150,6 @@ public class IdentityTest extends TestCase { /** * verify addCertificate(Certificate certificate) throws KeyManagementException if certificate is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "addCertificate", - args = {java.security.Certificate.class} - ) public void testAddCertificate4() throws Exception { try { new IdentityStub("aaa").addCertificate(null); @@ -248,12 +188,6 @@ public class IdentityTest extends TestCase { /** * verify certificates() returns a copy of all certificates for this identity */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "certificates", - args = {} - ) public void testCertificates() throws Exception { Identity i = new IdentityStub("iii"); PublicKeyStub pk1 = new PublicKeyStub("kkk", "fff", null); @@ -277,12 +211,6 @@ public class IdentityTest extends TestCase { /** * verify Identity.identityEquals(Identity) return true, only if names and public keys are equal */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "identityEquals", - args = {java.security.Identity.class} - ) public void testIdentityEquals() throws Exception { String name = "nnn"; PublicKey pk = new PublicKeyStub("aaa", "fff", new byte[]{1,2,3,4,5}); @@ -309,12 +237,6 @@ public class IdentityTest extends TestCase { /** * verify Identity.toString(boolean) return string representation of identity */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Method's returned value is not checked. SecurityException checking missed.", - method = "toString", - args = {boolean.class} - ) public void testToStringboolean() throws Exception { new IdentityStub("aaa").toString(false); new IdentityStub("aaa2", IdentityScope.getSystemScope()).toString(false); @@ -325,12 +247,6 @@ public class IdentityTest extends TestCase { /** * verify Identity.getScope() returns identity's scope */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getScope", - args = {} - ) public void testGetScope() throws Exception { Identity i = new IdentityStub("testGetScope"); assertNull(i.getScope()); @@ -345,12 +261,6 @@ public class IdentityTest extends TestCase { * verify Identity.setPublicKey() throws KeyManagementException if key is invalid * */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "setPublicKey", - args = {java.security.PublicKey.class} - ) public void testSetPublicKey2() throws Exception { Identity i2 = new IdentityStub("testSetPublicKey2_2", IdentityScope.getSystemScope()); new PublicKeyStub("kkk", "testSetPublicKey2", new byte[]{1,2,3,4,5}); @@ -382,12 +292,6 @@ public class IdentityTest extends TestCase { * verify Identity.setPublicKey() removes old key and all identity's certificates * */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "setPublicKey", - args = {java.security.PublicKey.class} - ) public void testSetPublicKey4() throws Exception { Identity i = new IdentityStub("testSetPublicKey4"); PublicKeyStub pk1 = new PublicKeyStub("kkk", "Identity.testSetPublicKey4", null); @@ -407,12 +311,6 @@ public class IdentityTest extends TestCase { /** * verify Identity.getPublicKey() returns public key */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPublicKey", - args = {} - ) public void testGetPublicKey() throws Exception { Identity i = new IdentityStub("testGetPublicKey"); assertNull(i.getPublicKey()); @@ -421,20 +319,6 @@ public class IdentityTest extends TestCase { assertSame(pk, i.getPublicKey()); } - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Both method were verified", - method = "getInfo", - args = {} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Both method were verified", - method = "setInfo", - args = {java.lang.String.class} - ) - }) public void testGetInfo() { Identity i = new IdentityStub("testGetInfo"); @@ -442,12 +326,6 @@ public class IdentityTest extends TestCase { assertEquals("some info", i.getInfo()); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getName", - args = {} - ) public void testGetName() { Identity i = new IdentityStub("testGetName"); assertEquals ("testGetName", i.getName()); diff --git a/luni/src/test/java/tests/java/sql/DatabaseMetaDataNotSupportedTest.java b/luni/src/test/java/tests/java/sql/DatabaseMetaDataNotSupportedTest.java index 799ab55..3f16a69 100644 --- a/luni/src/test/java/tests/java/sql/DatabaseMetaDataNotSupportedTest.java +++ b/luni/src/test/java/tests/java/sql/DatabaseMetaDataNotSupportedTest.java @@ -17,9 +17,6 @@ package tests.java.sql; import dalvik.annotation.KnownFailure; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; import junit.extensions.TestSetup; import junit.framework.Test; @@ -37,7 +34,6 @@ import java.sql.SQLException; import java.sql.Statement; import java.util.HashSet; -@TestTargetClass(DatabaseMetaData.class) public class DatabaseMetaDataNotSupportedTest extends TestCase { private static String VIEW_NAME = "myView"; @@ -130,7 +126,7 @@ public class DatabaseMetaDataNotSupportedTest extends TestCase { } /** - * @tests java.sql.DatabaseMetaData#allProceduresAreCallable() + * java.sql.DatabaseMetaData#allProceduresAreCallable() */ public void test_allProceduresAreCallable() throws SQLException { assertFalse(meta.allProceduresAreCallable()); @@ -178,28 +174,28 @@ public class DatabaseMetaDataNotSupportedTest extends TestCase { } /** - * @tests java.sql.DatabaseMetaData#dataDefinitionCausesTransactionCommit() + * java.sql.DatabaseMetaData#dataDefinitionCausesTransactionCommit() */ public void test_dataDefinitionCausesTransactionCommit() throws SQLException { // NOT_FEASIBLE: SQLITE does not implement this functionality } /** - * @tests java.sql.DatabaseMetaData#dataDefinitionIgnoredInTransactions() + * java.sql.DatabaseMetaData#dataDefinitionIgnoredInTransactions() */ public void test_dataDefinitionIgnoredInTransactions() throws SQLException { assertFalse(meta.dataDefinitionIgnoredInTransactions()); } /** - * @tests java.sql.DatabaseMetaData#deletesAreDetected(int) + * java.sql.DatabaseMetaData#deletesAreDetected(int) */ public void test_deletesAreDetectedI() throws SQLException { assertFalse(meta.deletesAreDetected(0)); } /** - * @tests java.sql.DatabaseMetaData#doesMaxRowSizeIncludeBlobs() + * java.sql.DatabaseMetaData#doesMaxRowSizeIncludeBlobs() */ @KnownFailure("not supported") public void test_doesMaxRowSizeIncludeBlobs() throws SQLException { @@ -207,7 +203,7 @@ public class DatabaseMetaDataNotSupportedTest extends TestCase { } /** - * @tests java.sql.DatabaseMetaData #getAttributes(java.lang.String, + * java.sql.DatabaseMetaData #getAttributes(java.lang.String, * java.lang.String, java.lang.String, java.lang.String) */ public void test_getAttributesLjava_lang_StringLjava_lang_StringLjava_lang_StringLjava_lang_String() @@ -228,42 +224,24 @@ public class DatabaseMetaDataNotSupportedTest extends TestCase { } /** - * @tests java.sql.DatabaseMetaData#getCatalogSeparator() + * java.sql.DatabaseMetaData#getCatalogSeparator() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "not supported", - method = "getCatalogSeparator", - args = {} - ) public void test_getCatalogSeparator() throws SQLException { assertTrue("Incorrect catalog separator", "".equals(meta .getCatalogSeparator().trim())); } /** - * @tests java.sql.DatabaseMetaData#getCatalogTerm() + * java.sql.DatabaseMetaData#getCatalogTerm() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "not supported", - method = "getCatalogTerm", - args = {} - ) public void test_getCatalogTerm() throws SQLException { assertTrue("Incorrect catalog term", "".equals(meta .getCatalogSeparator().trim())); } /** - * @tests java.sql.DatabaseMetaData#getExtraNameCharacters() + * java.sql.DatabaseMetaData#getExtraNameCharacters() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "not supported", - method = "getExtraNameCharacters", - args = {} - ) public void test_getExtraNameCharacters() throws SQLException { assertNotNull("Incorrect extra name characters", meta .getExtraNameCharacters()); @@ -426,14 +404,8 @@ public class DatabaseMetaDataNotSupportedTest extends TestCase { } /** - * @tests java.sql.DatabaseMetaData#getProcedureTerm() + * java.sql.DatabaseMetaData#getProcedureTerm() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getProcedureTerm", - args = {} - ) @KnownFailure("Exception test fails") public void test_getProcedureTerm() throws SQLException { assertTrue("Incorrect procedure term", "".equals(meta @@ -451,14 +423,8 @@ public class DatabaseMetaDataNotSupportedTest extends TestCase { } /** - * @tests java.sql.DatabaseMetaData#getSchemaTerm() + * java.sql.DatabaseMetaData#getSchemaTerm() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "not supported", - method = "getSchemaTerm", - args = {} - ) @KnownFailure("Exception test fails") public void test_getSchemaTerm() throws SQLException { String term = meta.getSchemaTerm(); @@ -611,14 +577,8 @@ public class DatabaseMetaDataNotSupportedTest extends TestCase { } /** - * @tests java.sql.DatabaseMetaData#isCatalogAtStart() + * java.sql.DatabaseMetaData#isCatalogAtStart() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isCatalogAtStart", - args = {} - ) @KnownFailure("Exception test fails") public void test_isCatalogAtStart() throws SQLException { assertFalse( @@ -662,14 +622,8 @@ public class DatabaseMetaDataNotSupportedTest extends TestCase { } /** - * @tests java.sql.DatabaseMetaData#ownDeletesAreVisible(int) + * java.sql.DatabaseMetaData#ownDeletesAreVisible(int) */ - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "Not Fully Supported.", - method = "ownDeletesAreVisible", - args = {int.class} - ) public void test_ownDeletesAreVisibleI() throws SQLException { // NOT_FEASIBLE not supported // assertFalse( @@ -686,14 +640,8 @@ public class DatabaseMetaDataNotSupportedTest extends TestCase { } /** - * @tests java.sql.DatabaseMetaData#ownInsertsAreVisible(int) + * java.sql.DatabaseMetaData#ownInsertsAreVisible(int) */ - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "not supported.", - method = "ownInsertsAreVisible", - args = {int.class} - ) public void test_ownInsertsAreVisibleI() throws SQLException { // assertFalse( // "result set's own inserts are visible for TYPE_FORWARD_ONLY type", @@ -986,235 +934,133 @@ public class DatabaseMetaDataNotSupportedTest extends TestCase { } /** - * @tests java.sql.DatabaseMetaData#getMaxBinaryLiteralLength() + * java.sql.DatabaseMetaData#getMaxBinaryLiteralLength() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getMaxBinaryLiteralLength", - args = {} - ) public void test_getMaxBinaryLiteralLength() throws SQLException { assertTrue("Incorrect binary literal length", meta .getMaxBinaryLiteralLength() == 0); } /** - * @tests java.sql.DatabaseMetaData#getMaxCatalogNameLength() + * java.sql.DatabaseMetaData#getMaxCatalogNameLength() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getMaxCatalogNameLength", - args = {} - ) public void test_getMaxCatalogNameLength() throws SQLException { assertTrue("Incorrect name length", meta.getMaxCatalogNameLength() == 0); } /** - * @tests java.sql.DatabaseMetaData#getMaxCharLiteralLength() + * java.sql.DatabaseMetaData#getMaxCharLiteralLength() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getMaxCharLiteralLength", - args = {} - ) public void test_getMaxCharLiteralLength() throws SQLException { assertTrue("Incorrect char literal length", meta .getMaxCharLiteralLength() == 0); } /** - * @tests java.sql.DatabaseMetaData#getMaxColumnNameLength() + * java.sql.DatabaseMetaData#getMaxColumnNameLength() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getMaxColumnNameLength", - args = {} - ) public void test_getMaxColumnNameLength() throws SQLException { assertTrue("Incorrect column name length", meta .getMaxColumnNameLength() == 0); } /** - * @tests java.sql.DatabaseMetaData#getMaxColumnsInGroupBy() + * java.sql.DatabaseMetaData#getMaxColumnsInGroupBy() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getMaxColumnsInGroupBy", - args = {} - ) public void test_getMaxColumnsInGroupBy() throws SQLException { assertTrue("Incorrect number of columns", meta.getMaxColumnsInGroupBy() == 0); } /** - * @tests java.sql.DatabaseMetaData#getMaxColumnsInIndex() + * java.sql.DatabaseMetaData#getMaxColumnsInIndex() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getMaxColumnsInIndex", - args = {} - ) public void test_getMaxColumnsInIndex() throws SQLException { assertTrue("Incorrect number of columns", meta.getMaxColumnsInIndex() == 0); } /** - * @tests java.sql.DatabaseMetaData#getMaxColumnsInOrderBy() + * java.sql.DatabaseMetaData#getMaxColumnsInOrderBy() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getMaxColumnsInOrderBy", - args = {} - ) public void test_getMaxColumnsInOrderBy() throws SQLException { assertTrue("Incorrect number of columns", meta.getMaxColumnsInOrderBy() == 0); } /** - * @tests java.sql.DatabaseMetaData#getMaxColumnsInSelect() + * java.sql.DatabaseMetaData#getMaxColumnsInSelect() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getMaxColumnsInSelect", - args = {} - ) public void test_getMaxColumnsInSelect() throws SQLException { assertTrue("Incorrect number of columns", meta.getMaxColumnsInSelect() == 0); } /** - * @tests java.sql.DatabaseMetaData#getMaxColumnsInTable() + * java.sql.DatabaseMetaData#getMaxColumnsInTable() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getMaxColumnsInTable", - args = {} - ) public void test_getMaxColumnsInTable() throws SQLException { assertTrue("Incorrect number of columns", meta.getMaxColumnsInTable() == 0); } /** - * @tests java.sql.DatabaseMetaData#getMaxConnections() + * java.sql.DatabaseMetaData#getMaxConnections() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getMaxConnections", - args = {} - ) public void test_getMaxConnections() throws SQLException { assertTrue("Incorrect number of connections", meta.getMaxConnections() == 0); } /** - * @tests java.sql.DatabaseMetaData#getMaxIndexLength() + * java.sql.DatabaseMetaData#getMaxIndexLength() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "not supported", - method = "getMaxIndexLength", - args = {} - ) public void test_getMaxIndexLength() throws SQLException { assertTrue("Incorrect length of index", meta.getMaxIndexLength() == 0); } /** - * @tests java.sql.DatabaseMetaData#getMaxProcedureNameLength() + * java.sql.DatabaseMetaData#getMaxProcedureNameLength() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "not supported", - method = "getMaxProcedureNameLength", - args = {} - ) public void test_getMaxProcedureNameLength() throws SQLException { assertTrue("Incorrect length of procedure name", meta .getMaxProcedureNameLength() == 0); } /** - * @tests java.sql.DatabaseMetaData#getMaxRowSize() + * java.sql.DatabaseMetaData#getMaxRowSize() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "not supported", - method = "getMaxRowSize", - args = {} - ) public void test_getMaxRowSize() throws SQLException { assertTrue("Incorrect size of row", meta.getMaxRowSize() == 0); } /** - * @tests java.sql.DatabaseMetaData#getMaxSchemaNameLength() + * java.sql.DatabaseMetaData#getMaxSchemaNameLength() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "not supported", - method = "getMaxSchemaNameLength", - args = {} - ) public void test_getMaxSchemaNameLength() throws SQLException { assertTrue("Incorrect length of schema name", meta .getMaxSchemaNameLength() == 0); } /** - * @tests java.sql.DatabaseMetaData#getMaxStatementLength() + * java.sql.DatabaseMetaData#getMaxStatementLength() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "not supported", - method = "getMaxStatementLength", - args = {} - ) public void test_getMaxStatementLength() throws SQLException { assertTrue("Incorrect length of statement", meta .getMaxStatementLength() == 0); } /** - * @tests java.sql.DatabaseMetaData#getMaxStatements() + * java.sql.DatabaseMetaData#getMaxStatements() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "not supported", - method = "getMaxStatements", - args = {} - ) public void test_getMaxStatements() throws SQLException { assertTrue("Incorrect number of statements", meta.getMaxStatements() == 0); } /** - * @tests java.sql.DatabaseMetaData#getMaxTableNameLength() + * java.sql.DatabaseMetaData#getMaxTableNameLength() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "not supported", - method = "getMaxTableNameLength", - args = {} - ) @KnownFailure("Exception test fails") public void test_getMaxTableNameLength() throws SQLException { assertTrue("Now supported", meta @@ -1232,14 +1078,8 @@ public class DatabaseMetaDataNotSupportedTest extends TestCase { } /** - * @tests java.sql.DatabaseMetaData#getMaxTablesInSelect() + * java.sql.DatabaseMetaData#getMaxTablesInSelect() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "not supported", - method = "getMaxTablesInSelect", - args = {} - ) @KnownFailure("Exception test fails") public void test_getMaxTablesInSelect() throws SQLException { assertTrue("Tables in select is now supported: change test implementation\"", @@ -1257,14 +1097,8 @@ public class DatabaseMetaDataNotSupportedTest extends TestCase { } /** - * @tests java.sql.DatabaseMetaData#getMaxUserNameLength() + * java.sql.DatabaseMetaData#getMaxUserNameLength() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "usernames not supported", - method = "getMaxUserNameLength", - args = {} - ) @KnownFailure("Exception test fails") public void test_getMaxUserNameLength() throws SQLException { assertTrue("Usernames are now supported: change test implementation", diff --git a/luni/src/test/java/tests/java/sql/DatabaseMetaDataTest.java b/luni/src/test/java/tests/java/sql/DatabaseMetaDataTest.java index d334fc1..67818c5 100755 --- a/luni/src/test/java/tests/java/sql/DatabaseMetaDataTest.java +++ b/luni/src/test/java/tests/java/sql/DatabaseMetaDataTest.java @@ -16,10 +16,6 @@ package tests.java.sql; import dalvik.annotation.KnownFailure; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; import junit.extensions.TestSetup; import junit.framework.Test; @@ -44,7 +40,6 @@ import java.util.List; import java.util.Random; import java.util.StringTokenizer; -@TestTargetClass(DatabaseMetaData.class) public class DatabaseMetaDataTest extends TestCase { private static String VIEW_NAME = "myView"; @@ -163,15 +158,9 @@ public class DatabaseMetaDataTest extends TestCase { */ /** - * @tests {@link java.sql.DatabaseMetaData #getBestRowIdentifier(java.lang.String, + * {@link java.sql.DatabaseMetaData #getBestRowIdentifier(java.lang.String, * java.lang.String, java.lang.String, int, boolean) } */ - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "Not all variants of parameters can be tested: updates on resultSets are not supported.", - method = "getBestRowIdentifier", - args = {java.lang.String.class, java.lang.String.class, java.lang.String.class, int.class, boolean.class} - ) public void test_getBestRowIdentifierLjava_lang_StringLjava_lang_StringLjava_lang_StringIZ() throws SQLException { ResultSet result = statementForward.executeQuery("SELECT * FROM " @@ -229,16 +218,10 @@ public class DatabaseMetaDataTest extends TestCase { } /** - * @tests java.sql.DatabaseMetaData #getColumns(java.lang.String, + * java.sql.DatabaseMetaData #getColumns(java.lang.String, * java.lang.String, java.lang.String, java.lang.String) * */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Tests Columns and search for arbitrary columns. test fails: Columns Name's not according to spec.", - method = "getColumns", - args = {java.lang.String.class, java.lang.String.class, java.lang.String.class, java.lang.String.class} - ) @KnownFailure("Not supported : pattern with %") public void test_getColumnsArbitrary() throws SQLException { ResultSet setAllNull = null; @@ -278,16 +261,10 @@ public class DatabaseMetaDataTest extends TestCase { } /** - * @tests java.sql.DatabaseMetaData #getColumns(java.lang.String, + * java.sql.DatabaseMetaData #getColumns(java.lang.String, * java.lang.String, java.lang.String, java.lang.String) * */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Tests getColumns with no Catalog and Schema. test fails on arguments: '', '', '%', '%'", - method = "getColumns", - args = {java.lang.String.class, java.lang.String.class, java.lang.String.class, java.lang.String.class} - ) @KnownFailure("Not supported ops applied: test fails on arguments: '', '', '%', '%' ") public void test_getColumnsTableWithNoCatalogSchema() throws SQLException{ @@ -351,16 +328,10 @@ public class DatabaseMetaDataTest extends TestCase { /** - * @tests java.sql.DatabaseMetaData #getColumns(java.lang.String, + * java.sql.DatabaseMetaData #getColumns(java.lang.String, * java.lang.String, java.lang.String, java.lang.String) * */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "tests for specific tables. test fails: invalid nullable value.", - method = "getColumns", - args = {java.lang.String.class, java.lang.String.class, java.lang.String.class, java.lang.String.class} - ) @KnownFailure("Wildcard operator does not seem wo work correctly.") public void test_getColumnsSpecific() throws SQLException { String[] tablesName = { @@ -447,14 +418,8 @@ public class DatabaseMetaDataTest extends TestCase { /** - * @tests java.sql.DatabaseMetaData#getConnection() + * java.sql.DatabaseMetaData#getConnection() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "SQLException checking test fails", - method = "getConnection", - args = {} - ) public void test_getConnection() throws SQLException { assertEquals("Incorrect connection value", conn, meta.getConnection()); @@ -470,16 +435,10 @@ public class DatabaseMetaDataTest extends TestCase { } /** - * @tests java.sql.DatabaseMetaData #getCrossReference(java.lang.String, + * java.sql.DatabaseMetaData #getCrossReference(java.lang.String, * java.lang.String, java.lang.String, java.lang.String, * java.lang.String, java.lang.String) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Test fails: Foreign keys not supported", - method = "getCrossReference", - args = {java.lang.String.class, java.lang.String.class, java.lang.String.class, java.lang.String.class, java.lang.String.class, java.lang.String.class} - ) @KnownFailure("(Ticket 91) Tables apply foreign key constraint. Catalogs not supported") public void test_getCrossReferenceLjava_lang_StringLjava_lang_StringLjava_lang_StringLjava_lang_StringLjava_lang_StringLjava_lang_String() throws SQLException { @@ -558,14 +517,8 @@ public class DatabaseMetaDataTest extends TestCase { } /** - * @tests java.sql.DatabaseMetaData#getDatabaseMajorVersion() + * java.sql.DatabaseMetaData#getDatabaseMajorVersion() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "SQLException checking test fails", - method = "getDatabaseMajorVersion", - args = {} - ) @KnownFailure("Ticket 98") public void test_getDatabaseMajorVersion() throws SQLException { assertTrue("Incorrdct database major version", meta @@ -584,14 +537,8 @@ public class DatabaseMetaDataTest extends TestCase { } /** - * @tests java.sql.DatabaseMetaData#getDatabaseMinorVersion() + * java.sql.DatabaseMetaData#getDatabaseMinorVersion() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "SQLException checking test fails", - method = "getDatabaseMinorVersion", - args = {} - ) @KnownFailure("Ticket 98") public void test_getDatabaseMinorVersion() throws SQLException { assertTrue("Incorrect database minor version", meta @@ -609,14 +556,8 @@ public class DatabaseMetaDataTest extends TestCase { } /** - * @tests java.sql.DatabaseMetaData#getDatabaseProductName() + * java.sql.DatabaseMetaData#getDatabaseProductName() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "SQLException checking test fails", - method = "getDatabaseProductName", - args = {} - ) @KnownFailure("Ticket 98") public void test_getDatabaseProductName() throws SQLException { assertTrue("Incorrect database product name", !"".equals(meta @@ -635,14 +576,8 @@ public class DatabaseMetaDataTest extends TestCase { } /** - * @tests java.sql.DatabaseMetaData#getDatabaseProductVersion() + * java.sql.DatabaseMetaData#getDatabaseProductVersion() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "SQLException checking test fails", - method = "getDatabaseProductVersion", - args = {} - ) @KnownFailure("Ticket 98") public void test_getDatabaseProductVersion() throws SQLException { assertTrue("Incorrect database product version", !"".equals(meta @@ -659,14 +594,8 @@ public class DatabaseMetaDataTest extends TestCase { } /** - * @tests java.sql.DatabaseMetaData#getDefaultTransactionIsolation() + * java.sql.DatabaseMetaData#getDefaultTransactionIsolation() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "SQLException checking test fails", - method = "getDefaultTransactionIsolation", - args = {} - ) @KnownFailure("Ticket 98") public void test_getDefaultTransactionIsolation() throws SQLException { int defaultLevel = meta.getDefaultTransactionIsolation(); @@ -694,42 +623,24 @@ public class DatabaseMetaDataTest extends TestCase { } /** - * @tests java.sql.DatabaseMetaData#getDriverMajorVersion() + * java.sql.DatabaseMetaData#getDriverMajorVersion() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getDriverMajorVersion", - args = {} - ) public void test_getDriverMajorVersion() throws SQLException { assertTrue("Incorrect driver major version", meta .getDriverMajorVersion() >= 0); } /** - * @tests java.sql.DatabaseMetaData#getDriverMinorVersion() + * java.sql.DatabaseMetaData#getDriverMinorVersion() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getDriverMinorVersion", - args = {} - ) public void test_getDriverMinorVersion() { assertTrue("Incorrect driver minor version", meta .getDriverMinorVersion() >= 0); } /** - * @tests java.sql.DatabaseMetaData#getDriverName() + * java.sql.DatabaseMetaData#getDriverName() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "SQLException checking test fails", - method = "getDriverName", - args = {} - ) @KnownFailure("Ticket 98") public void test_getDriverName() throws SQLException { String driverName = meta.getDriverName(); @@ -748,14 +659,8 @@ public class DatabaseMetaDataTest extends TestCase { } /** - * @tests java.sql.DatabaseMetaData#getDriverVersion() + * java.sql.DatabaseMetaData#getDriverVersion() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getDriverVersion", - args = {} - ) @KnownFailure("Ticket 98") public void test_getDriverVersion() throws SQLException { assertTrue("Incorrect driver version", !"".equals(meta @@ -838,14 +743,8 @@ public class DatabaseMetaDataTest extends TestCase { } /** - * @tests java.sql.DatabaseMetaData#getMaxCursorNameLength() + * java.sql.DatabaseMetaData#getMaxCursorNameLength() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getMaxCursorNameLength", - args = {} - ) public void test_getMaxCursorNameLength() throws SQLException { int nameLength = meta.getMaxCursorNameLength(); if (nameLength > 0) { @@ -861,14 +760,8 @@ public class DatabaseMetaDataTest extends TestCase { } /** - * @tests java.sql.DatabaseMetaData#getJDBCMinorVersion() + * java.sql.DatabaseMetaData#getJDBCMinorVersion() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "SQLException checking test fails", - method = "getJDBCMinorVersion", - args = {} - ) @KnownFailure("Ticket 98") public void test_getJDBCMinorVersion() throws SQLException { assertTrue("Incorrect JDBC minor version", @@ -887,14 +780,8 @@ public class DatabaseMetaDataTest extends TestCase { } /** - * @tests java.sql.DatabaseMetaData#getJDBCMajorVersion() + * java.sql.DatabaseMetaData#getJDBCMajorVersion() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "SQLException checking test fails", - method = "getJDBCMajorVersion", - args = {} - ) @KnownFailure("Ticket 98") public void test_getJDBCMajorVersion() throws SQLException { assertTrue("Incorrect JDBC major version", @@ -914,14 +801,8 @@ public class DatabaseMetaDataTest extends TestCase { /** - * @tests java.sql.DatabaseMetaData#getNumericFunctions() + * java.sql.DatabaseMetaData#getNumericFunctions() */ - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "Test fails. Not implemented correctly. SQLException checking test fails", - method = "getNumericFunctions", - args = {} - ) @KnownFailure("Not supported feature, Ticket 98. Broken because "+ "NUMERIC_FUNCTIONS not complete. When fixed change to @KnownFailure") public void test_getNumericFunctions() throws SQLException { @@ -941,15 +822,9 @@ public class DatabaseMetaDataTest extends TestCase { } /** - * @tests java.sql.DatabaseMetaData #getPrimaryKeys(java.lang.String, + * java.sql.DatabaseMetaData #getPrimaryKeys(java.lang.String, * java.lang.String, java.lang.String) */ - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "Functionality test fails: keys and catalogs are not supported.", - method = "getPrimaryKeys", - args = {java.lang.String.class, java.lang.String.class, java.lang.String.class} - ) @KnownFailure(" Ticket 91 : relies on not supported features: getCatalog, keys") public void test_getPrimaryKeysLjava_lang_StringLjava_lang_StringLjava_lang_String() throws SQLException { @@ -991,14 +866,8 @@ public class DatabaseMetaDataTest extends TestCase { } /** - * @tests java.sql.DatabaseMetaData#getResultSetHoldability() + * java.sql.DatabaseMetaData#getResultSetHoldability() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "SQLException checking test fails", - method = "getResultSetHoldability", - args = {} - ) @KnownFailure("Ticket 98") public void test_getResultSetHoldability() throws SQLException { int hdb = meta.getResultSetHoldability(); @@ -1026,14 +895,8 @@ public class DatabaseMetaDataTest extends TestCase { } /** - * @tests java.sql.DatabaseMetaData#getSQLKeywords() + * java.sql.DatabaseMetaData#getSQLKeywords() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "SQLException checking test fails", - method = "getSQLKeywords", - args = {} - ) @KnownFailure("Ticket 98") public void test_getSQLKeywords() throws SQLException { assertTrue("Incorrect SQL keywords", !"".equals(meta.getSQLKeywords() @@ -1052,14 +915,8 @@ public class DatabaseMetaDataTest extends TestCase { } /** - * @tests java.sql.DatabaseMetaData#getSQLStateType() + * java.sql.DatabaseMetaData#getSQLStateType() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "SQLException checking test fails", - method = "getSQLStateType", - args = {} - ) @KnownFailure("Ticket 98") public void test_getSQLStateType() throws SQLException { int type = meta.getSQLStateType(); @@ -1086,14 +943,8 @@ public class DatabaseMetaDataTest extends TestCase { } /** - * @tests java.sql.DatabaseMetaData#getSchemas() + * java.sql.DatabaseMetaData#getSchemas() */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "SQLException checking test fails", - method = "getSchemas", - args = {} - ) @KnownFailure("Ticket 98") public void test_getSchemas() throws SQLException { ResultSet rs = meta.getSchemas(); @@ -1122,14 +973,8 @@ public class DatabaseMetaDataTest extends TestCase { } /** - * @tests java.sql.DatabaseMetaData#getSearchStringEscape() + * java.sql.DatabaseMetaData#getSearchStringEscape() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "SQLException checking test fails", - method = "getSearchStringEscape", - args = {} - ) @KnownFailure("Ticket 98") public void test_getSearchStringEscape() throws SQLException { assertTrue("Incorrect search string escape", !"".equals(meta @@ -1148,14 +993,8 @@ public class DatabaseMetaDataTest extends TestCase { } /** - * @tests java.sql.DatabaseMetaData#getStringFunctions() + * java.sql.DatabaseMetaData#getStringFunctions() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Functionality test fails. SQLException checking test fails", - method = "getStringFunctions", - args = {} - ) @KnownFailure("not supported") public void test_getStringFunctions() throws SQLException { escapedFunctions(STRING_FUNCTIONS, meta.getStringFunctions()); @@ -1176,14 +1015,8 @@ public class DatabaseMetaDataTest extends TestCase { /** - * @tests java.sql.DatabaseMetaData#getSystemFunctions() + * java.sql.DatabaseMetaData#getSystemFunctions() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Functionality test fails. SQLException checking test fails", - method = "getSystemFunctions", - args = {} - ) @KnownFailure("not supported") public void test_getSystemFunctions() throws SQLException { escapedFunctions(SYSTEM_FUNCTIONS, meta.getSystemFunctions()); @@ -1203,14 +1036,8 @@ public class DatabaseMetaDataTest extends TestCase { /** - * @tests java.sql.DatabaseMetaData#getTableTypes() + * java.sql.DatabaseMetaData#getTableTypes() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "SQLException checking test fails", - method = "getTableTypes", - args = {} - ) @KnownFailure("Ticket 98") public void test_getTableTypes() throws SQLException { String[] tableTypes = { "LOCAL TEMPORARY", "TABLE", "VIEW" }; @@ -1236,15 +1063,9 @@ public class DatabaseMetaDataTest extends TestCase { } /** - * @tests java.sql.DatabaseMetaData #getTables(java.lang.String, + * java.sql.DatabaseMetaData #getTables(java.lang.String, * java.lang.String, java.lang.String, java.lang.String[]) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Test fails.", - method = "getTables", - args = {java.lang.String.class, java.lang.String.class, java.lang.String.class, java.lang.String[].class} - ) @KnownFailure("If no schema is associated: returns empty string where actually null be returned?. Ticket 98") public void test_getTablesLjava_lang_StringLjava_lang_StringLjava_lang_String$Ljava_lang_String() throws SQLException { @@ -1318,14 +1139,8 @@ public class DatabaseMetaDataTest extends TestCase { } /** - * @tests java.sql.DatabaseMetaData#getTimeDateFunctions() + * java.sql.DatabaseMetaData#getTimeDateFunctions() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Does not return any functions. test fails. SQLException checking test fails", - method = "getTimeDateFunctions", - args = {} - ) @KnownFailure("not supported") public void test_getTimeDateFunctions() throws SQLException { @@ -1344,14 +1159,8 @@ public class DatabaseMetaDataTest extends TestCase { } /** - * @tests java.sql.DatabaseMetaData#getTypeInfo() + * java.sql.DatabaseMetaData#getTypeInfo() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "SQLException checking test fails", - method = "getTypeInfo", - args = {} - ) @KnownFailure("not supported") public void test_getTypeInfo() throws SQLException { insertNewRecord(); @@ -1401,14 +1210,8 @@ public class DatabaseMetaDataTest extends TestCase { /** - * @tests java.sql.DatabaseMetaData#getURL() + * java.sql.DatabaseMetaData#getURL() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "SQLException checking test fails", - method = "getURL", - args = {} - ) @KnownFailure("Ticket 98") public void test_getURL() throws SQLException { assertEquals("Wrong url", Support_SQL.sqlUrl, meta.getURL()); @@ -1443,14 +1246,8 @@ public class DatabaseMetaDataTest extends TestCase { /** - * @tests java.sql.DatabaseMetaData#insertsAreDetected(int) + * java.sql.DatabaseMetaData#insertsAreDetected(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "SQLException checking test fails", - method = "insertsAreDetected", - args = {int.class} - ) @KnownFailure("Ticket 98") public void test_insertsAreDetectedI() throws SQLException { assertFalse( @@ -1477,14 +1274,8 @@ public class DatabaseMetaDataTest extends TestCase { } /** - * @tests java.sql.DatabaseMetaData#isReadOnly() + * java.sql.DatabaseMetaData#isReadOnly() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "SQLException checking test fails", - method = "isReadOnly", - args = {} - ) @KnownFailure("Ticket 98") public void test_isReadOnly() throws SQLException { assertFalse("database is not read-only", meta.isReadOnly()); @@ -1502,14 +1293,8 @@ public class DatabaseMetaDataTest extends TestCase { } /** - * @tests java.sql.DatabaseMetaData#othersDeletesAreVisible(int) + * java.sql.DatabaseMetaData#othersDeletesAreVisible(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "SQLException checking test fails.", - method = "othersDeletesAreVisible", - args = {int.class} - ) @KnownFailure("Ticket 98") public void test_othersDeletesAreVisibleI() throws SQLException { assertFalse( @@ -1537,14 +1322,8 @@ public class DatabaseMetaDataTest extends TestCase { } /** - * @tests java.sql.DatabaseMetaData#othersInsertsAreVisible(int) + * java.sql.DatabaseMetaData#othersInsertsAreVisible(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "othersInsertsAreVisible", - args = {int.class} - ) @KnownFailure("Ticket 98") public void test_othersInsertsAreVisibleI() throws SQLException { assertFalse( @@ -1572,14 +1351,8 @@ public class DatabaseMetaDataTest extends TestCase { } /** - * @tests java.sql.DatabaseMetaData#othersUpdatesAreVisible(int) + * java.sql.DatabaseMetaData#othersUpdatesAreVisible(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = " Verification with invalid parameters missed.", - method = "othersUpdatesAreVisible", - args = {int.class} - ) @KnownFailure("Ticket 98") public void test_othersUpdatesAreVisibleI() throws SQLException { assertFalse( @@ -1604,22 +1377,8 @@ public class DatabaseMetaDataTest extends TestCase { } /** - * @tests java.sql.DatabaseMetaData#storesMixedCaseQuotedIdentifiers() + * java.sql.DatabaseMetaData#storesMixedCaseQuotedIdentifiers() */ - @TestTargets ({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "SQLException checking test fails", - method = "storesMixedCaseQuotedIdentifiers", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "SQLException checking test fails", - method = "storesMixedCaseIdentifiers", - args = {} - ) - }) public void test_storesMixedCaseQuotedIdentifiers() throws SQLException { String quote = meta.getIdentifierQuoteString(); @@ -1663,12 +1422,6 @@ public class DatabaseMetaDataTest extends TestCase { } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Exception test fails.", - method = "getIdentifierQuoteString", - args = {} - ) @KnownFailure("Ticket 98") public void testGetIdentifierQuoteString() throws SQLException { assertNotNull( @@ -1690,14 +1443,8 @@ public class DatabaseMetaDataTest extends TestCase { /** - * @tests java.sql.DatabaseMetaData#supportsColumnAliasing() + * java.sql.DatabaseMetaData#supportsColumnAliasing() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "SQLException checking test fails", - method = "supportsColumnAliasing", - args = {} - ) @KnownFailure("not supported. SQLException checking test fails") public void test_supportsColumnAliasing() throws SQLException { insertNewRecord(); @@ -1733,14 +1480,8 @@ public class DatabaseMetaDataTest extends TestCase { /** - * @tests java.sql.DatabaseMetaData#supportsExpressionsInOrderBy() + * java.sql.DatabaseMetaData#supportsExpressionsInOrderBy() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "SQLException checking test fails", - method = "supportsExpressionsInOrderBy", - args = {} - ) @KnownFailure("exception test fails") public void test_supportsExpressionsInOrderBy() throws SQLException { insertNewRecord(); @@ -1773,14 +1514,8 @@ public class DatabaseMetaDataTest extends TestCase { /** - * @tests java.sql.DatabaseMetaData#supportsGroupBy() + * java.sql.DatabaseMetaData#supportsGroupBy() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "SQLException checking test fails", - method = "supportsGroupBy", - args = {} - ) @KnownFailure("exception test fails") public void test_supportsGroupBy() throws SQLException { insertNewRecord(); @@ -1813,14 +1548,8 @@ public class DatabaseMetaDataTest extends TestCase { /** - * @tests java.sql.DatabaseMetaData#supportsGroupByUnrelated() + * java.sql.DatabaseMetaData#supportsGroupByUnrelated() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "SQLException checking test fails", - method = "supportsGroupByUnrelated", - args = {} - ) @KnownFailure("exception test fails") public void test_supportsGroupByUnrelated() throws SQLException { insertNewRecord(); @@ -1852,14 +1581,8 @@ public class DatabaseMetaDataTest extends TestCase { } /** - * @tests java.sql.DatabaseMetaData#supportsNonNullableColumns() + * java.sql.DatabaseMetaData#supportsNonNullableColumns() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "SQLException thrown", - method = "supportsNonNullableColumns", - args = {} - ) @KnownFailure("Ticket 98") public void test_supportsNonNullableColumns() throws SQLException { assertTrue( @@ -1882,14 +1605,8 @@ public class DatabaseMetaDataTest extends TestCase { } /** - * @tests java.sql.DatabaseMetaData#supportsOrderByUnrelated() + * java.sql.DatabaseMetaData#supportsOrderByUnrelated() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "SQLException checking test fails", - method = "supportsOrderByUnrelated", - args = {} - ) @KnownFailure("exception test fails") public void test_supportsOrderByUnrelated() throws SQLException { insertNewRecord(); @@ -1921,14 +1638,8 @@ public class DatabaseMetaDataTest extends TestCase { } /** - * @tests java.sql.DatabaseMetaData#supportsSelectForUpdate() + * java.sql.DatabaseMetaData#supportsSelectForUpdate() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "SQLException checking test fails", - method = "supportsSelectForUpdate", - args = {} - ) @KnownFailure("exception test fails") public void test_supportsSelectForUpdate() throws SQLException { insertNewRecord(); @@ -1961,14 +1672,8 @@ public class DatabaseMetaDataTest extends TestCase { } /** - * @tests java.sql.DatabaseMetaData#supportsSubqueriesInExists() + * java.sql.DatabaseMetaData#supportsSubqueriesInExists() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "SQLException checking test fails", - method = "supportsSubqueriesInExists", - args = {} - ) @KnownFailure("exception test fails") public void test_supportsSubqueriesInExists() throws SQLException { insertNewRecord(); @@ -2003,14 +1708,8 @@ public class DatabaseMetaDataTest extends TestCase { } /** - * @tests java.sql.DatabaseMetaData#supportsTableCorrelationNames() + * java.sql.DatabaseMetaData#supportsTableCorrelationNames() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "SQLException checking test fails", - method = "supportsTableCorrelationNames", - args = {} - ) @KnownFailure("exception test fails") public void test_supportsTableCorrelationNames() throws SQLException { @@ -2048,14 +1747,8 @@ public class DatabaseMetaDataTest extends TestCase { } /** - * @tests java.sql.DatabaseMetaData#supportsTransactionIsolationLevel(int) + * java.sql.DatabaseMetaData#supportsTransactionIsolationLevel(int) */ - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = " Not all Transaction isolation levels supported.", - method = "supportsTransactionIsolationLevel", - args = {int.class} - ) public void test_supportsTransactionIsolationLevelI() throws SQLException { assertFalse("database supports TRANSACTION_NONE isolation level", meta .supportsTransactionIsolationLevel(Connection.TRANSACTION_NONE)); @@ -2089,14 +1782,8 @@ public class DatabaseMetaDataTest extends TestCase { } /** - * @tests java.sql.DatabaseMetaData#updatesAreDetected(int) + * java.sql.DatabaseMetaData#updatesAreDetected(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = " Verification with invalid parameters missed.", - method = "updatesAreDetected", - args = {int.class} - ) public void test_updatesAreDetectedI() throws SQLException { assertFalse( "visible row update can be detected for TYPE_FORWARD_ONLY type", @@ -2557,12 +2244,6 @@ public class DatabaseMetaDataTest extends TestCase { * * @throws SQLException */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Derby test for getSchema", - method = "getSchemas", - args = {} - ) public void testGetSchemasReadOnly() throws SQLException { ResultSet rs = meta.getSchemas(); diff --git a/luni/src/test/java/tests/java/sql/DeleteFunctionalityTest.java b/luni/src/test/java/tests/java/sql/DeleteFunctionalityTest.java index f760d1d..53e3eb3 100755 --- a/luni/src/test/java/tests/java/sql/DeleteFunctionalityTest.java +++ b/luni/src/test/java/tests/java/sql/DeleteFunctionalityTest.java @@ -16,10 +16,6 @@ package tests.java.sql; import dalvik.annotation.KnownFailure; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; import java.sql.Connection; import java.sql.DatabaseMetaData; @@ -35,7 +31,7 @@ import junit.extensions.TestSetup; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -@TestTargetClass(Statement.class) + public class DeleteFunctionalityTest extends TestCase { private static Connection conn = null; @@ -104,15 +100,9 @@ public class DeleteFunctionalityTest extends TestCase { } /** - * @tests DeleteFunctionalityTest#testDelete1(). Deletes row with no + * DeleteFunctionalityTest#testDelete1(). Deletes row with no * referencing ones and RESTRICT action */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Deletes row with no referencing ones and RESTRICT action", - method = "execute", - args = {java.lang.String.class} - ) public void testDelete1() throws SQLException { DatabaseCreator.fillFKStrictTable(conn); statement.execute("DELETE FROM " + DatabaseCreator.PARENT_TABLE @@ -120,7 +110,7 @@ public class DeleteFunctionalityTest extends TestCase { } /** - * @tests DeleteFunctionalityTest#testDelete2(). Attempts to delete row with + * DeleteFunctionalityTest#testDelete2(). Attempts to delete row with * referencing ones and RESTRICT action - expecting SQLException * TODO foreign key functionality is not supported */ @@ -136,15 +126,9 @@ public class DeleteFunctionalityTest extends TestCase { } */ /** - * @tests DeleteFunctionalityTest#testDelete3(). Deletes all referencing + * DeleteFunctionalityTest#testDelete3(). Deletes all referencing * rows and then deletes referenced one */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Deletes all referencing rows and then deletes referenced one", - method = "execute", - args = {java.lang.String.class} - ) public void testDelete3() throws SQLException { statement.execute("DELETE FROM " + DatabaseCreator.FKSTRICT_TABLE + " WHERE name_id = 1;"); @@ -153,15 +137,9 @@ public class DeleteFunctionalityTest extends TestCase { } /** - * @tests DeleteFunctionalityTest#testDelete4(). Deletes row with no + * DeleteFunctionalityTest#testDelete4(). Deletes row with no * referencing ones and CASCADE action */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Deletes row with no referencing ones and CASCADE action", - method = "execute", - args = {java.lang.String.class} - ) public void testDelete4() throws SQLException { DatabaseCreator.fillFKCascadeTable(conn); statement.execute("DELETE FROM " + DatabaseCreator.PARENT_TABLE @@ -169,24 +147,10 @@ public class DeleteFunctionalityTest extends TestCase { } /** - * @tests DeleteFunctionalityTest#testDelete5(). Attempts to delete row with + * DeleteFunctionalityTest#testDelete5(). Attempts to delete row with * referencing ones and CASCADE action - expecting all referencing * rows will also be deleted */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Attempts to delete row with referencing ones and CASCADE action - expecting all referencing rows will also be deleted", - method = "execute", - args = {java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Attempts to delete row with referencing ones and CASCADE action - expecting all referencing rows will also be deleted", - method = "executeQuery", - args = {java.lang.String.class} - ) - }) public void testDelete5() throws SQLException { statement.execute("DELETE FROM " + DatabaseCreator.PARENT_TABLE + " WHERE id = 1;"); @@ -199,15 +163,9 @@ public class DeleteFunctionalityTest extends TestCase { } /** - * @tests DeleteFunctionalityTest#testDelete6(). + * DeleteFunctionalityTest#testDelete6(). * TODO Foreign key functionality is not supported */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Deletes rows using subquery in WHERE clause with foreign keys. Foreign keys not supported.", - method = "execute", - args = {String.class} - ) @KnownFailure("not supported") public void testDelete6() throws SQLException { DatabaseCreator.fillFKStrictTable(conn); @@ -222,15 +180,9 @@ public class DeleteFunctionalityTest extends TestCase { } /** - * @tests DeleteFunctionalityTest#testDelete7(). Deletes rows using + * DeleteFunctionalityTest#testDelete7(). Deletes rows using * PreparedStatement */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Deletes rows using PreparedStatement", - method = "executeQuery", - args = {java.lang.String.class} - ) public void testDelete7() throws SQLException { DatabaseCreator.fillTestTable5(conn); PreparedStatement stat = conn.prepareStatement("DELETE FROM " diff --git a/luni/src/test/java/tests/java/sql/InsertFunctionalityTest.java b/luni/src/test/java/tests/java/sql/InsertFunctionalityTest.java index 825352f..3c6c28f 100755 --- a/luni/src/test/java/tests/java/sql/InsertFunctionalityTest.java +++ b/luni/src/test/java/tests/java/sql/InsertFunctionalityTest.java @@ -15,12 +15,6 @@ */ package tests.java.sql; -import dalvik.annotation.KnownFailure; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.sql.Connection; import java.sql.DatabaseMetaData; import java.sql.PreparedStatement; @@ -36,7 +30,6 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -@TestTargetClass(Statement.class) public class InsertFunctionalityTest extends TestCase { private static Connection conn = null; @@ -116,15 +109,9 @@ public class InsertFunctionalityTest extends TestCase { } /** - * @tests InsertFunctionalityTest#testInsert1(). Attempts to insert row into + * InsertFunctionalityTest#testInsert1(). Attempts to insert row into * table with integrity checking */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Attempts to insert row into table with integrity checking", - method = "execute", - args = {java.lang.String.class} - ) public void testInsert1() throws SQLException { DatabaseCreator.fillParentTable(conn); DatabaseCreator.fillFKStrictTable(conn); @@ -136,16 +123,10 @@ public class InsertFunctionalityTest extends TestCase { } /** - * @tests InsertFunctionalityTest#testInsert2(). Attempts to insert row into + * InsertFunctionalityTest#testInsert2(). Attempts to insert row into * table with integrity checking when row has incorrect foreign key * value - expecting SQLException */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Attempts to insert row into table with integrity checking when row has incorrect foreign key value - expecting SQLException", - method = "execute", - args = {java.lang.String.class} - ) public void testInsert2() throws SQLException { DatabaseCreator.fillParentTable(conn); DatabaseCreator.fillFKStrictTable(conn); @@ -169,23 +150,9 @@ public class InsertFunctionalityTest extends TestCase { } /** - * @tests InsertFunctionalityTest#testInsert3(). Tests INSERT ... SELECT + * InsertFunctionalityTest#testInsert3(). Tests INSERT ... SELECT * functionality */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Tests INSERT ... SELECT functionality", - method = "execute", - args = {java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Tests INSERT ... SELECT functionality", - method = "executeQuery", - args = {java.lang.String.class} - ) - }) public void testInsert3() throws SQLException { DatabaseCreator.fillParentTable(conn); DatabaseCreator.fillFKStrictTable(conn); @@ -200,23 +167,9 @@ public class InsertFunctionalityTest extends TestCase { } /** - * @tests InsertFunctionalityTest#testInsert4(). Tests INSERT ... SELECT + * InsertFunctionalityTest#testInsert4(). Tests INSERT ... SELECT * with expressions in SELECT query */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Tests INSERT ... SELECT with expressions in SELECT query", - method = "execute", - args = {java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Tests INSERT ... SELECT with expressions in SELECT query", - method = "executeQuery", - args = {java.lang.String.class} - ) - }) public void testInsert4() throws SQLException { DatabaseCreator.fillSimpleTable1(conn); statement.execute("INSERT INTO " + DatabaseCreator.SIMPLE_TABLE2 @@ -232,23 +185,9 @@ public class InsertFunctionalityTest extends TestCase { } /** - * @tests InsertFunctionalityTest#testInsert5(). Inserts multiple rows using + * InsertFunctionalityTest#testInsert5(). Inserts multiple rows using * UNION ALL */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Inserts multiple rows using UNION ALL", - method = "execute", - args = {java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Inserts multiple rows using UNION ALL", - method = "executeQuery", - args = {java.lang.String.class} - ) - }) public void testInsert5() throws SQLException { statement.execute("INSERT INTO " + DatabaseCreator.TEST_TABLE5 + " SELECT 1 as testId, 2 as testValue " @@ -262,15 +201,9 @@ public class InsertFunctionalityTest extends TestCase { } /** - * @tests InsertFunctionalityTest#testInsert6(). Tests INSERT with + * InsertFunctionalityTest#testInsert6(). Tests INSERT with * PreparedStatement */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Tests INSERT with PreparedStatement", - method = "executeQuery", - args = {java.lang.String.class} - ) public void testInsertPrepared() throws SQLException { PreparedStatement stat = conn.prepareStatement("INSERT INTO " + DatabaseCreator.TEST_TABLE5 + " VALUES(?, ?)"); diff --git a/luni/src/test/java/tests/java/sql/MultiThreadAccessTest.java b/luni/src/test/java/tests/java/sql/MultiThreadAccessTest.java index d7dd0bf..947777b 100755 --- a/luni/src/test/java/tests/java/sql/MultiThreadAccessTest.java +++ b/luni/src/test/java/tests/java/sql/MultiThreadAccessTest.java @@ -16,11 +16,6 @@ package tests.java.sql; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.math.BigDecimal; import java.sql.Connection; import java.sql.ResultSet; @@ -37,7 +32,6 @@ import junit.framework.TestSuite; import tests.support.ThreadPool; -@TestTargetClass(Statement.class) public class MultiThreadAccessTest extends TestCase { private static Connection conn; @@ -123,12 +117,6 @@ public class MultiThreadAccessTest extends TestCase { * * @throws SQLException */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Functionality test: A few threads execute select operation in the same time for one table in the database.", - method = "executeQuery", - args = {java.lang.String.class} - ) public void test_MultipleAccessToOneTable() throws SQLException { for (int i = 0; i < numThreads; i++) { threadPool.runTask(createTask1(i)); @@ -142,12 +130,6 @@ public class MultiThreadAccessTest extends TestCase { * * @throws SQLException */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Functionality test: A few threads execute select operation in the same time for different tables in the database", - method = "executeQuery", - args = {java.lang.String.class} - ) public void test_MultipleAccessToSeveralTables() throws SQLException { threadPool.runTask(createTask1(1)); threadPool.runTask(createTask2(2)); @@ -161,12 +143,6 @@ public class MultiThreadAccessTest extends TestCase { * * @throws SQLException */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Functionality test: A few threads execute update, insert and delete operations in the same time for one table in the database", - method = "executeQuery", - args = {java.lang.String.class} - ) public void test_MultipleOperationsInSeveralTables() throws SQLException { int id1 = numOfRecords - 1; threadPool.runTask(createTask4(id1)); @@ -222,12 +198,6 @@ public class MultiThreadAccessTest extends TestCase { * * @throws SQLException */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Functional test: A few threads execute update operation in the same time for one tables in the database", - method = "executeQuery", - args = {java.lang.String.class} - ) public void test_MultipleUpdatesInOneTables() throws SQLException { int id = 1; String field = "field3"; @@ -460,4 +430,4 @@ public class MultiThreadAccessTest extends TestCase { } }; } -}
\ No newline at end of file +} diff --git a/luni/src/test/java/tests/java/sql/QueryTimeoutTest.java b/luni/src/test/java/tests/java/sql/QueryTimeoutTest.java index 54c2c57..c553e31 100644 --- a/luni/src/test/java/tests/java/sql/QueryTimeoutTest.java +++ b/luni/src/test/java/tests/java/sql/QueryTimeoutTest.java @@ -20,10 +20,6 @@ package tests.java.sql; import SQLite.Database; import SQLite.Function; import SQLite.FunctionContext; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; import junit.extensions.TestSetup; import junit.framework.Test; @@ -76,7 +72,6 @@ import java.util.HashSet; * timeout. Verifies that the correct exception is thrown. * 4. Tests that the query timeout value is not forgotten after the execution of a statement. */ -@TestTargetClass(Statement.class) public class QueryTimeoutTest extends TestCase { private static Statement statement; @@ -341,12 +336,6 @@ public class QueryTimeoutTest extends TestCase { /** * Part 1 of this test. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Testing timeout with fetch operations", - method = "setQueryTimeout", - args = {int.class} - ) public static void testTimeoutWithFetch() throws TestFailedException { System.out.println("Testing timeout with fetch operations"); @@ -434,12 +423,6 @@ public class QueryTimeoutTest extends TestCase { * * Part two of this test. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "test timeout with st.exec()", - method = "setQueryTimeout", - args = {int.class} - ) public static void testTimeoutWithExec() throws TestFailedException { System.out.println("Testing timeout with an execute operation"); @@ -519,12 +502,6 @@ public class QueryTimeoutTest extends TestCase { * @test {@link java.sql.Statement#setQueryTimeout(int) } * */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Testing setting a negative timeout value", - method = "setQueryTimeout", - args = {int.class} - ) public static void testInvalidTimeoutValue(Connection conn) throws TestFailedException { @@ -581,12 +558,6 @@ public class QueryTimeoutTest extends TestCase { * * Part two of this test. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "timeout with executeUpdate call", - method = "setQueryTimeout", - args = {int.class} - ) public static void testTimeoutWithExecuteUpdate() throws TestFailedException { System.out.println("Testing timeout with executeUpdate call."); @@ -600,12 +571,6 @@ public class QueryTimeoutTest extends TestCase { } /** Test for DERBY-1692. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Testing that Statement considers timeout.", - method = "setQueryTimeout", - args = {int.class} - ) public static void testRememberTimeoutValue() throws TestFailedException { String sql = getFetchQuery("t"); diff --git a/luni/src/test/java/tests/java/sql/SelectFunctionalityTest.java b/luni/src/test/java/tests/java/sql/SelectFunctionalityTest.java index 758bd3e..4c02853 100755 --- a/luni/src/test/java/tests/java/sql/SelectFunctionalityTest.java +++ b/luni/src/test/java/tests/java/sql/SelectFunctionalityTest.java @@ -17,10 +17,6 @@ package tests.java.sql; import dalvik.annotation.KnownFailure; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; import java.io.CharArrayReader; import java.math.BigDecimal; @@ -43,7 +39,6 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -@TestTargetClass(Statement.class) public class SelectFunctionalityTest extends TestCase { private static Connection conn; @@ -129,15 +124,9 @@ public class SelectFunctionalityTest extends TestCase { } /** - * @tests SelectFunctionalityTest#test_SelectSimple(). Selects all records + * SelectFunctionalityTest#test_SelectSimple(). Selects all records * from the table */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Selects all records from the table", - method = "executeQuery", - args = {java.lang.String.class} - ) public void test_SelectSimple() throws SQLException { String sql = "SELECT * FROM " + DatabaseCreator.TEST_TABLE2; ResultSet result = statement.executeQuery(sql); @@ -178,15 +167,9 @@ public class SelectFunctionalityTest extends TestCase { } /** - * @tests SelectFunctionalityTest#test_SelectPrepared(). Selects all records + * SelectFunctionalityTest#test_SelectPrepared(). Selects all records * from the table using parametric query */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Selects all records from the table using parametric query", - method = "executeQuery", - args = {java.lang.String.class} - ) public void test_SelectPrepared() throws SQLException { String sql = "SELECT finteger, ftext, fcharacter, fdecimal, fnumeric," + " fsmallint, ffloat, freal, fdouble, fdate, ftime" + " FROM " @@ -246,15 +229,9 @@ public class SelectFunctionalityTest extends TestCase { } /** - * @tests SelectFunctionalityTest#test_SubSelect(). Selects records from the + * SelectFunctionalityTest#test_SubSelect(). Selects records from the * table using subselect */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Selects records from the table using subselect", - method = "executeQuery", - args = {java.lang.String.class} - ) public void test_SubSelect() throws SQLException { String sql = "SELECT finteger," + " (SELECT ftext FROM " + DatabaseCreator.TEST_TABLE2 + " WHERE finteger = 1) as ftext" @@ -281,15 +258,9 @@ public class SelectFunctionalityTest extends TestCase { } /** - * @tests SelectFunctionalityTest#test_SelectThreeTables(). Selects records + * SelectFunctionalityTest#test_SelectThreeTables(). Selects records * from a few tables */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Selects records from a few tables", - method = "executeQuery", - args = {java.lang.String.class} - ) public void test_SelectThreeTables() throws SQLException { String sql = "SELECT onum, " + DatabaseCreator.ORDERS_TABLE + ".cnum" + " FROM " + DatabaseCreator.SALESPEOPLE_TABLE + ", " @@ -325,15 +296,9 @@ public class SelectFunctionalityTest extends TestCase { } /** - * @tests SelectFunctionalityTest#test_SelectThreeTables(). Selects records + * SelectFunctionalityTest#test_SelectThreeTables(). Selects records * from a table using union */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Selects records from a table using union", - method = "executeQuery", - args = {java.lang.String.class} - ) public void test_SelectUnionItself() throws SQLException { String sql = "SELECT b.cnum, b.cname" + " FROM " + DatabaseCreator.CUSTOMERS_TABLE + " a, " @@ -359,15 +324,9 @@ public class SelectFunctionalityTest extends TestCase { } /** - * @tests SelectFunctionalityTest#test_SelectLeftOuterJoin(). Selects + * SelectFunctionalityTest#test_SelectLeftOuterJoin(). Selects * records from a table using left join */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Selects records from a table using left join", - method = "executeQuery", - args = {java.lang.String.class} - ) public void test_SelectLeftOuterJoin() throws SQLException { String sql = "SELECT distinct s.snum as ssnum, c.snum as ccnum FROM " + DatabaseCreator.CUSTOMERS_TABLE + " c left outer join " @@ -395,17 +354,11 @@ public class SelectFunctionalityTest extends TestCase { } /** - * @tests SelectFunctionalityTest#test_SelectRightOuterJoin(). Selects + * SelectFunctionalityTest#test_SelectRightOuterJoin(). Selects * records from a table using right join * * TODO RIGHT and FULL OUTER JOINs are not supported */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "tests right outer joins. RIGHT and FULL OUTER JOINs are not supported", - method = "executeQuery", - args = {java.lang.String.class} - ) @KnownFailure("not supported") public void test_SelectRightOuterJoin() throws SQLException { String sql = "SELECT distinct s.snum as ssnum, c.snum as ccnum FROM " @@ -435,15 +388,9 @@ public class SelectFunctionalityTest extends TestCase { } /** - * @tests SelectFunctionalityTest#test_SelectGroupBy(). Selects records from + * SelectFunctionalityTest#test_SelectGroupBy(). Selects records from * a table using group by */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Selects records from a table using group by", - method = "executeQuery", - args = {java.lang.String.class} - ) public void test_SelectGroupBy() throws SQLException { String selectQuery = "SELECT rating, SUM(snum) AS sum FROM " + DatabaseCreator.CUSTOMERS_TABLE + " GROUP BY rating"; @@ -468,15 +415,9 @@ public class SelectFunctionalityTest extends TestCase { } /** - * @tests SelectFunctionalityTest#test_SelectOrderBy(). Selects records from + * SelectFunctionalityTest#test_SelectOrderBy(). Selects records from * a table using order by */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Selects records from a table using order by", - method = "executeQuery", - args = {java.lang.String.class} - ) public void test_SelectOrderBy() throws SQLException { String selectQuery = "SELECT onum FROM " + DatabaseCreator.ORDERS_TABLE + " ORDER BY onum"; @@ -507,15 +448,9 @@ public class SelectFunctionalityTest extends TestCase { } /** - * @tests SelectFunctionalityTest#test_SelectDistinct(). Selects records + * SelectFunctionalityTest#test_SelectDistinct(). Selects records * from a table using distinct */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Selects records from a table using distinct", - method = "executeQuery", - args = {java.lang.String.class} - ) public void test_SelectDistinct() throws SQLException { String selectQuery = "SELECT DISTINCT rating FROM " + DatabaseCreator.CUSTOMERS_TABLE; @@ -537,15 +472,9 @@ public class SelectFunctionalityTest extends TestCase { } /** - * @tests SelectFunctionalityTest#test_SelectAgregateFunctions(). Selects + * SelectFunctionalityTest#test_SelectAgregateFunctions(). Selects * records from a table using agregate functions */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Selects records from a table using agregate functions", - method = "executeQuery", - args = {java.lang.String.class} - ) public void test_SelectAgregateFunctions() throws SQLException { String selectCount = "SELECT count(onum) as count FROM " + DatabaseCreator.ORDERS_TABLE; @@ -590,15 +519,9 @@ public class SelectFunctionalityTest extends TestCase { } /** - * @tests SelectFunctionalityTest#test_SelectHaving(). Selects records from + * SelectFunctionalityTest#test_SelectHaving(). Selects records from * a table using having */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Selects records from a table using having", - method = "executeQuery", - args = {java.lang.String.class} - ) public void test_SelectHaving() throws SQLException { String selectQuery = "SELECT snum, max(amt) AS max FROM " + DatabaseCreator.ORDERS_TABLE diff --git a/luni/src/test/java/tests/java/sql/StressTest.java b/luni/src/test/java/tests/java/sql/StressTest.java index 8bf695d..b981d5e 100755 --- a/luni/src/test/java/tests/java/sql/StressTest.java +++ b/luni/src/test/java/tests/java/sql/StressTest.java @@ -16,11 +16,6 @@ package tests.java.sql; -import dalvik.annotation.BrokenTest; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.sql.Connection; import java.sql.DatabaseMetaData; import java.sql.Driver; @@ -37,7 +32,6 @@ import tests.support.Support_SQL; import tests.support.ThreadPool; import junit.framework.TestCase; -@TestTargetClass(Statement.class) public class StressTest extends TestCase { Vector<Connection> vc = new Vector<Connection>(); @@ -108,15 +102,9 @@ public class StressTest extends TestCase { // } /** - * @tests StressTest#testManyConnectionsUsingOneThread(). Create many + * StressTest#testManyConnectionsUsingOneThread(). Create many * connections to the DataBase using one thread. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - method = "connect", - clazz = Driver.class, - args = {String.class, Properties.class} - ) public void testManyConnectionsUsingOneThread() { try { int maxConnections = getConnectionNum(); @@ -129,16 +117,9 @@ public class StressTest extends TestCase { } /** - * @tests StressTest#testManyConnectionsUsingManyThreads(). Create many + * StressTest#testManyConnectionsUsingManyThreads(). Create many * connections to the DataBase using some threads. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Stress test: Create many connections to the DataBase using some threads", - method = "connect", - clazz = Driver.class, - args = {String.class, Properties.class} - ) public void testManyConnectionsUsingManyThreads() { int numTasks = getConnectionNum(); @@ -165,15 +146,9 @@ public class StressTest extends TestCase { } /** - * @tests StressTest#testInsertOfManyRowsUsingOneThread(). Insert a lot of + * StressTest#testInsertOfManyRowsUsingOneThread(). Insert a lot of * records to the Database using a maximum number of connections. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - method = "connect", - clazz = Driver.class, - args = {String.class, Properties.class} - ) public void testInsertOfManyRowsUsingOneThread() { Logger.global @@ -213,12 +188,6 @@ public class StressTest extends TestCase { /** * @tests */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - method = "connect", - clazz = Driver.class, - args = {String.class, Properties.class} - ) public void testInsertOfManyRowsUsingManyThreads() { Logger.global.info("java.sql stress test: multiple threads and many operations."); diff --git a/luni/src/test/java/tests/java/sql/UpdateFunctionalityTest.java b/luni/src/test/java/tests/java/sql/UpdateFunctionalityTest.java index cbed7dc..c5cf143 100755 --- a/luni/src/test/java/tests/java/sql/UpdateFunctionalityTest.java +++ b/luni/src/test/java/tests/java/sql/UpdateFunctionalityTest.java @@ -16,11 +16,6 @@ package tests.java.sql; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; - import java.math.BigDecimal; import java.sql.Connection; import java.sql.DatabaseMetaData; @@ -36,7 +31,6 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -@TestTargetClass(Statement.class) public class UpdateFunctionalityTest extends TestCase { private static final int numberOfRecords = 20; @@ -106,23 +100,9 @@ public class UpdateFunctionalityTest extends TestCase { } /** - * @tests UpdateFunctionalityTest#testUpdate1(). Updates all values in one + * UpdateFunctionalityTest#testUpdate1(). Updates all values in one * column in the table */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Updates all values in one column in the table", - method = "executeUpdate", - args = {java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Updates all values in one column in the table", - method = "executeQuery", - args = {java.lang.String.class} - ) - }) public void testUpdate1() { String newValue = "newValue"; String updateQuery = "UPDATE " + DatabaseCreator.TEST_TABLE1 @@ -145,23 +125,9 @@ public class UpdateFunctionalityTest extends TestCase { } /** - * @tests UpdateFunctionalityTest#testUpdate2(). Updates values in one + * UpdateFunctionalityTest#testUpdate2(). Updates values in one * column in the table using where condition in update command */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Updates values in one column in the table using where condition in update command", - method = "executeUpdate", - args = {java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Updates values in one column in the table using where condition in update command", - method = "executeQuery", - args = {java.lang.String.class} - ) - }) public void testUpdate2() { String newValue = "newValue"; String updateQuery = "UPDATE " + DatabaseCreator.TEST_TABLE1 @@ -191,23 +157,9 @@ public class UpdateFunctionalityTest extends TestCase { } /** - * @tests UpdateFunctionalityTest#testUpdate3(). Updates values in a several + * UpdateFunctionalityTest#testUpdate3(). Updates values in a several * columns in the table */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Updates values in a several columns in the table", - method = "executeUpdate", - args = {java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Updates values in a several columns in the table", - method = "executeQuery", - args = {java.lang.String.class} - ) - }) public void testUpdate3() { int newValue1 = -1; int newValue2 = -2; @@ -234,23 +186,9 @@ public class UpdateFunctionalityTest extends TestCase { } /** - * @tests UpdateFunctionalityTest#testUpdate4(). Updates values in a several + * UpdateFunctionalityTest#testUpdate4(). Updates values in a several * columns in the table using where condition in update command */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Updates values in a several columns in the table using where condition in update command", - method = "executeUpdate", - args = {java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Updates values in a several columns in the table using where condition in update command", - method = "executeQuery", - args = {java.lang.String.class} - ) - }) public void testUpdate4() { int newValue1 = -1; int newValue2 = -2; @@ -287,23 +225,9 @@ public class UpdateFunctionalityTest extends TestCase { } /** - * @tests UpdateFunctionalityTest#testUpdate5(). Updates values in one + * UpdateFunctionalityTest#testUpdate5(). Updates values in one * columns in the table using condition */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Updates values in one columns in the table using condition", - method = "executeUpdate", - args = {java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Updates values in one columns in the table using condition", - method = "executeQuery", - args = {java.lang.String.class} - ) - }) public void testUpdate5() { int factor = 3; String updateQuery = "UPDATE " + DatabaseCreator.TEST_TABLE1 @@ -339,23 +263,9 @@ public class UpdateFunctionalityTest extends TestCase { } /** - * @tests UpdateFunctionalityTest#testUpdate6(). Sets value of field2 to + * UpdateFunctionalityTest#testUpdate6(). Sets value of field2 to * default */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Sets value of field2 to default", - method = "executeUpdate", - args = {java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Sets value of field2 to default", - method = "executeQuery", - args = {java.lang.String.class} - ) - }) public void testUpdate6() { String updateQuery = "UPDATE " + DatabaseCreator.TEST_TABLE1 + " SET field2='1'"; @@ -380,23 +290,9 @@ public class UpdateFunctionalityTest extends TestCase { } /** - * @tests UpdateFunctionalityTest#testUpdate7(). Updates records in the + * UpdateFunctionalityTest#testUpdate7(). Updates records in the * table using subquery in update command */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Updates records in the table using subquery in update command", - method = "executeUpdate", - args = {java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Updates records in the table using subquery in update command", - method = "executeQuery", - args = {java.lang.String.class} - ) - }) public void testUpdate7() { String updateQuery = "UPDATE " + DatabaseCreator.TEST_TABLE1 + " SET field2='1' WHERE id < ( SELECT COUNT(*) FROM " @@ -427,23 +323,9 @@ public class UpdateFunctionalityTest extends TestCase { } /** - * @tests UpdateFunctionalityTest#testUpdate8(). Sets value of field2 to + * UpdateFunctionalityTest#testUpdate8(). Sets value of field2 to * NULL */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Sets value of field2 to NULL", - method = "executeUpdate", - args = {java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Sets value of field2 to NULL", - method = "executeQuery", - args = {java.lang.String.class} - ) - }) public void testUpdate8() { String updateQuery = "UPDATE " + DatabaseCreator.TEST_TABLE1 + " SET field2=NULL"; diff --git a/luni/src/test/java/tests/java/sql/UpdateFunctionalityTest2.java b/luni/src/test/java/tests/java/sql/UpdateFunctionalityTest2.java index 72f93c6..01d6140 100755 --- a/luni/src/test/java/tests/java/sql/UpdateFunctionalityTest2.java +++ b/luni/src/test/java/tests/java/sql/UpdateFunctionalityTest2.java @@ -17,10 +17,6 @@ package tests.java.sql; import dalvik.annotation.KnownFailure; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; import java.sql.Connection; import java.sql.DatabaseMetaData; @@ -37,7 +33,6 @@ import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -@TestTargetClass(Statement.class) public class UpdateFunctionalityTest2 extends TestCase { private static Connection conn = null; @@ -123,15 +118,9 @@ public class UpdateFunctionalityTest2 extends TestCase { } /** - * @tests UpdateFunctionalityTest2#testUpdate1(). Updates row with no + * UpdateFunctionalityTest2#testUpdate1(). Updates row with no * referencing ones and RESTRICT action */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Updates row with no referencing ones and RESTRICT action", - method = "execute", - args = {java.lang.String.class} - ) public void testUpdate1() throws SQLException { DatabaseCreator.fillFKStrictTable(conn); statement.execute("UPDATE " + DatabaseCreator.PARENT_TABLE @@ -139,17 +128,11 @@ public class UpdateFunctionalityTest2 extends TestCase { } /** - * @tests UpdateFunctionalityTest2#testUpdate2(). Attempts to update row + * UpdateFunctionalityTest2#testUpdate2(). Attempts to update row * with referencing ones and RESTRICT action - expecting SQLException * * TODO not supported */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Attempts to update row with referencing ones and RESTRICT action - expecting SQLException", - method = "execute", - args = {java.lang.String.class} - ) @KnownFailure("not supported") public void testUpdate2() throws SQLException { DatabaseCreator.fillFKStrictTable(conn); @@ -164,15 +147,9 @@ public class UpdateFunctionalityTest2 extends TestCase { } /** - * @tests UpdateFunctionalityTest2#testUpdate3(). Deletes all referencing + * UpdateFunctionalityTest2#testUpdate3(). Deletes all referencing * rows and then updates referenced one */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Deletes all referencing rows and then updates referenced one", - method = "execute", - args = {java.lang.String.class} - ) public void testUpdate3() throws SQLException { DatabaseCreator.fillFKStrictTable(conn); statement.execute("DELETE FROM " + DatabaseCreator.FKSTRICT_TABLE @@ -182,19 +159,13 @@ public class UpdateFunctionalityTest2 extends TestCase { } /** - * @tests UpdateFunctionalityTest2#testUpdate4(). Attempts to set incorrect + * UpdateFunctionalityTest2#testUpdate4(). Attempts to set incorrect * foreign key value - expecting SQLException * * TODO foreign key functionality is not supported */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Attempts to set incorrect foreign key value - expecting SQLException", - method = "executeUpdate", - args = {java.lang.String.class} - ) @KnownFailure("not supported") - public void testUpdate4() throws SQLException { + public void testUpdate4() throws SQLException { DatabaseCreator.fillFKStrictTable(conn); try { statement.executeUpdate("UPDATE " + DatabaseCreator.FKSTRICT_TABLE @@ -206,24 +177,10 @@ public class UpdateFunctionalityTest2 extends TestCase { } /** - * @tests UpdateFunctionalityTest2#testUpdate5(). Updates row with + * UpdateFunctionalityTest2#testUpdate5(). Updates row with * referencing ones and CASCADE action - expecting that all * referencing rows will also be updated */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Updates row with referencing ones and CASCADE action - expecting that all referencing rows will also be updated", - method = "executeUpdate", - args = {java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Updates row with referencing ones and CASCADE action - expecting that all referencing rows will also be updated", - method = "executeQuery", - args = {java.lang.String.class} - ) - }) public void testUpdate5() throws SQLException { DatabaseCreator.fillFKCascadeTable(conn); statement.executeUpdate("UPDATE " + DatabaseCreator.PARENT_TABLE @@ -241,19 +198,12 @@ public class UpdateFunctionalityTest2 extends TestCase { } /** - * @tests UpdateFunctionalityTest2#testUpdate6(). Attempts to set incorrect + * UpdateFunctionalityTest2#testUpdate6(). Attempts to set incorrect * foreign key value to row with CASCADE action - expecting * SQLException * * TODO Foreign key functionality is not supported */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Attempts to set incorrect\n" + - "foreign key value to row with CASCADE action - expecting SQLException: not supported", - method = "executeUpdate", - args = {java.lang.String.class} - ) @KnownFailure("not supported") public void testUpdate6() throws SQLException { DatabaseCreator.fillFKCascadeTable(conn); @@ -267,25 +217,11 @@ public class UpdateFunctionalityTest2 extends TestCase { } /** - * @tests UpdateFunctionalityTest2#testUpdate7(). Updates table using + * UpdateFunctionalityTest2#testUpdate7(). Updates table using * subquery in WHERE clause * * TODO Foreign key functionality is not supported */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Updates table using subquery in WHERE clause. Not supported: FK", - method = "executeQuery", - args = {java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Updates table using subquery in WHERE clause. Not supported: FK.", - method = "executeUpdate", - args = {java.lang.String.class} - ) - }) @KnownFailure("not supported") public void testUpdate7() throws SQLException { @@ -301,23 +237,9 @@ public class UpdateFunctionalityTest2 extends TestCase { } /** - * @tests UpdateFunctionalityTest2#testUpdate8(). Updates table using scalar + * UpdateFunctionalityTest2#testUpdate8(). Updates table using scalar * subquery as new field value */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Updates table using scalar subquery as new field value", - method = "executeQuery", - args = {java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Updates table using scalar subquery as new field value", - method = "executeUpdate", - args = {java.lang.String.class} - ) - }) public void testUpdate8() throws SQLException { statement.executeUpdate("UPDATE " + DatabaseCreator.SIMPLE_TABLE3 + " SET speed = (SELECT MAX(speed) FROM " @@ -336,15 +258,9 @@ public class UpdateFunctionalityTest2 extends TestCase { } /** - * @tests UpdateFunctionalityTest2#testUpdate9(). Updates table using + * UpdateFunctionalityTest2#testUpdate9(). Updates table using * PreparedStatement */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Functionality test: Updates table using PreparedStatement", - method = "executeQuery", - args = {java.lang.String.class} - ) public void testUpdate9() throws SQLException { DatabaseCreator.fillTestTable5(conn); PreparedStatement stat = conn.prepareStatement("UPDATE " diff --git a/luni/src/test/java/tests/org/w3c/dom/AttrGetOwnerElement.java b/luni/src/test/java/tests/org/w3c/dom/AttrGetOwnerElement.java index ab2e6da..66cfd59 100644 --- a/luni/src/test/java/tests/org/w3c/dom/AttrGetOwnerElement.java +++ b/luni/src/test/java/tests/org/w3c/dom/AttrGetOwnerElement.java @@ -1,10 +1,5 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -14,7 +9,6 @@ import org.w3c.dom.NamedNodeMap; import javax.xml.parsers.DocumentBuilder; -@TestTargetClass(Attr.class) public final class AttrGetOwnerElement extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -61,12 +55,6 @@ public final class AttrGetOwnerElement extends DOMTestCase { // assertEquals("attrgetownerelement01", "emp:employee", ownerElementName); // // } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify that getOwnerElement returns null if an attribute is not in use.", - method = "getOwnerElement", - args = {} - ) public void testGetOwnerElement2() throws Throwable { Document doc; Element element; @@ -82,12 +70,6 @@ public final class AttrGetOwnerElement extends DOMTestCase { ownerElementName = ownerElement.getNodeName(); assertEquals("attrgetownerelement02", "root", ownerElementName); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies that getOwnerElement returns null if an attribute is not in use.", - method = "getOwnerElement", - args = {} - ) public void testGetOwnerElement3() throws Throwable { Document doc; Node ownerElement; @@ -97,12 +79,6 @@ public final class AttrGetOwnerElement extends DOMTestCase { ownerElement = attr.getOwnerElement(); assertNull("attrgetownerelement03", ownerElement); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies that getOwnerElement returns null if an attribute is not in use.", - method = "getOwnerElement", - args = {} - ) public void testGetOwnerElement4() throws Throwable { Document doc; Document docImp; @@ -124,12 +100,6 @@ public final class AttrGetOwnerElement extends DOMTestCase { ownerElement = attrImp.getOwnerElement(); assertNull("attrgetownerelement04", ownerElement); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify that getOwnerElement returns null if an attribute is not in use.", - method = "getOwnerElement", - args = {} - ) public void testGetOwnerElement5() throws Throwable { Document doc; Node element; diff --git a/luni/src/test/java/tests/org/w3c/dom/CreateAttributeNS.java b/luni/src/test/java/tests/org/w3c/dom/CreateAttributeNS.java index 2f9c177..0e53813 100644 --- a/luni/src/test/java/tests/org/w3c/dom/CreateAttributeNS.java +++ b/luni/src/test/java/tests/org/w3c/dom/CreateAttributeNS.java @@ -21,11 +21,6 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import java.util.ArrayList; import java.util.List; @@ -35,7 +30,6 @@ import org.w3c.dom.Attr; import javax.xml.parsers.DocumentBuilder; -@TestTargetClass(Document.class) public final class CreateAttributeNS extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -65,12 +59,6 @@ public final class CreateAttributeNS extends DOMTestCase { * @throws Throwable * Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NAMESPACE_ERR exception code.", - method = "createAttributeNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testCreateAttributeNS1() throws Throwable { String namespaceURI = "http://www.ecommerce.org/"; String malformedName = "prefix::local"; @@ -88,12 +76,6 @@ public final class CreateAttributeNS extends DOMTestCase { assertTrue("throw_NAMESPACE_ERR", success); } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies createAttributeNS method with null as the fisrt parameter.", - method = "createAttributeNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testCreateAttributeNS2() throws Throwable { String namespaceURI = null; @@ -112,12 +94,6 @@ public final class CreateAttributeNS extends DOMTestCase { assertTrue("throw_NAMESPACE_ERR", success); } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that createAttributeNS throws DOMException.", - method = "createAttributeNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testCreateAttributeNS3() throws Throwable { String namespaceURI = "http://www.wedding.com/"; String qualifiedName; @@ -166,12 +142,6 @@ public final class CreateAttributeNS extends DOMTestCase { } } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify exceptions.", - method = "createAttributeNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testCreateAttributeNS4() throws Throwable { String namespaceURI = "http://www.w3.org/XML/1998/namespaces"; String qualifiedName = "xml:attr1"; @@ -189,12 +159,6 @@ public final class CreateAttributeNS extends DOMTestCase { assertTrue("throw_NAMESPACE_ERR", success); } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify exceptions.", - method = "createAttributeNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testCreateAttributeNS5() throws Throwable { String namespaceURI = "http://www.ecommerce.org/"; String qualifiedName = "econm:local"; @@ -206,12 +170,6 @@ public final class CreateAttributeNS extends DOMTestCase { attrName = newAttr.getName(); assertEquals("throw_Equals", qualifiedName, attrName); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "createAttributeNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testCreateAttributeNS6() throws Throwable { String namespaceURI = "http://www.example.com/"; Document doc; diff --git a/luni/src/test/java/tests/org/w3c/dom/CreateDocument.java b/luni/src/test/java/tests/org/w3c/dom/CreateDocument.java index babdac7..e973842 100644 --- a/luni/src/test/java/tests/org/w3c/dom/CreateDocument.java +++ b/luni/src/test/java/tests/org/w3c/dom/CreateDocument.java @@ -21,11 +21,6 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import java.util.ArrayList; import java.util.List; @@ -56,7 +51,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a * href="http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('Level-2-Core-DOM-createDocument')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='NAMESPACE_ERR'])">http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('Level-2-Core-DOM-createDocument')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='NAMESPACE_ERR'])</a> */ -@TestTargetClass(DOMImplementation.class) public final class CreateDocument extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -86,12 +80,6 @@ public final class CreateDocument extends DOMTestCase { * @throws Throwable * Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify null as parameters.", - method = "createDocument", - args = {java.lang.String.class, java.lang.String.class, org.w3c.dom.DocumentType.class} - ) public void testCreateDocument1() throws Throwable { String namespaceURI = "http://www.ecommerce.org/"; String malformedName = "prefix::local"; @@ -112,12 +100,6 @@ public final class CreateDocument extends DOMTestCase { assertTrue("throw_NAMESPACE_ERR", success); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify null as parameters.", - method = "createDocument", - args = {java.lang.String.class, java.lang.String.class, org.w3c.dom.DocumentType.class} - ) public void testCreateDocument2() throws Throwable { String namespaceURI = null; @@ -183,12 +165,6 @@ public final class CreateDocument extends DOMTestCase { // assertTrue("throw_WRONG_DOCUMENT_ERR", success); // // } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify null as parameters.", - method = "createDocument", - args = {java.lang.String.class, java.lang.String.class, org.w3c.dom.DocumentType.class} - ) public void testCreateDocument5() throws Throwable { String namespaceURI = "http://www.ecommerce.org/schema"; String qualifiedName; @@ -241,12 +217,6 @@ public final class CreateDocument extends DOMTestCase { } } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify null as parameters.", - method = "createDocument", - args = {java.lang.String.class, java.lang.String.class, org.w3c.dom.DocumentType.class} - ) public void testCreateDocument6() throws Throwable { String namespaceURI = "http://ecommerce.org/schema"; String qualifiedName = "xml:local"; @@ -267,12 +237,6 @@ public final class CreateDocument extends DOMTestCase { assertTrue("throw_NAMESPACE_ERR", success); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify null as parameters.", - method = "createDocument", - args = {java.lang.String.class, java.lang.String.class, org.w3c.dom.DocumentType.class} - ) public void testCreateDocument7() throws Throwable { String namespaceURI = "http://www.ecommerce.org/schema"; String qualifiedName = "y:x"; @@ -291,12 +255,6 @@ public final class CreateDocument extends DOMTestCase { assertEquals("nodeName", "#document", nodeName); assertNull("nodeValue", nodeValue); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify null as parameters.", - method = "createDocument", - args = {java.lang.String.class, java.lang.String.class, org.w3c.dom.DocumentType.class} - ) public void testCreateDocument8() throws Throwable { String namespaceURI = "http://www.example.org/schema"; DocumentType docType = null; diff --git a/luni/src/test/java/tests/org/w3c/dom/CreateDocumentType.java b/luni/src/test/java/tests/org/w3c/dom/CreateDocumentType.java index d3b84d6..67da437 100644 --- a/luni/src/test/java/tests/org/w3c/dom/CreateDocumentType.java +++ b/luni/src/test/java/tests/org/w3c/dom/CreateDocumentType.java @@ -21,11 +21,6 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import java.util.ArrayList; import java.util.List; @@ -56,7 +51,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a * href="http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('Level-2-Core-DOM-createDocType')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='NAMESPACE_ERR'])">http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('Level-2-Core-DOM-createDocType')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='NAMESPACE_ERR'])</a> */ -@TestTargetClass(DOMImplementation.class) public final class CreateDocumentType extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -86,12 +80,6 @@ public final class CreateDocumentType extends DOMTestCase { * @throws Throwable * Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify null as parameters.", - method = "createDocumentType", - args = {java.lang.String.class, java.lang.String.class, java.lang.String.class} - ) public void testCreateDocumentType1() throws Throwable { String publicId = "STAFF"; String systemId = "staff.xml"; @@ -112,12 +100,6 @@ public final class CreateDocumentType extends DOMTestCase { assertTrue("throw_NAMESPACE_ERR", success); } } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify null as parameters.", - method = "createDocumentType", - args = {java.lang.String.class, java.lang.String.class, java.lang.String.class} - ) public void testCreateDocumentType2() throws Throwable { String publicId = "http://www.localhost.com/"; String systemId = "myDoc.dtd"; @@ -171,12 +153,6 @@ public final class CreateDocumentType extends DOMTestCase { } } } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify null as parameters.", - method = "createDocumentType", - args = {java.lang.String.class, java.lang.String.class, java.lang.String.class} - ) public void testCreateDocumentType3() throws Throwable { String qualifiedName = "prefix:myDoc"; @@ -196,12 +172,6 @@ public final class CreateDocumentType extends DOMTestCase { nodeValue = newType.getNodeValue(); assertNull("nodeValue", nodeValue); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify null as parameters.", - method = "createDocumentType", - args = {java.lang.String.class, java.lang.String.class, java.lang.String.class} - ) public void testCreateDocumentType4() throws Throwable { String publicId = "http://www.example.com/"; String systemId = "myDoc.dtd"; diff --git a/luni/src/test/java/tests/org/w3c/dom/CreateElementNS.java b/luni/src/test/java/tests/org/w3c/dom/CreateElementNS.java index 166521f..50bfbf3 100644 --- a/luni/src/test/java/tests/org/w3c/dom/CreateElementNS.java +++ b/luni/src/test/java/tests/org/w3c/dom/CreateElementNS.java @@ -21,11 +21,6 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import java.util.ArrayList; import java.util.List; @@ -53,7 +48,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a * href="http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-DocCrElNS')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='NAMESPACE_ERR'])">http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-DocCrElNS')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='NAMESPACE_ERR'])</a> */ -@TestTargetClass(Document.class) public final class CreateElementNS extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -83,12 +77,6 @@ public final class CreateElementNS extends DOMTestCase { * @throws Throwable * Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify null as a parameters, and other types of DOMException.", - method = "createElementNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testCreateElementNS1() throws Throwable { String namespaceURI = "http://www.ecommerce.org/"; String malformedName = "prefix::local"; @@ -106,12 +94,6 @@ public final class CreateElementNS extends DOMTestCase { assertTrue("throw_NAMESPACE_ERR", success); } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify null as a parameters, and other types of DOMException.", - method = "createElementNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testCreateElementNS2() throws Throwable { String namespaceURI = null; @@ -130,12 +112,6 @@ public final class CreateElementNS extends DOMTestCase { assertTrue("throw_NAMESPACE_ERR", success); } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify null as a parameters, and other types of DOMException.", - method = "createElementNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testCreateElementNS3() throws Throwable { String namespaceURI = "http://www.wedding.com/"; String qualifiedName; @@ -185,12 +161,6 @@ public final class CreateElementNS extends DOMTestCase { } } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify null as a parameters, and other types of DOMException.", - method = "createElementNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testCreateElementNS4() throws Throwable { String namespaceURI = "http://www.w3.org/XML/1998/namespaces"; String qualifiedName = "xml:element1"; @@ -208,12 +178,6 @@ public final class CreateElementNS extends DOMTestCase { assertTrue("throw_NAMESPACE_ERR", success); } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify null as a parameters, and other types of DOMException.", - method = "createElementNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testCreateElementNS5() throws Throwable { String namespaceURI = "http://www.nist.gov"; String qualifiedName = "gov:faculty"; @@ -225,12 +189,6 @@ public final class CreateElementNS extends DOMTestCase { elementName = newElement.getTagName(); assertEquals("throw_Equals", qualifiedName, elementName); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify null as a parameters, and other types of DOMException.", - method = "createElementNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testCreateElementNS6() throws Throwable { String namespaceURI = "http://www.example.com/"; diff --git a/luni/src/test/java/tests/org/w3c/dom/DOMImplementationCreateDocument.java b/luni/src/test/java/tests/org/w3c/dom/DOMImplementationCreateDocument.java index 6d31a81..8c1e07d 100644 --- a/luni/src/test/java/tests/org/w3c/dom/DOMImplementationCreateDocument.java +++ b/luni/src/test/java/tests/org/w3c/dom/DOMImplementationCreateDocument.java @@ -1,10 +1,5 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import java.util.ArrayList; import java.util.List; @@ -28,7 +23,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a * href="http://www.w3.org/TR/DOM-Level-2-Core/core#Level-2-Core-DOM-createDocument">http://www.w3.org/TR/DOM-Level-2-Core/core#Level-2-Core-DOM-createDocument</a> */ -@TestTargetClass(DOMImplementation.class) public final class DOMImplementationCreateDocument extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -58,12 +52,6 @@ public final class DOMImplementationCreateDocument extends DOMTestCase { * @throws Throwable * Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify DOMException.", - method = "createDocument", - args = {java.lang.String.class, java.lang.String.class, org.w3c.dom.DocumentType.class} - ) public void testCreateDocument3() throws Throwable { Document doc; DOMImplementation domImpl; @@ -93,12 +81,6 @@ public final class DOMImplementationCreateDocument extends DOMTestCase { assertNotNull("domimplementationcreatedocument03", newDoc); } } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies DOMException with NAMESPACE_ERR code.", - method = "createDocument", - args = {java.lang.String.class, java.lang.String.class, org.w3c.dom.DocumentType.class} - ) public void testCreateDocument4() throws Throwable { Document doc; DOMImplementation domImpl; @@ -121,12 +103,6 @@ public final class DOMImplementationCreateDocument extends DOMTestCase { assertTrue("domimplementationcreatedocument04", success); } } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies DOMException with NAMESPACE_ERR code.", - method = "createDocument", - args = {java.lang.String.class, java.lang.String.class, org.w3c.dom.DocumentType.class} - ) public void testCreateDocument5() throws Throwable { Document doc; DOMImplementation domImpl; @@ -148,12 +124,6 @@ public final class DOMImplementationCreateDocument extends DOMTestCase { assertTrue("domimplementationcreatedocument05", success); } } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies DOMException with NAMESPACE_ERR code.", - method = "createDocument", - args = {java.lang.String.class, java.lang.String.class, org.w3c.dom.DocumentType.class} - ) public void testCreateDocument7() throws Throwable { Document doc; DOMImplementation domImpl; diff --git a/luni/src/test/java/tests/org/w3c/dom/DOMImplementationCreateDocumentType.java b/luni/src/test/java/tests/org/w3c/dom/DOMImplementationCreateDocumentType.java index a6bdfb5..9fd57b6 100644 --- a/luni/src/test/java/tests/org/w3c/dom/DOMImplementationCreateDocumentType.java +++ b/luni/src/test/java/tests/org/w3c/dom/DOMImplementationCreateDocumentType.java @@ -21,11 +21,6 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import java.util.ArrayList; import java.util.List; @@ -48,7 +43,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a * href="http://www.w3.org/TR/DOM-Level-2-Core/core#Level-2-Core-DOM-createDocument">http://www.w3.org/TR/DOM-Level-2-Core/core#Level-2-Core-DOM-createDocument</a> */ -@TestTargetClass(DOMImplementation.class) public final class DOMImplementationCreateDocumentType extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -78,12 +72,6 @@ public final class DOMImplementationCreateDocumentType extends DOMTestCase { * @throws Throwable * Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify DOMException.", - method = "createDocumentType", - args = {java.lang.String.class, java.lang.String.class, java.lang.String.class} - ) public void testCreateDocumentType1() throws Throwable { Document doc; DOMImplementation domImpl; @@ -118,12 +106,6 @@ public final class DOMImplementationCreateDocumentType extends DOMTestCase { } } } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify DOMException.", - method = "createDocumentType", - args = {java.lang.String.class, java.lang.String.class, java.lang.String.class} - ) public void testCreateDocumentType2() throws Throwable { Document doc; DOMImplementation domImpl; @@ -161,12 +143,6 @@ public final class DOMImplementationCreateDocumentType extends DOMTestCase { ownerDocument); } } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify DOMException.", - method = "createDocumentType", - args = {java.lang.String.class, java.lang.String.class, java.lang.String.class} - ) public void testCreateDocumentType4() throws Throwable { Document doc; DOMImplementation domImpl; diff --git a/luni/src/test/java/tests/org/w3c/dom/DOMImplementationHasFeature.java b/luni/src/test/java/tests/org/w3c/dom/DOMImplementationHasFeature.java index e528009..703730b 100644 --- a/luni/src/test/java/tests/org/w3c/dom/DOMImplementationHasFeature.java +++ b/luni/src/test/java/tests/org/w3c/dom/DOMImplementationHasFeature.java @@ -1,10 +1,5 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import java.util.ArrayList; import java.util.List; @@ -28,7 +23,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a * href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-5CED94D7">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-5CED94D7</a> */ -@TestTargetClass(DOMImplementation.class) public final class DOMImplementationHasFeature extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -58,12 +52,6 @@ public final class DOMImplementationHasFeature extends DOMTestCase { * @throws Throwable * Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies that hasFeature returns true value.", - method = "hasFeature", - args = {java.lang.String.class, java.lang.String.class} - ) public void testHasFeatureCore() throws Throwable { Document doc; DOMImplementation domImpl; @@ -73,12 +61,6 @@ public final class DOMImplementationHasFeature extends DOMTestCase { state = domImpl.hasFeature("core", "2.0"); assertTrue("domimplementationFeaturecoreAssert", state); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies that hasFeature returns true value.", - method = "hasFeature", - args = {java.lang.String.class, java.lang.String.class} - ) public void testHasFeatureXml() throws Throwable { Document doc; DOMImplementation domImpl; @@ -88,12 +70,6 @@ public final class DOMImplementationHasFeature extends DOMTestCase { state = domImpl.hasFeature("xml", "2.0"); assertTrue("domimplementationFeaturexmlVersion2Assert", state); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify that hasFeature method returns false.", - method = "hasFeature", - args = {java.lang.String.class, java.lang.String.class} - ) public void testHasFeature1() throws Throwable { Document doc; DOMImplementation domImpl; @@ -129,12 +105,6 @@ public final class DOMImplementationHasFeature extends DOMTestCase { assertTrue("domimplementationhasfeature01_Core_3", success); } } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies that hasFeature method returns false.", - method = "hasFeature", - args = {java.lang.String.class, java.lang.String.class} - ) public void testHasFeature2() throws Throwable { Document doc; DOMImplementation domImpl; diff --git a/luni/src/test/java/tests/org/w3c/dom/DOMTestCase.java b/luni/src/test/java/tests/org/w3c/dom/DOMTestCase.java index e962d55..a550898 100644 --- a/luni/src/test/java/tests/org/w3c/dom/DOMTestCase.java +++ b/luni/src/test/java/tests/org/w3c/dom/DOMTestCase.java @@ -1,7 +1,5 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargetClass; - import java.net.MalformedURLException; import java.net.URL; @@ -13,7 +11,6 @@ import org.xml.sax.SAXParseException; import junit.framework.TestCase; -@TestTargetClass(Document.class) public class DOMTestCase extends TestCase { public Document load(String docURI, DocumentBuilder builder) { diff --git a/luni/src/test/java/tests/org/w3c/dom/DocumentCreateAttributeNS.java b/luni/src/test/java/tests/org/w3c/dom/DocumentCreateAttributeNS.java index 681c4be..00d5287 100644 --- a/luni/src/test/java/tests/org/w3c/dom/DocumentCreateAttributeNS.java +++ b/luni/src/test/java/tests/org/w3c/dom/DocumentCreateAttributeNS.java @@ -21,11 +21,6 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import java.util.ArrayList; import java.util.List; @@ -52,7 +47,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a * href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-DocCrAttrNS">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-DocCrAttrNS</a> */ -@TestTargetClass(Document.class) public final class DocumentCreateAttributeNS extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -82,12 +76,6 @@ public final class DocumentCreateAttributeNS extends DOMTestCase { * @throws Throwable * Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies positive functionality.", - method = "createAttributeNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testCreateAttributeNS1() throws Throwable { Document doc; Attr attribute; @@ -110,12 +98,6 @@ public final class DocumentCreateAttributeNS extends DOMTestCase { * @throws Throwable * Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies positive functionality.", - method = "createAttributeNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testCreateAttributeNS2() throws Throwable { Document doc; Attr attribute1; @@ -156,12 +138,6 @@ public final class DocumentCreateAttributeNS extends DOMTestCase { assertEquals("documentcreateattributeNS02_att2_namespaceURI", "http://www.w3.org/2000/xmlns/", namespaceURI); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that createAttributeNS throws DOMException with INVALID_CHARACTER_ERR code.", - method = "createAttributeNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testCreateAttributeNS3() throws Throwable { Document doc; @@ -193,12 +169,6 @@ public final class DocumentCreateAttributeNS extends DOMTestCase { } } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that createAttributeNS throws DOMException with NAMESPACE_ERR code.", - method = "createAttributeNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testCreateAttributeNS4() throws Throwable { Document doc; @@ -228,12 +198,6 @@ public final class DocumentCreateAttributeNS extends DOMTestCase { } } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that createAttributeNS throws DOMException with NAMESPACE_ERR code.", - method = "createAttributeNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testCreateAttributeNS5() throws Throwable { Document doc; Document newDoc; @@ -259,12 +223,6 @@ public final class DocumentCreateAttributeNS extends DOMTestCase { assertTrue("documentcreateattributeNS05", success); } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that createAttributeNS throws DOMException with NAMESPACE_ERR code.", - method = "createElementNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testCreateAttributeNS6() throws Throwable { Document doc; Document newDoc; @@ -289,12 +247,6 @@ public final class DocumentCreateAttributeNS extends DOMTestCase { assertTrue("documentcreateattributeNS06", success); } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that createAttributeNS throws DOMException with NAMESPACE_ERR code.", - method = "createAttributeNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testCreateAttributeNS7() throws Throwable { Document doc; diff --git a/luni/src/test/java/tests/org/w3c/dom/DocumentCreateElementNS.java b/luni/src/test/java/tests/org/w3c/dom/DocumentCreateElementNS.java index 858e5d4..6c683f9 100644 --- a/luni/src/test/java/tests/org/w3c/dom/DocumentCreateElementNS.java +++ b/luni/src/test/java/tests/org/w3c/dom/DocumentCreateElementNS.java @@ -1,10 +1,5 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.DOMException; @@ -28,7 +23,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a * href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-DocCrElNS">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-DocCrElNS</a> */ -@TestTargetClass(Document.class) public final class DocumentCreateElementNS extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -58,12 +52,6 @@ public final class DocumentCreateElementNS extends DOMTestCase { * @throws Throwable * Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies positive functionality.", - method = "createElementNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testCreateElementNS1() throws Throwable { Document doc; Element element; @@ -88,12 +76,6 @@ public final class DocumentCreateElementNS extends DOMTestCase { assertEquals("documentcreateelementNS01_prefix", "XML", prefix); assertEquals("documentcreateelementNS01_tagName", "XML:XML", tagName); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that createElementNS throws DOMException with INVALID_CHARACTER_ERR code.", - method = "createElementNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testCreateElementNS2() throws Throwable { Document doc; @@ -112,12 +94,6 @@ public final class DocumentCreateElementNS extends DOMTestCase { assertTrue("documentcreateelementNS02", success); } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that createElementNS throws DOMException with NAMESPACE_ERR code.", - method = "createElementNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testCreateElementNS5() throws Throwable { Document doc; @@ -136,12 +112,6 @@ public final class DocumentCreateElementNS extends DOMTestCase { assertTrue("documentcreateelementNS05", success); } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that createElementNS throws DOMException with NAMESPACE_ERR code.", - method = "createElementNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testCreateElementNS6() throws Throwable { Document doc; Document newDoc; diff --git a/luni/src/test/java/tests/org/w3c/dom/DocumentGetElementsByTagnameNS.java b/luni/src/test/java/tests/org/w3c/dom/DocumentGetElementsByTagnameNS.java index 35f4465..d88c3e8 100644 --- a/luni/src/test/java/tests/org/w3c/dom/DocumentGetElementsByTagnameNS.java +++ b/luni/src/test/java/tests/org/w3c/dom/DocumentGetElementsByTagnameNS.java @@ -1,10 +1,5 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import org.w3c.dom.Document; import org.w3c.dom.DocumentType; import org.w3c.dom.DOMImplementation; @@ -31,7 +26,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a * href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=259">http://www.w3.org/Bugs/Public/show_bug.cgi?id=259</a> */ -@TestTargetClass(Document.class) public final class DocumentGetElementsByTagnameNS extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -61,12 +55,6 @@ public final class DocumentGetElementsByTagnameNS extends DOMTestCase { * @throws Throwable * Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies '*' as parameters.", - method = "getElementsByTagNameNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testGetElementsByTagNameNS1() throws Throwable { Document doc; Document newDoc; @@ -83,12 +71,6 @@ public final class DocumentGetElementsByTagnameNS extends DOMTestCase { assertEquals("documentgetelementsbytagnameNS01", 1, childList .getLength()); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies '*' as the first parameter.", - method = "getElementsByTagNameNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testGetElementsByTagNameNS2() throws Throwable { Document doc; Element docElem; @@ -103,12 +85,6 @@ public final class DocumentGetElementsByTagnameNS extends DOMTestCase { assertEquals("documentgetelementsbytagnameNS02", 6, childList .getLength()); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies wrong namespaceURI as a parameter.", - method = "getElementsByTagNameNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testGetElementsByTagNameNS3() throws Throwable { Document doc; NodeList childList; @@ -117,12 +93,6 @@ public final class DocumentGetElementsByTagnameNS extends DOMTestCase { assertEquals("documentgetelementsbytagnameNS03", 0, childList .getLength()); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies positive functionality.", - method = "getElementsByTagNameNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testGetElementsByTagNameNS4() throws Throwable { Document doc; NodeList childList; @@ -133,12 +103,6 @@ public final class DocumentGetElementsByTagnameNS extends DOMTestCase { assertEquals("documentgetelementsbytagnameNS04", 0, childList .getLength()); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies positive functionality.", - method = "getElementsByTagNameNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testGetElementsByTagNameNS5() throws Throwable { Document doc; NodeList childList; diff --git a/luni/src/test/java/tests/org/w3c/dom/DocumentGeteEementById.java b/luni/src/test/java/tests/org/w3c/dom/DocumentGeteEementById.java index 5db6a5f..b4b3f0f 100644 --- a/luni/src/test/java/tests/org/w3c/dom/DocumentGeteEementById.java +++ b/luni/src/test/java/tests/org/w3c/dom/DocumentGeteEementById.java @@ -1,10 +1,5 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -24,7 +19,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a * href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-getElBId">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-getElBId</a> */ -@TestTargetClass(Document.class) public final class DocumentGeteEementById extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -54,12 +48,6 @@ public final class DocumentGeteEementById extends DOMTestCase { * @throws Throwable * Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify getElementById method for existent element.", - method = "getElementById", - args = {java.lang.String.class} - ) public void testGetElementById() throws Throwable { Document doc; Element element; diff --git a/luni/src/test/java/tests/org/w3c/dom/DocumentImportNode.java b/luni/src/test/java/tests/org/w3c/dom/DocumentImportNode.java index 1e26b90..e864f99 100644 --- a/luni/src/test/java/tests/org/w3c/dom/DocumentImportNode.java +++ b/luni/src/test/java/tests/org/w3c/dom/DocumentImportNode.java @@ -1,10 +1,5 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -37,7 +32,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a * href="http://www.w3.org/TR/DOM-Level-2-Core/core#Core-Document-importNode">http://www.w3.org/TR/DOM-Level-2-Core/core#Core-Document-importNode</a> */ -@TestTargetClass(Document.class) public final class DocumentImportNode extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -90,12 +84,6 @@ public final class DocumentImportNode extends DOMTestCase { // assertEquals("documentimportnode01_nodeType", 2, nodeType); // assertEquals("documentimportnode01_nodeValue", "Yes", nodeValue); // } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify DOMException exception.", - method = "importNode", - args = {org.w3c.dom.Node.class, boolean.class} - ) public void testImportNode2() throws Throwable { Document doc; Document docImported; @@ -178,12 +166,6 @@ public final class DocumentImportNode extends DOMTestCase { // assertEquals("documentimportnode04_nodeType", 2, nodeType); // assertEquals("documentimportnode04_nodeValue", "defaultVal", nodeValue); // } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify DOMException exception.", - method = "importNode", - args = {org.w3c.dom.Node.class, boolean.class} - ) public void testImportNode5() throws Throwable { Document doc; Document docImported; @@ -207,12 +189,6 @@ public final class DocumentImportNode extends DOMTestCase { assertEquals("documentimportnode05_namespaceURI", "http://www.w3.org/DOM/Test", namespaceURI); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that importNode method throws DOMException with NOT_SUPPORTED_ERR code.", - method = "importNode", - args = {org.w3c.dom.Node.class, boolean.class} - ) public void testImportNode6() throws Throwable { Document doc; @@ -228,12 +204,6 @@ public final class DocumentImportNode extends DOMTestCase { assertTrue("throw_NOT_SUPPORTED_ERR", success); } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that importNode method throws DOMException with NOT_SUPPORTED_ERR code.", - method = "importNode", - args = {org.w3c.dom.Node.class, boolean.class} - ) public void testImportNode7() throws Throwable { Document doc; @@ -251,12 +221,6 @@ public final class DocumentImportNode extends DOMTestCase { assertTrue("throw_NOT_SUPPORTED_ERR", success); } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that importNode method throws DOMException with NOT_SUPPORTED_ERR code.", - method = "importNode", - args = {org.w3c.dom.Node.class, boolean.class} - ) public void testImportNode8() throws Throwable { Document doc; @@ -278,12 +242,6 @@ public final class DocumentImportNode extends DOMTestCase { assertTrue("throw_NOT_SUPPORTED_ERR", success); } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify DOMException exception.", - method = "importNode", - args = {org.w3c.dom.Node.class, boolean.class} - ) public void testImportNode9() throws Throwable { Document doc; DocumentFragment docFragment; @@ -301,12 +259,6 @@ public final class DocumentImportNode extends DOMTestCase { success = importedDocFrag.hasChildNodes(); assertFalse("documentimportnode09", success); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies positive functionality; doesn't verify DOMException exceptions.", - method = "importNode", - args = {org.w3c.dom.Node.class, boolean.class} - ) public void testImportNode10() throws Throwable { Document doc; DocumentFragment docFragment; @@ -324,12 +276,6 @@ public final class DocumentImportNode extends DOMTestCase { success = importedDocFrag.hasChildNodes(); assertTrue("documentimportnode10", success); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify DOMException exception.", - method = "importNode", - args = {org.w3c.dom.Node.class, boolean.class} - ) public void testImportNode11() throws Throwable { Document doc; Element docElement; @@ -347,12 +293,6 @@ public final class DocumentImportNode extends DOMTestCase { assertEquals("documentimportnode11_NodeName", nodeNameImported, nodeNameOrig); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify DOMException exception.", - method = "importNode", - args = {org.w3c.dom.Node.class, boolean.class} - ) public void testImportNode12() throws Throwable { Document doc; NodeList childList; @@ -372,12 +312,6 @@ public final class DocumentImportNode extends DOMTestCase { importedLen = (int) importedChildren.getLength(); assertEquals("documentimportnode12", importedLen, addressElemLen); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify DOMException exception.", - method = "importNode", - args = {org.w3c.dom.Node.class, boolean.class} - ) public void testImportNode13() throws Throwable { Document doc; NodeList childList; @@ -421,12 +355,6 @@ public final class DocumentImportNode extends DOMTestCase { // "http://www.w3.org/2000/xmlns/", "emp"); // assertEquals("explicitAttrImported", "http://www.nist.gov", attrValue); // } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies import of TEXT_NODE.", - method = "importNode", - args = {org.w3c.dom.Node.class, boolean.class} - ) public void testImportNode15() throws Throwable { Document doc; @@ -442,12 +370,6 @@ public final class DocumentImportNode extends DOMTestCase { assertEquals("documentimportnode15", "Document.importNode test for a TEXT_NODE", nodeValue); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies import of COMMENT_NODE", - method = "importNode", - args = {org.w3c.dom.Node.class, boolean.class} - ) public void testImportNode17() throws Throwable { Document doc; @@ -463,12 +385,6 @@ public final class DocumentImportNode extends DOMTestCase { assertEquals("documentimportnode17", "Document.importNode test for a COMMENT_NODE", nodeValue); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify DOMException exception.", - method = "importNode", - args = {org.w3c.dom.Node.class, boolean.class} - ) public void testImportNode18() throws Throwable { Document doc; diff --git a/luni/src/test/java/tests/org/w3c/dom/DocumentTypeInternalSubset.java b/luni/src/test/java/tests/org/w3c/dom/DocumentTypeInternalSubset.java index db485f1..284e66c 100644 --- a/luni/src/test/java/tests/org/w3c/dom/DocumentTypeInternalSubset.java +++ b/luni/src/test/java/tests/org/w3c/dom/DocumentTypeInternalSubset.java @@ -1,10 +1,5 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import org.w3c.dom.DocumentType; import org.w3c.dom.Document; import org.w3c.dom.DOMImplementation; @@ -24,7 +19,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a * href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=259">http://www.w3.org/Bugs/Public/show_bug.cgi?id=259</a> */ -@TestTargetClass(DocumentType.class) public final class DocumentTypeInternalSubset extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -54,12 +48,6 @@ public final class DocumentTypeInternalSubset extends DOMTestCase { * @throws Throwable * Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't check positive case.", - method = "getInternalSubset", - args = {} - ) public void testGetInternalSubset() throws Throwable { Document doc; DocumentType docType; diff --git a/luni/src/test/java/tests/org/w3c/dom/DocumentTypePublicId.java b/luni/src/test/java/tests/org/w3c/dom/DocumentTypePublicId.java index 50199f6..f2544f0 100644 --- a/luni/src/test/java/tests/org/w3c/dom/DocumentTypePublicId.java +++ b/luni/src/test/java/tests/org/w3c/dom/DocumentTypePublicId.java @@ -22,11 +22,6 @@ See W3C License http://www.w3.org/Consortium/Legal/ for more details. package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import org.w3c.dom.Document; import org.w3c.dom.DocumentType; import org.w3c.dom.DOMImplementation; @@ -45,7 +40,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-Core-DocType-publicId">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-Core-DocType-publicId</a> * @see <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=259">http://www.w3.org/Bugs/Public/show_bug.cgi?id=259</a> */ -@TestTargetClass(DocumentType.class) public final class DocumentTypePublicId extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -73,12 +67,6 @@ public final class DocumentTypePublicId extends DOMTestCase { * Runs the test case. * @throws Throwable Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPublicId", - args = {} - ) public void testGetPublicId() throws Throwable { Document doc; DocumentType docType; diff --git a/luni/src/test/java/tests/org/w3c/dom/DocumentTypeSystemId.java b/luni/src/test/java/tests/org/w3c/dom/DocumentTypeSystemId.java index 5aade95..4908e1f 100644 --- a/luni/src/test/java/tests/org/w3c/dom/DocumentTypeSystemId.java +++ b/luni/src/test/java/tests/org/w3c/dom/DocumentTypeSystemId.java @@ -22,11 +22,6 @@ See W3C License http://www.w3.org/Consortium/Legal/ for more details. package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import org.w3c.dom.DocumentType; import org.w3c.dom.Document; import org.w3c.dom.DOMImplementation; @@ -42,7 +37,6 @@ import javax.xml.parsers.DocumentBuilder; * @author Neil Delima * @see <a href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-Core-DocType-systemId">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-Core-DocType-systemId</a> */ -@TestTargetClass(DocumentType.class) public final class DocumentTypeSystemId extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -70,12 +64,6 @@ public final class DocumentTypeSystemId extends DOMTestCase { * Runs the test case. * @throws Throwable Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSystemId", - args = {} - ) public void testGetSystemId() throws Throwable { Document doc; DocumentType docType; diff --git a/luni/src/test/java/tests/org/w3c/dom/ElementGetAttributeNS.java b/luni/src/test/java/tests/org/w3c/dom/ElementGetAttributeNS.java index fde97ea..5b390f8 100644 --- a/luni/src/test/java/tests/org/w3c/dom/ElementGetAttributeNS.java +++ b/luni/src/test/java/tests/org/w3c/dom/ElementGetAttributeNS.java @@ -22,8 +22,6 @@ See W3C License http://www.w3.org/Consortium/Legal/ for more details. package tests.org.w3c.dom; -import dalvik.annotation.TestTargetClass; - import javax.xml.parsers.DocumentBuilder; import org.w3c.dom.Document; @@ -41,7 +39,6 @@ import org.w3c.dom.NodeList; * @see <a href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElGetAttrNS">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElGetAttrNS</a> * @see <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=259">http://www.w3.org/Bugs/Public/show_bug.cgi?id=259</a> */ -@TestTargetClass(Element.class) public final class ElementGetAttributeNS extends DOMTestCase { DOMDocumentBuilderFactory factory; diff --git a/luni/src/test/java/tests/org/w3c/dom/ElementGetAttributeNodeNS.java b/luni/src/test/java/tests/org/w3c/dom/ElementGetAttributeNodeNS.java index 8c00244..61791a2 100644 --- a/luni/src/test/java/tests/org/w3c/dom/ElementGetAttributeNodeNS.java +++ b/luni/src/test/java/tests/org/w3c/dom/ElementGetAttributeNodeNS.java @@ -1,10 +1,5 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import org.w3c.dom.Element; import org.w3c.dom.Document; import org.w3c.dom.Attr; @@ -23,7 +18,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a * href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElGetAtNodeNS">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElGetAtNodeNS</a> */ -@TestTargetClass(Element.class) public final class ElementGetAttributeNodeNS extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -53,12 +47,6 @@ public final class ElementGetAttributeNodeNS extends DOMTestCase { * @throws Throwable * Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify DOMException.", - method = "getAttributeNodeNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testGetAttributeNodeNS1() throws Throwable { Document doc; Element element; @@ -96,12 +84,6 @@ public final class ElementGetAttributeNodeNS extends DOMTestCase { assertEquals("elementgetattributenodens01_attrNs", "http://www.w3.org/DOM/Level2", attrNS); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify DOMException.", - method = "getAttributeNodeNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testGetAttributeNodeNS2() throws Throwable { Document doc; Element element; diff --git a/luni/src/test/java/tests/org/w3c/dom/ElementGetElementsByTagNameNS.java b/luni/src/test/java/tests/org/w3c/dom/ElementGetElementsByTagNameNS.java index 5e54ed1..b5657a6 100644 --- a/luni/src/test/java/tests/org/w3c/dom/ElementGetElementsByTagNameNS.java +++ b/luni/src/test/java/tests/org/w3c/dom/ElementGetElementsByTagNameNS.java @@ -1,10 +1,5 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import org.w3c.dom.Element; import org.w3c.dom.Document; import org.w3c.dom.NodeList; @@ -23,7 +18,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a * href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-getElBTNNS">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-getElBTNNS</a> */ -@TestTargetClass(Element.class) public final class ElementGetElementsByTagNameNS extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -53,12 +47,6 @@ public final class ElementGetElementsByTagNameNS extends DOMTestCase { * @throws Throwable * Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify DOMException.", - method = "getElementsByTagNameNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testGetElementsByTagNameNS1() throws Throwable { Document doc; Element element; @@ -69,12 +57,6 @@ public final class ElementGetElementsByTagNameNS extends DOMTestCase { assertEquals("elementgetelementsbytagnamens02", 0, elementList .getLength()); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify DOMException.", - method = "getElementsByTagNameNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testGetElementsByTagNameNS4() throws Throwable { Document doc; Element element; @@ -102,12 +84,6 @@ public final class ElementGetElementsByTagNameNS extends DOMTestCase { assertEquals("elementgetelementsbytagnamens04_2", 3, elementList .getLength()); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify DOMException.", - method = "getElementsByTagNameNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testGetElementsByTagNameNS5() throws Throwable { Document doc; Element element; diff --git a/luni/src/test/java/tests/org/w3c/dom/ElementHasAttribute.java b/luni/src/test/java/tests/org/w3c/dom/ElementHasAttribute.java index 3d5de49..1132fef 100644 --- a/luni/src/test/java/tests/org/w3c/dom/ElementHasAttribute.java +++ b/luni/src/test/java/tests/org/w3c/dom/ElementHasAttribute.java @@ -1,10 +1,5 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import org.w3c.dom.Element; import org.w3c.dom.Document; import org.w3c.dom.Attr; @@ -21,7 +16,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a * href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeHasAttrs">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeHasAttrs</a> */ -@TestTargetClass(Element.class) public final class ElementHasAttribute extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -51,12 +45,6 @@ public final class ElementHasAttribute extends DOMTestCase { * @throws Throwable * Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies hasAttribute method with empty string as a parameter.", - method = "hasAttribute", - args = {java.lang.String.class} - ) public void testHasAttribute1() throws Throwable { Document doc; Element element; @@ -80,12 +68,6 @@ public final class ElementHasAttribute extends DOMTestCase { // state = element.hasAttribute("defaultAttr"); // assertTrue("elementhasattribute02", state); // } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies positive functionality.", - method = "hasAttribute", - args = {java.lang.String.class} - ) public void testHasAttribute3() throws Throwable { Document doc; Element element; @@ -101,12 +83,6 @@ public final class ElementHasAttribute extends DOMTestCase { state = element.hasAttribute("domestic"); assertTrue("elementhasattribute03_True", state); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies positive functionality.", - method = "hasAttribute", - args = {java.lang.String.class} - ) public void testHasAttribute4() throws Throwable { Document doc; Element element; diff --git a/luni/src/test/java/tests/org/w3c/dom/ElementHasAttributeNS.java b/luni/src/test/java/tests/org/w3c/dom/ElementHasAttributeNS.java index 2c5e582..1f84cbc 100644 --- a/luni/src/test/java/tests/org/w3c/dom/ElementHasAttributeNS.java +++ b/luni/src/test/java/tests/org/w3c/dom/ElementHasAttributeNS.java @@ -21,11 +21,6 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import org.w3c.dom.Element; import org.w3c.dom.Document; import org.w3c.dom.NodeList; @@ -47,7 +42,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a * href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElHasAttrNS">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElHasAttrNS</a> */ -@TestTargetClass(Element.class) public final class ElementHasAttributeNS extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -77,12 +71,6 @@ public final class ElementHasAttributeNS extends DOMTestCase { * @throws Throwable * Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify DOMException.", - method = "hasAttributeNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void _testHasAttributeNS1() throws Throwable { Document doc; Element element; @@ -95,12 +83,6 @@ public final class ElementHasAttributeNS extends DOMTestCase { .hasAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns"); assertTrue("elementhasattributens01", state); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify DOMException.", - method = "hasAttributeNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testHasAttributeNS2() throws Throwable { Document doc; Element element; @@ -114,12 +96,6 @@ public final class ElementHasAttributeNS extends DOMTestCase { state = element.hasAttributeNS("http://www.w3.org/DOM", "domestic"); assertTrue("hasDomesticAttr", state); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify DOMException.", - method = "hasAttributeNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testHasAttributeNS3() throws Throwable { Document doc; Element element; diff --git a/luni/src/test/java/tests/org/w3c/dom/ElementRemoveAttributeNS.java b/luni/src/test/java/tests/org/w3c/dom/ElementRemoveAttributeNS.java index 137ea54..a535072 100644 --- a/luni/src/test/java/tests/org/w3c/dom/ElementRemoveAttributeNS.java +++ b/luni/src/test/java/tests/org/w3c/dom/ElementRemoveAttributeNS.java @@ -1,10 +1,5 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import org.w3c.dom.Element; import org.w3c.dom.Attr; import org.w3c.dom.Document; @@ -23,7 +18,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a * href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElRemAtNS">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElRemAtNS</a> */ -@TestTargetClass(Element.class) public final class ElementRemoveAttributeNS extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -53,12 +47,6 @@ public final class ElementRemoveAttributeNS extends DOMTestCase { * @throws Throwable * Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify DOMException.", - method = "removeAttributeNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testRemoveAttributeNS() throws Throwable { Document doc; Element element; diff --git a/luni/src/test/java/tests/org/w3c/dom/ElementSetAttributeNS.java b/luni/src/test/java/tests/org/w3c/dom/ElementSetAttributeNS.java index 09be837..450fd4c 100644 --- a/luni/src/test/java/tests/org/w3c/dom/ElementSetAttributeNS.java +++ b/luni/src/test/java/tests/org/w3c/dom/ElementSetAttributeNS.java @@ -1,10 +1,5 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import java.util.ArrayList; import java.util.List; @@ -28,7 +23,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a * href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElSetAttrNS">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElSetAttrNS</a> */ -@TestTargetClass(Element.class) public final class ElementSetAttributeNS extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -58,12 +52,6 @@ public final class ElementSetAttributeNS extends DOMTestCase { * @throws Throwable * Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify DOMException.", - method = "setAttributeNS", - args = {java.lang.String.class, java.lang.String.class, java.lang.String.class} - ) public void testSetAttributeNS1() throws Throwable { Document doc; Element element; @@ -81,12 +69,6 @@ public final class ElementSetAttributeNS extends DOMTestCase { assertEquals("elementsetattributens01_attrName", "attr", attrName); assertEquals("elementsetattributens01_attrValue", "value", attrValue); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify DOMException.", - method = "setAttributeNS", - args = {java.lang.String.class, java.lang.String.class, java.lang.String.class} - ) public void testSetAttributeNS2() throws Throwable { Document doc; Element element; @@ -108,12 +90,6 @@ public final class ElementSetAttributeNS extends DOMTestCase { assertEquals("elementsetattributens02_attrValue", "Silver Street", attrValue); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify DOMException.", - method = "setAttributeNS", - args = {java.lang.String.class, java.lang.String.class, java.lang.String.class} - ) public void testSetAttributeNS3() throws Throwable { Document doc; Element element; @@ -137,12 +113,6 @@ public final class ElementSetAttributeNS extends DOMTestCase { attrName); assertEquals("elementsetattributens03_attrValue", "default1", attrValue); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies DOMException with INVALID_CHARACTER_ERR.", - method = "setAttributeNS", - args = {java.lang.String.class, java.lang.String.class, java.lang.String.class} - ) public void testSetAttributeNS4() throws Throwable { Document doc; Element element; @@ -176,12 +146,6 @@ public final class ElementSetAttributeNS extends DOMTestCase { } } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies DOMException with NAMESPACE_ERR code.", - method = "setAttributeNS", - args = {java.lang.String.class, java.lang.String.class, java.lang.String.class} - ) public void testSetAttributeNS5() throws Throwable { Document doc; Element element; @@ -201,12 +165,6 @@ public final class ElementSetAttributeNS extends DOMTestCase { assertTrue("elementsetattributens05", success); } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies DOMException with NAMESPACE_ERR code.", - method = "setAttributeNS", - args = {java.lang.String.class, java.lang.String.class, java.lang.String.class} - ) public void testSetAttributeNS8() throws Throwable { Document doc; Element element; @@ -236,12 +194,6 @@ public final class ElementSetAttributeNS extends DOMTestCase { assertTrue("elementsetattributens08_Err2", success); } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies DOMException with NAMESPACE_ERR code.", - method = "setAttributeNS", - args = {java.lang.String.class, java.lang.String.class, java.lang.String.class} - ) public void testSetAttributeNSURINull() throws Throwable { String namespaceURI = null; diff --git a/luni/src/test/java/tests/org/w3c/dom/ElementSetAttributeNodeNS.java b/luni/src/test/java/tests/org/w3c/dom/ElementSetAttributeNodeNS.java index 3a4279c..192db97 100644 --- a/luni/src/test/java/tests/org/w3c/dom/ElementSetAttributeNodeNS.java +++ b/luni/src/test/java/tests/org/w3c/dom/ElementSetAttributeNodeNS.java @@ -21,11 +21,6 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import org.w3c.dom.Element; import org.w3c.dom.Document; import org.w3c.dom.Attr; @@ -49,7 +44,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a * href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElSetAtNodeNS">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElSetAtNodeNS</a> */ -@TestTargetClass(Element.class) public final class ElementSetAttributeNodeNS extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -79,12 +73,6 @@ public final class ElementSetAttributeNodeNS extends DOMTestCase { * @throws Throwable * Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify DOMException.", - method = "setAttributeNodeNS", - args = {org.w3c.dom.Attr.class} - ) public void testSetAttributeNodeNS1() throws Throwable { Document doc; Element element; @@ -118,12 +106,6 @@ public final class ElementSetAttributeNodeNS extends DOMTestCase { length = (int) attributes.getLength(); assertEquals("length", 1, length); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify DOMException.", - method = "setAttributeNodeNS", - args = {org.w3c.dom.Attr.class} - ) public void testSetAttributeNodeNS2() throws Throwable { Document doc; Element element; @@ -149,12 +131,6 @@ public final class ElementSetAttributeNodeNS extends DOMTestCase { assertEquals("elementsetattributenodens02_attrName", "street", attrName); assertEquals("elementsetattributenodens02_attrValue", "Yes", attrValue); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies DOMException with INUSE_ATTRIBUTE_ERR code.", - method = "setAttributeNodeNS", - args = {org.w3c.dom.Attr.class} - ) public void testSetAttributeNodeNS3() throws Throwable { Document doc; Element element1; @@ -181,12 +157,6 @@ public final class ElementSetAttributeNodeNS extends DOMTestCase { assertTrue("elementsetattributenodens03", success); } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies DOMException with INUSE_ATTRIBUTE_ERR code.", - method = "setAttributeNodeNS", - args = {org.w3c.dom.Attr.class} - ) public void testSetAttributeNodeNS4() throws Throwable { Document doc; Element element1; @@ -209,12 +179,6 @@ public final class ElementSetAttributeNodeNS extends DOMTestCase { assertTrue("elementsetattributenodens04", success); } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies DOMException with WRONG_DOCUMENT_ERR code.", - method = "setAttributeNodeNS", - args = {org.w3c.dom.Attr.class} - ) public void testSetAttributeNodeNS5() throws Throwable { Document doc; Document docAlt; @@ -237,12 +201,6 @@ public final class ElementSetAttributeNodeNS extends DOMTestCase { assertTrue("throw_WRONG_DOCUMENT_ERR", success); } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies DOMException with NO_MODIFICATION_ALLOWED_ERR code.", - method = "setAttributeNodeNS", - args = {org.w3c.dom.Attr.class} - ) public void _testSetAttributeNodeNS6() throws Throwable { Document doc; Element element; diff --git a/luni/src/test/java/tests/org/w3c/dom/GetAttributeNS.java b/luni/src/test/java/tests/org/w3c/dom/GetAttributeNS.java index c8244f2..155b75c 100644 --- a/luni/src/test/java/tests/org/w3c/dom/GetAttributeNS.java +++ b/luni/src/test/java/tests/org/w3c/dom/GetAttributeNS.java @@ -21,11 +21,6 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import org.w3c.dom.Element; import org.w3c.dom.Attr; import org.w3c.dom.Document; @@ -48,7 +43,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a * href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=238">http://www.w3.org/Bugs/Public/show_bug.cgi?id=238</a> */ -@TestTargetClass(Element.class) public final class GetAttributeNS extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -93,12 +87,6 @@ public final class GetAttributeNS extends DOMTestCase { // attrValue = testAddr.getAttributeNS(namespaceURI, localName); // assertEquals("attrValue", "DISTRICT", attrValue); // } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify DOMException.", - method = "getAttributeNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testGetAttributeNS2() throws Throwable { String namespaceURI = "http://www.nist.gov"; String localName = "district"; @@ -120,12 +108,6 @@ public final class GetAttributeNS extends DOMTestCase { attrValue = testAddr.getAttributeNS(namespaceURI, localName); assertEquals("throw_Equals", "", attrValue); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify DOMException.", - method = "getAttributeNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testGetAttributeNS3() throws Throwable { String namespaceURI = "http://www.nist.gov"; String localName = "domestic"; @@ -141,12 +123,6 @@ public final class GetAttributeNS extends DOMTestCase { attrValue = testAddr.getAttributeNS(namespaceURI, localName); assertEquals("throw_Equals", "", attrValue); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify DOMException.", - method = "getAttributeNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testGetAttributeNS4() throws Throwable { String namespaceURI = "http://www.nist.gov"; String localName = "blank"; @@ -166,12 +142,6 @@ public final class GetAttributeNS extends DOMTestCase { attrValue = testAddr.getAttributeNS(namespaceURI, localName); assertEquals("throw_Equals", "NewValue", attrValue); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify DOMException.", - method = "getAttributeNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testGetAttributeNS5() throws Throwable { Document doc; NodeList elementList; diff --git a/luni/src/test/java/tests/org/w3c/dom/GetAttributeNodeNS.java b/luni/src/test/java/tests/org/w3c/dom/GetAttributeNodeNS.java index 2ef70a6..7b5c44c 100644 --- a/luni/src/test/java/tests/org/w3c/dom/GetAttributeNodeNS.java +++ b/luni/src/test/java/tests/org/w3c/dom/GetAttributeNodeNS.java @@ -21,11 +21,6 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import org.w3c.dom.Element; import org.w3c.dom.Document; import org.w3c.dom.NodeList; @@ -47,7 +42,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a * href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElGetAtNodeNS">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElGetAtNodeNS</a> */ -@TestTargetClass(Element.class) public final class GetAttributeNodeNS extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -77,12 +71,6 @@ public final class GetAttributeNodeNS extends DOMTestCase { * @throws Throwable * Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify DOMException.", - method = "getAttributeNodeNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testGetAttributeNodeNS1() throws Throwable { String namespaceURI = "http://www.nist.gov"; String localName = "invalidlocalname"; @@ -97,12 +85,6 @@ public final class GetAttributeNodeNS extends DOMTestCase { attribute = testAddr.getAttributeNodeNS(namespaceURI, localName); assertNull("throw_Null", attribute); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify DOMException.", - method = "getAttributeNodeNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testGetAttributeNodeNS2() throws Throwable { Document doc; NodeList elementList; diff --git a/luni/src/test/java/tests/org/w3c/dom/GetElementById.java b/luni/src/test/java/tests/org/w3c/dom/GetElementById.java index 62e1d19..b49df62 100644 --- a/luni/src/test/java/tests/org/w3c/dom/GetElementById.java +++ b/luni/src/test/java/tests/org/w3c/dom/GetElementById.java @@ -21,11 +21,6 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -46,7 +41,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a * href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=383">http://www.w3.org/Bugs/Public/show_bug.cgi?id=383</a> */ -@TestTargetClass(Document.class) public final class GetElementById extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -86,12 +80,6 @@ public final class GetElementById extends DOMTestCase { // tagname = element.getTagName(); // assertEquals("throw_Equals", "emp:address", tagname); // } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify getElementById method for existent element.", - method = "getElementById", - args = {java.lang.String.class} - ) public void testGetElementById2() throws Throwable { Document doc; Element element; diff --git a/luni/src/test/java/tests/org/w3c/dom/GetElementsByTagNameNS.java b/luni/src/test/java/tests/org/w3c/dom/GetElementsByTagNameNS.java index d93da93..19dc827 100644 --- a/luni/src/test/java/tests/org/w3c/dom/GetElementsByTagNameNS.java +++ b/luni/src/test/java/tests/org/w3c/dom/GetElementsByTagNameNS.java @@ -21,11 +21,6 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import java.util.ArrayList; import java.util.List; @@ -50,7 +45,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a * href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-getElBTNNS">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-getElBTNNS</a> */ -@TestTargetClass(Document.class) public final class GetElementsByTagNameNS extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -72,12 +66,6 @@ public final class GetElementsByTagNameNS extends DOMTestCase { builder = null; super.tearDown(); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies getElementsByTagNameNS method with * as parameters.", - method = "getElementsByTagNameNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testGetElementsByTagNameNS1() throws Throwable { String namespaceURI = "*"; String localName = "*"; @@ -89,12 +77,6 @@ public final class GetElementsByTagNameNS extends DOMTestCase { assertEquals("throw_Size", 36, newList.getLength()); // END android-changed } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies getElementsByTagNameNS with '*' as the first parameter.", - method = "getElementsByTagNameNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testGetElementsByTagNameNS2() throws Throwable { Document doc; NodeList newList; @@ -110,12 +92,6 @@ public final class GetElementsByTagNameNS extends DOMTestCase { lname = newElement.getLocalName(); assertEquals("lname", "employee", lname); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies getElementsByTagNameNS with '*' as the second parameter.", - method = "getElementsByTagNameNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testGetElementsByTagNameNS3() throws Throwable { Document doc; NodeList elementList; @@ -148,12 +124,6 @@ public final class GetElementsByTagNameNS extends DOMTestCase { } assertEquals("nodeNames", expectedResult, result); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies getElementsByTagNameNS with '*' as the first parameter.", - method = "getElementsByTagNameNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testGetElementsByTagNameNS4() throws Throwable { Document doc; NodeList elementList; @@ -177,12 +147,6 @@ public final class GetElementsByTagNameNS extends DOMTestCase { } assertEquals("nodeNames", expectedResult, result); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies negative case of getElementsByTagNameNS method.", - method = "getElementsByTagNameNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testGetElementsByTagNameNS5() throws Throwable { String namespaceURI = "http://www.nist.gov"; String localName = "nomatch"; @@ -192,12 +156,6 @@ public final class GetElementsByTagNameNS extends DOMTestCase { elementList = doc.getElementsByTagNameNS(namespaceURI, localName); assertEquals("throw_Size", 0, elementList.getLength()); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies negative case of getElementsByTagNameNS method.", - method = "getElementsByTagNameNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testGetElementsByTagNameNS6() throws Throwable { Document doc; NodeList elementList; @@ -206,12 +164,6 @@ public final class GetElementsByTagNameNS extends DOMTestCase { "address"); assertEquals("matchSize", 0, elementList.getLength()); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies positive case of getElementsByTagNameNS method.", - method = "getElementsByTagNameNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testGetElementsByTagNameNS7() throws Throwable { Document doc; NodeList elementList; @@ -220,12 +172,6 @@ public final class GetElementsByTagNameNS extends DOMTestCase { "address"); assertEquals("addresses", 3, elementList.getLength()); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies getElementsByTagNameNS method with '*' as parameters; positive case.", - method = "getElementsByTagNameNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testGetElementsByTagNameNS8() throws Throwable { Document doc; Element docElem; @@ -235,12 +181,6 @@ public final class GetElementsByTagNameNS extends DOMTestCase { newList = docElem.getElementsByTagNameNS("*", "*"); assertEquals("listSize", 35, newList.getLength()); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies getElementsByTagNameNS method with '*' as the first parameter.", - method = "getElementsByTagNameNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testGetElementsByTagNameNS9() throws Throwable { Document doc; NodeList newList; @@ -258,12 +198,6 @@ public final class GetElementsByTagNameNS extends DOMTestCase { lname = newElement.getLocalName(); assertEquals("lname", "employee", lname); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies getElementsByTagNameNS method with '*' as the second parameter.", - method = "getElementsByTagNameNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testGetElementsByTagNameNS10() throws Throwable { Document doc; Element docElem; @@ -299,12 +233,6 @@ public final class GetElementsByTagNameNS extends DOMTestCase { } assertEquals("nodeNames", expectedResult, result); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies getElementsByTagNameNS method with '*' as the first parameter.", - method = "getElementsByTagNameNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testGetElementsByTagNameNS11() throws Throwable { Document doc; Element docElem; @@ -330,12 +258,6 @@ public final class GetElementsByTagNameNS extends DOMTestCase { } assertEquals("nodeNames", expectedResult, result); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies negative case for getElementsByTagNameNS method.", - method = "getElementsByTagNameNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testGetElementsByTagNameNS12() throws Throwable { Document doc; Element docElem; @@ -346,12 +268,6 @@ public final class GetElementsByTagNameNS extends DOMTestCase { "nomatch"); assertEquals("size", 0, elementList.getLength()); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies negative case for getElementsByTagNameNS method.", - method = "getElementsByTagNameNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testGetElementsByTagNameNS13() throws Throwable { Document doc; Element docElem; @@ -362,12 +278,6 @@ public final class GetElementsByTagNameNS extends DOMTestCase { "address"); assertEquals("matchSize", 0, elementList.getLength()); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies positive case for getElementsByTagNameNS method.", - method = "getElementsByTagNameNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testGetElementsByTagNameNS14() throws Throwable { Document doc; Element docElem; diff --git a/luni/src/test/java/tests/org/w3c/dom/GetNamedItemNS.java b/luni/src/test/java/tests/org/w3c/dom/GetNamedItemNS.java index 51160f5..70c3b53 100644 --- a/luni/src/test/java/tests/org/w3c/dom/GetNamedItemNS.java +++ b/luni/src/test/java/tests/org/w3c/dom/GetNamedItemNS.java @@ -1,10 +1,5 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Document; import org.w3c.dom.Attr; @@ -27,7 +22,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a * href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-F68D095">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-F68D095</a> */ -@TestTargetClass(NamedNodeMap.class) public final class GetNamedItemNS extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -57,12 +51,6 @@ public final class GetNamedItemNS extends DOMTestCase { * @throws Throwable * Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify DOMException.", - method = "getNamedItem", - args = {java.lang.String.class} - ) public void testGetNamedItemNS1() throws Throwable { Document doc; NodeList elementList; @@ -79,12 +67,6 @@ public final class GetNamedItemNS extends DOMTestCase { attrName = domesticAttr.getNodeName(); assertEquals("attrName", "dmstc:domestic", attrName); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify DOMException.", - method = "getNamedItemNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testGetNamedItemNS2() throws Throwable { String namespaceURI = "http://www.usa.com"; String localName = "domest"; diff --git a/luni/src/test/java/tests/org/w3c/dom/HCEntitiesRemoveNamedItemNS.java b/luni/src/test/java/tests/org/w3c/dom/HCEntitiesRemoveNamedItemNS.java index b131444..1c9d65a 100644 --- a/luni/src/test/java/tests/org/w3c/dom/HCEntitiesRemoveNamedItemNS.java +++ b/luni/src/test/java/tests/org/w3c/dom/HCEntitiesRemoveNamedItemNS.java @@ -18,8 +18,6 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargetClass; - import javax.xml.parsers.DocumentBuilder; import org.w3c.dom.DOMException; @@ -37,7 +35,6 @@ import org.w3c.dom.NamedNodeMap; * @see <a * href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-removeNamedItemNS">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-removeNamedItemNS</a> */ -@TestTargetClass(NamedNodeMap.class) public final class HCEntitiesRemoveNamedItemNS extends DOMTestCase { DOMDocumentBuilderFactory factory; diff --git a/luni/src/test/java/tests/org/w3c/dom/HCEntitiesSetNamedItemNS.java b/luni/src/test/java/tests/org/w3c/dom/HCEntitiesSetNamedItemNS.java index 56186b8..692b33e 100644 --- a/luni/src/test/java/tests/org/w3c/dom/HCEntitiesSetNamedItemNS.java +++ b/luni/src/test/java/tests/org/w3c/dom/HCEntitiesSetNamedItemNS.java @@ -1,7 +1,5 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargetClass; - import javax.xml.parsers.DocumentBuilder; import org.w3c.dom.DOMException; @@ -20,7 +18,6 @@ import org.w3c.dom.NamedNodeMap; * @see <a * href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-setNamedItemNS">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-setNamedItemNS</a> */ -@TestTargetClass(NamedNodeMap.class) public final class HCEntitiesSetNamedItemNS extends DOMTestCase { DOMDocumentBuilderFactory factory; diff --git a/luni/src/test/java/tests/org/w3c/dom/HCNamedNodeMapInvalidType.java b/luni/src/test/java/tests/org/w3c/dom/HCNamedNodeMapInvalidType.java index aab04f2..91d2591 100644 --- a/luni/src/test/java/tests/org/w3c/dom/HCNamedNodeMapInvalidType.java +++ b/luni/src/test/java/tests/org/w3c/dom/HCNamedNodeMapInvalidType.java @@ -18,11 +18,6 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -42,7 +37,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a * href="http://www.w3.org/2000/11/DOM-Level-2-errata#core-4">http://www.w3.org/2000/11/DOM-Level-2-errata#core-4</a> */ -@TestTargetClass(NamedNodeMap.class) public final class HCNamedNodeMapInvalidType extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -72,12 +66,6 @@ public final class HCNamedNodeMapInvalidType extends DOMTestCase { * @throws Throwable * Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies that setNamedItem method throws DOMException with HIERARCHY_REQUEST_ERR code.", - method = "setNamedItem", - args = {org.w3c.dom.Node.class} - ) public void testNamedNodeMapInvalidType() throws Throwable { Document doc; NamedNodeMap attributes; diff --git a/luni/src/test/java/tests/org/w3c/dom/HCNodeDocumentFragmentNormalize.java b/luni/src/test/java/tests/org/w3c/dom/HCNodeDocumentFragmentNormalize.java index d2fa3ae..d3ac61e 100644 --- a/luni/src/test/java/tests/org/w3c/dom/HCNodeDocumentFragmentNormalize.java +++ b/luni/src/test/java/tests/org/w3c/dom/HCNodeDocumentFragmentNormalize.java @@ -1,10 +1,5 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import org.w3c.dom.Node; import org.w3c.dom.Document; import org.w3c.dom.DocumentFragment; @@ -22,7 +17,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a * href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-B63ED1A3">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-B63ED1A3</a> */ -@TestTargetClass(Node.class) public final class HCNodeDocumentFragmentNormalize extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -52,20 +46,6 @@ public final class HCNodeDocumentFragmentNormalize extends DOMTestCase { * @throws Throwable * Any uncaught exception causes test to fail */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies positive functionality of getNodeValue method, and that getNextSibling method returns null.", - method = "getNodeValue", - args = {} - ), - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies positive functionality of getNodeValue method, and that getNextSibling method returns null.", - method = "getNextSibling", - args = {} - ) - }) public void testNodeDocumentFragmentNormalize1() throws Throwable { Document doc; DocumentFragment docFragment; @@ -86,12 +66,6 @@ public final class HCNodeDocumentFragmentNormalize extends DOMTestCase { retval = txtNode.getNextSibling(); assertNull("singleChild", retval); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies that getFirstChild method returns null.", - method = "getFirstChild", - args = {} - ) public void testNodeDocumentFragmentNormalize2() throws Throwable { Document doc; DocumentFragment docFragment; diff --git a/luni/src/test/java/tests/org/w3c/dom/HCNotationsRemoveNamedItemNS.java b/luni/src/test/java/tests/org/w3c/dom/HCNotationsRemoveNamedItemNS.java index acde3a7..b658387 100644 --- a/luni/src/test/java/tests/org/w3c/dom/HCNotationsRemoveNamedItemNS.java +++ b/luni/src/test/java/tests/org/w3c/dom/HCNotationsRemoveNamedItemNS.java @@ -18,11 +18,6 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Document; import org.w3c.dom.DocumentType; @@ -40,7 +35,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a * href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-removeNamedItemNS">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-removeNamedItemNS</a> */ -@TestTargetClass(NamedNodeMap.class) public final class HCNotationsRemoveNamedItemNS extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -70,12 +64,6 @@ public final class HCNotationsRemoveNamedItemNS extends DOMTestCase { * @throws Throwable * Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that removeNamedItemNS method throws DOMException.", - method = "removeNamedItemNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testRemoveNamedItemNS() throws Throwable { Document doc; NamedNodeMap notations; diff --git a/luni/src/test/java/tests/org/w3c/dom/HCNotationsSetNamedItemNS.java b/luni/src/test/java/tests/org/w3c/dom/HCNotationsSetNamedItemNS.java index a58eda3..267b2f3 100644 --- a/luni/src/test/java/tests/org/w3c/dom/HCNotationsSetNamedItemNS.java +++ b/luni/src/test/java/tests/org/w3c/dom/HCNotationsSetNamedItemNS.java @@ -18,11 +18,6 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Document; import org.w3c.dom.DocumentType; @@ -41,7 +36,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a * href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-setNamedItemNS">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-setNamedItemNS</a> */ -@TestTargetClass(NamedNodeMap.class) public final class HCNotationsSetNamedItemNS extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -71,12 +65,6 @@ public final class HCNotationsSetNamedItemNS extends DOMTestCase { * @throws Throwable * Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that setNamedItemNS throws DOMException.", - method = "setNamedItemNS", - args = {org.w3c.dom.Node.class} - ) public void testNotationsSetNamedItemNS() throws Throwable { Document doc; NamedNodeMap notations; diff --git a/luni/src/test/java/tests/org/w3c/dom/HasAttribute.java b/luni/src/test/java/tests/org/w3c/dom/HasAttribute.java index d0cd09a..1509e69 100644 --- a/luni/src/test/java/tests/org/w3c/dom/HasAttribute.java +++ b/luni/src/test/java/tests/org/w3c/dom/HasAttribute.java @@ -1,10 +1,5 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import org.w3c.dom.Element; import org.w3c.dom.Document; import org.w3c.dom.NodeList; @@ -22,7 +17,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a * href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElHasAttr">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElHasAttr</a> */ -@TestTargetClass(Element.class) public final class HasAttribute extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -52,12 +46,6 @@ public final class HasAttribute extends DOMTestCase { * @throws Throwable * Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that hasAttribute method returns false.", - method = "hasAttribute", - args = {java.lang.String.class} - ) public void testHasAttribute1() throws Throwable { Document doc; NodeList elementList; @@ -82,12 +70,6 @@ public final class HasAttribute extends DOMTestCase { // state = testNode.hasAttribute("street"); // assertTrue("throw_True", state); // } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that hasAttribute method returns false.", - method = "hasAttribute", - args = {java.lang.String.class} - ) public void testHasAttribute3() throws Throwable { Document doc; NodeList elementList; @@ -99,12 +81,6 @@ public final class HasAttribute extends DOMTestCase { state = testNode.hasAttribute("nomatch"); assertFalse("throw_False", state); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that hasAttribute method returns true.", - method = "hasAttribute", - args = {java.lang.String.class} - ) public void testHasAttribute4() throws Throwable { Document doc; NodeList elementList; diff --git a/luni/src/test/java/tests/org/w3c/dom/HasAttributeNS.java b/luni/src/test/java/tests/org/w3c/dom/HasAttributeNS.java index 8ff8fd0..b81b007 100644 --- a/luni/src/test/java/tests/org/w3c/dom/HasAttributeNS.java +++ b/luni/src/test/java/tests/org/w3c/dom/HasAttributeNS.java @@ -21,11 +21,6 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import org.w3c.dom.Element; import org.w3c.dom.Document; import org.w3c.dom.NodeList; @@ -46,7 +41,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a * href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElHasAttrNS">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-ElHasAttrNS</a> */ -@TestTargetClass(Element.class) public final class HasAttributeNS extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -76,12 +70,6 @@ public final class HasAttributeNS extends DOMTestCase { * @throws Throwable * Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify DOMException.", - method = "hasAttributeNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testHasAttributeNS1() throws Throwable { String localName = "nomatch"; String namespaceURI = "http://www.usa.com"; @@ -95,12 +83,6 @@ public final class HasAttributeNS extends DOMTestCase { state = testNode.hasAttributeNS(namespaceURI, localName); assertFalse("throw_False", state); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify DOMException.", - method = "hasAttributeNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testHasAttributeNS2() throws Throwable { String localName = "domestic"; String namespaceURI = "http://www.nomatch.com"; @@ -114,12 +96,6 @@ public final class HasAttributeNS extends DOMTestCase { state = testNode.hasAttributeNS(namespaceURI, localName); assertFalse("throw_False", state); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify DOMException.", - method = "hasAttributeNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testHasAttributeNS3() throws Throwable { String localName = "blank"; String namespaceURI = "http://www.nist.gov"; @@ -150,12 +126,6 @@ public final class HasAttributeNS extends DOMTestCase { // state = testNode.hasAttributeNS(namespaceURI, localName); // assertTrue("hasAttribute", state); // } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify DOMException.", - method = "hasAttributeNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testHasAttributeNS5() throws Throwable { String localName = "domestic"; String namespaceURI = "http://www.usa.com"; diff --git a/luni/src/test/java/tests/org/w3c/dom/HasAttributes.java b/luni/src/test/java/tests/org/w3c/dom/HasAttributes.java index 059d883..11c6d5e 100644 --- a/luni/src/test/java/tests/org/w3c/dom/HasAttributes.java +++ b/luni/src/test/java/tests/org/w3c/dom/HasAttributes.java @@ -21,11 +21,6 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import org.w3c.dom.Node; import org.w3c.dom.Document; import org.w3c.dom.NodeList; @@ -43,7 +38,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a * href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeHasAttrs">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeHasAttrs</a> */ -@TestTargetClass(Node.class) public final class HasAttributes extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -73,12 +67,6 @@ public final class HasAttributes extends DOMTestCase { * @throws Throwable * Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that hasAttributes method returns false value.", - method = "hasAttributes", - args = {} - ) public void testHasAttributes1() throws Throwable { Document doc; NodeList addrList; @@ -90,12 +78,6 @@ public final class HasAttributes extends DOMTestCase { state = addrNode.hasAttributes(); assertFalse("throw_False", state); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that hasAttributes method returns true value.", - method = "hasAttributes", - args = {} - ) public void testHasAttributes2() throws Throwable { Document doc; NodeList addrList; diff --git a/luni/src/test/java/tests/org/w3c/dom/ImportNode.java b/luni/src/test/java/tests/org/w3c/dom/ImportNode.java index 2064678..442bac7 100644 --- a/luni/src/test/java/tests/org/w3c/dom/ImportNode.java +++ b/luni/src/test/java/tests/org/w3c/dom/ImportNode.java @@ -21,11 +21,6 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import java.util.ArrayList; import java.util.List; @@ -64,7 +59,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a * href="http://www.w3.org/TR/DOM-Level-2-Core/core#Core-Document-importNode">http://www.w3.org/TR/DOM-Level-2-Core/core#Core-Document-importNode</a> */ -@TestTargetClass(Document.class) public final class ImportNode extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -94,12 +88,6 @@ public final class ImportNode extends DOMTestCase { * @throws Throwable * Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify DOMException.", - method = "importNode", - args = {org.w3c.dom.Node.class, boolean.class} - ) public void _testImportNode1() throws Throwable { Document doc; Document aNewDoc; @@ -143,12 +131,6 @@ public final class ImportNode extends DOMTestCase { childValue = child.getNodeValue(); assertEquals("childValue", "importedText", childValue); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify DOMException.", - method = "importNode", - args = {org.w3c.dom.Node.class, boolean.class} - ) public void testImportNode2() throws Throwable { Document doc; Document aNewDoc; @@ -171,12 +153,6 @@ public final class ImportNode extends DOMTestCase { value = aNode.getNodeValue(); assertEquals("nodeValue", "this is CDATASection data", value); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify DOMException.", - method = "importNode", - args = {org.w3c.dom.Node.class, boolean.class} - ) public void testImportNode3() throws Throwable { Document doc; Document aNewDoc; @@ -199,12 +175,6 @@ public final class ImportNode extends DOMTestCase { value = aNode.getNodeValue(); assertEquals("nodeValue", "this is a comment", value); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify DOMException.", - method = "importNode", - args = {org.w3c.dom.Node.class, boolean.class} - ) public void testImportNode4() throws Throwable { Document doc; Document aNewDoc; @@ -226,12 +196,6 @@ public final class ImportNode extends DOMTestCase { childValue = child.getNodeValue(); assertEquals("descendant1", "descendant1", childValue); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify DOMException.", - method = "importNode", - args = {org.w3c.dom.Node.class, boolean.class} - ) public void testImportNode5() throws Throwable { Document doc; Document aNewDoc; @@ -259,12 +223,6 @@ public final class ImportNode extends DOMTestCase { name = aNode.getNodeName(); assertEquals("nodeName", "emp:address", name); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify DOMException.", - method = "importNode", - args = {org.w3c.dom.Node.class, boolean.class} - ) public void testImportNode6() throws Throwable { Document doc; Document aNewDoc; @@ -314,12 +272,6 @@ public final class ImportNode extends DOMTestCase { // lname = attr.getLocalName(); // assertEquals("lname", "defaultAttr", lname); // } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify DOMException.", - method = "importNode", - args = {org.w3c.dom.Node.class, boolean.class} - ) public void testImportNode8() throws Throwable { Document doc; Document aNewDoc; @@ -378,12 +330,6 @@ public final class ImportNode extends DOMTestCase { // notationName = entity1.getNotationName(); // assertEquals("notationName", "notation2", notationName); // } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify DOMException.", - method = "importNode", - args = {org.w3c.dom.Node.class, boolean.class} - ) public void testImportNode10() throws Throwable { Document doc; Document aNewDoc; @@ -493,12 +439,6 @@ public final class ImportNode extends DOMTestCase { // system = aNode.getSystemId(); // assertNull("notationSystemId", system); // } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify DOMException.", - method = "importNode", - args = {org.w3c.dom.Node.class, boolean.class} - ) public void testImportNode14() throws Throwable { Document doc; Document aNewDoc; @@ -525,12 +465,6 @@ public final class ImportNode extends DOMTestCase { data = aNode.getData(); assertEquals("piData", "data1", data); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify DOMException.", - method = "importNode", - args = {org.w3c.dom.Node.class, boolean.class} - ) public void testImportNode15() throws Throwable { Document doc; Document aNewDoc; @@ -553,12 +487,6 @@ public final class ImportNode extends DOMTestCase { value = aNode.getNodeValue(); assertEquals("nodeValue", "this is text data", value); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that importNode method throws DOMException with NOT_SUPPORTED_ERR code.", - method = "importNode", - args = {org.w3c.dom.Node.class, boolean.class} - ) public void testImportNode16() throws Throwable { Document doc; Document anotherDoc; @@ -578,12 +506,6 @@ public final class ImportNode extends DOMTestCase { assertTrue("throw_NOT_SUPPORTED_ERR", success); } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that importNode method throws DOMException with NOT_SUPPORTED_ERR code.", - method = "importNode", - args = {org.w3c.dom.Node.class, boolean.class} - ) public void testImportNode17() throws Throwable { Document doc; Document anotherDoc; diff --git a/luni/src/test/java/tests/org/w3c/dom/InternalSubset.java b/luni/src/test/java/tests/org/w3c/dom/InternalSubset.java index 17eb385..239b793 100644 --- a/luni/src/test/java/tests/org/w3c/dom/InternalSubset.java +++ b/luni/src/test/java/tests/org/w3c/dom/InternalSubset.java @@ -22,11 +22,6 @@ See W3C License http://www.w3.org/Consortium/Legal/ for more details. package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import org.w3c.dom.DocumentType; import org.w3c.dom.Document; @@ -44,7 +39,6 @@ import javax.xml.parsers.DocumentBuilder; * @author Mary Brady * @see <a href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-Core-DocType-internalSubset">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-Core-DocType-internalSubset</a> */ -@TestTargetClass(DocumentType.class) public final class InternalSubset extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -72,12 +66,6 @@ public final class InternalSubset extends DOMTestCase { * Runs the test case. * @throws Throwable Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify that getInternalSubset method returns the internal subset as a string.", - method = "getInternalSubset", - args = {} - ) public void testGetInternalSubset() throws Throwable { Document doc; DocumentType docType; diff --git a/luni/src/test/java/tests/org/w3c/dom/IsSupported.java b/luni/src/test/java/tests/org/w3c/dom/IsSupported.java index 14e20c3..b27d9c8 100644 --- a/luni/src/test/java/tests/org/w3c/dom/IsSupported.java +++ b/luni/src/test/java/tests/org/w3c/dom/IsSupported.java @@ -1,10 +1,5 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import java.util.ArrayList; import java.util.List; @@ -30,7 +25,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a * href="http://www.w3.org/TR/DOM-Level-2-Core/core#Level-2-Core-Node-supports">http://www.w3.org/TR/DOM-Level-2-Core/core#Level-2-Core-Node-supports</a> */ -@TestTargetClass(Document.class) public final class IsSupported extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -60,12 +54,6 @@ public final class IsSupported extends DOMTestCase { * @throws Throwable * Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies that isSupported method returns false.", - method = "isSupported", - args = {java.lang.String.class, java.lang.String.class} - ) public void testIsSupported1() throws Throwable { Document doc; Node rootNode; @@ -75,12 +63,6 @@ public final class IsSupported extends DOMTestCase { state = rootNode.isSupported("XXX", "1.0"); assertFalse("throw_False", state); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies that isSupported method returns false value.", - method = "isSupported", - args = {java.lang.String.class, java.lang.String.class} - ) public void testIsSupported2() throws Throwable { Document doc; Node rootNode; @@ -90,12 +72,6 @@ public final class IsSupported extends DOMTestCase { state = rootNode.isSupported("XML", "9.0"); assertFalse("throw_False", state); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies that isSupported method returns true value.", - method = "isSupported", - args = {java.lang.String.class, java.lang.String.class} - ) public void testIsSupported4() throws Throwable { Document doc; Node rootNode; @@ -105,12 +81,6 @@ public final class IsSupported extends DOMTestCase { state = rootNode.isSupported("xml", "1.0"); assertTrue("throw_True", state); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies that isSupported method returns true value.", - method = "isSupported", - args = {java.lang.String.class, java.lang.String.class} - ) public void testIsSupported5() throws Throwable { Document doc; Node rootNode; @@ -120,12 +90,6 @@ public final class IsSupported extends DOMTestCase { state = rootNode.isSupported("core", "2.0"); assertTrue("throw_True", state); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies that isSupported method returns true value.", - method = "isSupported", - args = {java.lang.String.class, java.lang.String.class} - ) public void testIsSupported6() throws Throwable { Document doc; Node rootNode; @@ -135,12 +99,6 @@ public final class IsSupported extends DOMTestCase { state = rootNode.isSupported("xml", "2.0"); assertTrue("throw_True", state); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies that isSupported method returns true value.", - method = "isSupported", - args = {java.lang.String.class, java.lang.String.class} - ) public void testIsSupported7() throws Throwable { Document doc; Node rootNode; @@ -150,12 +108,6 @@ public final class IsSupported extends DOMTestCase { state = rootNode.isSupported("XML", ""); assertTrue("throw_True", state); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies that isSupported method returns true value.", - method = "isSupported", - args = {java.lang.String.class, java.lang.String.class} - ) public void testIsSupported9() throws Throwable { Document doc; Node rootNode; @@ -165,12 +117,6 @@ public final class IsSupported extends DOMTestCase { state = rootNode.isSupported("XML", "1.0"); assertTrue("throw_True", state); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies that isSupported method returns true.", - method = "isSupported", - args = {java.lang.String.class, java.lang.String.class} - ) public void testIsSupported10() throws Throwable { Document doc; Node rootNode; @@ -180,12 +126,6 @@ public final class IsSupported extends DOMTestCase { state = rootNode.isSupported("CORE", "2.0"); assertTrue("throw_True", state); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies that isSupported method returns true.", - method = "isSupported", - args = {java.lang.String.class, java.lang.String.class} - ) public void testIsSupported11() throws Throwable { Document doc; Node rootNode; @@ -196,12 +136,6 @@ public final class IsSupported extends DOMTestCase { assertTrue("throw_True", state); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "", - method = "isSupported", - args = {java.lang.String.class, java.lang.String.class} - ) public void testIsSupported12() throws Throwable { List<String> features = new ArrayList<String>(); features.add("Core"); @@ -237,12 +171,6 @@ public final class IsSupported extends DOMTestCase { state = rootNode.isSupported(featureElement, "2.0"); } } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies that isSupported method returns correct value if it has empty string as a version parameter.", - method = "isSupported", - args = {java.lang.String.class, java.lang.String.class} - ) public void testIsSupported13() throws Throwable { Document doc; Node rootNode; @@ -252,12 +180,6 @@ public final class IsSupported extends DOMTestCase { state = rootNode.isSupported("Core", ""); assertTrue("Core", state); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies that isSupported method returns correct value if it has null as a version parameter.", - method = "isSupported", - args = {java.lang.String.class, java.lang.String.class} - ) public void testIsSupported14() throws Throwable { Document doc; Node rootNode; diff --git a/luni/src/test/java/tests/org/w3c/dom/LocalName.java b/luni/src/test/java/tests/org/w3c/dom/LocalName.java index 7045617..9796ef2 100644 --- a/luni/src/test/java/tests/org/w3c/dom/LocalName.java +++ b/luni/src/test/java/tests/org/w3c/dom/LocalName.java @@ -1,10 +1,5 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import org.w3c.dom.Node; import org.w3c.dom.Document; import org.w3c.dom.NodeList; @@ -28,7 +23,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a * href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSLocalN">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSLocalN</a> */ -@TestTargetClass(Node.class) public final class LocalName extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -58,12 +52,6 @@ public final class LocalName extends DOMTestCase { * @throws Throwable * Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies positive functionality.", - method = "getLocalName", - args = {} - ) public void testGetLocalName1() throws Throwable { Document doc; NodeList elementList; @@ -78,12 +66,6 @@ public final class LocalName extends DOMTestCase { localName = addrAttr.getLocalName(); assertEquals("localName", "domestic", localName); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that getLocalName method returns null.", - method = "getLocalName", - args = {} - ) public void testGetLocalName2() throws Throwable { Document doc; Node createdNode; @@ -93,12 +75,6 @@ public final class LocalName extends DOMTestCase { localName = createdNode.getLocalName(); assertNull("localNameNull", localName); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that getLocalName method returns null.", - method = "getLocalName", - args = {} - ) public void testGetLocalName3() throws Throwable { Document doc; NodeList elementList; @@ -112,12 +88,6 @@ public final class LocalName extends DOMTestCase { localName = textNode.getLocalName(); assertNull("textNodeLocalName", localName); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies positive functionality.", - method = "getLocalName", - args = {} - ) public void testGetLocalName4() throws Throwable { Document doc; NodeList elementList; diff --git a/luni/src/test/java/tests/org/w3c/dom/NamedNodeMapGetNamedItemNS.java b/luni/src/test/java/tests/org/w3c/dom/NamedNodeMapGetNamedItemNS.java index e6d2d73..3bdac18 100644 --- a/luni/src/test/java/tests/org/w3c/dom/NamedNodeMapGetNamedItemNS.java +++ b/luni/src/test/java/tests/org/w3c/dom/NamedNodeMapGetNamedItemNS.java @@ -21,11 +21,6 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Document; import org.w3c.dom.Node; @@ -51,7 +46,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a * href="http://lists.w3.org/Archives/Member/w3c-dom-ig/2003Nov/0016.html">http://lists.w3.org/Archives/Member/w3c-dom-ig/2003Nov/0016.html</a> */ -@TestTargetClass(NamedNodeMap.class) public final class NamedNodeMapGetNamedItemNS extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -103,12 +97,6 @@ public final class NamedNodeMapGetNamedItemNS extends DOMTestCase { // notation = (Notation) notations.getNamedItemNS(nullNS, "notation1"); // assertNotNull("notationNull", notation); // } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify DOMException.", - method = "getNamedItemNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testGetNamedItemNS2() throws Throwable { Document doc; NamedNodeMap attributes; @@ -126,12 +114,6 @@ public final class NamedNodeMapGetNamedItemNS extends DOMTestCase { attrName = attribute.getNodeName(); assertEquals("namednodemapgetnameditemns02", "emp:domestic", attrName); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify DOMException.", - method = "getNamedItemNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testGetNamedItemNS3() throws Throwable { Document doc; NamedNodeMap attributes; @@ -153,12 +135,6 @@ public final class NamedNodeMapGetNamedItemNS extends DOMTestCase { attrName = attribute.getNodeName(); assertEquals("namednodemapgetnameditemns03", "L2:att", attrName); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify DOMException.", - method = "getNamedItemNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testGetNamedItemNS4() throws Throwable { Document doc; NamedNodeMap attributes; @@ -178,12 +154,6 @@ public final class NamedNodeMapGetNamedItemNS extends DOMTestCase { attrName = attribute.getNodeName(); assertEquals("namednodemapgetnameditemns04", "street", attrName); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify DOMException.", - method = "getNamedItemNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testGetNamedItemNS5() throws Throwable { Document doc; NamedNodeMap attributes; diff --git a/luni/src/test/java/tests/org/w3c/dom/NamedNodeMapRemoveNamedItemNS.java b/luni/src/test/java/tests/org/w3c/dom/NamedNodeMapRemoveNamedItemNS.java index ffdce2c..19795e8 100644 --- a/luni/src/test/java/tests/org/w3c/dom/NamedNodeMapRemoveNamedItemNS.java +++ b/luni/src/test/java/tests/org/w3c/dom/NamedNodeMapRemoveNamedItemNS.java @@ -21,11 +21,6 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Document; import org.w3c.dom.Node; @@ -48,7 +43,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a * href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-D58B193">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-D58B193</a> */ -@TestTargetClass(NamedNodeMap.class) public final class NamedNodeMapRemoveNamedItemNS extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -78,12 +72,6 @@ public final class NamedNodeMapRemoveNamedItemNS extends DOMTestCase { * @throws Throwable * Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify DOMException.", - method = "removeNamedItemNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testRemoveNamedItemNS1() throws Throwable { Document doc; NamedNodeMap attributes; @@ -124,12 +112,6 @@ public final class NamedNodeMapRemoveNamedItemNS extends DOMTestCase { // assertEquals("namednodemapremovenameditemns02_attrValue", "defaultVal", // attrValue); // } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify DOMException.", - method = "removeNamedItemNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testRemoveNamedItemNS3() throws Throwable { Document doc; NamedNodeMap attributes; @@ -155,12 +137,6 @@ public final class NamedNodeMapRemoveNamedItemNS extends DOMTestCase { nodeName = attribute.getNodeName(); assertEquals("namednodemapremovenameditemns02", "L2:att", nodeName); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify DOMException.", - method = "removeNamedItemNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void _testRemoveNamedItemNS4() throws Throwable { Document doc; NamedNodeMap attributes; @@ -228,12 +204,6 @@ public final class NamedNodeMapRemoveNamedItemNS extends DOMTestCase { // } // } // } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that removeNamedItemNS method throws DOMException with NOT_FOUND_ERR code.", - method = "removeNamedItemNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testRemoveNamedItemNS6() throws Throwable { Document doc; NamedNodeMap attributes; @@ -256,12 +226,6 @@ public final class NamedNodeMapRemoveNamedItemNS extends DOMTestCase { assertTrue("throw_NOT_FOUND_ERR", success); } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that removeNamedItemNS method throws DOMException with NOT_FOUND_ERR code.", - method = "removeNamedItemNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testRemoveNamedItemNS7() throws Throwable { Document doc; NamedNodeMap attributes; @@ -284,12 +248,6 @@ public final class NamedNodeMapRemoveNamedItemNS extends DOMTestCase { assertTrue("throw_NOT_FOUND_ERR", success); } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that removeNamedItemNS method throws DOMException with NOT_FOUND_ERR code.", - method = "removeNamedItemNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testRemoveNamedItemNS8() throws Throwable { Document doc; NamedNodeMap attributes; @@ -313,12 +271,6 @@ public final class NamedNodeMapRemoveNamedItemNS extends DOMTestCase { assertTrue("throw_NOT_FOUND_ERR", success); } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify DOMException.", - method = "removeNamedItemNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testRemoveNamedItemNS9() throws Throwable { Document doc; NamedNodeMap attributes; diff --git a/luni/src/test/java/tests/org/w3c/dom/NamedNodeMapSetNamedItemNS.java b/luni/src/test/java/tests/org/w3c/dom/NamedNodeMapSetNamedItemNS.java index 3e8c042..70243e6 100644 --- a/luni/src/test/java/tests/org/w3c/dom/NamedNodeMapSetNamedItemNS.java +++ b/luni/src/test/java/tests/org/w3c/dom/NamedNodeMapSetNamedItemNS.java @@ -21,11 +21,6 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Document; import org.w3c.dom.Attr; @@ -53,7 +48,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a * href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-getNamedItemNS">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-getNamedItemNS</a> */ -@TestTargetClass(NamedNodeMap.class) public final class NamedNodeMapSetNamedItemNS extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -86,12 +80,6 @@ public final class NamedNodeMapSetNamedItemNS extends DOMTestCase { * @throws Throwable * Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify DOMException.", - method = "setNamedItemNS", - args = {org.w3c.dom.Node.class} - ) public void testSetNamedItemNS1() throws Throwable { Document doc; NamedNodeMap attributes; @@ -113,12 +101,6 @@ public final class NamedNodeMapSetNamedItemNS extends DOMTestCase { attrName = attribute.getNodeName(); assertEquals("namednodemapsetnameditemns01", "streets", attrName); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify DOMException.", - method = "setNamedItemNS", - args = {org.w3c.dom.Node.class} - ) public void testSetNamedItemNS2() throws Throwable { Document doc; NamedNodeMap attributes; @@ -138,12 +120,6 @@ public final class NamedNodeMapSetNamedItemNS extends DOMTestCase { attrName = attribute.getNodeName(); assertEquals("namednodemapsetnameditemns02", "L1:att", attrName); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies that setNamedItemNS throws DOMException with WRONG_DOCUMENT_ERR code.", - method = "setNamedItemNS", - args = {org.w3c.dom.Node.class} - ) public void testSetNamedItemNS3() throws Throwable { Document doc; @@ -179,12 +155,6 @@ public final class NamedNodeMapSetNamedItemNS extends DOMTestCase { assertTrue("throw_WRONG_DOCUMENT_ERR", success); } } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies that setNamedItemNS throws DOMException with WRONG_DOCUMENT_ERR code.", - method = "setNamedItemNS", - args = {org.w3c.dom.Node.class} - ) public void testSetNamedItemNS4() throws Throwable { Document doc; DOMImplementation domImpl; @@ -255,12 +225,6 @@ public final class NamedNodeMapSetNamedItemNS extends DOMTestCase { // assertTrue("throw_NO_MODIFICATION_ALLOWED_ERR_notations", success); // } // } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies that setNamedItemNS throws DOMException with INUSE_ATTRIBUTE_ERR code.", - method = "setNamedItemNS", - args = {org.w3c.dom.Node.class} - ) public void testSetNamedItemNS6() throws Throwable { Document doc; NamedNodeMap attributes; @@ -287,12 +251,6 @@ public final class NamedNodeMapSetNamedItemNS extends DOMTestCase { assertTrue("namednodemapsetnameditemns06", success); } } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies that setNamedItemNS throws DOMException with INUSE_ATTRIBUTE_ERR code.", - method = "setNamedItemNS", - args = {org.w3c.dom.Node.class} - ) public void testSetNamedItemNS7() throws Throwable { Document doc; NamedNodeMap attributes; @@ -319,12 +277,6 @@ public final class NamedNodeMapSetNamedItemNS extends DOMTestCase { assertTrue("namednodemapsetnameditemns07", success); } } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies that setNamedItemNS throws DOMException with INUSE_ATTRIBUTE_ERR code.", - method = "setNamedItemNS", - args = {org.w3c.dom.Node.class} - ) public void testSetNamedItemNS8() throws Throwable { Document doc; NamedNodeMap attributes; diff --git a/luni/src/test/java/tests/org/w3c/dom/NamespaceURI.java b/luni/src/test/java/tests/org/w3c/dom/NamespaceURI.java index 36edf19..9eab9db 100644 --- a/luni/src/test/java/tests/org/w3c/dom/NamespaceURI.java +++ b/luni/src/test/java/tests/org/w3c/dom/NamespaceURI.java @@ -21,11 +21,6 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.NodeList; @@ -49,7 +44,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a * href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=238">http://www.w3.org/Bugs/Public/show_bug.cgi?id=238</a> */ -@TestTargetClass(Attr.class) public final class NamespaceURI extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -94,12 +88,6 @@ public final class NamespaceURI extends DOMTestCase { // attrNamespaceURI = addrAttr.getNamespaceURI(); // assertEquals("namespaceURI", "http://www.nist.gov", attrNamespaceURI); // } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify that getNamespaceURI method returns null.", - method = "getNamespaceURI", - args = {} - ) public void testGetNamespaceURI2() throws Throwable { Document doc; NodeList elementList; @@ -115,12 +103,6 @@ public final class NamespaceURI extends DOMTestCase { attrNamespaceURI = addrAttr.getNamespaceURI(); assertEquals("namespaceURI", "http://www.nist.gov", attrNamespaceURI); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify that getNamespaceURI method returns null.", - method = "getNamespaceURI", - args = {} - ) public void testGetNamespaceURI3() throws Throwable { Document doc; NodeList elementList; @@ -133,12 +115,6 @@ public final class NamespaceURI extends DOMTestCase { employeeNamespace = testEmployee.getNamespaceURI(); assertEquals("namespaceURI", "http://www.nist.gov", employeeNamespace); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies that getNamespaceURI method returns null.", - method = "getNamespaceURI", - args = {} - ) public void testGetNamespaceURI4() throws Throwable { Document doc; NodeList elementList; diff --git a/luni/src/test/java/tests/org/w3c/dom/NodeGetLocalName.java b/luni/src/test/java/tests/org/w3c/dom/NodeGetLocalName.java index ce7f150..0eaa25d 100644 --- a/luni/src/test/java/tests/org/w3c/dom/NodeGetLocalName.java +++ b/luni/src/test/java/tests/org/w3c/dom/NodeGetLocalName.java @@ -22,11 +22,6 @@ See W3C License http://www.w3.org/Consortium/Legal/ for more details. package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import org.w3c.dom.Node; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -44,7 +39,6 @@ import javax.xml.parsers.DocumentBuilder; * @author Neil Delima * @see <a href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSLocalN">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSLocalN</a> */ -@TestTargetClass(Node.class) public final class NodeGetLocalName extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -72,12 +66,6 @@ public final class NodeGetLocalName extends DOMTestCase { * Runs the test case. * @throws Throwable Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify that getLocalName method returns null.", - method = "getLocalName", - args = {} - ) public void testGetLocalName() throws Throwable { Document doc; Element element; diff --git a/luni/src/test/java/tests/org/w3c/dom/NodeGetNamespaceURI.java b/luni/src/test/java/tests/org/w3c/dom/NodeGetNamespaceURI.java index ae45975..627709a 100644 --- a/luni/src/test/java/tests/org/w3c/dom/NodeGetNamespaceURI.java +++ b/luni/src/test/java/tests/org/w3c/dom/NodeGetNamespaceURI.java @@ -22,11 +22,6 @@ See W3C License http://www.w3.org/Consortium/Legal/ for more details. package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import org.w3c.dom.Node; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -46,7 +41,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSname">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSname</a> * @see <a href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=259">http://www.w3.org/Bugs/Public/show_bug.cgi?id=259</a> */ -@TestTargetClass(Node.class) public final class NodeGetNamespaceURI extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -74,12 +68,6 @@ public final class NodeGetNamespaceURI extends DOMTestCase { * Runs the test case. * @throws Throwable Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getNamespaceURI", - args = {} - ) public void testGetNamespaceURI() throws Throwable { Document doc; Element element; diff --git a/luni/src/test/java/tests/org/w3c/dom/NodeGetOwnerDocument.java b/luni/src/test/java/tests/org/w3c/dom/NodeGetOwnerDocument.java index 8ec1b3b..e505eaa 100644 --- a/luni/src/test/java/tests/org/w3c/dom/NodeGetOwnerDocument.java +++ b/luni/src/test/java/tests/org/w3c/dom/NodeGetOwnerDocument.java @@ -21,11 +21,6 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import org.w3c.dom.Node; import org.w3c.dom.Document; import org.w3c.dom.DocumentType; @@ -48,7 +43,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a * href="http://www.w3.org/Bugs/Public/show_bug.cgi?id=259">http://www.w3.org/Bugs/Public/show_bug.cgi?id=259</a> */ -@TestTargetClass(Node.class) public final class NodeGetOwnerDocument extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -78,12 +72,6 @@ public final class NodeGetOwnerDocument extends DOMTestCase { * @throws Throwable * Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies that getOwnerDocument method returns null.", - method = "getOwnerDocument", - args = {} - ) public void testGetOwnerDocument1() throws Throwable { Document doc; Document ownerDoc; @@ -97,12 +85,6 @@ public final class NodeGetOwnerDocument extends DOMTestCase { ownerDoc = docType.getOwnerDocument(); assertNull("nodegetownerdocument01", ownerDoc); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getOwnerDocument", - args = {} - ) public void testGetOwnerDocument2() throws Throwable { Document doc; Document newDoc; diff --git a/luni/src/test/java/tests/org/w3c/dom/NodeGetPrefix.java b/luni/src/test/java/tests/org/w3c/dom/NodeGetPrefix.java index 49694c6..13197e8 100644 --- a/luni/src/test/java/tests/org/w3c/dom/NodeGetPrefix.java +++ b/luni/src/test/java/tests/org/w3c/dom/NodeGetPrefix.java @@ -22,11 +22,6 @@ See W3C License http://www.w3.org/Consortium/Legal/ for more details. package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import org.w3c.dom.Node; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -44,7 +39,6 @@ import javax.xml.parsers.DocumentBuilder; * @author Neil Delima * @see <a href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix</a> */ -@TestTargetClass(Node.class) public final class NodeGetPrefix extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -73,12 +67,6 @@ public final class NodeGetPrefix extends DOMTestCase { * Runs the test case. * @throws Throwable Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPrefix", - args = {} - ) public void testGetPrefix() throws Throwable { Document doc; Element element; diff --git a/luni/src/test/java/tests/org/w3c/dom/NodeHasAttributes.java b/luni/src/test/java/tests/org/w3c/dom/NodeHasAttributes.java index 55029b5..d058485 100644 --- a/luni/src/test/java/tests/org/w3c/dom/NodeHasAttributes.java +++ b/luni/src/test/java/tests/org/w3c/dom/NodeHasAttributes.java @@ -21,11 +21,6 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import org.w3c.dom.Node; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -47,7 +42,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a * href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeHasAttrs">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeHasAttrs</a> */ -@TestTargetClass(Node.class) public final class NodeHasAttributes extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -77,12 +71,6 @@ public final class NodeHasAttributes extends DOMTestCase { * @throws Throwable * Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hasAttributes", - args = {} - ) public void testHasAttributes1() throws Throwable { Document doc; Element element; @@ -98,12 +86,6 @@ public final class NodeHasAttributes extends DOMTestCase { hasAttributes = element.hasAttributes(); assertTrue("nodehasattributes01_2", hasAttributes); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies that hasAttributes method returns false value.", - method = "hasAttributes", - args = {} - ) public void testHasAttributes2() throws Throwable { Document doc; DocumentType docType; @@ -113,12 +95,6 @@ public final class NodeHasAttributes extends DOMTestCase { hasAttributes = docType.hasAttributes(); assertFalse("nodehasattributes02", hasAttributes); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies that hasAttributes method returns true value.", - method = "hasAttributes", - args = {} - ) public void testHasAttributes3() throws Throwable { Document doc; Element element; @@ -131,12 +107,6 @@ public final class NodeHasAttributes extends DOMTestCase { hasAttributes = element.hasAttributes(); assertTrue("hasAttributes", hasAttributes); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies that hasAttributes method returns true value.", - method = "hasAttributes", - args = {} - ) public void testHasAttributes4() throws Throwable { Document doc; Document newDoc; diff --git a/luni/src/test/java/tests/org/w3c/dom/NodeIsSupported.java b/luni/src/test/java/tests/org/w3c/dom/NodeIsSupported.java index 0d77cac..8987fb3 100644 --- a/luni/src/test/java/tests/org/w3c/dom/NodeIsSupported.java +++ b/luni/src/test/java/tests/org/w3c/dom/NodeIsSupported.java @@ -21,11 +21,6 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import java.util.ArrayList; import java.util.List; @@ -55,7 +50,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a * href="http://www.w3.org/TR/DOM-Level-2-Core/core#Level-2-Core-Node-supports">http://www.w3.org/TR/DOM-Level-2-Core/core#Level-2-Core-Node-supports</a> */ -@TestTargetClass(Node.class) public final class NodeIsSupported extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -85,12 +79,6 @@ public final class NodeIsSupported extends DOMTestCase { * @throws Throwable * Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify that isSupported method can return false value.", - method = "isSupported", - args = {java.lang.String.class, java.lang.String.class} - ) public void testIsSupported1() throws Throwable { Document doc; Element element; @@ -126,12 +114,6 @@ public final class NodeIsSupported extends DOMTestCase { assertTrue("nodeissupported01_Core3", success); } } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify that isSupported method can return false value.", - method = "isSupported", - args = {java.lang.String.class, java.lang.String.class} - ) public void testIsSupported2() throws Throwable { Document doc; Attr attribute; @@ -167,12 +149,6 @@ public final class NodeIsSupported extends DOMTestCase { assertTrue("nodeissupported02_Core3", success); } } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies that isSupported method returns false value if it's called with empty strings as parameters.", - method = "isSupported", - args = {java.lang.String.class, java.lang.String.class} - ) public void testIsSupported3() throws Throwable { Document doc; DocumentType docType; @@ -182,12 +158,6 @@ public final class NodeIsSupported extends DOMTestCase { success = docType.isSupported("", ""); assertFalse("nodeissupported03", success); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies that isSupported method returns false value.", - method = "isSupported", - args = {java.lang.String.class, java.lang.String.class} - ) public void testIsSupported4() throws Throwable { Document doc; EntityReference entRef; @@ -198,12 +168,6 @@ public final class NodeIsSupported extends DOMTestCase { success = entRef.isSupported("XML CORE", ""); assertFalse("nodeissupported04", success); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies that isSupported method returns false value.", - method = "isSupported", - args = {java.lang.String.class, java.lang.String.class} - ) public void testIsSupported5() throws Throwable { Document doc; ProcessingInstruction pi; diff --git a/luni/src/test/java/tests/org/w3c/dom/NodeNormalize.java b/luni/src/test/java/tests/org/w3c/dom/NodeNormalize.java index 98db190..5fe9c87 100644 --- a/luni/src/test/java/tests/org/w3c/dom/NodeNormalize.java +++ b/luni/src/test/java/tests/org/w3c/dom/NodeNormalize.java @@ -21,11 +21,6 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import org.w3c.dom.Node; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -57,7 +52,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a * href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-normalize">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-normalize</a> */ -@TestTargetClass(Node.class) public final class NodeNormalize extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -87,12 +81,6 @@ public final class NodeNormalize extends DOMTestCase { * @throws Throwable * Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "normalize", - args = {} - ) public void testNormalize() throws Throwable { Document doc; Document newDoc; diff --git a/luni/src/test/java/tests/org/w3c/dom/NodeSetPrefix.java b/luni/src/test/java/tests/org/w3c/dom/NodeSetPrefix.java index 2394d7b..311476b 100644 --- a/luni/src/test/java/tests/org/w3c/dom/NodeSetPrefix.java +++ b/luni/src/test/java/tests/org/w3c/dom/NodeSetPrefix.java @@ -21,11 +21,6 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import java.util.ArrayList; import java.util.List; @@ -54,7 +49,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a * href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix</a> */ -@TestTargetClass(Node.class) public final class NodeSetPrefix extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -84,12 +78,6 @@ public final class NodeSetPrefix extends DOMTestCase { * @throws Throwable * Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify DOMException.", - method = "setPrefix", - args = {java.lang.String.class} - ) public void testSetPrefix1() throws Throwable { Document doc; DocumentFragment docFragment; @@ -134,12 +122,6 @@ public final class NodeSetPrefix extends DOMTestCase { // assertEquals("nodesetprefix02_attrName", "dmstc:domestic", attrName); // assertEquals("nodesetprefix02_newAttrName", "dom:address", newAttrName); // } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies DOMException with NAMESPACE_ERR code.", - method = "setPrefix", - args = {java.lang.String.class} - ) public void testSetPrefix3() throws Throwable { Document doc; Element element; @@ -181,12 +163,6 @@ public final class NodeSetPrefix extends DOMTestCase { // assertTrue("nodesetprefix04", success); // } // } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies DOMException with NAMESPACE_ERR code.", - method = "setPrefix", - args = {java.lang.String.class} - ) public void testSetPrefix5() throws Throwable { Document doc; Element element; @@ -215,12 +191,6 @@ public final class NodeSetPrefix extends DOMTestCase { } } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies DOMException with NAMESPACE_ERR code.", - method = "setPrefix", - args = {java.lang.String.class} - ) public void testSetPrefix6() throws Throwable { Document doc; Element element; @@ -238,12 +208,6 @@ public final class NodeSetPrefix extends DOMTestCase { assertTrue("throw_NAMESPACE_ERR", success); } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies DOMException with NAMESPACE_ERR code.", - method = "setPrefix", - args = {java.lang.String.class} - ) public void testSetPrefix7() throws Throwable { Document doc; Attr attribute; @@ -261,12 +225,6 @@ public final class NodeSetPrefix extends DOMTestCase { assertTrue("throw_NAMESPACE_ERR", success); } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies DOMException with NAMESPACE_ERR.", - method = "setPrefix", - args = {java.lang.String.class} - ) public void testSetPrefix8() throws Throwable { Document doc; Element element; @@ -287,12 +245,6 @@ public final class NodeSetPrefix extends DOMTestCase { assertTrue("throw_NAMESPACE_ERR", success); } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies DOMException with INVALID_CHARACTER_ERR code.", - method = "setPrefix", - args = {java.lang.String.class} - ) public void _testSetPrefix9() throws Throwable { Document doc; String value = "#$%&'()@"; diff --git a/luni/src/test/java/tests/org/w3c/dom/Normalize.java b/luni/src/test/java/tests/org/w3c/dom/Normalize.java index bc0f958..03d6014 100644 --- a/luni/src/test/java/tests/org/w3c/dom/Normalize.java +++ b/luni/src/test/java/tests/org/w3c/dom/Normalize.java @@ -22,11 +22,6 @@ See W3C License http://www.w3.org/Consortium/Legal/ for more details. package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import org.w3c.dom.Element; import org.w3c.dom.Document; import org.w3c.dom.Node; @@ -50,7 +45,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-normalize">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-normalize</a> * @see <a href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-72AB8359">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-72AB8359</a> */ -@TestTargetClass(Element.class) public final class Normalize extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -77,12 +71,6 @@ public final class Normalize extends DOMTestCase { * Runs the test case. * @throws Throwable Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "normalize", - args = {} - ) public void testNormalize() throws Throwable { Document doc; Element root; diff --git a/luni/src/test/java/tests/org/w3c/dom/OwnerDocument.java b/luni/src/test/java/tests/org/w3c/dom/OwnerDocument.java index a588926..eb1a8df 100644 --- a/luni/src/test/java/tests/org/w3c/dom/OwnerDocument.java +++ b/luni/src/test/java/tests/org/w3c/dom/OwnerDocument.java @@ -22,11 +22,6 @@ See W3C License http://www.w3.org/Consortium/Legal/ for more details. package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import org.w3c.dom.Document; import org.w3c.dom.DocumentType; @@ -42,7 +37,6 @@ import javax.xml.parsers.DocumentBuilder; * @author Mary Brady * @see <a href="http://www.w3.org/TR/DOM-Level-2-Core/core#node-ownerDoc">http://www.w3.org/TR/DOM-Level-2-Core/core#node-ownerDoc</a> */ -@TestTargetClass(Document.class) public final class OwnerDocument extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -70,12 +64,6 @@ public final class OwnerDocument extends DOMTestCase { * Runs the test case. * @throws Throwable Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Dosn't verify that getOwnerDocument can return not null value.", - method = "getOwnerDocument", - args = {} - ) public void testGetOwnerDocument() throws Throwable { Document doc; DocumentType ownerDocument; diff --git a/luni/src/test/java/tests/org/w3c/dom/OwnerElement.java b/luni/src/test/java/tests/org/w3c/dom/OwnerElement.java index 37bd10f..d777f42 100644 --- a/luni/src/test/java/tests/org/w3c/dom/OwnerElement.java +++ b/luni/src/test/java/tests/org/w3c/dom/OwnerElement.java @@ -21,11 +21,6 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import org.w3c.dom.Node; import org.w3c.dom.Attr; import org.w3c.dom.Document; @@ -47,7 +42,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a * href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-F68D095">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-F68D095</a> */ -@TestTargetClass(Attr.class) public final class OwnerElement extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -77,12 +71,6 @@ public final class OwnerElement extends DOMTestCase { * @throws Throwable * Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies positive functionlity.", - method = "getOwnerElement", - args = {} - ) public void testGetOwnerElement1() throws Throwable { Document doc; NodeList addressList; @@ -100,12 +88,6 @@ public final class OwnerElement extends DOMTestCase { name = elementNode.getNodeName(); assertEquals("throw_Equals", "address", name); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies that getOwnerElement method returns null.", - method = "getOwnerElement", - args = {} - ) public void testGetOwnerElement2() throws Throwable { Document doc; Attr newAttr; diff --git a/luni/src/test/java/tests/org/w3c/dom/Prefix.java b/luni/src/test/java/tests/org/w3c/dom/Prefix.java index ea449e1..a8cf6a4 100644 --- a/luni/src/test/java/tests/org/w3c/dom/Prefix.java +++ b/luni/src/test/java/tests/org/w3c/dom/Prefix.java @@ -21,11 +21,6 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import org.w3c.dom.Node; import org.w3c.dom.Document; import org.w3c.dom.NodeList; @@ -49,7 +44,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a * href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-NodeNSPrefix</a> */ -@TestTargetClass(Node.class) public final class Prefix extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -79,12 +73,6 @@ public final class Prefix extends DOMTestCase { * @throws Throwable * Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies that getPrefix method can return null.", - method = "getPrefix", - args = {} - ) public void testGetPrefix1() throws Throwable { Document doc; Node createdNode; @@ -94,12 +82,6 @@ public final class Prefix extends DOMTestCase { prefix = createdNode.getPrefix(); assertNull("throw_Null", prefix); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies positive functionality of getPrefix method.", - method = "getPrefix", - args = {} - ) public void testGetPrefix2() throws Throwable { Document doc; NodeList elementList; @@ -114,12 +96,6 @@ public final class Prefix extends DOMTestCase { prefix = textNode.getPrefix(); assertNull("textNodePrefix", prefix); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies positive functionality of getPrefix method.", - method = "getPrefix", - args = {} - ) public void testGetPrefix3() throws Throwable { Document doc; NodeList elementList; @@ -132,12 +108,6 @@ public final class Prefix extends DOMTestCase { prefix = testEmployee.getPrefix(); assertEquals("prefix", "emp", prefix); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies that getPrefix method returns null.", - method = "getPrefix", - args = {} - ) public void testGetPrefix4() throws Throwable { Document doc; NodeList elementList; @@ -149,12 +119,6 @@ public final class Prefix extends DOMTestCase { prefix = testEmployee.getPrefix(); assertNull("throw_Null", prefix); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies that getPrefix method throws DOMException with NAMESPACE_ERR code.", - method = "getPrefix", - args = {} - ) public void testGetPrefix5() throws Throwable { Document doc; NodeList elementList; @@ -176,12 +140,6 @@ public final class Prefix extends DOMTestCase { assertTrue("throw_NAMESPACE_ERR", success); } } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies that getPrefix method throws DOMException with INVALID_CHARACTER_ERR code.", - method = "getPrefix", - args = {} - ) public void _testGetPrefix6() throws Throwable { Document doc; NodeList elementList; @@ -200,12 +158,6 @@ public final class Prefix extends DOMTestCase { assertTrue("throw_INVALID_CHARACTER_ERR", success); } } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies that getPrefix method throws DOMException with NAMESPACE_ERR code.", - method = "getPrefix", - args = {} - ) public void testGetPrefix7() throws Throwable { Document doc; NodeList elementList; @@ -258,12 +210,6 @@ public final class Prefix extends DOMTestCase { // assertTrue("throw_NO_MODIFICATION_ALLOWED_ERR", success); // } // } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies that getPrefix method throws DOMException with NAMESPACE_ERR code.", - method = "getPrefix", - args = {} - ) public void _testGetPrefix9() throws Throwable { Document doc; NodeList elementList; @@ -284,12 +230,6 @@ public final class Prefix extends DOMTestCase { assertTrue("throw_NAMESPACE_ERR", success); } } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies that getPrefix method throws DOMException with NAMESPACE_ERR code.", - method = "getPrefix", - args = {} - ) public void testGetPrefix10() throws Throwable { Document doc; NodeList elementList; @@ -308,12 +248,6 @@ public final class Prefix extends DOMTestCase { assertTrue("throw_NAMESPACE_ERR", success); } } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies that getPrefix method throws DOMException with NAMESPACE_ERR code.", - method = "getPrefix", - args = {} - ) public void testGetPrefix11() throws Throwable { Document doc; NodeList elementList; diff --git a/luni/src/test/java/tests/org/w3c/dom/PublicId.java b/luni/src/test/java/tests/org/w3c/dom/PublicId.java index 32987cf..447a250 100644 --- a/luni/src/test/java/tests/org/w3c/dom/PublicId.java +++ b/luni/src/test/java/tests/org/w3c/dom/PublicId.java @@ -22,11 +22,6 @@ See W3C License http://www.w3.org/Consortium/Legal/ for more details. package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import org.w3c.dom.DocumentType; import org.w3c.dom.Document; @@ -43,7 +38,6 @@ import javax.xml.parsers.DocumentBuilder; * @author Mary Brady * @see <a href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-Core-DocType-publicId">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-Core-DocType-publicId</a> */ -@TestTargetClass(DocumentType.class) public final class PublicId extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -71,12 +65,6 @@ public final class PublicId extends DOMTestCase { * Runs the test case. * @throws Throwable Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPublicId", - args = {} - ) public void testGetPublicId() throws Throwable { Document doc; DocumentType docType; diff --git a/luni/src/test/java/tests/org/w3c/dom/RemoveAttributeNS.java b/luni/src/test/java/tests/org/w3c/dom/RemoveAttributeNS.java index 540a081..0293578 100644 --- a/luni/src/test/java/tests/org/w3c/dom/RemoveAttributeNS.java +++ b/luni/src/test/java/tests/org/w3c/dom/RemoveAttributeNS.java @@ -21,8 +21,6 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargetClass; - import javax.xml.parsers.DocumentBuilder; import org.w3c.dom.Attr; @@ -51,7 +49,6 @@ import org.w3c.dom.NodeList; * @see <a * href="http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-ElRemAtNS')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='NO_MODIFICATION_ALLOWED_ERR'])">http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-ElRemAtNS')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='NO_MODIFICATION_ALLOWED_ERR'])</a> */ -@TestTargetClass(Attr.class) public final class RemoveAttributeNS extends DOMTestCase { DOMDocumentBuilderFactory factory; diff --git a/luni/src/test/java/tests/org/w3c/dom/RemoveNamedItemNS.java b/luni/src/test/java/tests/org/w3c/dom/RemoveNamedItemNS.java index 1d0ea56..d01d5c1 100644 --- a/luni/src/test/java/tests/org/w3c/dom/RemoveNamedItemNS.java +++ b/luni/src/test/java/tests/org/w3c/dom/RemoveNamedItemNS.java @@ -21,11 +21,6 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Document; import org.w3c.dom.Node; @@ -50,7 +45,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a * href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-1074577549">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-1074577549</a> */ -@TestTargetClass(NamedNodeMap.class) public final class RemoveNamedItemNS extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -80,12 +74,6 @@ public final class RemoveNamedItemNS extends DOMTestCase { * @throws Throwable * Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify DOMException exception.", - method = "removeNamedItemNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testRemoveNamedItemNS1() throws Throwable { Document doc; NodeList elementList; @@ -103,12 +91,6 @@ public final class RemoveNamedItemNS extends DOMTestCase { newAttr = (Attr) attributes.getNamedItem("dmstc:domestic"); assertNull("nodeRemoved", newAttr); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies DOMException with NOT_FOUND_ERR code.", - method = "removeNamedItemNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testRemoveNamedItemNS2() throws Throwable { String namespaceURI = "http://www.usa.com"; String localName = "domest"; diff --git a/luni/src/test/java/tests/org/w3c/dom/SetAttributeNS.java b/luni/src/test/java/tests/org/w3c/dom/SetAttributeNS.java index 56ab3e7..671efbe 100644 --- a/luni/src/test/java/tests/org/w3c/dom/SetAttributeNS.java +++ b/luni/src/test/java/tests/org/w3c/dom/SetAttributeNS.java @@ -21,11 +21,6 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import org.w3c.dom.Element; import org.w3c.dom.Document; import org.w3c.dom.Node; @@ -52,7 +47,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a * href="http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-ElSetAttrNS')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='INVALID_CHARACTER_ERR'])">http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-ElSetAttrNS')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='INVALID_CHARACTER_ERR'])</a> */ -@TestTargetClass(Element.class) public final class SetAttributeNS extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -82,12 +76,6 @@ public final class SetAttributeNS extends DOMTestCase { * @throws Throwable * Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies DOMException with INVALID_CHARACTER_ERR code.", - method = "setAttributeNS", - args = {java.lang.String.class, java.lang.String.class, java.lang.String.class} - ) public void testSetAttributeNS1() throws Throwable { String namespaceURI = "http://www.nist.gov"; String qualifiedName = "emp:qual?name"; @@ -109,12 +97,6 @@ public final class SetAttributeNS extends DOMTestCase { assertTrue("throw_INVALID_CHARACTER_ERR", success); } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies DOMException with NAMESPACE_ERR code.", - method = "setAttributeNS", - args = {java.lang.String.class, java.lang.String.class, java.lang.String.class} - ) public void testSetAttributeNS2() throws Throwable { String namespaceURI = "http://www.nist.gov"; String qualifiedName = "emp:"; @@ -176,12 +158,6 @@ public final class SetAttributeNS extends DOMTestCase { // assertTrue("throw_NO_MODIFICATION_ALLOWED_ERR", success); // } // } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies positive functionality.", - method = "setAttributeNS", - args = {String.class, String.class, String.class} - ) public void testSetAttributeNS4() throws Throwable { Document doc; NodeList elementList; @@ -210,12 +186,6 @@ public final class SetAttributeNS extends DOMTestCase { assertEquals("prefix", "newprefix", resultPrefix); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies positive functionality.", - method = "setAttributeNS", - args = {java.lang.String.class, java.lang.String.class, java.lang.String.class} - ) public void testSetAttributeNS5() throws Throwable { String localName = "newAttr"; String namespaceURI = "http://www.newattr.com"; @@ -235,12 +205,6 @@ public final class SetAttributeNS extends DOMTestCase { namespaceURI, localName); assertEquals("throw_Equals", "<newValue>", resultAttr); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies DOMException with NAMESPACE_ERR code.", - method = "setAttributeNS", - args = {java.lang.String.class, java.lang.String.class, java.lang.String.class} - ) public void testSetAttributeNS6() throws Throwable { String namespaceURI = "http://www.nist.gov"; String qualifiedName = "xml:qualifiedName"; @@ -262,12 +226,6 @@ public final class SetAttributeNS extends DOMTestCase { assertTrue("throw_NAMESPACE_ERR", success); } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies DOMException with NAMESPACE_ERR.", - method = "setAttributeNS", - args = {java.lang.String.class, java.lang.String.class, java.lang.String.class} - ) public void testSetAttributeNS7() throws Throwable { String namespaceURI = "http://www.nist.gov"; String qualifiedName = "xmlns"; @@ -289,12 +247,6 @@ public final class SetAttributeNS extends DOMTestCase { assertTrue("throw_NAMESPACE_ERR", success); } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies positive functionality.", - method = "setAttributeNS", - args = {java.lang.String.class, java.lang.String.class, java.lang.String.class} - ) public void testSetAttributeNS9() throws Throwable { String localName = "newAttr"; String namespaceURI = "http://www.newattr.com"; @@ -325,12 +277,6 @@ public final class SetAttributeNS extends DOMTestCase { resultPrefix = addrAttr.getPrefix(); assertEquals("prefix", "emp", resultPrefix); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies DOMException with NAMESPACE_ERR code.", - method = "setAttributeNS", - args = {java.lang.String.class, java.lang.String.class, java.lang.String.class} - ) public void testSetAttributeNS10() throws Throwable { String namespaceURI = "http://www.example.gov"; Document doc; diff --git a/luni/src/test/java/tests/org/w3c/dom/SetAttributeNodeNS.java b/luni/src/test/java/tests/org/w3c/dom/SetAttributeNodeNS.java index 2643ca5..ee218f4 100644 --- a/luni/src/test/java/tests/org/w3c/dom/SetAttributeNodeNS.java +++ b/luni/src/test/java/tests/org/w3c/dom/SetAttributeNodeNS.java @@ -21,11 +21,6 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import org.w3c.dom.Element; import org.w3c.dom.Document; import org.w3c.dom.Node; @@ -55,7 +50,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a * href="http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-ElSetAtNodeNS')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='INUSE_ATTRIBUTE_ERR'])">http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-ElSetAtNodeNS')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='INUSE_ATTRIBUTE_ERR'])</a> */ -@TestTargetClass(Element.class) public final class SetAttributeNodeNS extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -85,12 +79,6 @@ public final class SetAttributeNodeNS extends DOMTestCase { * @throws Throwable * Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies DOMException with INUSE_ATTRIBUTE_ERR code.", - method = "setAttributeNodeNS", - args = {org.w3c.dom.Attr.class} - ) public void testSetAttributeNode1() throws Throwable { String namespaceURI = "http://www.newattr.com"; String qualifiedName = "emp:newAttr"; @@ -157,12 +145,6 @@ public final class SetAttributeNodeNS extends DOMTestCase { // assertTrue("throw_NO_MODIFICATION_ALLOWED_ERR", success); // } // } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify DOMException.", - method = "setAttributeNodeNS", - args = {org.w3c.dom.Attr.class} - ) public void testSetAttributeNode3() throws Throwable { String namespaceURI = "http://www.newattr.com"; String qualifiedName = "emp:newAttr"; @@ -180,12 +162,6 @@ public final class SetAttributeNodeNS extends DOMTestCase { .setAttributeNodeNS(newAttr); assertNull("throw_Null", newAddrAttr); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify DOMException.", - method = "setAttributeNodeNS", - args = {org.w3c.dom.Attr.class} - ) public void testSetAttributeNode4() throws Throwable { Document doc; NodeList elementList; @@ -203,12 +179,6 @@ public final class SetAttributeNodeNS extends DOMTestCase { newName = newAddrAttr.getNodeName(); assertEquals("nodeName", "emp:domestic", newName); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies DOMException with WRONG_DOCUMENT_ERR code.", - method = "setAttributeNodeNS", - args = {org.w3c.dom.Attr.class} - ) public void testSetAttributeNode5() throws Throwable { String namespaceURI = "http://www.newattr.com"; String qualifiedName = "emp:newAttr"; diff --git a/luni/src/test/java/tests/org/w3c/dom/SetNamedItemNS.java b/luni/src/test/java/tests/org/w3c/dom/SetNamedItemNS.java index 140f178..1808885 100644 --- a/luni/src/test/java/tests/org/w3c/dom/SetNamedItemNS.java +++ b/luni/src/test/java/tests/org/w3c/dom/SetNamedItemNS.java @@ -22,11 +22,6 @@ See W3C License http://www.w3.org/Consortium/Legal/ for more details. package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Document; import org.w3c.dom.Node; @@ -51,7 +46,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-setNamedItemNS">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-setNamedItemNS</a> * @see <a href="http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-setNamedItemNS')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='INUSE_ATTRIBUTE_ERR'])">http://www.w3.org/TR/DOM-Level-2-Core/core#xpointer(id('ID-setNamedItemNS')/raises/exception[@name='DOMException']/descr/p[substring-before(.,':')='INUSE_ATTRIBUTE_ERR'])</a> */ -@TestTargetClass(NamedNodeMap.class) public final class SetNamedItemNS extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -79,12 +73,6 @@ public final class SetNamedItemNS extends DOMTestCase { * Runs the test case. * @throws Throwable Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies DOMException with INUSE_ATTRIBUTE_ERR code.", - method = "setNamedItemNS", - args = {org.w3c.dom.Node.class} - ) public void testSetNamedItemNS1() throws Throwable { Document doc; NodeList elementList; @@ -112,12 +100,6 @@ public final class SetNamedItemNS extends DOMTestCase { assertTrue("throw_INUSE_ATTRIBUTE_ERR", success); } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies DOMException with WRONG_DOCUMENT_ERR code.", - method = "setNamedItemNS", - args = {org.w3c.dom.Node.class} - ) public void testSetNamedItemNS2() throws Throwable { String namespaceURI = "http://www.usa.com"; String qualifiedName = "dmstc:domestic"; @@ -146,12 +128,6 @@ public final class SetNamedItemNS extends DOMTestCase { assertTrue("throw_WRONG_DOCUMENT_ERR", success); } } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies positive fnctionality.", - method = "getNamedItemNS", - args = {java.lang.String.class, java.lang.String.class} - ) public void testSetNamedItemNS3() throws Throwable { String namespaceURI = "http://www.nist.gov"; String qualifiedName = "prefix:newAttr"; @@ -217,12 +193,6 @@ public final class SetNamedItemNS extends DOMTestCase { // assertTrue("throw_NO_MODIFICATION_ALLOWED_ERR", success); // } // } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies positive fnctionality.", - method = "setNamedItemNS", - args = {org.w3c.dom.Node.class} - ) public void testSetNamedItemNS5() throws Throwable { String namespaceURI = "http://www.usa.com"; String qualifiedName = "dmstc:domestic"; diff --git a/luni/src/test/java/tests/org/w3c/dom/SystemId.java b/luni/src/test/java/tests/org/w3c/dom/SystemId.java index d244f12..641ea0a 100644 --- a/luni/src/test/java/tests/org/w3c/dom/SystemId.java +++ b/luni/src/test/java/tests/org/w3c/dom/SystemId.java @@ -21,11 +21,6 @@ package tests.org.w3c.dom; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import org.w3c.dom.DocumentType; import org.w3c.dom.Document; @@ -43,7 +38,6 @@ import javax.xml.parsers.DocumentBuilder; * @see <a * href="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-Core-DocType-systemId">http://www.w3.org/TR/DOM-Level-2-Core/core#ID-Core-DocType-systemId</a> */ -@TestTargetClass(DocumentType.class) public final class SystemId extends DOMTestCase { DOMDocumentBuilderFactory factory; @@ -73,12 +67,6 @@ public final class SystemId extends DOMTestCase { * @throws Throwable * Any uncaught exception causes test to fail */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSystemId", - args = {} - ) public void testGetSystemId() throws Throwable { Document doc; DocumentType docType; diff --git a/luni/src/test/java/tests/security/AccessControllerTest.java b/luni/src/test/java/tests/security/AccessControllerTest.java index 5973d30..e031b5e 100644 --- a/luni/src/test/java/tests/security/AccessControllerTest.java +++ b/luni/src/test/java/tests/security/AccessControllerTest.java @@ -16,11 +16,6 @@ package tests.security; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; - import java.lang.reflect.Field; import java.security.AccessController; import java.security.BasicPermission; @@ -32,7 +27,6 @@ import java.security.ProtectionDomain; import junit.framework.TestCase; -@TestTargetClass(AccessController.class) public class AccessControllerTest extends TestCase { private static void setProtectionDomain(Class<?> c, ProtectionDomain pd){ @@ -68,16 +62,6 @@ public class AccessControllerTest extends TestCase { super.setUp(); } - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that checkPermission does not throw a SecurityException " + - "if all classes on the call stack refer to a protection domain " + - "which contains the necessary permissions.", - method = "checkPermission", - args = {Permission.class} - ) - }) public void test_do_privileged2() { // add TestPermission to T0, T1, T2 c0.add(p); diff --git a/luni/src/test/java/tests/security/CertPathBuilderTest.java b/luni/src/test/java/tests/security/CertPathBuilderTest.java index 1c82999..6660390 100644 --- a/luni/src/test/java/tests/security/CertPathBuilderTest.java +++ b/luni/src/test/java/tests/security/CertPathBuilderTest.java @@ -15,9 +15,6 @@ */ package tests.security; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; import java.security.cert.CertPath; import java.security.cert.CertPathBuilder; import java.security.cert.CertPathBuilderResult; @@ -42,29 +39,6 @@ public abstract class CertPathBuilderTest extends TestCase { public abstract CertPathParameters getCertPathParameters() throws Exception; public abstract void validateCertPath(CertPath path); - @TestTargets({ - @TestTargetNew( - level=TestLevel.ADDITIONAL, - method="getInstance", - args={String.class} - ), - @TestTargetNew( - level=TestLevel.ADDITIONAL, - method="build", - args={CertPathParameters.class} - ), - @TestTargetNew( - level=TestLevel.ADDITIONAL, - clazz=CertPathBuilderResult.class, - method="getCertPath", - args={} - ), - @TestTargetNew( - level=TestLevel.COMPLETE, - method="method", - args={} - ) - }) public void testCertPathBuilder() throws Exception { CertPathBuilder pathBuilder = CertPathBuilder.getInstance( algorithmName); diff --git a/luni/src/test/java/tests/security/CertPathValidatorTest.java b/luni/src/test/java/tests/security/CertPathValidatorTest.java index 2821f47..eb2e196 100644 --- a/luni/src/test/java/tests/security/CertPathValidatorTest.java +++ b/luni/src/test/java/tests/security/CertPathValidatorTest.java @@ -15,9 +15,6 @@ */ package tests.security; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; import java.security.cert.CertPath; import java.security.cert.CertPathParameters; import java.security.cert.CertPathValidator; @@ -37,23 +34,6 @@ public abstract class CertPathValidatorTest extends TestCase { public abstract CertPath getCertPath(); public abstract void validateResult(CertPathValidatorResult validatorResult); - @TestTargets({ - @TestTargetNew( - level=TestLevel.ADDITIONAL, - method="getInstance", - args={String.class} - ), - @TestTargetNew( - level=TestLevel.ADDITIONAL, - method="validate", - args={CertPath.class, CertPathParameters.class} - ), - @TestTargetNew( - level=TestLevel.COMPLETE, - method="method", - args={} - ) - }) public void testCertPathValidator() throws Exception { CertPathValidator certPathValidator = CertPathValidator.getInstance( algorithmName); diff --git a/luni/src/test/java/tests/security/CertificateFactoryTest.java b/luni/src/test/java/tests/security/CertificateFactoryTest.java index 1bfa2aa..ca267a9 100644 --- a/luni/src/test/java/tests/security/CertificateFactoryTest.java +++ b/luni/src/test/java/tests/security/CertificateFactoryTest.java @@ -15,9 +15,6 @@ */ package tests.security; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; import java.io.ByteArrayInputStream; import java.io.InputStream; import java.security.cert.Certificate; @@ -39,23 +36,6 @@ public abstract class CertificateFactoryTest extends TestCase { super.setUp(); } - @TestTargets({ - @TestTargetNew( - level=TestLevel.ADDITIONAL, - method="getInstance", - args={String.class} - ), - @TestTargetNew( - level=TestLevel.ADDITIONAL, - method="generateCertificate", - args={InputStream.class} - ), - @TestTargetNew( - level=TestLevel.COMPLETE, - method="method", - args={} - ) - }) public void testCertificateFactory() throws Exception { CertificateFactory certificateFactory = CertificateFactory.getInstance( algorithmName); diff --git a/luni/src/test/java/tests/security/acl/AclNotFoundException2Test.java b/luni/src/test/java/tests/security/acl/AclNotFoundException2Test.java index c4fac46..d3b7735 100644 --- a/luni/src/test/java/tests/security/acl/AclNotFoundException2Test.java +++ b/luni/src/test/java/tests/security/acl/AclNotFoundException2Test.java @@ -17,27 +17,15 @@ package tests.security.acl; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.security.acl.AclNotFoundException; -@TestTargetClass(AclNotFoundException.class) public class AclNotFoundException2Test extends TestCase { /** - * @tests java.security.acl.AclNotFoundException#AclNotFoundException() + * java.security.acl.AclNotFoundException#AclNotFoundException() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "AclNotFoundException", - args = {} - ) public void test_Constructor() { // Test for method java.security.acl.AclNotFoundException() try { diff --git a/luni/src/test/java/tests/security/acl/AclNotFoundExceptionTest.java b/luni/src/test/java/tests/security/acl/AclNotFoundExceptionTest.java index 8dc6753..a4c389e 100644 --- a/luni/src/test/java/tests/security/acl/AclNotFoundExceptionTest.java +++ b/luni/src/test/java/tests/security/acl/AclNotFoundExceptionTest.java @@ -22,11 +22,6 @@ package tests.security.acl; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.security.acl.AclNotFoundException; @@ -35,17 +30,10 @@ import java.security.acl.AclNotFoundException; * Unit test for AclNotFoundException. * */ -@TestTargetClass(AclNotFoundException.class) public class AclNotFoundExceptionTest extends TestCase { /** * check default constructor */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "AclNotFoundException", - args = {} - ) public void testAclNotFoundException() { assertNotNull(new AclNotFoundException()); assertNull(new AclNotFoundException().getMessage()); diff --git a/luni/src/test/java/tests/security/acl/LastOwnerException2Test.java b/luni/src/test/java/tests/security/acl/LastOwnerException2Test.java index e11e633..8b7d9a1 100644 --- a/luni/src/test/java/tests/security/acl/LastOwnerException2Test.java +++ b/luni/src/test/java/tests/security/acl/LastOwnerException2Test.java @@ -17,27 +17,15 @@ package tests.security.acl; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.security.acl.LastOwnerException; -@TestTargetClass(LastOwnerException.class) public class LastOwnerException2Test extends TestCase { /** - * @tests java.security.acl.LastOwnerException#LastOwnerException() + * java.security.acl.LastOwnerException#LastOwnerException() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "LastOwnerException", - args = {} - ) public void test_Constructor() { // Test for method java.security.acl.LastOwnerException() try { diff --git a/luni/src/test/java/tests/security/acl/NotOwnerException2Test.java b/luni/src/test/java/tests/security/acl/NotOwnerException2Test.java index 7ca2aad..5632ec7 100644 --- a/luni/src/test/java/tests/security/acl/NotOwnerException2Test.java +++ b/luni/src/test/java/tests/security/acl/NotOwnerException2Test.java @@ -17,27 +17,15 @@ package tests.security.acl; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.security.acl.NotOwnerException; -@TestTargetClass(NotOwnerException.class) public class NotOwnerException2Test extends TestCase { /** - * @tests java.security.acl.NotOwnerException#NotOwnerException() + * java.security.acl.NotOwnerException#NotOwnerException() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "NotOwnerException", - args = {} - ) public void test_Constructor() { // Test for method java.security.acl.NotOwnerException() try { diff --git a/luni/src/test/java/tests/security/cert/CRLExceptionTest.java b/luni/src/test/java/tests/security/cert/CRLExceptionTest.java index 1de4982..c542a2a 100644 --- a/luni/src/test/java/tests/security/cert/CRLExceptionTest.java +++ b/luni/src/test/java/tests/security/cert/CRLExceptionTest.java @@ -22,11 +22,6 @@ package tests.security.cert; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.security.cert.CRLException; @@ -35,7 +30,6 @@ import java.security.cert.CRLException; * Tests for <code>CRLException</code> class constructors and methods. * */ -@TestTargetClass(CRLException.class) public class CRLExceptionTest extends TestCase { private static String[] msgs = { @@ -49,12 +43,6 @@ public class CRLExceptionTest extends TestCase { * Test for <code>CRLException()</code> constructor Assertion: constructs * CRLException with no detail message */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "CRLException", - args = {} - ) public void testCRLException01() { CRLException tE = new CRLException(); assertNull("getMessage() must return null.", tE.getMessage()); @@ -66,12 +54,6 @@ public class CRLExceptionTest extends TestCase { * constructs CRLException with detail message msg. Parameter * <code>msg</code> is not null. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "CRLException", - args = {java.lang.String.class} - ) public void testCRLException02() { CRLException tE; for (int i = 0; i < msgs.length; i++) { @@ -86,12 +68,6 @@ public class CRLExceptionTest extends TestCase { * Test for <code>CRLException(String)</code> constructor Assertion: * constructs CRLException when <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as a parameter.", - method = "CRLException", - args = {java.lang.String.class} - ) public void testCRLException03() { String msg = null; CRLException tE = new CRLException(msg); @@ -103,12 +79,6 @@ public class CRLExceptionTest extends TestCase { * Test for <code>CRLException(Throwable)</code> constructor Assertion: * constructs CRLException when <code>cause</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as a parameter.", - method = "CRLException", - args = {java.lang.Throwable.class} - ) public void testCRLException04() { Throwable cause = null; CRLException tE = new CRLException(cause); @@ -120,12 +90,6 @@ public class CRLExceptionTest extends TestCase { * Test for <code>CRLException(Throwable)</code> constructor Assertion: * constructs CRLException when <code>cause</code> is not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "CRLException", - args = {java.lang.Throwable.class} - ) public void testCRLException05() { CRLException tE = new CRLException(tCause); if (tE.getMessage() != null) { @@ -144,12 +108,6 @@ public class CRLExceptionTest extends TestCase { * Assertion: constructs CRLException when <code>cause</code> is null * <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as parameters.", - method = "CRLException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testCRLException06() { CRLException tE = new CRLException(null, null); assertNull("getMessage() must return null", tE.getMessage()); @@ -161,12 +119,6 @@ public class CRLExceptionTest extends TestCase { * Assertion: constructs CRLException when <code>cause</code> is null * <code>msg</code> is not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as the second parameter.", - method = "CRLException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testCRLException07() { CRLException tE; for (int i = 0; i < msgs.length; i++) { @@ -182,12 +134,6 @@ public class CRLExceptionTest extends TestCase { * Assertion: constructs CRLException when <code>cause</code> is not null * <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as the first parameter.", - method = "CRLException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testCRLException08() { CRLException tE = new CRLException(null, tCause); if (tE.getMessage() != null) { @@ -206,12 +152,6 @@ public class CRLExceptionTest extends TestCase { * Assertion: constructs CRLException when <code>cause</code> is not null * <code>msg</code> is not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "CRLException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testCRLException09() { CRLException tE; for (int i = 0; i < msgs.length; i++) { diff --git a/luni/src/test/java/tests/security/cert/CRLTest.java b/luni/src/test/java/tests/security/cert/CRLTest.java index 1d09239..be8ddcd 100644 --- a/luni/src/test/java/tests/security/cert/CRLTest.java +++ b/luni/src/test/java/tests/security/cert/CRLTest.java @@ -22,11 +22,6 @@ package tests.security.cert; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.security.cert.CRL; @@ -38,7 +33,6 @@ import org.apache.harmony.security.tests.support.SpiEngUtils; * Tests for <code>java.security.cert.CRL</code> fields and methods * */ -@TestTargetClass(CRL.class) public class CRLTest extends TestCase { public static final String[] validValues = { "X.509", "x.509" }; @@ -52,12 +46,6 @@ public class CRLTest extends TestCase { /** * Test for <code>CRL(String type)</code> constructor<br> */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "CRL", - args = {java.lang.String.class} - ) public final void testConstructor() { for (int i = 0; i< validValues.length; i++) { CRL crl = new MyCRL(validValues[i]); @@ -81,12 +69,6 @@ public class CRLTest extends TestCase { * Test #1 for <code>getType()</code> method<br> * Assertion: returns <code>CRL</code> type */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getType", - args = {} - ) public final void testGetType01() { CRL crl = new MyCRL("TEST_TYPE"); assertEquals("TEST_TYPE", crl.getType()); @@ -96,12 +78,6 @@ public class CRLTest extends TestCase { * Test #2 for <code>getType()</code> method<br> * Assertion: returns <code>CRL</code> type */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as a parameter.", - method = "getType", - args = {} - ) public final void testGetType02() { CRL crl = new MyCRL(null); assertNull(crl.getType()); @@ -116,12 +92,6 @@ public class CRLTest extends TestCase { /** * Test for <code>toString()</code> method */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {} - ) public final void testToString() { CRL crl = new MyCRL("TEST_TYPE"); crl.toString(); @@ -130,12 +100,6 @@ public class CRLTest extends TestCase { /** * Test for <code>isRevoked()</code> method */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isRevoked", - args = {java.security.cert.Certificate.class} - ) public final void testIsRevoked() { CRL crl = new MyCRL("TEST_TYPE"); crl.isRevoked(null); diff --git a/luni/src/test/java/tests/security/cert/CertPathBuilder1Test.java b/luni/src/test/java/tests/security/cert/CertPathBuilder1Test.java index 6d6d527..aae021b 100644 --- a/luni/src/test/java/tests/security/cert/CertPathBuilder1Test.java +++ b/luni/src/test/java/tests/security/cert/CertPathBuilder1Test.java @@ -23,9 +23,6 @@ package tests.security.cert; import dalvik.annotation.KnownFailure; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; import org.apache.harmony.security.tests.support.SpiEngUtils; import org.apache.harmony.security.tests.support.cert.MyCertPathBuilderSpi; @@ -51,7 +48,6 @@ import junit.framework.TestCase; * methods. * */ -@TestTargetClass(CertPathBuilder.class) public class CertPathBuilder1Test extends TestCase { public static final String srvCertPathBuilder = "CertPathBuilder"; @@ -97,14 +93,8 @@ public class CertPathBuilder1Test extends TestCase { } /** - * @tests java.security.cert.CertPathBuilder#getDefaultType() + * java.security.cert.CertPathBuilder#getDefaultType() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getDefaultType", - args = {} - ) public void test_getDefaultType() throws Exception { // Regression for HARMONY-2785 @@ -121,12 +111,6 @@ public class CertPathBuilder1Test extends TestCase { * throws NoSuchAlgorithmException when algorithm is not correct * or it is not available */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies NoSuchAlgorithmException.", - method = "getInstance", - args = {java.lang.String.class} - ) public void testCertPathBuilder02() throws NoSuchAlgorithmException { try { CertPathBuilder.getInstance(null); @@ -146,12 +130,6 @@ public class CertPathBuilder1Test extends TestCase { * Test for <code>getInstance(String algorithm)</code> method * Assertion: returns CertPathBuilder object */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies positive functionality.", - method = "getInstance", - args = {java.lang.String.class} - ) public void testCertPathBuilder03() throws NoSuchAlgorithmException { if (!PKIXSupport) { fail(NotSupportMsg); @@ -168,12 +146,6 @@ public class CertPathBuilder1Test extends TestCase { * * FIXME: verify what exception will be thrown if provider is empty */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies IllegalArgumentException.", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void testCertPathBuilder04() throws NoSuchAlgorithmException, NoSuchProviderException { if (!PKIXSupport) { @@ -200,12 +172,6 @@ public class CertPathBuilder1Test extends TestCase { * Assertion: * throws NoSuchProviderException when provider has invalid value */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that getInstance throws NoSuchProviderException when provider has invalid value.", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void testCertPathBuilder05() throws NoSuchAlgorithmException { if (!PKIXSupport) { @@ -228,12 +194,6 @@ public class CertPathBuilder1Test extends TestCase { * throws NullPointerException when algorithm is null * throws NoSuchAlgorithmException when algorithm is not correct */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException when algorithm is null; verifies NoSuchAlgorithmException when algorithm is not correct.", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void testCertPathBuilder06() throws NoSuchAlgorithmException, NoSuchProviderException { if (!PKIXSupport) { @@ -258,12 +218,6 @@ public class CertPathBuilder1Test extends TestCase { * Test for <code>getInstance(String algorithm, String provider)</code> method * Assertion: returns CertPathBuilder object */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies positive case.", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void testCertPathBuilder07() throws NoSuchAlgorithmException, NoSuchProviderException { if (!PKIXSupport) { @@ -282,12 +236,6 @@ public class CertPathBuilder1Test extends TestCase { * Test for <code>getInstance(String algorithm, Provider provider)</code> method * Assertion: throws IllegalArgumentException when provider is null */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies that getInstance method throws IllegalArgumentException when provider is null method.", - method = "getInstance", - args = {java.lang.String.class, java.security.Provider.class} - ) public void testCertPathBuilder08() throws NoSuchAlgorithmException { if (!PKIXSupport) { @@ -310,12 +258,6 @@ public class CertPathBuilder1Test extends TestCase { * throws NullPointerException when algorithm is null * throws NoSuchAlgorithmException when algorithm is not correct */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies that getInstance method throws NullPointerException when algorithm is null, throws NoSuchAlgorithmException when algorithm is not correct.", - method = "getInstance", - args = {java.lang.String.class, java.security.Provider.class} - ) public void testCertPathBuilder09() throws NoSuchAlgorithmException, NoSuchProviderException { if (!PKIXSupport) { @@ -339,12 +281,6 @@ public class CertPathBuilder1Test extends TestCase { * Test for <code>getInstance(String algorithm, String provider)</code> method * Assertion: returns CertPathBuilder object */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that getInstance returns CertPathBuilder object.", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void testCertPathBuilder10() throws NoSuchAlgorithmException, NoSuchProviderException { if (!PKIXSupport) { @@ -362,12 +298,6 @@ public class CertPathBuilder1Test extends TestCase { * Test for <code>build(CertPathParameters params)</code> method * Assertion: throws InvalidAlgorithmParameterException params is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that build method throws InvalidAlgorithmParameterException if a parameter is null.", - method = "build", - args = {java.security.cert.CertPathParameters.class} - ) public void testCertPathBuilder11() throws NoSuchAlgorithmException, NoSuchProviderException, CertPathBuilderException { @@ -386,12 +316,6 @@ public class CertPathBuilder1Test extends TestCase { } } - @TestTargetNew( - level=TestLevel.PARTIAL_COMPLETE, - notes = "Verifies normal case", - method="build", - args={CertPathParameters.class} - ) // Test passed on RI @KnownFailure(value="expired certificate bug 2322662") public void testBuild() throws Exception { @@ -414,12 +338,6 @@ public class CertPathBuilder1Test extends TestCase { * <code>CertPathBuilder</code> constructor * Assertion: returns CertPathBuilder object */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "CertPathBuilder", - args = {java.security.cert.CertPathBuilderSpi.class, java.security.Provider.class, java.lang.String.class} - ) public void testCertPathBuilder12() throws CertificateException, NoSuchProviderException, NoSuchAlgorithmException, InvalidAlgorithmParameterException, @@ -452,12 +370,6 @@ public class CertPathBuilder1Test extends TestCase { * Test for <code>getAlgorithm()</code> method Assertion: returns * CertPathBuilder object */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getAlgorithm", - args = {} - ) public void testCertPathBuilder13() throws NoSuchAlgorithmException { if (!PKIXSupport) { fail(NotSupportMsg); @@ -493,12 +405,6 @@ public class CertPathBuilder1Test extends TestCase { * Test for <code>getProvider()</code> method Assertion: returns * CertPathBuilder object */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getProvider", - args = {} - ) public void testCertPathBuilder14() throws NoSuchAlgorithmException { if (!PKIXSupport) { fail(NotSupportMsg); diff --git a/luni/src/test/java/tests/security/cert/CertPathBuilder2Test.java b/luni/src/test/java/tests/security/cert/CertPathBuilder2Test.java index ed1dcbb..ffc5d08 100644 --- a/luni/src/test/java/tests/security/cert/CertPathBuilder2Test.java +++ b/luni/src/test/java/tests/security/cert/CertPathBuilder2Test.java @@ -22,11 +22,6 @@ package tests.security.cert; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import tests.security.cert.myCertPathBuilder.MyProvider; @@ -45,7 +40,6 @@ import org.apache.harmony.security.tests.support.SpiEngUtils; * Tests for CertPathBuilder class constructors and methods * */ -@TestTargetClass(CertPathBuilder.class) public class CertPathBuilder2Test extends TestCase { private static final String defaultAlg = "CertPB"; private static final String CertPathBuilderProviderClass = "org.apache.harmony.security.tests.support.cert.MyCertPathBuilderSpi"; @@ -115,12 +109,6 @@ public class CertPathBuilder2Test extends TestCase { * throws NoSuchAlgorithmException when algorithm is not correct * returns CertPathBuilder object */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class} - ) public void testGetInstance01() throws NoSuchAlgorithmException, InvalidAlgorithmParameterException, CertPathBuilderException { try { @@ -155,12 +143,6 @@ public class CertPathBuilder2Test extends TestCase { * throws NoSuchProviderException when provider is available; * returns CertPathBuilder object */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void testGetInstance02() throws NoSuchAlgorithmException, NoSuchProviderException, IllegalArgumentException, InvalidAlgorithmParameterException, CertPathBuilderException { @@ -225,12 +207,6 @@ public class CertPathBuilder2Test extends TestCase { * throws NoSuchAlgorithmException when algorithm is not correct * returns CertPathBuilder object */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.security.Provider.class} - ) public void testGetInstance03() throws NoSuchAlgorithmException, IllegalArgumentException, InvalidAlgorithmParameterException, CertPathBuilderException { diff --git a/luni/src/test/java/tests/security/cert/CertPathBuilderExceptionTest.java b/luni/src/test/java/tests/security/cert/CertPathBuilderExceptionTest.java index 00b0362..f1694de 100644 --- a/luni/src/test/java/tests/security/cert/CertPathBuilderExceptionTest.java +++ b/luni/src/test/java/tests/security/cert/CertPathBuilderExceptionTest.java @@ -22,11 +22,6 @@ package tests.security.cert; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.security.cert.CertPathBuilderException; @@ -37,7 +32,6 @@ import java.security.cert.CertPathBuilderException; * methods. * */ -@TestTargetClass(CertPathBuilderException.class) public class CertPathBuilderExceptionTest extends TestCase { private static String[] msgs = { @@ -51,12 +45,6 @@ public class CertPathBuilderExceptionTest extends TestCase { * Test for <code>CertPathBuilderException()</code> constructor Assertion: * constructs CertPathBuilderException with no detail message */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "CertPathBuilderException", - args = {} - ) public void testCertPathBuilderException01() { CertPathBuilderException tE = new CertPathBuilderException(); assertNull("getMessage() must return null.", tE.getMessage()); @@ -68,12 +56,6 @@ public class CertPathBuilderExceptionTest extends TestCase { * Assertion: constructs CertPathBuilderException with detail message msg. * Parameter <code>msg</code> is not null. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "CertPathBuilderException", - args = {java.lang.String.class} - ) public void testCertPathBuilderException02() { CertPathBuilderException tE; for (int i = 0; i < msgs.length; i++) { @@ -89,12 +71,6 @@ public class CertPathBuilderExceptionTest extends TestCase { * Assertion: constructs CertPathBuilderException when <code>msg</code> is * null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as a parameter.", - method = "CertPathBuilderException", - args = {java.lang.String.class} - ) public void testCertPathBuilderException03() { String msg = null; CertPathBuilderException tE = new CertPathBuilderException(msg); @@ -107,12 +83,6 @@ public class CertPathBuilderExceptionTest extends TestCase { * Assertion: constructs CertPathBuilderException when <code>cause</code> * is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as a parameter.", - method = "CertPathBuilderException", - args = {java.lang.Throwable.class} - ) public void testCertPathBuilderException04() { Throwable cause = null; CertPathBuilderException tE = new CertPathBuilderException(cause); @@ -125,12 +95,6 @@ public class CertPathBuilderExceptionTest extends TestCase { * Assertion: constructs CertPathBuilderException when <code>cause</code> * is not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "CertPathBuilderException", - args = {java.lang.Throwable.class} - ) public void testCertPathBuilderException05() { CertPathBuilderException tE = new CertPathBuilderException(tCause); if (tE.getMessage() != null) { @@ -149,12 +113,6 @@ public class CertPathBuilderExceptionTest extends TestCase { * constructor Assertion: constructs CertPathBuilderException when * <code>cause</code> is null <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as parameters.", - method = "CertPathBuilderException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testCertPathBuilderException06() { CertPathBuilderException tE = new CertPathBuilderException(null, null); assertNull("getMessage() must return null", tE.getMessage()); @@ -166,12 +124,6 @@ public class CertPathBuilderExceptionTest extends TestCase { * constructor Assertion: constructs CertPathBuilderException when * <code>cause</code> is null <code>msg</code> is not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as the second parameter.", - method = "CertPathBuilderException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testCertPathBuilderException07() { CertPathBuilderException tE; for (int i = 0; i < msgs.length; i++) { @@ -187,12 +139,6 @@ public class CertPathBuilderExceptionTest extends TestCase { * constructor Assertion: constructs CertPathBuilderException when * <code>cause</code> is not null <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as the first parameter.", - method = "CertPathBuilderException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testCertPathBuilderException08() { CertPathBuilderException tE = new CertPathBuilderException(null, tCause); if (tE.getMessage() != null) { @@ -211,12 +157,6 @@ public class CertPathBuilderExceptionTest extends TestCase { * constructor Assertion: constructs CertPathBuilderException when * <code>cause</code> is not null <code>msg</code> is not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies positive case.", - method = "CertPathBuilderException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testCertPathBuilderException09() { CertPathBuilderException tE; for (int i = 0; i < msgs.length; i++) { diff --git a/luni/src/test/java/tests/security/cert/CertPathBuilderSpiTest.java b/luni/src/test/java/tests/security/cert/CertPathBuilderSpiTest.java index dc173dc..b5615cc 100644 --- a/luni/src/test/java/tests/security/cert/CertPathBuilderSpiTest.java +++ b/luni/src/test/java/tests/security/cert/CertPathBuilderSpiTest.java @@ -22,11 +22,6 @@ package tests.security.cert; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.security.InvalidAlgorithmParameterException; @@ -41,27 +36,12 @@ import org.apache.harmony.security.tests.support.cert.MyCertPathBuilderSpi; * Tests for <code>CertPathBuilderSpi</code> class constructors and methods. * */ -@TestTargetClass(CertPathBuilderSpi.class) public class CertPathBuilderSpiTest extends TestCase { /** * Test for <code>CertPathBuilderSpi</code> constructor Assertion: * constructs CertPathBuilderSpi */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "CertPathBuilderSpi", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineBuild", - args = {java.security.cert.CertPathParameters.class} - ) - }) public void testCertPathBuilderSpi01() throws CertPathBuilderException, InvalidAlgorithmParameterException { CertPathBuilderSpi certPathBuilder = new MyCertPathBuilderSpi(); diff --git a/luni/src/test/java/tests/security/cert/CertPathCertPathRepTest.java b/luni/src/test/java/tests/security/cert/CertPathCertPathRepTest.java index 6f3f2bd..4dac8c3 100644 --- a/luni/src/test/java/tests/security/cert/CertPathCertPathRepTest.java +++ b/luni/src/test/java/tests/security/cert/CertPathCertPathRepTest.java @@ -1,9 +1,5 @@ package tests.security.cert; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; - import junit.framework.TestCase; import org.apache.harmony.security.tests.support.cert.MyCertPath; @@ -12,7 +8,6 @@ import org.apache.harmony.security.tests.support.cert.MyCertPath.MyCertPathRep; import java.io.ObjectStreamException; import java.security.cert.CertPath; -@TestTargetClass(CertPath.class) public class CertPathCertPathRepTest extends TestCase { private static final byte[] testEncoding = new byte[] { (byte) 1, (byte) 2, @@ -30,12 +25,6 @@ public class CertPathCertPathRepTest extends TestCase { * Test for <code>CertPath.CertPathRep(String type, byte[] data)</code> * method<br> */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "CertPath.CertPathRep.CertPathRep", - args = { String.class, byte[].class} - ) public final void testCertPathCertPathRep() { MyCertPath cp = new MyCertPath(testEncoding); MyCertPathRep rep = cp.new MyCertPathRep("MyEncoding", testEncoding); @@ -50,12 +39,6 @@ public class CertPathCertPathRepTest extends TestCase { } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Checks ObjectStreamException", - method = "CertPath.CertPathRep.readResolve", - args = {} - ) public final void testReadResolve() { MyCertPath cp = new MyCertPath(testEncoding); MyCertPathRep rep = cp.new MyCertPathRep("MyEncoding", testEncoding); diff --git a/luni/src/test/java/tests/security/cert/CertPathValidator1Test.java b/luni/src/test/java/tests/security/cert/CertPathValidator1Test.java index f4bbea8..f3554d6 100644 --- a/luni/src/test/java/tests/security/cert/CertPathValidator1Test.java +++ b/luni/src/test/java/tests/security/cert/CertPathValidator1Test.java @@ -22,11 +22,6 @@ package tests.security.cert; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.security.InvalidAlgorithmParameterException; @@ -49,7 +44,6 @@ import org.apache.harmony.security.tests.support.SpiEngUtils; * methods. * */ -@TestTargetClass(CertPathValidator.class) public class CertPathValidator1Test extends TestCase { public static final String srvCertPathValidator = "CertPathValidator"; @@ -100,12 +94,6 @@ public class CertPathValidator1Test extends TestCase { * Test for <code>getDefaultType()</code> method * Assertion: returns security property "certpathvalidator.type" or "PKIX" */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getDefaultType", - args = {} - ) public void testCertPathValidator01() { if (!PKIXSupport) { fail(NotSupportMsg); @@ -138,12 +126,6 @@ public class CertPathValidator1Test extends TestCase { * throws NullPointerException when algorithm is null * throws NoSuchAlgorithmException when algorithm is not available */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NoSuchAlgorithmException.", - method = "getInstance", - args = {java.lang.String.class} - ) public void testCertPathValidator02() { try { CertPathValidator.getInstance(null); @@ -163,12 +145,6 @@ public class CertPathValidator1Test extends TestCase { * Test for <code>getInstance(String algorithm)</code> method * Assertion: returns CertPathValidator object */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies positive case.", - method = "getInstance", - args = {java.lang.String.class} - ) public void testCertPathValidator03() throws NoSuchAlgorithmException { if (!PKIXSupport) { fail(NotSupportMsg); @@ -186,12 +162,6 @@ public class CertPathValidator1Test extends TestCase { * * FIXME: verify what exception will be thrown if provider is empty */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that getInstance method throws IllegalArgumentException when provider parameter is null or empty.", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void testCertPathValidator04() throws NoSuchAlgorithmException, NoSuchProviderException { if (!PKIXSupport) { @@ -217,12 +187,6 @@ public class CertPathValidator1Test extends TestCase { * Assertion: * throws NoSuchProviderException when provider has invalid value */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that getInstance method throws NoSuchProviderException when provider parameter has invalid value.", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void testCertPathValidator05() throws NoSuchAlgorithmException { if (!PKIXSupport) { fail(NotSupportMsg); @@ -246,12 +210,6 @@ public class CertPathValidator1Test extends TestCase { * throws NullPointerException when algorithm is null * throws NoSuchAlgorithmException when algorithm is not available */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that getInstance method throws NullPointerException when algorithm is null, and NoSuchAlgorithmException when algorithm is not available", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void testCertPathValidator06() throws NoSuchAlgorithmException, NoSuchProviderException { if (!PKIXSupport) { @@ -276,12 +234,6 @@ public class CertPathValidator1Test extends TestCase { * Test for <code>getInstance(String algorithm, String provider)</code> method * Assertion: returns CertPathValidator object */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that getInstance mwthod returns CertPathValidator object.", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void testCertPathValidator07() throws NoSuchAlgorithmException, NoSuchProviderException { if (!PKIXSupport) { @@ -303,12 +255,6 @@ public class CertPathValidator1Test extends TestCase { * Test for <code>getInstance(String algorithm, Provider provider)</code> method * Assertion: throws IllegalArgumentException when provider is null */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies that getInstance method throws IllegalArgumentException when provider parameter is null.", - method = "getInstance", - args = {java.lang.String.class, java.security.Provider.class} - ) public void testCertPathValidator08() throws NoSuchAlgorithmException { if (!PKIXSupport) { @@ -331,12 +277,6 @@ public class CertPathValidator1Test extends TestCase { * throws NullPointerException when algorithm is null * throws NoSuchAlgorithmException when algorithm is not available */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that getInstance method throws NullPointerException when algorithm is null, and NoSuchAlgorithmException when algorithm is not available.", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void testCertPathValidator09() throws NoSuchAlgorithmException, NoSuchProviderException { if (!PKIXSupport) { @@ -361,12 +301,6 @@ public class CertPathValidator1Test extends TestCase { * Test for <code>getInstance(String algorithm, String provider)</code> method * Assertion: returns CertPathValidator object */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that getInstance method returns CertPathValidator object.", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void testCertPathValidator10() throws NoSuchAlgorithmException, NoSuchProviderException { if (!PKIXSupport) { @@ -389,12 +323,6 @@ public class CertPathValidator1Test extends TestCase { * Assertion: throws InvalidAlgorithmParameterException params is not * instance of PKIXParameters or null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that validate method throws InvalidAlgorithmParameterException if param is not instance of PKIXParameters or null.", - method = "validate", - args = {java.security.cert.CertPath.class, java.security.cert.CertPathParameters.class} - ) public void testCertPathValidator11() throws NoSuchAlgorithmException, NoSuchProviderException, CertPathValidatorException { if (!PKIXSupport) { @@ -424,12 +352,6 @@ public class CertPathValidator1Test extends TestCase { * <code>CertPathValidator</code> constructor * Assertion: returns CertPathValidator object */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "CertPathValidator", - args = {java.security.cert.CertPathValidatorSpi.class, java.security.Provider.class, java.lang.String.class} - ) public void testCertPathValidator12() throws CertificateException, NoSuchProviderException, NoSuchAlgorithmException, CertPathValidatorException, InvalidAlgorithmParameterException { @@ -461,12 +383,6 @@ public class CertPathValidator1Test extends TestCase { /** * Test for <code>getAlgorithm()</code> method */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getAlgorithm", - args = {} - ) public void testCertPathValidator13() throws NoSuchAlgorithmException { if (!PKIXSupport) { fail(NotSupportMsg); @@ -496,12 +412,6 @@ public class CertPathValidator1Test extends TestCase { /** * Test for <code>getProvider()</code> method */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getProvider", - args = {} - ) public void testCertPathValidator14() throws NoSuchAlgorithmException { if (!PKIXSupport) { fail(NotSupportMsg); diff --git a/luni/src/test/java/tests/security/cert/CertPathValidator2Test.java b/luni/src/test/java/tests/security/cert/CertPathValidator2Test.java index 3f513cc..8f5b6d5 100644 --- a/luni/src/test/java/tests/security/cert/CertPathValidator2Test.java +++ b/luni/src/test/java/tests/security/cert/CertPathValidator2Test.java @@ -22,10 +22,6 @@ package tests.security.cert; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; - import junit.framework.TestCase; import org.apache.harmony.security.tests.support.SpiEngUtils; @@ -46,7 +42,6 @@ import java.security.cert.PKIXParameters; /** * Tests for CertPathValidator class constructors and methods */ -@TestTargetClass(CertPathValidator.class) public class CertPathValidator2Test extends TestCase { private static final String defaultAlg = "CertPB"; @@ -110,9 +105,6 @@ public class CertPathValidator2Test extends TestCase { * NoSuchAlgorithmException when algorithm is not available returns * CertPathValidator object */ - @TestTargetNew(level = TestLevel.COMPLETE, notes = "", method = "getInstance", args = { - java.lang.String.class - }) public void testGetInstance01() throws NoSuchAlgorithmException, InvalidAlgorithmParameterException, CertPathValidatorException { try { @@ -146,9 +138,6 @@ public class CertPathValidator2Test extends TestCase { * NoSuchProviderException when provider is available; returns * CertPathValidator object */ - @TestTargetNew(level = TestLevel.COMPLETE, notes = "", method = "getInstance", args = { - java.lang.String.class, java.lang.String.class - }) public void testGetInstance02() throws NoSuchAlgorithmException, NoSuchProviderException, IllegalArgumentException, InvalidAlgorithmParameterException, CertPathValidatorException { @@ -207,9 +196,6 @@ public class CertPathValidator2Test extends TestCase { * IllegalArgumentException when provider is null; returns CertPathValidator * object */ - @TestTargetNew(level = TestLevel.COMPLETE, notes = "", method = "getInstance", args = { - java.lang.String.class, java.security.Provider.class - }) public void testGetInstance03() throws NoSuchAlgorithmException, IllegalArgumentException, InvalidAlgorithmParameterException, CertPathValidatorException { try { @@ -244,9 +230,6 @@ public class CertPathValidator2Test extends TestCase { } } - @TestTargetNew(level = TestLevel.PARTIAL_COMPLETE, method = "validate", args = { - CertPath.class, CertPathParameters.class - }) public void testValidate() throws InvalidAlgorithmParameterException, NoSuchAlgorithmException { MyCertPath mCP = new MyCertPath(new byte[0]); CertPathParameters params = new PKIXParameters(TestUtils.getTrustAnchorSet()); diff --git a/luni/src/test/java/tests/security/cert/CertPathValidator3Test.java b/luni/src/test/java/tests/security/cert/CertPathValidator3Test.java index a4986a5..78410cc 100644 --- a/luni/src/test/java/tests/security/cert/CertPathValidator3Test.java +++ b/luni/src/test/java/tests/security/cert/CertPathValidator3Test.java @@ -23,10 +23,6 @@ package tests.security.cert; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; - import junit.framework.TestCase; import org.apache.harmony.security.tests.support.SpiEngUtils; @@ -47,7 +43,6 @@ import java.security.cert.PKIXParameters; * Tests for <code>CertPathValidator</code> class methods. * */ -@TestTargetClass(CertPathValidator.class) public class CertPathValidator3Test extends TestCase { private static final String defaultType = CertPathBuilder1Test.defaultType; @@ -91,12 +86,6 @@ public class CertPathValidator3Test extends TestCase { * certpath is not X.509 type * */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies exceptions.", - method = "validate", - args = {java.security.cert.CertPath.class, java.security.cert.CertPathParameters.class} - ) public void testValidate01() throws InvalidAlgorithmParameterException, CertPathValidatorException { if (!PKIXSupport) { fail(NotSupportMsg); diff --git a/luni/src/test/java/tests/security/cert/CertPathValidatorExceptionTest.java b/luni/src/test/java/tests/security/cert/CertPathValidatorExceptionTest.java index 62e486e..1eac1f7 100644 --- a/luni/src/test/java/tests/security/cert/CertPathValidatorExceptionTest.java +++ b/luni/src/test/java/tests/security/cert/CertPathValidatorExceptionTest.java @@ -22,11 +22,6 @@ package tests.security.cert; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.security.cert.CertPath; @@ -43,7 +38,6 @@ import java.util.Vector; * methods. * */ -@TestTargetClass(CertPathValidatorException.class) public class CertPathValidatorExceptionTest extends TestCase { private static String[] msgs = { @@ -57,12 +51,6 @@ public class CertPathValidatorExceptionTest extends TestCase { * Test for <code>CertPathValidatorException()</code> constructor * Assertion: constructs CertPathValidatorException with no detail message */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "CertPathValidatorException", - args = {} - ) public void testCertPathValidatorException01() { CertPathValidatorException tE = new CertPathValidatorException(); assertNull("getMessage() must return null.", tE.getMessage()); @@ -74,12 +62,6 @@ public class CertPathValidatorExceptionTest extends TestCase { * Assertion: constructs CertPathValidatorException with detail message msg. * Parameter <code>msg</code> is not null. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "CertPathValidatorException", - args = {java.lang.String.class} - ) public void testCertPathValidatorException02() { CertPathValidatorException tE; for (int i = 0; i < msgs.length; i++) { @@ -95,12 +77,6 @@ public class CertPathValidatorExceptionTest extends TestCase { * Assertion: constructs CertPathValidatorException when <code>msg</code> * is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as a parameter.", - method = "CertPathValidatorException", - args = {java.lang.String.class} - ) public void testCertPathValidatorException03() { String msg = null; CertPathValidatorException tE = new CertPathValidatorException(msg); @@ -113,12 +89,6 @@ public class CertPathValidatorExceptionTest extends TestCase { * Assertion: constructs CertPathValidatorException when <code>cause</code> * is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as a parameter.", - method = "CertPathValidatorException", - args = {java.lang.Throwable.class} - ) public void testCertPathValidatorException04() { Throwable cause = null; CertPathValidatorException tE = new CertPathValidatorException(cause); @@ -131,12 +101,6 @@ public class CertPathValidatorExceptionTest extends TestCase { * Assertion: constructs CertPathValidatorException when <code>cause</code> * is not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "CertPathValidatorException", - args = {java.lang.Throwable.class} - ) public void testCertPathValidatorException05() { CertPathValidatorException tE = new CertPathValidatorException(tCause); if (tE.getMessage() != null) { @@ -155,12 +119,6 @@ public class CertPathValidatorExceptionTest extends TestCase { * constructor Assertion: constructs CertPathValidatorException when * <code>cause</code> is null <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as parameters.", - method = "CertPathValidatorException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testCertPathValidatorException06() { CertPathValidatorException tE = new CertPathValidatorException(null, null); @@ -173,12 +131,6 @@ public class CertPathValidatorExceptionTest extends TestCase { * constructor Assertion: constructs CertPathValidatorException when * <code>cause</code> is null <code>msg</code> is not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as the second parameter.", - method = "CertPathValidatorException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testCertPathValidatorException07() { CertPathValidatorException tE; for (int i = 0; i < msgs.length; i++) { @@ -194,12 +146,6 @@ public class CertPathValidatorExceptionTest extends TestCase { * constructor Assertion: constructs CertPathValidatorException when * <code>cause</code> is not null <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as the first parameter.", - method = "CertPathValidatorException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testCertPathValidatorException08() { CertPathValidatorException tE = new CertPathValidatorException(null, tCause); @@ -219,12 +165,6 @@ public class CertPathValidatorExceptionTest extends TestCase { * constructor Assertion: constructs CertPathValidatorException when * <code>cause</code> is not null <code>msg</code> is not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "CertPathValidatorException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testCertPathValidatorException09() { CertPathValidatorException tE; for (int i = 0; i < msgs.length; i++) { @@ -252,12 +192,6 @@ public class CertPathValidatorExceptionTest extends TestCase { * <code>cause</code> is null <code>msg</code> is null * <code>certPath</code> is null <code>index</code> is -1 */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as parameters.", - method = "CertPathValidatorException", - args = {java.lang.String.class, java.lang.Throwable.class, java.security.cert.CertPath.class, int.class} - ) public void testCertPathValidatorException10() { CertPathValidatorException tE = new CertPathValidatorException(null, null, null, -1); @@ -275,12 +209,6 @@ public class CertPathValidatorExceptionTest extends TestCase { * <code>certPath</code> is null <code>index</code> not -1 throws: * IllegalArgumentException */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that IllegalArgumentException is thrown.", - method = "CertPathValidatorException", - args = {java.lang.String.class, java.lang.Throwable.class, java.security.cert.CertPath.class, int.class} - ) public void testCertPathValidatorException11() { int[] indx = { 0, 1, 100, Integer.MAX_VALUE, Integer.MIN_VALUE }; for (int j = 0; j < indx.length; j++) { @@ -304,12 +232,6 @@ public class CertPathValidatorExceptionTest extends TestCase { * <code>cause</code> not null <code>msg</code> not null * <code>certPath</code> is null <code>index</code> is -1 */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies IndexOutOfBoundsException.", - method = "CertPathValidatorException", - args = {java.lang.String.class, java.lang.Throwable.class, java.security.cert.CertPath.class, int.class} - ) public void testCertPathValidatorException12() { CertPathValidatorException tE; @@ -347,12 +269,6 @@ public class CertPathValidatorExceptionTest extends TestCase { * <code>certPath</code> not null <code>index</code>< -1 || >= * certPath.getCertificates().size() throws: IndexOutOfBoundsException */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies IndexOutOfBoundsException.", - method = "CertPathValidatorException", - args = {java.lang.String.class, java.lang.Throwable.class, java.security.cert.CertPath.class, int.class} - ) public void testCertPathValidatorException13() { myCertPath mcp = new myCertPath("X.509", ""); CertPath cp = mcp.get("X.509"); @@ -380,12 +296,6 @@ public class CertPathValidatorExceptionTest extends TestCase { * <code>certPath</code> not null <code>index</code>< * certPath.getCertificates().size() */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies IndexOutOfBoundsException.", - method = "CertPathValidatorException", - args = {java.lang.String.class, java.lang.Throwable.class, java.security.cert.CertPath.class, int.class} - ) public void testCertPathValidatorException14() { CertPathValidatorException tE; myCertPath mcp = new myCertPath("X.509", ""); @@ -424,12 +334,6 @@ public class CertPathValidatorExceptionTest extends TestCase { * Test for <code>getCertPath()</code>. Returns the certification path * that was being validated when the exception was thrown. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Verifies that getCertPath method returns the certification paththat was being validated when the exception was thrown.", - method = "getCertPath", - args = {} - ) public void testCertPathValidatorException15() { CertPathValidatorException tE = new CertPathValidatorException(); assertNull("getCertPath() must return null.", tE.getCertPath()); @@ -486,12 +390,6 @@ public class CertPathValidatorExceptionTest extends TestCase { * that the list of certificates in a CertPath is zero based. If no index * has been set, -1 is returned. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getIndex", - args = {} - ) public void testCertPathValidatorException16() { CertPathValidatorException tE = new CertPathValidatorException(); assertEquals("getIndex() must be equals -1", -1, tE.getIndex()); diff --git a/luni/src/test/java/tests/security/cert/CertPathValidatorSpiTest.java b/luni/src/test/java/tests/security/cert/CertPathValidatorSpiTest.java index 8db597b..f69a3e5 100644 --- a/luni/src/test/java/tests/security/cert/CertPathValidatorSpiTest.java +++ b/luni/src/test/java/tests/security/cert/CertPathValidatorSpiTest.java @@ -22,11 +22,6 @@ package tests.security.cert; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.security.InvalidAlgorithmParameterException; @@ -41,27 +36,12 @@ import org.apache.harmony.security.tests.support.cert.MyCertPathValidatorSpi; * Tests for <code>CertPathValidatorSpi</code> class constructors and methods. * */ -@TestTargetClass(CertPathValidatorSpi.class) public class CertPathValidatorSpiTest extends TestCase { /** * Test for <code>CertPathValidatorSpi</code> constructor Assertion: * constructs CertPathValidatorSpi */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "CertPathValidatorSpi", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineValidate", - args = {java.security.cert.CertPath.class, java.security.cert.CertPathParameters.class} - ) - }) public void testCertPathValidatorSpi01() throws CertPathValidatorException, InvalidAlgorithmParameterException { CertPathValidatorSpi certPathValid = new MyCertPathValidatorSpi(); diff --git a/luni/src/test/java/tests/security/cert/CertStore1Test.java b/luni/src/test/java/tests/security/cert/CertStore1Test.java index 6da8175..1c290e4 100644 --- a/luni/src/test/java/tests/security/cert/CertStore1Test.java +++ b/luni/src/test/java/tests/security/cert/CertStore1Test.java @@ -22,11 +22,6 @@ package tests.security.cert; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; - import junit.framework.TestCase; import org.apache.harmony.security.tests.support.SpiEngUtils; @@ -51,7 +46,6 @@ import java.util.Collection; * methods. * */ -@TestTargetClass(CertStore.class) public class CertStore1Test extends TestCase { public static final String srvCertStore = "CertStore"; @@ -133,12 +127,6 @@ public class CertStore1Test extends TestCase { * Test for <code>getDefaultType()</code> method * Assertion: returns security property "certstore.type" or "LDAP" */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getDefaultType", - args = {} - ) public void testCertStore01() { if (!LDAPSupport) { return; @@ -163,12 +151,6 @@ public class CertStore1Test extends TestCase { * <code>CertStore</code> constructor * Assertion: returns CertStore object */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "CertStore", - args = {java.security.cert.CertStoreSpi.class, java.security.Provider.class, java.lang.String.class, java.security.cert.CertStoreParameters.class} - ) public void testCertStore02() throws InvalidAlgorithmParameterException, CertStoreException { if (!initParams()) { return; @@ -202,12 +184,6 @@ public class CertStore1Test extends TestCase { * throws NullPointerException when type is null * throws NoSuchAlgorithmException when type is incorrect; */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies NoSuchAlgorithmException and NullPointerException. InvalidAlgorithmParameterException checking missed", - method = "getInstance", - args = {java.lang.String.class, java.security.cert.CertStoreParameters.class} - ) public void testCertStore03() throws InvalidAlgorithmParameterException { if (!initParams()) { return; @@ -231,12 +207,6 @@ public class CertStore1Test extends TestCase { * Test for <code>getInstance(String type, CertStoreParameters params)</code> method * Assertion: return CertStore object */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "InvalidAlgorithmParameterException checking missed", - method = "getInstance", - args = {java.lang.String.class, java.security.cert.CertStoreParameters.class} - ) public void testCertStore05() throws InvalidAlgorithmParameterException, NoSuchAlgorithmException { if (!initParams()) { @@ -255,12 +225,6 @@ public class CertStore1Test extends TestCase { * Assertion: throws IllegalArgumentException when provider is null or empty * */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies IllegalArgumentException. InvalidAlgorithmParameterException checking missed.", - method = "getInstance", - args = {java.lang.String.class, java.security.cert.CertStoreParameters.class, java.lang.String.class} - ) public void testCertStore06() throws InvalidAlgorithmParameterException, NoSuchAlgorithmException, NoSuchProviderException { @@ -286,12 +250,6 @@ public class CertStore1Test extends TestCase { * <code>getInstance(String type, CertStoreParameters params, String provider)</code> * Assertion: throws NoSuchProviderException when provider has invalid value */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies NoSuchProviderException. InvalidAlgorithmParameterException checking missed.", - method = "getInstance", - args = {java.lang.String.class, java.security.cert.CertStoreParameters.class, java.lang.String.class} - ) public void testCertStore07() throws InvalidAlgorithmParameterException, NoSuchAlgorithmException { if (!initParams()) { @@ -314,12 +272,6 @@ public class CertStore1Test extends TestCase { * throws NullPointerException when type is null * throws NoSuchAlgorithmException when type is incorrect; */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies NoSuchAlgorithmException and NullPointerException. InvalidAlgorithmParameterException checking missed.", - method = "getInstance", - args = {java.lang.String.class, java.security.cert.CertStoreParameters.class, java.lang.String.class} - ) public void testCertStore08() throws InvalidAlgorithmParameterException, NoSuchProviderException { if (!initParams()) { @@ -345,12 +297,6 @@ public class CertStore1Test extends TestCase { * <code>getInstance(String type, CertStoreParameters params, String provider)</code> * Assertion: return CertStore object */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies positive case. InvalidAlgorithmParameterException checking missed.", - method = "getInstance", - args = {java.lang.String.class, java.security.cert.CertStoreParameters.class, java.lang.String.class} - ) public void testCertStore10() throws InvalidAlgorithmParameterException, NoSuchAlgorithmException, NoSuchProviderException { if (!initParams()) { @@ -369,12 +315,6 @@ public class CertStore1Test extends TestCase { * <code>getInstance(String type, CertStoreParameters params, Provider provider)</code> * Assertion: throws IllegalArgumentException when provider is null */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies that getInstance throws IllegalArgumentException when provider is null. InvalidAlgorithmParameterException checking missed.", - method = "getInstance", - args = {java.lang.String.class, java.security.cert.CertStoreParameters.class, java.security.Provider.class} - ) public void testCertStore11() throws InvalidAlgorithmParameterException, NoSuchAlgorithmException { if (!initParams()) { @@ -395,12 +335,6 @@ public class CertStore1Test extends TestCase { * throws NullPointerException when type is null * throws NoSuchAlgorithmException when type is incorrect; */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies NullPointerException and NoSuchAlgorithmException. InvalidAlgorithmParameterException checking missed.", - method = "getInstance", - args = {java.lang.String.class, java.security.cert.CertStoreParameters.class, java.security.Provider.class} - ) public void testCertStore12() throws InvalidAlgorithmParameterException { if (!initParams()) { return; @@ -425,12 +359,6 @@ public class CertStore1Test extends TestCase { * <code>getInstance(String type, CertStoreParameters params, Provider provider)</code> * Assertion: return CertStore object */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies positive case. InvalidAlgorithmParameterException checking missed.", - method = "getInstance", - args = {java.lang.String.class, java.security.cert.CertStoreParameters.class, java.security.Provider.class} - ) public void testCertStore14() throws InvalidAlgorithmParameterException, NoSuchAlgorithmException { if (!initParams()) { @@ -449,20 +377,6 @@ public class CertStore1Test extends TestCase { * <code>getCRLs(CRLSelector selector)</code> * Assertion: returns empty Collection when selector is null */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies that these methods return empty Collection when selector is null.", - method = "getCertificates", - args = {java.security.cert.CertSelector.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies that these methods return empty Collection when selector is null.", - method = "getCRLs", - args = {java.security.cert.CRLSelector.class} - ) - }) public void testCertStore15() throws CertStoreException { if (!initParams()) { return; @@ -481,11 +395,6 @@ public class CertStore1Test extends TestCase { /** * Test for <code>getType()</code> method */ - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getType", - args = {} - ) public void testCertStore16() throws NoSuchAlgorithmException, InvalidAlgorithmParameterException { if (!initParams()) { @@ -518,12 +427,6 @@ public class CertStore1Test extends TestCase { /** * Test for <code>getProvider()</code> method */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getProvider", - args = {} - ) public void testCertStore17() throws NoSuchAlgorithmException, InvalidAlgorithmParameterException { if (!initParams()) { @@ -555,12 +458,6 @@ public class CertStore1Test extends TestCase { /** * Test for <code>getCertStoreParameters()</code> method */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getCertStoreParameters", - args = {} - ) public void testCertStore18() throws NoSuchAlgorithmException, InvalidAlgorithmParameterException { if (!initParams()) { diff --git a/luni/src/test/java/tests/security/cert/CertStore2Test.java b/luni/src/test/java/tests/security/cert/CertStore2Test.java index a5346c8..5b852d7 100644 --- a/luni/src/test/java/tests/security/cert/CertStore2Test.java +++ b/luni/src/test/java/tests/security/cert/CertStore2Test.java @@ -1,9 +1,5 @@ package tests.security.cert; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; - import junit.framework.TestCase; import java.security.InvalidAlgorithmParameterException; @@ -22,7 +18,6 @@ import java.security.cert.Certificate; import java.util.ArrayList; import java.util.Collection; -@TestTargetClass(CertStore.class) public class CertStore2Test extends TestCase { private static final String CERT_STORE_PROVIDER_NAME = "TestCertStoreProvider"; @@ -42,11 +37,6 @@ public class CertStore2Test extends TestCase { Security.removeProvider(CERT_STORE_PROVIDER_NAME); } - @TestTargetNew( - level=TestLevel.COMPLETE, - method="getInstance", - args={String.class, CertStoreParameters.class} - ) public void testGetInstanceStringCertStoreParameters() { try { CertStoreParameters parameters = new MyCertStoreParameters(); @@ -91,11 +81,6 @@ public class CertStore2Test extends TestCase { } } - @TestTargetNew( - level=TestLevel.COMPLETE, - method="getInstance", - args={String.class, CertStoreParameters.class, String.class} - ) public void testGetInstanceStringCertStoreParametersString() { try { CertStoreParameters parameters = new MyCertStoreParameters(); @@ -167,11 +152,6 @@ public class CertStore2Test extends TestCase { } - @TestTargetNew( - level=TestLevel.COMPLETE, - method="getInstance", - args={String.class, CertStoreParameters.class, Provider.class} - ) public void testGetInstanceStringCertStoreParametersProvider() { try { CertStoreParameters parameters = new MyCertStoreParameters(); @@ -220,11 +200,6 @@ public class CertStore2Test extends TestCase { } - @TestTargetNew( - level=TestLevel.COMPLETE, - method="getCertificates", - args={CertSelector.class} - ) public void testGetCertificates() { CertStore certStore = null; try { @@ -260,11 +235,6 @@ public class CertStore2Test extends TestCase { } } - @TestTargetNew( - level=TestLevel.COMPLETE, - method="getCRLs", - args={CRLSelector.class} - ) public void testGetCRLs() { CertStore certStore = null; try { diff --git a/luni/src/test/java/tests/security/cert/CertStoreExceptionTest.java b/luni/src/test/java/tests/security/cert/CertStoreExceptionTest.java index fce8a9c..5736a02 100644 --- a/luni/src/test/java/tests/security/cert/CertStoreExceptionTest.java +++ b/luni/src/test/java/tests/security/cert/CertStoreExceptionTest.java @@ -22,11 +22,6 @@ package tests.security.cert; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.security.cert.CertStoreException; @@ -35,7 +30,6 @@ import java.security.cert.CertStoreException; * Tests for <code>CertStoreException</code> class constructors and methods. * */ -@TestTargetClass(CertStoreException.class) public class CertStoreExceptionTest extends TestCase { private static String[] msgs = { @@ -49,12 +43,6 @@ public class CertStoreExceptionTest extends TestCase { * Test for <code>CertStoreException()</code> constructor Assertion: * constructs CertStoreException with no detail message */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "CertStoreException", - args = {} - ) public void testCertStoreException01() { CertStoreException tE = new CertStoreException(); assertNull("getMessage() must return null.", tE.getMessage()); @@ -66,12 +54,6 @@ public class CertStoreExceptionTest extends TestCase { * constructs CertStoreException with detail message msg. Parameter * <code>msg</code> is not null. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "CertStoreException", - args = {java.lang.String.class} - ) public void testCertStoreException02() { CertStoreException tE; for (int i = 0; i < msgs.length; i++) { @@ -86,12 +68,6 @@ public class CertStoreExceptionTest extends TestCase { * Test for <code>CertStoreException(String)</code> constructor Assertion: * constructs CertStoreException when <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null asa parameter.", - method = "CertStoreException", - args = {java.lang.String.class} - ) public void testCertStoreException03() { String msg = null; CertStoreException tE = new CertStoreException(msg); @@ -104,12 +80,6 @@ public class CertStoreExceptionTest extends TestCase { * Assertion: constructs CertStoreException when <code>cause</code> is * null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as a parameter.", - method = "CertStoreException", - args = {java.lang.Throwable.class} - ) public void testCertStoreException04() { Throwable cause = null; CertStoreException tE = new CertStoreException(cause); @@ -122,12 +92,6 @@ public class CertStoreExceptionTest extends TestCase { * Assertion: constructs CertStoreException when <code>cause</code> is not * null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "CertStoreException", - args = {java.lang.Throwable.class} - ) public void testCertStoreException05() { CertStoreException tE = new CertStoreException(tCause); if (tE.getMessage() != null) { @@ -146,12 +110,6 @@ public class CertStoreExceptionTest extends TestCase { * Assertion: constructs CertStoreException when <code>cause</code> is * null <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as parameters.", - method = "CertStoreException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testCertStoreException06() { CertStoreException tE = new CertStoreException(null, null); assertNull("getMessage() must return null", tE.getMessage()); @@ -163,12 +121,6 @@ public class CertStoreExceptionTest extends TestCase { * Assertion: constructs CertStoreException when <code>cause</code> is * null <code>msg</code> is not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as the second parameter.", - method = "CertStoreException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testCertStoreException07() { CertStoreException tE; for (int i = 0; i < msgs.length; i++) { @@ -184,12 +136,6 @@ public class CertStoreExceptionTest extends TestCase { * Assertion: constructs CertStoreException when <code>cause</code> is not * null <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as the first parameter.", - method = "CertStoreException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testCertStoreException08() { CertStoreException tE = new CertStoreException(null, tCause); if (tE.getMessage() != null) { @@ -208,12 +154,6 @@ public class CertStoreExceptionTest extends TestCase { * Assertion: constructs CertStoreException when <code>cause</code> is not * null <code>msg</code> is not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies positive case.", - method = "CertStoreException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testCertStoreException09() { CertStoreException tE; for (int i = 0; i < msgs.length; i++) { diff --git a/luni/src/test/java/tests/security/cert/CertStoreSpiTest.java b/luni/src/test/java/tests/security/cert/CertStoreSpiTest.java index 3d16bfa..393abee 100644 --- a/luni/src/test/java/tests/security/cert/CertStoreSpiTest.java +++ b/luni/src/test/java/tests/security/cert/CertStoreSpiTest.java @@ -23,11 +23,6 @@ package tests.security.cert; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; @@ -47,7 +42,6 @@ import org.apache.harmony.security.tests.support.cert.MyCertStoreSpi; * Tests for <code>CertStoreSpi</code> class constructors and methods. * */ -@TestTargetClass(CertStoreSpi.class) public class CertStoreSpiTest extends TestCase { @@ -55,26 +49,6 @@ public class CertStoreSpiTest extends TestCase { * Test for <code>CertStoreSpi</code> constructor Assertion: constructs * CertStoreSpi */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "CertStoreSpi", - args = {java.security.cert.CertStoreParameters.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineGetCertificates", - args = {java.security.cert.CertSelector.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineGetCRLs", - args = {java.security.cert.CRLSelector.class} - ) - }) public void testCertStoreSpi01() throws InvalidAlgorithmParameterException, CertStoreException { CertStoreSpi certStoreSpi = null; diff --git a/luni/src/test/java/tests/security/cert/CertificateCertificateRepTest.java b/luni/src/test/java/tests/security/cert/CertificateCertificateRepTest.java index 924b13b..7d973e7 100644 --- a/luni/src/test/java/tests/security/cert/CertificateCertificateRepTest.java +++ b/luni/src/test/java/tests/security/cert/CertificateCertificateRepTest.java @@ -1,9 +1,5 @@ package tests.security.cert; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; - import junit.framework.TestCase; import org.apache.harmony.security.tests.support.cert.MyCertificate; @@ -14,7 +10,6 @@ import java.io.ObjectStreamException; import java.security.cert.Certificate; import java.util.Arrays; -@TestTargetClass(java.security.cert.Certificate.class) public class CertificateCertificateRepTest extends TestCase { private static final byte[] testEncoding = new byte[] { (byte) 1, (byte) 2, @@ -33,12 +28,6 @@ public class CertificateCertificateRepTest extends TestCase { * <code>Certificate.CertificateRep(String type, byte[] data)</code> * method<br> */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "Certificate.CertificateRep.CertificateRep", - args = { String.class, byte[].class} - ) public final void testCertificateCertificateRep() { MyCertificate c1 = new MyCertificate("TEST_TYPE", testEncoding); MyCertificateRep rep = c1.new MyCertificateRep("TEST_TYPE", new byte[] { @@ -67,12 +56,6 @@ public class CertificateCertificateRepTest extends TestCase { /** * Test for <code>readResolve()</code> method<br> */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "Certificate.CertificateRep.readResolve", - args = {} - ) public final void testReadResolve() { MyCertificate c1 = new MyCertificate("TEST_TYPE", testEncoding); MyCertificateRep rep = c1.new MyCertificateRep("TEST_TYPE", new byte[] { diff --git a/luni/src/test/java/tests/security/cert/CertificateEncodingException2Test.java b/luni/src/test/java/tests/security/cert/CertificateEncodingException2Test.java index e8698b6..9896dc6 100644 --- a/luni/src/test/java/tests/security/cert/CertificateEncodingException2Test.java +++ b/luni/src/test/java/tests/security/cert/CertificateEncodingException2Test.java @@ -17,25 +17,13 @@ package tests.security.cert; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import java.security.cert.CertificateEncodingException; -@TestTargetClass(CertificateEncodingException.class) public class CertificateEncodingException2Test extends junit.framework.TestCase { /** - * @tests java.security.cert.CertificateEncodingException#CertificateEncodingException() + * java.security.cert.CertificateEncodingException#CertificateEncodingException() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "CertificateEncodingException", - args = {} - ) public void test_Constructor() { // Test for method java.security.cert.CertificateEncodingException() try { diff --git a/luni/src/test/java/tests/security/cert/CertificateEncodingExceptionTest.java b/luni/src/test/java/tests/security/cert/CertificateEncodingExceptionTest.java index 048c095..fa66cdb 100644 --- a/luni/src/test/java/tests/security/cert/CertificateEncodingExceptionTest.java +++ b/luni/src/test/java/tests/security/cert/CertificateEncodingExceptionTest.java @@ -22,11 +22,6 @@ package tests.security.cert; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.security.cert.CertificateEncodingException; @@ -37,7 +32,6 @@ import java.security.cert.CertificateEncodingException; * methods. * */ -@TestTargetClass(CertificateEncodingException.class) public class CertificateEncodingExceptionTest extends TestCase { private static String[] msgs = { @@ -51,12 +45,6 @@ public class CertificateEncodingExceptionTest extends TestCase { * Test for <code>CertificateEncodingException()</code> constructor * Assertion: constructs CertificateEncodingException with no detail message */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "CertificateEncodingException", - args = {} - ) public void testCertificateEncodingException01() { CertificateEncodingException tE = new CertificateEncodingException(); assertNull("getMessage() must return null.", tE.getMessage()); @@ -68,12 +56,6 @@ public class CertificateEncodingExceptionTest extends TestCase { * Assertion: constructs CertificateEncodingException with detail message * msg. Parameter <code>msg</code> is not null. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "CertificateEncodingException", - args = {java.lang.String.class} - ) public void testCertificateEncodingException02() { CertificateEncodingException tE; for (int i = 0; i < msgs.length; i++) { @@ -89,12 +71,6 @@ public class CertificateEncodingExceptionTest extends TestCase { * Assertion: constructs CertificateEncodingException when <code>msg</code> * is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as a parameter.", - method = "CertificateEncodingException", - args = {java.lang.String.class} - ) public void testCertificateEncodingException03() { String msg = null; CertificateEncodingException tE = new CertificateEncodingException(msg); @@ -107,12 +83,6 @@ public class CertificateEncodingExceptionTest extends TestCase { * constructor Assertion: constructs CertificateEncodingException when * <code>cause</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as a parameter.", - method = "CertificateEncodingException", - args = {java.lang.Throwable.class} - ) public void testCertificateEncodingException04() { Throwable cause = null; CertificateEncodingException tE = new CertificateEncodingException( @@ -126,12 +96,6 @@ public class CertificateEncodingExceptionTest extends TestCase { * constructor Assertion: constructs CertificateEncodingException when * <code>cause</code> is not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "CertificateEncodingException", - args = {java.lang.Throwable.class} - ) public void testCertificateEncodingException05() { CertificateEncodingException tE = new CertificateEncodingException( tCause); @@ -151,12 +115,6 @@ public class CertificateEncodingExceptionTest extends TestCase { * constructor Assertion: constructs CertificateEncodingException when * <code>cause</code> is null <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as parameters.", - method = "CertificateEncodingException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testCertificateEncodingException06() { CertificateEncodingException tE = new CertificateEncodingException( null, null); @@ -169,12 +127,6 @@ public class CertificateEncodingExceptionTest extends TestCase { * constructor Assertion: constructs CertificateEncodingException when * <code>cause</code> is null <code>msg</code> is not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as the second parameter.", - method = "CertificateEncodingException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testCertificateEncodingException07() { CertificateEncodingException tE; for (int i = 0; i < msgs.length; i++) { @@ -190,12 +142,6 @@ public class CertificateEncodingExceptionTest extends TestCase { * constructor Assertion: constructs CertificateEncodingException when * <code>cause</code> is not null <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as the first parameter.", - method = "CertificateEncodingException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testCertificateEncodingException08() { CertificateEncodingException tE = new CertificateEncodingException( null, tCause); @@ -215,12 +161,6 @@ public class CertificateEncodingExceptionTest extends TestCase { * constructor Assertion: constructs CertificateEncodingException when * <code>cause</code> is not null <code>msg</code> is not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "CertificateEncodingException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testCertificateEncodingException09() { CertificateEncodingException tE; for (int i = 0; i < msgs.length; i++) { diff --git a/luni/src/test/java/tests/security/cert/CertificateException2Test.java b/luni/src/test/java/tests/security/cert/CertificateException2Test.java index a3769c4..27f9d0e 100644 --- a/luni/src/test/java/tests/security/cert/CertificateException2Test.java +++ b/luni/src/test/java/tests/security/cert/CertificateException2Test.java @@ -17,25 +17,13 @@ package tests.security.cert; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import java.security.cert.CertificateException; -@TestTargetClass(CertificateException.class) public class CertificateException2Test extends junit.framework.TestCase { /** - * @tests java.security.cert.CertificateException#CertificateException() + * java.security.cert.CertificateException#CertificateException() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "CertificateException", - args = {} - ) public void test_Constructor() { // Test for method java.security.cert.CertificateException() try { @@ -52,14 +40,8 @@ public class CertificateException2Test extends junit.framework.TestCase { } /** - * @tests java.security.cert.CertificateException#CertificateException(java.lang.String) + * java.security.cert.CertificateException#CertificateException(java.lang.String) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Null/empty/invalid parameters checking missed", - method = "CertificateException", - args = {java.lang.String.class} - ) public void test_ConstructorLjava_lang_String() { // Test for method // java.security.cert.CertificateException(java.lang.String) diff --git a/luni/src/test/java/tests/security/cert/CertificateExceptionTest.java b/luni/src/test/java/tests/security/cert/CertificateExceptionTest.java index b88db00..e28a6d2 100644 --- a/luni/src/test/java/tests/security/cert/CertificateExceptionTest.java +++ b/luni/src/test/java/tests/security/cert/CertificateExceptionTest.java @@ -22,11 +22,6 @@ package tests.security.cert; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.security.cert.CertificateException; @@ -36,7 +31,6 @@ import java.security.cert.CertificateException; * Tests for <code>CertificateException</code> class constructors and methods. * */ -@TestTargetClass(CertificateException.class) public class CertificateExceptionTest extends TestCase { private static String[] msgs = { @@ -50,12 +44,6 @@ public class CertificateExceptionTest extends TestCase { * Test for <code>CertificateException()</code> constructor Assertion: * constructs CertificateException with no detail message */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "CertificateException", - args = {} - ) public void testCertificateException01() { CertificateException tE = new CertificateException(); assertNull("getMessage() must return null.", tE.getMessage()); @@ -67,12 +55,6 @@ public class CertificateExceptionTest extends TestCase { * Assertion: constructs CertificateException with detail message msg. * Parameter <code>msg</code> is not null. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "CertificateException", - args = {java.lang.String.class} - ) public void testCertificateException02() { CertificateException tE; for (int i = 0; i < msgs.length; i++) { @@ -88,12 +70,6 @@ public class CertificateExceptionTest extends TestCase { * Assertion: constructs CertificateException when <code>msg</code> is * null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as a parameter.", - method = "CertificateException", - args = {java.lang.String.class} - ) public void testCertificateException03() { String msg = null; CertificateException tE = new CertificateException(msg); @@ -106,12 +82,6 @@ public class CertificateExceptionTest extends TestCase { * Assertion: constructs CertificateException when <code>cause</code> is * null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as a parameter.", - method = "CertificateException", - args = {java.lang.Throwable.class} - ) public void testCertificateException04() { Throwable cause = null; CertificateException tE = new CertificateException(cause); @@ -124,12 +94,6 @@ public class CertificateExceptionTest extends TestCase { * Assertion: constructs CertificateException when <code>cause</code> is * not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "CertificateException", - args = {java.lang.Throwable.class} - ) public void testCertificateException05() { CertificateException tE = new CertificateException(tCause); if (tE.getMessage() != null) { @@ -148,12 +112,6 @@ public class CertificateExceptionTest extends TestCase { * constructor Assertion: constructs CertificateException when * <code>cause</code> is null <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as parameters.", - method = "CertificateException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testCertificateException06() { CertificateException tE = new CertificateException(null, null); assertNull("getMessage() must return null", tE.getMessage()); @@ -165,12 +123,6 @@ public class CertificateExceptionTest extends TestCase { * constructor Assertion: constructs CertificateException when * <code>cause</code> is null <code>msg</code> is not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as Throwable parameter.", - method = "CertificateException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testCertificateException07() { CertificateException tE; for (int i = 0; i < msgs.length; i++) { @@ -186,12 +138,6 @@ public class CertificateExceptionTest extends TestCase { * constructor Assertion: constructs CertificateException when * <code>cause</code> is not null <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies as String parameter.", - method = "CertificateException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testCertificateException08() { CertificateException tE = new CertificateException(null, tCause); if (tE.getMessage() != null) { @@ -210,12 +156,6 @@ public class CertificateExceptionTest extends TestCase { * constructor Assertion: constructs CertificateException when * <code>cause</code> is not null <code>msg</code> is not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "CertificateException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testCertificateException09() { CertificateException tE; for (int i = 0; i < msgs.length; i++) { diff --git a/luni/src/test/java/tests/security/cert/CertificateExpiredExceptionTest.java b/luni/src/test/java/tests/security/cert/CertificateExpiredExceptionTest.java index d6ee648..bf6f1dd 100644 --- a/luni/src/test/java/tests/security/cert/CertificateExpiredExceptionTest.java +++ b/luni/src/test/java/tests/security/cert/CertificateExpiredExceptionTest.java @@ -22,11 +22,6 @@ package tests.security.cert; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.security.cert.CertificateExpiredException; @@ -36,7 +31,6 @@ import java.security.cert.CertificateExpiredException; * Tests for <code>DigestException</code> class constructors and methods. * */ -@TestTargetClass(CertificateExpiredException.class) public class CertificateExpiredExceptionTest extends TestCase { static String[] msgs = { @@ -50,12 +44,6 @@ public class CertificateExpiredExceptionTest extends TestCase { * Test for <code>CertificateExpiredException()</code> constructor * Assertion: constructs CertificateExpiredException with no detail message */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "CertificateExpiredException", - args = {} - ) public void testCertificateExpiredException01() { CertificateExpiredException tE = new CertificateExpiredException(); assertNull("getMessage() must return null.", tE.getMessage()); @@ -67,12 +55,6 @@ public class CertificateExpiredExceptionTest extends TestCase { * Assertion: constructs CertificateExpiredException with detail message * msg. Parameter <code>msg</code> is not null. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "CertificateExpiredException", - args = {java.lang.String.class} - ) public void testCertificateExpiredException02() { CertificateExpiredException tE; for (int i = 0; i < msgs.length; i++) { @@ -88,12 +70,6 @@ public class CertificateExpiredExceptionTest extends TestCase { * Assertion: constructs CertificateExpiredException when <code>msg</code> * is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as a parameter.", - method = "CertificateExpiredException", - args = {java.lang.String.class} - ) public void testCertificateExpiredException03() { String msg = null; CertificateExpiredException tE = new CertificateExpiredException(msg); diff --git a/luni/src/test/java/tests/security/cert/CertificateFactory1Test.java b/luni/src/test/java/tests/security/cert/CertificateFactory1Test.java index 4fa6c62..d808f59 100644 --- a/luni/src/test/java/tests/security/cert/CertificateFactory1Test.java +++ b/luni/src/test/java/tests/security/cert/CertificateFactory1Test.java @@ -21,11 +21,6 @@ package tests.security.cert; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; - import junit.framework.TestCase; import org.apache.harmony.security.tests.support.SpiEngUtils; @@ -56,7 +51,6 @@ import java.util.Vector; * Tests for <code>CertificateFactory</code> class methods and constructor * */ -@TestTargetClass(CertificateFactory.class) public class CertificateFactory1Test extends TestCase { public static final String srvCertificateFactory = "CertificateFactory"; @@ -110,12 +104,6 @@ public class CertificateFactory1Test extends TestCase { * Test for <code>getInstance(String type)</code> method * Assertion: returns CertificateFactory if type is X.509 */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify CertificateException.", - method = "getInstance", - args = {java.lang.String.class} - ) public void testCertificateFactory01() throws CertificateException { if (!X509Support) { fail(NotSupportMsg); @@ -134,12 +122,6 @@ public class CertificateFactory1Test extends TestCase { * throws NullPointerException when type is null * throws CertificateException when type is not available */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies CertificateException.", - method = "getInstance", - args = {java.lang.String.class} - ) public void testCertificateFactory02() { try { CertificateFactory.getInstance(null); @@ -161,12 +143,6 @@ public class CertificateFactory1Test extends TestCase { * Test for <code>getInstance(String type, String provider)</code> method * Assertion: throws IllegalArgumentException when provider is null or empty */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies IllegalArgumentException. IllegalArgumentException was checked instead of NoSuchProviderException", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void testCertificateFactory03() throws CertificateException, NoSuchProviderException { if (!X509Support) { @@ -194,12 +170,6 @@ public class CertificateFactory1Test extends TestCase { * throws NullPointerException when type is null * throws CertificateException when type is not available */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies CertificateException and NullPointerException.", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void testCertificateFactory04() throws NoSuchProviderException { if (!X509Support) { fail(NotSupportMsg); @@ -228,12 +198,6 @@ public class CertificateFactory1Test extends TestCase { * Assertion: returns CertificateFactory when type and provider have valid * values */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies positive functionality.", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void testCertificateFactory05() throws CertificateException, NoSuchProviderException { if (!X509Support) { @@ -255,12 +219,6 @@ public class CertificateFactory1Test extends TestCase { * method * Assertion: throws IllegalArgumentException when provider is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies IllegalArgumentException.", - method = "getInstance", - args = {java.lang.String.class, java.security.Provider.class} - ) public void testCertificateFactory06() throws CertificateException { if (!X509Support) { fail(NotSupportMsg); @@ -283,12 +241,6 @@ public class CertificateFactory1Test extends TestCase { * throws NullPointerException when type is null * throws CertificateException when type is not available */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies CertificateException.", - method = "getInstance", - args = {java.lang.String.class, java.security.Provider.class} - ) public void testCertificateFactory07() { if (!X509Support) { fail(NotSupportMsg); @@ -318,12 +270,6 @@ public class CertificateFactory1Test extends TestCase { * Assertion: returns CertificateFactorythrows when type and provider * have valid values */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies positive functionality of getInstance method.", - method = "getInstance", - args = {java.lang.String.class, java.security.Provider.class} - ) public void testCertificateFactory08() throws CertificateException { if (!X509Support) { fail(NotSupportMsg); @@ -343,12 +289,6 @@ public class CertificateFactory1Test extends TestCase { * Test for <code>getCertPathEncodings()</code> method * Assertion: returns encodings */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getCertPathEncodings", - args = {} - ) public void testCertificateFactory09() { if (!X509Support) { fail(NotSupportMsg); @@ -399,32 +339,6 @@ public class CertificateFactory1Test extends TestCase { * Assertion: throw CertificateException and CRLException when * inStream is null or empty */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies methods with null and empty InputStream.", - method = "generateCertificate", - args = {java.io.InputStream.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies methods with null and empty InputStream.", - method = "generateCertificates", - args = {java.io.InputStream.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies methods with null and empty InputStream.", - method = "generateCRL", - args = {java.io.InputStream.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies methods with null and empty InputStream.", - method = "generateCRLs", - args = {java.io.InputStream.class} - ) - }) public void testCertificateFactory10() { if (!X509Support) { fail(NotSupportMsg); @@ -504,32 +418,6 @@ public class CertificateFactory1Test extends TestCase { * Assertion: throw CertificateException and CRLException when inStream * contains incompatible datas */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies positive functionality of methods.", - method = "generateCertificate", - args = {java.io.InputStream.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies positive functionality of methods.", - method = "generateCertificates", - args = {java.io.InputStream.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies positive functionality of methods.", - method = "generateCRL", - args = {java.io.InputStream.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies positive functionality of methods.", - method = "generateCRLs", - args = {java.io.InputStream.class} - ) - }) public void testCertificateFactory11() throws IOException { if (!X509Support) { fail(NotSupportMsg); @@ -590,20 +478,6 @@ public class CertificateFactory1Test extends TestCase { * Assertion: throws CertificateException when inStream is null or * when isStream contains invalid datas */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies CertificateException.", - method = "generateCertPath", - args = {java.io.InputStream.class, java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies CertificateException.", - method = "generateCertPath", - args = {java.io.InputStream.class} - ) - }) public void testCertificateFactory12() { if (!X509Support) { fail(NotSupportMsg); @@ -652,20 +526,6 @@ public class CertificateFactory1Test extends TestCase { * methods * Assertion: throw CertificateException when isStream contains invalid datas */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies CertificateException.", - method = "generateCertPath", - args = {java.io.InputStream.class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies CertificateException.", - method = "generateCertPath", - args = {java.io.InputStream.class, java.lang.String.class} - ) - }) // Test passed on RI public void testCertificateFactory13() throws IOException { if (!X509Support) { @@ -707,12 +567,6 @@ public class CertificateFactory1Test extends TestCase { * Test for <code>generateCertPath(List certificates)</code> method * Assertion: throw NullPointerException certificates is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException. Valid parameters checking missed.", - method = "generateCertPath", - args = {java.util.List.class} - ) public void testCertificateFactory14() throws CertificateException { if (!X509Support) { fail(NotSupportMsg); @@ -734,12 +588,6 @@ public class CertificateFactory1Test extends TestCase { * Test for <code>generateCertPath(List certificates)</code> method * Assertion: returns empty CertPath if certificates is empty */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that generateCertPath method returns empty CertPath if certificates is empty. Valid parameters checking missed.", - method = "generateCertPath", - args = {java.util.List.class} - ) public void testCertificateFactory15() throws CertificateException { if (!X509Support) { fail(NotSupportMsg); @@ -760,12 +608,6 @@ public class CertificateFactory1Test extends TestCase { * Assertion: throws CertificateException when certificates contains * incorrect Certificate */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies CertificateException. Valid parameters checking missed.", - method = "generateCertPath", - args = {java.util.List.class} - ) public void testCertificateFactory16() { if (!X509Support) { fail(NotSupportMsg); @@ -789,12 +631,6 @@ public class CertificateFactory1Test extends TestCase { * Test for <code>CertificateFactory</code> constructor * Assertion: returns CertificateFactory object */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies CRLException and NullPointerException.", - method = "generateCRLs", - args = {java.io.InputStream.class} - ) public void testCertificateFactory17() throws CRLException { if (!X509Support) { fail(NotSupportMsg); @@ -824,12 +660,6 @@ public class CertificateFactory1Test extends TestCase { /** * Test for <code>getType()</code> method */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getType", - args = {} - ) public void testCertificateFactory18() throws CertificateException { if (!X509Support) { fail(NotSupportMsg); @@ -858,12 +688,6 @@ public class CertificateFactory1Test extends TestCase { } @SuppressWarnings("cast") - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "CertificateFactory", - args = {java.security.cert.CertificateFactorySpi.class, java.security.Provider.class, java.lang.String.class} - ) public void testCertificateFactory19() { if (!X509Support) { fail(NotSupportMsg); diff --git a/luni/src/test/java/tests/security/cert/CertificateFactory2Test.java b/luni/src/test/java/tests/security/cert/CertificateFactory2Test.java index e491ba6..18fc79f 100644 --- a/luni/src/test/java/tests/security/cert/CertificateFactory2Test.java +++ b/luni/src/test/java/tests/security/cert/CertificateFactory2Test.java @@ -22,10 +22,6 @@ package tests.security.cert; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; - import junit.framework.TestCase; import org.apache.harmony.security.tests.support.SpiEngUtils; @@ -50,7 +46,6 @@ import java.util.List; * Tests for CertificateFactory class constructors and methods * */ -@TestTargetClass(CertificateFactory.class) public class CertificateFactory2Test extends TestCase { private static final String defaultAlg = "CertFac"; private static final String CertificateFactoryProviderClass = "org.apache.harmony.security.tests.support.cert.MyCertificateFactorySpi"; @@ -315,60 +310,24 @@ public class CertificateFactory2Test extends TestCase { checkResult(cerF, mode); } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class} - ) public void testGetInstance01() throws CertificateException, CRLException { GetInstance01(true); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.security.Provider.class} - ) public void testGetInstance02() throws CertificateException, NoSuchProviderException, IllegalArgumentException, CRLException { GetInstance02(true); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.security.Provider.class} - ) public void testGetInstance03() throws CertificateException, IllegalArgumentException, CRLException { GetInstance03(true); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class} - ) public void testGetInstance04() throws CertificateException, CRLException { GetInstance01(false); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.security.Provider.class} - ) public void testGetInstance05() throws CertificateException, NoSuchProviderException, IllegalArgumentException, CRLException { GetInstance02(false); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.security.Provider.class} - ) public void testGetInstance06() throws CertificateException, IllegalArgumentException, CRLException { GetInstance03(false); diff --git a/luni/src/test/java/tests/security/cert/CertificateFactory3Test.java b/luni/src/test/java/tests/security/cert/CertificateFactory3Test.java index 9163933..f908b69 100644 --- a/luni/src/test/java/tests/security/cert/CertificateFactory3Test.java +++ b/luni/src/test/java/tests/security/cert/CertificateFactory3Test.java @@ -22,10 +22,6 @@ package tests.security.cert; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; - import junit.framework.TestCase; import org.apache.harmony.security.tests.support.SpiEngUtils; @@ -46,7 +42,6 @@ import java.util.Vector; /** * Tests for <code>CertificateFactory</code> class methods */ -@TestTargetClass(CertificateFactory.class) public class CertificateFactory3Test extends TestCase { private static String defaultProviderName = null; @@ -88,12 +83,6 @@ public class CertificateFactory3Test extends TestCase { * Test for <code>generateCertificate(InputStream inStream)</code> method * Assertion: returns Certificate */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify CertificateException.", - method = "generateCertificate", - args = {java.io.InputStream.class} - ) public void testGenerateCertificate() throws Exception { CertificateFactory[] certFs = initCertFs(); assertNotNull("CertificateFactory objects were not created", certFs); @@ -110,12 +99,6 @@ public class CertificateFactory3Test extends TestCase { * Test for <code>generateCertificates(InputStream inStream)</code> method * Assertion: returns Collection which consists of 1 Certificate */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify CertificateException.", - method = "generateCertificates", - args = {java.io.InputStream.class} - ) public void testGenerateCertificates() throws Exception { CertificateFactory[] certFs = initCertFs(); assertNotNull("CertificateFactory objects were not created", certFs); @@ -136,12 +119,6 @@ public class CertificateFactory3Test extends TestCase { * Test for <code>generateCertPath(List certificates)</code> method * Assertion: returns CertPath with 1 Certificate */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify CertificateException.", - method = "generateCertPath", - args = {java.util.List.class} - ) public void testGenerateCertPath01() throws Exception { CertificateFactory[] certFs = initCertFs(); assertNotNull("CertificateFactory objects were not created", certFs); @@ -167,12 +144,6 @@ public class CertificateFactory3Test extends TestCase { * <code>generateCertPath(InputStream inStream, String encoding)</code> * method Assertion: returns CertPath with 1 Certificate */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify CertificateException.", - method = "generateCertPath", - args = {java.io.InputStream.class, java.lang.String.class} - ) public void testGenerateCertPath02() throws Exception { CertificateFactory[] certFs = initCertFs(); assertNotNull("CertificateFactory objects were not created", certFs); @@ -193,12 +164,6 @@ public class CertificateFactory3Test extends TestCase { * Test for <code>generateCertPath(InputStream inStream)</code> method * Assertion: returns CertPath with 1 Certificate */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify CertificateException.", - method = "generateCertPath", - args = {java.io.InputStream.class} - ) public void testGenerateCertPath03() throws Exception { String certPathEncoding = "PkiPath"; CertificateFactory[] certFs = initCertFs(); diff --git a/luni/src/test/java/tests/security/cert/CertificateFactory4Test.java b/luni/src/test/java/tests/security/cert/CertificateFactory4Test.java index 65f3868..060a4a2 100644 --- a/luni/src/test/java/tests/security/cert/CertificateFactory4Test.java +++ b/luni/src/test/java/tests/security/cert/CertificateFactory4Test.java @@ -17,10 +17,6 @@ package tests.security.cert; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; - import junit.framework.TestCase; import tests.support.resource.Support_Resources; @@ -42,7 +38,6 @@ import java.security.cert.CertificateFactory; import java.util.Collection; import java.util.List; -@TestTargetClass(CertificateFactory.class) public class CertificateFactory4Test extends TestCase { private static final String BASE_URL = Support_GetResource @@ -57,14 +52,8 @@ public class CertificateFactory4Test extends TestCase { private static final String[] CRLCOLLECTION_URLS = new String[] { "Bug94404-PKCS7.crl" }; /** - * @tests java.security.cert.CertificateFactory#generateCertificate(java.io.InputStream) + * java.security.cert.CertificateFactory#generateCertificate(java.io.InputStream) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "generateCertificate", - args = {java.io.InputStream.class} - ) public void test_generateCertificateLjava_io_InputStream() throws Exception { // Test 1 // Test for method java.security.cert.Certificate @@ -94,14 +83,8 @@ public class CertificateFactory4Test extends TestCase { } /** - * @tests java.security.cert.CertificateFactory#generateCertificates(java.io.InputStream) + * java.security.cert.CertificateFactory#generateCertificates(java.io.InputStream) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies IOException.", - method = "generateCertificates", - args = {java.io.InputStream.class} - ) public void test_generateCertificatesLjava_io_InputStream() throws Exception { CertificateFactory fact = CertificateFactory.getInstance("X.509"); @@ -123,14 +106,8 @@ public class CertificateFactory4Test extends TestCase { } /** - * @tests java.security.cert.CertificateFactory#generateCRL(java.io.InputStream) + * java.security.cert.CertificateFactory#generateCRL(java.io.InputStream) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies IOException.", - method = "generateCRL", - args = {java.io.InputStream.class} - ) public void test_generateCRLLjava_io_InputStream() throws Exception { CertificateFactory fact = CertificateFactory.getInstance("X.509"); for (int i = 0; i < CRL_URLS.length; i++) { @@ -150,14 +127,8 @@ public class CertificateFactory4Test extends TestCase { } /** - * @tests java.security.cert.CertificateFactory#generateCRLs(java.io.InputStream) + * java.security.cert.CertificateFactory#generateCRLs(java.io.InputStream) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies IOException.", - method = "generateCRLs", - args = {java.io.InputStream.class} - ) public void test_generateCRLsLjava_io_InputStream() throws Exception { CertificateFactory fact = CertificateFactory.getInstance("X.509"); for (int i = 0; i < CRLCOLLECTION_URLS.length; i++) { @@ -175,14 +146,8 @@ public class CertificateFactory4Test extends TestCase { } /** - * @tests java.security.cert.CertificateFactory#getInstance(java.lang.String) + * java.security.cert.CertificateFactory#getInstance(java.lang.String) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify CertificateException.", - method = "getInstance", - args = {java.lang.String.class} - ) public void test_getInstanceLjava_lang_String() throws Exception { // Test for method java.security.cert.CertificateFactory // java.security.cert.CertificateFactory.getInstance(java.lang.String) @@ -191,15 +156,9 @@ public class CertificateFactory4Test extends TestCase { } /** - * @tests java.security.cert.CertificateFactory#getInstance(java.lang.String, + * java.security.cert.CertificateFactory#getInstance(java.lang.String, * java.lang.String) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getInstance", - args = {java.lang.String.class, java.lang.String.class} - ) public void test_getInstanceLjava_lang_StringLjava_lang_String() throws Exception { // Test for method java.security.cert.CertificateFactory @@ -228,14 +187,8 @@ public class CertificateFactory4Test extends TestCase { } /** - * @tests java.security.cert.CertificateFactory#getProvider() + * java.security.cert.CertificateFactory#getProvider() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getProvider", - args = {} - ) public void test_getProvider() throws Exception { // Test for method java.security.Provider // java.security.cert.CertificateFactory.getProvider() @@ -244,15 +197,9 @@ public class CertificateFactory4Test extends TestCase { } /** - * @tests java.security.cert.CertificateFactory#generateCRLs(InputStream + * java.security.cert.CertificateFactory#generateCRLs(InputStream * inStream) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as a parameter.", - method = "generateCRLs", - args = {java.io.InputStream.class} - ) public void testGenerateCRLs2() throws Exception { // Regression for HARMONY-814 try { @@ -263,15 +210,9 @@ public class CertificateFactory4Test extends TestCase { } /** - * @tests java.security.cert.CertificateFactory#generateCertificate(InputStream + * java.security.cert.CertificateFactory#generateCertificate(InputStream * inStream) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as a parameter,s and CertificateException.", - method = "generateCertificate", - args = {java.io.InputStream.class} - ) public void testGenerateCertificate() throws Exception { // Regression for HARMONY-814 try { @@ -281,15 +222,9 @@ public class CertificateFactory4Test extends TestCase { } /** - * @tests java.security.cert.CertificateFactory#generateCertificates(InputStream + * java.security.cert.CertificateFactory#generateCertificates(InputStream * inStream) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as a parameter.", - method = "generateCertificates", - args = {java.io.InputStream.class} - ) public void testGenerateCertificates2() throws Exception { // Regression for HARMONY-814 try { @@ -299,15 +234,9 @@ public class CertificateFactory4Test extends TestCase { } /** - * @tests java.security.cert.CertificateFactory#generateCertPath(InputStream + * java.security.cert.CertificateFactory#generateCertPath(InputStream * inStream, String encoding) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as InputStream parameter.", - method = "generateCertPath", - args = {java.io.InputStream.class, java.lang.String.class} - ) public void testGenerateCertPath1() throws Exception { // Regression for HARMONY-814 try { @@ -318,15 +247,9 @@ public class CertificateFactory4Test extends TestCase { } /** - * @tests java.security.cert.CertificateFactory#generateCertPath(List<? + * java.security.cert.CertificateFactory#generateCertPath(List<? * extends Certificate> certificates) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as a parameter.", - method = "generateCertPath", - args = {java.util.List.class} - ) public void testGenerateCertPath2() throws Exception { // Regression for HARMONY-814 try { @@ -337,15 +260,9 @@ public class CertificateFactory4Test extends TestCase { } /** - * @tests java.security.cert.CertificateFactory#generateCertPath(InputStream + * java.security.cert.CertificateFactory#generateCertPath(InputStream * inStream) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as a parameter.", - method = "generateCertPath", - args = {java.io.InputStream.class} - ) public void testGenerateCertPath3() throws Exception { // Regression for HARMONY-814 try { @@ -356,15 +273,9 @@ public class CertificateFactory4Test extends TestCase { } /** - * @tests java.security.cert.CertificateFactory#generateCRL(InputStream + * java.security.cert.CertificateFactory#generateCRL(InputStream * inStream) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as a parameter.", - method = "generateCRL", - args = {java.io.InputStream.class} - ) public void testGenerateCRL() throws Exception { // Regression for HARMONY-814 try { diff --git a/luni/src/test/java/tests/security/cert/CertificateFactorySpiTest.java b/luni/src/test/java/tests/security/cert/CertificateFactorySpiTest.java index 1c27991..9e3f1ad 100644 --- a/luni/src/test/java/tests/security/cert/CertificateFactorySpiTest.java +++ b/luni/src/test/java/tests/security/cert/CertificateFactorySpiTest.java @@ -23,11 +23,6 @@ package tests.security.cert; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; - import junit.framework.TestCase; import org.apache.harmony.security.tests.support.cert.MyCertificateFactorySpi; @@ -49,19 +44,12 @@ import java.util.List; * Tests for <code>CertificateFactorySpi</code> class constructors and methods * */ -@TestTargetClass(CertificateFactorySpi.class) public class CertificateFactorySpiTest extends TestCase { /** * Test for <code>CertificateFactorySpi</code> constructor * Assertion: constructs CertificateFactorySpi */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies exceptions.", - method = "CertificateFactorySpi", - args = {} - ) public void testCertificateFactorySpi01() throws CertificateException, CRLException { CertificateFactorySpi certFactorySpi = new extCertificateFactorySpi(); @@ -123,20 +111,6 @@ public class CertificateFactorySpiTest extends TestCase { * Test for <code>CertificateFactorySpi</code> constructor * Assertion: constructs CertificateFactorySpi */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "CertificateFactorySpi", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineGetCertPathEncodings", - args = {} - ) - }) public void testCertificateFactorySpi02() throws CertificateException, CRLException { CertificateFactorySpi certFactorySpi = new MyCertificateFactorySpi(); @@ -207,12 +181,6 @@ public class CertificateFactorySpiTest extends TestCase { * Test for <code>CertificateFactorySpi</code> constructor * Assertion: constructs CertificateFactorySpi */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "CertificateFactorySpi", - args = {} - ) public void testCertificateFactorySpi03() throws CertificateException, CRLException { CertificateFactorySpi certFactorySpi = new MyCertificateFactorySpi(); @@ -280,12 +248,6 @@ public class CertificateFactorySpiTest extends TestCase { * Assertion: Generates a <code>CertPath</code> object and initializes it * with the data read from the <code>InputStream</code> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that engineGenerateCertPath method returns null.", - method = "engineGenerateCertPath", - args = {java.io.InputStream.class} - ) public void testEngineGenerateCertPathLjava_io_InputStream01() { CertificateFactorySpi certFactorySpi = new MyCertificateFactorySpi(); @@ -305,12 +267,6 @@ public class CertificateFactorySpiTest extends TestCase { * Assertion: Generates a <code>CertPath</code> object and initializes it * with the data read from the <code>InputStream</code> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies UnsupportedOperationException.", - method = "engineGenerateCertPath", - args = {java.io.InputStream.class} - ) public void testEngineGenerateCertPathLjava_io_InputStream02() { CertificateFactorySpi certFactorySpi = new extCertificateFactorySpi(); @@ -332,12 +288,6 @@ public class CertificateFactorySpiTest extends TestCase { * method. Assertion: generates a <code>CertPath</code> object and * initializes it with the data read from the <code>InputStream</code> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies CertificateException.", - method = "engineGenerateCertPath", - args = {java.io.InputStream.class, java.lang.String.class} - ) public void testEngineGenerateCertPathLjava_io_InputStream_Ljava_lang_String01() { CertificateFactorySpi certFactorySpi = new MyCertificateFactorySpi(); MyCertificateFactorySpi.putMode(true); @@ -364,12 +314,6 @@ public class CertificateFactorySpiTest extends TestCase { * method. Assertion: generates a <code>CertPath</code> object and * initializes it with the data read from the <code>InputStream</code> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies UnsupportedOperationException.", - method = "engineGenerateCertPath", - args = {java.io.InputStream.class, java.lang.String.class} - ) public void testEngineGenerateCertPathLjava_io_InputStream_Ljava_lang_String02() { CertificateFactorySpi certFactorySpi = new extCertificateFactorySpi(); @@ -391,12 +335,6 @@ public class CertificateFactorySpiTest extends TestCase { * method Assertion: generates a <code>CertPath</code> object and * initializes it with a <code>List</code> of <code>Certificates</code> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that engineGenerateCertPath method returns null.", - method = "engineGenerateCertPath", - args = {java.util.List.class} - ) public void testEngineGenerateCertPathLJava_util_List01() { CertificateFactorySpi certFactorySpi = new MyCertificateFactorySpi(); MyCertificateFactorySpi.putMode(true); @@ -423,12 +361,6 @@ public class CertificateFactorySpiTest extends TestCase { * method Assertion: generates a <code>CertPath</code> object and * initializes it with a <code>List</code> of <code>Certificates</code> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies UnsupportedOperationException.", - method = "engineGenerateCertPath", - args = {java.util.List.class} - ) public void testEngineGenerateCertPathLJava_util_List02() { CertificateFactorySpi certFactorySpi = new extCertificateFactorySpi(); @@ -444,32 +376,6 @@ public class CertificateFactorySpiTest extends TestCase { } } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineGenerateCRL", - args = {java.io.InputStream.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineGenerateCRLs", - args = {java.io.InputStream.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineGenerateCertificate", - args = {java.io.InputStream.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "engineGenerateCertificates", - args = {java.io.InputStream.class} - ) - }) public void testAbstractMethods() { CertificateFactorySpi certFactorySpi = new extCertificateFactorySpi(); ByteArrayInputStream bais = new ByteArrayInputStream(new byte[3]); diff --git a/luni/src/test/java/tests/security/cert/CertificateNotYetValidExceptionTest.java b/luni/src/test/java/tests/security/cert/CertificateNotYetValidExceptionTest.java index 361be29..4ea5e8f 100644 --- a/luni/src/test/java/tests/security/cert/CertificateNotYetValidExceptionTest.java +++ b/luni/src/test/java/tests/security/cert/CertificateNotYetValidExceptionTest.java @@ -22,11 +22,6 @@ package tests.security.cert; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.security.cert.CertificateNotYetValidException; @@ -36,7 +31,6 @@ import java.security.cert.CertificateNotYetValidException; * Tests for <code>DigestException</code> class constructors and methods. * */ -@TestTargetClass(CertificateNotYetValidException.class) public class CertificateNotYetValidExceptionTest extends TestCase { static String[] msgs = { @@ -51,12 +45,6 @@ public class CertificateNotYetValidExceptionTest extends TestCase { * Assertion: constructs CertificateNotYetValidException with no detail * message */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "CertificateNotYetValidException", - args = {} - ) public void testCertificateNotYetValidException01() { CertificateNotYetValidException tE = new CertificateNotYetValidException(); assertNull("getMessage() must return null.", tE.getMessage()); @@ -68,12 +56,6 @@ public class CertificateNotYetValidExceptionTest extends TestCase { * constructor Assertion: constructs CertificateNotYetValidException with * detail message msg. Parameter <code>msg</code> is not null. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "CertificateNotYetValidException", - args = {java.lang.String.class} - ) public void testCertificateNotYetValidException02() { CertificateNotYetValidException tE; for (int i = 0; i < msgs.length; i++) { @@ -89,12 +71,6 @@ public class CertificateNotYetValidExceptionTest extends TestCase { * constructor Assertion: constructs CertificateNotYetValidException when * <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as a parameter.", - method = "CertificateNotYetValidException", - args = {java.lang.String.class} - ) public void testCertificateNotYetValidException03() { String msg = null; CertificateNotYetValidException tE = new CertificateNotYetValidException( diff --git a/luni/src/test/java/tests/security/cert/CertificateParsingExceptionTest.java b/luni/src/test/java/tests/security/cert/CertificateParsingExceptionTest.java index af57c20..cc1f254 100644 --- a/luni/src/test/java/tests/security/cert/CertificateParsingExceptionTest.java +++ b/luni/src/test/java/tests/security/cert/CertificateParsingExceptionTest.java @@ -22,11 +22,6 @@ package tests.security.cert; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.security.cert.CertificateParsingException; @@ -37,7 +32,6 @@ import java.security.cert.CertificateParsingException; * methods. * */ -@TestTargetClass(CertificateParsingException.class) public class CertificateParsingExceptionTest extends TestCase { private static String[] msgs = { @@ -51,12 +45,6 @@ public class CertificateParsingExceptionTest extends TestCase { * Test for <code>CertificateParsingException()</code> constructor * Assertion: constructs CertificateParsingException with no detail message */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "CertificateParsingException", - args = {} - ) public void testCertificateParsingException01() { CertificateParsingException tE = new CertificateParsingException(); assertNull("getMessage() must return null.", tE.getMessage()); @@ -68,12 +56,6 @@ public class CertificateParsingExceptionTest extends TestCase { * Assertion: constructs CertificateParsingException with detail message * msg. Parameter <code>msg</code> is not null. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "CertificateParsingException", - args = {java.lang.String.class} - ) public void testCertificateParsingException02() { CertificateParsingException tE; for (int i = 0; i < msgs.length; i++) { @@ -89,12 +71,6 @@ public class CertificateParsingExceptionTest extends TestCase { * Assertion: constructs CertificateParsingException when <code>msg</code> * is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as a parameter.", - method = "CertificateParsingException", - args = {java.lang.String.class} - ) public void testCertificateParsingException03() { String msg = null; CertificateParsingException tE = new CertificateParsingException(msg); @@ -107,12 +83,6 @@ public class CertificateParsingExceptionTest extends TestCase { * constructor Assertion: constructs CertificateParsingException when * <code>cause</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as a parameter.", - method = "CertificateParsingException", - args = {java.lang.Throwable.class} - ) public void testCertificateParsingException04() { Throwable cause = null; CertificateParsingException tE = new CertificateParsingException(cause); @@ -125,12 +95,6 @@ public class CertificateParsingExceptionTest extends TestCase { * constructor Assertion: constructs CertificateParsingException when * <code>cause</code> is not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "CertificateParsingException", - args = {java.lang.Throwable.class} - ) public void testCertificateParsingException05() { CertificateParsingException tE = new CertificateParsingException(tCause); if (tE.getMessage() != null) { @@ -149,12 +113,6 @@ public class CertificateParsingExceptionTest extends TestCase { * constructor Assertion: constructs CertificateParsingException when * <code>cause</code> is null <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as parameters.", - method = "CertificateParsingException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testCertificateParsingException06() { CertificateParsingException tE = new CertificateParsingException(null, null); @@ -167,12 +125,6 @@ public class CertificateParsingExceptionTest extends TestCase { * constructor Assertion: constructs CertificateParsingException when * <code>cause</code> is null <code>msg</code> is not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as the second parameter.", - method = "CertificateParsingException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testCertificateParsingException07() { CertificateParsingException tE; for (int i = 0; i < msgs.length; i++) { @@ -188,12 +140,6 @@ public class CertificateParsingExceptionTest extends TestCase { * constructor Assertion: constructs CertificateParsingException when * <code>cause</code> is not null <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as the first parameter.", - method = "CertificateParsingException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testCertificateParsingException08() { CertificateParsingException tE = new CertificateParsingException(null, tCause); @@ -213,12 +159,6 @@ public class CertificateParsingExceptionTest extends TestCase { * constructor Assertion: constructs CertificateParsingException when * <code>cause</code> is not null <code>msg</code> is not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies positive functionality.", - method = "CertificateParsingException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testCertificateParsingException09() { CertificateParsingException tE; for (int i = 0; i < msgs.length; i++) { diff --git a/luni/src/test/java/tests/security/cert/CertificateTest.java b/luni/src/test/java/tests/security/cert/CertificateTest.java index 94e1b7d..1fc0c68 100644 --- a/luni/src/test/java/tests/security/cert/CertificateTest.java +++ b/luni/src/test/java/tests/security/cert/CertificateTest.java @@ -26,10 +26,6 @@ package tests.security.cert; import dalvik.annotation.AndroidOnly; import dalvik.annotation.KnownFailure; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargets; import junit.framework.TestCase; @@ -59,7 +55,6 @@ import org.apache.harmony.testframework.serialization.SerializationTest; * Tests for <code>Certificate</code> fields and methods * */ -@TestTargetClass(Certificate.class) public class CertificateTest extends TestCase { /** * Meaningless cert encoding just for testing purposes @@ -74,12 +69,6 @@ public class CertificateTest extends TestCase { /** * Test for <code>Certificate(String type)</code> method<br> */ - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "", - method = "Certificate", - args = {java.lang.String.class} - ) @AndroidOnly("Gets security providers with specific signature algorithm: " + "Security.getProviders(\"Signature.sha1WithRSAEncryption\")") public final void testCertificate() { @@ -102,12 +91,6 @@ public class CertificateTest extends TestCase { * Assertion: returns hash of the <code>Certificate</code> instance * @throws CertificateEncodingException */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "hashCode", - args = {} - ) @AndroidOnly("Gets security providers with specific signature algorithm: " + "Security.getProviders(\"Signature.sha1WithRSAEncryption\")") public final void testHashCode() throws CertificateEncodingException { @@ -125,12 +108,6 @@ public class CertificateTest extends TestCase { * Test for <code>hashCode()</code> method<br> * Assertion: hash code of equal objects should be the same */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "hashCode", - args = {} - ) @AndroidOnly("Gets security providers with specific signature algorithm: " + "Security.getProviders(\"Signature.sha1WithRSAEncryption\")") public final void testHashCodeEqualsObject() { @@ -146,12 +123,6 @@ public class CertificateTest extends TestCase { * Test for <code>getType()</code> method<br> * Assertion: returns this certificate type */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getType", - args = {} - ) @AndroidOnly("Gets security providers with specific signature algorithm: " + "Security.getProviders(\"Signature.sha1WithRSAEncryption\")") public final void testGetType() { @@ -163,12 +134,6 @@ public class CertificateTest extends TestCase { * Test #1 for <code>equals(Object)</code> method<br> * Assertion: object equals to itself */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies positive case.", - method = "equals", - args = {java.lang.Object.class} - ) @AndroidOnly("Gets security providers with specific signature algorithm: " + "Security.getProviders(\"Signature.sha1WithRSAEncryption\")") public final void testEqualsObject01() { @@ -181,12 +146,6 @@ public class CertificateTest extends TestCase { * Assertion: object equals to other <code>Certificate</code> * instance with the same state */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies positive case.", - method = "equals", - args = {java.lang.Object.class} - ) @AndroidOnly("Gets security providers with specific signature algorithm: " + "Security.getProviders(\"Signature.sha1WithRSAEncryption\")") public final void testEqualsObject02() { @@ -199,12 +158,6 @@ public class CertificateTest extends TestCase { * Test for <code>equals(Object)</code> method<br> * Assertion: object not equals to <code>null</code> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies equals method with null as a parameter.", - method = "equals", - args = {java.lang.Object.class} - ) @AndroidOnly("Gets security providers with specific signature algorithm: " + "Security.getProviders(\"Signature.sha1WithRSAEncryption\")") public final void testEqualsObject03() { @@ -217,12 +170,6 @@ public class CertificateTest extends TestCase { * Assertion: object not equals to other which is not * instance of <code>Certificate</code> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies negative case.", - method = "equals", - args = {java.lang.Object.class} - ) @AndroidOnly("Gets security providers with specific signature algorithm: " + "Security.getProviders(\"Signature.sha1WithRSAEncryption\")") public final void testEqualsObject04() { @@ -240,12 +187,6 @@ public class CertificateTest extends TestCase { * This test just calls <code>getEncoded()</code> method<br> * @throws CertificateException */ - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "Can not verify CertificateEncodingException. indirectly tested", - method = "getEncoded", - args = {} - ) @AndroidOnly("Gets security providers with specific signature algorithm: " + "Security.getProviders(\"Signature.sha1WithRSAEncryption\")") @KnownFailure("Assertion does not evaluate to true... Works in javax.Certificate") @@ -277,12 +218,6 @@ public class CertificateTest extends TestCase { * @throws NoSuchProviderException * @throws SignatureException */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies only null as a parameter.", - method = "verify", - args = {java.security.PublicKey.class} - ) @AndroidOnly("Gets security providers with specific signature algorithm: " + "Security.getProviders(\"Signature.sha1WithRSAEncryption\")") public final void testVerifyPublicKey() @@ -304,12 +239,6 @@ public class CertificateTest extends TestCase { * @throws NoSuchProviderException * @throws SignatureException */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies only null as parameters.", - method = "verify", - args = {java.security.PublicKey.class, java.lang.String.class} - ) @AndroidOnly("Gets security providers with specific signature algorithm: " + "Security.getProviders(\"Signature.sha1WithRSAEncryption\")") public final void testVerifyPublicKeyString() @@ -325,12 +254,6 @@ public class CertificateTest extends TestCase { /** * This test just calls <code>toString()</code> method<br> */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {} - ) @AndroidOnly("Gets security providers with specific signature algorithm: " + "Security.getProviders(\"Signature.sha1WithRSAEncryption\")") public final void testToString() { @@ -341,12 +264,6 @@ public class CertificateTest extends TestCase { /** * This test just calls <code>testGetPublicKey()</code> method<br> */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPublicKey", - args = {} - ) @AndroidOnly("Gets security providers with specific signature algorithm: " + "Security.getProviders(\"Signature.sha1WithRSAEncryption\")") public final void testGetPublicKey() { @@ -357,12 +274,6 @@ public class CertificateTest extends TestCase { /** * This test just calls <code>writeReplace()</code> method<br> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify ObjectStreamException.", - method = "writeReplace", - args = {} - ) @AndroidOnly("Gets security providers with specific signature algorithm: " + "Security.getProviders(\"Signature.sha1WithRSAEncryption\")") public final void testWriteReplace() { @@ -462,12 +373,6 @@ public class MyModifiablePublicKey implements PublicKey { * @throws NoSuchProviderException * @throws SignatureException */ - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "Test fails: ClassCastException when SignatureException is expected", - method = "verify", - args = {java.security.PublicKey.class, java.lang.String.class} - ) @AndroidOnly("Gets security providers with specific signature algorithm: " + "Security.getProviders(\"Signature.sha1WithRSAEncryption\")") public final void testVerifyPublicKeyString2() throws InvalidKeyException, @@ -530,12 +435,6 @@ public class MyModifiablePublicKey implements PublicKey { * @throws IOException * @throws InvalidAlgorithmParameterException */ - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "Can't test exception for cases where the algorithm is unknown", - method = "verify", - args = {java.security.PublicKey.class} - ) @AndroidOnly("Gets security providers with specific signature algorithm: " + "Security.getProviders(\"Signature.sha1WithRSAEncryption\")") public final void testVerifyPublicKey2() throws InvalidKeyException, @@ -571,12 +470,6 @@ public class MyModifiablePublicKey implements PublicKey { /** * This test just calls <code>writeReplace()</code> method<br> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "writeReplace", - args = {} - ) @AndroidOnly("Gets security providers with specific signature algorithm: " + "Security.getProviders(\"Signature.sha1WithRSAEncryption\")") public final void testWriteReplace2() { @@ -590,28 +483,8 @@ public class MyModifiablePublicKey implements PublicKey { } /** - * @tests serialization/deserialization compatibility. + * serialization/deserialization compatibility. */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Verifies serialization/deserialization compatibility. And tests default constructor", - method = "!SerializationSelf", - args = {} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "writeReplace", - args = {} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "Certificate.CertificateRep.readResolve", - args = {} - ) - }) @AndroidOnly("Gets security providers with specific signature algorithm: " + "Security.getProviders(\"Signature.sha1WithRSAEncryption\")") public void testSerializationSelf() throws Exception { @@ -621,28 +494,8 @@ public class MyModifiablePublicKey implements PublicKey { } /** - * @tests serialization/deserialization compatibility with RI. + * serialization/deserialization compatibility with RI. */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Verifies serialization/deserialization compatibility.", - method = "!SerializationGolden", - args = {} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "writeReplace", - args = {} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "Certificate.CertificateRep.readResolve", - args = {} - ) - }) @AndroidOnly("Gets security providers with specific signature algorithm: " + "Security.getProviders(\"Signature.sha1WithRSAEncryption\")") public void testSerializationCompatibility() throws Exception { diff --git a/luni/src/test/java/tests/security/cert/CollectionCertStoreParametersTest.java b/luni/src/test/java/tests/security/cert/CollectionCertStoreParametersTest.java index b194c70..9e98c16 100644 --- a/luni/src/test/java/tests/security/cert/CollectionCertStoreParametersTest.java +++ b/luni/src/test/java/tests/security/cert/CollectionCertStoreParametersTest.java @@ -22,11 +22,6 @@ package tests.security.cert; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.security.cert.CertStoreParameters; @@ -40,7 +35,6 @@ import org.apache.harmony.security.tests.support.cert.MyCertificate; /** * Tests for <code>CollectionCertStoreParameters</code>. */ -@TestTargetClass(CollectionCertStoreParameters.class) public class CollectionCertStoreParametersTest extends TestCase { // @@ -50,12 +44,6 @@ public class CollectionCertStoreParametersTest extends TestCase { /** * Test #1 for <code>CollectionCertStoreParameters()</code> constructor<br> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "CollectionCertStoreParameters", - args = {} - ) public final void testCollectionCertStoreParameters01() { CertStoreParameters cp = new CollectionCertStoreParameters(); assertTrue("isCollectionCertStoreParameters", @@ -65,12 +53,6 @@ public class CollectionCertStoreParametersTest extends TestCase { /** * Test #2 for <code>CollectionCertStoreParameters</code> constructor<br> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "CollectionCertStoreParameters", - args = {} - ) @SuppressWarnings("unchecked") public final void testCollectionCertStoreParameters02() { CollectionCertStoreParameters cp = new CollectionCertStoreParameters(); @@ -90,12 +72,6 @@ public class CollectionCertStoreParametersTest extends TestCase { * Test #1 for <code>CollectionCertStoreParameters(Collection)</code> * constructor<br> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "CollectionCertStoreParameters", - args = {java.util.Collection.class} - ) public final void testCollectionCertStoreParametersCollection01() { Vector<Certificate> certificates = new Vector<Certificate>(); certificates.add(new MyCertificate("TEST", new byte[] {})); @@ -106,12 +82,6 @@ public class CollectionCertStoreParametersTest extends TestCase { * Test #2 for <code>CollectionCertStoreParameters(Collection)</code> * constructor<br> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "CollectionCertStoreParameters", - args = {java.util.Collection.class} - ) public final void testCollectionCertStoreParametersCollection02() { // just check that we able to create CollectionCertStoreParameters // object passing Collection containing Object which is not @@ -125,12 +95,6 @@ public class CollectionCertStoreParametersTest extends TestCase { * Test #3 for <code>CollectionCertStoreParameters(Collection)</code> * constructor<br> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "CollectionCertStoreParameters", - args = {java.util.Collection.class} - ) public final void testCollectionCertStoreParametersCollection03() { Vector<Certificate> certificates = new Vector<Certificate>(); // create using empty collection @@ -151,12 +115,6 @@ public class CollectionCertStoreParametersTest extends TestCase { * Test #4 for <code>CollectionCertStoreParameters(Collection)</code> * constructor<br> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as a parameter.", - method = "CollectionCertStoreParameters", - args = {java.util.Collection.class} - ) public final void testCollectionCertStoreParametersCollection04() { try { new CollectionCertStoreParameters(null); @@ -168,12 +126,6 @@ public class CollectionCertStoreParametersTest extends TestCase { /** * Test #1 for <code>clone()</code> method<br> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "clone", - args = {} - ) public final void testClone01() { Vector<Certificate> certificates = new Vector<Certificate>(); certificates.add(new MyCertificate("TEST", new byte[] {(byte)4})); @@ -188,12 +140,6 @@ public class CollectionCertStoreParametersTest extends TestCase { /** * Test #2 for <code>clone()</code> method<br> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "clone", - args = {} - ) public final void testClone02() { Vector<Certificate> certificates = new Vector<Certificate>(); certificates.add(new MyCertificate("TEST", new byte[] {(byte)4})); @@ -208,12 +154,6 @@ public class CollectionCertStoreParametersTest extends TestCase { /** * Test #3 for <code>clone()</code> method<br> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "clone", - args = {} - ) public final void testClone03() { CollectionCertStoreParameters cp1 = new CollectionCertStoreParameters(); @@ -229,12 +169,6 @@ public class CollectionCertStoreParametersTest extends TestCase { /** * Test #1 for <code>toString()</code> method<br> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "toString", - args = {} - ) public final void testToString01() { CollectionCertStoreParameters cp = new CollectionCertStoreParameters(); @@ -245,12 +179,6 @@ public class CollectionCertStoreParametersTest extends TestCase { /** * Test #2 for <code>toString()</code> method<br> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "toString", - args = {} - ) public final void testToString02() { Vector<Certificate> certificates = new Vector<Certificate>(); certificates.add(new MyCertificate("TEST", new byte[] {(byte)4})); @@ -263,12 +191,6 @@ public class CollectionCertStoreParametersTest extends TestCase { /** * Test #1 for <code>getCollection()</code> method<br> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getCollection", - args = {} - ) public final void testGetCollection01() { CollectionCertStoreParameters cp = new CollectionCertStoreParameters(); assertNotNull(cp.getCollection()); @@ -277,12 +199,6 @@ public class CollectionCertStoreParametersTest extends TestCase { /** * Test #2 for <code>getCollection()</code> method<br> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getCollection", - args = {} - ) public final void testGetCollection02() { Vector certificates = new Vector(); CollectionCertStoreParameters cp = diff --git a/luni/src/test/java/tests/security/cert/LDAPCertStoreParametersTest.java b/luni/src/test/java/tests/security/cert/LDAPCertStoreParametersTest.java index 0a317dc..1963f30 100644 --- a/luni/src/test/java/tests/security/cert/LDAPCertStoreParametersTest.java +++ b/luni/src/test/java/tests/security/cert/LDAPCertStoreParametersTest.java @@ -22,11 +22,6 @@ package tests.security.cert; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.security.cert.CertStoreParameters; @@ -37,7 +32,6 @@ import java.security.cert.LDAPCertStoreParameters; * fields and methods * */ -@TestTargetClass(LDAPCertStoreParameters.class) public class LDAPCertStoreParametersTest extends TestCase { // @@ -49,12 +43,6 @@ public class LDAPCertStoreParametersTest extends TestCase { * Assertion: Creates an instance of <code>LDAPCertStoreParameters</code> * with the default parameter values (server name "localhost", port 389) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "LDAPCertStoreParameters", - args = {} - ) public final void testLDAPCertStoreParameters01() { CertStoreParameters cp = new LDAPCertStoreParameters(); assertTrue("isLDAPCertStoreParameters", @@ -66,12 +54,6 @@ public class LDAPCertStoreParametersTest extends TestCase { * Assertion: Creates an instance of <code>LDAPCertStoreParameters</code> * with the default parameter values (server name "localhost", port 389) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "LDAPCertStoreParameters", - args = {} - ) public final void testLDAPCertStoreParameters02() { LDAPCertStoreParameters cp = new LDAPCertStoreParameters(); assertEquals("host", "localhost", cp.getServerName()); @@ -83,12 +65,6 @@ public class LDAPCertStoreParametersTest extends TestCase { * Assertion: Creates an instance of <code>LDAPCertStoreParameters</code> * with the specified server name and a default port of 389 */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "LDAPCertStoreParameters", - args = {java.lang.String.class} - ) public final void testLDAPCertStoreParametersString01() { CertStoreParameters cp = new LDAPCertStoreParameters("myhost"); assertTrue("isLDAPCertStoreParameters", @@ -100,12 +76,6 @@ public class LDAPCertStoreParametersTest extends TestCase { * Assertion: Creates an instance of <code>LDAPCertStoreParameters</code> * with the specified server name and a default port of 389 */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "LDAPCertStoreParameters", - args = {java.lang.String.class} - ) public final void testLDAPCertStoreParametersString02() { String serverName = "myhost"; LDAPCertStoreParameters cp = new LDAPCertStoreParameters(serverName); @@ -118,12 +88,6 @@ public class LDAPCertStoreParametersTest extends TestCase { * Assertion: throws <code>NullPointerException</code> - * if <code>serverName</code> is <code>null</code> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException.", - method = "LDAPCertStoreParameters", - args = {java.lang.String.class} - ) public final void testLDAPCertStoreParametersString03() { try { new LDAPCertStoreParameters(null); @@ -137,12 +101,6 @@ public class LDAPCertStoreParametersTest extends TestCase { * Assertion: Creates an instance of <code>LDAPCertStoreParameters</code> * with the specified parameter values */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "LDAPCertStoreParameters", - args = {java.lang.String.class, int.class} - ) public final void testLDAPCertStoreParametersStringint01() { CertStoreParameters cp = new LDAPCertStoreParameters("myhost", 1098); assertTrue("isLDAPCertStoreParameters", @@ -154,12 +112,6 @@ public class LDAPCertStoreParametersTest extends TestCase { * Assertion: Creates an instance of <code>LDAPCertStoreParameters</code> * with the specified parameter values */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "LDAPCertStoreParameters", - args = {java.lang.String.class, int.class} - ) public final void testLDAPCertStoreParametersStringint02() { String serverName = "myhost"; int portNumber = 1099; @@ -174,12 +126,6 @@ public class LDAPCertStoreParametersTest extends TestCase { * Assertion: throws <code>NullPointerException</code> - * if <code>serverName</code> is <code>null</code> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException.", - method = "LDAPCertStoreParameters", - args = {java.lang.String.class, int.class} - ) public final void testLDAPCertStoreParametersStringint03() { try { new LDAPCertStoreParameters(null, 0); @@ -202,12 +148,6 @@ public class LDAPCertStoreParametersTest extends TestCase { * Test for <code>clone()</code> method<br> * Assertion: Returns a copy of this object */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "clone", - args = {} - ) public final void testClone() { LDAPCertStoreParameters cp1 = new LDAPCertStoreParameters("myhost", 1100); @@ -223,12 +163,6 @@ public class LDAPCertStoreParametersTest extends TestCase { * Test for <code>toString()</code> method<br> * Assertion: returns the formatted string describing parameters */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {} - ) public final void testToString() { LDAPCertStoreParameters cp1 = new LDAPCertStoreParameters("myhost", 1101); @@ -240,12 +174,6 @@ public class LDAPCertStoreParametersTest extends TestCase { * Test for <code>toString()</code> method<br> * Assertion: returns the port number */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPort", - args = {} - ) public final void testGetPort() { int portNumber = -1099; LDAPCertStoreParameters cp = @@ -257,12 +185,6 @@ public class LDAPCertStoreParametersTest extends TestCase { * Test for <code>toString()</code> method<br> * Assertion: returns the server name (never <code>null</code>) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getServerName", - args = {} - ) public final void testGetServerName() { LDAPCertStoreParameters cp = new LDAPCertStoreParameters("serverName"); diff --git a/luni/src/test/java/tests/security/cert/PKIXBuilderParametersTest.java b/luni/src/test/java/tests/security/cert/PKIXBuilderParametersTest.java index 2ef5c0c..f5e3538 100644 --- a/luni/src/test/java/tests/security/cert/PKIXBuilderParametersTest.java +++ b/luni/src/test/java/tests/security/cert/PKIXBuilderParametersTest.java @@ -22,11 +22,6 @@ package tests.security.cert; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.io.ByteArrayInputStream; @@ -49,7 +44,6 @@ import org.apache.harmony.security.tests.support.cert.TestUtils; * Tests for <code>PKIXBuilderParameters</code> fields and methods * */ -@TestTargetClass(PKIXBuilderParameters.class) public class PKIXBuilderParametersTest extends TestCase { String certificate = "-----BEGIN CERTIFICATE-----\n" + "MIICZTCCAdICBQL3AAC2MA0GCSqGSIb3DQEBAgUAMF8xCzAJBgNVBAYTAlVTMSAw\n" @@ -89,12 +83,6 @@ public class PKIXBuilderParametersTest extends TestCase { * Assertion: creates an instance of <code>PKIXBuilderParameters</code> * @throws InvalidAlgorithmParameterException */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies positive case.", - method = "PKIXBuilderParameters", - args = {java.util.Set.class, java.security.cert.CertSelector.class} - ) public final void testPKIXBuilderParametersSetCertSelector01() throws InvalidAlgorithmParameterException { Set<TrustAnchor> taSet = TestUtils.getTrustAnchorSet(); @@ -114,12 +102,6 @@ public class PKIXBuilderParametersTest extends TestCase { * Assertion: creates an instance of <code>PKIXBuilderParameters</code> * @throws InvalidAlgorithmParameterException */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as a CertSelector parameter.", - method = "PKIXBuilderParameters", - args = {java.util.Set.class, java.security.cert.CertSelector.class} - ) public final void testPKIXBuilderParametersSetCertSelector02() throws InvalidAlgorithmParameterException { Set<TrustAnchor> taSet = TestUtils.getTrustAnchorSet(); @@ -139,12 +121,6 @@ public class PKIXBuilderParametersTest extends TestCase { * subsequent modifications * @throws InvalidAlgorithmParameterException */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as a CertSelector parameter.", - method = "PKIXBuilderParameters", - args = {java.util.Set.class, java.security.cert.CertSelector.class} - ) @SuppressWarnings("unchecked") public final void testPKIXBuilderParametersSetCertSelector03() throws InvalidAlgorithmParameterException { @@ -172,12 +148,6 @@ public class PKIXBuilderParametersTest extends TestCase { * Assertion: <code>NullPointerException</code> - * if the specified <code>Set</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as parameters.", - method = "PKIXBuilderParameters", - args = {java.util.Set.class, java.security.cert.CertSelector.class} - ) public final void testPKIXBuilderParametersSetCertSelector04() throws Exception { try { // pass null @@ -194,12 +164,6 @@ public class PKIXBuilderParametersTest extends TestCase { * if the specified <code>Set</code> is empty * (<code>trustAnchors.isEmpty() == true</code>) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as a parameter.", - method = "PKIXBuilderParameters", - args = {java.util.Set.class, java.security.cert.CertSelector.class} - ) public final void testPKIXBuilderParametersSetCertSelector05() { try { // use empty set @@ -215,12 +179,6 @@ public class PKIXBuilderParametersTest extends TestCase { * Assertion: <code>NullPointerException</code> - if the * <code>keystore</code> is <code>null</code> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Veirifies null as a KeyStore parameter.", - method = "PKIXBuilderParameters", - args = {java.security.KeyStore.class, java.security.cert.CertSelector.class} - ) public final void testPKIXBuilderParametersKeyStoreCertSelector01() throws Exception { try { @@ -237,12 +195,6 @@ public class PKIXBuilderParametersTest extends TestCase { * Assertion: <code>KeyStoreException</code> - if the * <code>keystore</code> has not been initialized */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Veirifies null as a CertSelector parameter.", - method = "PKIXBuilderParameters", - args = {java.security.KeyStore.class, java.security.cert.CertSelector.class} - ) public final void testPKIXBuilderParametersKeyStoreCertSelector02() throws Exception { KeyStore keyTest = KeyStore.getInstance(KeyStore.getDefaultType()); @@ -261,12 +213,6 @@ public class PKIXBuilderParametersTest extends TestCase { * <code>keystore</code> does not contain at least one trusted certificate * entry */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as parameters.", - method = "PKIXBuilderParameters", - args = {java.security.KeyStore.class, java.security.cert.CertSelector.class} - ) public final void testPKIXBuilderParametersKeyStoreCertSelector03() throws Exception { KeyStore keyTest = KeyStore.getInstance(KeyStore.getDefaultType()); @@ -285,12 +231,6 @@ public class PKIXBuilderParametersTest extends TestCase { * Assertion: <code>NullPointerException</code> - * if the <code>keystore</code> is <code>null</code> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies positive case.", - method = "PKIXBuilderParameters", - args = {java.security.KeyStore.class, java.security.cert.CertSelector.class} - ) public final void testPKIXBuilderParametersKeyStoreCertSelector04() throws Exception { KeyStore keyTest = KeyStore.getInstance(KeyStore.getDefaultType()); @@ -323,12 +263,6 @@ public class PKIXBuilderParametersTest extends TestCase { /** * Test for <code>getMaxPathLength()</code> */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getMaxPathLength", - args = {} - ) public final void testGetMaxPathLength() throws Exception { KeyStore keyTest = KeyStore.getInstance(KeyStore.getDefaultType()); keyTest.load(null, null); @@ -357,12 +291,6 @@ public class PKIXBuilderParametersTest extends TestCase { /** * Test for <code>setMaxPathLength()</code> */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setMaxPathLength", - args = {int.class} - ) public final void testSetMaxPathLength() throws Exception { KeyStore keyTest = KeyStore.getInstance(KeyStore.getDefaultType()); keyTest.load(null, null); @@ -406,12 +334,6 @@ public class PKIXBuilderParametersTest extends TestCase { /** * Test for <code>toString()</code> */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {} - ) public final void testToString() throws Exception { KeyStore keyTest = KeyStore.getInstance(KeyStore.getDefaultType()); keyTest.load(null, null); diff --git a/luni/src/test/java/tests/security/cert/PKIXCertPathBuilderResultTest.java b/luni/src/test/java/tests/security/cert/PKIXCertPathBuilderResultTest.java index 2cb6891..e9b14b2 100644 --- a/luni/src/test/java/tests/security/cert/PKIXCertPathBuilderResultTest.java +++ b/luni/src/test/java/tests/security/cert/PKIXCertPathBuilderResultTest.java @@ -22,10 +22,6 @@ package tests.security.cert; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; - import junit.framework.TestCase; import org.apache.harmony.security.tests.support.cert.MyCertPath; @@ -43,7 +39,6 @@ import java.security.spec.InvalidKeySpecException; * Tests for <code>PKIXCertPathBuilderResult</code> * */ -@TestTargetClass(PKIXCertPathBuilderResult.class) public class PKIXCertPathBuilderResultTest extends TestCase { /** * Cert path encoding stub @@ -81,11 +76,6 @@ public class PKIXCertPathBuilderResultTest extends TestCase { * @throws NoSuchAlgorithmException * @throws InvalidKeySpecException */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - method = "PKIXCertPathBuilderResult", - args = {java.security.cert.CertPath.class, java.security.cert.TrustAnchor.class, java.security.cert.PolicyNode.class, java.security.PublicKey.class} - ) public final void testPKIXCertPathBuilderResult01() throws InvalidKeySpecException, NoSuchAlgorithmException { @@ -109,11 +99,6 @@ public class PKIXCertPathBuilderResultTest extends TestCase { * @throws NoSuchAlgorithmException * @throws InvalidKeySpecException */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - method = "PKIXCertPathBuilderResult", - args = {java.security.cert.CertPath.class, java.security.cert.TrustAnchor.class, java.security.cert.PolicyNode.class, java.security.PublicKey.class} - ) public final void testPKIXCertPathBuilderResult02() throws InvalidKeySpecException, NoSuchAlgorithmException { @@ -136,11 +121,6 @@ public class PKIXCertPathBuilderResultTest extends TestCase { * Assertion: <code>NullPointerException</code> * if certPath is <code>null</code> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - method = "PKIXCertPathBuilderResult", - args = {java.security.cert.CertPath.class, java.security.cert.TrustAnchor.class, java.security.cert.PolicyNode.class, java.security.PublicKey.class} - ) public final void testPKIXCertPathBuilderResult03() { TrustAnchor ta = TestUtils.getTrustAnchor(); if (ta == null) { @@ -165,11 +145,6 @@ public class PKIXCertPathBuilderResultTest extends TestCase { * Assertion: <code>NullPointerException</code> * if trustAnchor is <code>null</code> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - method = "PKIXCertPathBuilderResult", - args = {java.security.cert.CertPath.class, java.security.cert.TrustAnchor.class, java.security.cert.PolicyNode.class, java.security.PublicKey.class} - ) public final void testPKIXCertPathBuilderResult04() { try { // pass null @@ -189,11 +164,6 @@ public class PKIXCertPathBuilderResultTest extends TestCase { * Assertion: <code>NullPointerException</code> * if publicKey is <code>null</code> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - method = "PKIXCertPathBuilderResult", - args = {java.security.cert.CertPath.class, java.security.cert.TrustAnchor.class, java.security.cert.PolicyNode.class, java.security.PublicKey.class} - ) public final void testPKIXCertPathBuilderResult05() { TrustAnchor ta = TestUtils.getTrustAnchor(); if (ta == null) { @@ -211,12 +181,6 @@ public class PKIXCertPathBuilderResultTest extends TestCase { } catch (NullPointerException e) { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "clone", - args = {} - ) public final void test_clone() { // Regression for HARMONY-2786. @@ -243,12 +207,6 @@ public class PKIXCertPathBuilderResultTest extends TestCase { * @throws NoSuchAlgorithmException * @throws InvalidKeySpecException */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getCertPath", - args = {} - ) public final void testGetCertPath() throws Exception { TrustAnchor ta = TestUtils.getTrustAnchor(); if (ta == null) { @@ -274,12 +232,6 @@ public class PKIXCertPathBuilderResultTest extends TestCase { * @throws NoSuchAlgorithmException * @throws InvalidKeySpecException */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {} - ) public final void testToString() throws InvalidKeySpecException, NoSuchAlgorithmException { diff --git a/luni/src/test/java/tests/security/cert/PKIXCertPathCheckerTest.java b/luni/src/test/java/tests/security/cert/PKIXCertPathCheckerTest.java index 8376e5f..44a2fa4 100644 --- a/luni/src/test/java/tests/security/cert/PKIXCertPathCheckerTest.java +++ b/luni/src/test/java/tests/security/cert/PKIXCertPathCheckerTest.java @@ -22,11 +22,6 @@ package tests.security.cert; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.security.cert.CertPathValidatorException; @@ -43,18 +38,11 @@ import org.apache.harmony.security.tests.support.cert.TestUtils; * Tests for <code>PKIXCertPathChecker</code> * */ -@TestTargetClass(PKIXCertPathChecker.class) public class PKIXCertPathCheckerTest extends TestCase { // // Tests // - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "PKIXCertPathChecker", - args = {} - ) public final void testConstructor() { try { new MyPKIXCertPathChecker(); @@ -62,12 +50,6 @@ public class PKIXCertPathCheckerTest extends TestCase { fail("Unexpected exception " + e.getMessage()); } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "clone", - args = {} - ) public final void testClone() { PKIXCertPathChecker pc1 = TestUtils.getTestCertPathChecker(); PKIXCertPathChecker pc2 = (PKIXCertPathChecker) pc1.clone(); @@ -79,43 +61,19 @@ public class PKIXCertPathCheckerTest extends TestCase { // that are abstract in <code>PKIXCertPathChecker</code> // (So they just like signature tests) // - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "isForwardCheckingSupported", - args = {} - ) public final void testIsForwardCheckingSupported() { PKIXCertPathChecker pc = TestUtils.getTestCertPathChecker(); pc.isForwardCheckingSupported(); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "init", - args = {boolean.class} - ) public final void testInit() throws CertPathValidatorException { PKIXCertPathChecker pc = TestUtils.getTestCertPathChecker(); pc.init(true); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSupportedExtensions", - args = {} - ) public final void testGetSupportedExtensions() { PKIXCertPathChecker pc = TestUtils.getTestCertPathChecker(); pc.getSupportedExtensions(); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "check", - args = {java.security.cert.Certificate.class, java.util.Collection.class} - ) public final void testCheck() throws CertPathValidatorException { PKIXCertPathChecker pc = TestUtils.getTestCertPathChecker(); pc.check(new MyCertificate("", null), new HashSet<String>()); diff --git a/luni/src/test/java/tests/security/cert/PKIXCertPathValidatorResultTest.java b/luni/src/test/java/tests/security/cert/PKIXCertPathValidatorResultTest.java index c3de8dd..d578b53 100644 --- a/luni/src/test/java/tests/security/cert/PKIXCertPathValidatorResultTest.java +++ b/luni/src/test/java/tests/security/cert/PKIXCertPathValidatorResultTest.java @@ -22,11 +22,6 @@ package tests.security.cert; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.security.NoSuchAlgorithmException; @@ -42,7 +37,6 @@ import org.apache.harmony.security.tests.support.cert.TestUtils; * Tests for <code>PKIXCertPathValidatorResult</code> * */ -@TestTargetClass(PKIXCertPathValidatorResult.class) public class PKIXCertPathValidatorResultTest extends TestCase { /** * PublicKey stub @@ -73,12 +67,6 @@ public class PKIXCertPathValidatorResultTest extends TestCase { * @throws NoSuchAlgorithmException * @throws InvalidKeySpecException */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify NullPointerException.", - method = "PKIXCertPathValidatorResult", - args = {java.security.cert.TrustAnchor.class, java.security.cert.PolicyNode.class, java.security.PublicKey.class} - ) public final void testPKIXCertPathValidatorResult01() throws InvalidKeySpecException, NoSuchAlgorithmException { @@ -98,12 +86,6 @@ public class PKIXCertPathValidatorResultTest extends TestCase { * Assertion: <code>NullPointerException</code> if * <code>TrustAnchor</code> parameter is <code>null</code> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException.", - method = "PKIXCertPathValidatorResult", - args = {java.security.cert.TrustAnchor.class, java.security.cert.PolicyNode.class, java.security.PublicKey.class} - ) public final void testPKIXCertPathValidatorResult02() { try { // pass null @@ -122,12 +104,6 @@ public class PKIXCertPathValidatorResultTest extends TestCase { * Assertion: <code>NullPointerException</code> if * <code>PublicKey</code> parameter is <code>null</code> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException.", - method = "PKIXCertPathValidatorResult", - args = {java.security.cert.TrustAnchor.class, java.security.cert.PolicyNode.class, java.security.PublicKey.class} - ) public final void testPKIXCertPathValidatorResult03() { TrustAnchor ta = TestUtils.getTrustAnchor(); if (ta == null) { @@ -149,12 +125,6 @@ public class PKIXCertPathValidatorResultTest extends TestCase { * PolicyNode, PublicKey)</code> constructor<br> * Assertion: <code>PolicyNode</code>can be <code>null</code> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as a parameter.", - method = "PKIXCertPathValidatorResult", - args = {java.security.cert.TrustAnchor.class, java.security.cert.PolicyNode.class, java.security.PublicKey.class} - ) public final void testPKIXCertPathValidatorResult04() throws Exception { TrustAnchor ta = TestUtils.getTrustAnchor(); if (ta == null) { @@ -173,12 +143,6 @@ public class PKIXCertPathValidatorResultTest extends TestCase { * @throws NoSuchAlgorithmException * @throws InvalidKeySpecException */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getTrustAnchor", - args = {} - ) public final void testGetTrustAnchor() throws Exception { TrustAnchor ta = TestUtils.getTrustAnchor(); if (ta == null) { @@ -202,12 +166,6 @@ public class PKIXCertPathValidatorResultTest extends TestCase { * @throws NoSuchAlgorithmException * @throws InvalidKeySpecException */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPublicKey", - args = {} - ) public final void testGetPublicKey() throws Exception { TrustAnchor ta = TestUtils.getTrustAnchor(); if (ta == null) { @@ -234,12 +192,6 @@ public class PKIXCertPathValidatorResultTest extends TestCase { * @throws NoSuchAlgorithmException * @throws InvalidKeySpecException */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that getPolicyTree method returns the root node of the valid policy tree.", - method = "getPolicyTree", - args = {} - ) public final void testGetPolicyTree01() throws Exception { TrustAnchor ta = TestUtils.getTrustAnchor(); if (ta == null) { @@ -267,12 +219,6 @@ public class PKIXCertPathValidatorResultTest extends TestCase { * @throws NoSuchAlgorithmException * @throws InvalidKeySpecException */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that getPolicyTree method returns null if there are no valid policies.", - method = "getPolicyTree", - args = {} - ) public final void testGetPolicyTree02() throws Exception { TrustAnchor ta = TestUtils.getTrustAnchor(); if (ta == null) { @@ -297,12 +243,6 @@ public class PKIXCertPathValidatorResultTest extends TestCase { * @throws NoSuchAlgorithmException * @throws InvalidKeySpecException */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "clone", - args = {} - ) public final void testClone() throws Exception { TrustAnchor ta = TestUtils.getTrustAnchor(); if (ta == null) { @@ -354,12 +294,6 @@ public class PKIXCertPathValidatorResultTest extends TestCase { * @throws NoSuchAlgorithmException * @throws InvalidKeySpecException */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {} - ) public final void testToString01() throws Exception { TrustAnchor ta = TestUtils.getTrustAnchor(); if (ta == null) { @@ -381,12 +315,6 @@ public class PKIXCertPathValidatorResultTest extends TestCase { * @throws NoSuchAlgorithmException * @throws InvalidKeySpecException */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {} - ) public final void testToString02() throws Exception { TrustAnchor ta = TestUtils.getTrustAnchor(); if (ta == null) { diff --git a/luni/src/test/java/tests/security/cert/PolicyQualifierInfoTest.java b/luni/src/test/java/tests/security/cert/PolicyQualifierInfoTest.java index 4f7fbfc..a89c063 100644 --- a/luni/src/test/java/tests/security/cert/PolicyQualifierInfoTest.java +++ b/luni/src/test/java/tests/security/cert/PolicyQualifierInfoTest.java @@ -21,11 +21,6 @@ package tests.security.cert; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.io.IOException; @@ -36,7 +31,6 @@ import java.util.Arrays; * PolicyQualifierInfo test * */ -@TestTargetClass(PolicyQualifierInfo.class) public class PolicyQualifierInfoTest extends TestCase { @@ -46,12 +40,6 @@ public class PolicyQualifierInfoTest extends TestCase { * parameter does not represent a valid and parsable policy * qualifier info */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException and IOException.", - method = "PolicyQualifierInfo", - args = {byte[].class} - ) public final void test_Ctor() throws IOException { try { // pass null @@ -84,12 +72,6 @@ public class PolicyQualifierInfoTest extends TestCase { * parameter does not represent a valid and parsable policy * qualifier info */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies IOException.", - method = "PolicyQualifierInfo", - args = {byte[].class} - ) public final void testPolicyQualifierInfo02() { // get valid encoding byte[] encoding = getDerEncoding(); @@ -124,12 +106,6 @@ public class PolicyQualifierInfoTest extends TestCase { * * @throws IOException */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "PolicyQualifierInfo", - args = {byte[].class} - ) public final void testPolicyQualifierInfo03() throws IOException { // get valid encoding byte[] encoding = getDerEncoding(); @@ -143,12 +119,6 @@ public class PolicyQualifierInfoTest extends TestCase { * * @throws IOException */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies constructor with encoded byte array copied on construction.", - method = "PolicyQualifierInfo", - args = {byte[].class} - ) public final void testPolicyQualifierInfo04() throws IOException { // get valid encoding byte[] encoding = getDerEncoding(); @@ -175,12 +145,6 @@ public class PolicyQualifierInfoTest extends TestCase { * * @throws IOException */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getEncoded", - args = {} - ) public final void testGetEncoded01() throws IOException { // get valid encoding byte[] encoding = getDerEncoding(); @@ -198,12 +162,6 @@ public class PolicyQualifierInfoTest extends TestCase { * * @throws IOException */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getEncoded", - args = {} - ) public final void testGetEncoded02() throws IOException { // get valid encoding byte[] encoding = getDerEncoding(); @@ -228,12 +186,6 @@ public class PolicyQualifierInfoTest extends TestCase { * * @throws IOException */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPolicyQualifier", - args = {} - ) public final void testGetPolicyQualifier01() throws IOException { // get valid encoding byte[] encoding = getDerEncoding(); @@ -254,12 +206,6 @@ public class PolicyQualifierInfoTest extends TestCase { * * @throws IOException */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPolicyQualifier", - args = {} - ) public final void testGetPolicyQualifier02() throws IOException { // get valid encoding byte[] encoding = getDerEncoding(); @@ -290,12 +236,6 @@ public class PolicyQualifierInfoTest extends TestCase { * * @throws IOException */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPolicyQualifierId", - args = {} - ) public final void testGetPolicyQualifierId() throws IOException { // get valid encoding byte[] encoding = getDerEncoding(); @@ -324,12 +264,6 @@ public class PolicyQualifierInfoTest extends TestCase { * * @throws IOException */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {} - ) public final void testToString() throws IOException { // get valid encoding byte[] encoding = getDerEncoding(); diff --git a/luni/src/test/java/tests/security/cert/TrustAnchorTest.java b/luni/src/test/java/tests/security/cert/TrustAnchorTest.java index 49f188f..76324f0 100644 --- a/luni/src/test/java/tests/security/cert/TrustAnchorTest.java +++ b/luni/src/test/java/tests/security/cert/TrustAnchorTest.java @@ -22,10 +22,6 @@ package tests.security.cert; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; - import junit.framework.TestCase; import org.apache.harmony.security.tests.support.TestCertUtils; @@ -46,7 +42,6 @@ import javax.security.auth.x500.X500Principal; /** * Unit tests for <code>TrustAnchor</code> */ -@TestTargetClass(TrustAnchor.class) public class TrustAnchorTest extends TestCase { private static final String keyAlg = "DSA"; // Sample of some valid CA name @@ -65,12 +60,6 @@ public class TrustAnchorTest extends TestCase { * Expected: must pass without any exceptions * @throws InvalidKeySpecException */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "TrustAnchor", - args = {java.lang.String.class, java.security.PublicKey.class, byte[].class} - ) public final void testTrustAnchorStringPublicKeybyteArray01() throws Exception { @@ -93,12 +82,6 @@ public class TrustAnchorTest extends TestCase { * Expected: must pass without any exceptions * @throws InvalidKeySpecException */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as a parameter.", - method = "TrustAnchor", - args = {java.lang.String.class, java.security.PublicKey.class, byte[].class} - ) public final void testTrustAnchorStringPublicKeybyteArray02() throws Exception { @@ -114,12 +97,6 @@ public class TrustAnchorTest extends TestCase { * Expected: modification must not change object internal state * @throws InvalidKeySpecException */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies positive case.", - method = "TrustAnchor", - args = {java.lang.String.class, java.security.PublicKey.class, byte[].class} - ) public final void testTrustAnchorStringPublicKeybyteArray03() throws Exception { @@ -143,12 +120,6 @@ public class TrustAnchorTest extends TestCase { * Test preconditions: pass <code>null</code> as mentioned parameter<br> * Expected: NullPointerException */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies exceptions.", - method = "TrustAnchor", - args = {java.lang.String.class, java.security.PublicKey.class, byte[].class} - ) public final void testTrustAnchorStringPublicKeybyteArray04() throws Exception { @@ -197,12 +168,6 @@ public class TrustAnchorTest extends TestCase { * Expected: must pass without any exceptions * @throws InvalidKeySpecException */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies positive case.", - method = "TrustAnchor", - args = {javax.security.auth.x500.X500Principal.class, java.security.PublicKey.class, byte[].class} - ) public final void testTrustAnchorX500PrincipalPublicKeybyteArray01() throws Exception { @@ -226,12 +191,6 @@ public class TrustAnchorTest extends TestCase { * Expected: must pass without any exceptions * @throws InvalidKeySpecException */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as a parameter.", - method = "TrustAnchor", - args = {javax.security.auth.x500.X500Principal.class, java.security.PublicKey.class, byte[].class} - ) public final void testTrustAnchorX500PrincipalPublicKeybyteArray02() throws Exception { @@ -249,12 +208,6 @@ public class TrustAnchorTest extends TestCase { * Expected: modification must not change object internal state * @throws InvalidKeySpecException */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies TrustAnchor with copied byte array.", - method = "TrustAnchor", - args = {javax.security.auth.x500.X500Principal.class, java.security.PublicKey.class, byte[].class} - ) public final void testTrustAnchorX500PrincipalPublicKeybyteArray03() throws Exception { @@ -280,12 +233,6 @@ public class TrustAnchorTest extends TestCase { * Expected: NullPointerException * @throws InvalidKeySpecException */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException.", - method = "TrustAnchor", - args = {javax.security.auth.x500.X500Principal.class, java.security.PublicKey.class, byte[].class} - ) public final void testTrustAnchorX500PrincipalPublicKeybyteArray04() throws Exception { @@ -324,12 +271,6 @@ public class TrustAnchorTest extends TestCase { * Test preconditions: valid parameters passed<br> * Expected: must pass without any exceptions */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies positive case.", - method = "TrustAnchor", - args = {java.security.cert.X509Certificate.class, byte[].class} - ) public final void testTrustAnchorX509CertificatebyteArray01() throws CertificateException { @@ -379,12 +320,6 @@ public class TrustAnchorTest extends TestCase { * Test preconditions: <code>null</code> as X509Certificate passed<br> * Expected: <code>NullPointerException</code> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException.", - method = "TrustAnchor", - args = {java.security.cert.X509Certificate.class, byte[].class} - ) public final void testTrustAnchorX509CertificatebyteArray02() throws Exception { @@ -403,12 +338,6 @@ public class TrustAnchorTest extends TestCase { * Test preconditions: <code>null</code> as nameConstraints passed<br> * Expected: must pass without any exceptions */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies constructor with null as nameConstraints parameter.", - method = "TrustAnchor", - args = {java.security.cert.X509Certificate.class, byte[].class} - ) public final void testTrustAnchorX509CertificatebyteArray03() throws Exception { CertificateFactory certFact = CertificateFactory.getInstance("X509"); @@ -431,12 +360,6 @@ public class TrustAnchorTest extends TestCase { * IllegalArgumentException * */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies IllegalArgumentException.", - method = "TrustAnchor", - args = {java.security.cert.X509Certificate.class, byte[].class} - ) public final void testTrustAnchorX509CertificatebyteArray04() throws Exception { @@ -461,12 +384,6 @@ public class TrustAnchorTest extends TestCase { * Test preconditions: both parameters are passed as null<br> * Expected: <code>NullPointerException</code> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException.", - method = "TrustAnchor", - args = {java.security.cert.X509Certificate.class, byte[].class} - ) public final void testTrustAnchorX509CertificatebyteArray05() throws Exception { @@ -486,12 +403,6 @@ public class TrustAnchorTest extends TestCase { * Expected: the same name must be returned by the method<br> * */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getCAPublicKey", - args = {} - ) public final void testGetCAPublicKey01() throws Exception { PublicKey pk = new TestKeyPair(keyAlg).getPublic(); @@ -515,12 +426,6 @@ public class TrustAnchorTest extends TestCase { * Expected: the same name must be returned by the method<br> * @throws InvalidKeySpecException */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getCAName", - args = {} - ) public final void testGetCAName01() throws Exception { PublicKey pk = new TestKeyPair(keyAlg).getPublic(); @@ -544,11 +449,6 @@ public class TrustAnchorTest extends TestCase { * Expected: <code>null</code> as return value<br> * @throws InvalidKeySpecException */ - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "getTrustedCert", - args = {} - ) public final void testGetTrustedCer02() throws Exception { PublicKey pk = new TestKeyPair(keyAlg).getPublic(); @@ -574,12 +474,6 @@ public class TrustAnchorTest extends TestCase { * Test preconditions: valid parameters are passed to the constructors<br> * Expected: the valid parameters must be returned by the method<br> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies positive case.", - method = "getNameConstraints", - args = {} - ) public final void testGetNameConstraints01() throws Exception { PublicKey pk = new TestKeyPair(keyAlg).getPublic(); TrustAnchor ta1 = new TrustAnchor(validCaNameRfc2253, pk, @@ -607,12 +501,6 @@ public class TrustAnchorTest extends TestCase { * Test preconditions: null parameters are passed to the constructors<br> * Expected: the null parameters must be returned by the method<br> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that getNameConstraints returns null.", - method = "getNameConstraints", - args = {} - ) public final void testGetNameConstraints02() throws Exception { PublicKey pk = new TestKeyPair(keyAlg).getPublic(); TrustAnchor ta1 = new TrustAnchor(validCaNameRfc2253, pk, null); @@ -638,12 +526,6 @@ public class TrustAnchorTest extends TestCase { * Test preconditions: valid parameters are passed to the constructors<br> * Expected: not null string<br> */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {} - ) public final void testToString() throws Exception { PublicKey pk = new TestKeyPair(keyAlg).getPublic(); TrustAnchor ta1 = new TrustAnchor(validCaNameRfc2253, pk, @@ -672,12 +554,6 @@ public class TrustAnchorTest extends TestCase { * by the method<br> * @throws InvalidKeySpecException */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getCA", - args = {} - ) public final void testGetCA01() throws Exception { PublicKey pk = new TestKeyPair(keyAlg).getPublic(); diff --git a/luni/src/test/java/tests/security/cert/X509CRL2Test.java b/luni/src/test/java/tests/security/cert/X509CRL2Test.java index 0c21333..c986032 100644 --- a/luni/src/test/java/tests/security/cert/X509CRL2Test.java +++ b/luni/src/test/java/tests/security/cert/X509CRL2Test.java @@ -17,11 +17,6 @@ package tests.security.cert; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; - import junit.framework.TestCase; import java.io.ByteArrayInputStream; @@ -39,7 +34,6 @@ import java.util.Iterator; import java.util.Set; import java.util.Vector; -@TestTargetClass(X509CRL.class) public class X509CRL2Test extends TestCase { private X509Certificate pemCert = null; @@ -79,34 +73,8 @@ public class X509CRL2Test extends TestCase { } /** - * @tests java.security.cert.X509CRL#getExtensionValue(java.lang.String) + * java.security.cert.X509CRL#getExtensionValue(java.lang.String) */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getExtensionValue", - args = {java.lang.String.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getCriticalExtensionOIDs", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getNonCriticalExtensionOIDs", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hasUnsupportedCriticalExtension", - args = {} - ) - }) public void test_getExtensionValueLjava_lang_String() { try { setUp(); @@ -135,15 +103,9 @@ public class X509CRL2Test extends TestCase { } /** - * @tests java.security.cert.X509CRL#X509CRL() + * java.security.cert.X509CRL#X509CRL() */ @SuppressWarnings("cast") - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "X509CRL", - args = {} - ) public void test_X509CRL() { try { MyX509CRL crl = new MyX509CRL(); diff --git a/luni/src/test/java/tests/security/cert/X509CRLEntryTest.java b/luni/src/test/java/tests/security/cert/X509CRLEntryTest.java index 7d156dd..616caff 100644 --- a/luni/src/test/java/tests/security/cert/X509CRLEntryTest.java +++ b/luni/src/test/java/tests/security/cert/X509CRLEntryTest.java @@ -22,11 +22,6 @@ package tests.security.cert; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; @@ -39,7 +34,6 @@ import java.util.Set; /** */ -@TestTargetClass(X509CRLEntry.class) public class X509CRLEntryTest extends TestCase { X509CRLEntry tbt_crlentry; @@ -100,12 +94,6 @@ public class X509CRLEntryTest extends TestCase { /** * X509CRLEntry() method testing. Tests for creating object. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "X509CRLEntry", - args = {} - ) public void testX509CRLEntry() { TBTCRLEntry tbt_crlentry = new TBTCRLEntry(); @@ -126,12 +114,6 @@ public class X509CRLEntryTest extends TestCase { * operation: it should be reflexive, symmetric, transitive, consistent * and should be false on null object. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "equals", - args = {java.lang.Object.class} - ) public void testEquals() { TBTCRLEntry tbt_crlentry_1 = new TBTCRLEntry() { public byte[] getEncoded() { @@ -182,12 +164,6 @@ public class X509CRLEntryTest extends TestCase { * hashCode() method testing. Tests that for equal objects hash codes * are equal. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hashCode", - args = {} - ) public void testHashCode() { TBTCRLEntry tbt_crlentry_1 = new TBTCRLEntry() { public byte[] getEncoded() { @@ -202,49 +178,11 @@ public class X509CRLEntryTest extends TestCase { * getCertificateIssuer() method testing. Tests if the method throws * appropriate exception. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getCertificateIssuer", - args = {} - ) public void testGetCertificateIssuer() { assertNull("The default implementation should return null.", tbt_crlentry.getCertificateIssuer()); } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getEncoded", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getRevocationDate", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSerialNumber", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hasExtensions", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {} - ) - }) public void testAbstractMethods() { TBTCRLEntry tbt = new TBTCRLEntry() { public byte[] getEncoded() { diff --git a/luni/src/test/java/tests/security/cert/X509CRLSelector2Test.java b/luni/src/test/java/tests/security/cert/X509CRLSelector2Test.java index 8e451f0..f2e814d 100644 --- a/luni/src/test/java/tests/security/cert/X509CRLSelector2Test.java +++ b/luni/src/test/java/tests/security/cert/X509CRLSelector2Test.java @@ -1,10 +1,6 @@ package tests.security.cert; import dalvik.annotation.AndroidOnly; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; import junit.framework.TestCase; @@ -36,7 +32,7 @@ import java.util.Date; import java.util.Set; import javax.security.auth.x500.X500Principal; -@TestTargetClass(X509CRLSelector.class) + public class X509CRLSelector2Test extends TestCase { protected void setUp() throws Exception { @@ -51,12 +47,6 @@ public class X509CRLSelector2Test extends TestCase { * constructor testing. * */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "X509CRLSelector", - args = {} - ) public void testX509CRLSelector() { X509CRLSelector selector = new X509CRLSelector(); assertNull(selector.getDateAndTime()); @@ -72,19 +62,6 @@ public class X509CRLSelector2Test extends TestCase { * specified issuers match the selector, and if not specified issuer does * not match the selector. */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "addIssuer", - args = {javax.security.auth.x500.X500Principal.class} - ), - @TestTargetNew( - level=TestLevel.PARTIAL_COMPLETE, - method="match", - args={java.security.cert.CRL.class} - ) - }) public void testAddIssuerLjavax_security_auth_x500_X500Principal02() { X509CRLSelector selector = new X509CRLSelector(); X500Principal iss1 = new X500Principal("O=First Org."); @@ -107,12 +84,6 @@ public class X509CRLSelector2Test extends TestCase { * issuers match the selector, and if not specified issuer does not match * the selector. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify IOException.", - method = "addIssuerName", - args = {java.lang.String.class} - ) public void testAddIssuerNameLjava_lang_String03() { X509CRLSelector selector = new X509CRLSelector(); String iss1 = "O=First Org."; @@ -147,12 +118,6 @@ public class X509CRLSelector2Test extends TestCase { * match the selector, and if the internal collection of issuer names is * copied during initialization. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setIssuerNames", - args = {java.util.Collection.class} - ) @SuppressWarnings("unchecked") public void testSetIssuerNamesLjava_util_Collection02() { X509CRLSelector selector = new X509CRLSelector(); @@ -201,12 +166,6 @@ public class X509CRLSelector2Test extends TestCase { * criteria, if specified issuers match the selector, and if not specified * issuer does not match the selector. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setIssuers", - args = {java.util.Collection.class} - ) public void testSetIssuersLjava_util_Collection() { X509CRLSelector selector = new X509CRLSelector(); X500Principal iss1 = new X500Principal("O=First Org."); @@ -239,12 +198,6 @@ public class X509CRLSelector2Test extends TestCase { * issuers match the selector, and if not specified issuer does not match * the selector. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify IOException.", - method = "addIssuerName", - args = {byte[].class} - ) public void testAddIssuerName$B() { X509CRLSelector selector = new X509CRLSelector(); byte[] iss1 = new byte[] @@ -284,12 +237,6 @@ public class X509CRLSelector2Test extends TestCase { * criteria, if specified minCRL value matches the selector, and if CRL with * inappropriate crlNumber value does not match the selector. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setMinCRLNumber", - args = {java.math.BigInteger.class} - ) @AndroidOnly("Uses specific class: " + "org.apache.harmony.security.asn1.ASN1OctetString.") public void testSetMinCRLNumberLjava_math_BigInteger() { @@ -314,12 +261,6 @@ public class X509CRLSelector2Test extends TestCase { * criteria, if specified maxCRL value matches the selector, and if CRL with * inappropriate crlNumber value does not match the selector. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setMaxCRLNumber", - args = {java.math.BigInteger.class} - ) @AndroidOnly("Uses specific class: " + "org.apache.harmony.security.asn1.ASN1OctetString.") public void testSetMaxCRLNumberLjava_math_BigInteger() { @@ -343,12 +284,6 @@ public class X509CRLSelector2Test extends TestCase { * update dates match the selector in the case of null dateAndTime criteria, * if correct dates match and incorrect do not match the selector. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setDateAndTime", - args = {java.util.Date.class} - ) public void testSetDateAndTimeLjava_util_Date() { X509CRLSelector selector = new X509CRLSelector(); TestCRL crl = new TestCRL(new Date(200), new Date(300)); @@ -375,12 +310,6 @@ public class X509CRLSelector2Test extends TestCase { /** * setCertificateChecking(X509Certificate) method testing. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setCertificateChecking", - args = {java.security.cert.X509Certificate.class} - ) public void testSetCertificateCheckingLjava_X509Certificate() throws CertificateException { X509CRLSelector selector = new X509CRLSelector(); @@ -407,12 +336,6 @@ public class X509CRLSelector2Test extends TestCase { * of not specified issuers, if the returned collection corresponds to the * specified issuers and this collection is unmodifiable. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getIssuers", - args = {} - ) public void testGetIssuers() { X509CRLSelector selector = new X509CRLSelector(); X500Principal iss1 = new X500Principal("O=First Org."); @@ -436,12 +359,6 @@ public class X509CRLSelector2Test extends TestCase { * case of not specified issuers, if the returned collection corresponds to * the specified issuers. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getIssuerNames", - args = {} - ) public void testGetIssuerNames() { X509CRLSelector selector = new X509CRLSelector(); byte[] iss1 = new byte[] @@ -470,12 +387,6 @@ public class X509CRLSelector2Test extends TestCase { * of not specified minCRL criteria, and if the returned value corresponds * to the specified one. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getMinCRL", - args = {} - ) public void testGetMinCRL() { X509CRLSelector selector = new X509CRLSelector(); assertNull("Initially the minCRL should be null.", selector.getMinCRL()); @@ -490,12 +401,6 @@ public class X509CRLSelector2Test extends TestCase { * of not specified maxCRL criteria, and if the returned value corresponds * to the specified one. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getMaxCRL", - args = {} - ) public void testGetMaxCRL() { X509CRLSelector selector = new X509CRLSelector(); assertNull("Initially the maxCRL should be null.", selector.getMaxCRL()); @@ -510,12 +415,6 @@ public class X509CRLSelector2Test extends TestCase { * case of not specified dateAndTime criteria, and if the returned value * corresponds to the specified one. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getDateAndTime", - args = {} - ) public void testGetDateAndTime() { X509CRLSelector selector = new X509CRLSelector(); assertNull("Initially the dateAndTime criteria should be null.", @@ -529,12 +428,6 @@ public class X509CRLSelector2Test extends TestCase { /** * getCertificateChecking() method testing. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getCertificateChecking", - args = {} - ) public void testGetCertificateCheckingLjava_X509Certificate() throws CertificateException { X509CRLSelector selector = new X509CRLSelector(); @@ -555,12 +448,6 @@ public class X509CRLSelector2Test extends TestCase { * match(CRL crl) method testing. Tests if the null object matches to the * selector or not. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify not null value as parameter.", - method = "match", - args = {java.security.cert.CRL.class} - ) public void testMatchLjava_security_cert_X509CRL() { X509CRLSelector selector = new X509CRLSelector(); assertFalse("The null object should not match", selector @@ -572,12 +459,6 @@ public class X509CRLSelector2Test extends TestCase { * crl which matche to the initial selector should match to the clone and * the change of clone should not cause the change of initial selector. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "clone", - args = {} - ) @AndroidOnly("Uses specific classes: " + "org.apache.harmony.security.asn1.ASN1OctetString, " + "org.apache.harmony.security.asn1.ASN1Integer.") @@ -608,12 +489,6 @@ public class X509CRLSelector2Test extends TestCase { + "the changes of initial object", selector.getIssuerNames() .size() == 3); } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {} - ) public void testToString() { X509CRLSelector selector = new X509CRLSelector(); X500Principal iss1 = new X500Principal("O=First Org."); diff --git a/luni/src/test/java/tests/security/cert/X509CRLSelectorTest.java b/luni/src/test/java/tests/security/cert/X509CRLSelectorTest.java index 31faaaf..096bfee 100644 --- a/luni/src/test/java/tests/security/cert/X509CRLSelectorTest.java +++ b/luni/src/test/java/tests/security/cert/X509CRLSelectorTest.java @@ -22,11 +22,6 @@ package tests.security.cert; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.io.IOException; @@ -36,18 +31,11 @@ import java.util.TreeSet; import javax.security.auth.x500.X500Principal; -@TestTargetClass(X509CRLSelector.class) public class X509CRLSelectorTest extends TestCase { /** - * @tests java.security.cert.X509CRLSelector#addIssuer(javax.security.auth.x500.X500Principal) + * java.security.cert.X509CRLSelector#addIssuer(javax.security.auth.x500.X500Principal) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "addIssuer", - args = {javax.security.auth.x500.X500Principal.class} - ) public void test_addIssuerLjavax_security_auth_x500_X500Principal01() throws Exception { //Regression for HARMONY-465 @@ -61,14 +49,8 @@ public class X509CRLSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CRLSelector#addIssuerName(java.lang.String) + * java.security.cert.X509CRLSelector#addIssuerName(java.lang.String) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies IOException.", - method = "addIssuerName", - args = {java.lang.String.class} - ) public void test_addIssuerNameLjava_lang_String01() throws Exception { //Regression for HARMONY-465 X509CRLSelector obj = new X509CRLSelector(); @@ -89,14 +71,8 @@ public class X509CRLSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CRLSelector#addIssuerName(java.lang.String) + * java.security.cert.X509CRLSelector#addIssuerName(java.lang.String) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as a parameter.", - method = "addIssuerName", - args = {java.lang.String.class} - ) public void test_addIssuerNameLjava_lang_String02() throws IOException { // Regression for HARMONY-736 X509CRLSelector selector = new X509CRLSelector(); @@ -107,14 +83,8 @@ public class X509CRLSelectorTest extends TestCase { /** - * @tests java.security.cert.X509CRLSelector#addIssuerName(byte[]) + * java.security.cert.X509CRLSelector#addIssuerName(byte[]) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies IOException.", - method = "addIssuerName", - args = {byte[].class} - ) public void test_addIssuerName$B_3() throws Exception { //Regression for HARMONY-465 X509CRLSelector obj = new X509CRLSelector(); @@ -127,14 +97,8 @@ public class X509CRLSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CRLSelector#addIssuerName(byte[]) + * java.security.cert.X509CRLSelector#addIssuerName(byte[]) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException.", - method = "addIssuerName", - args = {byte[].class} - ) public void test_addIssuerName$B_4() throws Exception { //Regression for HARMONY-465 X509CRLSelector obj = new X509CRLSelector(); @@ -147,14 +111,8 @@ public class X509CRLSelectorTest extends TestCase { } /** - * @tests setIssuerNames(Collection <?> names) + * setIssuerNames(Collection <?> names) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Regression test.", - method = "setIssuerNames", - args = {java.util.Collection.class} - ) public void test_setIssuerNamesLjava_util_Collection01() throws IOException { // Regression for HARMONY-737 X509CRLSelector selector = new X509CRLSelector(); diff --git a/luni/src/test/java/tests/security/cert/X509CRLTest.java b/luni/src/test/java/tests/security/cert/X509CRLTest.java index a460b89..c0163f3 100644 --- a/luni/src/test/java/tests/security/cert/X509CRLTest.java +++ b/luni/src/test/java/tests/security/cert/X509CRLTest.java @@ -23,10 +23,6 @@ package tests.security.cert; import dalvik.annotation.AndroidOnly; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; import junit.framework.Test; import junit.framework.TestCase; @@ -56,7 +52,6 @@ import org.apache.harmony.security.tests.support.cert.TestUtils; import tests.security.cert.X509CRL2Test.MyX509CRL; /** */ -@TestTargetClass(X509CRL.class) public class X509CRLTest extends TestCase { private X509CRL tbt_crl; @@ -188,12 +183,6 @@ public class X509CRLTest extends TestCase { * getType() method testing. Tests that getType() method returns * the value "X.509" */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getType", - args = {} - ) public void testGetType() { assertEquals("The type of X509CRL should be X.509", tbt_crl.getType(), "X.509"); @@ -204,12 +193,6 @@ public class X509CRLTest extends TestCase { * operation: it should be reflexive, symmetric, transitive, consistent * and should be false on null object. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "equals", - args = {java.lang.Object.class} - ) public void testEquals() { TBTCRL tbt_crl_1 = new TBTCRL() { public byte[] getEncoded() { @@ -258,12 +241,6 @@ public class X509CRLTest extends TestCase { * hashCode() method testing. Tests that for equal objects hash codes * are equal. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "hashCode", - args = {} - ) public void testHashCode() { TBTCRL tbt_crl_1 = new TBTCRL() { public byte[] getEncoded() { @@ -275,14 +252,8 @@ public class X509CRLTest extends TestCase { } /** - * @tests java.security.cert.X509CRL#getIssuerX500Principal() + * java.security.cert.X509CRL#getIssuerX500Principal() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getIssuerX500Principal", - args = {} - ) public void testGetIssuerX500Principal() { // return valid encoding TBTCRL crl = new TBTCRL() { @@ -299,12 +270,6 @@ public class X509CRLTest extends TestCase { * Check if the default implementation throws NullPointerException * on null input data. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getRevokedCertificate", - args = {java.security.cert.X509Certificate.class} - ) @AndroidOnly("Test filed on RI: getRevokedCertificate throws " + "RuntimeException.") public void testGetRevokedCertificate() { @@ -325,92 +290,6 @@ public class X509CRLTest extends TestCase { } } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getEncoded", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getIssuerDN", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getNextUpdate", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getRevokedCertificate", - args = {java.math.BigInteger.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getRevokedCertificates", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSigAlgName", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSigAlgOID", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSigAlgParams", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSignature", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getTBSCertList", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getThisUpdate", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getVersion", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "verify", - args = {java.security.PublicKey.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "verify", - args = {java.security.PublicKey.class, java.lang.String.class} - ) - }) public void testAbstractMethods() { TBTCRL crl = new TBTCRL() { public byte[] getEncoded() { @@ -439,12 +318,6 @@ public class X509CRLTest extends TestCase { } } - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "X509CRL", - args = {} - ) public void testX509CRL() { try { TBTCRL crl = new TBTCRL(); diff --git a/luni/src/test/java/tests/security/cert/X509CertSelectorTest.java b/luni/src/test/java/tests/security/cert/X509CertSelectorTest.java index 04d6c48..438bef9 100644 --- a/luni/src/test/java/tests/security/cert/X509CertSelectorTest.java +++ b/luni/src/test/java/tests/security/cert/X509CertSelectorTest.java @@ -17,10 +17,6 @@ package tests.security.cert; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.io.ByteArrayInputStream; @@ -83,7 +79,6 @@ import org.apache.harmony.security.x509.PrivateKeyUsagePeriod; /** * X509CertSelectorTest */ -@TestTargetClass(X509CertSelector.class) public class X509CertSelectorTest extends TestCase { byte[][] constraintBytes = new byte[][] { @@ -128,14 +123,8 @@ public class X509CertSelectorTest extends TestCase { 1, -128, 1, 0}}; /** - * @tests java.security.cert.X509CertSelector#addSubjectAlternativeName(int, byte[]) + * java.security.cert.X509CertSelector#addSubjectAlternativeName(int, byte[]) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "IOException checking missed", - method = "addSubjectAlternativeName", - args = {int.class, byte[].class} - ) public void test_addSubjectAlternativeNameLintLbyte_array() throws IOException { // Regression for HARMONY-2487 int[] types = { 0, 1, 2, 3, 4, 5, 6, 7, 8 }; @@ -150,14 +139,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#addSubjectAlternativeName(int, String) + * java.security.cert.X509CertSelector#addSubjectAlternativeName(int, String) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies IOException.", - method = "addSubjectAlternativeName", - args = {int.class, java.lang.String.class} - ) public void test_addSubjectAlternativeNameLintLjava_lang_String() { // Regression for HARMONY-727 int[] types = { 0, 2, 3, 4, 5, 6, 7, 8 }; @@ -172,14 +155,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#addPathToName(int, byte[]) + * java.security.cert.X509CertSelector#addPathToName(int, byte[]) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies NullPointerException.", - method = "addPathToName", - args = {int.class, byte[].class} - ) public void test_addPathToNameLintLbyte_array() throws IOException { // Regression for HARMONY-2487 int[] types = { 0, 1, 2, 3, 4, 5, 6, 7, 8 }; @@ -193,14 +170,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#addPathToName(int, String) + * java.security.cert.X509CertSelector#addPathToName(int, String) */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies IOException.", - method = "addPathToName", - args = {int.class, java.lang.String.class} - ) public void test_addPathToNameLintLjava_lang_String() { // Regression for HARMONY-724 for (int type = 0; type <= 8; type++) { @@ -216,14 +187,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#X509CertSelector() + * java.security.cert.X509CertSelector#X509CertSelector() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "X509CertSelector", - args = {} - ) public void test_X509CertSelector() { X509CertSelector selector = null; try { @@ -236,14 +201,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#clone() + * java.security.cert.X509CertSelector#clone() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "clone", - args = {} - ) public void test_clone() throws Exception { X509CertSelector selector = new X509CertSelector(); X509CertSelector selector1 = (X509CertSelector) selector.clone(); @@ -295,14 +254,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#getAuthorityKeyIdentifier() + * java.security.cert.X509CertSelector#getAuthorityKeyIdentifier() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getAuthorityKeyIdentifier", - args = {} - ) public void test_getAuthorityKeyIdentifier() { byte[] akid1 = new byte[] { 4, 5, 1, 2, 3, 4, 5 }; // random value byte[] akid2 = new byte[] { 4, 5, 5, 4, 3, 2, 1 }; // random value @@ -320,14 +273,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#getBasicConstraints() + * java.security.cert.X509CertSelector#getBasicConstraints() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getBasicConstraints", - args = {} - ) public void test_getBasicConstraints() { X509CertSelector selector = new X509CertSelector(); int[] validValues = { 2, 1, 0, 1, 2, 3, 10, 20 }; @@ -338,14 +285,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#getCertificate() + * java.security.cert.X509CertSelector#getCertificate() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getCertificate", - args = {} - ) public void test_getCertificate() throws CertificateException { X509CertSelector selector = new X509CertSelector(); CertificateFactory certFact = CertificateFactory.getInstance("X509"); @@ -368,14 +309,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#getCertificateValid() + * java.security.cert.X509CertSelector#getCertificateValid() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getCertificateValid", - args = {} - ) public void test_getCertificateValid() { Date date1 = new Date(100); Date date2 = new Date(200); @@ -400,14 +335,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#getExtendedKeyUsage() + * java.security.cert.X509CertSelector#getExtendedKeyUsage() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getExtendedKeyUsage", - args = {} - ) public void test_getExtendedKeyUsage() { HashSet<String> ku = new HashSet<String>(Arrays .asList(new String[] { "1.3.6.1.5.5.7.3.1", @@ -436,14 +365,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#getIssuer() + * java.security.cert.X509CertSelector#getIssuer() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getIssuer", - args = {} - ) public void test_getIssuer() { X500Principal iss1 = new X500Principal("O=First Org."); X500Principal iss2 = new X500Principal("O=Second Org."); @@ -458,14 +381,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#getIssuerAsBytes() + * java.security.cert.X509CertSelector#getIssuerAsBytes() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getIssuerAsBytes", - args = {} - ) public void test_getIssuerAsBytes() { byte[] name1 = new byte[] // manually obtained DER encoding of "O=First Org." issuer name; @@ -497,14 +414,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#getIssuerAsString() + * java.security.cert.X509CertSelector#getIssuerAsString() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getIssuerAsString", - args = {} - ) public void test_getIssuerAsString() { String name1 = "O=First Org."; String name2 = "O=Second Org."; @@ -524,14 +435,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#getKeyUsage() + * java.security.cert.X509CertSelector#getKeyUsage() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getKeyUsage", - args = {} - ) public void test_getKeyUsage() { boolean[] ku = new boolean[] { true, false, true, false, true, false, true, false, true }; @@ -548,14 +453,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#getMatchAllSubjectAltNames() + * java.security.cert.X509CertSelector#getMatchAllSubjectAltNames() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getMatchAllSubjectAltNames", - args = {} - ) public void test_getMatchAllSubjectAltNames() { X509CertSelector selector = new X509CertSelector(); assertTrue("The matchAllNames initially should be true", selector @@ -566,14 +465,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#getNameConstraints() + * java.security.cert.X509CertSelector#getNameConstraints() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getNameConstraints", - args = {} - ) public void test_getNameConstraints() throws IOException { // Used to generate following byte array @@ -612,14 +505,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#getPathToNames() + * java.security.cert.X509CertSelector#getPathToNames() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPathToNames", - args = {} - ) public void test_getPathToNames() { try { GeneralName san0 = new GeneralName(new OtherName("1.2.3.4.5", @@ -666,14 +553,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#getPolicy() + * java.security.cert.X509CertSelector#getPolicy() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPolicy", - args = {} - ) public void test_getPolicy() throws IOException { String[] policies1 = new String[] { "1.3.6.1.5.5.7.3.1", "1.3.6.1.5.5.7.3.2", "1.3.6.1.5.5.7.3.3", "1.3.6.1.5.5.7.3.4", @@ -698,14 +579,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#getPrivateKeyValid() + * java.security.cert.X509CertSelector#getPrivateKeyValid() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPrivateKeyValid", - args = {} - ) public void test_getPrivateKeyValid() { Date date1 = new Date(100); Date date2 = new Date(200); @@ -723,14 +598,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#getSerialNumber() + * java.security.cert.X509CertSelector#getSerialNumber() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSerialNumber", - args = {} - ) public void test_getSerialNumber() { BigInteger ser1 = new BigInteger("10000"); BigInteger ser2 = new BigInteger("10001"); @@ -745,14 +614,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#getSubject() + * java.security.cert.X509CertSelector#getSubject() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSubject", - args = {} - ) public void test_getSubject() { X500Principal sub1 = new X500Principal("O=First Org."); X500Principal sub2 = new X500Principal("O=Second Org."); @@ -767,14 +630,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#getSubjectAlternativeNames() + * java.security.cert.X509CertSelector#getSubjectAlternativeNames() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSubjectAlternativeNames", - args = {} - ) public void test_getSubjectAlternativeNames() { try { GeneralName san1 = new GeneralName(1, "rfc@822.Name"); @@ -804,14 +661,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#getSubjectAsBytes() + * java.security.cert.X509CertSelector#getSubjectAsBytes() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSubjectAsBytes", - args = {} - ) public void test_getSubjectAsBytes() { byte[] name1 = new byte[] // manually obtained DER encoding of "O=First Org." issuer name; @@ -843,14 +694,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#getSubjectAsString() + * java.security.cert.X509CertSelector#getSubjectAsString() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSubjectAsString", - args = {} - ) public void test_getSubjectAsString() { String name1 = "O=First Org."; String name2 = "O=Second Org."; @@ -870,14 +715,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#getSubjectKeyIdentifier() + * java.security.cert.X509CertSelector#getSubjectKeyIdentifier() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSubjectKeyIdentifier", - args = {} - ) public void test_getSubjectKeyIdentifier() { byte[] skid1 = new byte[] { 1, 2, 3, 4, 5 }; // random value byte[] skid2 = new byte[] { 4, 5, 5, 4, 3, 2, 1 }; // random value @@ -896,14 +735,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#getSubjectPublicKey() + * java.security.cert.X509CertSelector#getSubjectPublicKey() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSubjectPublicKey", - args = {} - ) public void test_getSubjectPublicKey() throws Exception { // SubjectPublicKeyInfo ::= SEQUENCE { @@ -934,14 +767,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#getSubjectPublicKeyAlgID() + * java.security.cert.X509CertSelector#getSubjectPublicKeyAlgID() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSubjectPublicKeyAlgID", - args = {} - ) public void test_getSubjectPublicKeyAlgID() { X509CertSelector selector = new X509CertSelector(); @@ -976,14 +803,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#match(java.security.cert.Certificate) + * java.security.cert.X509CertSelector#match(java.security.cert.Certificate) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "match", - args = {java.security.cert.Certificate.class} - ) public void test_matchLjava_security_cert_Certificate() throws CertificateException { X509CertSelector selector = new X509CertSelector(); @@ -1008,14 +829,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#setAuthorityKeyIdentifier(byte[]) + * java.security.cert.X509CertSelector#setAuthorityKeyIdentifier(byte[]) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setAuthorityKeyIdentifier", - args = {byte[].class} - ) public void test_setAuthorityKeyIdentifierLB$() throws CertificateException { X509CertSelector selector = new X509CertSelector(); @@ -1048,14 +863,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#setBasicConstraints(int) + * java.security.cert.X509CertSelector#setBasicConstraints(int) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setBasicConstraints", - args = {int.class} - ) public void test_setBasicConstraintsLint() { X509CertSelector selector = new X509CertSelector(); int[] invalidValues = { -3, -4, -5, 1000000000 }; @@ -1076,14 +885,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#setCertificate(java.security.cert.Certificate) + * java.security.cert.X509CertSelector#setCertificate(java.security.cert.Certificate) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setCertificate", - args = {java.security.cert.X509Certificate.class} - ) public void test_setCertificateLjava_security_cert_X509Certificate() throws CertificateException { @@ -1108,14 +911,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#setCertificateValid(java.util.Date) + * java.security.cert.X509CertSelector#setCertificateValid(java.util.Date) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setCertificateValid", - args = {java.util.Date.class} - ) public void test_setCertificateValidLjava_util_Date() throws CertificateException { X509CertSelector selector = new X509CertSelector(); @@ -1139,14 +936,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#setExtendedKeyUsage(Set<String>) + * java.security.cert.X509CertSelector#setExtendedKeyUsage(Set<String>) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setExtendedKeyUsage", - args = {java.util.Set.class} - ) public void test_setExtendedKeyUsageLjava_util_Set() throws CertificateException { HashSet<String> ku1 = new HashSet<String>(Arrays @@ -1188,14 +979,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#setIssuer(byte[]) + * java.security.cert.X509CertSelector#setIssuer(byte[]) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setIssuer", - args = {byte[].class} - ) public void test_setIssuerLB$() throws CertificateException { byte[] name1 = new byte[] // manually obtained DER encoding of "O=First Org." issuer name; @@ -1239,14 +1024,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#setIssuer(java.lang.String) + * java.security.cert.X509CertSelector#setIssuer(java.lang.String) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setIssuer", - args = {java.lang.String.class} - ) public void test_setIssuerLjava_lang_String() throws CertificateException { String name1 = "O=First Org."; @@ -1285,14 +1064,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#setIssuer(javax.security.auth.x500.X500Principal) + * java.security.cert.X509CertSelector#setIssuer(javax.security.auth.x500.X500Principal) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setIssuer", - args = {javax.security.auth.x500.X500Principal.class} - ) public void test_setIssuerLjavax_security_auth_x500_X500Principal() throws CertificateException { X500Principal iss1 = new X500Principal("O=First Org."); @@ -1316,14 +1089,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#setKeyUsage(boolean) + * java.security.cert.X509CertSelector#setKeyUsage(boolean) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setKeyUsage", - args = {boolean[].class} - ) public void test_setKeyUsageZ() throws CertificateException { boolean[] ku1 = new boolean[] { true, true, true, true, true, true, true, true, true }; @@ -1355,14 +1122,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#setMatchAllSubjectAltNames(boolean) + * java.security.cert.X509CertSelector#setMatchAllSubjectAltNames(boolean) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setMatchAllSubjectAltNames", - args = {boolean.class} - ) public void test_setMatchAllSubjectAltNamesZ() { TestCert cert = new TestCert(); X509CertSelector selector = new X509CertSelector(); @@ -1373,15 +1134,9 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#setNameConstraints(byte[] + * java.security.cert.X509CertSelector#setNameConstraints(byte[] * bytes) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setNameConstraints", - args = {byte[].class} - ) public void test_setNameConstraintsLB$() throws IOException { // GeneralName[] name_constraints = new GeneralName[] { // new GeneralName(1, "822.Name"), @@ -1413,14 +1168,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#setPathToNames(Collection<List<?>>) + * java.security.cert.X509CertSelector#setPathToNames(Collection<List<?>>) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setPathToNames", - args = {java.util.Collection.class} - ) public void test_setPathToNamesLjava_util_Collection() { try { GeneralName san0 = new GeneralName(new OtherName("1.2.3.4.5", @@ -1467,14 +1216,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#setPolicy(Set<String>) + * java.security.cert.X509CertSelector#setPolicy(Set<String>) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setPolicy", - args = {java.util.Set.class} - ) public void test_setPolicyLjava_util_Set() throws IOException { String[] policies1 = new String[] { "1.3.6.1.5.5.7.3.1", "1.3.6.1.5.5.7.3.2", "1.3.6.1.5.5.7.3.3", "1.3.6.1.5.5.7.3.4", @@ -1510,14 +1253,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#setPrivateKeyValid(java.util.Date) + * java.security.cert.X509CertSelector#setPrivateKeyValid(java.util.Date) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setPrivateKeyValid", - args = {java.util.Date.class} - ) public void test_setPrivateKeyValidLjava_util_Date() throws CertificateException { Date date1 = new Date(100000000); @@ -1546,14 +1283,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#setSerialNumber(java.math.BigInteger) + * java.security.cert.X509CertSelector#setSerialNumber(java.math.BigInteger) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setSerialNumber", - args = {java.math.BigInteger.class} - ) public void test_setSerialNumberLjava_math_BigInteger() throws CertificateException { BigInteger ser1 = new BigInteger("10000"); @@ -1577,14 +1308,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#setSubject(byte[]) + * java.security.cert.X509CertSelector#setSubject(byte[]) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setSubject", - args = {byte[].class} - ) public void test_setSubjectLB$() throws CertificateException { byte[] name1 = new byte[] // manually obtained DER encoding of "O=First Org." issuer name; @@ -1628,14 +1353,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#setSubject(java.lang.String) + * java.security.cert.X509CertSelector#setSubject(java.lang.String) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setSubject", - args = {java.lang.String.class} - ) public void test_setSubjectLjava_lang_String() throws CertificateException { String name1 = "O=First Org."; String name2 = "O=Second Org."; @@ -1673,14 +1392,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#setSubject(javax.security.auth.x500.X500Principal) + * java.security.cert.X509CertSelector#setSubject(javax.security.auth.x500.X500Principal) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setSubject", - args = {javax.security.auth.x500.X500Principal.class} - ) public void test_setSubjectLjavax_security_auth_x500_X500Principal() throws CertificateException { X500Principal sub1 = new X500Principal("O=First Org."); @@ -1705,14 +1418,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#setSubjectAlternativeNames(Collection<List<?>>) + * java.security.cert.X509CertSelector#setSubjectAlternativeNames(Collection<List<?>>) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setSubjectAlternativeNames", - args = {java.util.Collection.class} - ) public void test_setSubjectAlternativeNamesLjava_util_Collection() { try { @@ -1761,14 +1468,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#setSubjectKeyIdentifier(byte[]) + * java.security.cert.X509CertSelector#setSubjectKeyIdentifier(byte[]) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setSubjectKeyIdentifier", - args = {byte[].class} - ) public void test_setSubjectKeyIdentifierLB$() throws CertificateException { byte[] skid1 = new byte[] { 1, 2, 3, 4, 5 }; // random value byte[] skid2 = new byte[] { 5, 4, 3, 2, 1 }; // random value @@ -1792,14 +1493,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#setSubjectPublicKey(byte[]) + * java.security.cert.X509CertSelector#setSubjectPublicKey(byte[]) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setSubjectPublicKey", - args = {byte[].class} - ) public void test_setSubjectPublicKeyLB$() throws Exception { //SubjectPublicKeyInfo ::= SEQUENCE { @@ -1823,14 +1518,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#setSubjectPublicKey(java.security.PublicKey key) + * java.security.cert.X509CertSelector#setSubjectPublicKey(java.security.PublicKey key) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setSubjectPublicKey", - args = {java.security.PublicKey.class} - ) public void test_setSubjectPublicKeyLjava_security_PublicKey() throws CertificateException { PublicKey pkey1 = null; @@ -1861,14 +1550,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#setSubjectPublicKeyAlgID(java.lang.String) + * java.security.cert.X509CertSelector#setSubjectPublicKeyAlgID(java.lang.String) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "setSubjectPublicKeyAlgID", - args = {java.lang.String.class} - ) public void test_setSubjectPublicKeyAlgIDLjava_lang_String() throws CertificateException { @@ -1941,14 +1624,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#toString() + * java.security.cert.X509CertSelector#toString() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {} - ) public void test_toString() { X509CertSelector selector = new X509CertSelector(); assertNotNull(selector.toString()); @@ -2411,14 +2088,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#addPathToName(int, byte[]) + * java.security.cert.X509CertSelector#addPathToName(int, byte[]) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Verifies Exception", - method = "addPathToName", - args = {int.class, byte[].class} - ) public void test_addPathToNameLintLbyte_array2() throws Exception { TestUtils.initCertPathSSCertChain(); setupEnvironment(); @@ -2454,14 +2125,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#addPathToName(int, String) + * java.security.cert.X509CertSelector#addPathToName(int, String) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Verifies IOException.", - method = "addPathToName", - args = {int.class, java.lang.String.class} - ) public void test_addPathToNameLintLjava_lang_String2() throws Exception { setupEnvironment(); byte[] bytes, bytesName; @@ -2497,14 +2162,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#addSubjectAlternativeName(int, byte[]) + * java.security.cert.X509CertSelector#addSubjectAlternativeName(int, byte[]) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "IOException checking missed", - method = "addSubjectAlternativeName", - args = {int.class, byte[].class} - ) public void test_addSubjectAlternativeNameLintLbyte_array2() throws Exception { @@ -2546,14 +2205,8 @@ public class X509CertSelectorTest extends TestCase { } /** - * @tests java.security.cert.X509CertSelector#addSubjectAlternativeName(int, String) + * java.security.cert.X509CertSelector#addSubjectAlternativeName(int, String) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "addSubjectAlternativeName", - args = {int.class, java.lang.String.class} - ) public void test_addSubjectAlternativeNameLintLjava_lang_String2() throws Exception{ GeneralName san6 = new GeneralName(6, "http://uniform.Resource.Id"); GeneralName san2 = new GeneralName(2, "dNSName"); diff --git a/luni/src/test/java/tests/security/cert/X509Certificate2Test.java b/luni/src/test/java/tests/security/cert/X509Certificate2Test.java index d8e7100..5578234 100644 --- a/luni/src/test/java/tests/security/cert/X509Certificate2Test.java +++ b/luni/src/test/java/tests/security/cert/X509Certificate2Test.java @@ -17,11 +17,6 @@ package tests.security.cert; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; - import org.apache.harmony.security.tests.support.cert.TestUtils; import java.io.ByteArrayInputStream; @@ -41,18 +36,11 @@ import java.util.Set; import javax.security.auth.x500.X500Principal; -@TestTargetClass(X509Certificate.class) public class X509Certificate2Test extends junit.framework.TestCase { /** * Test for X.509 Certificate provider */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "toString", - args = {} - ) public void test_toString() throws Exception { // Regression for HARMONY-3384 @@ -70,14 +58,8 @@ public class X509Certificate2Test extends junit.framework.TestCase { } /** - * @tests java.security.cert.X509Certificate#X509Certificate() + * java.security.cert.X509Certificate#X509Certificate() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "X509Certificate", - args = {} - ) public void test_X509Certificate() { MyX509Certificate s = null; try { @@ -88,110 +70,6 @@ public class X509Certificate2Test extends junit.framework.TestCase { assertEquals("X.509", s.getType()); } - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "checkValidity", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "checkValidity", - args = {java.util.Date.class} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getBasicConstraints", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getIssuerDN", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getIssuerUniqueID", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getKeyUsage", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getNotAfter", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getNotBefore", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSerialNumber", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSigAlgName", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSigAlgOID", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSigAlgParams", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSignature", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSubjectDN", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSubjectUniqueID", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getTBSCertificate", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getVersion", - args = {} - ) - }) public void testAbstractMethods() { MyX509Certificate s = new MyX509Certificate(); try { @@ -395,27 +273,15 @@ public class X509Certificate2Test extends junit.framework.TestCase { } /** - * @tests java.security.cert.X509Certificate#getType() + * java.security.cert.X509Certificate#getType() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getType", - args = {} - ) public void testGetType() { assertEquals("X.509", new MyX509Certificate().getType()); } /** - * @tests java.security.cert.X509Certificate#getIssuerX500Principal() + * java.security.cert.X509Certificate#getIssuerX500Principal() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getIssuerX500Principal", - args = {} - ) public void testGetIssuerX500Principal() { // return valid encoding MyX509Certificate cert = new MyX509Certificate() { @@ -430,14 +296,8 @@ public class X509Certificate2Test extends junit.framework.TestCase { } /** - * @tests java.security.cert.X509Certificate#getSubjectX500Principal() + * java.security.cert.X509Certificate#getSubjectX500Principal() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getSubjectX500Principal", - args = {} - ) public void testGetSubjectX500Principal() { // return valid encoding MyX509Certificate cert = new MyX509Certificate() { @@ -453,14 +313,8 @@ public class X509Certificate2Test extends junit.framework.TestCase { /** * @throws CertificateException - * @tests java.security.cert.X509Certificate#getExtendedKeyUsage() + * java.security.cert.X509Certificate#getExtendedKeyUsage() */ - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "Doesn't verify CertificateParsingException.", - method = "getExtendedKeyUsage", - args = {} - ) public void testGetExtendedKeyUsage() throws CertificateException { assertNull(new MyX509Certificate().getExtendedKeyUsage()); @@ -490,14 +344,8 @@ public class X509Certificate2Test extends junit.framework.TestCase { } /** - * @tests java.security.cert.X509Certificate#getSubjectAlternativeNames() + * java.security.cert.X509Certificate#getSubjectAlternativeNames() */ - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "", - method = "getSubjectAlternativeNames", - args = {} - ) public void testGetSubjectAlternativeNames() throws CertificateParsingException { @@ -526,14 +374,8 @@ public class X509Certificate2Test extends junit.framework.TestCase { } /** - * @tests java.security.cert.X509Certificate#getIssuerAlternativeNames() + * java.security.cert.X509Certificate#getIssuerAlternativeNames() */ - @TestTargetNew( - level = TestLevel.SUFFICIENT, - notes = "Doesn't verify CertificateParsingException.", - method = "getIssuerAlternativeNames", - args = {} - ) public void testGetIssuerAlternativeNames() throws CertificateParsingException { @@ -560,13 +402,6 @@ public class X509Certificate2Test extends junit.framework.TestCase { assertTrue(coll.size() < 10); } - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - clazz = CertificateException.class, - method = "CertificateException", - args = {} - ) public void testCerficateException() { try { CertificateFactory cf = CertificateFactory.getInstance("X.509"); diff --git a/luni/src/test/java/tests/security/interfaces/DSAKeyPairGeneratorTest.java b/luni/src/test/java/tests/security/interfaces/DSAKeyPairGeneratorTest.java index 0f1df05..0e2fefe 100644 --- a/luni/src/test/java/tests/security/interfaces/DSAKeyPairGeneratorTest.java +++ b/luni/src/test/java/tests/security/interfaces/DSAKeyPairGeneratorTest.java @@ -16,10 +16,6 @@ package tests.security.interfaces; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.math.BigInteger; @@ -31,7 +27,6 @@ import java.security.InvalidParameterException; import org.apache.harmony.security.tests.support.interfaces.DSAKeyPairGeneratorImpl; -@TestTargetClass(DSAKeyPairGenerator.class) public class DSAKeyPairGeneratorTest extends TestCase { private final BigInteger p = new BigInteger("4"); @@ -46,15 +41,9 @@ public class DSAKeyPairGeneratorTest extends TestCase { } /** - * @tests java.security.interfaces.DSAKeyPairGenerator + * java.security.interfaces.DSAKeyPairGenerator * #initialize(DSAParams params, SecureRandom random) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "initialize", - args = {java.security.interfaces.DSAParams.class, java.security.SecureRandom.class} - ) public void test_DSAKeyPairGenerator01() { DSAParams dsaParams = new DSAParameterSpec(p, q, g); SecureRandom random = null; @@ -90,15 +79,9 @@ public class DSAKeyPairGeneratorTest extends TestCase { } /** - * @tests java.security.interfaces.DSAKeyPairGenerator + * java.security.interfaces.DSAKeyPairGenerator * #initialize(int modlen, boolean genParams, SecureRandom randomm) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "initialize", - args = {int.class, boolean.class, java.security.SecureRandom.class} - ) public void test_DSAKeyPairGenerator02() { int[] invalidLen = {-1, 0, 511, 513, 650, 1023, 1025}; DSAParams dsaParams = new DSAParameterSpec(p, q, g); diff --git a/luni/src/test/java/tests/security/interfaces/DSAKeyTest.java b/luni/src/test/java/tests/security/interfaces/DSAKeyTest.java index a8aa78a..a53cddb 100644 --- a/luni/src/test/java/tests/security/interfaces/DSAKeyTest.java +++ b/luni/src/test/java/tests/security/interfaces/DSAKeyTest.java @@ -15,9 +15,6 @@ */ package tests.security.interfaces; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; import junit.framework.TestCase; @@ -26,22 +23,15 @@ import java.security.interfaces.DSAKey; import java.security.interfaces.DSAParams; import java.security.spec.DSAParameterSpec; -@TestTargetClass(DSAKey.class) public class DSAKeyTest extends TestCase { /** - * @tests java.security.interfaces.DSAKey + * java.security.interfaces.DSAKey * #getParams() * test covers following use cases * Case 1: check private key * Case 2: check public key */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getParams", - args = {} - ) public void test_getParams() throws Exception { DSAParams param = new DSAParameterSpec(Util.P, Util.Q, Util.G); diff --git a/luni/src/test/java/tests/security/interfaces/DSAParamsTest.java b/luni/src/test/java/tests/security/interfaces/DSAParamsTest.java index 686d0f2..d07d5cd 100644 --- a/luni/src/test/java/tests/security/interfaces/DSAParamsTest.java +++ b/luni/src/test/java/tests/security/interfaces/DSAParamsTest.java @@ -14,9 +14,6 @@ * limitations under the License. */ package tests.security.interfaces; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; import junit.framework.TestCase; @@ -24,7 +21,6 @@ import java.math.BigInteger; import java.security.interfaces.DSAParams; import java.security.spec.DSAParameterSpec; -@TestTargetClass(DSAParams.class) public class DSAParamsTest extends TestCase { private final BigInteger p = new BigInteger("4"); @@ -32,45 +28,27 @@ public class DSAParamsTest extends TestCase { private final BigInteger g = BigInteger.ZERO; /** - * @tests java.security.interfaces.DSAParams + * java.security.interfaces.DSAParams * #getG() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getG", - args = {} - ) public void test_getG() { DSAParams params = new DSAParameterSpec(p, q, g); assertEquals("Invalid G", g, params.getG()); } /** - * @tests java.security.interfaces.DSAParams + * java.security.interfaces.DSAParams * #getP() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getP", - args = {} - ) public void test_getP() { DSAParams params = new DSAParameterSpec(p, q, g); assertEquals("Invalid P", p, params.getP()); } /** - * @tests java.security.interfaces.DSAParams + * java.security.interfaces.DSAParams * #getQ() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getQ", - args = {} - ) public void test_getQ() { DSAParams params = new DSAParameterSpec(p, q, g); assertEquals("Invalid Q", q, params.getQ()); diff --git a/luni/src/test/java/tests/security/interfaces/DSAPrivateKeyTest.java b/luni/src/test/java/tests/security/interfaces/DSAPrivateKeyTest.java index c08d5af..6cebda5 100644 --- a/luni/src/test/java/tests/security/interfaces/DSAPrivateKeyTest.java +++ b/luni/src/test/java/tests/security/interfaces/DSAPrivateKeyTest.java @@ -14,10 +14,6 @@ * limitations under the License. */ package tests.security.interfaces; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.BrokenTest; import junit.framework.TestCase; @@ -28,19 +24,12 @@ import java.security.interfaces.DSAPrivateKey; import java.security.interfaces.DSAPublicKey; import java.security.spec.DSAParameterSpec; -@TestTargetClass(DSAPrivateKey.class) public class DSAPrivateKeyTest extends TestCase { /** - * @tests java.security.interfaces.DSAPrivateKey + * java.security.interfaces.DSAPrivateKey * #getX() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getX", - args = {} - ) public void test_getX() throws Exception { KeyPairGenerator keyGen = KeyPairGenerator.getInstance("DSA"); keyGen.initialize(new DSAParameterSpec(Util.P, Util.Q, Util.G), diff --git a/luni/src/test/java/tests/security/interfaces/DSAPublicKeyTest.java b/luni/src/test/java/tests/security/interfaces/DSAPublicKeyTest.java index 533ead5..9fe4910 100644 --- a/luni/src/test/java/tests/security/interfaces/DSAPublicKeyTest.java +++ b/luni/src/test/java/tests/security/interfaces/DSAPublicKeyTest.java @@ -14,10 +14,6 @@ * limitations under the License. */ package tests.security.interfaces; -import dalvik.annotation.BrokenTest; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; import junit.framework.TestCase; @@ -28,23 +24,16 @@ import java.security.interfaces.DSAPrivateKey; import java.security.interfaces.DSAPublicKey; import java.security.spec.DSAParameterSpec; -@TestTargetClass(DSAPublicKey.class) public class DSAPublicKeyTest extends TestCase { /** - * @tests java.security.interfaces.DSAPublicKey + * java.security.interfaces.DSAPublicKey * #getY() * test covers following use cases * Case 1: check with predefined p, q, g, x * Case 2: check with random p, q, g, x. It takes some time (up to * minute) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getY", - args = {} - ) public void test_getY() throws Exception { KeyPairGenerator keyGen = null; KeyPair keys = null; diff --git a/luni/src/test/java/tests/security/interfaces/RSAKeyTest.java b/luni/src/test/java/tests/security/interfaces/RSAKeyTest.java index 63c4df4..9f2830d 100644 --- a/luni/src/test/java/tests/security/interfaces/RSAKeyTest.java +++ b/luni/src/test/java/tests/security/interfaces/RSAKeyTest.java @@ -14,9 +14,6 @@ * limitations under the License. */ package tests.security.interfaces; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; import junit.framework.TestCase; @@ -26,22 +23,15 @@ import java.security.interfaces.RSAKey; import java.security.spec.RSAPrivateKeySpec; import java.security.spec.RSAPublicKeySpec; -@TestTargetClass(RSAKey.class) public class RSAKeyTest extends TestCase { /** - * @tests java.security.interfaces.RSAKey + * java.security.interfaces.RSAKey * #getModulus() * test covers following use cases * Case 1: check private key * Case 2: check public key */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getModulus", - args = {} - ) public void test_getModulus() throws Exception { KeyFactory gen = KeyFactory.getInstance("RSA"); final BigInteger n = BigInteger.valueOf(3233); diff --git a/luni/src/test/java/tests/security/interfaces/RSAMultiPrimePrivateCrtKeyTest.java b/luni/src/test/java/tests/security/interfaces/RSAMultiPrimePrivateCrtKeyTest.java index 86d4ae5..dca8de7 100644 --- a/luni/src/test/java/tests/security/interfaces/RSAMultiPrimePrivateCrtKeyTest.java +++ b/luni/src/test/java/tests/security/interfaces/RSAMultiPrimePrivateCrtKeyTest.java @@ -16,11 +16,6 @@ package tests.security.interfaces; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.math.BigInteger; @@ -29,7 +24,6 @@ import java.security.spec.RSAOtherPrimeInfo; import org.apache.harmony.security.tests.support.interfaces.RSAMultiPrimePrivateCrtKeyImpl; -@TestTargetClass(RSAMultiPrimePrivateCrtKey.class) public class RSAMultiPrimePrivateCrtKeyTest extends TestCase { /** @@ -61,51 +55,13 @@ public class RSAMultiPrimePrivateCrtKeyTest extends TestCase { } /** - * @tests java.security.interfaces.RSAMultiPrimePrivateCrtKey#getCrtCoefficient() - * @tests java.security.interfaces.RSAMultiPrimePrivateCrtKey#getPrimeExponentP() - * @tests java.security.interfaces.RSAMultiPrimePrivateCrtKey#getPrimeExponentQ() - * @tests java.security.interfaces.RSAMultiPrimePrivateCrtKey#getPrimeP() - * @tests java.security.interfaces.RSAMultiPrimePrivateCrtKey#getPrimeQ() - * @tests java.security.interfaces.RSAMultiPrimePrivateCrtKey#getPublicExponent() + * java.security.interfaces.RSAMultiPrimePrivateCrtKey#getCrtCoefficient() + * java.security.interfaces.RSAMultiPrimePrivateCrtKey#getPrimeExponentP() + * java.security.interfaces.RSAMultiPrimePrivateCrtKey#getPrimeExponentQ() + * java.security.interfaces.RSAMultiPrimePrivateCrtKey#getPrimeP() + * java.security.interfaces.RSAMultiPrimePrivateCrtKey#getPrimeQ() + * java.security.interfaces.RSAMultiPrimePrivateCrtKey#getPublicExponent() */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getCrtCoefficient", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPrimeExponentP", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPrimeExponentQ", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPrimeP", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPrimeQ", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPublicExponent", - args = {} - ) - }) public void test_RSAMultiPrimePrivateCrtKey() { RSAMulti rsam = new RSAMulti(publicExponent, primeExponentP, primeExponentQ, primeP, primeQ, crtCoefficient, opi); @@ -122,14 +78,8 @@ public class RSAMultiPrimePrivateCrtKeyTest extends TestCase { } /** - * @tests java.security.interfaces.RSAMultiPrimePrivateCrtKey#getOtherPrimeInfo() + * java.security.interfaces.RSAMultiPrimePrivateCrtKey#getOtherPrimeInfo() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getOtherPrimeInfo", - args = {} - ) public void test_getOtherPrimeInfo() { RSAMulti rsam = new RSAMulti(publicExponent, primeExponentP, primeExponentQ, primeP, primeQ, crtCoefficient, null); @@ -147,4 +97,4 @@ public class RSAMultiPrimePrivateCrtKeyTest extends TestCase { fail("Unexpected exception: " + e); } } -}
\ No newline at end of file +} diff --git a/luni/src/test/java/tests/security/interfaces/RSAPrivateCrtKeyTest.java b/luni/src/test/java/tests/security/interfaces/RSAPrivateCrtKeyTest.java index 8d0ef80..d0c794c 100644 --- a/luni/src/test/java/tests/security/interfaces/RSAPrivateCrtKeyTest.java +++ b/luni/src/test/java/tests/security/interfaces/RSAPrivateCrtKeyTest.java @@ -14,16 +14,12 @@ * limitations under the License. */ package tests.security.interfaces; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; import junit.framework.TestCase; import java.security.KeyFactory; import java.security.interfaces.RSAPrivateCrtKey; -@TestTargetClass(RSAPrivateCrtKey.class) public class RSAPrivateCrtKeyTest extends TestCase { RSAPrivateCrtKey key = null; @@ -35,90 +31,54 @@ public class RSAPrivateCrtKeyTest extends TestCase { } /** - * @tests java.security.interfaces.RSAPrivateCrtKey + * java.security.interfaces.RSAPrivateCrtKey * #getCrtCoefficient() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getCrtCoefficient", - args = {} - ) public void test_getCrtCoefficient() { assertEquals("invalid CRT coefficient", Util.rsaCrtParam.getCrtCoefficient(), key.getCrtCoefficient()); } /** - * @tests java.security.interfaces.RSAPrivateCrtKey + * java.security.interfaces.RSAPrivateCrtKey * #getPrimeExponentP() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPrimeExponentP", - args = {} - ) public void test_getPrimeExponentP() { assertEquals("invalid prime exponent P", Util.rsaCrtParam.getPrimeExponentP(), key.getPrimeExponentP()); } /** - * @tests java.security.interfaces.RSAPrivateCrtKey + * java.security.interfaces.RSAPrivateCrtKey * #getPrimeExponentQ() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPrimeExponentQ", - args = {} - ) public void test_getPrimeExponentQ() { assertEquals("invalid prime exponent Q", Util.rsaCrtParam.getPrimeExponentQ(), key.getPrimeExponentQ()); } /** - * @tests java.security.interfaces.RSAPrivateCrtKey + * java.security.interfaces.RSAPrivateCrtKey * #getPrimeP() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPrimeP", - args = {} - ) public void test_getPrimeP() { assertEquals("invalid prime P", Util.rsaCrtParam.getPrimeP(), key.getPrimeP()); } /** - * @tests java.security.interfaces.RSAPrivateCrtKey + * java.security.interfaces.RSAPrivateCrtKey * #getPrimeQ() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPrimeQ", - args = {} - ) public void test_getPrimeQ() { assertEquals("invalid prime Q", Util.rsaCrtParam.getPrimeQ(), key.getPrimeQ()); } /** - * @tests java.security.interfaces.RSAPrivateCrtKey + * java.security.interfaces.RSAPrivateCrtKey * #getPublicExponent() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPublicExponent", - args = {} - ) public void test_getPublicExponent() { assertEquals("invalid public exponent", Util.rsaCrtParam.getPublicExponent(), key.getPublicExponent()); diff --git a/luni/src/test/java/tests/security/interfaces/RSAPrivateKeyTest.java b/luni/src/test/java/tests/security/interfaces/RSAPrivateKeyTest.java index fdd1018..a5035a9 100644 --- a/luni/src/test/java/tests/security/interfaces/RSAPrivateKeyTest.java +++ b/luni/src/test/java/tests/security/interfaces/RSAPrivateKeyTest.java @@ -14,9 +14,6 @@ * limitations under the License. */ package tests.security.interfaces; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; import junit.framework.TestCase; @@ -25,19 +22,12 @@ import java.security.KeyFactory; import java.security.interfaces.RSAPrivateKey; import java.security.spec.RSAPrivateKeySpec; -@TestTargetClass(RSAPrivateKey.class) public class RSAPrivateKeyTest extends TestCase { /** - * @tests java.security.interfaces.RSAPrivateKey + * java.security.interfaces.RSAPrivateKey * #getPrivateExponent() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPrivateExponent", - args = {} - ) public void test_getPrivateExponent() throws Exception { KeyFactory gen = KeyFactory.getInstance("RSA"); final BigInteger n = BigInteger.valueOf(3233); diff --git a/luni/src/test/java/tests/security/interfaces/RSAPublicKeyTest.java b/luni/src/test/java/tests/security/interfaces/RSAPublicKeyTest.java index f3aaaac..09919af 100644 --- a/luni/src/test/java/tests/security/interfaces/RSAPublicKeyTest.java +++ b/luni/src/test/java/tests/security/interfaces/RSAPublicKeyTest.java @@ -14,9 +14,6 @@ * limitations under the License. */ package tests.security.interfaces; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; import junit.framework.TestCase; @@ -25,19 +22,12 @@ import java.security.KeyFactory; import java.security.interfaces.RSAPublicKey; import java.security.spec.RSAPublicKeySpec; -@TestTargetClass(RSAPublicKey.class) public class RSAPublicKeyTest extends TestCase { /** - * @tests java.security.interfaces.RSAPublicKey + * java.security.interfaces.RSAPublicKey * #getPublicExponent() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPublicExponent", - args = {} - ) public void test_getPublicExponent() throws Exception { KeyFactory gen = KeyFactory.getInstance("RSA"); final BigInteger n = BigInteger.valueOf(3233); diff --git a/luni/src/test/java/tests/security/spec/DSAParameterSpecTest.java b/luni/src/test/java/tests/security/spec/DSAParameterSpecTest.java index 408e74b..c270a0e 100644 --- a/luni/src/test/java/tests/security/spec/DSAParameterSpecTest.java +++ b/luni/src/test/java/tests/security/spec/DSAParameterSpecTest.java @@ -22,11 +22,6 @@ package tests.security.spec; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.math.BigInteger; @@ -37,18 +32,11 @@ import java.security.spec.DSAParameterSpec; * Tests for <code>DSAParameterSpec</code> * */ -@TestTargetClass(DSAParameterSpec.class) public class DSAParameterSpecTest extends TestCase { /** * Ctor test */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "DSAParameterSpec", - args = {java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class} - ) public final void testDSAParameterSpec() { AlgorithmParameterSpec aps = new DSAParameterSpec( new BigInteger("1"), @@ -61,12 +49,6 @@ public class DSAParameterSpecTest extends TestCase { /** * getG() test */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getG", - args = {} - ) public final void testGetG() { DSAParameterSpec dps = new DSAParameterSpec( new BigInteger("1"), @@ -79,12 +61,6 @@ public class DSAParameterSpecTest extends TestCase { /** * getP() test */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getP", - args = {} - ) public final void testGetP() { DSAParameterSpec dps = new DSAParameterSpec( new BigInteger("1"), @@ -97,12 +73,6 @@ public class DSAParameterSpecTest extends TestCase { /** * getQ() test */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getQ", - args = {} - ) public final void testGetQ() { DSAParameterSpec dps = new DSAParameterSpec( new BigInteger("1"), diff --git a/luni/src/test/java/tests/security/spec/DSAPrivateKeySpecTest.java b/luni/src/test/java/tests/security/spec/DSAPrivateKeySpecTest.java index b44e29b..98bd8f0 100644 --- a/luni/src/test/java/tests/security/spec/DSAPrivateKeySpecTest.java +++ b/luni/src/test/java/tests/security/spec/DSAPrivateKeySpecTest.java @@ -22,11 +22,6 @@ package tests.security.spec; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.math.BigInteger; @@ -37,18 +32,11 @@ import java.security.spec.KeySpec; * Tests for <code>DSAPrivateKeySpec</code> * */ -@TestTargetClass(DSAPrivateKeySpec.class) public class DSAPrivateKeySpecTest extends TestCase { /** * Test for constructor */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "DSAPrivateKeySpec", - args = {java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class} - ) public final void testDSAPrivateKeySpec() { KeySpec ks = new DSAPrivateKeySpec( new BigInteger("1"), @@ -62,12 +50,6 @@ public class DSAPrivateKeySpecTest extends TestCase { /** * getG() test */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getG", - args = {} - ) public final void testGetG() { DSAPrivateKeySpec dpks = new DSAPrivateKeySpec( new BigInteger("1"), @@ -81,12 +63,6 @@ public class DSAPrivateKeySpecTest extends TestCase { /** * getP() test */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getP", - args = {} - ) public final void testGetP() { DSAPrivateKeySpec dpks = new DSAPrivateKeySpec( new BigInteger("1"), @@ -100,12 +76,6 @@ public class DSAPrivateKeySpecTest extends TestCase { /** * getQ() test */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getQ", - args = {} - ) public final void testGetQ() { DSAPrivateKeySpec dpks = new DSAPrivateKeySpec( new BigInteger("1"), @@ -119,12 +89,6 @@ public class DSAPrivateKeySpecTest extends TestCase { /** * getX() test */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getX", - args = {} - ) public final void testGetX() { DSAPrivateKeySpec dpks = new DSAPrivateKeySpec( new BigInteger("1"), diff --git a/luni/src/test/java/tests/security/spec/DSAPublicKeySpecTest.java b/luni/src/test/java/tests/security/spec/DSAPublicKeySpecTest.java index 6dfecd9..1921566 100644 --- a/luni/src/test/java/tests/security/spec/DSAPublicKeySpecTest.java +++ b/luni/src/test/java/tests/security/spec/DSAPublicKeySpecTest.java @@ -22,11 +22,6 @@ package tests.security.spec; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.math.BigInteger; @@ -37,18 +32,11 @@ import java.security.spec.KeySpec; * Tests for <code>DSAPublicKeySpec</code> * */ -@TestTargetClass(DSAPublicKeySpec.class) public class DSAPublicKeySpecTest extends TestCase { /** * Test for <code>DSAPublicKeySpec</code> ctor */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "DSAPublicKeySpec", - args = {java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class} - ) public final void testDSAPublicKeySpec() { KeySpec ks = new DSAPublicKeySpec( new BigInteger("1"), // y @@ -62,12 +50,6 @@ public class DSAPublicKeySpecTest extends TestCase { /** * Test for <code>getG</code> method */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getG", - args = {} - ) public final void testGetG() { DSAPublicKeySpec dpks = new DSAPublicKeySpec( new BigInteger("1"), // y @@ -81,12 +63,6 @@ public class DSAPublicKeySpecTest extends TestCase { /** * Test for <code>getP</code> method */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getP", - args = {} - ) public final void testGetP() { DSAPublicKeySpec dpks = new DSAPublicKeySpec( new BigInteger("1"), // y @@ -100,12 +76,6 @@ public class DSAPublicKeySpecTest extends TestCase { /** * Test for <code>getQ</code> method */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getQ", - args = {} - ) public final void testGetQ() { DSAPublicKeySpec dpks = new DSAPublicKeySpec( new BigInteger("1"), // y @@ -119,12 +89,6 @@ public class DSAPublicKeySpecTest extends TestCase { /** * Test for <code>getY</code> method */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getY", - args = {} - ) public final void testGetY() { DSAPublicKeySpec dpks = new DSAPublicKeySpec( new BigInteger("1"), // y diff --git a/luni/src/test/java/tests/security/spec/ECFieldF2mTest.java b/luni/src/test/java/tests/security/spec/ECFieldF2mTest.java index ae26df7..6e541c3 100644 --- a/luni/src/test/java/tests/security/spec/ECFieldF2mTest.java +++ b/luni/src/test/java/tests/security/spec/ECFieldF2mTest.java @@ -22,11 +22,6 @@ package tests.security.spec; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.math.BigInteger; @@ -38,7 +33,6 @@ import java.util.Random; * Tests for <code>ECFieldF2m</code> class fields and methods. * */ -@TestTargetClass(ECFieldF2m.class) public class ECFieldF2mTest extends TestCase { /** @@ -132,12 +126,6 @@ public class ECFieldF2mTest extends TestCase { * * Assertion: IllegalArgumentException if m is not positive. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "ECFieldF2m", - args = {int.class} - ) public final void testECFieldF2mint() { for(int i=0; i<intCtorTestParameters.length; i++) { ECFieldF2mDomainParams tp = intCtorTestParameters[i]; @@ -263,12 +251,6 @@ public class ECFieldF2mTest extends TestCase { * * Assertion: IllegalArgumentException if ks is invalid. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "ECFieldF2m", - args = {int.class, int[].class} - ) public final void testECFieldF2mintintArray() { for(int i=0; i<constructorTestParameters.length; i++) { ECFieldF2mDomainParams tp = constructorTestParameters[i]; @@ -308,11 +290,6 @@ public class ECFieldF2mTest extends TestCase { * * Assertion: IllegalArgumentException if rp is invalid. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - method = "ECFieldF2m", - args = {int.class, java.math.BigInteger.class} - ) public final void testECFieldF2mintBigInteger() { for(int i=0; i<constructorTestParameters.length; i++) { ECFieldF2mDomainParams tp = constructorTestParameters[i]; @@ -343,12 +320,6 @@ public class ECFieldF2mTest extends TestCase { * Assertion: must return the same value if invoked * repeatedly on the same object. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "hashCode", - args = {} - ) public final void testHashCode01() { ECFieldF2m f = new ECFieldF2m(2000); int hc = f.hashCode(); @@ -368,12 +339,6 @@ public class ECFieldF2mTest extends TestCase { * Assertion: must return the same value if invoked * repeatedly on the same object. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "hashCode", - args = {} - ) public final void testHashCode02() { ECFieldF2m f = new ECFieldF2m(2000, new int[] {981, 2, 1}); int hc = f.hashCode(); @@ -393,12 +358,6 @@ public class ECFieldF2mTest extends TestCase { * Assertion: must return the same value if invoked * on equal (according to the <code>equals(Object)</code> method) objects. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "hashCode", - args = {} - ) public final void testHashCode03() { assertTrue(new ECFieldF2m(111).hashCode() == new ECFieldF2m(111).hashCode()); @@ -410,12 +369,6 @@ public class ECFieldF2mTest extends TestCase { * Assertion: must return the same value if invoked * on equal (according to the <code>equals(Object)</code> method) objects. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "hashCode", - args = {} - ) public final void testHashCode04() { assertTrue(new ECFieldF2m(2000, new int[] {981, 2, 1}).hashCode() == new ECFieldF2m(2000, new int[] {981, 2, 1}).hashCode()); @@ -427,12 +380,6 @@ public class ECFieldF2mTest extends TestCase { * Assertion: must return the same value if invoked * on equal (according to the <code>equals(Object)</code> method) objects. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "hashCode", - args = {} - ) public final void testHashCode05() { assertTrue(new ECFieldF2m(2000, new int[] {981, 2, 1}).hashCode() == new ECFieldF2m(2000, BigInteger.valueOf(0L). @@ -445,12 +392,6 @@ public class ECFieldF2mTest extends TestCase { * * Assertion: object equals to itself. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "equals", - args = {java.lang.Object.class} - ) public final void testEqualsObject01() { ECFieldF2m obj = new ECFieldF2m(1999, new int[] {367}); assertTrue(obj.equals(obj)); @@ -461,12 +402,6 @@ public class ECFieldF2mTest extends TestCase { * * Assertion: normal basis - objects equal if their m are equal. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Simple test. Doesn't verify other cases.", - method = "equals", - args = {java.lang.Object.class} - ) public final void testEqualsObject02() { assertTrue(new ECFieldF2m(43).equals(new ECFieldF2m(43))); } @@ -477,12 +412,6 @@ public class ECFieldF2mTest extends TestCase { * Assertion: trinomial basis - objects equal if their m, and rp * are mutually equal. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "equals", - args = {java.lang.Object.class} - ) public final void testEqualsObject03() { assertTrue(new ECFieldF2m(1999, new int[] {367}).equals( new ECFieldF2m(1999, BigInteger.valueOf(0L). @@ -495,12 +424,6 @@ public class ECFieldF2mTest extends TestCase { * Assertion: pentanomial basis - objects equal if their m, and rp * are mutually equal. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "equals", - args = {java.lang.Object.class} - ) public final void testEqualsObject04() { ECFieldF2m f1 = new ECFieldF2m(2000, new int[] {981, 2, 1}); ECFieldF2m f2 = new ECFieldF2m(2000, BigInteger.valueOf(0L). @@ -514,12 +437,6 @@ public class ECFieldF2mTest extends TestCase { * * Assertion: objects equal if their m, and rp are mutually equal. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "equals", - args = {java.lang.Object.class} - ) public final void testEqualsObject05() { ECFieldF2m f1 = new ECFieldF2m(2000); ECFieldF2m f2 = new ECFieldF2m(2000, BigInteger.valueOf(0L). @@ -533,12 +450,6 @@ public class ECFieldF2mTest extends TestCase { * * Assertion: returns false if obj is <code>null</code> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "equals", - args = {java.lang.Object.class} - ) public final void testEqualsObject06() { assertFalse(new ECFieldF2m(2000).equals(null)); } @@ -548,12 +459,6 @@ public class ECFieldF2mTest extends TestCase { * * Assertion: returns false if obj is not instance of <code>ECFieldF2m</code> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "equals", - args = {java.lang.Object.class} - ) public final void testEqualsObject07() { assertFalse(new ECFieldF2m(2000).equals(new Object())); } @@ -563,12 +468,6 @@ public class ECFieldF2mTest extends TestCase { * * Assertion: returns m value for <code>ECFieldF2m</code> */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getFieldSize", - args = {} - ) public final void testGetFieldSize() { assertEquals(2000, new ECFieldF2m(2000).getFieldSize()); } @@ -578,12 +477,6 @@ public class ECFieldF2mTest extends TestCase { * * Assertion: returns m value for <code>ECFieldF2m</code> */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getM", - args = {} - ) public final void testGetM() { assertEquals(2000, new ECFieldF2m(2000).getM()); } @@ -593,12 +486,6 @@ public class ECFieldF2mTest extends TestCase { * * Assertion: returns mid terms of reduction polynomial */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that getMidTermsOfReductionPolynomial method returns mid terms of reduction polynomial.", - method = "getMidTermsOfReductionPolynomial", - args = {} - ) public final void testGetMidTermsOfReductionPolynomial01() { int[] a = new int[] {981,2,1}; int[] b = new ECFieldF2m(2000, @@ -613,12 +500,6 @@ public class ECFieldF2mTest extends TestCase { * * Assertion: returns null for normal basis */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that getMidTermsOfReductionPolynomial method returns null for normal basis.", - method = "getMidTermsOfReductionPolynomial", - args = {} - ) public final void testGetMidTermsOfReductionPolynomial02() { assertNull(new ECFieldF2m(2000).getMidTermsOfReductionPolynomial()); } @@ -628,12 +509,6 @@ public class ECFieldF2mTest extends TestCase { * * Assertion: returns mid terms of reduction polynomial */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that getMidTermsOfReductionPolynomial method returns mid terms of reduction polynomial.", - method = "getMidTermsOfReductionPolynomial", - args = {} - ) public final void testGetMidTermsOfReductionPolynomial03() { int[] a = new int[] {367}; int[] b = new ECFieldF2m(1999, a).getMidTermsOfReductionPolynomial(); @@ -645,12 +520,6 @@ public class ECFieldF2mTest extends TestCase { * * Assertion: returns reduction polynomial */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that getReductionPolynomial method returns reduction polynomial.", - method = "getReductionPolynomial", - args = {} - ) public final void testGetReductionPolynomial01() { BigInteger rp = BigInteger.valueOf(0L).setBit(0).setBit(1).setBit(2). setBit(981).setBit(2000); @@ -662,12 +531,6 @@ public class ECFieldF2mTest extends TestCase { * * Assertion: returns null for normal basis */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that getReductionPolynomial method returns null for normal basis.", - method = "getReductionPolynomial", - args = {} - ) public final void testGetReductionPolynomial02() { assertNull(new ECFieldF2m(2000).getReductionPolynomial()); } @@ -676,12 +539,6 @@ public class ECFieldF2mTest extends TestCase { * Tests that object state is preserved against modifications * through array reference passed to the constructor. */ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies that object state is preserved against modifications through array reference passed to the constructor.", - method = "ECFieldF2m", - args = {int.class, int[].class} - ) public final void testIsStatePreserved01() { // reference array int[] a = new int[] {367}; @@ -700,20 +557,6 @@ public class ECFieldF2mTest extends TestCase { * modifications through array reference returned by * <code>getMidTermsOfReductionPolynomial()</code> method. */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies that object state is preserved against modifications through array reference returned by getMidTermsOfReductionPolynomial() method.", - method = "ECFieldF2m", - args = {int.class, int[].class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Verifies that object state is preserved against modifications through array reference returned by getMidTermsOfReductionPolynomial() method.", - method = "getMidTermsOfReductionPolynomial", - args = {} - ) - }) public final void testIsStatePreserved02() { // reference array int[] a = new int[] {981,2,1}; diff --git a/luni/src/test/java/tests/security/spec/ECFieldFpTest.java b/luni/src/test/java/tests/security/spec/ECFieldFpTest.java index aacb4b3..838ead0 100644 --- a/luni/src/test/java/tests/security/spec/ECFieldFpTest.java +++ b/luni/src/test/java/tests/security/spec/ECFieldFpTest.java @@ -22,11 +22,6 @@ package tests.security.spec; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.math.BigInteger; @@ -36,7 +31,6 @@ import java.security.spec.ECFieldFp; * Tests for <code>ECFieldFp</code> class fields and methods. * */ -@TestTargetClass(ECFieldFp.class) public class ECFieldFpTest extends TestCase { // @@ -49,12 +43,6 @@ public class ECFieldFpTest extends TestCase { * Assertion: creates new object of <code>ECFieldFp</code> class * using valid <code>p</code> (odd prime) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "ECFieldFp", - args = {java.math.BigInteger.class} - ) public final void testECFieldFp01() { new ECFieldFp(BigInteger.valueOf(23L)); } @@ -65,12 +53,6 @@ public class ECFieldFpTest extends TestCase { * Assertion: creates new object of <code>ECFieldFp</code> class * using valid <code>p</code> (odd but not prime) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "ECFieldFp", - args = {java.math.BigInteger.class} - ) public final void testECFieldFp02() { new ECFieldFp(BigInteger.valueOf(21L)); } @@ -80,12 +62,6 @@ public class ECFieldFpTest extends TestCase { * * Assertion: IllegalArgumentException if <code>p</code> is not positive */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "ECFieldFp", - args = {java.math.BigInteger.class} - ) public final void testECFieldFp03() { try { new ECFieldFp(BigInteger.valueOf(-1L)); @@ -100,12 +76,6 @@ public class ECFieldFpTest extends TestCase { * * Assertion: IllegalArgumentException if <code>p</code> is not positive */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "ECFieldFp", - args = {java.math.BigInteger.class} - ) public final void testECFieldFp04() { try { new ECFieldFp(BigInteger.valueOf(0L)); @@ -120,12 +90,6 @@ public class ECFieldFpTest extends TestCase { * * Assertion: NullPointerException if <code>p</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "ECFieldFp", - args = {java.math.BigInteger.class} - ) public final void testECFieldFp05() { try { new ECFieldFp(null); @@ -141,12 +105,6 @@ public class ECFieldFpTest extends TestCase { * Assertion: must return the same value if invoked * repeatedly on the same object. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "hashCode", - args = {} - ) public final void testHashCode01() { ECFieldFp f = new ECFieldFp(BigInteger.valueOf(23L)); int hc = f.hashCode(); @@ -166,12 +124,6 @@ public class ECFieldFpTest extends TestCase { * Assertion: must return the same value if invoked * on equal (according to the <code>equals(Object)</code> method) objects. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "hashCode", - args = {} - ) public final void testHashCode02() { assertTrue(new ECFieldFp(BigInteger.valueOf(23L)).hashCode() == new ECFieldFp(BigInteger.valueOf(23L)).hashCode()); @@ -182,12 +134,6 @@ public class ECFieldFpTest extends TestCase { * * Assertion: returns field size in bits which is prime size */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getFieldSize", - args = {} - ) public final void testGetFieldSize() { assertEquals(5, new ECFieldFp(BigInteger.valueOf(23L)).getFieldSize()); } @@ -197,12 +143,6 @@ public class ECFieldFpTest extends TestCase { * * Assertion: returns prime */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getP", - args = {} - ) public final void testGetP() { BigInteger p = BigInteger.valueOf(23L); assertTrue(p.equals(new ECFieldFp(p).getP())); @@ -213,12 +153,6 @@ public class ECFieldFpTest extends TestCase { * * Assertion: object equals to itself. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "equals", - args = {java.lang.Object.class} - ) public final void testEqualsObject01() { ECFieldFp obj = new ECFieldFp(BigInteger.valueOf(23L)); assertTrue(obj.equals(obj)); @@ -229,12 +163,6 @@ public class ECFieldFpTest extends TestCase { * * Assertion: returns false if <code>obj</code> is <code>null</code> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "equals", - args = {java.lang.Object.class} - ) public final void testEqualsObject02() { assertFalse(new ECFieldFp(BigInteger.valueOf(23L)).equals(null)); } @@ -245,12 +173,6 @@ public class ECFieldFpTest extends TestCase { * Assertion: returns false if <code>obj</code> * is not instance of <code>ECFieldFp</code> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "equals", - args = {java.lang.Object.class} - ) public final void testEqualsObject03() { assertFalse(new ECFieldFp(BigInteger.valueOf(23L)).equals(new Object())); } @@ -260,12 +182,6 @@ public class ECFieldFpTest extends TestCase { * * Assertion: true if prime values match. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "equals", - args = {java.lang.Object.class} - ) public final void testEqualsObject04() { assertTrue(new ECFieldFp(BigInteger.valueOf(23L)).equals( new ECFieldFp(BigInteger.valueOf(23L)))); diff --git a/luni/src/test/java/tests/security/spec/ECGenParameterSpecTest.java b/luni/src/test/java/tests/security/spec/ECGenParameterSpecTest.java index 343d4ce..f3a3913 100644 --- a/luni/src/test/java/tests/security/spec/ECGenParameterSpecTest.java +++ b/luni/src/test/java/tests/security/spec/ECGenParameterSpecTest.java @@ -22,11 +22,6 @@ package tests.security.spec; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.security.spec.ECGenParameterSpec; @@ -35,7 +30,6 @@ import java.security.spec.ECGenParameterSpec; * Tests for <code>ECGenParameterSpec</code> class fields and methods. * */ -@TestTargetClass(ECGenParameterSpec.class) public class ECGenParameterSpecTest extends TestCase { // @@ -48,12 +42,6 @@ public class ECGenParameterSpecTest extends TestCase { * Assertion: creates new object of <code>ECGenParameterSpec</code> class * using valid <code>name</code> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "ECGenParameterSpec", - args = {java.lang.String.class} - ) public final void testECGenParameterSpec01() { new ECGenParameterSpec("someName"); } @@ -64,12 +52,6 @@ public class ECGenParameterSpecTest extends TestCase { * Assertion: throws NullPointerException * if <code>name</code> is <code>null</code> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "ECGenParameterSpec", - args = {java.lang.String.class} - ) public final void testECGenParameterSpec02() { try { new ECGenParameterSpec(null); @@ -82,12 +64,6 @@ public class ECGenParameterSpecTest extends TestCase { * * Assertion: returns the <code>name</code> */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getName", - args = {} - ) public final void testGetName() { String name = "someName"; ECGenParameterSpec ps = new ECGenParameterSpec(name); diff --git a/luni/src/test/java/tests/security/spec/ECParameterSpecTest.java b/luni/src/test/java/tests/security/spec/ECParameterSpecTest.java index 3b4b9a3..cb1c66e 100644 --- a/luni/src/test/java/tests/security/spec/ECParameterSpecTest.java +++ b/luni/src/test/java/tests/security/spec/ECParameterSpecTest.java @@ -16,11 +16,6 @@ package tests.security.spec; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.math.BigInteger; @@ -29,7 +24,6 @@ import java.security.spec.ECParameterSpec; import java.security.spec.ECPoint; import java.security.spec.EllipticCurve; -@TestTargetClass(ECParameterSpec.class) public class ECParameterSpecTest extends TestCase { EllipticCurve curve; @@ -63,12 +57,6 @@ public class ECParameterSpecTest extends TestCase { * case 5: IllegalArgumentException - if n is not positive * case 6: IllegalArgumentException - if h is not positive */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "ECParameterSpec", - args = {java.security.spec.EllipticCurve.class, java.security.spec.ECPoint.class, java.math.BigInteger.class, int.class} - ) public void test_constructorLjava_security_spec_EllipticCurveLjava_security_spec_ECPointLjava_math_BigIntegerI() { // case 1: creating object with valid parameters @@ -123,12 +111,6 @@ public class ECParameterSpecTest extends TestCase { /** * test for getCurve() method */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getCurve", - args = {} - ) public void test_GetCurve() { assertEquals("wrong elliptic curve", curve, ecps.getCurve()); } @@ -136,12 +118,6 @@ public class ECParameterSpecTest extends TestCase { /** * test for getGenerator() method */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getGenerator", - args = {} - ) public void test_GetGenerator() { assertEquals("wrong generator was returned", ecpoint, ecps .getGenerator()); @@ -150,12 +126,6 @@ public class ECParameterSpecTest extends TestCase { /** * test for getOrder() method */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getOrder", - args = {} - ) public void test_GetOrder() { assertEquals("wrong order was reteurned", BigInteger.valueOf(1), ecps .getOrder()); @@ -164,12 +134,6 @@ public class ECParameterSpecTest extends TestCase { /** * test for getCofactor() method */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getCofactor", - args = {} - ) public void test_GetCofactor() { assertEquals("wrong cofactor was returned", 1, ecps.getCofactor()); } diff --git a/luni/src/test/java/tests/security/spec/ECPointTest.java b/luni/src/test/java/tests/security/spec/ECPointTest.java index 515e62c..e240f3c 100644 --- a/luni/src/test/java/tests/security/spec/ECPointTest.java +++ b/luni/src/test/java/tests/security/spec/ECPointTest.java @@ -22,11 +22,6 @@ package tests.security.spec; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.math.BigInteger; @@ -36,7 +31,6 @@ import java.security.spec.ECPoint; * Tests for <code>ECPoint</code> class fields and methods. * */ -@TestTargetClass(ECPoint.class) public class ECPointTest extends TestCase { // @@ -49,12 +43,6 @@ public class ECPointTest extends TestCase { * Test preconditions: valid parameters passed<br> * Expected: must pass without any exceptions */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies positive cases.", - method = "ECPoint", - args = {java.math.BigInteger.class, java.math.BigInteger.class} - ) public final void testECPoint01() { new ECPoint(BigInteger.ZERO, BigInteger.ZERO); new ECPoint(BigInteger.valueOf(-23456L), BigInteger.valueOf(-23456L)); @@ -70,12 +58,6 @@ public class ECPointTest extends TestCase { * Test preconditions: pass <code>null</code> as mentioned parameters<br> * Expected: must throw <code>NullPointerException</code> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies exceptions.", - method = "ECPoint", - args = {java.math.BigInteger.class, java.math.BigInteger.class} - ) public final void testECPoint02() { // test case 1: x is null try { @@ -110,12 +92,6 @@ public class ECPointTest extends TestCase { * which is equal to the one passed to the constructor; * (both must refer the same object) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies positive case.", - method = "getAffineX", - args = {} - ) public final void testGetAffineX01() { BigInteger x = BigInteger.valueOf(-23456L); ECPoint p = new ECPoint(x, BigInteger.valueOf(23456L)); @@ -131,12 +107,6 @@ public class ECPointTest extends TestCase { * Expected: must return <code>null</code> for * <code>ECPoint.POINT_INFINITY</code> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that getAffineX returns null for POINT_INFINITY.", - method = "getAffineX", - args = {} - ) public final void testGetAffineX02() { assertNull(ECPoint.POINT_INFINITY.getAffineX()); } @@ -150,12 +120,6 @@ public class ECPointTest extends TestCase { * which is equal to the one passed to the constructor; * (both must refer the same object) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies positive functionality.", - method = "getAffineY", - args = {} - ) public final void testGetAffineY01() { BigInteger y = BigInteger.valueOf(23456L); ECPoint p = new ECPoint(BigInteger.valueOf(-23456L), y); @@ -171,12 +135,6 @@ public class ECPointTest extends TestCase { * Expected: must return <code>null</code> for * <code>ECPoint.POINT_INFINITY</code> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that getAffineY ruturns null for POINT_INFINITY.", - method = "getAffineY", - args = {} - ) public final void testGetAffineY02() { assertNull(ECPoint.POINT_INFINITY.getAffineY()); } @@ -187,12 +145,6 @@ public class ECPointTest extends TestCase { * Test preconditions: see test comments<br> * Expected: all objects in this test must be equal */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies positive cases.", - method = "equals", - args = {java.lang.Object.class} - ) public final void testEqualsObject01() { // test case 1: must be equal to itself ECPoint p2=null, p1 = @@ -216,12 +168,6 @@ public class ECPointTest extends TestCase { * Test preconditions: see test comments<br> * Expected: all objects in this test must be not equal */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies negative cases.", - method = "equals", - args = {java.lang.Object.class} - ) public final void testEqualsObject02() { // test case 1: must be not equal to null ECPoint p2=null, p1 = @@ -250,12 +196,6 @@ public class ECPointTest extends TestCase { * Assertion: must return the same value if invoked * repeatedly on the same object. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "hashCode", - args = {} - ) public final void testHashCode01() { ECPoint f = new ECPoint(BigInteger.valueOf(-23457L), BigInteger.ONE); int hc = f.hashCode(); @@ -287,12 +227,6 @@ public class ECPointTest extends TestCase { * Assertion: must return the same value if invoked * on equal (according to the <code>equals(Object)</code> method) objects. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "hashCode", - args = {} - ) public final void testHashCode02() { ECPoint p1 = new ECPoint(BigInteger.valueOf(-23456L), BigInteger.ONE); ECPoint p2 = new ECPoint(BigInteger.valueOf(-23456L), BigInteger.valueOf(1L)); diff --git a/luni/src/test/java/tests/security/spec/ECPrivateKeySpecTest.java b/luni/src/test/java/tests/security/spec/ECPrivateKeySpecTest.java index 2dd7c14..a3db5a7 100644 --- a/luni/src/test/java/tests/security/spec/ECPrivateKeySpecTest.java +++ b/luni/src/test/java/tests/security/spec/ECPrivateKeySpecTest.java @@ -16,11 +16,6 @@ package tests.security.spec; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.math.BigInteger; @@ -30,7 +25,6 @@ import java.security.spec.ECPoint; import java.security.spec.ECPrivateKeySpec; import java.security.spec.EllipticCurve; -@TestTargetClass(ECPrivateKeySpec.class) public class ECPrivateKeySpecTest extends TestCase { BigInteger s; @@ -66,12 +60,6 @@ public class ECPrivateKeySpecTest extends TestCase { * case 2: catch NullPointerException - if s is null. * case 3: catch NullPointerException - if params is null. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "ECPrivateKeySpec", - args = {java.math.BigInteger.class, java.security.spec.ECParameterSpec.class} - ) public void test_constructorLjava_math_BigIntegerLjava_security_spec_ECParameterSpec() { // case 1: creating object with valid parameters @@ -98,12 +86,6 @@ public class ECPrivateKeySpecTest extends TestCase { /** * test for getS() method */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getS", - args = {} - ) public void test_GetS() { assertEquals("wrong private value", s, ecpks.getS()); } @@ -111,12 +93,6 @@ public class ECPrivateKeySpecTest extends TestCase { /** * test for getParams() method */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getParams", - args = {} - ) public void test_GetParams() { assertEquals("wrong parameters", ecparams, ecpks.getParams()); } diff --git a/luni/src/test/java/tests/security/spec/ECPublicKeySpecTest.java b/luni/src/test/java/tests/security/spec/ECPublicKeySpecTest.java index 618d6f5..abac7a2 100644 --- a/luni/src/test/java/tests/security/spec/ECPublicKeySpecTest.java +++ b/luni/src/test/java/tests/security/spec/ECPublicKeySpecTest.java @@ -16,11 +16,6 @@ package tests.security.spec; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.math.BigInteger; @@ -30,7 +25,6 @@ import java.security.spec.ECPoint; import java.security.spec.ECPublicKeySpec; import java.security.spec.EllipticCurve; -@TestTargetClass(ECPublicKeySpec.class) public class ECPublicKeySpecTest extends TestCase { ECPoint w; @@ -64,12 +58,6 @@ public class ECPublicKeySpecTest extends TestCase { * case 2: catch NullPointerException - if w is null. * case 3: catch NullPointerException - if params is null. */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "ECPublicKeySpec", - args = {java.security.spec.ECPoint.class, java.security.spec.ECParameterSpec.class} - ) public final void test_constructorLjava_security_spec_ECPointLjava_security_spec_ECParameterSpec() { // case 1: creating object with valid parameters @@ -96,12 +84,6 @@ public class ECPublicKeySpecTest extends TestCase { /** * test for getW() method */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getW", - args = {} - ) public final void testGetW() { assertEquals("wrong w value", w, ecpks.getW()); } @@ -109,12 +91,6 @@ public class ECPublicKeySpecTest extends TestCase { /** * test for getParams() meyhod */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getParams", - args = {} - ) public final void testGetParams() { assertEquals("wrong params value", params, ecpks.getParams()); } diff --git a/luni/src/test/java/tests/security/spec/EllipticCurveTest.java b/luni/src/test/java/tests/security/spec/EllipticCurveTest.java index a26532d..cd090c6 100644 --- a/luni/src/test/java/tests/security/spec/EllipticCurveTest.java +++ b/luni/src/test/java/tests/security/spec/EllipticCurveTest.java @@ -17,11 +17,6 @@ package tests.security.spec; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.math.BigInteger; @@ -35,7 +30,6 @@ import java.util.Arrays; * Tests for <code>EllipticCurve</code> class fields and methods. * */ -@TestTargetClass(EllipticCurve.class) public class EllipticCurveTest extends TestCase { /** @@ -45,12 +39,6 @@ public class EllipticCurveTest extends TestCase { * Test preconditions: valid parameters passed<br> * Expected: must pass without any exceptions */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies positive cases.", - method = "EllipticCurve", - args = {java.security.spec.ECField.class, java.math.BigInteger.class, java.math.BigInteger.class, byte[].class} - ) public final void testEllipticCurveECFieldBigIntegerBigIntegerbyteArray01() { // test case 1 parameters set ECFieldFp f = new ECFieldFp(BigInteger.valueOf(23L)); @@ -85,12 +73,6 @@ public class EllipticCurveTest extends TestCase { * Test preconditions: pass <code>null</code> as mentioned parameters<br> * Expected: must throw <code>NullPointerException</code> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException.", - method = "EllipticCurve", - args = {java.security.spec.ECField.class, java.math.BigInteger.class, java.math.BigInteger.class, byte[].class} - ) public final void testEllipticCurveECFieldBigIntegerBigIntegerbyteArray02() { // test case 1 parameters set ECFieldFp f = null; @@ -137,12 +119,6 @@ public class EllipticCurveTest extends TestCase { * not in the <code>field</code> of type <code>ECFieldFp</code><br> * Expected: must throw <code>IllegalArgumentException</code> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies IllegalArgumentException.", - method = "EllipticCurve", - args = {java.security.spec.ECField.class, java.math.BigInteger.class, java.math.BigInteger.class, byte[].class} - ) public final void testEllipticCurveECFieldBigIntegerBigIntegerbyteArray03() { // test case 1 parameters set, // a is not in field @@ -204,12 +180,6 @@ public class EllipticCurveTest extends TestCase { * not in the <code>field</code> of type <code>ECFieldF2m</code><br> * Expected: must throw <code>IllegalArgumentException</code> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies IllegalArgumentException.", - method = "EllipticCurve", - args = {java.security.spec.ECField.class, java.math.BigInteger.class, java.math.BigInteger.class, byte[].class} - ) public final void testEllipticCurveECFieldBigIntegerBigIntegerbyteArray04() { // test case 1 parameters set, // a is not in field @@ -256,12 +226,6 @@ public class EllipticCurveTest extends TestCase { * Test preconditions: pass <code>seed</code> to the ctor then modify it<br> * Expected: getSeed() must return unmodified array */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that byte array of EllipticCurve can't be modified", - method = "EllipticCurve", - args = {java.security.spec.ECField.class, java.math.BigInteger.class, java.math.BigInteger.class, byte[].class} - ) public final void testEllipticCurveECFieldBigIntegerBigIntegerbyteArray05() { ECFieldF2m f = new ECFieldF2m(5); BigInteger a = BigInteger.valueOf(0L); @@ -283,12 +247,6 @@ public class EllipticCurveTest extends TestCase { * Test preconditions: valid parameters passed, field type is ECFieldFp<br> * Expected: must pass without any exceptions */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Doesn't verify exceptions.", - method = "EllipticCurve", - args = {java.security.spec.ECField.class, java.math.BigInteger.class, java.math.BigInteger.class} - ) public final void testEllipticCurveECFieldBigIntegerBigInteger01() { // test case 1 parameters set ECFieldFp f = new ECFieldFp(BigInteger.valueOf(23L)); @@ -321,12 +279,6 @@ public class EllipticCurveTest extends TestCase { * Test preconditions: pass <code>null</code> as mentioned parameters<br> * Expected: must throw <code>NullPointerException</code> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException.", - method = "EllipticCurve", - args = {java.security.spec.ECField.class, java.math.BigInteger.class, java.math.BigInteger.class} - ) public final void testEllipticCurveECFieldBigIntegerBigInteger02() { // test case 1 parameters set ECFieldFp f = null; @@ -370,12 +322,6 @@ public class EllipticCurveTest extends TestCase { * not in the <code>field</code> of type <code>ECFieldFp</code><br> * Expected: must throw <code>IllegalArgumentException</code> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies IllegalArgumentException.", - method = "EllipticCurve", - args = {java.security.spec.ECField.class, java.math.BigInteger.class, java.math.BigInteger.class} - ) public final void testEllipticCurveECFieldBigIntegerBigInteger03() { // test case 1 parameters set, // a is not in field @@ -433,12 +379,6 @@ public class EllipticCurveTest extends TestCase { * not in the <code>field</code> of type <code>ECFieldF2m</code><br> * Expected: must throw <code>IllegalArgumentException</code> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies IllegalArgumentException.", - method = "EllipticCurve", - args = {java.security.spec.ECField.class, java.math.BigInteger.class, java.math.BigInteger.class} - ) public final void testEllipticCurveECFieldBigIntegerBigInteger04() { // test case 1 parameters set, // a is not in field @@ -483,12 +423,6 @@ public class EllipticCurveTest extends TestCase { * to the one passed to the constructor; (both must refer * the same object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getA", - args = {} - ) public final void testGetA() { ECFieldF2m f = new ECFieldF2m(5); BigInteger a = BigInteger.valueOf(5L); @@ -499,14 +433,8 @@ public class EllipticCurveTest extends TestCase { } /** - * @tests java/security/spec/EllipticCurve#EllipticCurve(EcField,BigInteger,BigInteger) + * java/security/spec/EllipticCurve#EllipticCurve(EcField,BigInteger,BigInteger) */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Regression test.", - method = "EllipticCurve", - args = {java.security.spec.ECField.class, java.math.BigInteger.class, java.math.BigInteger.class} - ) public final void testEllipticCurveECFieldBigIntegerBigInteger05() { // Regression for Harmony-731 EllipticCurve ec = new EllipticCurve(new testECField(), BigInteger @@ -525,12 +453,6 @@ public class EllipticCurveTest extends TestCase { * to the one passed to the constructor; (both must refer * the same object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getB", - args = {} - ) public final void testGetB() { ECFieldF2m f = new ECFieldF2m(5); BigInteger a = BigInteger.valueOf(5L); @@ -549,12 +471,6 @@ public class EllipticCurveTest extends TestCase { * to the one passed to the constructor; (both must refer * the same object) */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getField", - args = {} - ) public final void testGetField() { ECFieldF2m f = new ECFieldF2m(5); BigInteger a = BigInteger.valueOf(5L); @@ -572,12 +488,6 @@ public class EllipticCurveTest extends TestCase { * Expected: must return <code>seed</code> which is equal * to the one passed to the constructor */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies positive case.", - method = "getSeed", - args = {} - ) public final void testGetSeed01() { ECFieldFp f = new ECFieldFp(BigInteger.valueOf(23L)); BigInteger a = BigInteger.ONE; @@ -597,12 +507,6 @@ public class EllipticCurveTest extends TestCase { * called and then returned array modified<br> * Expected: internal state must not be affected by the modification */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that modification of byte array doesn't change internal state of test object.", - method = "getSeed", - args = {} - ) public final void testGetSeed02() { ECFieldFp f = new ECFieldFp(BigInteger.valueOf(23L)); BigInteger a = BigInteger.ONE; @@ -624,12 +528,6 @@ public class EllipticCurveTest extends TestCase { * created using valid parameters<br> * Expected: repeated method calls must return different refs */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that repeated calls of getSeed method must return different refs.", - method = "getSeed", - args = {} - ) public final void testGetSeed03() { ECFieldFp f = new ECFieldFp(BigInteger.valueOf(23L)); BigInteger a = BigInteger.ONE; @@ -641,15 +539,9 @@ public class EllipticCurveTest extends TestCase { } /** - * @tests java.security.spec.EllipticCurve#getSeed() + * java.security.spec.EllipticCurve#getSeed() * Assertion: null if not specified */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Regression test.", - method = "getSeed", - args = {} - ) public final void testGetSeed04() { //Regression for HARMONY-732 ECFieldFp f = new ECFieldFp(BigInteger.valueOf(23L)); @@ -663,12 +555,6 @@ public class EllipticCurveTest extends TestCase { * Test preconditions: see test comments<br> * Expected: all objects in this test must be equal */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "equals", - args = {java.lang.Object.class} - ) public final void testEqualsObject01() { // test case 1: must be equal to itself EllipticCurve c2 = null, c1 = new EllipticCurve(new ECFieldFp( @@ -712,12 +598,6 @@ public class EllipticCurveTest extends TestCase { * Assertion: must return the same value if invoked * repeatedly on the same object. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that several calls of hashCode method for the same objects return the same values.", - method = "hashCode", - args = {} - ) public final void testHashCode01() { int hc = 0; EllipticCurve f = new EllipticCurve(new ECFieldFp(BigInteger @@ -736,12 +616,6 @@ public class EllipticCurveTest extends TestCase { * Assertion: must return the same value if invoked * on equal (according to the <code>equals(Object)</code> method) objects. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "hashCode", - args = {} - ) public final void testHashCode02() { assertEquals(new EllipticCurve(new ECFieldFp(BigInteger.valueOf(23L)), BigInteger.ONE, BigInteger.valueOf(19L), new byte[24]) diff --git a/luni/src/test/java/tests/security/spec/EncodedKeySpec2Test.java b/luni/src/test/java/tests/security/spec/EncodedKeySpec2Test.java index 8cbab69..edb801e 100644 --- a/luni/src/test/java/tests/security/spec/EncodedKeySpec2Test.java +++ b/luni/src/test/java/tests/security/spec/EncodedKeySpec2Test.java @@ -17,11 +17,6 @@ package tests.security.spec; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.security.Key; @@ -34,18 +29,11 @@ import java.security.spec.EncodedKeySpec; import java.security.spec.PKCS8EncodedKeySpec; import java.security.spec.X509EncodedKeySpec; -@TestTargetClass(EncodedKeySpec.class) public class EncodedKeySpec2Test extends TestCase { /** - * @tests java.security.spec.EncodedKeySpec#getEncoded() + * java.security.spec.EncodedKeySpec#getEncoded() */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getEncoded", - args = {} - ) public void test_getEncoded() throws Exception { KeyPairGenerator keyGen = KeyPairGenerator.getInstance("DSA"); diff --git a/luni/src/test/java/tests/security/spec/EncodedKeySpecTest.java b/luni/src/test/java/tests/security/spec/EncodedKeySpecTest.java index 32f2282..d97b37d 100644 --- a/luni/src/test/java/tests/security/spec/EncodedKeySpecTest.java +++ b/luni/src/test/java/tests/security/spec/EncodedKeySpecTest.java @@ -22,10 +22,6 @@ package tests.security.spec; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; - import junit.framework.TestCase; import org.apache.harmony.security.tests.support.spec.MyEncodedKeySpec; @@ -37,18 +33,11 @@ import java.util.Arrays; * Tests for <code>EncodedKeySpec</code> class fields and methods. * */ -@TestTargetClass(EncodedKeySpec.class) public class EncodedKeySpecTest extends TestCase { /** * Tests for constructor <code>EncodedKeySpec(byte[])</code><br> */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "EncodedKeySpec", - args = {byte[].class} - ) public final void testEncodedKeySpec() { byte[] encodedKey = new byte[] { (byte) 1, (byte) 2, (byte) 3, (byte) 4 }; EncodedKeySpec eks = new MyEncodedKeySpec(encodedKey); @@ -69,12 +58,6 @@ public class EncodedKeySpecTest extends TestCase { /** * Tests that <code>getEncoded()</code> method returns valid byte array */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getEncoded", - args = {} - ) public final void testGetEncoded() { byte[] encodedKey = new byte[] { (byte) 1, (byte) 2, (byte) 3, (byte) 4 }; @@ -99,12 +82,6 @@ public class EncodedKeySpecTest extends TestCase { * Tests that internal state of the object can not be modified by modifying * initial array value */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getEncoded", - args = {} - ) public final void testIsStatePreserved1() { /* Create initial byte array */ byte[] encodedKey = new byte[] { (byte) 1, (byte) 2, (byte) 3, (byte) 4 }; @@ -125,12 +102,6 @@ public class EncodedKeySpecTest extends TestCase { * Tests that internal state of the object can not be modified using * returned value of <code>getEncoded()</code> method */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getEncoded", - args = {} - ) public final void testIsStatePreserved2() { byte[] encodedKey = new byte[] { (byte) 1, (byte) 2, (byte) 3, (byte) 4 }; diff --git a/luni/src/test/java/tests/security/spec/InvalidKeySpecExceptionTest.java b/luni/src/test/java/tests/security/spec/InvalidKeySpecExceptionTest.java index 82523e5..f766d7e 100644 --- a/luni/src/test/java/tests/security/spec/InvalidKeySpecExceptionTest.java +++ b/luni/src/test/java/tests/security/spec/InvalidKeySpecExceptionTest.java @@ -22,11 +22,6 @@ package tests.security.spec; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.security.spec.InvalidKeySpecException; @@ -36,7 +31,6 @@ import java.security.spec.InvalidKeySpecException; * methods. * */ -@TestTargetClass(InvalidKeySpecException.class) public class InvalidKeySpecExceptionTest extends TestCase { private static String[] msgs = { @@ -50,12 +44,6 @@ public class InvalidKeySpecExceptionTest extends TestCase { * Test for <code>InvalidKeySpecException()</code> constructor Assertion: * constructs InvalidKeySpecException with no detail message */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "InvalidKeySpecException", - args = {} - ) public void testInvalidKeySpecException01() { InvalidKeySpecException tE = new InvalidKeySpecException(); assertNull("getMessage() must return null.", tE.getMessage()); @@ -67,12 +55,6 @@ public class InvalidKeySpecExceptionTest extends TestCase { * Assertion: constructs InvalidKeySpecException with detail message msg. * Parameter <code>msg</code> is not null. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "InvalidKeySpecException", - args = {java.lang.String.class} - ) public void testInvalidKeySpecException02() { InvalidKeySpecException tE; for (int i = 0; i < msgs.length; i++) { @@ -88,12 +70,6 @@ public class InvalidKeySpecExceptionTest extends TestCase { * Assertion: constructs InvalidKeySpecException when <code>msg</code> is * null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as a parameter.", - method = "InvalidKeySpecException", - args = {java.lang.String.class} - ) public void testInvalidKeySpecException03() { String msg = null; InvalidKeySpecException tE = new InvalidKeySpecException(msg); @@ -106,12 +82,6 @@ public class InvalidKeySpecExceptionTest extends TestCase { * Assertion: constructs InvalidKeySpecException when <code>cause</code> * is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as a parameter.", - method = "InvalidKeySpecException", - args = {java.lang.Throwable.class} - ) public void testInvalidKeySpecException04() { Throwable cause = null; InvalidKeySpecException tE = new InvalidKeySpecException(cause); @@ -124,12 +94,6 @@ public class InvalidKeySpecExceptionTest extends TestCase { * Assertion: constructs InvalidKeySpecException when <code>cause</code> * is not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies positive cases.", - method = "InvalidKeySpecException", - args = {java.lang.Throwable.class} - ) public void testInvalidKeySpecException05() { InvalidKeySpecException tE = new InvalidKeySpecException(tCause); if (tE.getMessage() != null) { @@ -148,12 +112,6 @@ public class InvalidKeySpecExceptionTest extends TestCase { * constructor Assertion: constructs InvalidKeySpecException when * <code>cause</code> is null <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as parameters.", - method = "InvalidKeySpecException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testInvalidKeySpecException06() { InvalidKeySpecException tE = new InvalidKeySpecException(null, null); assertNull("getMessage() must return null", tE.getMessage()); @@ -165,12 +123,6 @@ public class InvalidKeySpecExceptionTest extends TestCase { * constructor Assertion: constructs InvalidKeySpecException when * <code>cause</code> is null <code>msg</code> is not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as a cause parameter.", - method = "InvalidKeySpecException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testInvalidKeySpecException07() { InvalidKeySpecException tE; for (int i = 0; i < msgs.length; i++) { @@ -186,12 +138,6 @@ public class InvalidKeySpecExceptionTest extends TestCase { * constructor Assertion: constructs InvalidKeySpecException when * <code>cause</code> is not null <code>msg</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as a message parameter.", - method = "InvalidKeySpecException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testInvalidKeySpecException08() { InvalidKeySpecException tE = new InvalidKeySpecException(null, tCause); if (tE.getMessage() != null) { @@ -210,12 +156,6 @@ public class InvalidKeySpecExceptionTest extends TestCase { * constructor Assertion: constructs InvalidKeySpecException when * <code>cause</code> is not null <code>msg</code> is not null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies positive case.", - method = "InvalidKeySpecException", - args = {java.lang.String.class, java.lang.Throwable.class} - ) public void testInvalidKeySpecException09() { InvalidKeySpecException tE; for (int i = 0; i < msgs.length; i++) { diff --git a/luni/src/test/java/tests/security/spec/InvalidParameterSpecExceptionTest.java b/luni/src/test/java/tests/security/spec/InvalidParameterSpecExceptionTest.java index 385696e..daba495 100644 --- a/luni/src/test/java/tests/security/spec/InvalidParameterSpecExceptionTest.java +++ b/luni/src/test/java/tests/security/spec/InvalidParameterSpecExceptionTest.java @@ -22,11 +22,6 @@ package tests.security.spec; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.security.spec.InvalidParameterSpecException; @@ -36,7 +31,6 @@ import java.security.spec.InvalidParameterSpecException; * methods. * */ -@TestTargetClass(InvalidParameterSpecException.class) public class InvalidParameterSpecExceptionTest extends TestCase { static String[] msgs = { @@ -51,12 +45,6 @@ public class InvalidParameterSpecExceptionTest extends TestCase { * Assertion: constructs InvalidParameterSpecException with no detail * message */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "InvalidParameterSpecException", - args = {} - ) public void testInvalidParameterSpecException01() { InvalidParameterSpecException tE = new InvalidParameterSpecException(); assertNull("getMessage() must return null.", tE.getMessage()); @@ -68,12 +56,6 @@ public class InvalidParameterSpecExceptionTest extends TestCase { * Assertion: constructs InvalidParameterSpecException with detail message * msg. Parameter <code>msg</code> is not null. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "InvalidParameterSpecException", - args = {java.lang.String.class} - ) public void testInvalidParameterSpecException02() { InvalidParameterSpecException tE; for (int i = 0; i < msgs.length; i++) { @@ -89,12 +71,6 @@ public class InvalidParameterSpecExceptionTest extends TestCase { * Assertion: constructs InvalidParameterSpecException when <code>msg</code> * is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as a parameter.", - method = "InvalidParameterSpecException", - args = {java.lang.String.class} - ) public void testInvalidParameterSpecException03() { String msg = null; InvalidParameterSpecException tE = new InvalidParameterSpecException( diff --git a/luni/src/test/java/tests/security/spec/MGF1ParameterSpecTest.java b/luni/src/test/java/tests/security/spec/MGF1ParameterSpecTest.java index d92346a..178fcce 100644 --- a/luni/src/test/java/tests/security/spec/MGF1ParameterSpecTest.java +++ b/luni/src/test/java/tests/security/spec/MGF1ParameterSpecTest.java @@ -22,11 +22,6 @@ package tests.security.spec; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.security.spec.MGF1ParameterSpec; @@ -35,7 +30,6 @@ import java.security.spec.MGF1ParameterSpec; * Test for MGF1ParameterSpec class * */ -@TestTargetClass(MGF1ParameterSpec.class) public class MGF1ParameterSpecTest extends TestCase { /** @@ -52,12 +46,6 @@ public class MGF1ParameterSpecTest extends TestCase { * Assertion: constructs new <code>MGF1ParameterSpec</code> * object using valid parameter */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "MGF1ParameterSpec", - args = {java.lang.String.class} - ) public final void testMGF1ParameterSpec01() { try { MGF1ParameterSpec pgf = new MGF1ParameterSpec(testAlgName); @@ -72,12 +60,6 @@ public class MGF1ParameterSpecTest extends TestCase { * Test #2 for <code>MGF1ParameterSpec</code> constructor<br> * Assertion: <code>NullPointerException</code> if parameter is <code>null</code> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "MGF1ParameterSpec", - args = {java.lang.String.class} - ) public final void testMGF1ParameterSpec02() { try { new MGF1ParameterSpec(null); @@ -92,12 +74,6 @@ public class MGF1ParameterSpecTest extends TestCase { * Assertion: returns the algorithm name of the message * digest used by the mask generation function */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getDigestAlgorithm", - args = {} - ) public final void testGetDigestAlgorithm() { MGF1ParameterSpec aps = new MGF1ParameterSpec(testAlgName); assertTrue(testAlgName.equals(aps.getDigestAlgorithm())); @@ -108,32 +84,6 @@ public class MGF1ParameterSpecTest extends TestCase { * Assertion: returns the algorithm name of the message * digest used by the mask generation function */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Field testing", - method = "!field SHA1", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Field testing", - method = "!field SHA256", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Field testing", - method = "!field SHA384", - args = {} - ), - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "Field testing", - method = "!field SHA512", - args = {} - ) - }) public final void testFieldsGetDigestAlgorithm() { assertEquals("SHA-1", MGF1ParameterSpec.SHA1.getDigestAlgorithm()); diff --git a/luni/src/test/java/tests/security/spec/PKCS8EncodedKeySpecTest.java b/luni/src/test/java/tests/security/spec/PKCS8EncodedKeySpecTest.java index 5e86384..41a5d33 100644 --- a/luni/src/test/java/tests/security/spec/PKCS8EncodedKeySpecTest.java +++ b/luni/src/test/java/tests/security/spec/PKCS8EncodedKeySpecTest.java @@ -22,11 +22,6 @@ package tests.security.spec; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.security.spec.EncodedKeySpec; @@ -37,7 +32,6 @@ import java.util.Arrays; * Tests for <code>PKCS8EncodedKeySpec</code> class fields and methods. * */ -@TestTargetClass(PKCS8EncodedKeySpec.class) public class PKCS8EncodedKeySpecTest extends TestCase { // @@ -49,12 +43,6 @@ public class PKCS8EncodedKeySpecTest extends TestCase { * Assertion: constructs new <code>PKCS8EncodedKeySpec</code> * object using valid parameter */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "PKCS8EncodedKeySpec", - args = {byte[].class} - ) public final void testPKCS8EncodedKeySpec() { byte[] encodedKey = new byte[] {(byte)1,(byte)2,(byte)3,(byte)4}; @@ -73,12 +61,6 @@ public class PKCS8EncodedKeySpecTest extends TestCase { * Test for <code>getEncoded()</code> method<br> * Assertion: returns encoded key */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getEncoded", - args = {} - ) public final void testGetEncoded() { byte[] encodedKey = new byte[] {(byte)1,(byte)2,(byte)3,(byte)4}; @@ -93,12 +75,6 @@ public class PKCS8EncodedKeySpecTest extends TestCase { * Test for <code>getFormat()</code> method * Assertion: returns format name (always "PKCS#8") */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getFormat", - args = {} - ) public final void testGetFormat() { byte[] encodedKey = new byte[] {(byte)1,(byte)2,(byte)3,(byte)4}; @@ -112,12 +88,6 @@ public class PKCS8EncodedKeySpecTest extends TestCase { * can not be changed by modifying initial * array value */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getEncoded", - args = {} - ) public final void testIsStatePreserved1() { // Reference array byte[] encodedKey = new byte[] {(byte)1,(byte)2,(byte)3,(byte)4}; @@ -142,12 +112,6 @@ public class PKCS8EncodedKeySpecTest extends TestCase { * can not be modified using returned value * of <code>getEncoded()</code> method */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getEncoded", - args = {} - ) public final void testIsStatePreserved2() { // Reference array byte[] encodedKey = new byte[] {(byte)1,(byte)2,(byte)3,(byte)4}; diff --git a/luni/src/test/java/tests/security/spec/PSSParameterSpecTest.java b/luni/src/test/java/tests/security/spec/PSSParameterSpecTest.java index 1dad00a..6e720d3 100644 --- a/luni/src/test/java/tests/security/spec/PSSParameterSpecTest.java +++ b/luni/src/test/java/tests/security/spec/PSSParameterSpecTest.java @@ -22,11 +22,6 @@ package tests.security.spec; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.security.spec.AlgorithmParameterSpec; @@ -37,7 +32,6 @@ import java.security.spec.PSSParameterSpec; * Tests for <code>PSSParameterSpec</code> class (1.5) * */ -@TestTargetClass(PSSParameterSpec.class) public class PSSParameterSpecTest extends TestCase { /** @@ -45,12 +39,6 @@ public class PSSParameterSpecTest extends TestCase { * Assertion: constructs using valid parameter * <code>PSSParameterSpec<code> object */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies constructor with valid parameter.", - method = "PSSParameterSpec", - args = {int.class} - ) public final void testPSSParameterSpec0101() { AlgorithmParameterSpec aps = new PSSParameterSpec(20); assertTrue(aps instanceof PSSParameterSpec); @@ -62,12 +50,6 @@ public class PSSParameterSpecTest extends TestCase { * throws <code>IllegalArgumentException</code> * if <code>saltLen</code> less than 0 */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies IllegalArgumentException.", - method = "PSSParameterSpec", - args = {int.class} - ) public final void testPSSParameterSpec0102() { try { new PSSParameterSpec(-1); @@ -84,12 +66,6 @@ public class PSSParameterSpecTest extends TestCase { * Assertion: constructs using valid parameters * <code>PSSParameterSpec<code> object */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies constructor with valid parameters.", - method = "PSSParameterSpec", - args = {java.lang.String.class, java.lang.String.class, java.security.spec.AlgorithmParameterSpec.class, int.class, int.class} - ) public final void testPSSParameterSpec0201() { AlgorithmParameterSpec aps = new PSSParameterSpec("SHA-1", "MGF1", MGF1ParameterSpec.SHA1, 20, 1); @@ -105,12 +81,6 @@ public class PSSParameterSpecTest extends TestCase { * throws <code>NullPointerException</code> * if <code>mdName</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException.", - method = "PSSParameterSpec", - args = {java.lang.String.class, java.lang.String.class, java.security.spec.AlgorithmParameterSpec.class, int.class, int.class} - ) public final void testPSSParameterSpec0202() { try { new PSSParameterSpec(null, "MGF1", MGF1ParameterSpec.SHA1, 20, 1); @@ -128,12 +98,6 @@ public class PSSParameterSpecTest extends TestCase { * throws <code>NullPointerException</code> * if <code>mgfName</code> is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException.", - method = "PSSParameterSpec", - args = {java.lang.String.class, java.lang.String.class, java.security.spec.AlgorithmParameterSpec.class, int.class, int.class} - ) public final void testPSSParameterSpec0203() { try { new PSSParameterSpec("SHA-1", null, MGF1ParameterSpec.SHA1, 20, 1); @@ -151,12 +115,6 @@ public class PSSParameterSpecTest extends TestCase { * throws <code>IllegalArgumentException<code> * if <code>saltLen<code> less than 0 */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies IllegalArgumentException.", - method = "PSSParameterSpec", - args = {java.lang.String.class, java.lang.String.class, java.security.spec.AlgorithmParameterSpec.class, int.class, int.class} - ) public final void testPSSParameterSpec0204() { try { new PSSParameterSpec("SHA-1", "MGF1", @@ -175,12 +133,6 @@ public class PSSParameterSpecTest extends TestCase { * throws <code>IllegalArgumentException</code> * if <code>trailerField</code> less than 0 */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "PSSParameterSpec", - args = {java.lang.String.class, java.lang.String.class, java.security.spec.AlgorithmParameterSpec.class, int.class, int.class} - ) public final void testPSSParameterSpec0205() { try { new PSSParameterSpec("SHA-1", "MGF1", @@ -198,12 +150,6 @@ public class PSSParameterSpecTest extends TestCase { * Assertion: <code>AlgorithmParameterSpec</code> can be null * */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as AlgorithmParameterSpec parameter.", - method = "PSSParameterSpec", - args = {java.lang.String.class, java.lang.String.class, java.security.spec.AlgorithmParameterSpec.class, int.class, int.class} - ) public final void testPSSParameterSpec0206() { new PSSParameterSpec("SHA-1", "MGF1", null, 20, 1); } @@ -212,12 +158,6 @@ public class PSSParameterSpecTest extends TestCase { * Test for <code>getDigestAlgorithm()</code> method * Assertion: returns message digest algorithm name */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies positive case.", - method = "getDigestAlgorithm", - args = {} - ) public final void testGetDigestAlgorithm() { PSSParameterSpec pssps = new PSSParameterSpec("SHA-1", "MGF1", MGF1ParameterSpec.SHA1, 20, 1); @@ -228,12 +168,6 @@ public class PSSParameterSpecTest extends TestCase { * Test for <code>getMGFAlgorithm()</code> method * Assertion: returns mask generation function algorithm name */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies positive case.", - method = "getMGFAlgorithm", - args = {} - ) public final void testGetMGFAlgorithm() { PSSParameterSpec pssps = new PSSParameterSpec("SHA-1", "MGF1", MGF1ParameterSpec.SHA1, 20, 1); @@ -244,12 +178,6 @@ public class PSSParameterSpecTest extends TestCase { * Test #1 for <code>getMGFParameters()</code> method * Assertion: returns mask generation function parameters */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies positive case.", - method = "getMGFParameters", - args = {} - ) public final void testGetMGFParameters01() { PSSParameterSpec pssps = new PSSParameterSpec("SHA-1", "MGF1", MGF1ParameterSpec.SHA1, 20, 1); @@ -262,12 +190,6 @@ public class PSSParameterSpecTest extends TestCase { * if <code>null</code> had been passed as * AlgorithmParameterSpec parameter to the ctor */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as a parameter.", - method = "getMGFParameters", - args = {} - ) public final void testGetMGFParameters02() { PSSParameterSpec pssps = new PSSParameterSpec("SHA-1", "MGF1", null, 20, 1); @@ -279,12 +201,6 @@ public class PSSParameterSpecTest extends TestCase { * Test for <code>getSaltLength()</code> method<br> * Assertion: returns salt length value */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getSaltLength", - args = {} - ) public final void testGetSaltLength() { PSSParameterSpec pssps = new PSSParameterSpec(20); assertEquals(20, pssps.getSaltLength()); @@ -294,12 +210,6 @@ public class PSSParameterSpecTest extends TestCase { * Test for <code>getTrailerField()</code> method<br> * Assertion: returns trailer field value */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getTrailerField", - args = {} - ) public final void testGetTrailerField() { PSSParameterSpec pssps = new PSSParameterSpec("SHA-1", "MGF1", MGF1ParameterSpec.SHA1, 20, 1); @@ -310,12 +220,6 @@ public class PSSParameterSpecTest extends TestCase { * Test for <code>DEFAULT</code> field<br> * Assertion: default message digest algorithm name is "SHA-1" */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies the name of default message digest algorithm.", - method = "getDigestAlgorithm", - args = {} - ) public final void testDEFAULTmdName() { assertEquals("SHA-1", PSSParameterSpec.DEFAULT.getDigestAlgorithm()); } @@ -324,12 +228,6 @@ public class PSSParameterSpecTest extends TestCase { * Test for <code>DEFAULT</code> field<br> * Assertion: default mask generation function algorithm name is "MGF1" */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies the name of default mask generation function algorithm.", - method = "getMGFAlgorithm", - args = {} - ) public final void testDEFAULTmgfName() { assertEquals("MGF1", PSSParameterSpec.DEFAULT.getMGFAlgorithm()); } @@ -339,12 +237,6 @@ public class PSSParameterSpecTest extends TestCase { * Assertion: default algorithm parameters for mask * generation function are <code>MGF1ParameterSpec.SHA1</code> */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies default algorithm parameters for mask generation function.", - method = "getMGFParameters", - args = {} - ) public final void testDEFAULTmgfSpec() { assertTrue(MGF1ParameterSpec.SHA1.equals(PSSParameterSpec.DEFAULT.getMGFParameters())); } @@ -353,12 +245,6 @@ public class PSSParameterSpecTest extends TestCase { * Test for <code>DEFAULT</code> field<br> * Assertion: default salt length value is 20 */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getSaltLength", - args = {} - ) public final void testDEFAULTsaltLen() { assertEquals(20, PSSParameterSpec.DEFAULT.getSaltLength()); } @@ -367,12 +253,6 @@ public class PSSParameterSpecTest extends TestCase { * Test for <code>DEFAULT</code> field<br> * Assertion: default trailer field value is 1 */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies default trailer field value.", - method = "getTrailerField", - args = {} - ) public final void testDEFAULTtrailerField() { assertEquals(1, PSSParameterSpec.DEFAULT.getTrailerField()); } diff --git a/luni/src/test/java/tests/security/spec/RSAKeyGenParameterSpecTest.java b/luni/src/test/java/tests/security/spec/RSAKeyGenParameterSpecTest.java index ae8317c..929034a 100644 --- a/luni/src/test/java/tests/security/spec/RSAKeyGenParameterSpecTest.java +++ b/luni/src/test/java/tests/security/spec/RSAKeyGenParameterSpecTest.java @@ -22,11 +22,6 @@ package tests.security.spec; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.math.BigInteger; @@ -37,7 +32,6 @@ import java.security.spec.RSAKeyGenParameterSpec; * Tests for <code>RSAKeyGenParameterSpec</code> class fields and methods. * */ -@TestTargetClass(RSAKeyGenParameterSpec.class) public class RSAKeyGenParameterSpecTest extends TestCase { /** @@ -45,12 +39,6 @@ public class RSAKeyGenParameterSpecTest extends TestCase { * Assertion: constructs <code>RSAKeyGenParameterSpec</code> * object using valid parameters */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "RSAKeyGenParameterSpec", - args = {int.class, java.math.BigInteger.class} - ) public final void testRSAKeyGenParameterSpec() { AlgorithmParameterSpec aps = new RSAKeyGenParameterSpec(512, BigInteger.valueOf(0L)); @@ -61,12 +49,6 @@ public class RSAKeyGenParameterSpecTest extends TestCase { * Test for <code>getKeySize()</code> method<br> * Assertion: returns key size value */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getKeysize", - args = {} - ) public final void testGetKeysize() { RSAKeyGenParameterSpec rkgps = new RSAKeyGenParameterSpec(512, BigInteger.valueOf(0L)); @@ -77,12 +59,6 @@ public class RSAKeyGenParameterSpecTest extends TestCase { * Test for <code>getPublicExponent()</code> method<br> * Assertion: returns public exponent value */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPublicExponent", - args = {} - ) public final void testGetPublicExponent() { RSAKeyGenParameterSpec rkgps = new RSAKeyGenParameterSpec(512, BigInteger.valueOf(0L)); @@ -93,12 +69,6 @@ public class RSAKeyGenParameterSpecTest extends TestCase { * Test for <code>F0</code> field<br> * Assertion: the public exponent value F0 = 3 */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Test for F0 field.", - method = "!Constants", - args = {} - ) public final void testF0Value() { assertEquals(3, RSAKeyGenParameterSpec.F0.intValue()); } @@ -107,12 +77,6 @@ public class RSAKeyGenParameterSpecTest extends TestCase { * Test for <code>F4</code> field<br> * Assertion: the public exponent value F0 = 65537 */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Test for F4 field.", - method = "!Constants", - args = {} - ) public final void testF4Value() { assertEquals(65537, RSAKeyGenParameterSpec.F4.intValue()); } diff --git a/luni/src/test/java/tests/security/spec/RSAMultiPrimePrivateCrtKeySpecTest.java b/luni/src/test/java/tests/security/spec/RSAMultiPrimePrivateCrtKeySpecTest.java index 8a50f25..bb6bc87 100644 --- a/luni/src/test/java/tests/security/spec/RSAMultiPrimePrivateCrtKeySpecTest.java +++ b/luni/src/test/java/tests/security/spec/RSAMultiPrimePrivateCrtKeySpecTest.java @@ -22,11 +22,6 @@ package tests.security.spec; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.math.BigInteger; @@ -39,7 +34,6 @@ import java.security.spec.RSAPrivateKeySpec; * Tests for <code>RSAMultiPrimePrivateCrtKeySpec</code> class fields and methods. * */ -@TestTargetClass(RSAMultiPrimePrivateCrtKeySpec.class) public class RSAMultiPrimePrivateCrtKeySpecTest extends TestCase { /** * Reference array of RSAOtherPrimeInfo. DO NOT MODIFY @@ -67,12 +61,6 @@ public class RSAMultiPrimePrivateCrtKeySpecTest extends TestCase { * Assertion: constructs <code>RSAMultiPrimePrivateCrtKeySpec</code> * object using valid parameters */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies constructor with valid parameters.", - method = "RSAMultiPrimePrivateCrtKeySpec", - args = {java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.security.spec.RSAOtherPrimeInfo[].class} - ) public final void testRSAMultiPrimePrivateCrtKeySpec01() { KeySpec ks = new RSAMultiPrimePrivateCrtKeySpec( BigInteger.ONE, @@ -101,12 +89,6 @@ public class RSAMultiPrimePrivateCrtKeySpecTest extends TestCase { * </code> ctor<br> * Assertion: NullPointerException if modulus is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException.", - method = "RSAMultiPrimePrivateCrtKeySpec", - args = {java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.security.spec.RSAOtherPrimeInfo[].class} - ) public final void testRSAMultiPrimePrivateCrtKeySpec02() { try { new RSAMultiPrimePrivateCrtKeySpec( @@ -138,12 +120,6 @@ public class RSAMultiPrimePrivateCrtKeySpecTest extends TestCase { * </code> ctor<br> * Assertion: NullPointerException if publicExponent is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException.", - method = "RSAMultiPrimePrivateCrtKeySpec", - args = {java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.security.spec.RSAOtherPrimeInfo[].class} - ) public final void testRSAMultiPrimePrivateCrtKeySpec03() { try { new RSAMultiPrimePrivateCrtKeySpec( @@ -175,12 +151,6 @@ public class RSAMultiPrimePrivateCrtKeySpecTest extends TestCase { * </code> ctor<br> * Assertion: NullPointerException if privateExponent is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException.", - method = "RSAMultiPrimePrivateCrtKeySpec", - args = {java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.security.spec.RSAOtherPrimeInfo[].class} - ) public final void testRSAMultiPrimePrivateCrtKeySpec04() { try { new RSAMultiPrimePrivateCrtKeySpec( @@ -212,12 +182,6 @@ public class RSAMultiPrimePrivateCrtKeySpecTest extends TestCase { * </code> ctor<br> * Assertion: NullPointerException if primeP is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException.", - method = "RSAMultiPrimePrivateCrtKeySpec", - args = {java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.security.spec.RSAOtherPrimeInfo[].class} - ) public final void testRSAMultiPrimePrivateCrtKeySpec05() { try { new RSAMultiPrimePrivateCrtKeySpec( @@ -249,12 +213,6 @@ public class RSAMultiPrimePrivateCrtKeySpecTest extends TestCase { * </code> ctor<br> * Assertion: NullPointerException if primeQ is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException.", - method = "RSAMultiPrimePrivateCrtKeySpec", - args = {java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.security.spec.RSAOtherPrimeInfo[].class} - ) public final void testRSAMultiPrimePrivateCrtKeySpec06() { try { new RSAMultiPrimePrivateCrtKeySpec( @@ -286,12 +244,6 @@ public class RSAMultiPrimePrivateCrtKeySpecTest extends TestCase { * </code> ctor<br> * Assertion: NullPointerException if primeExponentP is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException.", - method = "RSAMultiPrimePrivateCrtKeySpec", - args = {java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.security.spec.RSAOtherPrimeInfo[].class} - ) public final void testRSAMultiPrimePrivateCrtKeySpec07() { try { new RSAMultiPrimePrivateCrtKeySpec( @@ -323,12 +275,6 @@ public class RSAMultiPrimePrivateCrtKeySpecTest extends TestCase { * </code> ctor<br> * Assertion: NullPointerException if primeExponentQ is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException.", - method = "RSAMultiPrimePrivateCrtKeySpec", - args = {java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.security.spec.RSAOtherPrimeInfo[].class} - ) public final void testRSAMultiPrimePrivateCrtKeySpec08() { try { new RSAMultiPrimePrivateCrtKeySpec( @@ -360,12 +306,6 @@ public class RSAMultiPrimePrivateCrtKeySpecTest extends TestCase { * </code> ctor<br> * Assertion: NullPointerException if crtCoefficient is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException.", - method = "RSAMultiPrimePrivateCrtKeySpec", - args = {java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.security.spec.RSAOtherPrimeInfo[].class} - ) public final void testRSAMultiPrimePrivateCrtKeySpec09() { try { new RSAMultiPrimePrivateCrtKeySpec( @@ -397,12 +337,6 @@ public class RSAMultiPrimePrivateCrtKeySpecTest extends TestCase { * </code> ctor<br> * Assertion: otherPrimeInfo can be null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null otherPrimeInfo.", - method = "RSAMultiPrimePrivateCrtKeySpec", - args = {java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.security.spec.RSAOtherPrimeInfo[].class} - ) public final void testRSAMultiPrimePrivateCrtKeySpec10() { try { new RSAMultiPrimePrivateCrtKeySpec( @@ -434,12 +368,6 @@ public class RSAMultiPrimePrivateCrtKeySpecTest extends TestCase { * </code> ctor<br> * Assertion: IllegalArgumentException if otherPrimeInfo length is 0 */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies IllegalArgumentException.", - method = "RSAMultiPrimePrivateCrtKeySpec", - args = {java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.security.spec.RSAOtherPrimeInfo[].class} - ) public final void testRSAMultiPrimePrivateCrtKeySpec11() { try { new RSAMultiPrimePrivateCrtKeySpec( @@ -473,12 +401,6 @@ public class RSAMultiPrimePrivateCrtKeySpecTest extends TestCase { * object using valid parameters. Constructed object must be * instance of RSAPrivateKeySpec. */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies constructor using valid parameters. Constructed object must be instance of RSAPrivateKeySpec.", - method = "RSAMultiPrimePrivateCrtKeySpec", - args = {java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.security.spec.RSAOtherPrimeInfo[].class} - ) public final void testRSAMultiPrimePrivateCrtKeySpec12() { KeySpec ks = new RSAMultiPrimePrivateCrtKeySpec( BigInteger.ONE, @@ -497,12 +419,6 @@ public class RSAMultiPrimePrivateCrtKeySpecTest extends TestCase { * Test for <code>getCrtCoefficient()</code> method<br> * Assertion: returns crt coefficient */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getCrtCoefficient", - args = {} - ) public final void testGetCrtCoefficient() { RSAMultiPrimePrivateCrtKeySpec ks = new RSAMultiPrimePrivateCrtKeySpec( @@ -522,12 +438,6 @@ public class RSAMultiPrimePrivateCrtKeySpecTest extends TestCase { * Test for <code>getPrimeExponentP()</code> method<br> * Assertion: returns prime exponent P */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPrimeExponentP", - args = {} - ) public final void testGetPrimeExponentP() { RSAMultiPrimePrivateCrtKeySpec ks = new RSAMultiPrimePrivateCrtKeySpec( @@ -547,12 +457,6 @@ public class RSAMultiPrimePrivateCrtKeySpecTest extends TestCase { * Test for <code>getPrimeExponentQ()</code> method<br> * Assertion: returns prime exponent Q */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPrimeExponentQ", - args = {} - ) public final void testGetPrimeExponentQ() { RSAMultiPrimePrivateCrtKeySpec ks = new RSAMultiPrimePrivateCrtKeySpec( @@ -572,12 +476,6 @@ public class RSAMultiPrimePrivateCrtKeySpecTest extends TestCase { * Test for <code>getPrimeP()</code> method<br> * Assertion: returns prime P */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPrimeP", - args = {} - ) public final void testGetPrimeP() { RSAMultiPrimePrivateCrtKeySpec ks = new RSAMultiPrimePrivateCrtKeySpec( @@ -597,12 +495,6 @@ public class RSAMultiPrimePrivateCrtKeySpecTest extends TestCase { * Test for <code>getPrimeQ()</code> method<br> * Assertion: returns prime Q */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPrimeQ", - args = {} - ) public final void testGetPrimeQ() { RSAMultiPrimePrivateCrtKeySpec ks = new RSAMultiPrimePrivateCrtKeySpec( @@ -622,12 +514,6 @@ public class RSAMultiPrimePrivateCrtKeySpecTest extends TestCase { * Test for <code>getPublicExponent()</code> method<br> * Assertion: returns public exponent */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPublicExponent", - args = {} - ) public final void testGetPublicExponent() { RSAMultiPrimePrivateCrtKeySpec ks = new RSAMultiPrimePrivateCrtKeySpec( @@ -647,12 +533,6 @@ public class RSAMultiPrimePrivateCrtKeySpecTest extends TestCase { * Test #1 for <code>getOtherPrimeInfo()</code> method<br> * Assertion: returns array of RSAOtherPrimeInfo */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies positive case.", - method = "getOtherPrimeInfo", - args = {} - ) public final void testGetOtherPrimeInfo01() { RSAMultiPrimePrivateCrtKeySpec ks = new RSAMultiPrimePrivateCrtKeySpec( @@ -673,12 +553,6 @@ public class RSAMultiPrimePrivateCrtKeySpecTest extends TestCase { * Assertion: returns null if null has been passed to the * constructor as otherPrimeInfo parameter */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that getOtherPrimeInfo returns null if there are only two prime factors.", - method = "getOtherPrimeInfo", - args = {} - ) public final void testGetOtherPrimeInfo02() { RSAMultiPrimePrivateCrtKeySpec ks = new RSAMultiPrimePrivateCrtKeySpec( @@ -702,20 +576,6 @@ public class RSAMultiPrimePrivateCrtKeySpecTest extends TestCase { * Tests that internal state of the object * can not be modified by modifying initial array */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that internal state of the object can not be modified by modifying initial array.", - method = "RSAMultiPrimePrivateCrtKeySpec", - args = {java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.security.spec.RSAOtherPrimeInfo[].class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that internal state of the object can not be modified by modifying initial array.", - method = "getOtherPrimeInfo", - args = {} - ) - }) public final void testIsStatePreserved1() { // Create initial array RSAOtherPrimeInfo[] opi1 = opi.clone(); @@ -747,20 +607,6 @@ public class RSAMultiPrimePrivateCrtKeySpecTest extends TestCase { * returned by <code>getOtherPrimeInfo()</code> * method */ - @TestTargets({ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that internal state of the object can not be modified using array reference returned by getOtherPrimeInfo() method.", - method = "RSAMultiPrimePrivateCrtKeySpec", - args = {java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.security.spec.RSAOtherPrimeInfo[].class} - ), - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies that internal state of the object can not be modified using array reference returned by getOtherPrimeInfo() method.", - method = "getOtherPrimeInfo", - args = {} - ) - }) public final void testIsStatePreserved2() { // Create initial array RSAOtherPrimeInfo[] opi1 = opi.clone(); @@ -796,12 +642,6 @@ public class RSAMultiPrimePrivateCrtKeySpecTest extends TestCase { * Test for <code>getModulus()</code> method<br> * Assertion: returns modulus */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getModulus", - args = {} - ) public final void testGetModulus() { RSAMultiPrimePrivateCrtKeySpec ks = new RSAMultiPrimePrivateCrtKeySpec( @@ -821,12 +661,6 @@ public class RSAMultiPrimePrivateCrtKeySpecTest extends TestCase { * Test for <code>getPrivateExponent()</code> method<br> * Assertion: returns private exponent */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPrivateExponent", - args = {} - ) public final void testGetPrivateExponent() { RSAMultiPrimePrivateCrtKeySpec ks = new RSAMultiPrimePrivateCrtKeySpec( diff --git a/luni/src/test/java/tests/security/spec/RSAOtherPrimeInfoTest.java b/luni/src/test/java/tests/security/spec/RSAOtherPrimeInfoTest.java index b3343ee..ad128e0 100644 --- a/luni/src/test/java/tests/security/spec/RSAOtherPrimeInfoTest.java +++ b/luni/src/test/java/tests/security/spec/RSAOtherPrimeInfoTest.java @@ -22,11 +22,6 @@ package tests.security.spec; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.math.BigInteger; @@ -36,7 +31,6 @@ import java.security.spec.RSAOtherPrimeInfo; * Tests for <code>RSAOtherPrimeInfo</code> class fields and methods. * */ -@TestTargetClass(RSAOtherPrimeInfo.class) public class RSAOtherPrimeInfoTest extends TestCase { /** @@ -44,12 +38,6 @@ public class RSAOtherPrimeInfoTest extends TestCase { * Assertion: constructs <code>RSAOtherPrimeInfo</code> * object using valid parameter */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies constructor with valid parameters.", - method = "RSAOtherPrimeInfo", - args = {java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class} - ) public final void testRSAOtherPrimeInfo01() { Object o = new RSAOtherPrimeInfo(BigInteger.valueOf(1L), @@ -62,12 +50,6 @@ public class RSAOtherPrimeInfoTest extends TestCase { * Test #2 for <code>RSAOtherPrimeInfo(BigInteger,BigInteger,BigInteger)</code> ctor * Assertion: NullPointerException if prime is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException.", - method = "RSAOtherPrimeInfo", - args = {java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class} - ) public final void testRSAOtherPrimeInfo02() { try { new RSAOtherPrimeInfo(null, @@ -82,12 +64,6 @@ public class RSAOtherPrimeInfoTest extends TestCase { * Test #3 for <code>RSAOtherPrimeInfo(BigInteger,BigInteger,BigInteger)</code> ctor * Assertion: NullPointerException if primeExponent is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException.", - method = "RSAOtherPrimeInfo", - args = {java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class} - ) public final void testRSAOtherPrimeInfo03() { try { new RSAOtherPrimeInfo(BigInteger.valueOf(1L), @@ -102,12 +78,6 @@ public class RSAOtherPrimeInfoTest extends TestCase { * Test #4 for <code>RSAOtherPrimeInfo(BigInteger,BigInteger,BigInteger)</code> ctor * Assertion: NullPointerException if crtCoefficient is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException.", - method = "RSAOtherPrimeInfo", - args = {java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class} - ) public final void testRSAOtherPrimeInfo04() { try { new RSAOtherPrimeInfo(BigInteger.valueOf(1L), @@ -122,12 +92,6 @@ public class RSAOtherPrimeInfoTest extends TestCase { * Test #5 for <code>RSAOtherPrimeInfo(BigInteger,BigInteger,BigInteger)</code> ctor * Assertion: NullPointerException if prime and crtCoefficient is null */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies NullPointerException.", - method = "RSAOtherPrimeInfo", - args = {java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class} - ) public final void testRSAOtherPrimeInfo05() { try { new RSAOtherPrimeInfo(null, @@ -142,12 +106,6 @@ public class RSAOtherPrimeInfoTest extends TestCase { * Test for <code>getCrtCoefficient()</code> method<br> * Assertion: returns CRT coefficient value */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getCrtCoefficient", - args = {} - ) public final void testGetCrtCoefficient() { RSAOtherPrimeInfo ropi = new RSAOtherPrimeInfo(BigInteger.valueOf(1L), @@ -160,12 +118,6 @@ public class RSAOtherPrimeInfoTest extends TestCase { * Test for <code>getPrime()</code> method<br> * Assertion: returns prime value */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPrime", - args = {} - ) public final void testGetPrime() { RSAOtherPrimeInfo ropi = new RSAOtherPrimeInfo(BigInteger.valueOf(1L), @@ -178,12 +130,6 @@ public class RSAOtherPrimeInfoTest extends TestCase { * Test for <code>getExponent()</code> method<br> * Assertion: returns prime exponent value */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getExponent", - args = {} - ) public final void testGetExponent() { RSAOtherPrimeInfo ropi = new RSAOtherPrimeInfo(BigInteger.valueOf(1L), diff --git a/luni/src/test/java/tests/security/spec/RSAPrivateCrtKeySpecTest.java b/luni/src/test/java/tests/security/spec/RSAPrivateCrtKeySpecTest.java index 392e998..f19ecc7 100644 --- a/luni/src/test/java/tests/security/spec/RSAPrivateCrtKeySpecTest.java +++ b/luni/src/test/java/tests/security/spec/RSAPrivateCrtKeySpecTest.java @@ -22,11 +22,6 @@ package tests.security.spec; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.math.BigInteger; @@ -38,7 +33,6 @@ import java.security.spec.RSAPrivateKeySpec; * Tests for <code>RSAPrivateCrtKeySpec</code> class fields and methods * */ -@TestTargetClass(RSAPrivateCrtKeySpec.class) public class RSAPrivateCrtKeySpecTest extends TestCase { /** @@ -46,12 +40,6 @@ public class RSAPrivateCrtKeySpecTest extends TestCase { * Assertion: Constructs <code>RSAPrivateCrtKeySpec</code> * object using valid parameters */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies constructor with valid parameters.", - method = "RSAPrivateCrtKeySpec", - args = {java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class} - ) public final void testRSAPrivateCrtKeySpec01() { KeySpec ks = new RSAPrivateCrtKeySpec( BigInteger.ONE, @@ -70,12 +58,6 @@ public class RSAPrivateCrtKeySpecTest extends TestCase { * Assertion: Constructs <code>RSAPrivateCrtKeySpec</code> * object using valid parameters */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies constructor with valid parameters.", - method = "RSAPrivateCrtKeySpec", - args = {java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class} - ) public final void testRSAPrivateCrtKeySpec02() { KeySpec ks = new RSAPrivateCrtKeySpec( BigInteger.ONE, @@ -94,12 +76,6 @@ public class RSAPrivateCrtKeySpecTest extends TestCase { * Assertion: Constructs <code>RSAPrivateCrtKeySpec</code> * object using valid parameters */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as parameters.", - method = "RSAPrivateCrtKeySpec", - args = {java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class, java.math.BigInteger.class} - ) public final void testRSAPrivateCrtKeySpec03() { new RSAPrivateCrtKeySpec( null, @@ -116,12 +92,6 @@ public class RSAPrivateCrtKeySpecTest extends TestCase { * Test for <code>getCrtCoefficient()</code> method<br> * Assertion: returns crt coefficient */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getCrtCoefficient", - args = {} - ) public final void testGetCrtCoefficient() { RSAPrivateCrtKeySpec ks = new RSAPrivateCrtKeySpec( BigInteger.ONE, @@ -139,12 +109,6 @@ public class RSAPrivateCrtKeySpecTest extends TestCase { * Test for <code>getPrimeExponentP()</code> method<br> * Assertion: returns prime exponent P */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPrimeExponentP", - args = {} - ) public final void testGetPrimeExponentP() { RSAPrivateCrtKeySpec ks = new RSAPrivateCrtKeySpec( BigInteger.ONE, @@ -162,12 +126,6 @@ public class RSAPrivateCrtKeySpecTest extends TestCase { * Test for <code>getPrimeExponentQ()</code> method<br> * Assertion: returns prime exponent Q */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPrimeExponentQ", - args = {} - ) public final void testGetPrimeExponentQ() { RSAPrivateCrtKeySpec ks = new RSAPrivateCrtKeySpec( BigInteger.ONE, @@ -185,12 +143,6 @@ public class RSAPrivateCrtKeySpecTest extends TestCase { * Test for <code>getPrimeP()</code> method<br> * Assertion: returns prime P */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPrimeP", - args = {} - ) public final void testGetPrimeP() { RSAPrivateCrtKeySpec ks = new RSAPrivateCrtKeySpec( BigInteger.ONE, @@ -208,12 +160,6 @@ public class RSAPrivateCrtKeySpecTest extends TestCase { * Test for <code>getPrimeQ()</code> method<br> * Assertion: returns prime Q */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPrimeQ", - args = {} - ) public final void testGetPrimeQ() { RSAPrivateCrtKeySpec ks = new RSAPrivateCrtKeySpec( BigInteger.ONE, @@ -231,12 +177,6 @@ public class RSAPrivateCrtKeySpecTest extends TestCase { * Test for <code>getPublicExponent()</code> method<br> * Assertion: returns public exponent */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPublicExponent", - args = {} - ) public final void testGetPublicExponent() { RSAPrivateCrtKeySpec ks = new RSAPrivateCrtKeySpec( BigInteger.ONE, @@ -258,12 +198,6 @@ public class RSAPrivateCrtKeySpecTest extends TestCase { * Test for <code>getModulus()</code> method<br> * Assertion: returns modulus */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getModulus", - args = {} - ) public final void testGetModulus() { RSAPrivateCrtKeySpec ks = new RSAPrivateCrtKeySpec( BigInteger.valueOf(5L), @@ -281,12 +215,6 @@ public class RSAPrivateCrtKeySpecTest extends TestCase { * Test for <code>getPrivateExponent()</code> method<br> * Assertion: returns private exponent */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPrivateExponent", - args = {} - ) public final void testGetPrivateExponent() { RSAPrivateCrtKeySpec ks = new RSAPrivateCrtKeySpec( BigInteger.ONE, diff --git a/luni/src/test/java/tests/security/spec/RSAPrivateKeySpecTest.java b/luni/src/test/java/tests/security/spec/RSAPrivateKeySpecTest.java index f231fd7..411d4d2 100644 --- a/luni/src/test/java/tests/security/spec/RSAPrivateKeySpecTest.java +++ b/luni/src/test/java/tests/security/spec/RSAPrivateKeySpecTest.java @@ -22,11 +22,6 @@ package tests.security.spec; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.math.BigInteger; @@ -37,7 +32,6 @@ import java.security.spec.RSAPrivateKeySpec; * Tests for <code>RSAPrivateKeySpec</code> class fields and methods * */ -@TestTargetClass(RSAPrivateKeySpec.class) public class RSAPrivateKeySpecTest extends TestCase { /** @@ -45,12 +39,6 @@ public class RSAPrivateKeySpecTest extends TestCase { * Assertion: constructs <code>RSAPrivateKeySpec</code> * object using valid parameters */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "RSAPrivateKeySpec", - args = {java.math.BigInteger.class, java.math.BigInteger.class} - ) public final void testRSAPrivateKeySpec() { KeySpec ks = new RSAPrivateKeySpec(BigInteger.valueOf(1234567890L), BigInteger.valueOf(3L)); @@ -61,12 +49,6 @@ public class RSAPrivateKeySpecTest extends TestCase { * Test for <code>getModulus()</code> method<br> * Assertion: returns modulus */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getModulus", - args = {} - ) public final void testGetModulus() { RSAPrivateKeySpec rpks = new RSAPrivateKeySpec(BigInteger.valueOf(1234567890L), @@ -78,12 +60,6 @@ public class RSAPrivateKeySpecTest extends TestCase { * Test for <code>getPrivateExponent()</code> method<br> * Assertion: returns private exponent */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPrivateExponent", - args = {} - ) public final void testGetPrivateExponent() { RSAPrivateKeySpec rpks = new RSAPrivateKeySpec(BigInteger.valueOf(1234567890L), diff --git a/luni/src/test/java/tests/security/spec/RSAPublicKeySpecTest.java b/luni/src/test/java/tests/security/spec/RSAPublicKeySpecTest.java index 7a46160..96a1034 100644 --- a/luni/src/test/java/tests/security/spec/RSAPublicKeySpecTest.java +++ b/luni/src/test/java/tests/security/spec/RSAPublicKeySpecTest.java @@ -22,11 +22,6 @@ package tests.security.spec; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.math.BigInteger; @@ -37,7 +32,6 @@ import java.security.spec.RSAPublicKeySpec; * Tests for <code>RSAPublicKeySpec</code> class fields and methods * */ -@TestTargetClass(RSAPublicKeySpec.class) public class RSAPublicKeySpecTest extends TestCase { /** @@ -45,12 +39,6 @@ public class RSAPublicKeySpecTest extends TestCase { * Assertion: Constructs <code>RSAPublicKeySpec</code> * object using valid parameters */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies constructor with valid parameters.", - method = "RSAPublicKeySpec", - args = {java.math.BigInteger.class, java.math.BigInteger.class} - ) public final void testRSAPublicKeySpec01() { KeySpec ks = new RSAPublicKeySpec(BigInteger.valueOf(1234567890L), @@ -64,12 +52,6 @@ public class RSAPublicKeySpecTest extends TestCase { * Assertion: Constructs <code>RSAPublicKeySpec</code> * object using valid parameters */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "Verifies null as parameters.", - method = "RSAPublicKeySpec", - args = {java.math.BigInteger.class, java.math.BigInteger.class} - ) public final void testRSAPublicKeySpec02() { KeySpec ks = new RSAPublicKeySpec(null, null); @@ -81,12 +63,6 @@ public class RSAPublicKeySpecTest extends TestCase { * Test for <code>getModulus()</code> method<br> * Assertion: returns modulus */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getModulus", - args = {} - ) public final void testGetModulus() { RSAPublicKeySpec rpks = new RSAPublicKeySpec(BigInteger.valueOf(1234567890L), @@ -98,12 +74,6 @@ public class RSAPublicKeySpecTest extends TestCase { * Test for <code>getPublicExponent()</code> method<br> * Assertion: returns public exponent */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getPublicExponent", - args = {} - ) public final void testGetPublicExponent() { RSAPublicKeySpec rpks = new RSAPublicKeySpec(BigInteger.valueOf(3L), diff --git a/luni/src/test/java/tests/security/spec/X509EncodedKeySpecTest.java b/luni/src/test/java/tests/security/spec/X509EncodedKeySpecTest.java index 0ccbf52..1292983 100644 --- a/luni/src/test/java/tests/security/spec/X509EncodedKeySpecTest.java +++ b/luni/src/test/java/tests/security/spec/X509EncodedKeySpecTest.java @@ -22,11 +22,6 @@ package tests.security.spec; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import java.security.spec.EncodedKeySpec; @@ -38,7 +33,6 @@ import java.util.Arrays; * Tests for <code>X509EncodedKeySpec</code> class fields and methods * */ -@TestTargetClass(X509EncodedKeySpec.class) public class X509EncodedKeySpecTest extends TestCase { // @@ -50,12 +44,6 @@ public class X509EncodedKeySpecTest extends TestCase { * Assertion: constructs new <code>X509EncodedKeySpec</code> * object using valid parameter */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "X509EncodedKeySpec", - args = {byte[].class} - ) public final void testX509EncodedKeySpec() { byte[] encodedKey = new byte[] {(byte)1,(byte)2,(byte)3,(byte)4}; @@ -74,12 +62,6 @@ public class X509EncodedKeySpecTest extends TestCase { * Test for <code>getEncoded()</code> method<br> * Assertion: returns encoded key */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getEncoded", - args = {} - ) public final void testGetEncoded() { byte[] encodedKey = new byte[] {(byte)1,(byte)2,(byte)3,(byte)4}; @@ -94,12 +76,6 @@ public class X509EncodedKeySpecTest extends TestCase { * Test for <code>getFormat()</code> method * Assertion: returns format name (always "X.509") */ - @TestTargetNew( - level = TestLevel.COMPLETE, - notes = "", - method = "getFormat", - args = {} - ) public final void testGetFormat() { byte[] encodedKey = new byte[] {(byte)1,(byte)2,(byte)3,(byte)4}; @@ -113,12 +89,6 @@ public class X509EncodedKeySpecTest extends TestCase { * can not be changed by modifying initial * array value */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getEncoded", - args = {} - ) public final void testIsStatePreserved1() { // Reference array byte[] encodedKey = new byte[] {(byte)1,(byte)2,(byte)3,(byte)4}; @@ -143,12 +113,6 @@ public class X509EncodedKeySpecTest extends TestCase { * can not be modified using returned value * of <code>getEncoded()</code> method */ - @TestTargetNew( - level = TestLevel.PARTIAL_COMPLETE, - notes = "", - method = "getEncoded", - args = {} - ) public final void testIsStatePreserved2() { // Reference array byte[] encodedKey = new byte[] {(byte)1,(byte)2,(byte)3,(byte)4}; diff --git a/luni/src/test/java/tests/targets/security/KeyStoreTest.java b/luni/src/test/java/tests/targets/security/KeyStoreTest.java index 41d0f9a..41206c8 100644 --- a/luni/src/test/java/tests/targets/security/KeyStoreTest.java +++ b/luni/src/test/java/tests/targets/security/KeyStoreTest.java @@ -15,9 +15,6 @@ */ package tests.targets.security; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -51,23 +48,6 @@ public class KeyStoreTest extends TestCase { this.keyStorePassword = keyStorePassword; } - @TestTargets({ - @TestTargetNew( - level=TestLevel.ADDITIONAL, - method="getInstance", - args={String.class} - ), - @TestTargetNew( - level=TestLevel.ADDITIONAL, - method="load", - args={InputStream.class,char[].class} - ), - @TestTargetNew( - level=TestLevel.PARTIAL_COMPLETE, - method="method", - args={} - ) - }) public void testKeyStoreLoad() { KeyStore keyStore = null; try { @@ -95,28 +75,6 @@ public class KeyStoreTest extends TestCase { } } - @TestTargets({ - @TestTargetNew( - level=TestLevel.ADDITIONAL, - method="getInstance", - args={String.class} - ), - @TestTargetNew( - level=TestLevel.ADDITIONAL, - method="load", - args={InputStream.class,char[].class} - ), - @TestTargetNew( - level=TestLevel.ADDITIONAL, - method="setEntry", - args={String.class,Entry.class,ProtectionParameter.class} - ), - @TestTargetNew( - level=TestLevel.PARTIAL_COMPLETE, - method="method", - args={} - ) - }) public void testKeyStoreCreate() { KeyStore keyStore = null; try { diff --git a/luni/src/test/java/tests/targets/security/MessageDigestTestMD2.java b/luni/src/test/java/tests/targets/security/MessageDigestTestMD2.java index ab24067..6811bc0 100644 --- a/luni/src/test/java/tests/targets/security/MessageDigestTestMD2.java +++ b/luni/src/test/java/tests/targets/security/MessageDigestTestMD2.java @@ -16,8 +16,6 @@ package tests.targets.security; import dalvik.annotation.AndroidOnly; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.security.Provider; @@ -26,11 +24,6 @@ import junit.framework.TestCase; public class MessageDigestTestMD2 extends TestCase { - @TestTargetNew( - level = TestLevel.ADDITIONAL, - method = "getInstance", - args = {String.class} - ) @AndroidOnly("Android doesn't include MD2 message digest algorithm") public void testMessageDigest1() throws Exception{ try { @@ -49,11 +42,6 @@ public class MessageDigestTestMD2 extends TestCase { } } - @TestTargetNew( - level = TestLevel.ADDITIONAL, - method = "getInstance", - args = {String.class} - ) @AndroidOnly("Android allows usage of MD2 in third party providers") public void testMessageDigest2() throws Exception{ diff --git a/luni/src/test/java/tests/targets/security/SignatureTestMD2withRSA.java b/luni/src/test/java/tests/targets/security/SignatureTestMD2withRSA.java index 2041d41..3a30c2f 100644 --- a/luni/src/test/java/tests/targets/security/SignatureTestMD2withRSA.java +++ b/luni/src/test/java/tests/targets/security/SignatureTestMD2withRSA.java @@ -16,8 +16,6 @@ package tests.targets.security; import dalvik.annotation.AndroidOnly; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; import java.security.InvalidKeyException; import java.security.InvalidParameterException; import java.security.NoSuchAlgorithmException; @@ -31,11 +29,6 @@ import junit.framework.TestCase; public class SignatureTestMD2withRSA extends TestCase { - @TestTargetNew( - level = TestLevel.ADDITIONAL, - method = "getInstance", - args = {String.class} - ) @AndroidOnly("Android doesn't include MD2withRSA signature algorithm") public void testSignature() { @@ -98,11 +91,6 @@ public class SignatureTestMD2withRSA extends TestCase { } } - @TestTargetNew( - level = TestLevel.ADDITIONAL, - method = "getInstance", - args = {String.class} - ) @AndroidOnly("Android allows usage of MD2withRSA in third party providers") public void testSignature2() throws Exception{ diff --git a/luni/src/test/java/tests/targets/security/cert/CertificateTest.java b/luni/src/test/java/tests/targets/security/cert/CertificateTest.java index 78619a5..dde7664 100644 --- a/luni/src/test/java/tests/targets/security/cert/CertificateTest.java +++ b/luni/src/test/java/tests/targets/security/cert/CertificateTest.java @@ -16,8 +16,6 @@ package tests.targets.security.cert; import dalvik.annotation.AndroidOnly; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; import java.io.ByteArrayInputStream; import java.security.KeyStore; import java.security.NoSuchAlgorithmException; @@ -590,12 +588,6 @@ public class CertificateTest extends TestCase { + "+qrLMgx5qoZ0bERU9tgHns2Y9CMFCS+iU7XbCoHMXyPLeRHFEVuFaycBifMOuw==\n" + "-----END CERTIFICATE-----"; - @TestTargetNew( - clazz=Certificate.class, - level=TestLevel.ADDITIONAL, - method="verify", - args={PublicKey.class} - ) public void testVerifyMD5() throws Exception { Provider[] providers = Security.getProviders("CertificateFactory.X509"); for (Provider provider : providers) { @@ -610,12 +602,6 @@ public class CertificateTest extends TestCase { } } - @TestTargetNew( - clazz=Certificate.class, - level=TestLevel.ADDITIONAL, - method="verify", - args={PublicKey.class} - ) @AndroidOnly("MD2 is not supported by Android") public void testVerifyMD2() throws Exception { Provider[] providers = Security.getProviders("CertificateFactory.X509"); @@ -635,12 +621,6 @@ public class CertificateTest extends TestCase { } } - @TestTargetNew( - clazz=CertPathValidator.class, - level=TestLevel.ADDITIONAL, - method="verify", - args={PublicKey.class} - ) public void testVerifyMD2_chain() throws Exception { CertificateFactory certificateFactory = CertificateFactory .getInstance("X509"); @@ -679,12 +659,6 @@ public class CertificateTest extends TestCase { .contains(r.getTrustAnchor())); } - @TestTargetNew( - clazz=CertPathValidator.class, - level=TestLevel.ADDITIONAL, - method="verify", - args={PublicKey.class} - ) public void testVerifyMD5_chain() throws Exception { CertificateFactory certificateFactory = CertificateFactory .getInstance("X509"); diff --git a/luni/src/test/java/tests/xml/NodeTest.java b/luni/src/test/java/tests/xml/NodeTest.java index 6bf4d94..a2c86a9 100644 --- a/luni/src/test/java/tests/xml/NodeTest.java +++ b/luni/src/test/java/tests/xml/NodeTest.java @@ -16,7 +16,6 @@ package tests.xml; -import dalvik.annotation.TestTargetClass; import junit.framework.TestCase; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -31,7 +30,6 @@ import java.io.File; import java.util.ArrayList; import java.util.List; -@TestTargetClass(Node.class) public class NodeTest extends TestCase { /** diff --git a/luni/src/test/java/tests/xml/SimpleBuilderTest.java b/luni/src/test/java/tests/xml/SimpleBuilderTest.java index a6c6a1d..4dbe73e 100644 --- a/luni/src/test/java/tests/xml/SimpleBuilderTest.java +++ b/luni/src/test/java/tests/xml/SimpleBuilderTest.java @@ -16,9 +16,6 @@ package tests.xml; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetClass; -import dalvik.annotation.TestTargetNew; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import junit.framework.TestCase; @@ -30,7 +27,6 @@ import org.w3c.dom.NodeList; import org.w3c.dom.ProcessingInstruction; import org.w3c.dom.Text; -@TestTargetClass(DocumentBuilder.class) public class SimpleBuilderTest extends TestCase { private DocumentBuilder builder; @@ -58,12 +54,6 @@ public class SimpleBuilderTest extends TestCase { return result; } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Regression test.", - method = "parse", - args = {java.io.InputStream.class} - ) public void testGoodFile1() throws Exception { Document document = builder.parse(getClass().getResourceAsStream( "/SimpleBuilderTest.xml")); @@ -117,11 +107,6 @@ public class SimpleBuilderTest extends TestCase { assertEquals(" Fragile! Handle me with care! ", comment); } - @TestTargetNew( - level = TestLevel.ADDITIONAL, - method = "!todo parse", - args = {java.io.InputStream.class} - ) public void testGoodFile2() throws Exception { Document document = builder.parse(getClass().getResourceAsStream( "/staffNS.xml")); diff --git a/luni/src/test/java/tests/xml/SimpleParserTest.java b/luni/src/test/java/tests/xml/SimpleParserTest.java index 663c863..f3f0dde 100644 --- a/luni/src/test/java/tests/xml/SimpleParserTest.java +++ b/luni/src/test/java/tests/xml/SimpleParserTest.java @@ -16,11 +16,6 @@ package tests.xml; -import dalvik.annotation.TestTargets; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargetClass; - import junit.framework.TestCase; import org.xml.sax.Attributes; @@ -39,7 +34,6 @@ import java.util.Map; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; -@TestTargetClass(SAXParser.class) public class SimpleParserTest extends TestCase implements ContentHandler { private SAXParser parser; @@ -166,12 +160,6 @@ public class SimpleParserTest extends TestCase implements ContentHandler { public void startPrefixMapping(String prefix, String uri) { } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "", - method = "parse", - args = {java.io.InputStream.class, org.xml.sax.helpers.DefaultHandler.class} - ) public void testWorkingFile1() throws Exception { SAXParserFactory factory = SAXParserFactory.newInstance(); factory.setValidating(false); @@ -196,12 +184,6 @@ public class SimpleParserTest extends TestCase implements ContentHandler { assertEquals("http://www.foobar.org", namespaces1.get("stuff")); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "", - method = "parse", - args = {java.io.InputStream.class, org.xml.sax.helpers.DefaultHandler.class} - ) public void testWorkingFile2() throws Exception { SAXParserFactory factory = SAXParserFactory.newInstance(); @@ -230,12 +212,6 @@ public class SimpleParserTest extends TestCase implements ContentHandler { assertEquals(0, namespaces2.size()); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify exceptions.", - method = "parse", - args = {java.io.InputStream.class, org.xml.sax.helpers.DefaultHandler.class} - ) public void testEntityResolver() throws Exception { final StringBuilder text = new StringBuilder(); DefaultHandler handler = new DefaultHandler() { @@ -265,12 +241,6 @@ public class SimpleParserTest extends TestCase implements ContentHandler { "resolved external entity must be in parser character stream", text.toString().contains("test")); } - @TestTargetNew( - level = TestLevel.PARTIAL, - notes = "Doesn't verify exceptions.", - method = "parse", - args = {java.io.InputStream.class, org.xml.sax.helpers.DefaultHandler.class} - ) public void testGetValue() throws Exception{ parser.parse(getClass().getResourceAsStream("/staffNS.xml"), new DefaultHandler() { diff --git a/support/src/test/java/tests/security/AlgorithmParameterGeneratorTest.java b/support/src/test/java/tests/security/AlgorithmParameterGeneratorTest.java index 80065f3..7bd52f0 100644 --- a/support/src/test/java/tests/security/AlgorithmParameterGeneratorTest.java +++ b/support/src/test/java/tests/security/AlgorithmParameterGeneratorTest.java @@ -15,9 +15,6 @@ */ package tests.security; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; import java.security.AlgorithmParameterGenerator; import java.security.AlgorithmParameters; import java.security.NoSuchAlgorithmException; @@ -33,23 +30,6 @@ public abstract class AlgorithmParameterGeneratorTest extends TestCase { this.helper = helper; } - @TestTargets({ - @TestTargetNew( - level=TestLevel.ADDITIONAL, - method="getInstance", - args={String.class} - ), - @TestTargetNew( - level=TestLevel.ADDITIONAL, - method="init", - args={int.class} - ), - @TestTargetNew( - level=TestLevel.COMPLETE, - method="method", - args={} - ) - }) public void testAlgorithmParameterGenerator() { AlgorithmParameterGenerator generator = null; try { diff --git a/support/src/test/java/tests/security/AlgorithmParametersTest.java b/support/src/test/java/tests/security/AlgorithmParametersTest.java index d5c1910..67255fc 100644 --- a/support/src/test/java/tests/security/AlgorithmParametersTest.java +++ b/support/src/test/java/tests/security/AlgorithmParametersTest.java @@ -15,9 +15,6 @@ */ package tests.security; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; import java.security.AlgorithmParameters; import java.security.NoSuchAlgorithmException; import java.security.spec.AlgorithmParameterSpec; @@ -37,23 +34,6 @@ public class AlgorithmParametersTest extends TestCase { this.parameterData = parameterData; } - @TestTargets({ - @TestTargetNew( - level=TestLevel.ADDITIONAL, - method="getInstance", - args={String.class} - ), - @TestTargetNew( - level=TestLevel.ADDITIONAL, - method="init", - args={byte[].class} - ), - @TestTargetNew( - level=TestLevel.COMPLETE, - method="method", - args={} - ) - }) public void testAlgorithmParameters() { AlgorithmParameters algorithmParameters = null; try { diff --git a/support/src/test/java/tests/security/KeyFactoryTest.java b/support/src/test/java/tests/security/KeyFactoryTest.java index 179254a..e2f687d 100644 --- a/support/src/test/java/tests/security/KeyFactoryTest.java +++ b/support/src/test/java/tests/security/KeyFactoryTest.java @@ -15,9 +15,6 @@ */ package tests.security; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; import java.security.Key; import java.security.KeyFactory; import java.security.KeyPair; @@ -58,28 +55,6 @@ public abstract class KeyFactoryTest<PublicKeySpec extends KeySpec, PrivateKeySp return null; } - @TestTargets({ - @TestTargetNew( - level = TestLevel.ADDITIONAL, - method = "getKeySpec", - args = {Key.class, Class.class} - ), - @TestTargetNew( - level = TestLevel.ADDITIONAL, - method = "generatePrivate", - args = {KeySpec.class} - ), - @TestTargetNew( - level = TestLevel.ADDITIONAL, - method = "generatePublic", - args = {KeySpec.class} - ), - @TestTargetNew( - level=TestLevel.COMPLETE, - method="method", - args={} - ) - }) public void testKeyFactory() { PrivateKeySpec privateKeySpec = null; try { diff --git a/support/src/test/java/tests/security/KeyPairGeneratorTest.java b/support/src/test/java/tests/security/KeyPairGeneratorTest.java index adf8d4d..4ade0af 100644 --- a/support/src/test/java/tests/security/KeyPairGeneratorTest.java +++ b/support/src/test/java/tests/security/KeyPairGeneratorTest.java @@ -16,9 +16,6 @@ package tests.security; -import dalvik.annotation.TestLevel; -import dalvik.annotation.TestTargetNew; -import dalvik.annotation.TestTargets; import java.security.KeyPair; import java.security.KeyPairGenerator; import java.security.NoSuchAlgorithmException; @@ -50,23 +47,6 @@ public abstract class KeyPairGeneratorTest extends TestCase { } } - @TestTargets({ - @TestTargetNew( - level = TestLevel.ADDITIONAL, - method = "initialize", - args = {int.class} - ), - @TestTargetNew( - level = TestLevel.ADDITIONAL, - method = "generateKeyPair", - args = {} - ), - @TestTargetNew( - level=TestLevel.COMPLETE, - method="method", - args={} - ) - }) public void testKeyPairGenerator() throws NoSuchAlgorithmException { generator.initialize(1024); diff --git a/support/src/test/java/tests/support/Support_CollectionTest.java b/support/src/test/java/tests/support/Support_CollectionTest.java index 6ff1868..190c6b9 100644 --- a/support/src/test/java/tests/support/Support_CollectionTest.java +++ b/support/src/test/java/tests/support/Support_CollectionTest.java @@ -17,15 +17,12 @@ package tests.support; -import dalvik.annotation.TestTargetClass; - import java.util.Collection; import java.util.TreeSet; /** - * @tests java.util.Collection + * java.util.Collection */ -@TestTargetClass(java.util.Collection.class) public class Support_CollectionTest extends junit.framework.TestCase { Collection<Integer> col; // must contain the Integers 0 to 99 diff --git a/support/src/test/java/tests/support/Support_ListTest.java b/support/src/test/java/tests/support/Support_ListTest.java index f9b7a21..8aeeeaf 100644 --- a/support/src/test/java/tests/support/Support_ListTest.java +++ b/support/src/test/java/tests/support/Support_ListTest.java @@ -17,14 +17,11 @@ package tests.support; -import dalvik.annotation.TestTargetClass; - import java.util.LinkedList; import java.util.List; import java.util.ListIterator; import java.util.NoSuchElementException; -@TestTargetClass(List.class) public class Support_ListTest extends junit.framework.TestCase { List<Integer> list; // must contain the Integers 0 to 99 in order diff --git a/support/src/test/java/tests/support/Support_SetTest.java b/support/src/test/java/tests/support/Support_SetTest.java index cbea1d8..a4a1432 100644 --- a/support/src/test/java/tests/support/Support_SetTest.java +++ b/support/src/test/java/tests/support/Support_SetTest.java @@ -17,11 +17,8 @@ package tests.support; -import dalvik.annotation.TestTargetClass; - import java.util.Set; -@TestTargetClass(Set.class) public class Support_SetTest extends junit.framework.TestCase { Set<Integer> set; // must contain only the Integers 0 to 99 diff --git a/support/src/test/java/tests/support/Support_UnmodifiableCollectionTest.java b/support/src/test/java/tests/support/Support_UnmodifiableCollectionTest.java index a07b9b4..ee266c6 100644 --- a/support/src/test/java/tests/support/Support_UnmodifiableCollectionTest.java +++ b/support/src/test/java/tests/support/Support_UnmodifiableCollectionTest.java @@ -17,8 +17,6 @@ package tests.support; -import dalvik.annotation.TestTargetClass; - import java.util.Collection; import java.util.HashSet; import java.util.Iterator; @@ -26,7 +24,6 @@ import java.util.SortedSet; import java.util.TreeSet; import junit.framework.TestCase; -@TestTargetClass(Collection.class) public class Support_UnmodifiableCollectionTest extends TestCase { Collection<Integer> col; diff --git a/support/src/test/java/tests/support/Support_UnmodifiableMapTest.java b/support/src/test/java/tests/support/Support_UnmodifiableMapTest.java index 464ee93..e7a1620 100644 --- a/support/src/test/java/tests/support/Support_UnmodifiableMapTest.java +++ b/support/src/test/java/tests/support/Support_UnmodifiableMapTest.java @@ -17,15 +17,12 @@ package tests.support; -import dalvik.annotation.TestTargetClass; - import java.util.HashSet; import java.util.Iterator; import java.util.Map; import java.util.Set; import junit.framework.TestCase; -@TestTargetClass(Map.class) public class Support_UnmodifiableMapTest extends TestCase { Map<String, Integer> map; |