Commit a62fa83b authored by Greg Messner's avatar Greg Messner
Browse files

Now only creates personal access tokens if not in properties file (#311).

parent 03651d35
......@@ -28,11 +28,13 @@ public class IntegrationTestSuite implements PropertyConstants {
protected static final String TEST_NAMESPACE = HelperUtils.getProperty(NAMESPACE_KEY);
protected static final String TEST_PRIVATE_TOKEN_NAME = "GitLab4J Test Private Token - " + HelperUtils.getRandomInt(1000);
protected static String TEST_PRIVATE_TOKEN;
protected static String TEST_PRIVATE_TOKEN = HelperUtils.getProperty(PRIVATE_TOKEN_KEY);
protected static final String TEST_ACCESS_TOKEN_NAME = "GitLab4J Test Access Token - " + HelperUtils.getRandomInt(1000);
protected static String TEST_ACCESS_TOKEN;
protected static String TEST_ACCESS_TOKEN = HelperUtils.getProperty(ACCESS_TOKEN_KEY);
private static boolean createdPrivateToken = false;
private static boolean createdAccessToken = false;
private static String problems = "";
@BeforeClass
......@@ -58,22 +60,31 @@ public class IntegrationTestSuite implements PropertyConstants {
fail(problems);
}
// Create a new personal access token for both the private and access tokens
TEST_PRIVATE_TOKEN = AccessTokenUtils.createPersonalAccessToken(
TEST_HOST_URL, TEST_LOGIN_USERNAME, TEST_LOGIN_PASSWORD,
TEST_PRIVATE_TOKEN_NAME, Arrays.asList("api", "sudo"));
System.out.println("Created private token: " + TEST_PRIVATE_TOKEN);
assertNotNull(TEST_PRIVATE_TOKEN);
assertFalse(TEST_PRIVATE_TOKEN.trim().isEmpty());
HelperUtils.setProperty(PRIVATE_TOKEN_KEY, TEST_PRIVATE_TOKEN);
TEST_ACCESS_TOKEN = AccessTokenUtils.createPersonalAccessToken(
TEST_HOST_URL, TEST_LOGIN_USERNAME, TEST_LOGIN_PASSWORD,
TEST_ACCESS_TOKEN_NAME, Arrays.asList("api", "sudo"));
System.out.println("Created access token: " + TEST_ACCESS_TOKEN);
assertNotNull(TEST_ACCESS_TOKEN);
assertFalse(TEST_ACCESS_TOKEN.trim().isEmpty());
HelperUtils.setProperty(ACCESS_TOKEN_KEY, TEST_ACCESS_TOKEN);
// If the private token is not in the properties, create it
if (TEST_PRIVATE_TOKEN == null || TEST_PRIVATE_TOKEN.trim().isEmpty()) {
TEST_PRIVATE_TOKEN = AccessTokenUtils.createPersonalAccessToken(
TEST_HOST_URL, TEST_LOGIN_USERNAME, TEST_LOGIN_PASSWORD,
TEST_PRIVATE_TOKEN_NAME, Arrays.asList("api", "sudo"));
System.out.println("Created private token: " + TEST_PRIVATE_TOKEN);
assertNotNull(TEST_PRIVATE_TOKEN);
assertFalse(TEST_PRIVATE_TOKEN.trim().isEmpty());
HelperUtils.setProperty(PRIVATE_TOKEN_KEY, TEST_PRIVATE_TOKEN);
createdPrivateToken = true;
}
// If the access token is not in the properties, create it t
if (TEST_ACCESS_TOKEN == null || TEST_ACCESS_TOKEN.trim().isEmpty()) {
TEST_ACCESS_TOKEN = AccessTokenUtils.createPersonalAccessToken(
TEST_HOST_URL, TEST_LOGIN_USERNAME, TEST_LOGIN_PASSWORD,
TEST_ACCESS_TOKEN_NAME, Arrays.asList("api", "sudo"));
System.out.println("Created access token: " + TEST_ACCESS_TOKEN);
assertNotNull(TEST_ACCESS_TOKEN);
assertFalse(TEST_ACCESS_TOKEN.trim().isEmpty());
HelperUtils.setProperty(ACCESS_TOKEN_KEY, TEST_ACCESS_TOKEN);
createdAccessToken = true;
}
}
@AfterClass
......@@ -83,7 +94,7 @@ public class IntegrationTestSuite implements PropertyConstants {
System.out.println("* Test Suite Teardown *");
System.out.println("********************************************************");
if (TEST_PRIVATE_TOKEN != null) {
if (createdPrivateToken && TEST_PRIVATE_TOKEN != null) {
try {
AccessTokenUtils.revokePersonalAccessToken(
TEST_HOST_URL, TEST_LOGIN_USERNAME, TEST_LOGIN_PASSWORD,
......@@ -92,7 +103,7 @@ public class IntegrationTestSuite implements PropertyConstants {
} catch (Exception ignore) {}
}
if (TEST_ACCESS_TOKEN != null) {
if (createdAccessToken && TEST_ACCESS_TOKEN != null) {
try {
AccessTokenUtils.revokePersonalAccessToken(
TEST_HOST_URL, TEST_LOGIN_USERNAME, TEST_LOGIN_PASSWORD,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment