From 35063cf9e61121fb37d33ff9e5c2597f48368a83 Mon Sep 17 00:00:00 2001
From: Patrick Schmitz <pschmitz@berkeley.edu>
Date: Fri, 19 Nov 2010 07:55:59 +0000
Subject: [PATCH] CSPACE-3077, 2742 - Get rid of test/test accounts, and
 super-admin role. Removed sql-script based initialization of test accounts,
 users, and roles. Changed default credentials used in XmlReplay tests to use
 tenant admin account. Changed ServiceMain to create SPRING_ADMIN_ROLE, rather
 than set it up in the sql scripts. Removed and updated a number of account
 and authentication tests that were in error, and depended upon the test
 accounts initialized in sql scripts.

---
 .../test-data/xmlreplay/dev-master.xml        |  4 +-
 .../test-data/xmlreplay/dimension-master.xml  |  4 +-
 .../test-data/xmlreplay/dimension.xml         | 14 +++----
 .../xmlreplay/objectexit/object-exit.xml      |  6 +--
 .../test-data/xmlreplay/organization.xml      |  2 +-
 .../test-data/xmlreplay/security.xml          | 29 +++++++-------
 .../xmlreplay/xml-replay-master-self-test.xml |  4 +-
 .../test-data/xmlreplay/xml-replay-master.xml |  6 +--
 .../xmlreplay/xml-replay-self-test.xml        |  2 +-
 .../account/client/test/AccountTest.java      | 38 -------------------
 .../main/resources/db/mysql/test_account.sql  |  8 ++--
 .../db/mysql/test_authentication.sql          |  5 +--
 services/authorization-mgt/import/pom.xml     |  4 +-
 .../driver/AuthorizationSeedDriver.java       |  4 +-
 .../resources/db/mysql/test_authorization.sql | 11 +++---
 .../services/common/ServiceMain.java          | 24 ++++++++----
 .../test/AuthenticationServiceTest.java       | 18 ++++++---
 17 files changed, 79 insertions(+), 104 deletions(-)

diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/dev-master.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/dev-master.xml
index fe48894ad..b1ef1ed09 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/dev-master.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/dev-master.xml
@@ -6,8 +6,8 @@
     <!-- legal values for dumpServiceResult=[minimal,detailed,full] -->
     <dump payloads="false" dumpServiceResult="minimal" />
     
-    <auths default="test">
-       <auth ID="test">dGVzdDp0ZXN0</auth>
+    <auths default="admin@collectionspace.org">
+       <auth ID="admin@collectionspace.org">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>
     </auths>
 
 
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/dimension-master.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/dimension-master.xml
index 0df0d28ac..16baa30c2 100755
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/dimension-master.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/dimension-master.xml
@@ -5,8 +5,8 @@
     <!-- legal values for dumpServiceResult=[minimal,detailed,full] -->
     <dump payloads="false" dumpServiceResult="minimal" />
     
-    <auths default="test">
-       <auth ID="test">dGVzdDp0ZXN0</auth>
+    <auths default="admin@collectionspace.org">
+       <auth ID="admin@collectionspace.org">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>
     </auths>
 
     
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/dimension.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/dimension.xml
index 224859204..d591c887f 100755
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/dimension.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/dimension.xml
@@ -2,7 +2,7 @@
 <xmlReplay>
     <auths>
         <!-- IMPORTANT: THESE ARE STICKY :: THEY STICK AROUND UNTIL RESET, IN EXEC ORDER OF THIS FILE. -->
-        <auth ID="test">dGVzdDp0ZXN0</auth>
+        <auth ID="admin@collectionspace.org">59PnafP1k9rcuGNMxbCfyQ3TphxKBqecsJI2Yv5vrms=</auth>
         <auth ID="bigbird2010">YmlnYmlyZDIwMTA6YmlnYmlyZDIwMTA=</auth>
     </auths>
     
@@ -21,7 +21,7 @@
         </test>
 
         <!-- should succeed on auth="test" since test is admin user. -->
-        <test ID="dimension2"  auth="test">
+        <test ID="dimension2"  auth="admin@collectionspace.org">
             <!-- actually, this one should succeed since "test" is admin, but it fails now. -->
             <expectedCodes>201,403</expectedCodes>
             <method>POST</method>
@@ -37,7 +37,7 @@
 
     <testGroup ID="dimensionCRUDGroup" autoDeletePOSTS="true">
          <!-- should succeed on auth="test" since test is admin user. -->
-         <test ID="dimPOST"  auth="test">
+         <test ID="dimPOST"  auth="admin@collectionspace.org">
              <!-- actually, this one should succeed since "test" is admin, but it fails now. -->
              <expectedCodes>201</expectedCodes>
              <method>POST</method>
@@ -48,13 +48,13 @@
              </part>
          </test>
 
-        <test ID="dimGET"  auth="test">
+        <test ID="dimGET"  auth="admin@collectionspace.org">
             <!-- actually, this one should succeed since "test" is admin, but it fails now. -->
             <method>GET</method>
             <uri>/cspace-services/dimensions/${dimPOST.CSID}</uri>
         </test>
 
-        <test ID="dimPUT"  auth="test">
+        <test ID="dimPUT"  auth="admin@collectionspace.org">
             <method>PUT</method>
             <uri>/cspace-services/dimensions/${dimPOST.CSID}</uri>
             <part>
@@ -63,7 +63,7 @@
             </part>
         </test>
 
-        <test ID="dimGET2"  auth="test">
+        <test ID="dimGET2"  auth="admin@collectionspace.org">
             <method>GET</method>
             <uri>/cspace-services/dimensions/${dimPOST.CSID}</uri>
         </test>
@@ -73,4 +73,4 @@
 
 </xmlReplay>
         
-        
\ No newline at end of file
+        
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/object-exit.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/object-exit.xml
index dabb8b13b..7e3c34c78 100644
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/object-exit.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/objectexit/object-exit.xml
@@ -2,13 +2,13 @@
 <xmlReplay>
     <auths>
         <!-- IMPORTANT: THESE ARE STICKY :: THEY STICK AROUND UNTIL RESET, IN EXEC ORDER OF THIS FILE. -->
-        <auth ID="test">dGVzdDp0ZXN0</auth>
+        <auth ID="admin@collectionspace.org">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>
     </auths>
     
    <!-- ================================================================================ -->
     
      <testGroup ID="CRUDL" autoDeletePOSTS="true">
-         <test ID="oe1"  auth="test">
+         <test ID="oe1"  auth="admin@collectionspace.org">
              <method>POST</method>
              <uri>/cspace-services/objectexit/</uri>
              <part>
@@ -201,4 +201,4 @@
 
 </xmlReplay>
         
-        
\ No newline at end of file
+        
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/organization.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/organization.xml
index e02a01c26..60eb04d5e 100755
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/organization.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/organization.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xmlReplay>
     <testGroup ID="organization" autoDeletePOSTS="true">
-        <test ID="OrgAuth1" auth="test">
+        <test ID="OrgAuth1" auth="admin@collectionspace.org">
             <method>POST</method>
             <uri>/cspace-services/orgauthorities/</uri>
             <part>
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/security.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/security.xml
index 5f32f3f04..8ffee79f5 100755
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/security.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/security.xml
@@ -2,8 +2,7 @@
 <xmlReplay>
     <auths>
         <!-- IMPORTANT: THESE ARE STICKY :: THEY STICK AROUND UNTIL RESET, IN EXEC ORDER OF THIS FILE. -->
-        <auth ID="test">dGVzdDp0ZXN0</auth>
-        <auth ID="test-pahma">dGVzdC1wYWhtYTp0ZXN0</auth>
+        <auth ID="admin@collectionspace.org">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>
         <auth ID="user1@museum1">dXNlcjFAbXVzZXVtMS5vcmc6dXNlcjFAbXVzZXVtMS5vcmc=</auth>
         <auth ID="bigbird2010">YmlnYmlyZDIwMTA6YmlnYmlyZDIwMTA=</auth>
         <auth ID="elmo2010">ZWxtbzIwMTA6ZWxtbzIwMTA=</auth>
@@ -22,7 +21,7 @@
         </test>
 
         <!--Next, set up permissions and roles, and test bigbird2010 and elmo2010. -->
-        <test ID="permBigbird" auth="test">
+        <test ID="permBigbird" auth="admin@collectionspace.org">
             <method>POST</method>
             <uri>/cspace-services/authorization/permissions</uri>
             <filename>security/1-bigbird-permission.xml</filename>
@@ -133,7 +132,7 @@
         -->
 
 
-        <test auth="test">
+        <test auth="admin@collectionspace.org">
             <method>DELETE</method>
             <uri>/cspace-services/authorization/permissions/${permBigbird.CSID}/permroles</uri>
             <!-- don't do <fromTestID>, no CSID of permrole on end of url, but deleteURL will put one there for you, so don't use it.
@@ -169,7 +168,7 @@
         </test>
 
         
-        <test ID="accountroles2" auth="test">
+        <test ID="accountroles2" auth="admin@collectionspace.org">
             <method>DELETE</method>
             <uri>/cspace-services/accounts/${accountBigbird.CSID}/accountroles</uri>
         </test>
@@ -218,12 +217,12 @@
         </test>
 
         <!--Next, set up permissions and roles, and test bigbird2010.-->
-        <test ID="permBigbird" auth="test">
+        <test ID="permBigbird" auth="admin@collectionspace.org">
             <method>POST</method>
             <uri>/cspace-services/authorization/permissions</uri>
             <filename>security/1-bigbird-permission.xml</filename>
         </test>
-        <test ID="roleTestCM"  auth="test">
+        <test ID="roleTestCM"  auth="admin@collectionspace.org">
             <method>POST</method>
             <uri>/cspace-services/authorization/roles</uri>
             <filename>security/3-role-test-cm.xml</filename>
@@ -279,7 +278,7 @@
         
         <!--  NOW **REMOVE** PERMROLES FROM BIGBIRD -->
         
-        <test ID="deletePermrolesBigbird" auth="test">
+        <test ID="deletePermrolesBigbird" auth="admin@collectionspace.org">
             <msg>Deleting permroles from bigbird2010</msg>
             <method>DELETE</method>
             <uri>/cspace-services/authorization/permissions/${permBigbird.CSID}/permroles</uri>
@@ -320,12 +319,12 @@
 
         <!--  NOW **ADD** PERMS CRU TO BIGBIRD -->
 
-        <test ID="permBigbird_CRU" auth="test">
+        <test ID="permBigbird_CRU" auth="admin@collectionspace.org">
             <method>POST</method>
             <uri>/cspace-services/authorization/permissions</uri>
             <filename>security/11-bigbird-permission-CRU.xml</filename>
         </test>
-        <test ID="bigbirdPermrolesCRU" auth="test">
+        <test ID="bigbirdPermrolesCRU" auth="admin@collectionspace.org">
             <method>POST</method>
             <uri>/cspace-services/authorization/permissions/${permBigbird_CRU.CSID}/permroles</uri>
             <filename>security/11-permissionroles-bigbird-CRU.xml</filename>
@@ -362,7 +361,7 @@
 
         <!--  NOW **REMOVE** PERMROLES FROM BIGBIRD -->
         
-        <test ID="deletePermrolesBigbird" auth="test">
+        <test ID="deletePermrolesBigbird" auth="admin@collectionspace.org">
             <msg>Deleting permroles from bigbird2010</msg>
             <method>DELETE</method>
             <uri>/cspace-services/authorization/permissions/${permBigbird_CRU.CSID}/permroles</uri>
@@ -370,12 +369,12 @@
         
         <!--  NOW **ADD** PERMS R TO BIGBIRD -->
 
-        <test ID="permBigbird_R" auth="test">
+        <test ID="permBigbird_R" auth="admin@collectionspace.org">
             <method>POST</method>
             <uri>/cspace-services/authorization/permissions</uri>
             <filename>security/12-bigbird-permission-R.xml</filename>
         </test>
-        <test ID="bigbirdPermroles_R" auth="test">
+        <test ID="bigbirdPermroles_R" auth="admin@collectionspace.org">
             <method>POST</method>
             <uri>/cspace-services/authorization/permissions/${permBigbird_R.CSID}/permroles</uri>
             <filename>security/12-permissionroles-bigbird-R.xml</filename>
@@ -414,7 +413,7 @@
         </test>
         
         <!-- CLEANUP -->
-        <test  auth="test">
+        <test  auth="admin@collectionspace.org">
             <method>DELETE</method>
             <uri>/cspace-services/accounts/${accountBigbird.CSID}/accountroles</uri>
         </test>
@@ -436,4 +435,4 @@
 
 </xmlReplay>
         
-        
\ No newline at end of file
+        
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master-self-test.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master-self-test.xml
index 1fae5a1ed..e22bc0554 100755
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master-self-test.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master-self-test.xml
@@ -5,8 +5,8 @@
     <!-- legal values for dumpServiceResult=[minimal,detailed,full] -->
     <dump payloads="false" dumpServiceResult="minimal" />
     
-    <auths default="test">
-       <auth ID="test">dGVzdDp0ZXN0</auth>
+    <auths default="admin@collectionspace.org">
+       <auth ID="admin@collectionspace.org">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>
     </auths>
 
     
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master.xml
index c700ad0ed..13c448c64 100755
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-master.xml
@@ -3,10 +3,10 @@
     <protoHostPort>http://localhost:8180</protoHostPort>
     
     <!-- legal values for dumpServiceResult=[minimal,detailed,full] -->
-    <dump payloads="false" dumpServiceResult="minimal" />
+    <dump payloads="false" dumpServiceResult="full" />
     
-    <auths default="test">
-       <auth ID="test">dGVzdDp0ZXN0</auth>
+    <auths default="admin@collectionspace.org">
+       <auth ID="admin@collectionspace.org">YWRtaW5AY29sbGVjdGlvbnNwYWNlLm9yZzpBZG1pbmlzdHJhdG9y</auth>
     </auths>
 
     <!--
diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-self-test.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-self-test.xml
index 209013325..e786aed4a 100755
--- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-self-test.xml
+++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/xml-replay-self-test.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xmlReplay>
     <testGroup ID="selftestGroup" autoDeletePOSTS="true">
-        <test ID="OrgAuth1" auth="test">
+        <test ID="OrgAuth1" auth="admin@collectionspace.org">
             <method>POST</method>
             <uri>/cspace-services/orgauthorities/</uri>
             <part>
diff --git a/services/account/client/src/test/java/org/collectionspace/services/account/client/test/AccountTest.java b/services/account/client/src/test/java/org/collectionspace/services/account/client/test/AccountTest.java
index 883911e32..1f6ff4202 100644
--- a/services/account/client/src/test/java/org/collectionspace/services/account/client/test/AccountTest.java
+++ b/services/account/client/src/test/java/org/collectionspace/services/account/client/test/AccountTest.java
@@ -58,44 +58,6 @@ public class AccountTest {
         }
     }
 
-    @SuppressWarnings("unchecked")
-    @Test(dataProvider = "testName", dataProviderClass = AccountTest.class)
-    public void createTest(String testName) throws Exception {
-        AccountsCommon account = null;
-        try {
-            account = findAccount("test");
-            if (account != null) {
-                return;
-            }
-        } catch (NoResultException nre) {
-            //ignore
-        }
-        if (account == null) {
-            account = new AccountsCommon();
-        }
-        account.setScreenName("test");
-        account.setPersonRefName("test hello");
-        account.setEmail("test.test@berkeley.edu");
-        account.setUserId("test");
-        account.setStatus(Status.ACTIVE);
-        id = UUID.randomUUID().toString();
-        account.setCsid(id);
-
-        AccountTenant tenant = new AccountTenant();
-        tenant.setTenantId("1");
-        List<AccountTenant> tList = new ArrayList<AccountTenant>();
-        tList.add(tenant);
-        account.setTenants(tList);
-        em.getTransaction().begin();
-        em.persist(account);
-        // Commit the transaction
-        em.getTransaction().commit();
-        if (logger.isDebugEnabled()) {
-            logger.debug("created/updated account "
-                    + " screen name=" + account.getScreenName()
-                    + " email=" + account.getEmail());
-        }
-    }
 
     @SuppressWarnings("unchecked")
     @Test(dataProvider = "testName", dataProviderClass = AccountTest.class)
diff --git a/services/account/pstore/src/main/resources/db/mysql/test_account.sql b/services/account/pstore/src/main/resources/db/mysql/test_account.sql
index 7d8ee3bf4..5d8021382 100644
--- a/services/account/pstore/src/main/resources/db/mysql/test_account.sql
+++ b/services/account/pstore/src/main/resources/db/mysql/test_account.sql
@@ -8,11 +8,11 @@ use cspace;
 -- Tenants
 -- default cspace --
 -- ONLY Needed for the hack below.
-INSERT INTO `cspace`.`tenants` (`id`, `name`, `created_at`) VALUES  ('1','collectionspace.org', now());
+-- INSERT INTO `cspace`.`tenants` (`id`, `name`, `created_at`) VALUES  ('1','collectionspace.org', now());
 
 -- Accounts
--- default test account --
-INSERT INTO `cspace`.`accounts_common` (`csid`, `email`, `phone`, `mobile`, `userid`, `status`, `screen_name`, `created_at`) VALUES  ('eeca40d7-dc77-4cc5-b489-16a53c75525a','test.test@berkeley.edu',NULL,NULL,'test','ACTIVE','test', now());
+-- default bootstrap user required to run ImportAuthZ (to bootstrap Spring) --
+-- INSERT INTO `cspace`.`accounts_common` (`csid`, `email`, `phone`, `mobile`, `userid`, `status`, `screen_name`, `created_at`) VALUES  ('Bootstrapping-Account-DO-NOT-DELETE','bootstrap@collectionspace.org',NULL,NULL,'SPRING_ADMIN','ACTIVE','SPRING_ADMIN', now());
 
 -- Association of accounts with tenants
-INSERT INTO `cspace`.`accounts_tenants` (`TENANTS_ACCOUNTSCOMMON_CSID`, `tenant_id`) VALUES ('eeca40d7-dc77-4cc5-b489-16a53c75525a', '1');
+-- INSERT INTO `cspace`.`accounts_tenants` (`TENANTS_ACCOUNTSCOMMON_CSID`, `tenant_id`) VALUES ('Bootstrapping-Account-DO-NOT-DELETE', '1');
diff --git a/services/authentication/pstore/src/main/resources/db/mysql/test_authentication.sql b/services/authentication/pstore/src/main/resources/db/mysql/test_authentication.sql
index 3f5f2ce02..8814ef331 100644
--- a/services/authentication/pstore/src/main/resources/db/mysql/test_authentication.sql
+++ b/services/authentication/pstore/src/main/resources/db/mysql/test_authentication.sql
@@ -5,6 +5,5 @@
 --
 use cspace;
 
--- default test user --
--- This should go away.
-insert into `users` (`username`,`passwd`, `created_at`) VALUES ('test','n4bQgYhMfWWaL+qgxVrQFaO/TxsrC4Is0V1sFbDwCgg=', now());
+-- default bootstrap user required to run ImportAuthZ (to bootstrap Spring) --
+-- insert into `users` (`username`,`passwd`, `created_at`) VALUES ('SPRING_ADMIN','MzwE3RUaKmgxwDnLmmUd8pGYvooE4WzoYdS2o0oRyVQ=', now());
diff --git a/services/authorization-mgt/import/pom.xml b/services/authorization-mgt/import/pom.xml
index f19330a42..cb70e5bba 100644
--- a/services/authorization-mgt/import/pom.xml
+++ b/services/authorization-mgt/import/pom.xml
@@ -142,9 +142,9 @@
                     <mainClass>org.collectionspace.ImportAuthz</mainClass>
                     <arguments>
                         <argument>-u</argument>
-                        <argument>test</argument>
+                        <argument>SPRING_ADMIN</argument>
                         <argument>-p</argument>
-                        <argument>test</argument>
+                        <argument>does_not_matter</argument>
                         <argument>-b</argument>
                         <argument>${basedir}/../../common/src/main/config/services/tenant-bindings.xml</argument>
                         <argument>-edir</argument>
diff --git a/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/driver/AuthorizationSeedDriver.java b/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/driver/AuthorizationSeedDriver.java
index 9c6faab5a..9c08adb06 100644
--- a/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/driver/AuthorizationSeedDriver.java
+++ b/services/authorization-mgt/import/src/main/java/org/collectionspace/services/authorization/driver/AuthorizationSeedDriver.java
@@ -165,10 +165,10 @@ public class AuthorizationSeedDriver {
     }
 
     private void login() {
-        GrantedAuthority cspace_admin = new GrantedAuthorityImpl("ROLE_ADMINISTRATOR");
+        //GrantedAuthority cspace_admin = new GrantedAuthorityImpl("ROLE_ADMINISTRATOR");
         GrantedAuthority spring_security_admin = new GrantedAuthorityImpl("ROLE_SPRING_ADMIN");
         HashSet<GrantedAuthority> gauths = new HashSet<GrantedAuthority>();
-        gauths.add(cspace_admin);
+        //gauths.add(cspace_admin);
         gauths.add(spring_security_admin);
         Authentication authRequest = new UsernamePasswordAuthenticationToken(user, password, gauths);
         SecurityContextHolder.getContext().setAuthentication(authRequest);
diff --git a/services/authorization/pstore/src/main/resources/db/mysql/test_authorization.sql b/services/authorization/pstore/src/main/resources/db/mysql/test_authorization.sql
index 177818f78..4ac057be0 100644
--- a/services/authorization/pstore/src/main/resources/db/mysql/test_authorization.sql
+++ b/services/authorization/pstore/src/main/resources/db/mysql/test_authorization.sql
@@ -5,11 +5,10 @@
 --
 use cspace;
 
-insert into `roles` (`csid`, `rolename`, `displayName`, `rolegroup`, `created_at`, `tenant_id`) values ('-1', 'ROLE_SPRING_ADMIN', 'SPRING_ADMIN', 'Spring Security Administrator', now(), '0');
-insert into `roles` (`csid`, `rolename`, `displayName`, `rolegroup`, `created_at`, `tenant_id`) values ('0', 'ROLE_ADMINISTRATOR', 'ADMINISTRATOR', 'CollectionSpace Administrator', now(), '0');
+-- insert into `roles` (`csid`, `rolename`, `displayName`, `rolegroup`, `created_at`, `tenant_id`) values ('-1', 'ROLE_SPRING_ADMIN', 'SPRING_ADMIN', 'Spring Security Administrator', now(), '0');
+-- insert into `roles` (`csid`, `rolename`, `displayName`, `rolegroup`, `created_at`, `tenant_id`) values ('0', 'ROLE_ADMINISTRATOR', 'ADMINISTRATOR', 'CollectionSpace Administrator', now(), '0');
 
--- for default test account --
--- THESE SHOULD GO AWAY.
-insert into `accounts_roles`(`account_id`, `user_id`, `role_id`, `role_name`, `created_at`) values ('eeca40d7-dc77-4cc5-b489-16a53c75525a', 'test', '-1', 'ROLE_SPRING_ADMIN', now());
-insert into `accounts_roles`(`account_id`, `user_id`, `role_id`, `role_name`, `created_at`) values ('eeca40d7-dc77-4cc5-b489-16a53c75525a', 'test', '0', 'ROLE_ADMINISTRATOR', now());
+-- for default bootstrap user required to run ImportAuthZ (to bootstrap Spring) --
+-- insert into `accounts_roles`(`account_id`, `user_id`, `role_id`, `role_name`, `created_at`) values ('Bootstrapping-Account-DO-NOT-DELETE', 'test', '-1', 'ROLE_SPRING_ADMIN', now());
+-- insert into `accounts_roles`(`account_id`, `user_id`, `role_id`, `role_name`, `created_at`) values ('Bootstrapping-Account-DO-NOT-DELETE', 'test', '0', 'ROLE_ADMINISTRATOR', now());
 
diff --git a/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java b/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java
index eb5aa130f..b29470437 100644
--- a/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/ServiceMain.java
@@ -336,17 +336,27 @@ public class ServiceMain {
         	}
         	pstmt.close();
         	// Fifth, fetch and save the default roles
+			String springAdminRoleCSID = null;
         	String querySpringRole = 
         		"SELECT `csid` from `Roles` WHERE `rolename`='"+SPRING_ADMIN_ROLE+"'";
 			rs = stmt.executeQuery(querySpringRole);
-    		if(!rs.next()) {
-    			throw new RuntimeException("Cannot find SPRING ADMIN role!");
+    		if(rs.next()) {
+    			springAdminRoleCSID = rs.getString(1);
+            	if (logger.isDebugEnabled()) {
+            		logger.debug("createDefaultAccounts found Spring Admin role: "
+            				+springAdminRoleCSID);
+            	}
+    		} else {
+                String insertSpringAdminRoleSQL =
+                	"INSERT INTO `Roles` (`csid`, `rolename`, `displayName`, `rolegroup`, `created_at`, `tenant_id`) "
+                	+ "VALUES ('-1', 'ROLE_SPRING_ADMIN', 'SPRING_ADMIN', 'Spring Security Administrator', now(), '0')";
+    			stmt.executeUpdate(insertSpringAdminRoleSQL);
+    			springAdminRoleCSID = "-1";
+            	if (logger.isDebugEnabled()) {
+            		logger.debug("createDefaultAccounts CREATED Spring Admin role: "
+            				+springAdminRoleCSID);
+            	}
     		}
-			String springAdminRoleCSID = rs.getString(1);
-        	if (logger.isDebugEnabled()) {
-        		logger.debug("createDefaultAccounts found Spring Admin role: "
-        				+springAdminRoleCSID);
-        	}
         	rs.close();
         	String getRoleCSIDSql =
         		"SELECT `csid` from `Roles` WHERE `tenant_id`=? and `rolename`=?";
diff --git a/services/security/client/src/test/java/org/collectionspace/services/security/client/test/AuthenticationServiceTest.java b/services/security/client/src/test/java/org/collectionspace/services/security/client/test/AuthenticationServiceTest.java
index 8eaac9725..fbe0db723 100644
--- a/services/security/client/src/test/java/org/collectionspace/services/security/client/test/AuthenticationServiceTest.java
+++ b/services/security/client/src/test/java/org/collectionspace/services/security/client/test/AuthenticationServiceTest.java
@@ -111,7 +111,8 @@ public class AuthenticationServiceTest extends AbstractServiceTestImpl {
         setupCreate();
 
         AccountClient accountClient = new AccountClient();
-        accountClient.setAuth(true, "test", true, "test", true);
+        // This should not be needed - the auth is already set up
+        //accountClient.setAuth(true, "test", true, "test", true);
 
         // Submit the request to the service and store the response.
         AccountsCommon account =
@@ -147,7 +148,8 @@ public class AuthenticationServiceTest extends AbstractServiceTestImpl {
         setupCreate();
 
         AccountClient accountClient = new AccountClient();
-        accountClient.setAuth(true, "test", true, "test", true);
+        // This should not be needed - the auth is already set up
+        //accountClient.setAuth(true, "test", true, "test", true);
 
         // Submit the request to the service and store the response.
         AccountsCommon account =
@@ -233,7 +235,9 @@ public class AuthenticationServiceTest extends AbstractServiceTestImpl {
         }
         setupCreate();
         CollectionObjectClient collectionObjectClient = new CollectionObjectClient();
-        collectionObjectClient.setAuth(false, "test", true, "test", true);
+        String user = collectionObjectClient.getProperty(collectionObjectClient.USER_PROPERTY);
+        String pass = collectionObjectClient.getProperty(collectionObjectClient.PASSWORD_PROPERTY);
+        collectionObjectClient.setAuth(false, user, true, pass, true);
         String identifier = BaseServiceTest.createIdentifier();
         MultipartOutput multipart = createCollectionObjectInstance(
                 collectionObjectClient.getCommonPartName(), identifier);
@@ -278,7 +282,8 @@ public class AuthenticationServiceTest extends AbstractServiceTestImpl {
             logger.debug(testBanner(testName));
         }
         CollectionObjectClient collectionObjectClient = new CollectionObjectClient();
-        collectionObjectClient.setAuth(true, "test", true, "", false);
+        String user = collectionObjectClient.getProperty(collectionObjectClient.USER_PROPERTY);
+        collectionObjectClient.setAuth(true, user, true, "", false);
         String identifier = BaseServiceTest.createIdentifier();
         MultipartOutput multipart = createCollectionObjectInstance(
                 collectionObjectClient.getCommonPartName(), identifier);
@@ -320,7 +325,8 @@ public class AuthenticationServiceTest extends AbstractServiceTestImpl {
             logger.debug(testBanner(testName));
         }
         CollectionObjectClient collectionObjectClient = new CollectionObjectClient();
-        collectionObjectClient.setAuth(true, "test", true, "bar", true);
+        String user = collectionObjectClient.getProperty(collectionObjectClient.USER_PROPERTY);
+        collectionObjectClient.setAuth(true, user, true, "bar", true);
         String identifier = BaseServiceTest.createIdentifier();
         MultipartOutput multipart = createCollectionObjectInstance(
                 collectionObjectClient.getCommonPartName(), identifier);
@@ -397,7 +403,7 @@ public class AuthenticationServiceTest extends AbstractServiceTestImpl {
         // Perform setup.
         setupDelete();
         AccountClient accountClient = new AccountClient();
-        accountClient.setAuth(true, "test", true, "test", true);
+        // accountClient.setAuth(true, "test", true, "test", true);
         // Submit the request to the service and store the response.
         ClientResponse<Response> res = accountClient.delete(barneyAccountId);
         int statusCode = res.getStatus();
-- 
2.47.3