@@ -81,7 +81,7 @@ public void testApiKeys() {
81
81
82
82
List <String > roles = apiClient .userService .getRoles ();
83
83
assertFalse (roles .isEmpty ());
84
- assertTrue (roles .contains (TEST_TEAM . replace ( "team" , Roles .TESTER ) ));
84
+ assertTrue (roles .contains ("dev-" + Roles .TESTER ));
85
85
86
86
UserService .ApiKeyResponse apiKey = horreumClient .userService .apiKeys ().get (0 );
87
87
assertFalse (apiKey .isRevoked );
@@ -376,8 +376,6 @@ protected static String resourceToString(String resourcePath) {
376
376
377
377
private static Test dummyTest ;
378
378
379
- private static final String TEST_USERNAME = "it-test-user" , TEST_PASSWORD = "super-secret" , TEST_TEAM = "it-team" ;
380
-
381
379
@ Override
382
380
public void beforeEach (QuarkusTestMethodContext context ) {
383
381
if (horreumClient == null ) {
@@ -390,7 +388,7 @@ public void beforeEach(QuarkusTestMethodContext context) {
390
388
Assertions .assertNull (dummyTest );
391
389
Test test = new Test ();
392
390
test .name = "test" ;
393
- test .owner = TEST_TEAM ;
391
+ test .owner = "dev-team" ;
394
392
test .description = "This is a dummy test" ;
395
393
dummyTest = horreumClient .testService .add (test );
396
394
Assertions .assertNotNull (dummyTest );
@@ -416,8 +414,8 @@ private void instantiateClient() {
416
414
if (horreumClient == null ) {
417
415
horreumClient = new HorreumClient .Builder ()
418
416
.horreumUrl ("http://localhost:" .concat (System .getProperty ("quarkus.http.test-port" )))
419
- .horreumUser (TEST_USERNAME )
420
- .horreumPassword (TEST_PASSWORD )
417
+ .horreumUser ("horreum.bootstrap" )
418
+ .horreumPassword (ItResource . HORREUM_BOOTSTRAP_PASSWORD )
421
419
.build ();
422
420
423
421
Assertions .assertNotNull (horreumClient );
@@ -426,23 +424,6 @@ private void instantiateClient() {
426
424
427
425
@ Override
428
426
public void beforeClass (Class <?> testClass ) {
429
- HorreumClient adminClient = new HorreumClient .Builder ()
430
- .horreumUrl ("http://localhost:" .concat (System .getProperty ("quarkus.http.test-port" , "8081" )))
431
- .horreumUser ("horreum.bootstrap" )
432
- .horreumPassword (ItResource .HORREUM_BOOTSTRAP_PASSWORD )
433
- .build ();
434
-
435
- adminClient .userService .addTeam (TEST_TEAM );
436
-
437
- // create machine account to be used throughout the test
438
- UserService .NewUser testUser = new UserService .NewUser ();
439
- testUser .
user =
new UserService .
UserData (
"" ,
TEST_USERNAME ,
"Test" ,
"User" ,
"[email protected] " );
440
- testUser .team = TEST_TEAM ;
441
- testUser .password = TEST_PASSWORD ;
442
- testUser .roles = List .of (Roles .MACHINE , Roles .TESTER , Roles .UPLOADER );
443
- adminClient .userService .createUser (testUser );
444
-
445
- adminClient .close ();
446
427
}
447
428
448
429
@ Override
0 commit comments