Skip to content

Commit aeb5d1a

Browse files
author
rathnapandi
committed
- fix integration test related to swagger.io certificates and oadmin roles
1 parent da8a337 commit aeb5d1a

File tree

9 files changed

+56
-19
lines changed

9 files changed

+56
-19
lines changed

‎modules/apis/src/test/java/com/axway/apim/export/test/applications/ApplicationExportTestIT.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,7 @@ public void run(@Optional @CitrusResource TestContext context) throws IOExceptio
100100
assertNull(app.getId(), "The ID of an application shouldn't be exported.");
101101
assertNull(app.getAppQuota(), "The application quota should not be exported. It's not supported by the export!");
102102
assertTrue(new File(context.getVariable("exportLocation") + "/" + context.getVariable("exportFolder") + "/swagger.io.crt").exists(), "Certificate swagger.io.crt is missing");
103-
assertTrue(new File(context.getVariable("exportLocation") + "/" + context.getVariable("exportFolder") + "/AmazonRSA2048M02.crt").exists(), "Certificate StarfieldServicesRootCertificateAuthority-G2.crt is missing");
104-
assertTrue(new File(context.getVariable("exportLocation") + "/" + context.getVariable("exportFolder") + "/AmazonRootCA1.crt").exists(), "Certificate AmazonRootCA1.crt is missing");
103+
assertTrue(new File(context.getVariable("exportLocation") + "/" + context.getVariable("exportFolder") + "/WE1.crt").exists(), "Certificate WE1.crt is missing");
105104
assertTrue(new File(context.getVariable("exportLocation") + "/" + context.getVariable("exportFolder") + "/" + context.getVariable("exportAPIName")).exists(), "Exported Swagger-File is missing");
106105
}
107106
}

‎modules/apis/src/test/java/com/axway/apim/export/test/basic/ImageAPIExportTestIT.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,7 @@ public void run(@Optional @CitrusResource TestContext context) throws IOExceptio
6969
assertFalse(exportedAPIConfig.get("caCerts").get(0).get("inbound").asBoolean());
7070
assertTrue(exportedAPIConfig.get("caCerts").get(0).get("outbound").asBoolean());
7171
assertTrue(new File(context.getVariable("exportLocation") + "/" + context.getVariable("exportFolder") + "/swagger.io.crt").exists(), "Certificate swagger.io.crt is missing");
72-
assertTrue(new File(context.getVariable("exportLocation") + "/" + context.getVariable("exportFolder") + "/AmazonRSA2048M02.crt").exists(), "Certificate StarfieldServicesRootCertificateAuthority-G2.crt is missing");
73-
assertTrue(new File(context.getVariable("exportLocation") + "/" + context.getVariable("exportFolder") + "/AmazonRootCA1.crt").exists(), "Certificate AmazonRootCA1.crt is missing");
74-
//assertTrue(new File(context.getVariable("exportLocation")+"/"+context.getVariable("exportFolder")+"/Amazon.crt").exists(), "Certificate Amazon.crt is missing");
72+
assertTrue(new File(context.getVariable("exportLocation") + "/" + context.getVariable("exportFolder") + "/WE1.crt").exists(), "Certificate WE1.crt is missing");
7573
assertTrue(new File(context.getVariable("exportLocation") + "/" + context.getVariable("exportFolder") + "/" + context.getVariable("exportAPIName")).exists(), "Exported Swagger-File is missing");
7674
assertTrue(new File(context.getVariable("exportLocation") + "/" + context.getVariable("exportFolder") + "/api-image.jpg").exists(), "API-Image is missing");
7775
}

‎modules/apis/src/test/java/com/axway/apim/export/test/basic/SimpleAPIExportTestIT.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,7 @@ public void run(@Optional @CitrusResource TestContext context) throws IOExceptio
9999
assertFalse(exportedAPIConfig.get("caCerts").get(0).get("inbound").asBoolean());
100100
assertTrue(exportedAPIConfig.get("caCerts").get(0).get("outbound").asBoolean());
101101
assertTrue(new File(context.getVariable("exportLocation") + "/" + context.getVariable("exportFolder") + "/swagger.io.crt").exists(), "Certificate swagger.io.crt is missing");
102-
assertTrue(new File(context.getVariable("exportLocation") + "/" + context.getVariable("exportFolder") + "/AmazonRSA2048M02.crt").exists(), "Certificate StarfieldServicesRootCertificateAuthority-G2.crt is missing");
103-
assertTrue(new File(context.getVariable("exportLocation") + "/" + context.getVariable("exportFolder") + "/AmazonRootCA1.crt").exists(), "Certificate AmazonRootCA1.crt is missing");
104-
//assertTrue(new File(context.getVariable("exportLocation")+"/"+context.getVariable("exportFolder")+"/Amazon.crt").exists(), "Certificate Amazon.crt is missing");
102+
assertTrue(new File(context.getVariable("exportLocation") + "/" + context.getVariable("exportFolder") + "/WE1.crt").exists(), "Certificate WE1.crt is missing");
105103

106104
File exportedAPISpecFile = new File(context.getVariable("exportLocation") + "/" + context.getVariable("exportFolder") + "/" + context.getVariable("exportAPIName"));
107105
assertTrue(exportedAPISpecFile.exists(), "Exported API-Specification is missing");

‎modules/apis/src/test/java/com/axway/apim/export/test/basic/WildcardAPIExportTestIT.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,7 @@ public void run(@Optional @CitrusResource TestContext context) throws IOExceptio
108108
assertTrue(exportedAPIConfig.get("caCerts").get(0).get("outbound").asBoolean());
109109

110110
assertTrue(new File(context.getVariable("exportLocation") + "/" + context.getVariable("exportFolder2") + "/swagger.io.crt").exists(), "Certificate swagger.io.crt is missing");
111-
assertTrue(new File(context.getVariable("exportLocation") + "/" + context.getVariable("exportFolder2") + "/AmazonRSA2048M02.crt").exists(), "Certificate StarfieldServicesRootCertificateAuthority-G2.crt is missing");
112-
assertTrue(new File(context.getVariable("exportLocation") + "/" + context.getVariable("exportFolder2") + "/AmazonRootCA1.crt").exists(), "Certificate AmazonRootCA1.crt is missing");
111+
assertTrue(new File(context.getVariable("exportLocation") + "/" + context.getVariable("exportFolder2") + "/WE1.crt").exists(), "Certificate WE1.crt is missing");
113112
//assertTrue(new File(context.getVariable("exportLocation")+"/"+context.getVariable("exportFolder2")+"/Amazon.crt").exists(), "Certificate Amazon.crt is missing");
114113
assertTrue(new File(context.getVariable("exportLocation") + "/" + context.getVariable("exportFolder2") + "/" + context.getVariable("exportAPIName2")).exists(), "Exported Swagger-File is missing");
115114
}

‎modules/apis/src/test/java/com/axway/apim/test/description/LocalMarkdownDescriptionTestIT.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import org.citrusframework.message.MessageType;
99
import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
1010
import org.springframework.beans.factory.annotation.Autowired;
11+
import org.springframework.beans.factory.annotation.Value;
1112
import org.springframework.http.HttpStatus;
1213
import org.springframework.test.context.ContextConfiguration;
1314
import org.testng.annotations.Test;
@@ -24,6 +25,12 @@ public class LocalMarkdownDescriptionTestIT extends TestNGCitrusSpringSupport {
2425
@Autowired
2526
HttpClient apiManager;
2627

28+
@Value("${apiManagerUser}")
29+
private String username;
30+
31+
@Value("${apiManagerPass}")
32+
private String password;
33+
2734
@CitrusTest
2835
@Test
2936
public void importAPIWithLocalMarkdown() {
@@ -34,6 +41,11 @@ public void importAPIWithLocalMarkdown() {
3441
variable("apiPath", "/localmarkdown-api-${apiNumber}");
3542
variable("apiName", "LocalMarkDown-API-${apiNumber}");
3643

44+
// Directly use an admin-account, otherwise the OrgAdmin organization is used by default
45+
variable("oadminUsername1", username);
46+
variable("oadminPassword1", password);
47+
48+
3749
$(echo("####### Importing API: '${apiName}' on path: '${apiPath}' #######"));
3850

3951
variable(ImportTestAction.API_DEFINITION, "/com/axway/apim/test/files/basic/petstore.json");

‎modules/apis/src/test/java/com/axway/apim/test/envProperties/UsingEnvironmentTestIT.java‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import org.citrusframework.http.client.HttpClient;
88
import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
99
import org.springframework.beans.factory.annotation.Autowired;
10+
import org.springframework.beans.factory.annotation.Value;
1011
import org.springframework.test.context.ContextConfiguration;
1112
import org.testng.annotations.Test;
1213

@@ -16,8 +17,12 @@
1617
@ContextConfiguration(classes = {EndpointConfig.class})
1718
public class UsingEnvironmentTestIT extends TestNGCitrusSpringSupport {
1819

19-
@Autowired
20-
HttpClient apiManager;
20+
@Value("${apiManagerUser}")
21+
private String username;
22+
23+
@Value("${apiManagerPass}")
24+
private String password;
25+
2126

2227

2328
@CitrusTest(name = "UsingEnvironmentTestIT")
@@ -28,7 +33,8 @@ public void run() {
2833
variable("apiNumber", RandomNumberFunction.getRandomNumber(3, true));
2934
variable("apiPath", "/envrionment-stage-api-${apiNumber}");
3035
variable("apiName", "envrionment-stage-API-${apiNumber}");
31-
36+
variable("oadminUsername1", username);
37+
variable("oadminPassword1", password);
3238

3339
$(echo("####### Importing API: '${apiName}' on path: '${apiPath}' for the first time #######"));
3440
variable(ImportTestAction.API_CONFIG, "/com/axway/apim/test/files/basic/minimal-config-with-api-definition.json");

‎modules/apis/src/test/java/com/axway/apim/test/organizations/InvalidDevelopmentOrgTestIT.java‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import org.citrusframework.message.MessageType;
88
import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
99
import org.springframework.beans.factory.annotation.Autowired;
10+
import org.springframework.beans.factory.annotation.Value;
1011
import org.springframework.http.HttpStatus;
1112
import org.springframework.test.context.ContextConfiguration;
1213
import org.testng.annotations.Test;
@@ -21,6 +22,13 @@
2122
@ContextConfiguration(classes = {EndpointConfig.class})
2223
public class InvalidDevelopmentOrgTestIT extends TestNGCitrusSpringSupport {
2324

25+
26+
@Value("${apiManagerUser}")
27+
private String username;
28+
29+
@Value("${apiManagerPass}")
30+
private String password;
31+
2432
@Autowired
2533
HttpClient apiManager;
2634

@@ -33,8 +41,8 @@ public void runUnknownOrg() {
3341
variable("apiPath", "/invalid-org-${apiNumber}");
3442
variable("apiName", "Invalid organization ${apiNumber}");
3543
// Directly use an admin-account, otherwise the OrgAdmin organization is used by default
36-
variable("oadminUsername1", "apiadmin");
37-
variable("oadminPassword1", "changeme");
44+
variable("oadminUsername1", username);
45+
variable("oadminPassword1", password);
3846
variable("testOrgName", "Invalid organization ${orgNumber}");
3947
variable("testOrgName", "Org without permission ${apiNumber}");
4048
$(echo("####### Try to import an API with an invalid organization - Must be handled with a proper error-code and message #######"));
@@ -53,8 +61,8 @@ public void runNonDevOrg() {
5361
variable("apiPath", "/invalid-org-${apiNumber}");
5462
variable("apiName", "Invalid organization ${apiNumber}");
5563
// Directly use an admin-account, otherwise the OrgAdmin organization is used by default
56-
variable("oadminUsername1", "apiadmin");
57-
variable("oadminPassword1", "changeme");
64+
variable("oadminUsername1", username);
65+
variable("oadminPassword1", password);
5866
variable("testOrgName", "NonDevOrg ${apiNumber}");
5967

6068
$(http().client(apiManager).send().post("/organizations").name("anotherOrgCreatedRequest").message()

‎modules/apis/src/test/java/com/axway/apim/test/security/UnpublishedApiKeyTestIT.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import org.citrusframework.message.MessageType;
99
import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
1010
import org.springframework.beans.factory.annotation.Autowired;
11+
import org.springframework.beans.factory.annotation.Value;
1112
import org.springframework.http.HttpStatus;
1213
import org.springframework.test.context.ContextConfiguration;
1314
import org.testng.annotations.Test;
@@ -23,6 +24,11 @@ public class UnpublishedApiKeyTestIT extends TestNGCitrusSpringSupport {
2324

2425
@Autowired
2526
HttpClient apiManager;
27+
@Value("${apiManagerUser}")
28+
private String username;
29+
30+
@Value("${apiManagerPass}")
31+
private String password;
2632

2733
@CitrusTest(name = "UnpublishedApiKeyTest")
2834
@Test
@@ -35,6 +41,10 @@ public void run() {
3541
variable("apiName", "API Key Test ${apiNumber}");
3642
variable("status", "unpublished");
3743

44+
// Directly use an admin-account, otherwise the OrgAdmin organization is used by default
45+
variable("oadminUsername1", username);
46+
variable("oadminPassword1", password);
47+
3848
$(echo("####### Importing API: '${apiName}' on path: '${apiPath}' with following settings: #######"));
3949
variable("apiKeyFieldName", "KeyId");
4050
variable("takeFrom", "HEADER");

‎modules/apis/src/test/java/com/axway/apim/test/vhost/VhostConfigOrgWithVHostTestIT.java‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import org.citrusframework.message.MessageType;
1111
import org.citrusframework.testng.spring.TestNGCitrusSpringSupport;
1212
import org.springframework.beans.factory.annotation.Autowired;
13+
import org.springframework.beans.factory.annotation.Value;
1314
import org.springframework.http.HttpStatus;
1415
import org.springframework.test.context.ContextConfiguration;
1516
import org.testng.annotations.Optional;
@@ -29,6 +30,12 @@ public class VhostConfigOrgWithVHostTestIT extends TestNGCitrusSpringSupport {
2930
@Autowired
3031
HttpClient apiManager;
3132

33+
@Value("${apiManagerUser}")
34+
private String username;
35+
36+
@Value("${apiManagerPass}")
37+
private String password;
38+
3239

3340
@CitrusTest
3441
@Test
@@ -42,8 +49,8 @@ public void run(@Optional @CitrusResource TestContext context) throws IOExceptio
4249
variable("vhost", "abc.company.com");
4350
variable("vhostOrgName", "VHost Org ${orgNumber}");
4451
// Directly use an admin-account, otherwise the OrgAdmin organization is used by default
45-
variable("oadminUsername1", "apiadmin");
46-
variable("oadminPassword1", "changeme");
52+
variable("oadminUsername1", username);
53+
variable("oadminPassword1", password);
4754

4855
$(http().client(apiManager).send().post("/organizations").message().header("Content-Type", "application/json")
4956
.body("{\"name\": \"${vhostOrgName}\", \"description\": \"Org 1 with dev permission and VHost\", \"enabled\": true, \"development\": true, \"virtualHost\": \"${vhost}\" }"));

0 commit comments

Comments
 (0)