77import java .util .Arrays ;
88
99import org .gitlab4j .api .utils .AccessTokenUtils ;
10+ import org .junit .AfterClass ;
1011import org .junit .BeforeClass ;
1112import org .junit .experimental .categories .Categories .IncludeCategory ;
1213import org .junit .runner .RunWith ;
@@ -26,8 +27,12 @@ public class IntegrationTestSuite implements PropertyConstants {
2627 protected static final String TEST_PROJECT_NAME = HelperUtils .getProperty (PROJECT_NAME_KEY );
2728 protected static final String TEST_NAMESPACE = HelperUtils .getProperty (NAMESPACE_KEY );
2829
30+ protected static final String TEST_PRIVATE_TOKEN_NAME = "GitLab4J Test Private Token - " + HelperUtils .getRandomInt (1000 );
2931 protected static String TEST_PRIVATE_TOKEN ;
32+
33+ protected static final String TEST_ACCESS_TOKEN_NAME = "GitLab4J Test Access Token - " + HelperUtils .getRandomInt (1000 );
3034 protected static String TEST_ACCESS_TOKEN ;
35+
3136 private static String problems = "" ;
3237
3338 @ BeforeClass
@@ -55,19 +60,45 @@ public static void suiteSetup() throws GitLabApiException {
5560
5661 // Create a new personal access token for both the private and access tokens
5762 TEST_PRIVATE_TOKEN = AccessTokenUtils .createPersonalAccessToken (
58- TEST_HOST_URL , TEST_LOGIN_USERNAME , TEST_LOGIN_PASSWORD ,
59- "GitLab4J Test Private Token" , Arrays .asList ("api" , "sudo" ));
63+ TEST_HOST_URL , TEST_LOGIN_USERNAME , TEST_LOGIN_PASSWORD ,
64+ TEST_PRIVATE_TOKEN_NAME , Arrays .asList ("api" , "sudo" ));
6065 System .out .println ("Created private token: " + TEST_PRIVATE_TOKEN );
6166 assertNotNull (TEST_PRIVATE_TOKEN );
6267 assertFalse (TEST_PRIVATE_TOKEN .trim ().isEmpty ());
6368 HelperUtils .setProperty (PRIVATE_TOKEN_KEY , TEST_PRIVATE_TOKEN );
6469
6570 TEST_ACCESS_TOKEN = AccessTokenUtils .createPersonalAccessToken (
66- TEST_HOST_URL , TEST_LOGIN_USERNAME , TEST_LOGIN_PASSWORD ,
67- "GitLab4J Test Access Token" , Arrays .asList ("api" , "sudo" ));
68- System .out .println ("Created private token: " + TEST_ACCESS_TOKEN );
71+ TEST_HOST_URL , TEST_LOGIN_USERNAME , TEST_LOGIN_PASSWORD ,
72+ TEST_ACCESS_TOKEN_NAME , Arrays .asList ("api" , "sudo" ));
73+ System .out .println ("Created access token: " + TEST_ACCESS_TOKEN );
6974 assertNotNull (TEST_ACCESS_TOKEN );
7075 assertFalse (TEST_ACCESS_TOKEN .trim ().isEmpty ());
7176 HelperUtils .setProperty (ACCESS_TOKEN_KEY , TEST_ACCESS_TOKEN );
7277 }
78+
79+ @ AfterClass
80+ public static void suiteTeardown () throws GitLabApiException {
81+
82+ System .out .println ("********************************************************" );
83+ System .out .println ("* Test Suite Teardown *" );
84+ System .out .println ("********************************************************" );
85+
86+ if (TEST_PRIVATE_TOKEN != null ) {
87+ try {
88+ AccessTokenUtils .revokePersonalAccessToken (
89+ TEST_HOST_URL , TEST_LOGIN_USERNAME , TEST_LOGIN_PASSWORD ,
90+ TEST_PRIVATE_TOKEN_NAME , Arrays .asList ("api" , "sudo" ));
91+ System .out .format ("Revoved '%s'%n" , TEST_PRIVATE_TOKEN_NAME );
92+ } catch (Exception ignore ) {}
93+ }
94+
95+ if (TEST_ACCESS_TOKEN != null ) {
96+ try {
97+ AccessTokenUtils .revokePersonalAccessToken (
98+ TEST_HOST_URL , TEST_LOGIN_USERNAME , TEST_LOGIN_PASSWORD ,
99+ TEST_ACCESS_TOKEN_NAME , Arrays .asList ("api" , "sudo" ));
100+ System .out .format ("Revoved '%s'%n" , TEST_ACCESS_TOKEN_NAME );
101+ } catch (Exception ignore ) {}
102+ }
103+ }
73104}
0 commit comments