@@ -322,44 +322,35 @@ private void verifyPatch(final boolean sendAdminCert, Header... restAdminHeader)
322322 HttpStatus .SC_CREATED );
323323
324324 // Add enabled service account then get it
325-
326-
327- rh .sendAdminCertificate = sendAdminCert ;
328325 response = rh .executePutRequest (ENDPOINT + "/internalusers/happyServiceLive" ,
329326 ENABLED_SERVICE_ACCOUNT_BODY , restAdminHeader );
330327 Assert .assertEquals (response .getBody (), HttpStatus .SC_CREATED , response .getStatusCode ());
331- rh .sendAdminCertificate = sendAdminCert ;
332328 response = rh .executeGetRequest (ENDPOINT + "/internalusers/happyServiceLive" , restAdminHeader );
333329 Assert .assertEquals (HttpStatus .SC_OK , response .getStatusCode ());
334- settings = Settings .builder ().loadFromSource (response .getBody (), XContentType .JSON ).build ();
335330
336331
337332 // Add disabled service account
338- rh .sendAdminCertificate = sendAdminCert ;
339333 response = rh .executePutRequest (ENDPOINT + "/internalusers/happyServiceDead" ,
340334 DISABLED_SERVICE_ACCOUNT_BODY , restAdminHeader );
341335 Assert .assertEquals (response .getBody (), HttpStatus .SC_CREATED , response .getStatusCode ());
342336
343337 // Add enabled non-service account
344- rh .sendAdminCertificate = sendAdminCert ;
345338 response = rh .executePutRequest (ENDPOINT + "/internalusers/user_is_owner_1" ,
346339 ENABLED_NOT_SERVICE_ACCOUNT_BODY , restAdminHeader );
347340 Assert .assertEquals (HttpStatus .SC_CREATED , response .getStatusCode ());
348341
349342 // Add service account with password -- Should Fail
350- rh . sendAdminCertificate = sendAdminCert ;
343+
351344 response = rh .executePutRequest (ENDPOINT + "/internalusers/passwordService" ,
352345 PASSWORD_SERVICE , restAdminHeader );
353346 Assert .assertEquals (HttpStatus .SC_BAD_REQUEST , response .getStatusCode ());
354347
355348 //Add service with hash -- should fail
356- rh .sendAdminCertificate = sendAdminCert ;
357349 response = rh .executePutRequest (ENDPOINT + "/internalusers/hashService" ,
358350 HASH_SERVICE , restAdminHeader );
359351 Assert .assertEquals (HttpStatus .SC_BAD_REQUEST , response .getStatusCode ());
360352
361353 // Add Service account with password & Hash -- should fail
362- rh .sendAdminCertificate = sendAdminCert ;
363354 response = rh .executePutRequest (ENDPOINT + "/internalusers/passwordHashService" ,
364355 PASSWORD_HASH_SERVICE , restAdminHeader );
365356 Assert .assertEquals (HttpStatus .SC_BAD_REQUEST , response .getStatusCode ());
0 commit comments