You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by nd...@apache.org on 2006/10/02 04:52:43 UTC
svn commit: r451857 [3/4] - in
/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java:
common/javax/security/auth/ common/javax/security/auth/callback/
common/javax/security/auth/kerberos/ common/javax/security/auth/login/
common/javax/s...
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/internal/SecurityTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/internal/SecurityTest.java?view=diff&rev=451857&r1=451856&r2=451857
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/internal/SecurityTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/internal/SecurityTest.java Sun Oct 1 19:52:40 2006
@@ -15,6 +15,11 @@
* limitations under the License.
*/
+/**
+* @author Stepan M. Mishura
+* @version $Revision$
+*/
+
package org.apache.harmony.auth.internal;
import java.security.AccessControlContext;
@@ -22,7 +27,6 @@
import java.security.AllPermission;
import java.security.Permission;
import java.security.Permissions;
-import java.security.Principal;
import java.security.ProtectionDomain;
import java.util.Enumeration;
import java.util.HashSet;
@@ -47,6 +51,7 @@
* please notify the author before using it
*
*/
+
public class SecurityTest extends TestCase {
public static boolean testing = false;
@@ -67,14 +72,12 @@
denyMode(); //set default mode
}
- @Override
protected void runTest() throws Throwable {
if (System.getSecurityManager() != null) {
fail("There MUST be no security manager installed!");
}
SecurityManager sm = new SecurityManager() {
- @Override
public void checkPermission(Permission permission) {
//System.out.println("P: " + permission);
if (mode) { //deny mode
@@ -117,7 +120,7 @@
* @param permission - permission class for comparing
*/
public final void assertEquals(AccessControlException exception,
- Class<AuthPermission> permission) {
+ Class permission) {
if (!permission.isInstance(exception.getPermission())) {
fail("No expected " + permission.getName());
}
@@ -187,7 +190,7 @@
/**
* Tested <code>set</code>. Must be initialized in derived class
*/
- public Set<?> set;
+ public Set set;
/**
* Set's <code>element</code>. Must be initialized in derived class
@@ -202,7 +205,6 @@
super(name);
}
- @Override
protected void setUp() throws Exception {
super.setUp();
@@ -226,10 +228,9 @@
*
* Expected: must return true
*/
- @SuppressWarnings("unchecked")
public void testHasNext() {
- ((Set<Object>)set).add(element);
+ set.add(element);
assertTrue("Set is not empty", set.iterator().hasNext());
}
@@ -253,12 +254,11 @@
*
* Expected: no exception, returned element is equals to added
*/
- @SuppressWarnings("unchecked")
public void testNext() {
- ((Set<Object>)set).add(element);
+ set.add(element);
- Iterator<?> it = set.iterator();
+ Iterator it = set.iterator();
assertEquals("Element", it.next(), element);
assertFalse("Next element", it.hasNext());
@@ -269,12 +269,11 @@
*
* Expected: NoSuchElementException
*/
- @SuppressWarnings("unchecked")
public void testNext_NoSuchElementException() {
- ((Set<Object>)set).add(element);
+ set.add(element);
- Iterator<?> it = set.iterator();
+ Iterator it = set.iterator();
it.next();
try {
@@ -289,12 +288,11 @@
*
* Expected: no exception, size must be 0
*/
- @SuppressWarnings("unchecked")
public void testRemove() {
- ((Set<Object>)set).add(element);
+ set.add(element);
- Iterator<?> it = set.iterator();
+ Iterator it = set.iterator();
it.next();
it.remove();
@@ -324,10 +322,9 @@
*
* Expected: IllegalStateException
*/
- @SuppressWarnings("unchecked")
public void testRemove_IllegalStateException_NoNext() {
- ((Set<Object>)set).add(element);
+ set.add(element);
try {
set.iterator().remove();
@@ -341,12 +338,11 @@
*
* Expected: IllegalStateException
*/
- @SuppressWarnings("unchecked")
public void testRemove_IllegalStateException_2Remove() {
- ((Set<Object>)set).add(element);
+ set.add(element);
- Iterator<?> it = set.iterator();
+ Iterator it = set.iterator();
it.next();
it.remove();
@@ -362,7 +358,6 @@
* Tests iterator interface for read only set
*
*/
- @SuppressWarnings("unchecked")
public static class ReadOnlyIteratorTest extends IteratorTest {
public void setReadOnly() {
@@ -373,7 +368,6 @@
/**
* @see org.apache.harmony.auth.internal.SecurityTest.IteratorTest#testHasNext_EmptySet()
*/
- @Override
public void testHasNext_EmptySet() {
setReadOnly();
super.testHasNext_EmptySet();
@@ -382,11 +376,9 @@
/**
* @see org.apache.harmony.auth.internal.SecurityTest.IteratorTest#testHasNext()
*/
- @SuppressWarnings("unchecked")
- @Override
public void testHasNext() {
- ((Set<Object>)set).add(element);
+ set.add(element);
setReadOnly();
assertTrue("Set is not empty", set.iterator().hasNext());
@@ -395,7 +387,6 @@
/**
* @see org.apache.harmony.auth.internal.SecurityTest.IteratorTest#testNext_EmptySet_NoSuchElementException()
*/
- @Override
public void testNext_EmptySet_NoSuchElementException() {
setReadOnly();
super.testNext_EmptySet_NoSuchElementException();
@@ -404,13 +395,12 @@
/**
* @see org.apache.harmony.auth.internal.SecurityTest.IteratorTest#testNext()
*/
- @Override
public void testNext() {
- ((Set<Object>)set).add(element);
+ set.add(element);
setReadOnly();
- Iterator<?> it = set.iterator();
+ Iterator it = set.iterator();
assertEquals("Element", it.next(), element);
assertFalse("Next element", it.hasNext());
@@ -419,13 +409,12 @@
/**
* @see org.apache.harmony.auth.internal.SecurityTest.IteratorTest#testNext_NoSuchElementException()
*/
- @Override
public void testNext_NoSuchElementException() {
- ((Set<Object>)set).add(element);
+ set.add(element);
setReadOnly();
- Iterator<?> it = set.iterator();
+ Iterator it = set.iterator();
it.next();
try {
@@ -440,13 +429,12 @@
*
* Expected: IllegalStateException
*/
- @Override
public void testRemove() {
- ((Set<Object>)set).add(element);
+ set.add(element);
setReadOnly();
- Iterator<?> it = set.iterator();
+ Iterator it = set.iterator();
it.next();
try {
@@ -459,7 +447,6 @@
/**
* @see org.apache.harmony.auth.internal.SecurityTest.IteratorTest#testRemove_EmptySet_IllegalStateException()
*/
- @Override
public void testRemove_EmptySet_IllegalStateException() {
setReadOnly();
super.testRemove_EmptySet_IllegalStateException();
@@ -471,10 +458,9 @@
*
* Expected: IllegalStateException
*/
- @Override
public void testRemove_IllegalStateException_NoNext() {
- ((Set<Object>)set).add(element);
+ set.add(element);
setReadOnly();
try {
@@ -489,12 +475,11 @@
*
* Expected: IllegalStateException
*/
- @Override
public void testRemove_IllegalStateException_2Remove() {
- ((Set<Object>)set).add(element);
+ set.add(element);
- Iterator<?> it = set.iterator();
+ Iterator it = set.iterator();
it.next();
setReadOnly();
@@ -510,7 +495,6 @@
* Tests iterator interface for secure set
*
*/
- @SuppressWarnings("unchecked")
public static class SecureIteratorTest extends IteratorTest {
public void setSecure() {
@@ -521,7 +505,6 @@
/**
* @see org.apache.harmony.auth.internal.SecurityTest.IteratorTest#testHasNext_EmptySet()
*/
- @Override
public void testHasNext_EmptySet() {
setSecure();
super.testHasNext_EmptySet();
@@ -530,9 +513,8 @@
/**
* @see org.apache.harmony.auth.internal.SecurityTest.IteratorTest#testHasNext()
*/
- @Override
public void testHasNext() {
- ((Set<Object>)set).add(element);
+ set.add(element);
setSecure();
assertTrue("Set is not empty", set.iterator().hasNext());
@@ -541,7 +523,6 @@
/**
* @see org.apache.harmony.auth.internal.SecurityTest.IteratorTest#testNext_EmptySet_NoSuchElementException()
*/
- @Override
public void testNext_EmptySet_NoSuchElementException() {
setSecure();
super.testNext_EmptySet_NoSuchElementException();
@@ -550,12 +531,11 @@
/**
* @see org.apache.harmony.auth.internal.SecurityTest.IteratorTest#testNext_NoSuchElementException()
*/
- @Override
public void testNext_NoSuchElementException() {
- ((Set<Object>)set).add(element);
+ set.add(element);
setSecure();
- Iterator<?> it = set.iterator();
+ Iterator it = set.iterator();
it.next();
try {
@@ -568,12 +548,11 @@
/**
* @see org.apache.harmony.auth.internal.SecurityTest.IteratorTest#testNext()
*/
- @Override
public void testNext() {
- ((Set<Object>)set).add(element);
+ set.add(element);
setSecure();
- Iterator<?> it = set.iterator();
+ Iterator it = set.iterator();
assertEquals("Element", it.next(), element);
assertFalse("Next element", it.hasNext());
@@ -584,12 +563,11 @@
*
* Expected: AccessControlException
*/
- @Override
public void testRemove() {
- ((Set<Object>)set).add(element);
+ set.add(element);
setSecure();
- Iterator<?> it = set.iterator();
+ Iterator it = set.iterator();
it.next();
try {
@@ -606,7 +584,6 @@
*
* Expected: AccessControlException instead IllegalStateException for empty set
*/
- @Override
public void testRemove_EmptySet_IllegalStateException() {
setSecure();
@@ -623,10 +600,9 @@
*
* Expected: AccessControlException instead IllegalStateException
*/
- @Override
public void testRemove_IllegalStateException_NoNext() {
- ((Set<Object>)set).add(element);
+ set.add(element);
setSecure();
try {
@@ -642,11 +618,10 @@
*
* Expected: AccessControlException
*/
- @Override
public void testRemove_IllegalStateException_2Remove() {
- ((Set<Object>)set).add(element);
+ set.add(element);
- Iterator<?> it = set.iterator();
+ Iterator it = set.iterator();
it.next();
setSecure();
@@ -659,13 +634,12 @@
}
}
- @SuppressWarnings("unchecked")
public static class SetTest extends SecurityTest {
/**
* Tested <code>set</code>. Must be initialized in derived class
*/
- public Set<?> set;
+ public Set set;
/**
* Set's <code>element</code>. Must be initialized in derived class
@@ -675,9 +649,8 @@
/**
* Is used as collection parameter
*/
- public HashSet<Object> hash = new HashSet<Object>();
+ public HashSet hash = new HashSet();
- @Override
protected void setUp() throws Exception {
super.setUp();
@@ -693,13 +666,13 @@
// Testing: boolean Set.add(Object o)
//
public void testAdd_NewElement() {
- assertTrue("Adding new element", ((Set<Object>)set).add(element));
+ assertTrue("Adding new element", set.add(element));
assertEquals("Size", 1, set.size());
}
public void testAdd_ExistingElement() {
- ((Set<Object>)set).add(element);
- assertFalse("Adding existing element", ((Set<Object>)set).add(element));
+ set.add(element);
+ assertFalse("Adding existing element", set.add(element));
assertEquals("Size", 1, set.size());
}
@@ -709,25 +682,25 @@
public void testAddAll_NullParameter() {
try {
- ((Set<Object>)set).addAll(null);
+ set.addAll(null);
fail("No expected NullPointerException");
} catch (NullPointerException npe) {
}
}
public void testAddAll_EmptySet() {
- assertFalse("Adding empty set", ((Set<Object>)set).addAll(new HashSet<Object>()));
+ assertFalse("Adding empty set", set.addAll(new HashSet()));
assertEquals("Size", 0, set.size());
}
public void testAddAll_NewElement() {
- assertTrue("Adding new element", ((Set<Object>)set).addAll(hash));
+ assertTrue("Adding new element", set.addAll(hash));
assertEquals("Size", 1, set.size());
}
public void testAddAll_ExistingElement() {
- ((Set<Object>)set).add(element);
- assertFalse("Adding existing element", ((Set<Object>)set).addAll(hash));
+ set.add(element);
+ assertFalse("Adding existing element", set.addAll(hash));
assertEquals("Size", 1, set.size());
}
@@ -740,7 +713,7 @@
}
public void testClear_NotEmptySet() {
- ((Set<Object>)set).add(element);
+ set.add(element);
set.clear();
assertEquals("Set MUST be empty", 0, set.size());
}
@@ -753,7 +726,7 @@
}
public void testContains_ExistingElement() {
- ((Set<Object>)set).add(element);
+ set.add(element);
assertTrue("Set contains element", set.contains(element));
}
@@ -769,7 +742,7 @@
}
public void testContainsAll_EmptySet() {
- assertTrue("Empty set", set.containsAll(new HashSet<Object>()));
+ assertTrue("Empty set", set.containsAll(new HashSet()));
}
public void testContainsAll_NotExistingElement() {
@@ -777,7 +750,7 @@
}
public void testContainsAll_ExistingElement() {
- ((Set<Object>)set).add(element);
+ set.add(element);
assertTrue("Set contains element", set.containsAll(hash));
}
@@ -790,7 +763,7 @@
}
public void testIsEmpty_NotEmptySet() {
- ((Set<Object>)set).add(element);
+ set.add(element);
assertFalse("Set is not empty", set.isEmpty());
}
@@ -804,9 +777,8 @@
assertNotNull("Iterator", set.iterator());
}
- @SuppressWarnings("unchecked")
public void testIterator_NotEmptySet() {
- ((Set<Object>)set).add(element);
+ set.add(element);
assertNotNull("Iterator", set.iterator());
}
@@ -820,7 +792,7 @@
}
public void testRemove_ExistingElement() {
- ((Set<Object>)set).add(element);
+ set.add(element);
assertTrue("Removing element", set.remove(element));
assertEquals("Size", 0, set.size());
}
@@ -839,7 +811,7 @@
public void testRemoveAll_NullParameter_NotEmptySet() {
- ((Set<Object>)set).add(element);
+ set.add(element);
try {
set.removeAll(null);
fail("No expected NullPointerException");
@@ -848,13 +820,13 @@
}
public void testRemoveAll_EmptySet() {
- assertFalse("Removing empty set", set.removeAll(new HashSet<Object>()));
+ assertFalse("Removing empty set", set.removeAll(new HashSet()));
assertEquals("Size", 0, set.size());
}
public void testRemoveAll_NotEmptySet() {
- ((Set<Object>)set).add(element);
- assertFalse("Removing empty set", set.removeAll(new HashSet<Object>()));
+ set.add(element);
+ assertFalse("Removing empty set", set.removeAll(new HashSet()));
assertEquals("Size", 1, set.size());
}
@@ -864,7 +836,7 @@
}
public void testRemoveAll_ExistingElement() {
- ((Set<Object>)set).add(element);
+ set.add(element);
assertTrue("Removing elements", set.removeAll(hash));
assertEquals("Size", 0, set.size());
}
@@ -887,7 +859,7 @@
public void testRetainAll_NullParameter_NotEmptySet() {
- ((Set<Object>)set).add(element);
+ set.add(element);
try {
set.retainAll(null);
fail("No expected NullPointerException");
@@ -896,13 +868,13 @@
}
public void testRetainAll_EmptySet() {
- assertFalse("Removing all elements", set.retainAll(new HashSet<Object>()));
+ assertFalse("Removing all elements", set.retainAll(new HashSet()));
assertEquals("Size", 0, set.size());
}
public void testRetainAll_NotEmptySet() {
- ((Set<Object>)set).add(element);
- assertTrue("Removing all elements", set.retainAll(new HashSet<Object>()));
+ set.add(element);
+ assertTrue("Removing all elements", set.retainAll(new HashSet()));
assertEquals("Size", 0, set.size());
}
@@ -912,7 +884,7 @@
}
public void testRetainAll_ExistingElement() {
- ((Set<Object>)set).add(element);
+ set.add(element);
assertFalse("Removing elements", set.retainAll(hash));
assertEquals("Size", 1, set.size());
}
@@ -925,27 +897,26 @@
}
public void testToArray_NotEmptySet() {
- ((Set<Object>)set).add(element);
+ set.add(element);
assertEquals("Set is not empty", set.toArray().length, 1);
assertTrue("Set element", set.toArray()[0] == element);
}
public void testToArray_Immutability() {
- ((Set<Object>)set).add(element);
+ set.add(element);
set.toArray()[0] = null;
assertTrue("Element", set.toArray()[0] == element);
}
//TODO test Object[] Set.toArray(Object[] a)
}
-
- @SuppressWarnings("unchecked")
+
public static class UnsupportedNullTest extends SecurityTest {
/**
* Tested <code>set</code>. Must be initialized in derived class
*/
- public Set<?> set;
+ public Set set;
/**
* Set's <code>element</code>. Must be initialized in derived class
@@ -955,9 +926,8 @@
/**
* Is used as collection parameter
*/
- public HashSet<?> hash = new HashSet<Object>();
+ public HashSet hash = new HashSet();
- @Override
protected void setUp() throws Exception {
super.setUp();
@@ -995,7 +965,7 @@
if (testing) {
try {
- ((Set<Object>)set).addAll(hash);
+ set.addAll(hash);
// priv/pub credentials set: no NullPointerException
} catch (NullPointerException e) {
assertEquals("Size", 0, set.size());
@@ -1004,7 +974,7 @@
}
} else {
try {
- ((Set<Object>)set).addAll(hash);
+ set.addAll(hash);
fail("No expected NullPointerException");
} catch (NullPointerException e) {
}
@@ -1036,7 +1006,7 @@
}
public void testRetainAll_NotEmptySet() {
- ((Set<Object>)set).add(element);
+ set.add(element);
try {
assertTrue("Retaining NULL element", set.retainAll(hash));
} catch (NullPointerException npe) {
@@ -1044,14 +1014,13 @@
assertEquals("Set is empty", 0, set.size());
}
}
-
- @SuppressWarnings("unchecked")
+
public static class IneligibleElementTest extends SecurityTest {
/**
* Tested <code>set</code>. Must be initialized in derived class
*/
- public Set<?> set;
+ public Set set;
/**
* Set's <code>element</code>. Must be initialized in derived class
@@ -1061,7 +1030,7 @@
/**
* Is used as collection parameter
*/
- public HashSet<?> hash = new HashSet<Object>();
+ public HashSet hash = new HashSet();
/**
* Set's <code>ineligible element</code>. Must be initialized in derived class
@@ -1071,9 +1040,8 @@
/**
* Is used as collection parameter
*/
- public HashSet<Object> iHash = new HashSet<Object>();
+ public HashSet iHash = new HashSet();
- @Override
protected void setUp() throws Exception {
super.setUp();
@@ -1091,7 +1059,7 @@
public void testAdd() {
try {
- ((Set<Object>)set).add(iElement);
+ set.add(iElement);
fail("No expected ClassCastException or IllegalArgumentException");
} catch (ClassCastException e) {
@@ -1113,7 +1081,7 @@
}
try {
- ((Set<Object>)set).add(new Object());
+ set.add(new Object());
if (!testing) {
// all Class sets - no exception
@@ -1127,7 +1095,7 @@
public void testAddAll() {
try {
- ((Set<Object>)set).addAll(iHash);
+ set.addAll(iHash);
fail("No expected ClassCastException or IllegalArgumentException");
} catch (ClassCastException e) {
@@ -1188,7 +1156,7 @@
public void testRetainAll_NotEmptySet_IneligibleElement() {
- ((Set<Object>)set).add(element);
+ set.add(element);
try {
assertTrue("Retaining ineligible element", set.retainAll(iHash));
} catch (ClassCastException e) {
@@ -1197,7 +1165,7 @@
assertEquals("Now set is empty", 0, set.size());
}
}
- @SuppressWarnings("unchecked")
+
public static class ReadOnlySetTest extends SetTest {
public void setReadOnly() {
@@ -1205,74 +1173,66 @@
"setReadOnly MUST be implemented in derived class");
}
- @Override
public void testAdd_ExistingElement() {
- ((Set<Object>)set).add(element);
+ set.add(element);
setReadOnly();
try {
- ((Set<Object>)set).add(element);
+ set.add(element);
fail("No expected IllegalStateException");
} catch (IllegalStateException e) {
}
}
- @Override
public void testAdd_NewElement() {
setReadOnly();
try {
- ((Set<Object>)set).add(element);
+ set.add(element);
fail("No expected IllegalStateException");
} catch (IllegalStateException e) {
}
}
- @Override
public void testAddAll_EmptySet() {
setReadOnly();
super.testAddAll_EmptySet();
}
- @Override
public void testAddAll_ExistingElement() {
- ((Set<Object>)set).add(element);
+ set.add(element);
setReadOnly();
try {
- ((Set<Object>)set).addAll(hash);
+ set.addAll(hash);
fail("No expected IllegalStateException");
} catch (IllegalStateException e) {
}
}
- @Override
public void testAddAll_NewElement() {
setReadOnly();
try {
- ((Set<Object>)set).addAll(hash);
+ set.addAll(hash);
fail("No expected IllegalStateException");
} catch (IllegalStateException e) {
}
}
- @Override
public void testAddAll_NullParameter() {
setReadOnly();
super.testAddAll_NullParameter();
}
- @Override
public void testClear_EmptySet() {
setReadOnly();
super.testClear_EmptySet();
}
- @Override
public void testClear_NotEmptySet() {
- ((Set<Object>)set).add(element);
+ set.add(element);
setReadOnly();
try {
@@ -1282,74 +1242,63 @@
}
}
- @Override
public void testContains_ExistingElement() {
- ((Set<Object>)set).add(element);
+ set.add(element);
setReadOnly();
assertTrue("Set contains element", set.contains(element));
}
- @Override
public void testContains_NotExistingElement() {
setReadOnly();
super.testContains_NotExistingElement();
}
- @Override
public void testContainsAll_EmptySet() {
setReadOnly();
super.testContainsAll_EmptySet();
}
- @Override
public void testContainsAll_ExistingElement() {
- ((Set<Object>)set).add(element);
+ set.add(element);
setReadOnly();
assertTrue("Set contains element", set.containsAll(hash));
}
- @Override
public void testContainsAll_NotExistingElement() {
setReadOnly();
super.testContainsAll_NotExistingElement();
}
- @Override
public void testContainsAll_NullParameter() {
setReadOnly();
super.testContainsAll_NullParameter();
}
- @Override
public void testIsEmpty_EmptySet() {
setReadOnly();
super.testIsEmpty_EmptySet();
}
- @Override
public void testIsEmpty_NotEmptySet() {
- ((Set<Object>)set).add(element);
+ set.add(element);
setReadOnly();
assertFalse("Set is not empty", set.isEmpty());
}
- @Override
public void testIterator_EmptySet() {
setReadOnly();
super.testIterator_EmptySet();
}
- @Override
public void testIterator_NotEmptySet() {
- ((Set<Object>)set).add(element);
+ set.add(element);
setReadOnly();
assertNotNull("Iterator", set.iterator());
}
- @Override
public void testRemove_ExistingElement() {
- ((Set<Object>)set).add(element);
+ set.add(element);
setReadOnly();
try {
@@ -1359,22 +1308,19 @@
}
}
- @Override
public void testRemove_NotExistingElement() {
setReadOnly();
super.testRemove_NotExistingElement();
}
- @Override
public void testRemoveAll_EmptySet() {
setReadOnly();
super.testRemoveAll_EmptySet();
}
- @Override
public void testRemoveAll_ExistingElement() {
- ((Set<Object>)set).add(element);
+ set.add(element);
setReadOnly();
try {
@@ -1384,30 +1330,26 @@
}
}
- @Override
public void testRemoveAll_NotEmptySet() {
- ((Set<Object>)set).add(element);
+ set.add(element);
setReadOnly();
- set.removeAll(new HashSet<Object>());
+ set.removeAll(new HashSet());
}
- @Override
public void testRemoveAll_NotExistingElement() {
setReadOnly();
super.testRemoveAll_NotExistingElement();
}
- @Override
public void testRemoveAll_NullParameter_EmptySet() {
setReadOnly();
super.testRemoveAll_NullParameter_EmptySet();
}
- @Override
public void testRemoveAll_NullParameter_NotEmptySet() {
- ((Set<Object>)set).add(element);
+ set.add(element);
setReadOnly();
try {
@@ -1417,47 +1359,41 @@
}
}
- @Override
public void testRetainAll_EmptySet() {
setReadOnly();
super.testRetainAll_EmptySet();
}
- @Override
public void testRetainAll_ExistingElement() {
- ((Set<Object>)set).add(element);
+ set.add(element);
setReadOnly();
set.retainAll(hash);
}
- @Override
public void testRetainAll_NotEmptySet() {
- ((Set<Object>)set).add(element);
+ set.add(element);
setReadOnly();
try {
- set.retainAll(new HashSet<Object>());
+ set.retainAll(new HashSet());
fail("No expected IllegalStateException");
} catch (IllegalStateException e) {
}
}
- @Override
public void testRetainAll_NotExistingElement() {
setReadOnly();
super.testRetainAll_NotExistingElement();
}
- @Override
public void testRetainAll_NullParameter_EmptySet() {
setReadOnly();
super.testRetainAll_NullParameter_EmptySet();
}
- @Override
public void testRetainAll_NullParameter_NotEmptySet() {
- ((Set<Object>)set).add(element);
+ set.add(element);
setReadOnly();
try {
@@ -1467,31 +1403,28 @@
}
}
- @Override
public void testToArray_EmptySet() {
setReadOnly();
super.testToArray_EmptySet();
}
- @Override
public void testToArray_Immutability() {
- ((Set<Object>)set).add(element);
+ set.add(element);
setReadOnly();
set.toArray()[0] = null;
assertTrue("Element", set.toArray()[0] == element);
}
- @Override
public void testToArray_NotEmptySet() {
- ((Set<Object>)set).add(element);
+ set.add(element);
setReadOnly();
assertEquals("Set is not empty", set.toArray().length, 1);
assertTrue("Set element", set.toArray()[0] == element);
}
}
- @SuppressWarnings("unchecked")
+
public static class SecureSetTest extends SetTest {
public void setSecure() {
@@ -1508,80 +1441,72 @@
// }
// }
- @Override
public void testAdd_ExistingElement() {
- ((Set<Object>)set).add(element);
+ set.add(element);
setSecure();
try {
- ((Set<Object>)set).add(element);
+ set.add(element);
fail("No expected AccessControlException");
} catch (AccessControlException e) {
assertEquals(e, AuthPermission.class);
}
}
- @Override
public void testAdd_NewElement() {
setSecure();
try {
- ((Set<Object>)set).add(element);
+ set.add(element);
fail("No expected AccessControlException");
} catch (AccessControlException e) {
assertEquals(e, AuthPermission.class);
}
}
- @Override
public void testAddAll_EmptySet() {
setSecure();
super.testAddAll_EmptySet();
}
- @Override
public void testAddAll_ExistingElement() {
- ((Set<Object>)set).add(element);
+ set.add(element);
setSecure();
try {
- ((Set<Object>)set).addAll(hash);
+ set.addAll(hash);
fail("No expected AccessControlException");
} catch (AccessControlException e) {
assertEquals(e, AuthPermission.class);
}
}
- @Override
public void testAddAll_NewElement() {
setSecure();
try {
- ((Set<Object>)set).addAll(hash);
+ set.addAll(hash);
fail("No expected AccessControlException");
} catch (AccessControlException e) {
assertEquals(e, AuthPermission.class);
}
}
- @Override
public void testAddAll_NullParameter() {
setSecure();
super.testAddAll_NullParameter();
}
- @Override
public void testClear_EmptySet() {
setSecure();
super.testClear_EmptySet();
}
- @Override
public void testClear_NotEmptySet() {
- ((Set<Object>)set).add(element);
+ set.add(element);
setSecure();
try {
@@ -1592,74 +1517,63 @@
}
}
- @Override
public void testContains_ExistingElement() {
- ((Set<Object>)set).add(element);
+ set.add(element);
setSecure();
assertTrue("Set contains element", set.contains(element));
}
- @Override
public void testContains_NotExistingElement() {
setSecure();
super.testContains_NotExistingElement();
}
- @Override
public void testContainsAll_EmptySet() {
setSecure();
super.testContainsAll_EmptySet();
}
- @Override
public void testContainsAll_ExistingElement() {
- ((Set<Object>)set).add(element);
+ set.add(element);
setSecure();
assertTrue("Set contains element", set.containsAll(hash));
}
- @Override
public void testContainsAll_NotExistingElement() {
setSecure();
super.testContainsAll_NotExistingElement();
}
- @Override
public void testContainsAll_NullParameter() {
setSecure();
super.testContainsAll_NullParameter();
}
- @Override
public void testIsEmpty_EmptySet() {
setSecure();
super.testIsEmpty_EmptySet();
}
- @Override
public void testIsEmpty_NotEmptySet() {
- ((Set<Object>)set).add(element);
+ set.add(element);
setSecure();
assertFalse("Set is not empty", set.isEmpty());
}
- @Override
public void testIterator_EmptySet() {
setSecure();
super.testIterator_EmptySet();
}
- @Override
public void testIterator_NotEmptySet() {
- ((Set<Object>)set).add(element);
+ set.add(element);
setSecure();
assertNotNull("Iterator", set.iterator());
}
- @Override
public void testRemove_ExistingElement() {
- ((Set<Object>)set).add(element);
+ set.add(element);
setSecure();
try {
@@ -1670,22 +1584,19 @@
}
}
- @Override
public void testRemove_NotExistingElement() {
setSecure();
super.testRemove_NotExistingElement();
}
- @Override
public void testRemoveAll_EmptySet() {
setSecure();
super.testRemoveAll_EmptySet();
}
- @Override
public void testRemoveAll_ExistingElement() {
- ((Set<Object>)set).add(element);
+ set.add(element);
setSecure();
try {
@@ -1696,31 +1607,27 @@
}
}
- @Override
public void testRemoveAll_NotEmptySet() {
- ((Set<Object>)set).add(element);
+ set.add(element);
setSecure();
- assertFalse("Removing empty set", set.removeAll(new HashSet<Object>()));
+ assertFalse("Removing empty set", set.removeAll(new HashSet()));
assertEquals("Size", 1, set.size());
}
- @Override
public void testRemoveAll_NotExistingElement() {
setSecure();
super.testRemoveAll_NotExistingElement();
}
- @Override
public void testRemoveAll_NullParameter_EmptySet() {
setSecure();
super.testRemoveAll_NullParameter_EmptySet();
}
- @Override
public void testRemoveAll_NullParameter_NotEmptySet() {
- ((Set<Object>)set).add(element);
+ set.add(element);
setSecure();
try {
@@ -1730,49 +1637,43 @@
}
}
- @Override
public void testRetainAll_EmptySet() {
setSecure();
super.testRetainAll_EmptySet();
}
- @Override
public void testRetainAll_ExistingElement() {
- ((Set<Object>)set).add(element);
+ set.add(element);
setSecure();
assertFalse("Removing elements", set.retainAll(hash));
assertEquals("Size", 1, set.size());
}
- @Override
public void testRetainAll_NotEmptySet() {
- ((Set<Object>)set).add(element);
+ set.add(element);
setSecure();
try {
- set.retainAll(new HashSet<Object>());
+ set.retainAll(new HashSet());
fail("No expected AccessControlException");
} catch (AccessControlException e) {
assertEquals(e, AuthPermission.class);
}
}
- @Override
public void testRetainAll_NotExistingElement() {
setSecure();
super.testRetainAll_NotExistingElement();
}
- @Override
public void testRetainAll_NullParameter_EmptySet() {
setSecure();
super.testRetainAll_NullParameter_EmptySet();
}
- @Override
public void testRetainAll_NullParameter_NotEmptySet() {
- ((Set<Object>)set).add(element);
+ set.add(element);
setSecure();
try {
@@ -1782,24 +1683,21 @@
}
}
- @Override
public void testToArray_EmptySet() {
setSecure();
super.testToArray_EmptySet();
}
- @Override
public void testToArray_Immutability() {
- ((Set<Object>)set).add(element);
+ set.add(element);
setSecure();
set.toArray()[0] = null;
assertTrue("Element", set.toArray()[0] == element);
}
- @Override
public void testToArray_NotEmptySet() {
- ((Set<Object>)set).add(element);
+ set.add(element);
setSecure();
assertEquals("Set is not empty", set.toArray().length, 1);
@@ -1820,11 +1718,10 @@
public Object obj3;
// Set of objects that are not equal to obj1, obj2, obj3
- public Vector<Object> notEqual;
+ public Vector notEqual;
// Checks that references to testing objects are different
// because we are not going to test Object.equals(Object)
- @Override
protected void setUp() throws Exception {
super.setUp();
@@ -1858,7 +1755,7 @@
}
public void testEquals_NotEqual() {
- for (Enumeration<Object> e = notEqual.elements(); e.hasMoreElements();) {
+ for (Enumeration e = notEqual.elements(); e.hasMoreElements();) {
assertFalse(obj1.equals(e.nextElement()));
}
}
@@ -1891,7 +1788,7 @@
// init obj3
- HashSet<MyClass1> hash = new HashSet<MyClass1>();
+ HashSet hash = new HashSet();
hash.add(element1);
hash.add(element2);
@@ -1899,19 +1796,19 @@
obj3 = hash;
// init obj3
- HashSet<Principal> hash1 = new HashSet<Principal>();
+ HashSet hash1 = new HashSet();
hash1.add(element1);
hash1.add(new MyClass1());
Subject s1 = new Subject(false, hash1, hash1, hash1);
- HashSet<MyClass2> hash2 = new HashSet<MyClass2>();
+ HashSet hash2 = new HashSet();
hash1.add(element2);
hash1.add(new MyClass2());
Subject s2 = new Subject(false, hash2, hash2, hash2);
Subject s3 = new Subject();
- notEqual = new Vector<Object>();
+ notEqual = new Vector();
notEqual.add(s1.getPrincipals());
notEqual.add(s1.getPrivateCredentials());
@@ -1934,7 +1831,7 @@
notEqual.add(s3.getPrivateCredentials(MyClass1.class));
notEqual.add(s3.getPublicCredentials(MyClass1.class));
- notEqual.add(new HashSet<Object>());
+ notEqual.add(new HashSet());
notEqual.add(new Object());
}
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/login/DefaultConfigParserTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/login/DefaultConfigParserTest.java?view=diff&rev=451857&r1=451856&r2=451857
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/login/DefaultConfigParserTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/login/DefaultConfigParserTest.java Sun Oct 1 19:52:40 2006
@@ -30,7 +30,6 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
-import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -58,7 +57,7 @@
URL url;
- LinkedList<?> entriesList;
+ LinkedList entriesList;
public static void main(String[] args) {
junit.textui.TestRunner.run(DefaultConfigParserTest.class);
@@ -73,8 +72,7 @@
super(name);
}
- @Override
- public void setUp() throws Exception {
+ public void setUp() throws Exception {
p = System.getProperties();
File f = new File(fconf);
try {
@@ -88,25 +86,25 @@
* @throws Exception
*/
public final void testConfigParser_01() throws Exception {
- Map<?, ?> config = null;
- config = DefaultConfigurationParser.configParser(url, p, new HashMap<String, List<AppConfigurationEntry>>());
- entriesList = (LinkedList<?>) config.get("Login1");
+ Map config = null;
+ config = DefaultConfigurationParser.configParser(url, p, new HashMap());
+ entriesList = (LinkedList) config.get("Login1");
assertNotNull(entriesList);
- entriesList = (LinkedList<?>) config.get("other");
+ entriesList = (LinkedList) config.get("other");
assertNotNull(entriesList);
- entriesList = (LinkedList<?>) config.get("Login2");
+ entriesList = (LinkedList) config.get("Login2");
assertNotNull(entriesList);
- entriesList = (LinkedList<?>) config.get("Login3");
+ entriesList = (LinkedList) config.get("Login3");
assertNotNull(entriesList);
- entriesList = (LinkedList<?>) config.get("Login4");
+ entriesList = (LinkedList) config.get("Login4");
assertNotNull(entriesList);
- entriesList = (LinkedList<?>) config.get("Login5");
+ entriesList = (LinkedList) config.get("Login5");
assertNotNull(entriesList);
- entriesList = (LinkedList<?>) config.get("Login6");
+ entriesList = (LinkedList) config.get("Login6");
assertNotNull(entriesList);
- entriesList = (LinkedList<?>) config.get("Login7");
+ entriesList = (LinkedList) config.get("Login7");
assertNotNull(entriesList);
- entriesList = (LinkedList<?>) config.get("Login8");
+ entriesList = (LinkedList) config.get("Login8");
assertNull(entriesList);
}
@@ -116,14 +114,14 @@
*/
public final void testConfigParser_02() throws Exception {
- Map<?, ?> config = DefaultConfigurationParser.configParser(url, p, new HashMap<String, List<AppConfigurationEntry>>());
- entriesList = (LinkedList<?>) config.get("Login1");
+ Map config = DefaultConfigurationParser.configParser(url, p, new HashMap());
+ entriesList = (LinkedList) config.get("Login1");
if (entriesList == null || entriesList.size() == 0) {
fail("Unable to read configuration");
}
- Iterator<?> i = entriesList.iterator();
+ Iterator i = entriesList.iterator();
while (i.hasNext()) {
AppConfigurationEntry e = (AppConfigurationEntry) i.next();
assertEquals("com.intel.security.auth.module.LoginModule1", e
@@ -133,7 +131,7 @@
assertEquals(
AppConfigurationEntry.LoginModuleControlFlag.REQUIRED,
e.getControlFlag());
- Map<String, String> m = new HashMap<String, String>();
+ Map m = new HashMap();
m.put("debug1", "true");
m.put("test1", "false");
assertEquals(m, e.getOptions());
@@ -171,14 +169,14 @@
byte[] b = str[i].getBytes();
OutputStream os = new FileOutputStream(file);
- for (byte element : b) {
- os.write(element);
+ for (int j = 0; j < b.length; j++) {
+ os.write(b[j]);
}
os.flush();
os.close();
try {
- DefaultConfigurationParser.configParser(file.toURL(), p, new HashMap<String, List<AppConfigurationEntry>>());
+ DefaultConfigurationParser.configParser(file.toURL(), p, new HashMap());
fail("no expected InvalidFormatException" + i);
} catch (NullPointerException e) {
System.out.println(file.getCanonicalPath());
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/login/DefaultConfigurationTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/login/DefaultConfigurationTest.java?view=diff&rev=451857&r1=451856&r2=451857
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/login/DefaultConfigurationTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/login/DefaultConfigurationTest.java Sun Oct 1 19:52:40 2006
@@ -64,16 +64,14 @@
String oldp1 = null;
String oldp2 = null;
- @Override
- public void setUp() throws Exception {
+ public void setUp() throws Exception {
createConfFile();
oldp1 = Security.getProperty("login.config.url.1");
oldp2 = Security.getProperty("login.config.url.2");
}
- @Override
- public void tearDown() throws Exception {
+ public void tearDown() throws Exception {
System.setSecurityManager(old);
TestUtils.setSystemProperty("login.config.url.1", oldp1);
@@ -108,7 +106,7 @@
ents = dc.getAppConfigurationEntry("LoginNew");
assertNotNull(ents);
assertEquals("com.intel.security.auth.module.LoginModule1", ents[0].getLoginModuleName());
- Map<String, String> m = new HashMap<String, String>();
+ Map m = new HashMap();
m.put("debug", "true");
m.put("test", "false");
assertEquals(m, ents[0].getOptions());
@@ -116,14 +114,14 @@
ents = dc.getAppConfigurationEntry("Login1");
assertNotNull(ents);
- for (AppConfigurationEntry element : ents) {
+ for (int i = 0; i < ents.length; i++) {
assertEquals("com.intel.security.auth.module.LoginModule1",
- element.getLoginModuleName());
+ ents[i].getLoginModuleName());
m.clear();
m.put("debug1", "true");
m.put("test1", "false");
- assertEquals(m, element.getOptions());
- assertEquals("LoginModuleControlFlag: required", element
+ assertEquals(m, ents[i].getOptions());
+ assertEquals("LoginModuleControlFlag: required", ents[i]
.getControlFlag().toString());
}
@@ -149,15 +147,15 @@
assertNotNull(ents);
ents = dc.getAppConfigurationEntry("Login1");
assertNotNull(ents);
- Map<String, String> m = new HashMap<String, String>();
- for (AppConfigurationEntry element : ents) {
+ Map m = new HashMap();
+ for (int i = 0; i < ents.length; i++) {
assertEquals("com.intel.security.auth.module.LoginModule1",
- element.getLoginModuleName());
+ ents[i].getLoginModuleName());
m.clear();
m.put("debug1", "true");
m.put("test1", "false");
- assertEquals(m, element.getOptions());
- assertEquals("LoginModuleControlFlag: required", element
+ assertEquals(m, ents[i].getOptions());
+ assertEquals("LoginModuleControlFlag: required", ents[i]
.getControlFlag().toString());
}
@@ -233,8 +231,8 @@
byte[] b = newConfFile.getBytes();
OutputStream os = new FileOutputStream(defaultConfFile);
- for (byte element : b) {
- os.write(element);
+ for (int j = 0; j < b.length; j++) {
+ os.write(b[j]);
}
os.flush();
os.close();
@@ -259,8 +257,7 @@
enableAccess = enable;
}
- @Override
- public void checkPermission(Permission p) {
+ public void checkPermission(Permission p) {
if (p instanceof AuthPermission && checkTarget.equals(p)) {
checkAsserted = true;
if (!enableAccess) {
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/serialization/ChoiceCallbackTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/serialization/ChoiceCallbackTest.java?view=diff&rev=451857&r1=451856&r2=451857
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/serialization/ChoiceCallbackTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/serialization/ChoiceCallbackTest.java Sun Oct 1 19:52:40 2006
@@ -41,7 +41,6 @@
junit.textui.TestRunner.run(ChoiceCallbackTest.class);
}
- @Override
protected Object[] getData() {
String prompt = "prompt";
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/serialization/ConfirmationCallbackTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/serialization/ConfirmationCallbackTest.java?view=diff&rev=451857&r1=451856&r2=451857
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/serialization/ConfirmationCallbackTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/serialization/ConfirmationCallbackTest.java Sun Oct 1 19:52:40 2006
@@ -40,7 +40,6 @@
junit.textui.TestRunner.run(ConfirmationCallbackTest.class);
}
- @Override
protected Object[] getData() {
return new Object[] { new ConfirmationCallback("prompt",
ConfirmationCallback.INFORMATION,
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/serialization/LanguageCallbackTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/serialization/LanguageCallbackTest.java?view=diff&rev=451857&r1=451856&r2=451857
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/serialization/LanguageCallbackTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/serialization/LanguageCallbackTest.java Sun Oct 1 19:52:40 2006
@@ -40,7 +40,6 @@
junit.textui.TestRunner.run(LanguageCallbackTest.class);
}
- @Override
protected Object[] getData() {
LanguageCallback lc = new LanguageCallback();
lc.setLocale(Locale.UK);
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/serialization/NameCallbackTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/serialization/NameCallbackTest.java?view=diff&rev=451857&r1=451856&r2=451857
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/serialization/NameCallbackTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/serialization/NameCallbackTest.java Sun Oct 1 19:52:40 2006
@@ -40,7 +40,6 @@
junit.textui.TestRunner.run(NameCallbackTest.class);
}
- @Override
protected Object[] getData() {
NameCallback nc = new NameCallback("prmpt", "defName");
nc.setName("Name");
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/serialization/PasswordCallbackTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/serialization/PasswordCallbackTest.java?view=diff&rev=451857&r1=451856&r2=451857
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/serialization/PasswordCallbackTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/serialization/PasswordCallbackTest.java Sun Oct 1 19:52:40 2006
@@ -40,7 +40,6 @@
junit.textui.TestRunner.run(PasswordCallbackTest.class);
}
- @Override
protected Object[] getData() {
char[] pwd = {'a', 'b', 'c'};
PasswordCallback p = new PasswordCallback("prmpt", true);
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/serialization/TextInputCallbackTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/serialization/TextInputCallbackTest.java?view=diff&rev=451857&r1=451856&r2=451857
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/serialization/TextInputCallbackTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/serialization/TextInputCallbackTest.java Sun Oct 1 19:52:40 2006
@@ -40,7 +40,6 @@
junit.textui.TestRunner.run(TextInputCallbackTest.class);
}
- @Override
protected Object[] getData() {
TextInputCallback t = new TextInputCallback("prmpt","defText");
t.setText("new text");
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/serialization/TextOutputCallbackTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/serialization/TextOutputCallbackTest.java?view=diff&rev=451857&r1=451856&r2=451857
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/serialization/TextOutputCallbackTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/serialization/TextOutputCallbackTest.java Sun Oct 1 19:52:40 2006
@@ -40,7 +40,6 @@
junit.textui.TestRunner.run(TextOutputCallbackTest.class);
}
- @Override
protected Object[] getData() {
return new Object[] { new TextOutputCallback(
TextOutputCallback.INFORMATION, "message") };
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/serialization/UnsupportedCallbackExceptionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/serialization/UnsupportedCallbackExceptionTest.java?view=diff&rev=451857&r1=451856&r2=451857
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/serialization/UnsupportedCallbackExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/serialization/UnsupportedCallbackExceptionTest.java Sun Oct 1 19:52:40 2006
@@ -40,7 +40,6 @@
junit.textui.TestRunner.run(UnsupportedCallbackExceptionTest.class);
}
- @Override
protected Object[] getData() {
return new Object[] {new UnsupportedCallbackException(nc)};
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/kerberos/serialization/DelegationPermissionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/kerberos/serialization/DelegationPermissionTest.java?view=diff&rev=451857&r1=451856&r2=451857
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/kerberos/serialization/DelegationPermissionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/kerberos/serialization/DelegationPermissionTest.java Sun Oct 1 19:52:40 2006
@@ -33,7 +33,6 @@
*/
public class DelegationPermissionTest extends SerializationTest {
- @Override
protected Object[] getData() {
return new Object[] {
new DelegationPermission("\"AAA\" \"BBB\"", "action"),
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/kerberos/serialization/KrbDelegationPermissionCollectionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/kerberos/serialization/KrbDelegationPermissionCollectionTest.java?view=diff&rev=451857&r1=451856&r2=451857
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/kerberos/serialization/KrbDelegationPermissionCollectionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/kerberos/serialization/KrbDelegationPermissionCollectionTest.java Sun Oct 1 19:52:40 2006
@@ -24,6 +24,10 @@
import java.security.Permission;
import java.security.PermissionCollection;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.HashSet;
+
import javax.security.auth.kerberos.DelegationPermission;
import org.apache.harmony.testframework.serialization.SerializationTest;
@@ -35,7 +39,6 @@
*/
public class KrbDelegationPermissionCollectionTest extends SerializationTest {
- @Override
protected Object[] getData() {
Permission p1 = new DelegationPermission("\"AAA\" \"BBB\"", "action");
Permission p2 = new DelegationPermission("\"AAA\" \"CCC\"");
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/kerberos/serialization/KrbServicePermissionCollectionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/kerberos/serialization/KrbServicePermissionCollectionTest.java?view=diff&rev=451857&r1=451856&r2=451857
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/kerberos/serialization/KrbServicePermissionCollectionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/kerberos/serialization/KrbServicePermissionCollectionTest.java Sun Oct 1 19:52:40 2006
@@ -24,6 +24,10 @@
import java.security.Permission;
import java.security.PermissionCollection;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.HashSet;
+
import javax.security.auth.kerberos.ServicePermission;
import org.apache.harmony.testframework.serialization.SerializationTest;
@@ -33,7 +37,6 @@
*/
public class KrbServicePermissionCollectionTest extends SerializationTest {
- @Override
protected Object[] getData() {
Permission p1 = new ServicePermission("AAA", "accept");
Permission p2 = new ServicePermission("BBB", "initiate");
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/kerberos/serialization/ServicePermissionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/kerberos/serialization/ServicePermissionTest.java?view=diff&rev=451857&r1=451856&r2=451857
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/kerberos/serialization/ServicePermissionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/kerberos/serialization/ServicePermissionTest.java Sun Oct 1 19:52:40 2006
@@ -32,7 +32,6 @@
*/
public class ServicePermissionTest extends SerializationTest {
- @Override
protected Object[] getData() {
return new Object[] { new ServicePermission("AAA", "accept"),
new ServicePermission("BBB", "initiate"),
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/LoginContextTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/LoginContextTest.java?view=diff&rev=451857&r1=451856&r2=451857
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/LoginContextTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/LoginContextTest.java Sun Oct 1 19:52:40 2006
@@ -38,7 +38,7 @@
MyPrincipal pri = new MyPrincipal();
HashSet<Principal> set = new HashSet<Principal>();
set.add(pri);
- Subject sub = new Subject(false, set, new HashSet<Object>(), new HashSet<Object>());
+ Subject sub = new Subject(false, set, new HashSet(), new HashSet());
Configuration.setConfiguration(new MyConfig());
LoginContext context = new LoginContext("moduleName", sub);
context.login();
@@ -53,18 +53,16 @@
assertNotNull(context.getSubject());
}
static class MyConfig extends Configuration{
- AppConfigurationEntry[] entries = new AppConfigurationEntry[]{new AppConfigurationEntry(MyModule.class.getName(), LoginModuleControlFlag.REQUIRED, new HashMap<String, Object>())};
- @Override
+ AppConfigurationEntry[] entries = new AppConfigurationEntry[]{new AppConfigurationEntry(MyModule.class.getName(), LoginModuleControlFlag.REQUIRED, new HashMap())};
public AppConfigurationEntry[] getAppConfigurationEntry(String name) {
return entries;
}
- @Override
public void refresh() {
}
}
public static class MyModule implements LoginModule{
Subject sub;
- public MyModule(){
+ public void MyModule(){
}
public boolean abort() throws LoginException {
return false;
@@ -88,7 +86,6 @@
public String getName() {
return name;
}
- @Override
public String toString(){
return name;
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/serialization/AccountExceptionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/serialization/AccountExceptionTest.java?view=diff&rev=451857&r1=451856&r2=451857
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/serialization/AccountExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/serialization/AccountExceptionTest.java Sun Oct 1 19:52:40 2006
@@ -38,7 +38,6 @@
junit.textui.TestRunner.run(AccountExceptionTest.class);
}
- @Override
protected Object[] getData() {
return new Object[] {new AccountException("message")};
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/serialization/AccountExpiredExceptionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/serialization/AccountExpiredExceptionTest.java?view=diff&rev=451857&r1=451856&r2=451857
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/serialization/AccountExpiredExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/serialization/AccountExpiredExceptionTest.java Sun Oct 1 19:52:40 2006
@@ -36,7 +36,6 @@
junit.textui.TestRunner.run(AccountExpiredExceptionTest.class);
}
- @Override
protected Object[] getData() {
return new Object[] {new AccountExpiredException("message")};
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/serialization/AccountLockedExceptionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/serialization/AccountLockedExceptionTest.java?view=diff&rev=451857&r1=451856&r2=451857
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/serialization/AccountLockedExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/serialization/AccountLockedExceptionTest.java Sun Oct 1 19:52:40 2006
@@ -38,7 +38,6 @@
junit.textui.TestRunner.run(AccountLockedExceptionTest.class);
}
- @Override
protected Object[] getData() {
return new Object[] {new AccountLockedException("message")};
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/serialization/AccountNotFoundExceptionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/serialization/AccountNotFoundExceptionTest.java?view=diff&rev=451857&r1=451856&r2=451857
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/serialization/AccountNotFoundExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/serialization/AccountNotFoundExceptionTest.java Sun Oct 1 19:52:40 2006
@@ -37,7 +37,6 @@
junit.textui.TestRunner.run(AccountNotFoundExceptionTest.class);
}
- @Override
protected Object[] getData() {
return new Object[] {new AccountNotFoundException("message")};
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/serialization/CredentialExceptionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/serialization/CredentialExceptionTest.java?view=diff&rev=451857&r1=451856&r2=451857
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/serialization/CredentialExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/serialization/CredentialExceptionTest.java Sun Oct 1 19:52:40 2006
@@ -38,7 +38,6 @@
junit.textui.TestRunner.run(CredentialExceptionTest.class);
}
- @Override
protected Object[] getData() {
return new Object[] {new CredentialException("message")};
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/serialization/CredentialExpiredExceptionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/serialization/CredentialExpiredExceptionTest.java?view=diff&rev=451857&r1=451856&r2=451857
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/serialization/CredentialExpiredExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/serialization/CredentialExpiredExceptionTest.java Sun Oct 1 19:52:40 2006
@@ -37,7 +37,6 @@
junit.textui.TestRunner.run(CredentialExpiredExceptionTest.class);
}
- @Override
protected Object[] getData() {
return new Object[] {new CredentialExpiredException("message")};
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/serialization/CredentialNotFoundExceptionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/serialization/CredentialNotFoundExceptionTest.java?view=diff&rev=451857&r1=451856&r2=451857
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/serialization/CredentialNotFoundExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/serialization/CredentialNotFoundExceptionTest.java Sun Oct 1 19:52:40 2006
@@ -37,7 +37,6 @@
junit.textui.TestRunner.run(CredentialNotFoundExceptionTest.class);
}
- @Override
protected Object[] getData() {
return new Object[] {new CredentialNotFoundException("message")};
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/serialization/FailedLoginExceptionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/serialization/FailedLoginExceptionTest.java?view=diff&rev=451857&r1=451856&r2=451857
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/serialization/FailedLoginExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/serialization/FailedLoginExceptionTest.java Sun Oct 1 19:52:40 2006
@@ -37,7 +37,6 @@
junit.textui.TestRunner.run(FailedLoginExceptionTest.class);
}
- @Override
protected Object[] getData() {
return new Object[] {new FailedLoginException("message")};
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/serialization/LoginExceptionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/serialization/LoginExceptionTest.java?view=diff&rev=451857&r1=451856&r2=451857
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/serialization/LoginExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/serialization/LoginExceptionTest.java Sun Oct 1 19:52:40 2006
@@ -37,7 +37,6 @@
junit.textui.TestRunner.run(LoginExceptionTest.class);
}
- @Override
protected Object[] getData() {
return new Object[] {new LoginException("message")};
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/serialization/AuthPermissionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/serialization/AuthPermissionTest.java?view=diff&rev=451857&r1=451856&r2=451857
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/serialization/AuthPermissionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/serialization/AuthPermissionTest.java Sun Oct 1 19:52:40 2006
@@ -33,7 +33,6 @@
public class AuthPermissionTest extends SerializationTest {
- @Override
protected Object[] getData() {
return new Object[] {new AuthPermission("name", "read")};
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/serialization/DestroyFailedExceptionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/serialization/DestroyFailedExceptionTest.java?view=diff&rev=451857&r1=451856&r2=451857
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/serialization/DestroyFailedExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/serialization/DestroyFailedExceptionTest.java Sun Oct 1 19:52:40 2006
@@ -37,7 +37,6 @@
junit.textui.TestRunner.run(DestroyFailedExceptionTest.class);
}
- @Override
protected Object[] getData() {
return new Object[] {new DestroyFailedException("message")};
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/serialization/PrivateCredentialPermissionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/serialization/PrivateCredentialPermissionTest.java?view=diff&rev=451857&r1=451856&r2=451857
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/serialization/PrivateCredentialPermissionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/serialization/PrivateCredentialPermissionTest.java Sun Oct 1 19:52:40 2006
@@ -33,7 +33,6 @@
public class PrivateCredentialPermissionTest extends SerializationTest {
- @Override
protected Object[] getData() {
return new Object[] {new PrivateCredentialPermission("a.b.Cred a.c.Princ \"duke\"", "read")};
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/serialization/RefreshFailedExceptionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/serialization/RefreshFailedExceptionTest.java?view=diff&rev=451857&r1=451856&r2=451857
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/serialization/RefreshFailedExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/serialization/RefreshFailedExceptionTest.java Sun Oct 1 19:52:40 2006
@@ -38,7 +38,6 @@
junit.textui.TestRunner.run(RefreshFailedExceptionTest.class);
}
- @Override
protected Object[] getData() {
return new Object[] {new RefreshFailedException("message")};
}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/serialization/SubjectTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/serialization/SubjectTest.java?view=diff&rev=451857&r1=451856&r2=451857
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/serialization/SubjectTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/serialization/SubjectTest.java Sun Oct 1 19:52:40 2006
@@ -33,7 +33,6 @@
public class SubjectTest extends SerializationTest {
- @Override
protected Object[] getData() {
Subject subject = new Subject();
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/x500/serialization/X500PrincipalTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/x500/serialization/X500PrincipalTest.java?view=diff&rev=451857&r1=451856&r2=451857
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/x500/serialization/X500PrincipalTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/x500/serialization/X500PrincipalTest.java Sun Oct 1 19:52:40 2006
@@ -32,7 +32,6 @@
*/
public class X500PrincipalTest extends SerializationTest {
- @Override
protected Object[] getData() {
return new Object[] {new X500Principal("CN=A"),
new X500Principal("CN=A, C=B"),
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/serialization/AuthenticationExceptionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/serialization/AuthenticationExceptionTest.java?view=diff&rev=451857&r1=451856&r2=451857
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/serialization/AuthenticationExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/serialization/AuthenticationExceptionTest.java Sun Oct 1 19:52:40 2006
@@ -37,7 +37,6 @@
"New message",
"Long message for Exception. Long message for Exception. Long message for Exception." };
- @Override
protected Object[] getData() {
String msg = null;
Exception cause = new Exception(msgs[1]);
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/serialization/AuthorizeCallbackTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/serialization/AuthorizeCallbackTest.java?view=diff&rev=451857&r1=451856&r2=451857
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/serialization/AuthorizeCallbackTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/serialization/AuthorizeCallbackTest.java Sun Oct 1 19:52:40 2006
@@ -40,7 +40,6 @@
"New String",
"Long stringID. Long stringID. Long stringID. Long stringID. Long stringID. Long stringID. Long stringID. Long stringID. Long stringID. Long stringID. Long stringID. Long stringID. Long stringID. Long stringID. Long stringID. Long stringID. Long stringID." };
- @Override
protected Object[] getData() {
String msg = null;
return new Object[] { new AuthorizeCallback(msg, msg),
Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/serialization/RealmCallbackTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/serialization/RealmCallbackTest.java?view=diff&rev=451857&r1=451856&r2=451857
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/serialization/RealmCallbackTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/serialization/RealmCallbackTest.java Sun Oct 1 19:52:40 2006
@@ -42,15 +42,14 @@
public static String addText = "This text was set to RealmCallback";
- @Override
protected Object[] getData() {
Object [] oo = {
new RealmCallback(msgs[0], msgs[1]),
new RealmCallback(msgs[1], msgs[0]),
new RealmCallback(msgs[1], msgs[1])
};
- for (Object element : oo) {
- ((RealmCallback)element).setText(addText);
+ for (int i = 0; i < oo.length; i++) {
+ ((RealmCallback)oo[i]).setText(addText);
}
return oo;
}