harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r373789 [9/9] - in /incubator/harmony/enhanced/classlib/trunk/modules/security2/test: common/unit/java/security/ common/unit/java/security/cert/ common/unit/java/security/interfaces/ common/unit/java/security/spec/ common/unit/javax/crypto/...
Date Tue, 31 Jan 2006 11:04:50 GMT
Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/cert/CertificateExceptionTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/cert/CertificateExceptionTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/cert/CertificateExceptionTest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/cert/CertificateExceptionTest.java
Tue Jan 31 03:01:12 2006
@@ -23,14 +23,14 @@
 
 import javax.security.cert.CertificateException;
 
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
  * Tests for <code>DigestException</code> class constructors and methods.
  * 
  */
-public class CertificateExceptionTest extends PerformanceTest {
+public class CertificateExceptionTest extends TestCase {
 
     public static void main(String[] args) {
     }
@@ -78,7 +78,6 @@
      */
     public void testCertificateException01() {
         CertificateException tE = new CertificateException();
-        assertTrue(errNotExc, tE instanceof CertificateException);
         assertNull("getMessage() must return null.", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -97,8 +96,6 @@
         CertificateException tE;
         for (int i = 0; i < msgs.length; i++) {
             tE = new CertificateException(msgs[i]);
-            assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"),
-                    tE instanceof CertificateException);
             assertEquals("getMessage() must return: ".concat(msgs[i]), tE
                     .getMessage(), msgs[i]);
             assertNull("getCause() must return null", tE.getCause());
@@ -118,7 +115,6 @@
     public void testCertificateException03() {
         String msg = null;
         CertificateException tE = new CertificateException(msg);
-        assertTrue(errNotExc, tE instanceof CertificateException);
         assertNull("getMessage() must return null.", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -128,4 +124,4 @@
         }
     }
 
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/cert/CertificateExpiredExceptionTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/cert/CertificateExpiredExceptionTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/cert/CertificateExpiredExceptionTest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/cert/CertificateExpiredExceptionTest.java
Tue Jan 31 03:01:12 2006
@@ -23,14 +23,14 @@
 
 import javax.security.cert.CertificateExpiredException;
 
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
  * Tests for <code>DigestException</code> class constructors and methods.
  * 
  */
-public class CertificateExpiredExceptionTest extends PerformanceTest {
+public class CertificateExpiredExceptionTest extends TestCase {
 
     public static void main(String[] args) {
     }
@@ -78,7 +78,6 @@
      */
     public void testCertificateExpiredException01() {
         CertificateExpiredException tE = new CertificateExpiredException();
-        assertTrue(errNotExc, tE instanceof CertificateExpiredException);
         assertNull("getMessage() must return null.", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -97,8 +96,6 @@
         CertificateExpiredException tE;
         for (int i = 0; i < msgs.length; i++) {
             tE = new CertificateExpiredException(msgs[i]);
-            assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"),
-                    tE instanceof CertificateExpiredException);
             assertEquals("getMessage() must return: ".concat(msgs[i]), tE
                     .getMessage(), msgs[i]);
             assertNull("getCause() must return null", tE.getCause());
@@ -118,7 +115,6 @@
     public void testCertificateExpiredException03() {
         String msg = null;
         CertificateExpiredException tE = new CertificateExpiredException(msg);
-        assertTrue(errNotExc, tE instanceof CertificateExpiredException);
         assertNull("getMessage() must return null.", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -128,4 +124,4 @@
         }
     }
 
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/cert/CertificateNotYetValidExceptionTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/cert/CertificateNotYetValidExceptionTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/cert/CertificateNotYetValidExceptionTest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/cert/CertificateNotYetValidExceptionTest.java
Tue Jan 31 03:01:12 2006
@@ -23,14 +23,14 @@
 
 import javax.security.cert.CertificateNotYetValidException;
 
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
  * Tests for <code>DigestException</code> class constructors and methods.
  * 
  */
-public class CertificateNotYetValidExceptionTest extends PerformanceTest {
+public class CertificateNotYetValidExceptionTest extends TestCase {
 
     public static void main(String[] args) {
     }
@@ -80,7 +80,6 @@
      */
     public void testCertificateNotYetValidException01() {
         CertificateNotYetValidException tE = new CertificateNotYetValidException();
-        assertTrue(errNotExc, tE instanceof CertificateNotYetValidException);
         assertNull("getMessage() must return null.", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -99,8 +98,6 @@
         CertificateNotYetValidException tE;
         for (int i = 0; i < msgs.length; i++) {
             tE = new CertificateNotYetValidException(msgs[i]);
-            assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"),
-                    tE instanceof CertificateNotYetValidException);
             assertEquals("getMessage() must return: ".concat(msgs[i]), tE
                     .getMessage(), msgs[i]);
             assertNull("getCause() must return null", tE.getCause());
@@ -121,7 +118,6 @@
         String msg = null;
         CertificateNotYetValidException tE = new CertificateNotYetValidException(
                 msg);
-        assertTrue(errNotExc, tE instanceof CertificateNotYetValidException);
         assertNull("getMessage() must return null.", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -131,4 +127,4 @@
         }
     }
 
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/cert/CertificateParsingExceptionTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/cert/CertificateParsingExceptionTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/cert/CertificateParsingExceptionTest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/cert/CertificateParsingExceptionTest.java
Tue Jan 31 03:01:12 2006
@@ -23,14 +23,14 @@
 
 import javax.security.cert.CertificateParsingException;
 
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
  * Tests for <code>DigestException</code> class constructors and methods.
  * 
  */
-public class CertificateParsingExceptionTest extends PerformanceTest {
+public class CertificateParsingExceptionTest extends TestCase {
 
     public static void main(String[] args) {
     }
@@ -78,7 +78,6 @@
      */
     public void testCertificateParsingException01() {
         CertificateParsingException tE = new CertificateParsingException();
-        assertTrue(errNotExc, tE instanceof CertificateParsingException);
         assertNull("getMessage() must return null.", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -97,8 +96,6 @@
         CertificateParsingException tE;
         for (int i = 0; i < msgs.length; i++) {
             tE = new CertificateParsingException(msgs[i]);
-            assertTrue(errNotExc.concat(" (msg: ").concat(msgs[i]).concat(")"),
-                    tE instanceof CertificateParsingException);
             assertEquals("getMessage() must return: ".concat(msgs[i]), tE
                     .getMessage(), msgs[i]);
             assertNull("getCause() must return null", tE.getCause());
@@ -118,7 +115,6 @@
     public void testCertificateParsingException03() {
         String msg = null;
         CertificateParsingException tE = new CertificateParsingException(msg);
-        assertTrue(errNotExc, tE instanceof CertificateParsingException);
         assertNull("getMessage() must return null.", tE.getMessage());
         assertNull("getCause() must return null", tE.getCause());
         try {
@@ -128,4 +124,4 @@
         }
     }
 
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/AuthenticationExceptionTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/AuthenticationExceptionTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/AuthenticationExceptionTest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/AuthenticationExceptionTest.java
Tue Jan 31 03:01:12 2006
@@ -21,13 +21,13 @@
 
 package javax.security.sasl;
 
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 /**
  * Tests for constructors and methods of AuthenticationException class
  * 
  */
-public class AuthenticationExceptionTest extends PerformanceTest {
+public class AuthenticationExceptionTest extends TestCase {
 
     public static void main(String[] args) {
         junit.textui.TestRunner.run(AuthenticationExceptionTest.class);
@@ -232,4 +232,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/AuthorizeCallbackTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/AuthorizeCallbackTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/AuthorizeCallbackTest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/AuthorizeCallbackTest.java
Tue Jan 31 03:01:12 2006
@@ -21,14 +21,14 @@
 
 package javax.security.sasl;
 
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 /**
  * Tests for constructor and methods of AuthorizeCallback class
  * 
  */
 
-public class AuthorizeCallbackTest extends PerformanceTest {
+public class AuthorizeCallbackTest extends TestCase {
 
     public static void main(String[] args) {
         junit.textui.TestRunner.run(AuthorizeCallbackTest.class);
@@ -118,4 +118,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/RealmCallbackTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/RealmCallbackTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/RealmCallbackTest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/RealmCallbackTest.java
Tue Jan 31 03:01:12 2006
@@ -21,7 +21,7 @@
 
 package javax.security.sasl;
 
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 ;
 
 /**
@@ -29,7 +29,7 @@
  * 
  */
 
-public class RealmCallbackTest extends PerformanceTest {
+public class RealmCallbackTest extends TestCase {
 
     public static void main(String[] args) {
         junit.textui.TestRunner.run(RealmCallbackTest.class);
@@ -147,4 +147,4 @@
             assertNull("Not null text", rCB.getText());
         }
         }
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/RealmChoiceCallbackTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/RealmChoiceCallbackTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/RealmChoiceCallbackTest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/RealmChoiceCallbackTest.java
Tue Jan 31 03:01:12 2006
@@ -21,14 +21,14 @@
 
 package javax.security.sasl;
 
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 /**
  * Tests for constructor and methods ofRealmChoiceCallback class 
  * 
  */
 
-public class RealmChoiceCallbackTest extends PerformanceTest {
+public class RealmChoiceCallbackTest extends TestCase {
 
     public static void main(String[] args) {
         junit.textui.TestRunner.run(RealmChoiceCallbackTest.class);
@@ -195,4 +195,4 @@
             assertNull("Incorrect indexes array", rCCB.getSelectedIndexes());
         }
     }
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/SaslExceptionTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/SaslExceptionTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/SaslExceptionTest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/SaslExceptionTest.java
Tue Jan 31 03:01:12 2006
@@ -22,13 +22,13 @@
 package javax.security.sasl;
 
 
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 /**
  * Tests for constructors and methods of SaslException class
  * 
  */
-public class SaslExceptionTest extends PerformanceTest {
+public class SaslExceptionTest extends TestCase {
 
     public static void main(String[] args) {
         junit.textui.TestRunner.run(SaslExceptionTest.class);
@@ -340,4 +340,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/SaslTest1.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/SaslTest1.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/SaslTest1.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/SaslTest1.java
Tue Jan 31 03:01:12 2006
@@ -26,14 +26,14 @@
 import java.security.Security;
 import java.util.Enumeration;
 
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 /**
  * Test for Sasl class
  * 
  */
 
-public class SaslTest1 extends PerformanceTest {
+public class SaslTest1 extends TestCase {
 
     public static void main(String[] args) {
         junit.textui.TestRunner.run(SaslTest1.class);
@@ -101,4 +101,4 @@
         assertFalse("List of SaslServerFactories should not have elements", en
                 .hasMoreElements());
     }
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/SaslTest2.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/SaslTest2.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/SaslTest2.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/SaslTest2.java
Tue Jan 31 03:01:12 2006
@@ -27,7 +27,7 @@
 import javax.security.auth.callback.CallbackHandler;
 
 import org.apache.harmony.security.SpiEngUtils;
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 import java.util.Enumeration;
 import java.util.Map;
@@ -37,7 +37,7 @@
  * 
  */
 
-public class SaslTest2 extends PerformanceTest {
+public class SaslTest2 extends TestCase {
 
     public static void main(String[] args) {
         junit.textui.TestRunner.run(SaslTest2.class);
@@ -581,4 +581,4 @@
             String srvName, Map prop, CallbackHandler ch) throws SaslException {
         return null;
     }
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/SaslTest3.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/SaslTest3.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/SaslTest3.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/SaslTest3.java
Tue Jan 31 03:01:12 2006
@@ -35,14 +35,14 @@
 import javax.security.auth.callback.UnsupportedCallbackException;
 
 import org.apache.harmony.security.SpiEngUtils;
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 /**
  * Test for Sasl class
  * 
  */
 
-public class SaslTest3 extends PerformanceTest {
+public class SaslTest3 extends TestCase {
     private static final String CLNTSRV = "SaslClientFactory.";
 
     private static final String fClientClass = "javax.security.sasl.mySaslClientFactory";
@@ -435,4 +435,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/SaslTest4.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/SaslTest4.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/SaslTest4.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/javax/security/sasl/SaslTest4.java
Tue Jan 31 03:01:12 2006
@@ -32,14 +32,14 @@
 import javax.security.auth.callback.UnsupportedCallbackException;
 
 import org.apache.harmony.security.SpiEngUtils;
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 /**
  * Test for Sasl class
  * 
  */
 
-public class SaslTest4 extends PerformanceTest {
+public class SaslTest4 extends TestCase {
     private static final String SRVSSRV = "SaslServerFactory.";
 
     private static final String fServerClass = "javax.security.sasl.mySaslServerFactory";
@@ -389,4 +389,4 @@
         }
         return new mySaslServer();
     }
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/DefaultPolicyScannerTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/DefaultPolicyScannerTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/DefaultPolicyScannerTest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/DefaultPolicyScannerTest.java
Tue Jan 31 03:01:12 2006
@@ -31,7 +31,7 @@
 import java.util.List;
 
 import org.apache.harmony.security.DefaultPolicyScanner;
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
@@ -39,7 +39,7 @@
  * 
  */
 
-public class DefaultPolicyScannerTest extends PerformanceTest {
+public class DefaultPolicyScannerTest extends TestCase {
     
     public static void main(String[] args) {
         junit.textui.TestRunner.run(DefaultPolicyScannerTest.class);
@@ -582,4 +582,4 @@
             assertEquals(IO_ERROR, ok.getMessage());
         }
     }
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/PolicyEntryTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/PolicyEntryTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/PolicyEntryTest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/PolicyEntryTest.java
Tue Jan 31 03:01:12 2006
@@ -35,7 +35,7 @@
 
 import org.apache.harmony.security.PolicyEntry;
 import org.apache.harmony.security.UnresolvedPrincipal;
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
@@ -43,7 +43,7 @@
  * 
  */
 
-public class PolicyEntryTest extends PerformanceTest {
+public class PolicyEntryTest extends TestCase {
 
     /** 
      * Tests constructor and accessors of PolicyEntry 
@@ -112,4 +112,4 @@
         assertFalse(pe.impliesPrincipals(pp1));
         assertTrue(pe.impliesPrincipals(pp3));
     }
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/SystemScopeTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/SystemScopeTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/SystemScopeTest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/SystemScopeTest.java
Tue Jan 31 03:01:12 2006
@@ -26,7 +26,7 @@
 import java.util.Enumeration;
 
 import org.apache.harmony.security.SystemScope;
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
@@ -34,7 +34,7 @@
  * 
  */
 
-public class SystemScopeTest extends PerformanceTest {
+public class SystemScopeTest extends TestCase {
 
     public static void main(String[] args) {
         junit.textui.TestRunner.run(SystemScopeTest.class);

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/UnresolvedPrincipalTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/UnresolvedPrincipalTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/UnresolvedPrincipalTest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/UnresolvedPrincipalTest.java
Tue Jan 31 03:01:12 2006
@@ -23,7 +23,7 @@
 import java.security.Principal;
 
 import org.apache.harmony.security.UnresolvedPrincipal;
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
@@ -31,7 +31,7 @@
  * 
  */
 
-public class UnresolvedPrincipalTest extends PerformanceTest {
+public class UnresolvedPrincipalTest extends TestCase {
 
     public static void main(String[] args) {
         junit.textui.TestRunner.run(UnresolvedPrincipalTest.class);
@@ -115,4 +115,4 @@
     public String getName() {
         return name;
     }
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/fortress/DefaultPolicyParserTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/fortress/DefaultPolicyParserTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/fortress/DefaultPolicyParserTest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/fortress/DefaultPolicyParserTest.java
Tue Jan 31 03:01:12 2006
@@ -33,7 +33,7 @@
 
 import org.apache.harmony.security.PolicyEntry;
 import org.apache.harmony.security.fortress.DefaultPolicyParser;
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
@@ -41,7 +41,7 @@
  * 
  */
 
-public class DefaultPolicyParserTest extends PerformanceTest {
+public class DefaultPolicyParserTest extends TestCase {
 
     public static void main(String[] args) {
         junit.textui.TestRunner.run(DefaultPolicyParserTest.class);

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/fortress/DefaultPolicyTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/fortress/DefaultPolicyTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/fortress/DefaultPolicyTest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/fortress/DefaultPolicyTest.java
Tue Jan 31 03:01:12 2006
@@ -38,14 +38,14 @@
 import org.apache.harmony.security.UnresolvedPrincipal;
 import org.apache.harmony.security.fortress.DefaultPolicy;
 import org.apache.harmony.security.fortress.DefaultPolicyParser;
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
  * Tests for DefaultPolicy
  * 
  */
-public class DefaultPolicyTest extends PerformanceTest {
+public class DefaultPolicyTest extends TestCase {
 
     public static void main(String[] args) {
         junit.textui.TestRunner.run(DefaultPolicyTest.class);

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/fortress/EngineTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/fortress/EngineTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/fortress/EngineTest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/fortress/EngineTest.java
Tue Jan 31 03:01:12 2006
@@ -27,14 +27,14 @@
 
 import org.apache.harmony.security.fortress.Engine;
 import org.apache.harmony.security.fortress.Services;
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
  *
  * Tests for Engine
  */
-public class EngineTest extends PerformanceTest {
+public class EngineTest extends TestCase {
 
 	protected void tearDown() throws Exception {
 		super.tearDown();

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/fortress/PolicyUtilsTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/fortress/PolicyUtilsTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/fortress/PolicyUtilsTest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/fortress/PolicyUtilsTest.java
Tue Jan 31 03:01:12 2006
@@ -36,7 +36,7 @@
 import java.util.Properties;
 
 import org.apache.harmony.security.fortress.PolicyUtils;
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
@@ -44,7 +44,7 @@
  * 
  */
 
-public class PolicyUtilsTest extends PerformanceTest {
+public class PolicyUtilsTest extends TestCase {
 
     /** Tests valid expansion of ${key} entries. */
     public void testExpand() throws Exception {
@@ -327,4 +327,4 @@
         assertFalse(PolicyUtils.matchSubset(new Object[] { "1", null },
                 new Object[] { "3", "2", }));
     }
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/fortress/ServicesTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/fortress/ServicesTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/fortress/ServicesTest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/fortress/ServicesTest.java
Tue Jan 31 03:01:12 2006
@@ -24,14 +24,14 @@
 import java.security.Provider;
 
 import org.apache.harmony.security.fortress.Services;
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
  *
  * Tests for Services
  */
-public class ServicesTest extends PerformanceTest {
+public class ServicesTest extends TestCase {
 
 	public void testInitServiceInfo() {
 		Provider p = new MyProvider();

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/test/SecurityTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/test/SecurityTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/test/SecurityTest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/test/SecurityTest.java
Tue Jan 31 03:01:12 2006
@@ -41,6 +41,8 @@
 import javax.security.auth.SubjectTest.MyClass1;
 import javax.security.auth.SubjectTest.MyClass2;
 
+import junit.framework.TestCase;
+
 /**
  * Custom security manager 
  * 
@@ -49,7 +51,7 @@
  * 
  */
 
-public class SecurityTest extends PerformanceTest {
+public class SecurityTest extends TestCase {
 
     public static boolean testing = false;
 
@@ -1839,4 +1841,4 @@
             notEqual.add(new Object());
         }
     }
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/test/SerializationTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/test/SerializationTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/test/SerializationTest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/test/SerializationTest.java
Tue Jan 31 03:01:12 2006
@@ -32,6 +32,8 @@
 import java.io.ObjectOutputStream;
 import java.io.OutputStream;
 
+import junit.framework.TestCase;
+
 /**
  * Framework for serialization testing. Subclasses only need to override
  * getData() method and, optionally, assertDeserialized() method. The first one
@@ -51,7 +53,18 @@
  * <b>&quot;TEST_SRC_DIR&quot; </b> system property.
  * 
  */
-public abstract class SerializationTest extends PerformanceTest {
+public abstract class SerializationTest extends TestCase {
+
+    /**
+     * Property name for the testing mode.
+     */
+    public static final String MODE_KEY = "test.mode";
+
+
+    /**
+     * Testing mode.
+     */
+    public static String mode = System.getProperty(MODE_KEY);
 
     /**
      * Reference files generation mode switch.
@@ -202,4 +215,4 @@
         ois.close();
         return result;
     }
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/test/TestUtils.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/test/TestUtils.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/test/TestUtils.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/test/TestUtils.java
Tue Jan 31 03:01:12 2006
@@ -41,7 +41,7 @@
 
     /**
      * Prints byte array <code>data</code> as hex to the
-     * PerformanceTest log in the customizable form.
+     * <code>System.out</code> in the customizable form.
      *
      * @param perLine how many numbers put on single line
      * @param prefix custom output number prefix
@@ -57,39 +57,12 @@
             if (tail.length() == 1) {
                 tail = "0" + tail; 
             }
-            PerformanceTest.log(prefix + "0x" + tail + delimiter);
-
-            if (((i+1)%perLine) == 0) {
-                PerformanceTest.logln("");
-            }
-        }
-        PerformanceTest.logln("");
-    }
-
-    /**
-     * Prints byte array <code>data</code> as hex to the
-     * <code>System.out</code> in the customizable form.
-     *
-     * @param perLine how many numbers put on single line
-     * @param prefix custom output number prefix
-     * @param delimiter custom output number delimiter
-     * @param data data to be printed
-     */
-    public static void printAsHex1(int perLine,
-            String prefix,
-            String delimiter,
-            byte[] data) {
-        for (int i=0; i<data.length; i++) {
-            String tail = Integer.toHexString(0x000000ff & data[i]);
-            if (tail.length() == 1) {
-                tail = "0" + tail; 
-            }
             System.out.print(prefix + "0x" + tail + delimiter);
 
             if (((i+1)%perLine) == 0) {
-                System.out.println();
+                System.out.println("");
             }
         }
-        System.out.println();
+        System.out.println("");
     }
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/x/crypto/NullCipherSpiTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/x/crypto/NullCipherSpiTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/x/crypto/NullCipherSpiTest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/x/crypto/NullCipherSpiTest.java
Tue Jan 31 03:01:12 2006
@@ -25,7 +25,7 @@
 
 import javax.crypto.ShortBufferException;
 
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 import org.apache.harmony.security.x.crypto.NullCipherSpi;
 
 
@@ -33,7 +33,7 @@
  *
  * Tests for NullCipher implementation
  */
-public class NullCipherSpiTest extends PerformanceTest {
+public class NullCipherSpiTest extends TestCase {
 
 	public void testEngineGetBlockSize() {
 		NullCipherSpi spi = new NullCipherSpi();

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/x/security/auth/login/DefaultConfigParserTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/x/security/auth/login/DefaultConfigParserTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/x/security/auth/login/DefaultConfigParserTest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/x/security/auth/login/DefaultConfigParserTest.java
Tue Jan 31 03:01:12 2006
@@ -34,7 +34,7 @@
 
 import javax.security.auth.login.AppConfigurationEntry;
 
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 import org.apache.harmony.security.x.security.auth.login.DefaultConfigurationParser;
 import org.apache.harmony.security.x.security.auth.login.DefaultConfigurationParser.InvalidFormatException;
 
@@ -43,7 +43,7 @@
  * Tests parser implementation for default configuration.
  */
 
-public class DefaultConfigParserTest extends PerformanceTest {
+public class DefaultConfigParserTest extends TestCase {
 
     static String outputPath = System.getProperty("TEST_SRC_DIR", "test/common/unit");
     
@@ -202,4 +202,4 @@
 		assertEquals("message", ife1.getMessage());
 	}
 	
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/x/security/auth/login/DefaultConfigurationTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/x/security/auth/login/DefaultConfigurationTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/x/security/auth/login/DefaultConfigurationTest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/apache/harmony/security/x/security/auth/login/DefaultConfigurationTest.java
Tue Jan 31 03:01:12 2006
@@ -33,7 +33,7 @@
 import javax.security.auth.AuthPermission;
 import javax.security.auth.login.AppConfigurationEntry;
 
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 import org.apache.harmony.security.x.security.auth.login.DefaultConfiguration;
 
 
@@ -41,7 +41,7 @@
  * Tests default configuration implementation.  
  */
 
-public class DefaultConfigurationTest extends PerformanceTest {
+public class DefaultConfigurationTest extends TestCase {
 
     static String outputPath = System.getProperty("TEST_SRC_DIR", "test/common/unit");
     
@@ -270,4 +270,4 @@
 		}
 	}
 	
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/ietf/jgss/GSSManagerTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/ietf/jgss/GSSManagerTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/ietf/jgss/GSSManagerTest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/common/unit/org/ietf/jgss/GSSManagerTest.java
Tue Jan 31 03:01:12 2006
@@ -24,13 +24,13 @@
 import java.security.Provider;
 import java.security.Security;
 
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 
 
 /**
  * Tests GSSManager class
  */
-public class GSSManagerTest extends PerformanceTest {
+public class GSSManagerTest extends TestCase {
 
     public static void main(String[] args) {
         junit.textui.TestRunner.run(GSSManagerTest.class);
@@ -150,4 +150,4 @@
             return null;
         }
     }
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/linux/unit/org/apache/harmony/security/x/security/auth/module/UnixLoginModuleTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/linux/unit/org/apache/harmony/security/x/security/auth/module/UnixLoginModuleTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/linux/unit/org/apache/harmony/security/x/security/auth/module/UnixLoginModuleTest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/linux/unit/org/apache/harmony/security/x/security/auth/module/UnixLoginModuleTest.java
Tue Jan 31 03:01:12 2006
@@ -28,14 +28,14 @@
 import javax.security.auth.callback.Callback;
 import javax.security.auth.login.LoginException;
 
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 import org.apache.harmony.security.x.security.auth.module.UnixLoginModule;
 
 
 /**
  * Unit test for UnixLoginModule
  */
-public class UnixLoginModuleTest extends PerformanceTest {
+public class UnixLoginModuleTest extends TestCase {
 
     /**
      * Standalone entry point.
@@ -122,4 +122,4 @@
         lm.logout();
     }
 
-}
\ No newline at end of file
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/test/windows/unit/org/apache/harmony/security/x/security/auth/module/NTLoginModuleTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/test/windows/unit/org/apache/harmony/security/x/security/auth/module/NTLoginModuleTest.java?rev=373789&r1=373788&r2=373789&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security2/test/windows/unit/org/apache/harmony/security/x/security/auth/module/NTLoginModuleTest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security2/test/windows/unit/org/apache/harmony/security/x/security/auth/module/NTLoginModuleTest.java
Tue Jan 31 03:01:12 2006
@@ -28,14 +28,14 @@
 import javax.security.auth.callback.Callback;
 import javax.security.auth.login.LoginException;
 
-import org.apache.harmony.security.test.PerformanceTest;
+import junit.framework.TestCase;
 import org.apache.harmony.security.x.security.auth.module.NTLoginModule;
 
 
 /**
  * Unit test for NTLoginModule
  */
-public class NTLoginModuleTest extends PerformanceTest {
+public class NTLoginModuleTest extends TestCase {
 
     /**
      * Standalone entry point.
@@ -122,4 +122,4 @@
         lm.logout();
     }
 
-}
\ No newline at end of file
+}



Mime
View raw message