harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ndbe...@apache.org
Subject svn commit: r479918 - in /harmony/enhanced/classlib/trunk/modules/auth/src/test/java: common/javax/security/auth/x500/ common/org/apache/harmony/auth/login/ common/org/apache/harmony/auth/tests/javax/security/auth/ common/org/apache/harmony/auth/tests/...
Date Tue, 28 Nov 2006 05:51:22 GMT
Author: ndbeyer
Date: Mon Nov 27 21:51:19 2006
New Revision: 479918

URL: http://svn.apache.org/viewvc?view=rev&rev=479918
Log:
Remove unnecessary methods from tests.

Modified:
    harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/x500/X500PrincipalTest.java
    harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/x500/X500PrivateCredentialTest.java
    harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/login/DefaultConfigurationTest.java
    harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/DestroyFailedExceptionTest.java
    harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/RefreshFailedExceptionTest.java
    harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/SubjectDomainCombinerTest.java
    harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/ChoiceCallbackTest.java
    harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/ConfirmationCallbackTest.java
    harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/LanguageCallbackTest.java
    harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/NameCallbackTest.java
    harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/PasswordCallbackTest.java
    harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/TextInputCallbackTest.java
    harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/TextOutputCallbackTest.java
    harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/UnsupportedCallbackExceptionTest.java
    harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/kerberos/KerberosKeyTest.java
    harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/kerberos/KerberosPrincipalTest.java
    harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/AccountExceptionTest.java
    harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/AccountExpiredExceptionTest.java
    harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/AccountLockedExceptionTest.java
    harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/AccountNotFoundExceptionTest.java
    harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/CredentialExceptionTest.java
    harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/CredentialExpiredExceptionTest.java
    harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/CredentialNotFoundExceptionTest.java
    harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/FailedLoginExceptionTest.java
    harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/LoginContext1Test.java
    harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/LoginExceptionTest.java
    harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/AuthenticationExceptionTest.java
    harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/AuthorizeCallbackTest.java
    harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/RealmCallbackTest.java
    harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/RealmChoiceCallbackTest.java
    harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/Sasl3Test.java
    harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/Sasl4Test.java
    harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/SaslExceptionTest.java
    harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/serialization/AuthenticationExceptionTest.java
    harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/serialization/AuthorizeCallbackTest.java
    harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/serialization/RealmCallbackTest.java
    harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/serialization/RealmChoiceCallbackTest.java
    harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/serialization/SaslExceptionTest.java
    harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/ietf/jgss/ChannelBindingTest.java
    harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/ietf/jgss/GSSExceptionTest.java
    harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/ietf/jgss/GSSManagerTest.java
    harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/ietf/jgss/GSSNameTest.java
    harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/ietf/jgss/MessagePropTest.java
    harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/ietf/jgss/OidTest.java
    harmony/enhanced/classlib/trunk/modules/auth/src/test/java/linux/org/apache/harmony/auth/module/UnixLoginModuleTest.java

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/x500/X500PrincipalTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/x500/X500PrincipalTest.java?view=diff&rev=479918&r1=479917&r2=479918
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/x500/X500PrincipalTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/x500/X500PrincipalTest.java Mon Nov 27 21:51:19 2006
@@ -27,9 +27,8 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Locale;
-import junit.framework.Test;
+
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 import tests.support.resource.Support_Resources;
 
 /**
@@ -1929,14 +1928,6 @@
         X500Principal principal = new X500Principal(dn);
         String s = principal.getName(X500Principal.CANONICAL);
         assertEquals("cn=a\nb", s);
-    }
-
-    public static Test suite() {
-        return new TestSuite(X500PrincipalTest.class);
-    }
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
     }
 
     public static final String[] RFC2253_SPECIAL = new String[] { ",", "=",

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/x500/X500PrivateCredentialTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/x500/X500PrivateCredentialTest.java?view=diff&rev=479918&r1=479917&r2=479918
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/x500/X500PrivateCredentialTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/x500/X500PrivateCredentialTest.java Mon Nov 27 21:51:19 2006
@@ -33,194 +33,185 @@
 import java.security.cert.CertificateEncodingException;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
-import junit.framework.Test;
+import java.util.Date;
+import java.util.Set;
+
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import java.util.*;
 /**
  * Tests implementation of X500PrivateCredential class
  */
 @SuppressWarnings("serial")
 public class X500PrivateCredentialTest extends TestCase {
 
-	X509Certificate cert= new X509Certificate() {
-		@Override
+    X509Certificate cert= new X509Certificate() {
+        @Override
         public void checkValidity(){}
-		@Override
+        @Override
         public void checkValidity(Date date){}
-		@Override
+        @Override
         public int getVersion() {
-			return 0;
-		}
-		@Override
+            return 0;
+        }
+        @Override
         public BigInteger getSerialNumber() {
-			return null;
-		}
-		@Override
+            return null;
+        }
+        @Override
         public Principal getIssuerDN() {
-			return null;
-		}
-		@Override
+            return null;
+        }
+        @Override
         public Principal getSubjectDN() {
-			return null;
-		}
-		@Override
+            return null;
+        }
+        @Override
         public Date getNotBefore() {
-			return null;
-		}
-		@Override
+            return null;
+        }
+        @Override
         public Date getNotAfter() {
-			return null;
-		}
-		@Override
+            return null;
+        }
+        @Override
         public byte[] getTBSCertificate() throws CertificateEncodingException {
-			return null;
-		}
-		@Override
+            return null;
+        }
+        @Override
         public byte[] getSignature() {
-			return null;
-		}
-		@Override
+            return null;
+        }
+        @Override
         public String getSigAlgName() {
-			return null;
-		}
-		@Override
+            return null;
+        }
+        @Override
         public String getSigAlgOID() {
-			return null;
-		}
-		@Override
+            return null;
+        }
+        @Override
         public byte[] getSigAlgParams() {
-			return null;
-		}
-		@Override
+            return null;
+        }
+        @Override
         public boolean[] getIssuerUniqueID() {
-			return null;
-		}
-		@Override
+            return null;
+        }
+        @Override
         public boolean[] getSubjectUniqueID() {
-			return null;
-		}
-		@Override
+            return null;
+        }
+        @Override
         public boolean[] getKeyUsage() {
-			return null;
-		}
-		@Override
+            return null;
+        }
+        @Override
         public int getBasicConstraints() {
-			return 0;
-		}
-		@Override
+            return 0;
+        }
+        @Override
         public byte[] getEncoded() throws CertificateEncodingException {
-			return null;
-		}
-		@Override
+            return null;
+        }
+        @Override
         public void verify(PublicKey key) throws CertificateException, NoSuchAlgorithmException, InvalidKeyException, NoSuchProviderException, SignatureException {
-		}
-		@Override
+        }
+        @Override
         public void verify(PublicKey key, String sigProvider) throws CertificateException, NoSuchAlgorithmException, InvalidKeyException, NoSuchProviderException, SignatureException {
-		}
-		@Override
+        }
+        @Override
         public String toString() {
-			return null;
-		}
-		@Override
+            return null;
+        }
+        @Override
         public PublicKey getPublicKey() {
-			return null;
-		}
-		public Set<String> getCriticalExtensionOIDs() {
-			return null;
-		}
-		public byte[] getExtensionValue(String oid) {
-			return null;
-		}
-		public Set<String> getNonCriticalExtensionOIDs() {
-			return null;
-		}
-		public boolean hasUnsupportedCriticalExtension() {
-			return false;
-		}
-	};
-	
-	PrivateKey key= new PrivateKey() {
-		public String getAlgorithm() {
-			return null;
-		}
-
-		public String getFormat() {
-			return null;
-		}
-
-		public byte[] getEncoded() {
-			return null;
-		}
-		
-	};
-	public void testGetCert() {
-		X500PrivateCredential cred= new X500PrivateCredential(cert, key);
-		X509Certificate c= cred.getCertificate();
-		assertNotNull(c);
-	}
-	
-	public void testGetKey() {
-		X500PrivateCredential cred= new X500PrivateCredential(cert, key);
-		PrivateKey k= cred.getPrivateKey();
-		assertNotNull(k);
-	}
-	
-	public void testIsDestroyed() {
-		X500PrivateCredential cred= new X500PrivateCredential(cert, key);
-		cred.destroy();
-		assertTrue(cred.isDestroyed());
-	}
-	
-	public void testDestroy() {
-		X500PrivateCredential cred= new X500PrivateCredential(cert, key);
-		cred.destroy();
-		String al= cred.getAlias();
-		assertNull(al);
-	}
-	
-	public void testGetAlias() {
-		X500PrivateCredential cred= new X500PrivateCredential(cert, key, "ALIAS");
-		String al= cred.getAlias();
-		assertEquals("ALIAS", al);
-	}
-	
-	public void testIllegalArg() {
-		try {
-			new X500PrivateCredential(cert, key, null);
-			fail("No IllegalArgumentException on null value");
-		}
-		catch(IllegalArgumentException e) {
-			//ignore
-		}
-	}
-
-	public void testIllegalArg_0() {
-		try {
-			new X500PrivateCredential(cert, null, null);
-			fail("No IllegalArgumentException on null value");
-		}
-		catch(IllegalArgumentException e) {
-			//ignore
-		}
-	}
-
-	public void testIllegalArg_1() {
-		try {
-			new X500PrivateCredential(null, key, "");
-			fail("No IllegalArgumentException on null value");
-		}
-		catch(IllegalArgumentException e) {
-			//ignore
-		}
-	}
-
-	public static Test suite() {
-		return new TestSuite(X500PrivateCredentialTest.class);
-	}
-
-	public static void main(String[] args) {
-		junit.textui.TestRunner.run(suite());
-	}
-
+            return null;
+        }
+        public Set<String> getCriticalExtensionOIDs() {
+            return null;
+        }
+        public byte[] getExtensionValue(String oid) {
+            return null;
+        }
+        public Set<String> getNonCriticalExtensionOIDs() {
+            return null;
+        }
+        public boolean hasUnsupportedCriticalExtension() {
+            return false;
+        }
+    };
+    
+    PrivateKey key= new PrivateKey() {
+        public String getAlgorithm() {
+            return null;
+        }
+
+        public String getFormat() {
+            return null;
+        }
+
+        public byte[] getEncoded() {
+            return null;
+        }
+        
+    };
+    public void testGetCert() {
+        X500PrivateCredential cred= new X500PrivateCredential(cert, key);
+        X509Certificate c= cred.getCertificate();
+        assertNotNull(c);
+    }
+    
+    public void testGetKey() {
+        X500PrivateCredential cred= new X500PrivateCredential(cert, key);
+        PrivateKey k= cred.getPrivateKey();
+        assertNotNull(k);
+    }
+    
+    public void testIsDestroyed() {
+        X500PrivateCredential cred= new X500PrivateCredential(cert, key);
+        cred.destroy();
+        assertTrue(cred.isDestroyed());
+    }
+    
+    public void testDestroy() {
+        X500PrivateCredential cred= new X500PrivateCredential(cert, key);
+        cred.destroy();
+        String al= cred.getAlias();
+        assertNull(al);
+    }
+    
+    public void testGetAlias() {
+        X500PrivateCredential cred= new X500PrivateCredential(cert, key, "ALIAS");
+        String al= cred.getAlias();
+        assertEquals("ALIAS", al);
+    }
+    
+    public void testIllegalArg() {
+        try {
+            new X500PrivateCredential(cert, key, null);
+            fail("No IllegalArgumentException on null value");
+        }
+        catch(IllegalArgumentException e) {
+            //ignore
+        }
+    }
+
+    public void testIllegalArg_0() {
+        try {
+            new X500PrivateCredential(cert, null, null);
+            fail("No IllegalArgumentException on null value");
+        }
+        catch(IllegalArgumentException e) {
+            //ignore
+        }
+    }
+
+    public void testIllegalArg_1() {
+        try {
+            new X500PrivateCredential(null, key, "");
+            fail("No IllegalArgumentException on null value");
+        }
+        catch(IllegalArgumentException e) {
+            //ignore
+        }
+    }
 }

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/login/DefaultConfigurationTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/login/DefaultConfigurationTest.java?view=diff&rev=479918&r1=479917&r2=479918
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/login/DefaultConfigurationTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/login/DefaultConfigurationTest.java Mon Nov 27 21:51:19 2006
@@ -48,146 +48,141 @@
     static String otherConfFile = Support_Resources
             .getAbsoluteResourcePath("auth.conf");
 
-	static AppConfigurationEntry[] ents;
+    static AppConfigurationEntry[] ents;
 
-	SecurityManager old = System.getSecurityManager();
+    SecurityManager old = System.getSecurityManager();
 
-	@Override
+    @Override
     public void tearDown() throws Exception {
-		System.setSecurityManager(old);
-	}
+        System.setSecurityManager(old);
+    }
 
-	public static void main(String[] args) {
-		junit.textui.TestRunner.run(DefaultConfigurationTest.class);
-	}
-	
+    /**
+     * loading a config file specified on the system property
+     * using -Djava.security.auth.login.config    
+     */
+    public void testLoadConfigFile_1() throws IOException {
+        
+        String oldp = System.getProperty(LOGIN_CONFIG); 
+        try {
+        System.setProperty(LOGIN_CONFIG, 
+                new File(otherConfFile).getCanonicalPath());
+        DefaultConfiguration dc = new DefaultConfiguration();
+        assertNotNull(dc);
+        
+        ents = dc.getAppConfigurationEntry("Login2");
+        assertNotNull(ents);
+        ents = dc.getAppConfigurationEntry("other");
+        assertNotNull(ents);
+        ents = dc.getAppConfigurationEntry("Login1");
+        assertNotNull(ents);
+        Map<String, String> m = new HashMap<String, String>();
+        for (AppConfigurationEntry element : ents) {
+            assertEquals("com.intel.security.auth.module.LoginModule1",
+                    element.getLoginModuleName());
+            m.clear();
+            m.put("debug1", "true");
+            m.put("test1", "false");
+            assertEquals(m, element.getOptions());
+            assertEquals("LoginModuleControlFlag: required", element
+                    .getControlFlag().toString());
+        }
+        
+        ents = dc.getAppConfigurationEntry("Login7");
+        assertNotNull(ents);
+
+        
+        assertEquals("com.intel.security.auth.module.LoginModule1", ents[0].getLoginModuleName());
+        assertEquals("com.intel.security.auth.module.LoginModule2", ents[1].getLoginModuleName());
+        assertEquals("com.intel.security.auth.module.LoginModule3", ents[2].getLoginModuleName());
+        assertEquals("com.intel.security.auth.module.LoginModule4",  ents[3].getLoginModuleName());
+        
+        assertEquals("LoginModuleControlFlag: required", ents[0].getControlFlag().toString());
+        assertEquals("LoginModuleControlFlag: optional", ents[1].getControlFlag().toString());
+        assertEquals("LoginModuleControlFlag: sufficient", ents[2].getControlFlag().toString());
+        assertEquals("LoginModuleControlFlag: requisite", ents[3].getControlFlag().toString());
+        
+        m.clear();
+        m.put("AAAA", "true");
+        m.put("BBB", "false");
+        assertEquals(m, ents[0].getOptions());
+        m.clear();
+        m.put("debug2", "true");
+        assertEquals(m, ents[1].getOptions());
+        m.clear();
+        m.put("debug2", "false");
+        assertEquals(m, ents[2].getOptions());
+        m.clear();
+        m.put("ticketCache", System.getProperty("user.home")+ File.separator+"tickets");
+        m.put("useTicketCache", "true");
+        assertEquals(m, ents[3].getOptions());
+
+        } finally {
+            TestUtils.setSystemProperty(LOGIN_CONFIG, oldp);
+        }
+    }
+    /**
+     * test of the refresh method
+     */
+    public void testRefresh() throws IOException {
+        
+        String oldp = System.getProperty(LOGIN_CONFIG);
+        try {
+            System.setProperty(LOGIN_CONFIG, 
+                    new File(otherConfFile).getCanonicalPath());
+
+        DefaultConfiguration dc = new DefaultConfiguration();
+        MySecurityManager checker = new MySecurityManager(new AuthPermission(
+                "refreshLoginConfiguration"), true);
+        System.setSecurityManager(checker);
+        dc.refresh();
+        assertTrue(checker.checkAsserted);
+        checker.reset();
+        checker.enableAccess = false;
+        try {
+            dc.refresh();
+            fail("No expected SecurityException");
+        } catch (SecurityException ex) {
+        }
+        } finally {
+            TestUtils.setSystemProperty(LOGIN_CONFIG, oldp);
+        }
+
+    }
 
     /**
-	 * loading a config file specified on the system property
-	 * using -Djava.security.auth.login.config    
-	 */
-	public void testLoadConfigFile_1() throws IOException {
-		
-	    String oldp = System.getProperty(LOGIN_CONFIG);	
-		try {
-		System.setProperty(LOGIN_CONFIG, 
-				new File(otherConfFile).getCanonicalPath());
-		DefaultConfiguration dc = new DefaultConfiguration();
-		assertNotNull(dc);
-		
-		ents = dc.getAppConfigurationEntry("Login2");
-		assertNotNull(ents);
-		ents = dc.getAppConfigurationEntry("other");
-		assertNotNull(ents);
-		ents = dc.getAppConfigurationEntry("Login1");
-		assertNotNull(ents);
-		Map<String, String> m = new HashMap<String, String>();
-		for (AppConfigurationEntry element : ents) {
-			assertEquals("com.intel.security.auth.module.LoginModule1",
-					element.getLoginModuleName());
-			m.clear();
-			m.put("debug1", "true");
-			m.put("test1", "false");
-			assertEquals(m, element.getOptions());
-			assertEquals("LoginModuleControlFlag: required", element
-					.getControlFlag().toString());
-		}
-		
-		ents = dc.getAppConfigurationEntry("Login7");
-		assertNotNull(ents);
-
-		
-		assertEquals("com.intel.security.auth.module.LoginModule1", ents[0].getLoginModuleName());
-		assertEquals("com.intel.security.auth.module.LoginModule2", ents[1].getLoginModuleName());
-		assertEquals("com.intel.security.auth.module.LoginModule3", ents[2].getLoginModuleName());
-		assertEquals("com.intel.security.auth.module.LoginModule4",  ents[3].getLoginModuleName());
-		
-		assertEquals("LoginModuleControlFlag: required", ents[0].getControlFlag().toString());
-		assertEquals("LoginModuleControlFlag: optional", ents[1].getControlFlag().toString());
-		assertEquals("LoginModuleControlFlag: sufficient", ents[2].getControlFlag().toString());
-		assertEquals("LoginModuleControlFlag: requisite", ents[3].getControlFlag().toString());
-		
-		m.clear();
-		m.put("AAAA", "true");
-		m.put("BBB", "false");
-		assertEquals(m, ents[0].getOptions());
-		m.clear();
-		m.put("debug2", "true");
-		assertEquals(m, ents[1].getOptions());
-		m.clear();
-		m.put("debug2", "false");
-		assertEquals(m, ents[2].getOptions());
-		m.clear();
-		m.put("ticketCache", System.getProperty("user.home")+ File.separator+"tickets");
-		m.put("useTicketCache", "true");
-		assertEquals(m, ents[3].getOptions());
-
-		} finally {
-		    TestUtils.setSystemProperty(LOGIN_CONFIG, oldp);
-		}
-	}
-	/**
-	 * test of the refresh method
-	 */
-	public void testRefresh() throws IOException {
-	    
-	    String oldp = System.getProperty(LOGIN_CONFIG);
-		try {
-			System.setProperty(LOGIN_CONFIG, 
-					new File(otherConfFile).getCanonicalPath());
-
-		DefaultConfiguration dc = new DefaultConfiguration();
-		MySecurityManager checker = new MySecurityManager(new AuthPermission(
-				"refreshLoginConfiguration"), true);
-		System.setSecurityManager(checker);
-		dc.refresh();
-		assertTrue(checker.checkAsserted);
-		checker.reset();
-		checker.enableAccess = false;
-		try {
-			dc.refresh();
-			fail("No expected SecurityException");
-		} catch (SecurityException ex) {
-		}
-		} finally {
-		    TestUtils.setSystemProperty(LOGIN_CONFIG, oldp);
-		}
-
-	}
-
-	/**
-	 * Easy the SecurityManager class
-	 * 
-	 */
-
-	class MySecurityManager extends SecurityManager {
-
-		public boolean enableAccess;
-
-		public Permission checkTarget;
-
-		public boolean checkAsserted;
-
-		public MySecurityManager(Permission target, boolean enable) {
-			checkAsserted = false;
-			checkTarget = target;
-			enableAccess = enable;
-		}
+     * Easy the SecurityManager class
+     * 
+     */
+
+    class MySecurityManager extends SecurityManager {
+
+        public boolean enableAccess;
+
+        public Permission checkTarget;
+
+        public boolean checkAsserted;
+
+        public MySecurityManager(Permission target, boolean enable) {
+            checkAsserted = false;
+            checkTarget = target;
+            enableAccess = enable;
+        }
 
-		@Override
+        @Override
         public void checkPermission(Permission p) {
-			if (p instanceof AuthPermission && checkTarget.equals(p)) {
-				checkAsserted = true;
-				if (!enableAccess) {
-					throw new SecurityException();
-				}
-			}
-		}
-
-		public MySecurityManager reset() {
-			checkAsserted = false;
-			return this;
-		}
-	}
-	
+            if (p instanceof AuthPermission && checkTarget.equals(p)) {
+                checkAsserted = true;
+                if (!enableAccess) {
+                    throw new SecurityException();
+                }
+            }
+        }
+
+        public MySecurityManager reset() {
+            checkAsserted = false;
+            return this;
+        }
+    }
+    
 }

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/DestroyFailedExceptionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/DestroyFailedExceptionTest.java?view=diff&rev=479918&r1=479917&r2=479918
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/DestroyFailedExceptionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/DestroyFailedExceptionTest.java Mon Nov 27 21:51:19 2006
@@ -51,8 +51,4 @@
         message = "message";
         assertSame(message, new DestroyFailedException(message).getMessage());
     }
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(DestroyFailedExceptionTest.class);
-    }
 }

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/RefreshFailedExceptionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/RefreshFailedExceptionTest.java?view=diff&rev=479918&r1=479917&r2=479918
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/RefreshFailedExceptionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/RefreshFailedExceptionTest.java Mon Nov 27 21:51:19 2006
@@ -51,8 +51,4 @@
         message = "message";
         assertSame(message, new RefreshFailedException(message).getMessage());
     }
-    
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(RefreshFailedExceptionTest.class);
-    }
 }

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/SubjectDomainCombinerTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/SubjectDomainCombinerTest.java?view=diff&rev=479918&r1=479917&r2=479918
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/SubjectDomainCombinerTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/SubjectDomainCombinerTest.java Mon Nov 27 21:51:19 2006
@@ -43,12 +43,6 @@
  */
 
 public class SubjectDomainCombinerTest extends SecurityTest {
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(
-                org.apache.harmony.auth.tests.javax.security.auth.SubjectDomainCombinerTest.class);
-    }
-
     /**
      * @tests javax.security.auth.SubjectDomainCombiner#SubjectDomainCombiner(
      *        javax.security.auth.Subject)

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/ChoiceCallbackTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/ChoiceCallbackTest.java?view=diff&rev=479918&r1=479917&r2=479918
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/ChoiceCallbackTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/ChoiceCallbackTest.java Mon Nov 27 21:51:19 2006
@@ -32,122 +32,118 @@
 
 public class ChoiceCallbackTest extends TestCase {
 
-	ChoiceCallback cb;
+    ChoiceCallback cb;
 
-	String prompt = "prompt";
+    String prompt = "prompt";
 
-	int defaultChoice = 1;
+    int defaultChoice = 1;
 
-	String[] choices = { "AAA", "BBB" };
+    String[] choices = { "AAA", "BBB" };
 
-	int index[] = { 1, 2, 3 };
-
-	public static void main(String[] args) {
-		junit.textui.TestRunner.run(ChoiceCallbackTest.class);
-	}
-
-	/**
-	 * Class under test for Ctor
-	 */
-	public final void testChoiceCallback_01() {
-		cb = new ChoiceCallback(prompt, choices, defaultChoice, true);
-		assertEquals(this.prompt, cb.getPrompt());
-		assertEquals(this.choices, cb.getChoices());
-		assertEquals(this.defaultChoice, cb.getDefaultChoice());
-		assertTrue(cb.allowMultipleSelections());
-	}
-
-	/**
-	 * test for the method setSelectedIndexes
-	 */
-	public final void testChoiceCallback_02() {
-		cb = new ChoiceCallback(prompt, choices, defaultChoice, false);
-		try {
-			cb.setSelectedIndexes(index);
-			fail("should be throw UnsupportedOperationException");
-		} catch (UnsupportedOperationException e) {
-		}
-		cb.setSelectedIndex(1);
-		assertEquals(1, cb.getSelectedIndexes()[0]);
-	}
-	
-	public final void testChoiceCallback_03() {
-		
-		try {
-			cb = new ChoiceCallback(prompt, null, defaultChoice, true);
-			fail("should be throw IllegalArgumentException");
-		} catch (IllegalArgumentException e) {
-		}
-
-		try {
-			cb = new ChoiceCallback(null, choices, defaultChoice, true);
-			fail("should be throw IllegalArgumentException");
-		} catch (IllegalArgumentException e) {
-		}
-
-		try {
-			cb = new ChoiceCallback(prompt, choices, -1, true);
-			fail("should be throw IllegalArgumentException");
-		} catch (IllegalArgumentException e) {
-		}
-		try {
-			cb = new ChoiceCallback(prompt, new String[0], defaultChoice, true);
-			fail("should be throw IllegalArgumentException");
-		} catch (IllegalArgumentException e) {
-		}
-
-		try {
-			cb = new ChoiceCallback("", choices, defaultChoice, true);
-			fail("should be throw IllegalArgumentException");
-		} catch (IllegalArgumentException e) {
-		}
-
-		try {
-			cb = new ChoiceCallback(prompt, choices, 5, true);
-			fail("should be throw IllegalArgumentException");
-		} catch (IllegalArgumentException e) {
-		}
-		try {
-			cb = new ChoiceCallback(prompt, choices, 2, true);
-			fail("should be throw IllegalArgumentException");
-		} catch (IllegalArgumentException e) {
-		}
-	}
-
-	public final void testChoiceCallback_04() {
-		String[] ch = {null};
-
-		try {
-			cb = new ChoiceCallback(prompt, ch, 5, true);
-			fail("should be throw IllegalArgumentException");
-		} catch (IllegalArgumentException e) {
-		}
-		
-		String[] ch1 = {""};
-
-		try {
-			cb = new ChoiceCallback(prompt, ch1, 5, true);
-			fail("should be throw IllegalArgumentException");
-		} catch (IllegalArgumentException e) {
-		}
-		
-
-	}
-	/**
-	 * test whether implementation is mutable
-	 */
-	public final void testMutable() {
-		String c[] = { "A", "B", "C" };
-		cb = new ChoiceCallback(prompt, c, defaultChoice, false);
-		c[0] = "D";
-		assertFalse("A".equals(cb.getChoices()[0]));
-		int selection[] = { 1, 2, 3 };
-		cb = new ChoiceCallback(prompt, c, defaultChoice, true);
-		cb.setSelectedIndexes(selection);
-		selection[0] = 4;
-		assertEquals(4, cb.getSelectedIndexes()[0]);
-		cb.getSelectedIndexes()[0] = 5;
-		assertEquals(5, cb.getSelectedIndexes()[0]);
-	}
+    int index[] = { 1, 2, 3 };
+
+    /**
+     * Class under test for Ctor
+     */
+    public final void testChoiceCallback_01() {
+        cb = new ChoiceCallback(prompt, choices, defaultChoice, true);
+        assertEquals(this.prompt, cb.getPrompt());
+        assertEquals(this.choices, cb.getChoices());
+        assertEquals(this.defaultChoice, cb.getDefaultChoice());
+        assertTrue(cb.allowMultipleSelections());
+    }
+
+    /**
+     * test for the method setSelectedIndexes
+     */
+    public final void testChoiceCallback_02() {
+        cb = new ChoiceCallback(prompt, choices, defaultChoice, false);
+        try {
+            cb.setSelectedIndexes(index);
+            fail("should be throw UnsupportedOperationException");
+        } catch (UnsupportedOperationException e) {
+        }
+        cb.setSelectedIndex(1);
+        assertEquals(1, cb.getSelectedIndexes()[0]);
+    }
+    
+    public final void testChoiceCallback_03() {
+        
+        try {
+            cb = new ChoiceCallback(prompt, null, defaultChoice, true);
+            fail("should be throw IllegalArgumentException");
+        } catch (IllegalArgumentException e) {
+        }
+
+        try {
+            cb = new ChoiceCallback(null, choices, defaultChoice, true);
+            fail("should be throw IllegalArgumentException");
+        } catch (IllegalArgumentException e) {
+        }
+
+        try {
+            cb = new ChoiceCallback(prompt, choices, -1, true);
+            fail("should be throw IllegalArgumentException");
+        } catch (IllegalArgumentException e) {
+        }
+        try {
+            cb = new ChoiceCallback(prompt, new String[0], defaultChoice, true);
+            fail("should be throw IllegalArgumentException");
+        } catch (IllegalArgumentException e) {
+        }
+
+        try {
+            cb = new ChoiceCallback("", choices, defaultChoice, true);
+            fail("should be throw IllegalArgumentException");
+        } catch (IllegalArgumentException e) {
+        }
+
+        try {
+            cb = new ChoiceCallback(prompt, choices, 5, true);
+            fail("should be throw IllegalArgumentException");
+        } catch (IllegalArgumentException e) {
+        }
+        try {
+            cb = new ChoiceCallback(prompt, choices, 2, true);
+            fail("should be throw IllegalArgumentException");
+        } catch (IllegalArgumentException e) {
+        }
+    }
+
+    public final void testChoiceCallback_04() {
+        String[] ch = {null};
+
+        try {
+            cb = new ChoiceCallback(prompt, ch, 5, true);
+            fail("should be throw IllegalArgumentException");
+        } catch (IllegalArgumentException e) {
+        }
+        
+        String[] ch1 = {""};
+
+        try {
+            cb = new ChoiceCallback(prompt, ch1, 5, true);
+            fail("should be throw IllegalArgumentException");
+        } catch (IllegalArgumentException e) {
+        }
+        
+
+    }
+    /**
+     * test whether implementation is mutable
+     */
+    public final void testMutable() {
+        String c[] = { "A", "B", "C" };
+        cb = new ChoiceCallback(prompt, c, defaultChoice, false);
+        c[0] = "D";
+        assertFalse("A".equals(cb.getChoices()[0]));
+        int selection[] = { 1, 2, 3 };
+        cb = new ChoiceCallback(prompt, c, defaultChoice, true);
+        cb.setSelectedIndexes(selection);
+        selection[0] = 4;
+        assertEquals(4, cb.getSelectedIndexes()[0]);
+        cb.getSelectedIndexes()[0] = 5;
+        assertEquals(5, cb.getSelectedIndexes()[0]);
+    }
 
 }

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/ConfirmationCallbackTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/ConfirmationCallbackTest.java?view=diff&rev=479918&r1=479917&r2=479918
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/ConfirmationCallbackTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/ConfirmationCallbackTest.java Mon Nov 27 21:51:19 2006
@@ -34,23 +34,18 @@
 
     ConfirmationCallback cc;
      int mt[] = { ConfirmationCallback.INFORMATION,
-            			ConfirmationCallback.WARNING, 
-            			ConfirmationCallback.ERROR 
-            			};
+                        ConfirmationCallback.WARNING, 
+                        ConfirmationCallback.ERROR 
+                        };
      int ot[] = { ConfirmationCallback.YES_NO_OPTION,
-            			ConfirmationCallback.YES_NO_CANCEL_OPTION ,
-            			ConfirmationCallback.OK_CANCEL_OPTION
-            			};
+                        ConfirmationCallback.YES_NO_CANCEL_OPTION ,
+                        ConfirmationCallback.OK_CANCEL_OPTION
+                        };
      int dopt[] = { ConfirmationCallback.YES, 
-            			ConfirmationCallback.NO,
-            			ConfirmationCallback.CANCEL, 
-            			ConfirmationCallback.OK 
-            			};
-
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(ConfirmationCallbackTest.class);
-    }
+                        ConfirmationCallback.NO,
+                        ConfirmationCallback.CANCEL, 
+                        ConfirmationCallback.OK 
+                        };
 
     /**
      *  Ctor test  
@@ -174,8 +169,8 @@
       try {
           cc = new ConfirmationCallback(ConfirmationCallback.INFORMATION, opt, 3);
           fail("Default Option does not lie within the array boundaries of options ");
-      	} catch(IllegalArgumentException e){
-      	}
+        } catch(IllegalArgumentException e){
+        }
     }
     
     /**
@@ -213,15 +208,15 @@
             cc = new ConfirmationCallback("prompt", ConfirmationCallback.INFORMATION, opt2, 1);
           fail("2. Option type should not be null and empty ");
         } catch(IllegalArgumentException e){}
-      	try {
-      	    cc = new ConfirmationCallback("", ConfirmationCallback.INFORMATION, opt, 1);
-      	    fail("3. Prompt should not be null and empty ");
-      	} catch(IllegalArgumentException e){}
-      	try {
-      	    cc = new ConfirmationCallback(null, ConfirmationCallback.INFORMATION, opt, 1);
-      	    fail("4. Prompt should not be null and empty ");
-      	} catch(IllegalArgumentException e){
-      	}
+        try {
+            cc = new ConfirmationCallback("", ConfirmationCallback.INFORMATION, opt, 1);
+            fail("3. Prompt should not be null and empty ");
+        } catch(IllegalArgumentException e){}
+        try {
+            cc = new ConfirmationCallback(null, ConfirmationCallback.INFORMATION, opt, 1);
+            fail("4. Prompt should not be null and empty ");
+        } catch(IllegalArgumentException e){
+        }
 
     }
 

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/LanguageCallbackTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/LanguageCallbackTest.java?view=diff&rev=479918&r1=479917&r2=479918
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/LanguageCallbackTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/LanguageCallbackTest.java Mon Nov 27 21:51:19 2006
@@ -34,14 +34,8 @@
  */
 
 public class LanguageCallbackTest extends TestCase {
-
     LanguageCallback lc;
     
-    
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(LanguageCallbackTest.class);
-    }
-
     /**
      * test of Ctor, method set/getLocale() 
      */

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/NameCallbackTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/NameCallbackTest.java?view=diff&rev=479918&r1=479917&r2=479918
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/NameCallbackTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/NameCallbackTest.java Mon Nov 27 21:51:19 2006
@@ -34,10 +34,6 @@
 
     NameCallback nc;
 
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(NameCallbackTest.class);
-    }
-
     /**
      * Class under test for void NameCallback(String)
      */

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/PasswordCallbackTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/PasswordCallbackTest.java?view=diff&rev=479918&r1=479917&r2=479918
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/PasswordCallbackTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/PasswordCallbackTest.java Mon Nov 27 21:51:19 2006
@@ -34,10 +34,6 @@
 public class PasswordCallbackTest extends TestCase {
 
     PasswordCallback pc;
-    
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(PasswordCallbackTest.class);
-    }
 
     public final void testPasswordCallback() {
         pc = new PasswordCallback("prompt", true);

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/TextInputCallbackTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/TextInputCallbackTest.java?view=diff&rev=479918&r1=479917&r2=479918
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/TextInputCallbackTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/TextInputCallbackTest.java Mon Nov 27 21:51:19 2006
@@ -32,11 +32,7 @@
 
 public class TextInputCallbackTest extends TestCase {
 
-    TextInputCallback text = null;
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(TextInputCallbackTest.class);
-    }
+    TextInputCallback text;
 
     /**
      * Test for TextInputCallback(String), TextInputCallback(String, String) ctors 

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/TextOutputCallbackTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/TextOutputCallbackTest.java?view=diff&rev=479918&r1=479917&r2=479918
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/TextOutputCallbackTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/TextOutputCallbackTest.java Mon Nov 27 21:51:19 2006
@@ -32,11 +32,7 @@
 
 public class TextOutputCallbackTest extends TestCase {
 
-    TextOutputCallback text = null;
-    
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(TextOutputCallbackTest.class);
-    }
+    TextOutputCallback text;
 
     /**
      * Test for TextOutputCallback(int msgType,String msg) ctor 

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/UnsupportedCallbackExceptionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/UnsupportedCallbackExceptionTest.java?view=diff&rev=479918&r1=479917&r2=479918
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/UnsupportedCallbackExceptionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/callback/UnsupportedCallbackExceptionTest.java Mon Nov 27 21:51:19 2006
@@ -36,10 +36,6 @@
 
     NameCallback nc = new NameCallback("prompt");
     
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(UnsupportedCallbackExceptionTest.class);
-    }
-    
     /**
      * Test for UnsupportedCallbackException(Callback c) ctor 
      */

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/kerberos/KerberosKeyTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/kerberos/KerberosKeyTest.java?view=diff&rev=479918&r1=479917&r2=479918
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/kerberos/KerberosKeyTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/kerberos/KerberosKeyTest.java Mon Nov 27 21:51:19 2006
@@ -225,8 +225,4 @@
         } catch (IllegalStateException e) {
         }
     }
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(KerberosKeyTest.class);
-    }
 }

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/kerberos/KerberosPrincipalTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/kerberos/KerberosPrincipalTest.java?view=diff&rev=479918&r1=479917&r2=479918
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/kerberos/KerberosPrincipalTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/kerberos/KerberosPrincipalTest.java Mon Nov 27 21:51:19 2006
@@ -247,8 +247,4 @@
         assertFalse(new KerberosPrincipal("A@B").equals(null));
         assertFalse(new KerberosPrincipal("A@B").equals(new Object()));
     }
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(KerberosPrincipalTest.class);
-    }
 }

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/AccountExceptionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/AccountExceptionTest.java?view=diff&rev=479918&r1=479917&r2=479918
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/AccountExceptionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/AccountExceptionTest.java Mon Nov 27 21:51:19 2006
@@ -51,8 +51,4 @@
         message = "message";
         assertSame(message, new AccountException(message).getMessage());
     }
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(AccountExceptionTest.class);
-    }
 }

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/AccountExpiredExceptionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/AccountExpiredExceptionTest.java?view=diff&rev=479918&r1=479917&r2=479918
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/AccountExpiredExceptionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/AccountExpiredExceptionTest.java Mon Nov 27 21:51:19 2006
@@ -51,8 +51,4 @@
         message = "message";
         assertSame(message, new AccountExpiredException(message).getMessage());
     }
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(AccountExpiredExceptionTest.class);
-    }
 }

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/AccountLockedExceptionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/AccountLockedExceptionTest.java?view=diff&rev=479918&r1=479917&r2=479918
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/AccountLockedExceptionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/AccountLockedExceptionTest.java Mon Nov 27 21:51:19 2006
@@ -51,8 +51,4 @@
         message = "message";
         assertSame(message, new AccountLockedException(message).getMessage());
     }
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(AccountLockedExceptionTest.class);
-    }
 }

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/AccountNotFoundExceptionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/AccountNotFoundExceptionTest.java?view=diff&rev=479918&r1=479917&r2=479918
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/AccountNotFoundExceptionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/AccountNotFoundExceptionTest.java Mon Nov 27 21:51:19 2006
@@ -51,8 +51,4 @@
         message = "message";
         assertSame(message, new AccountNotFoundException(message).getMessage());
     }
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(AccountNotFoundExceptionTest.class);
-    }
 }

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/CredentialExceptionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/CredentialExceptionTest.java?view=diff&rev=479918&r1=479917&r2=479918
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/CredentialExceptionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/CredentialExceptionTest.java Mon Nov 27 21:51:19 2006
@@ -51,8 +51,4 @@
         message = "message";
         assertSame(message, new CredentialException(message).getMessage());
     }
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(CredentialExceptionTest.class);
-    }
 }

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/CredentialExpiredExceptionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/CredentialExpiredExceptionTest.java?view=diff&rev=479918&r1=479917&r2=479918
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/CredentialExpiredExceptionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/CredentialExpiredExceptionTest.java Mon Nov 27 21:51:19 2006
@@ -54,8 +54,4 @@
         assertSame(message, new CredentialExpiredException(message)
                 .getMessage());
     }
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(CredentialExpiredExceptionTest.class);
-    }
 }

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/CredentialNotFoundExceptionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/CredentialNotFoundExceptionTest.java?view=diff&rev=479918&r1=479917&r2=479918
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/CredentialNotFoundExceptionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/CredentialNotFoundExceptionTest.java Mon Nov 27 21:51:19 2006
@@ -53,8 +53,4 @@
         assertSame(message, new CredentialNotFoundException(message)
                 .getMessage());
     }
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(CredentialNotFoundExceptionTest.class);
-    }
 }

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/FailedLoginExceptionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/FailedLoginExceptionTest.java?view=diff&rev=479918&r1=479917&r2=479918
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/FailedLoginExceptionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/FailedLoginExceptionTest.java Mon Nov 27 21:51:19 2006
@@ -51,8 +51,4 @@
         message = "message";
         assertSame(message, new FailedLoginException(message).getMessage());
     }
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(FailedLoginExceptionTest.class);
-    }
 }

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/LoginContext1Test.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/LoginContext1Test.java?view=diff&rev=479918&r1=479917&r2=479918
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/LoginContext1Test.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/LoginContext1Test.java Mon Nov 27 21:51:19 2006
@@ -72,10 +72,6 @@
 
     private static final int SUFFICIENT = 3;
 
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(LoginContext1Test.class);
-    }
-
     /**
      * Converts short (local) class names (like TestLoginModule) into the 
      * global (fully qualified) ones.<br>

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/LoginExceptionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/LoginExceptionTest.java?view=diff&rev=479918&r1=479917&r2=479918
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/LoginExceptionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/auth/login/LoginExceptionTest.java Mon Nov 27 21:51:19 2006
@@ -51,8 +51,4 @@
         message = "message";
         assertSame(message, new LoginException(message).getMessage());
     }
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(LoginExceptionTest.class);
-    }
 }

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/AuthenticationExceptionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/AuthenticationExceptionTest.java?view=diff&rev=479918&r1=479917&r2=479918
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/AuthenticationExceptionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/AuthenticationExceptionTest.java Mon Nov 27 21:51:19 2006
@@ -31,11 +31,6 @@
  * 
  */
 public class AuthenticationExceptionTest extends TestCase {
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(AuthenticationExceptionTest.class);
-    }
-
     /**
      * Constructor for AuthenticationExceptionTests.
      * 

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/AuthorizeCallbackTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/AuthorizeCallbackTest.java?view=diff&rev=479918&r1=479917&r2=479918
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/AuthorizeCallbackTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/AuthorizeCallbackTest.java Mon Nov 27 21:51:19 2006
@@ -32,11 +32,6 @@
  */
 
 public class AuthorizeCallbackTest extends TestCase {
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(AuthorizeCallbackTest.class);
-    }
-
     /**
      * Test for <code>AuthorizeCallback(String authnID, String authzID)</code>
      * and get/set methods

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/RealmCallbackTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/RealmCallbackTest.java?view=diff&rev=479918&r1=479917&r2=479918
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/RealmCallbackTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/RealmCallbackTest.java Mon Nov 27 21:51:19 2006
@@ -32,15 +32,6 @@
  */
 
 public class RealmCallbackTest extends TestCase {
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(RealmCallbackTest.class);
-    }
-
-    public RealmCallbackTest(String arg0) {
-        super(arg0);
-    }
-    
     private static final String[] prompts = {
             "Prompts",
             "Another prompt",

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/RealmChoiceCallbackTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/RealmChoiceCallbackTest.java?view=diff&rev=479918&r1=479917&r2=479918
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/RealmChoiceCallbackTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/RealmChoiceCallbackTest.java Mon Nov 27 21:51:19 2006
@@ -32,15 +32,6 @@
  */
 
 public class RealmChoiceCallbackTest extends TestCase {
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(RealmChoiceCallbackTest.class);
-    }
-    
-    public RealmChoiceCallbackTest(String arg0) {
-        super(arg0);
-    }
-    
     private static final String[] prompts = {
             "Prompts",
             "Another prompt",

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/Sasl3Test.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/Sasl3Test.java?view=diff&rev=479918&r1=479917&r2=479918
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/Sasl3Test.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/Sasl3Test.java Mon Nov 27 21:51:19 2006
@@ -51,20 +51,7 @@
     private static final String fClientClass = mySaslClientFactory.class.getName();;
 
     private Provider [] provs;
-    private boolean initProvs = false;
-    
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(Sasl3Test.class);
-    }
-
-    /**
-     * Constructor for Sasl3Test.
-     * 
-     * @param arg0
-     */
-    public Sasl3Test(String arg0) {
-        super(arg0);
-    }
+    private boolean initProvs;
 
     @Override
     protected void setUp() throws Exception {

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/Sasl4Test.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/Sasl4Test.java?view=diff&rev=479918&r1=479917&r2=479918
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/Sasl4Test.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/Sasl4Test.java Mon Nov 27 21:51:19 2006
@@ -48,21 +48,7 @@
     private static final String fServerClass = mySaslServerFactory.class.getName();
 
     private Provider [] provs;
-    private boolean initProvs = false;
-
-    
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(Sasl4Test.class);
-    }
-
-    /**
-     * Constructor for Sasl4Test.
-     * 
-     * @param arg0
-     */
-    public Sasl4Test(String arg0) {
-        super(arg0);
-    }
+    private boolean initProvs;
 
     @Override
     protected void setUp() throws Exception {

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/SaslExceptionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/SaslExceptionTest.java?view=diff&rev=479918&r1=479917&r2=479918
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/SaslExceptionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/SaslExceptionTest.java Mon Nov 27 21:51:19 2006
@@ -30,20 +30,6 @@
  * Tests for constructors and methods of SaslException class
  */
 public class SaslExceptionTest extends TestCase {
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(SaslExceptionTest.class);
-    }
-
-    /**
-     * Constructor for SaslExceptionTests.
-     * 
-     * @param arg0
-     */
-    public SaslExceptionTest(String arg0) {
-        super(arg0);
-    }
-
     static String[] msgs = {
             "",
             "Check new message",

Modified: 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/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/serialization/AuthenticationExceptionTest.java?view=diff&rev=479918&r1=479917&r2=479918
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/serialization/AuthenticationExceptionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/serialization/AuthenticationExceptionTest.java Mon Nov 27 21:51:19 2006
@@ -50,8 +50,4 @@
                 new AuthenticationException(msgs[1], cause)
                 };
     }
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(AuthenticationExceptionTest.class);
-    }
 }

Modified: 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/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/serialization/AuthorizeCallbackTest.java?view=diff&rev=479918&r1=479917&r2=479918
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/serialization/AuthorizeCallbackTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/serialization/AuthorizeCallbackTest.java Mon Nov 27 21:51:19 2006
@@ -74,8 +74,4 @@
         assertEquals(test.isAuthorized(), is);
 
     }
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(AuthorizeCallbackTest.class);
-    }
 }

Modified: 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/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/serialization/RealmCallbackTest.java?view=diff&rev=479918&r1=479917&r2=479918
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/serialization/RealmCallbackTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/serialization/RealmCallbackTest.java Mon Nov 27 21:51:19 2006
@@ -66,8 +66,4 @@
         assertEquals(prompt, test.getPrompt());
 
     }
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(RealmCallbackTest.class);
-    }
 }

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/serialization/RealmChoiceCallbackTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/serialization/RealmChoiceCallbackTest.java?view=diff&rev=479918&r1=479917&r2=479918
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/serialization/RealmChoiceCallbackTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/serialization/RealmChoiceCallbackTest.java Mon Nov 27 21:51:19 2006
@@ -43,6 +43,7 @@
             "t"};
 
     public static final int [] idx = {2, 3};
+    
     @Override
     protected Object[] getData() {
         Object [] oo = {
@@ -52,7 +53,7 @@
                 new RealmChoiceCallback(msgs[2], msgs, 0, false)
 
         };        
-for (Object element : oo) {
+        for (Object element : oo) {
             RealmChoiceCallback rc = (RealmChoiceCallback)element;           
             if (rc.allowMultipleSelections()) {
                 rc.setSelectedIndexes(idx);
@@ -60,7 +61,6 @@
                 rc.setSelectedIndex(msgs.length - 1);
             }
         }
-//                
         return oo;
     }
 
@@ -84,7 +84,7 @@
         int [] tIn = test.getSelectedIndexes();
 //        assertNull("in is not null", in);            
 //        assertNull("tIn is not null", tIn);
-//        
+
         if (!all) {
             assertEquals("Incorrect length in ", in.length, 1);
             assertEquals("Incorrect length tIn ", tIn.length, 1);
@@ -95,10 +95,5 @@
                 assertEquals(in[i], tIn[i]);
             }            
         }
-//        
-    }
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(RealmChoiceCallbackTest.class);
     }
 }

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/serialization/SaslExceptionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/serialization/SaslExceptionTest.java?view=diff&rev=479918&r1=479917&r2=479918
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/serialization/SaslExceptionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/tests/javax/security/sasl/serialization/SaslExceptionTest.java Mon Nov 27 21:51:19 2006
@@ -50,8 +50,4 @@
                 new SaslException(msgs[1], cause)
                 };
     }
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(SaslExceptionTest.class);
-    }
 }

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/ietf/jgss/ChannelBindingTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/ietf/jgss/ChannelBindingTest.java?view=diff&rev=479918&r1=479917&r2=479918
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/ietf/jgss/ChannelBindingTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/ietf/jgss/ChannelBindingTest.java Mon Nov 27 21:51:19 2006
@@ -21,11 +21,10 @@
  */
 package org.ietf.jgss;
 
-import junit.framework.Test;
+import java.net.InetAddress;
+import java.util.Arrays;
+
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import java.util.*;
-import java.net.*;
 
 /**
  * Tests ChannelBinding class
@@ -274,13 +273,4 @@
         ChannelBinding cb = new ChannelBinding(null, null, data);
         assertEquals(312, cb.hashCode());
     }
-    
-    public static Test suite() {
-        return new TestSuite(ChannelBindingTest.class);
-    }
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
-    }
-
 }

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/ietf/jgss/GSSExceptionTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/ietf/jgss/GSSExceptionTest.java?view=diff&rev=479918&r1=479917&r2=479918
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/ietf/jgss/GSSExceptionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/ietf/jgss/GSSExceptionTest.java Mon Nov 27 21:51:19 2006
@@ -21,9 +21,7 @@
  */
 package org.ietf.jgss;
 
-import junit.framework.Test;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 /**
  * Tests GSSException class
@@ -155,13 +153,5 @@
     public void testToString_0() {
         GSSException gssException= new GSSException(GSSException.BAD_NAME, GSSException.BAD_NAME, "Bad day today");
         assertEquals("GSSException: BAD NAME (Bad day today)",  gssException.toString() );
-    }
-    
-    public static Test suite() {
-        return new TestSuite(GSSExceptionTest.class);
-    }
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
     }
 }

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/ietf/jgss/GSSManagerTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/ietf/jgss/GSSManagerTest.java?view=diff&rev=479918&r1=479917&r2=479918
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/ietf/jgss/GSSManagerTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/ietf/jgss/GSSManagerTest.java Mon Nov 27 21:51:19 2006
@@ -32,11 +32,6 @@
  * Tests GSSManager class
  */
 public class GSSManagerTest extends TestCase {
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(GSSManagerTest.class);
-    }
-
     /**
      * Tests loading of a default provider with valid class references.
      */

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/ietf/jgss/GSSNameTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/ietf/jgss/GSSNameTest.java?view=diff&rev=479918&r1=479917&r2=479918
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/ietf/jgss/GSSNameTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/ietf/jgss/GSSNameTest.java Mon Nov 27 21:51:19 2006
@@ -21,9 +21,7 @@
  */
 package org.ietf.jgss;
 
-import junit.framework.Test;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 /**
  * Tests GSSName interface
@@ -59,13 +57,4 @@
         Oid oid= new Oid("1.2.840.113554.1.2.1.1");
         assertTrue(oid.equals(GSSName.NT_USER_NAME));
     }
-    
-    public static Test suite() {
-        return new TestSuite(GSSNameTest.class);
-    }
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
-    }
-
 }

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/ietf/jgss/MessagePropTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/ietf/jgss/MessagePropTest.java?view=diff&rev=479918&r1=479917&r2=479918
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/ietf/jgss/MessagePropTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/ietf/jgss/MessagePropTest.java Mon Nov 27 21:51:19 2006
@@ -21,9 +21,7 @@
  */
 package org.ietf.jgss;
 
-import junit.framework.Test;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 /**
  * Tests MessageProp class
@@ -159,13 +157,4 @@
         String s= mp.getMinorString();
         assertEquals("minor string", s);
     }
-    
-    public static Test suite() {
-        return new TestSuite(MessagePropTest.class);
-    }
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
-    }
-
 }

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/ietf/jgss/OidTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/ietf/jgss/OidTest.java?view=diff&rev=479918&r1=479917&r2=479918
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/ietf/jgss/OidTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/ietf/jgss/OidTest.java Mon Nov 27 21:51:19 2006
@@ -21,11 +21,10 @@
 */
 package org.ietf.jgss;
 
-import junit.framework.Test;
+import java.io.ByteArrayInputStream;
+import java.util.Arrays;
+
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import java.util.*;
-import java.io.*;
 
 /**
  * Tests Oid class
@@ -313,13 +312,5 @@
             fail("No expected GSSException");
         } catch (GSSException e) {
         }
-    }
-
-    public static Test suite() {
-        return new TestSuite(OidTest.class);
-    }
-
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
     }
 }

Modified: harmony/enhanced/classlib/trunk/modules/auth/src/test/java/linux/org/apache/harmony/auth/module/UnixLoginModuleTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/linux/org/apache/harmony/auth/module/UnixLoginModuleTest.java?view=diff&rev=479918&r1=479917&r2=479918
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/auth/src/test/java/linux/org/apache/harmony/auth/module/UnixLoginModuleTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/auth/src/test/java/linux/org/apache/harmony/auth/module/UnixLoginModuleTest.java Mon Nov 27 21:51:19 2006
@@ -36,21 +36,12 @@
 /**
  * Unit test for UnixLoginModule
  */
+@SuppressWarnings("unchecked")
 public class UnixLoginModuleTest extends TestCase {
 
-    /**
-     * Standalone entry point.
-     * @param args
-     */
-    public static void main(String[] args) {
-        junit.textui.TestRunner.run(UnixLoginModuleTest.class);
-    }
-
     UnixLoginModule lm = new UnixLoginModule();
 
-    /*
-     * @see TestCase#setUp()
-     */
+    @Override
     protected void setUp() throws Exception {
         Subject subj = new Subject();
         CallbackHandler cbh = new TestCallbackHandler();



Mime
View raw message