harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mloe...@apache.org
Subject svn commit: r410788 [2/13] - in /incubator/harmony/enhanced/classlib/trunk/modules: auth/make/common/ auth/src/test/java/common/javax/security/auth/ auth/src/test/java/common/javax/security/auth/callback/serialization/ auth/src/test/java/common/javax/s...
Date Thu, 01 Jun 2006 08:15:44 GMT

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/build.xml?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/make/common/build.xml Thu Jun  1 01:15:17 2006
@@ -72,7 +72,7 @@
             <src>
                 <pathelement location="${hy.auth.src.test.java}"/>
                 <pathelement location="${hy.auth.src.test.java.platform}"/>
-                <pathelement location="${hy.auth}/../security/src/test/java/common"/>
+                <pathelement location="${hy.auth}/../security/src/test/support/common/java"/>
             </src>
 
             <include name="javax/security/auth/**/*Test*.java" />
@@ -112,7 +112,7 @@
             <!-- Note: will be deleted after improving             -->
             <!-- SerializationTest support class: all resource     -->
             <!-- files will be placed on the classpath             -->
-            <jvmarg value="-DTEST_SRC_DIR=${hy.auth.src.test.java}"/>
+            <jvmarg value="-DRESOURCE_DIR=${hy.auth.src.test.java}"/>
 
             <!-- to pick up junit.jar -->
             <jvmarg value="-Xbootclasspath/a:${hy.auth.bin.test}${path.separator}../../../../${junit.jar}"/>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/PolicyTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/PolicyTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/PolicyTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/PolicyTest.java Thu Jun  1 01:15:17 2006
@@ -35,8 +35,8 @@
 
 import junit.framework.TestCase;
 
-import org.apache.harmony.security.support.SecurityChecker;
-import org.apache.harmony.security.support.TestUtils;
+import org.apache.harmony.security.tests.support.SecurityChecker;
+import org.apache.harmony.security.tests.support.TestUtils;
 
 
 /**
@@ -169,7 +169,7 @@
     //
     //
 
-    static String outputPath = System.getProperty("TEST_SRC_DIR", "test"
+    static String outputPath = System.getProperty("RESOURCE_DIR", "test"
             + File.separator + "common" + File.separator + "unit");
 
     static String inputFile1 = outputPath + File.separator + "javax"

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerChoiceCallbackTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerChoiceCallbackTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerChoiceCallbackTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerChoiceCallbackTest.java Thu Jun  1 01:15:17 2006
@@ -23,7 +23,7 @@
 
 import javax.security.auth.callback.ChoiceCallback;
 
-import org.apache.harmony.security.support.SerializationTest;
+import org.apache.harmony.security.tests.support.SerializationTest;
 
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerConfirmationCallbackTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerConfirmationCallbackTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerConfirmationCallbackTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerConfirmationCallbackTest.java Thu Jun  1 01:15:17 2006
@@ -23,7 +23,7 @@
 
 import javax.security.auth.callback.ConfirmationCallback;
 
-import org.apache.harmony.security.support.SerializationTest;
+import org.apache.harmony.security.tests.support.SerializationTest;
 
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerLanguageCallbackTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerLanguageCallbackTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerLanguageCallbackTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerLanguageCallbackTest.java Thu Jun  1 01:15:17 2006
@@ -24,7 +24,7 @@
 import java.util.Locale;
 import javax.security.auth.callback.LanguageCallback;
 
-import org.apache.harmony.security.support.SerializationTest;
+import org.apache.harmony.security.tests.support.SerializationTest;
 
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerNameCallbackTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerNameCallbackTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerNameCallbackTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerNameCallbackTest.java Thu Jun  1 01:15:17 2006
@@ -23,7 +23,7 @@
 
 import javax.security.auth.callback.NameCallback;
 
-import org.apache.harmony.security.support.SerializationTest;
+import org.apache.harmony.security.tests.support.SerializationTest;
 
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerPasswordCallbackTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerPasswordCallbackTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerPasswordCallbackTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerPasswordCallbackTest.java Thu Jun  1 01:15:17 2006
@@ -23,7 +23,7 @@
 
 import javax.security.auth.callback.PasswordCallback;
 
-import org.apache.harmony.security.support.SerializationTest;
+import org.apache.harmony.security.tests.support.SerializationTest;
 
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerTextInputCallbackTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerTextInputCallbackTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerTextInputCallbackTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerTextInputCallbackTest.java Thu Jun  1 01:15:17 2006
@@ -23,7 +23,7 @@
 
 import javax.security.auth.callback.TextInputCallback;
 
-import org.apache.harmony.security.support.SerializationTest;
+import org.apache.harmony.security.tests.support.SerializationTest;
 
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerTextOutputCallbackTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerTextOutputCallbackTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerTextOutputCallbackTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerTextOutputCallbackTest.java Thu Jun  1 01:15:17 2006
@@ -23,7 +23,7 @@
 
 import javax.security.auth.callback.TextOutputCallback;
 
-import org.apache.harmony.security.support.SerializationTest;
+import org.apache.harmony.security.tests.support.SerializationTest;
 
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerUnsupportedCallbackExceptionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerUnsupportedCallbackExceptionTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerUnsupportedCallbackExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/callback/serialization/SerUnsupportedCallbackExceptionTest.java Thu Jun  1 01:15:17 2006
@@ -24,7 +24,7 @@
 import javax.security.auth.callback.LanguageCallback;
 import javax.security.auth.callback.UnsupportedCallbackException;
 
-import org.apache.harmony.security.support.SerializationTest;
+import org.apache.harmony.security.tests.support.SerializationTest;
 
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/kerberos/serialization/DelegationPermissionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/kerberos/serialization/DelegationPermissionTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/kerberos/serialization/DelegationPermissionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/kerberos/serialization/DelegationPermissionTest.java Thu Jun  1 01:15:17 2006
@@ -23,7 +23,7 @@
 
 import javax.security.auth.kerberos.DelegationPermission;
 
-import org.apache.harmony.security.support.SerializationTest;
+import org.apache.harmony.security.tests.support.SerializationTest;
 
 
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/kerberos/serialization/KrbDelegationPermissionCollectionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/kerberos/serialization/KrbDelegationPermissionCollectionTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/kerberos/serialization/KrbDelegationPermissionCollectionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/kerberos/serialization/KrbDelegationPermissionCollectionTest.java Thu Jun  1 01:15:17 2006
@@ -29,7 +29,7 @@
 
 import javax.security.auth.kerberos.DelegationPermission;
 
-import org.apache.harmony.security.support.SerializationTest;
+import org.apache.harmony.security.tests.support.SerializationTest;
 
 
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/kerberos/serialization/KrbServicePermissionCollectionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/kerberos/serialization/KrbServicePermissionCollectionTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/kerberos/serialization/KrbServicePermissionCollectionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/kerberos/serialization/KrbServicePermissionCollectionTest.java Thu Jun  1 01:15:17 2006
@@ -29,7 +29,7 @@
 
 import javax.security.auth.kerberos.ServicePermission;
 
-import org.apache.harmony.security.support.SerializationTest;
+import org.apache.harmony.security.tests.support.SerializationTest;
 
 /**
  * Serialization test for KrbServicePermissionCollection class

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/kerberos/serialization/ServicePermissionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/kerberos/serialization/ServicePermissionTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/kerberos/serialization/ServicePermissionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/kerberos/serialization/ServicePermissionTest.java Thu Jun  1 01:15:17 2006
@@ -23,7 +23,7 @@
 
 import javax.security.auth.kerberos.ServicePermission;
 
-import org.apache.harmony.security.support.SerializationTest;
+import org.apache.harmony.security.tests.support.SerializationTest;
 
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerAccountExceptionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerAccountExceptionTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerAccountExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerAccountExceptionTest.java Thu Jun  1 01:15:17 2006
@@ -24,7 +24,7 @@
 
 import javax.security.auth.login.AccountException;
 
-import org.apache.harmony.security.support.SerializationTest;
+import org.apache.harmony.security.tests.support.SerializationTest;
 
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerAccountExpiredExceptionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerAccountExpiredExceptionTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerAccountExpiredExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerAccountExpiredExceptionTest.java Thu Jun  1 01:15:17 2006
@@ -23,7 +23,7 @@
 
 import javax.security.auth.login.AccountExpiredException;
 
-import org.apache.harmony.security.support.SerializationTest;
+import org.apache.harmony.security.tests.support.SerializationTest;
 
 /**
  * Serialization test for AccountExpiredException class

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerAccountLockedExceptionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerAccountLockedExceptionTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerAccountLockedExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerAccountLockedExceptionTest.java Thu Jun  1 01:15:17 2006
@@ -23,7 +23,7 @@
 
 import javax.security.auth.login.AccountLockedException;
 
-import org.apache.harmony.security.support.SerializationTest;
+import org.apache.harmony.security.tests.support.SerializationTest;
 
 
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerAccountNotFoundExceptionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerAccountNotFoundExceptionTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerAccountNotFoundExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerAccountNotFoundExceptionTest.java Thu Jun  1 01:15:17 2006
@@ -23,7 +23,7 @@
 
 import javax.security.auth.login.AccountNotFoundException;
 
-import org.apache.harmony.security.support.SerializationTest;
+import org.apache.harmony.security.tests.support.SerializationTest;
 
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerCredentialExceptionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerCredentialExceptionTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerCredentialExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerCredentialExceptionTest.java Thu Jun  1 01:15:17 2006
@@ -24,7 +24,7 @@
 
 import javax.security.auth.login.CredentialException;
 
-import org.apache.harmony.security.support.SerializationTest;
+import org.apache.harmony.security.tests.support.SerializationTest;
 
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerCredentialExpiredExceptionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerCredentialExpiredExceptionTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerCredentialExpiredExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerCredentialExpiredExceptionTest.java Thu Jun  1 01:15:17 2006
@@ -23,7 +23,7 @@
 
 import javax.security.auth.login.CredentialExpiredException;
 
-import org.apache.harmony.security.support.SerializationTest;
+import org.apache.harmony.security.tests.support.SerializationTest;
 
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerCredentialNotFoundExceptionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerCredentialNotFoundExceptionTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerCredentialNotFoundExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerCredentialNotFoundExceptionTest.java Thu Jun  1 01:15:17 2006
@@ -23,7 +23,7 @@
 
 import javax.security.auth.login.CredentialNotFoundException;
 
-import org.apache.harmony.security.support.SerializationTest;
+import org.apache.harmony.security.tests.support.SerializationTest;
 
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerFailedLoginExceptionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerFailedLoginExceptionTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerFailedLoginExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerFailedLoginExceptionTest.java Thu Jun  1 01:15:17 2006
@@ -23,7 +23,7 @@
 
 import javax.security.auth.login.FailedLoginException;
 
-import org.apache.harmony.security.support.SerializationTest;
+import org.apache.harmony.security.tests.support.SerializationTest;
 
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerLoginExceptionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerLoginExceptionTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerLoginExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/login/serialization/SerLoginExceptionTest.java Thu Jun  1 01:15:17 2006
@@ -23,7 +23,7 @@
 
 import javax.security.auth.login.LoginException;
 
-import org.apache.harmony.security.support.SerializationTest;
+import org.apache.harmony.security.tests.support.SerializationTest;
 
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/serialization/SerAuthPermissionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/serialization/SerAuthPermissionTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/serialization/SerAuthPermissionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/serialization/SerAuthPermissionTest.java Thu Jun  1 01:15:17 2006
@@ -23,7 +23,7 @@
 
 import javax.security.auth.AuthPermission;
 
-import org.apache.harmony.security.support.SerializationTest;
+import org.apache.harmony.security.tests.support.SerializationTest;
 
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/serialization/SerDestroyFailedExceptionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/serialization/SerDestroyFailedExceptionTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/serialization/SerDestroyFailedExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/serialization/SerDestroyFailedExceptionTest.java Thu Jun  1 01:15:17 2006
@@ -23,7 +23,7 @@
 
 import javax.security.auth.DestroyFailedException;
 
-import org.apache.harmony.security.support.SerializationTest;
+import org.apache.harmony.security.tests.support.SerializationTest;
 
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/serialization/SerPrivateCredentialPermissionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/serialization/SerPrivateCredentialPermissionTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/serialization/SerPrivateCredentialPermissionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/serialization/SerPrivateCredentialPermissionTest.java Thu Jun  1 01:15:17 2006
@@ -23,7 +23,7 @@
 
 import javax.security.auth.PrivateCredentialPermission;
 
-import org.apache.harmony.security.support.SerializationTest;
+import org.apache.harmony.security.tests.support.SerializationTest;
 
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/serialization/SerRefreshFailedExceptionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/serialization/SerRefreshFailedExceptionTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/serialization/SerRefreshFailedExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/serialization/SerRefreshFailedExceptionTest.java Thu Jun  1 01:15:17 2006
@@ -24,7 +24,7 @@
 
 import javax.security.auth.RefreshFailedException;
 
-import org.apache.harmony.security.support.SerializationTest;
+import org.apache.harmony.security.tests.support.SerializationTest;
 
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/serialization/SubjectTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/serialization/SubjectTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/serialization/SubjectTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/serialization/SubjectTest.java Thu Jun  1 01:15:17 2006
@@ -23,7 +23,7 @@
 
 import javax.security.auth.Subject;
 
-import org.apache.harmony.security.support.SerializationTest;
+import org.apache.harmony.security.tests.support.SerializationTest;
 
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/x500/X500PrincipalTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/x500/X500PrincipalTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/x500/X500PrincipalTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/x500/X500PrincipalTest.java Thu Jun  1 01:15:17 2006
@@ -48,7 +48,7 @@
 
     private boolean testing = false;
 
-    static String outputPath = System.getProperty("TEST_SRC_DIR",
+    static String outputPath = System.getProperty("RESOURCE_DIR",
             "test/common/unit");
 
     static String inputFile = outputPath + File.separator + "javax"

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/x500/serialization/X500PrincipalTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/x500/serialization/X500PrincipalTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/x500/serialization/X500PrincipalTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/auth/x500/serialization/X500PrincipalTest.java Thu Jun  1 01:15:17 2006
@@ -24,7 +24,7 @@
 
 import javax.security.auth.x500.X500Principal; 
 
-import org.apache.harmony.security.support.SerializationTest;
+import org.apache.harmony.security.tests.support.SerializationTest;
 
 /**
  * Serialization test for X500Principal class

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/Sasl2Test.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/Sasl2Test.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/Sasl2Test.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/Sasl2Test.java Thu Jun  1 01:15:17 2006
@@ -26,7 +26,8 @@
 import java.security.Security;
 import javax.security.auth.callback.CallbackHandler;
 
-import org.apache.harmony.security.SpiEngUtils;
+import org.apache.harmony.security.tests.support.SpiEngUtils;
+
 import junit.framework.TestCase;
 
 import java.util.Enumeration;

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/Sasl3Test.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/Sasl3Test.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/Sasl3Test.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/Sasl3Test.java Thu Jun  1 01:15:17 2006
@@ -34,7 +34,8 @@
 import javax.security.auth.callback.TextOutputCallback;
 import javax.security.auth.callback.UnsupportedCallbackException;
 
-import org.apache.harmony.security.SpiEngUtils;
+import org.apache.harmony.security.tests.support.SpiEngUtils;
+
 import junit.framework.TestCase;
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/Sasl4Test.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/Sasl4Test.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/Sasl4Test.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/Sasl4Test.java Thu Jun  1 01:15:17 2006
@@ -31,7 +31,8 @@
 import javax.security.auth.callback.TextOutputCallback;
 import javax.security.auth.callback.UnsupportedCallbackException;
 
-import org.apache.harmony.security.SpiEngUtils;
+import org.apache.harmony.security.tests.support.SpiEngUtils;
+
 import junit.framework.TestCase;
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/serialization/AuthenticationExceptionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/serialization/AuthenticationExceptionTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/serialization/AuthenticationExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/serialization/AuthenticationExceptionTest.java Thu Jun  1 01:15:17 2006
@@ -23,7 +23,7 @@
 
 import javax.security.sasl.AuthenticationException;
 
-import org.apache.harmony.security.support.SerializationTest;
+import org.apache.harmony.security.tests.support.SerializationTest;
 
 /**
  * Test for AuthoricationException seialization

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/serialization/AuthorizeCallbackTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/serialization/AuthorizeCallbackTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/serialization/AuthorizeCallbackTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/serialization/AuthorizeCallbackTest.java Thu Jun  1 01:15:17 2006
@@ -23,7 +23,7 @@
 
 import javax.security.sasl.AuthorizeCallback;
 
-import org.apache.harmony.security.support.SerializationTest;
+import org.apache.harmony.security.tests.support.SerializationTest;
 
 /**
  * Test for AuthorizeCallback seialization

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/serialization/RealmCallbackTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/serialization/RealmCallbackTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/serialization/RealmCallbackTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/serialization/RealmCallbackTest.java Thu Jun  1 01:15:17 2006
@@ -23,7 +23,7 @@
 
 import javax.security.sasl.RealmCallback;
 
-import org.apache.harmony.security.support.SerializationTest;
+import org.apache.harmony.security.tests.support.SerializationTest;
 
 /**
  * Test for RealmCallback seialization

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/serialization/RealmChoiceCallbackTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/serialization/RealmChoiceCallbackTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/serialization/RealmChoiceCallbackTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/serialization/RealmChoiceCallbackTest.java Thu Jun  1 01:15:17 2006
@@ -23,7 +23,7 @@
 
 import javax.security.sasl.RealmChoiceCallback;
 
-import org.apache.harmony.security.support.SerializationTest;
+import org.apache.harmony.security.tests.support.SerializationTest;
 
 /**
  * Test for RealmChoiceCallback seialization

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/serialization/SaslExceptionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/serialization/SaslExceptionTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/serialization/SaslExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/javax/security/sasl/serialization/SaslExceptionTest.java Thu Jun  1 01:15:17 2006
@@ -23,7 +23,7 @@
 
 import javax.security.sasl.SaslException;
 
-import org.apache.harmony.security.support.SerializationTest;
+import org.apache.harmony.security.tests.support.SerializationTest;
 
 /**
  * Test for SaslException seialization

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/login/DefaultConfigParserTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/login/DefaultConfigParserTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/login/DefaultConfigParserTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/login/DefaultConfigParserTest.java Thu Jun  1 01:15:17 2006
@@ -45,7 +45,7 @@
 
 public class DefaultConfigParserTest extends TestCase {
 
-    static String outputPath = System.getProperty("TEST_SRC_DIR", "test/common/unit");
+    static String outputPath = System.getProperty("RESOURCE_DIR", "test/common/unit");
     
     static String fconf = outputPath + File.separator + "org" + 
         File.separator + "apache" + File.separator + "harmony" + 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/login/DefaultConfigurationTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/login/DefaultConfigurationTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/login/DefaultConfigurationTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/auth/src/test/java/common/org/apache/harmony/auth/login/DefaultConfigurationTest.java Thu Jun  1 01:15:17 2006
@@ -35,7 +35,7 @@
 
 import junit.framework.TestCase;
 
-import org.apache.harmony.security.support.TestUtils;
+import org.apache.harmony.security.tests.support.TestUtils;
 import org.apache.harmony.auth.login.DefaultConfiguration;
 
 
@@ -47,7 +47,7 @@
 
     private static final String LOGIN_CONFIG = "java.security.auth.login.config";
     
-    static String outputPath = System.getProperty("TEST_SRC_DIR", "test/common/unit");
+    static String outputPath = System.getProperty("RESOURCE_DIR", "test/common/unit");
     
     static String otherConfFile = outputPath + File.separator + "org" + 
         File.separator + "apache" + File.separator + "harmony" + 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/make/common/build.xml Thu Jun  1 01:15:17 2006
@@ -52,7 +52,13 @@
 
         <compile-tests description="test support files" destdir="../../../../build/tests">
             <javac-elements>
-                <src path="${hy.crypto.src.test}/support/common/java"/>
+                <src>
+                    <pathelement location="${hy.crypto.src.test}/support/common/java"/>
+
+                    <!-- FIXME: CRYPTO tests should not reach into security module code -->
+                    <pathelement location="${hy.crypto}/../security/src/test/support/common/java"/>
+                </src>
+
                 <include name="**/*.java" />
             </javac-elements>
         </compile-tests>
@@ -60,15 +66,8 @@
 
         <compile-tests description="api tests" destdir="${hy.crypto.bin.test}/api">
             <javac-elements>
-                <!-- FIXME: CRYPTO tests should not reach into security module code -->
-                <src>
-                    <pathelement location="${hy.crypto.src.test}/api/java"/>
-                    <pathelement location="${hy.crypto}/../security/src/test/java/common"/>
-                </src>
-
-                <include name="javax/crypto/**/*Test.java" />
-                <include name="org/apache/harmony/crypto/**/*Test.java" />
-                <include name="org/apache/harmony/security/test/**/*" />
+                <src path="${hy.crypto.src.test}/api/java"/>
+                <include name="**/*Test.java" />
             </javac-elements>
         </compile-tests>
 
@@ -81,29 +80,15 @@
 
         <compile-tests description="impl injected tests" destdir="${hy.crypto.bin.test}/impl.injected">
             <javac-elements>
-                <!-- FIXME: CRYPTO tests should not reach into security module code -->
-                <src>
-                    <pathelement location="${hy.crypto.src.test}/impl/java.injected"/>
-                    <pathelement location="${hy.crypto}/../security/src/test/java/common"/>
-                </src>
-
-                <include name="javax/crypto/**/*Test.java" />
-                <include name="org/apache/harmony/crypto/**/*Test.java" />
-                <include name="org/apache/harmony/security/**/*" />
+                <src path="${hy.crypto.src.test}/impl/java.injected"/>
+                <include name="**/*Test.java" />
             </javac-elements>
         </compile-tests>
 
         <compile-tests description="impl tests" destdir="${hy.crypto.bin.test}/impl">
             <javac-elements>
-                <!-- FIXME: CRYPTO tests should not reach into security module code -->
-                <src>
-                	<pathelement location="${hy.crypto.src.test}/impl/java"/>
-                    <pathelement location="${hy.crypto}/../security/src/test/java/common"/>
-                </src>
-
-                <include name="javax/crypto/**/*Test.java" />
-                <include name="org/apache/harmony/crypto/**/*Test.java" />
-                <include name="org/apache/harmony/security/**/*" />
+                <src path="${hy.crypto.src.test}/impl/java"/>
+                <include name="**/*Test.java" />
             </javac-elements>
         </compile-tests>
     </target>
@@ -121,7 +106,7 @@
                 <!-- Note: will be deleted after improving             -->
                 <!-- SerializationTest support class: all resource     -->
                 <!-- files will be placed on the classpath             -->
-                <jvmarg value="-DTEST_SRC_DIR=${hy.crypto.src.test}/api/java"/>
+                <jvmarg value="-DRESOURCE_DIR=${hy.crypto.src.test}/api/java"/>
 
                 <classpath>
                     <pathelement path="${hy.crypto.bin.test}/api"/>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/CipherInputStreamTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/CipherInputStreamTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/CipherInputStreamTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/CipherInputStreamTest.java Thu Jun  1 01:15:17 2006
@@ -22,12 +22,9 @@
 package javax.crypto;
 
 import java.io.ByteArrayInputStream;
-import java.io.IOException;
 import javax.crypto.NullCipher;
 
-import junit.framework.Test;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 /**
  */

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/CipherOutputStreamTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/CipherOutputStreamTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/CipherOutputStreamTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/CipherOutputStreamTest.java Thu Jun  1 01:15:17 2006
@@ -22,13 +22,10 @@
 package javax.crypto;
 
 import java.io.ByteArrayOutputStream;
-import java.io.IOException;
 import java.util.Arrays;
 import javax.crypto.NullCipher;
 
-import junit.framework.Test;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 /**
  */

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/SealedObjectTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/SealedObjectTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/SealedObjectTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java.injected/javax/crypto/SealedObjectTest.java Thu Jun  1 01:15:17 2006
@@ -23,26 +23,17 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
 import java.security.Key;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
 import java.util.Arrays;
 import javax.crypto.Cipher;
-import javax.crypto.IllegalBlockSizeException;
 import javax.crypto.KeyGenerator;
-import javax.crypto.NoSuchPaddingException;
 import javax.crypto.NullCipher;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 
-import junit.framework.Test;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 /**
  */

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanismTest.java Thu Jun  1 01:15:17 2006
@@ -28,8 +28,9 @@
 import javax.crypto.ExemptionMechanismSpi;
 
 import org.apache.harmony.crypto.tests.support.MyExemptionMechanismSpi;
-import org.apache.harmony.security.SpiEngUtils;
-import org.apache.harmony.security.SpiEngUtils.MyProvider;
+import org.apache.harmony.security.tests.support.SpiEngUtils;
+import org.apache.harmony.security.tests.support.SpiEngUtils.MyProvider;
+
 import junit.framework.TestCase;
 /**
  * Tests for <code>ExemptionMechanism</code> class constructors and methods

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreementTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreementTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreementTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreementTest.java Thu Jun  1 01:15:17 2006
@@ -39,8 +39,8 @@
 import javax.crypto.spec.DHParameterSpec;
 
 import org.apache.harmony.crypto.tests.support.MyKeyAgreementSpi;
-import org.apache.harmony.security.SpiEngUtils;
-import org.apache.harmony.security.support.TestKeyPair;
+import org.apache.harmony.security.tests.support.SpiEngUtils;
+import org.apache.harmony.security.tests.support.TestKeyPair;
 
 import junit.framework.TestCase;
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/KeyGeneratorTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/KeyGeneratorTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/KeyGeneratorTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/KeyGeneratorTest.java Thu Jun  1 01:15:17 2006
@@ -34,7 +34,8 @@
 import javax.crypto.SecretKey;
 
 import org.apache.harmony.crypto.tests.support.MyKeyGeneratorSpi;
-import org.apache.harmony.security.SpiEngUtils;
+import org.apache.harmony.security.tests.support.SpiEngUtils;
+
 import junit.framework.TestCase;
 
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/MacTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/MacTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/MacTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/MacTest.java Thu Jun  1 01:15:17 2006
@@ -36,7 +36,8 @@
 import javax.crypto.spec.SecretKeySpec;
 
 import org.apache.harmony.crypto.tests.support.MyMacSpi;
-import org.apache.harmony.security.SpiEngUtils;
+import org.apache.harmony.security.tests.support.SpiEngUtils;
+
 import junit.framework.TestCase;
 
 import junit.framework.Test;

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyFactoryTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyFactoryTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyFactoryTest.java Thu Jun  1 01:15:17 2006
@@ -36,7 +36,8 @@
 import javax.crypto.spec.SecretKeySpec;
 
 import org.apache.harmony.crypto.tests.support.MySecretKeyFactorySpi;
-import org.apache.harmony.security.SpiEngUtils;
+import org.apache.harmony.security.tests.support.SpiEngUtils;
+
 import junit.framework.TestCase;
 
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/BadPaddingExceptionTest.java Thu Jun  1 01:15:17 2006
@@ -23,7 +23,7 @@
 
 import javax.crypto.BadPaddingException;
 
-import org.apache.harmony.security.support.SerializationTest;
+import org.apache.harmony.security.tests.support.SerializationTest;
 
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/ExemptionMechanismExceptionTest.java Thu Jun  1 01:15:17 2006
@@ -23,7 +23,7 @@
 
 import javax.crypto.ExemptionMechanismException;
 
-import org.apache.harmony.security.support.SerializationTest;
+import org.apache.harmony.security.tests.support.SerializationTest;
 
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/IllegalBlockSizeExceptionTest.java Thu Jun  1 01:15:17 2006
@@ -23,7 +23,7 @@
 
 import javax.crypto.IllegalBlockSizeException;
 
-import org.apache.harmony.security.support.SerializationTest;
+import org.apache.harmony.security.tests.support.SerializationTest;
 
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/NoSuchPaddingExceptionTest.java Thu Jun  1 01:15:17 2006
@@ -23,7 +23,7 @@
 
 import javax.crypto.NoSuchPaddingException;
 
-import org.apache.harmony.security.support.SerializationTest;
+import org.apache.harmony.security.tests.support.SerializationTest;
 
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/api/java/org/apache/harmony/crypto/tests/javax/crypto/serialization/ShortBufferExceptionTest.java Thu Jun  1 01:15:17 2006
@@ -23,7 +23,7 @@
 
 import javax.crypto.ShortBufferException;
 
-import org.apache.harmony.security.support.SerializationTest;
+import org.apache.harmony.security.tests.support.SerializationTest;
 
 
 /**

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/Cipher_ImplTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/Cipher_ImplTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/Cipher_ImplTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/Cipher_ImplTest.java Thu Jun  1 01:15:17 2006
@@ -30,9 +30,8 @@
 
 import javax.crypto.Cipher;
 import javax.crypto.NoSuchPaddingException;
-import javax.crypto.ShortBufferException;
 
-import org.apache.harmony.security.support.TestKeyPair;
+import org.apache.harmony.security.tests.support.TestKeyPair;
 
 import junit.framework.TestCase;
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanism_ImplTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanism_ImplTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanism_ImplTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/ExemptionMechanism_ImplTest.java Thu Jun  1 01:15:17 2006
@@ -38,7 +38,8 @@
 import javax.crypto.spec.SecretKeySpec;
 
 import org.apache.harmony.crypto.tests.support.MyExemptionMechanismSpi;
-import org.apache.harmony.security.SpiEngUtils;
+import org.apache.harmony.security.tests.support.SpiEngUtils;
+
 import junit.framework.TestCase;
 
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreement_Impl1Test.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreement_Impl1Test.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreement_Impl1Test.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreement_Impl1Test.java Thu Jun  1 01:15:17 2006
@@ -29,7 +29,7 @@
 import javax.crypto.KeyAgreementSpi;
 
 import org.apache.harmony.crypto.tests.support.MyKeyAgreementSpi;
-import org.apache.harmony.security.SpiEngUtils;
+import org.apache.harmony.security.tests.support.SpiEngUtils;
 
 import junit.framework.TestCase;
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreement_ImplTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreement_ImplTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreement_ImplTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/KeyAgreement_ImplTest.java Thu Jun  1 01:15:17 2006
@@ -35,7 +35,7 @@
 import javax.crypto.KeyAgreement;
 import javax.crypto.ShortBufferException;
 
-import org.apache.harmony.security.SpiEngUtils;
+import org.apache.harmony.security.tests.support.SpiEngUtils;
 import junit.framework.TestCase;
 
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/KeyGenerator_ImplTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/KeyGenerator_ImplTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/KeyGenerator_ImplTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/KeyGenerator_ImplTest.java Thu Jun  1 01:15:17 2006
@@ -33,7 +33,7 @@
 
 import javax.crypto.KeyGenerator;
 
-import org.apache.harmony.security.SpiEngUtils;
+import org.apache.harmony.security.tests.support.SpiEngUtils;
 import junit.framework.TestCase;
 
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/Mac_ImplTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/Mac_ImplTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/Mac_ImplTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/Mac_ImplTest.java Thu Jun  1 01:15:17 2006
@@ -33,7 +33,7 @@
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
 
-import org.apache.harmony.security.SpiEngUtils;
+import org.apache.harmony.security.tests.support.SpiEngUtils;
 import junit.framework.TestCase;
 
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyFactory_Impl1Test.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyFactory_Impl1Test.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyFactory_Impl1Test.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyFactory_Impl1Test.java Thu Jun  1 01:15:17 2006
@@ -27,7 +27,7 @@
 import javax.crypto.SecretKeyFactory;
 import javax.crypto.spec.SecretKeySpec;
 
-import org.apache.harmony.security.SpiEngUtils;
+import org.apache.harmony.security.tests.support.SpiEngUtils;
 import junit.framework.TestCase;
 /**
  * Tests for <code>SecretKeyFactory</code> class constructors and methods.

Modified: incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyFactory_ImplTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyFactory_ImplTest.java?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyFactory_ImplTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/crypto/src/test/impl/java/org/apache/harmony/crypto/tests/javax/crypto/SecretKeyFactory_ImplTest.java Thu Jun  1 01:15:17 2006
@@ -32,7 +32,7 @@
 import javax.crypto.SecretKey;
 import javax.crypto.SecretKeyFactory;
 
-import org.apache.harmony.security.SpiEngUtils;
+import org.apache.harmony.security.tests.support.SpiEngUtils;
 import junit.framework.TestCase;
 
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/build.xml?rev=410788&r1=410787&r2=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/make/common/build.xml Thu Jun  1 01:15:17 2006
@@ -15,7 +15,7 @@
     limitations under the License.
 -->
 
-<project name="Common_Security_Build">
+<project name="Common_SECURITY_Build">
 
     <property file="../../../../make/depends.properties" />
 
@@ -41,95 +41,170 @@
 
     <target name="build.jar">
         <jar destfile="${hy.jdk}/jre/lib/boot/${hy.security.packaging.jarname}.jar"
-            manifest="${hy.security}/META-INF/MANIFEST.MF">
+             manifest="${hy.security}/META-INF/MANIFEST.MF">
             <fileset dir="${hy.build}"
                      includesfile="${hy.security}/make/patternset.txt" />
         </jar>
     </target>
 
+
     <target name="compile.tests">
-        <echo message="Compiling SECURITY tests from ${hy.security.src.test.java}" />
 
-        <mkdir dir="${hy.security.bin.test}" />
+        <compile-tests description="test support files" destdir="../../../../build/tests">
+            <javac-elements>
+                <src>
+                    <pathelement location="${hy.security.src.test}/support/common/java"/>
+                </src>
+                <include name="**/*.java" />
+            </javac-elements>
+        </compile-tests>
+
+
+        <compile-tests description="api tests" destdir="${hy.security.bin.test}/api">
+            <javac-elements>
+                <src>
+                    <pathelement location="${hy.security.src.test}/api/java"/>
+                </src>
+
+                <include name="**/*Test.java" />
+            </javac-elements>
+        </compile-tests>
+
+        <compile-tests description="api injected tests" destdir="${hy.security.bin.test}/api.injected">
+            <javac-elements>
+                <src path="${hy.security.src.test}/api/java.injected"/>
+                <include name="**/*.java" />
+            </javac-elements>
+        </compile-tests>
+
+        <compile-tests description="impl injected tests" destdir="${hy.security.bin.test}/impl.injected">
+            <javac-elements>
+                <src>
+                    <pathelement location="${hy.security.src.test}/impl/java.injected"/>
+                </src>
+
+                <include name="**/*Test.java" />
+            </javac-elements>
+        </compile-tests>
+
+        <compile-tests description="impl tests" destdir="${hy.security.bin.test}/impl">
+            <javac-elements>
+                <src>
+                    <pathelement location="${hy.security.src.test}/impl/java"/>
+                </src>
+
+                <include name="**/*Test.java" />
+            </javac-elements>
+        </compile-tests>
+    </target>
 
-        <javac 	destdir="${hy.security.bin.test}"
-            srcdir="${hy.security.src.test.java}"
-            source="${hy.javac.source}"
-            target="${hy.javac.target}"
-            sourcepath=""
-            debug="${java.debug.option}">
 
-            <bootclasspath>
-                <fileset dir="${hy.jdk}/jre/lib/boot">
-                    <include name="**/*.jar" />
-                </fileset>
-            </bootclasspath>
-            <classpath location="../../../../build/tests" />
-        </javac>
+
+
+    <target name="run.tests" depends="run.tests.api, run.tests.impl" />
+
+    <target name="run.tests.api">
+
+        <run-tests description="api tests">
+            <junit-elements>
+                <classpath>
+                    <pathelement path="${hy.security.bin.test}/api"/>
+                    <pathelement path="../../../../build/tests"/>
+                </classpath>
+
+                <batchtest todir="${hy.tests.reports}" haltonfailure="no" unless="test.case">
+                    <fileset dir="${hy.security.src.test}/api/java">
+                        <include name="**/*Test.java"/>
+
+    <exclude name="tests/api/java/security/KeyStoreTest.java" />
+    <exclude name="tests/api/java/security/SecureRandomTest.java" />
+    <exclude name="tests/api/java/security/AccessControllerTest.java"/>
+    <exclude name="tests/api/java/security/PermissionCollectionTest.java"/>                    
+
+                    </fileset>
+                </batchtest>
+
+            </junit-elements>
+        </run-tests>
+
+        <run-tests description="api.injected tests">
+            <junit-elements>
+                <!-- Required for running the serialization unit tests -->
+                <!-- Note: will be deleted after improving             -->
+                <!-- SerializationTest support class: all resource     -->
+                <!-- files will be placed on the classpath             -->
+                <jvmarg value="-DRESOURCE_DIR=${hy.security.src.test}/resources"/>
+
+                <!-- to pick up junit.jar               -->
+                <jvmarg value="-Xbootclasspath/a:${hy.security.bin.test}/api.injected${path.separator}../../../../${junit.jar}${path.separator}../../../../build/tests"/>
+
+                <batchtest todir="${hy.tests.reports}" haltonfailure="no" unless="test.case">
+                    <fileset dir="${hy.security.src.test}/api/java.injected">
+                        <include name="**/*Test.java"/>
+    <exclude name="java/security/serialization/KeyPairTest.java"/>
+                    </fileset>
+                </batchtest>
+
+            </junit-elements>
+        </run-tests>
+
+        <antcall target="touch-failures-file" />
+        <antcall target="touch-errors-file" />
     </target>
 
 
-    <target name="run.tests">
+    <target name="run.tests.impl">
+        <run-tests description="impl tests">
+            <junit-elements>
+                <!-- Required for running the serialization unit tests -->
+                <!-- Note: will be deleted after improving             -->
+                <!-- SerializationTest support class: all resource     -->
+                <!-- files will be placed on the classpath             -->
+                <jvmarg value="-DRESOURCE_DIR=${hy.security.src.test}/resources"/>
+
+                <classpath>
+                    <pathelement path="${hy.security.bin.test}/impl"/>
+                    <pathelement path="../../../../build/tests"/>
+                </classpath>
+            	
+                <batchtest todir="${hy.tests.reports}" haltonfailure="no" unless="test.case">
+                    <fileset dir="${hy.security.src.test}/impl/java">
+                        <include name="**/*Test.java"/>
+                        <exclude name="${hy.security.x-list}" />
+                    </fileset>
+                </batchtest>
+
+            </junit-elements>
+        </run-tests>
+
+        <run-tests description="impl injected tests">
+            <junit-elements>
+                <!-- Required for running the serialization unit tests -->
+                <!-- Note: will be deleted after improving             -->
+                <!-- SerializationTest support class: all resource     -->
+                <!-- files will be placed on the classpath             -->
+                <jvmarg value="-DRESOURCE_DIR=${hy.security.src.test}/resources"/>
+
+                <!-- to pick up junit.jar               -->
+                <jvmarg value="-Xbootclasspath/a:${hy.security.bin.test}/impl.injected${path.separator}../../../../${junit.jar}${path.separator}../../../../build/tests"/>
+
+                <batchtest todir="${hy.tests.reports}" haltonfailure="no" unless="test.case">
+                    <fileset dir="${hy.security.src.test}/impl/java.injected">
+                        <include name="**/*Test.java"/>
 
-        <mkdir dir="${hy.tests.reports}" />
+                        <exclude name="${hy.security.x-list}" />
 
-        <property name="test.jre.home" value="${hy.jdk}/jre" />
+                    </fileset>
+                </batchtest>
+
+            </junit-elements>
+        </run-tests>
 
-        <junit fork="yes"
-            forkmode="once"
-            printsummary="withOutAndErr"
-            errorproperty="test.errors"
-            failureproperty="test.failures"
-            showoutput="on"
-            dir="${hy.security.bin.test}"
-            jvm="${test.jre.home}/bin/java">
-
-            <!--jvmarg value="-showversion"/-->
-
-            <!-- Required for running the serialization unit tests -->
-            <!-- Note: will be deleted after improving             -->
-            <!-- SerializationTest support class: all resource     -->
-            <!-- files will be placed on the classpath             -->
-            <jvmarg value="-DTEST_SRC_DIR=${hy.security.src.test.java}"/>
-
-            <!-- to pick up junit.jar -->
-            <jvmarg value="-Xbootclasspath/a:${hy.security.bin.test}${path.separator}../../../../${junit.jar}${path.separator}../../../../build/tests"/>
-
-            <classpath>
-                <pathelement path="${hy.security.src.test.resources}"/>
-            </classpath>
-
-            <env key="JAVA_HOME" value="${test.jre.home}"/>
-
-            <formatter type="xml" />
-
-            <test name="${test.case}" todir="${hy.tests.reports}" if="test.case" />
-            <batchtest todir="${hy.tests.reports}" haltonfailure="no"
-                unless="test.case">
-
-                <fileset dir="${hy.security.src.test.java}">
-                    <include name="**/*Test.java"/>
-
-                    <!-- Not a test -->
-                    <exclude name="org/apache/harmony/security/support/**"/>
-
-                    <!-- Harmony exclude list -->
-                    <exclude name="java/security/serialization/KeyPairTest.java"/>
-                    <!-- Designed to run via classpath -->
-                    <exclude name="tests/api/java/security/AccessControllerTest.java"/>
-                    <!-- test excluded due BC bug -->
-                    <exclude name="tests/api/java/security/KeyStoreTest.java"/>
-                    <!-- Designed to run via classpath -->
-                    <exclude name="tests/api/java/security/PermissionCollectionTest.java"/>                    
-                    <!-- No SHA1PRNG implementation yet -->
-                    <exclude name="tests/api/java/security/SecureRandomTest.java"/>
-                </fileset>
-            </batchtest>
-        </junit>
         <antcall target="touch-failures-file" />
         <antcall target="touch-errors-file" />
     </target>
 
+
     <target name="touch-failures-file" if="test.failures">
         <echo file="${hy.tests.reports}/test.failures"
             append="true" >security
@@ -144,5 +219,68 @@
     <target name="copy.resources">
         <!-- Nothing for SECURITY -->
     </target>
+
+    <macrodef name="compile-tests">
+        <attribute name="description" default="" />
+        <attribute name="destdir"  />
+        <element name="javac-elements" />
+        <sequential>
+            <echo message="Compiling SECURITY @{description}" />
+
+            <mkdir dir="@{destdir}" />
+
+            <javac destdir="@{destdir}"
+                source="${hy.javac.source}"
+                target="${hy.javac.target}"
+                debug="${java.debug.option}">
+
+                <javac-elements />
+
+                <bootclasspath>
+                    <fileset dir="${hy.jdk}/jre/lib/boot">
+                        <include name="**/*.jar" />
+                    </fileset>
+                </bootclasspath>
+                <classpath location="../../../../build/tests" />
+            </javac>
+        </sequential>
+    </macrodef>
+
+
+    <macrodef name="run-tests">
+        <attribute name="description" default="" />
+        <element name="junit-elements" />
+        <sequential>
+            <echo message="Running SECURITY @{description}" />
+
+            <mkdir dir="${hy.tests.reports}" />
+
+            <property name="test.jre.home" value="${hy.jdk}/jre" />
+
+            <junit fork="yes"
+                forkmode="once"
+                printsummary="withOutAndErr"
+                errorproperty="test.errors"
+                failureproperty="test.failures"
+                showoutput="on"
+                dir="${hy.security.bin.test}"
+                jvm="${test.jre.home}/bin/java">
+
+                <jvmarg value="-showversion" />
+
+                <env key="JAVA_HOME" value="${test.jre.home}"/>
+                <junit-elements />
+
+                <classpath>
+                    <pathelement path="${hy.security.src.test.resources}"/>
+                </classpath>
+
+                <formatter type="xml" />
+
+                <test name="${test.case}" todir="${hy.tests.reports}" if="test.case" />
+            </junit>
+        </sequential>
+    </macrodef>
+
 </project>
 

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/AlgorithmParameterGenerator1Test.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/AlgorithmParameterGenerator1Test.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/AlgorithmParameterGenerator1Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/AlgorithmParameterGenerator1Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/AlgorithmParameterGenerator1Test.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/AlgorithmParameterGenerator1Test.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/AlgorithmParameterGenerator1Test.java Thu Jun  1 01:15:17 2006
@@ -23,7 +23,9 @@
 
 import java.security.spec.AlgorithmParameterSpec;
 
-import org.apache.harmony.security.SpiEngUtils;
+import org.apache.harmony.security.tests.support.MyAlgorithmParameterGeneratorSpi;
+import org.apache.harmony.security.tests.support.SpiEngUtils;
+
 import junit.framework.TestCase;
 
 

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/AlgorithmParameterGenerator2Test.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/AlgorithmParameterGenerator2Test.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/AlgorithmParameterGenerator2Test.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/AlgorithmParameterGenerator2Test.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/AlgorithmParameterGenerator2Test.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/AlgorithmParameterGenerator2Test.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/AlgorithmParameterGenerator2Test.java Thu Jun  1 01:15:17 2006
@@ -27,7 +27,8 @@
 import java.security.Security;
 import java.security.spec.AlgorithmParameterSpec;
 
-import org.apache.harmony.security.SpiEngUtils;
+import org.apache.harmony.security.tests.support.SpiEngUtils;
+
 import junit.framework.TestCase;
 
 
@@ -38,7 +39,7 @@
 
 public class AlgorithmParameterGenerator2Test extends TestCase {
     
-    private static final String AlgorithmParameterGeneratorProviderClass = "java.security.MyAlgorithmParameterGeneratorSpi";
+    private static final String AlgorithmParameterGeneratorProviderClass = "org.apache.harmony.security.tests.support.MyAlgorithmParameterGeneratorSpi";
 
     private static final String defaultAlg = "APG";
 

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/AlgorithmParameterGeneratorSpiTest.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/AlgorithmParameterGeneratorSpiTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/AlgorithmParameterGeneratorSpiTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/AlgorithmParameterGeneratorSpiTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/AlgorithmParameterGeneratorSpiTest.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/AlgorithmParameterGeneratorSpiTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/AlgorithmParameterGeneratorSpiTest.java Thu Jun  1 01:15:17 2006
@@ -24,6 +24,8 @@
 
 import java.security.spec.AlgorithmParameterSpec;
 
+import org.apache.harmony.security.tests.support.MyAlgorithmParameterGeneratorSpi;
+
 import junit.framework.TestCase;
 
 

Copied: incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/AlgorithmParametersTest.java (from r410523, incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/AlgorithmParametersTest.java)
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/AlgorithmParametersTest.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/AlgorithmParametersTest.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/AlgorithmParametersTest.java&r1=410523&r2=410788&rev=410788&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/java/common/java/security/AlgorithmParametersTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/security/src/test/api/java.injected/java/security/AlgorithmParametersTest.java Thu Jun  1 01:15:17 2006
@@ -24,6 +24,8 @@
 import junit.framework.TestCase;
 import java.security.spec.AlgorithmParameterSpec;
 
+import org.apache.harmony.security.tests.support.MyAlgorithmParameters;
+
 /**
  * Tests for <code>AlgorithmParameters</code> class constructors and
  * methods.
@@ -235,7 +237,7 @@
 	private class MyProvider extends Provider {
 		MyProvider() {
 			super("MyProvider", 1.0, "Provider for testing");
-			put("AlgorithmParameters.ABC", "java.security.MyAlgorithmParameters");
+			put("AlgorithmParameters.ABC", "org.apache.harmony.security.tests.support.MyAlgorithmParameters");
 		}
 		
 		MyProvider(String name, double version, String info) {



Mime
View raw message