Improved integration test to validate application-subscriptions

#114

Author: Chris Wiechmann

modules/apis/src/test/java/com/axway/apim/test/applications/ApplicationSubscriptionTestIT.java

@@ -58,7 +58,7 @@ public void run(@Optional @CitrusResource TestContext context) throws IOExceptio
 		createVariable("extClientId", RandomNumberFunction.getRandomNumber(15, true));
 		createVariable("app2Name", "Test-SubApp 2 ${apiNumber}");
 		http(builder -> builder.client("apiManager").send().post("/applications").header("Content-Type", "application/json")
-			.payload("{\"name\":\"${app2Name}\",\"apis\":[],\"organizationId\":\"${orgId}\"}"));
+			.payload("{\"name\":\"${app2Name}\",\"apis\":[],\"organizationId\":\"${orgId2}\"}"));
 
 		http(builder -> builder.client("apiManager").receive().response(HttpStatus.CREATED).messageType(MessageType.JSON)
 			.extractFromPayload("$.id", "consumingTestApp2Id")
@@ -77,7 +77,7 @@ public void run(@Optional @CitrusResource TestContext context) throws IOExceptio
 		// ############## Creating Test-Application 3 #################
 		createVariable("app3Name", "Test-SubApp 3 ${apiNumber}");
 		http(builder -> builder.client("apiManager").send().post("/applications").header("Content-Type", "application/json")
-			.payload("{\"name\":\"${app3Name}\",\"apis\":[],\"organizationId\":\"${orgId}\"}"));
+			.payload("{\"name\":\"${app3Name}\",\"apis\":[],\"organizationId\":\"${orgId2}\"}"));
 
 		http(builder -> builder.client("apiManager").receive().response(HttpStatus.CREATED).messageType(MessageType.JSON)
 			.extractFromPayload("$.id", "consumingTestApp3Id")
@@ -91,6 +91,7 @@ public void run(@Optional @CitrusResource TestContext context) throws IOExceptio
 		createVariable(ImportTestAction.API_CONFIG,  "/com/axway/apim/test/files/applications/1_api-with-1-org-some-apps.json");
 		createVariable("state", "published");
 		createVariable("orgName", "${orgName}");
+		createVariable("version", "1.0.0");
 		createVariable("expectedReturnCode", "0");
 		swaggerImport.doExecute(context);
 
@@ -139,8 +140,43 @@ public void run(@Optional @CitrusResource TestContext context) throws IOExceptio
 			.validate("$.[?(@.path=='${apiPath}')].name", "${apiName}")
 			.validate("$.[?(@.path=='${apiPath}')].id", "${apiId}")); // Must be the same API-ID as before!
 
+		echo("####### Changin FE-API Settings only for: '${apiName}' - Mode: Unpublish/Publish and make sure subscriptions stay #######");
+		createVariable(ImportTestAction.API_DEFINITION,  "/com/axway/apim/test/files/basic/petstore.json");
+		createVariable(ImportTestAction.API_CONFIG,  "/com/axway/apim/test/files/applications/1_api-with-1-org-some-apps.json");
+		createVariable("state", "published");
+		createVariable("orgName", "${orgName}");
+		createVariable("version", "2.0.0");
+		createVariable("expectedReturnCode", "0");
+		swaggerImport.doExecute(context);
+		
+		echo("####### Validate API: '${apiName}' has been reconfigured (Unpublich/Publish) and appscriptions are recreated #######");
+		http(builder -> builder.client("apiManager").send().get("/proxies/${apiId}").header("Content-Type", "application/json"));
+
+		http(builder -> builder.client("apiManager").receive().response(HttpStatus.OK).messageType(MessageType.JSON)
+			.validate("$.[?(@.id=='${apiId}')].name", "${apiName}")
+			.validate("$.[?(@.id=='${apiId}')].state", "published"));
+		
+		echo("####### Validate Application 3 still has an active subscription to the API (Based on the name) #######");
+		http(builder -> builder.client("apiManager").send().get("/applications/${consumingTestApp3Id}/apis").header("Content-Type", "application/json"));
+		
+		http(builder -> builder.client("apiManager").receive().response(HttpStatus.OK).messageType(MessageType.JSON)
+			.validate("$.*.apiId", "${apiId}"));
+		
+		echo("####### Validate Application 1 still has an active subscription to the API (based on the API-Key) #######");
+		http(builder -> builder.client("apiManager").send().get("/applications/${consumingTestApp1Id}/apis").header("Content-Type", "application/json"));
+		
+		http(builder -> builder.client("apiManager").receive().response(HttpStatus.OK).messageType(MessageType.JSON)
+			.validate("$.*.apiId", "${apiId}"));
+		
+		echo("####### Validate Application 2 still has an active subscription to the API (based on the Ext-Client-Id) #######");
+		http(builder -> builder.client("apiManager").send().get("/applications/${consumingTestApp2Id}/apis")
+			.header("Content-Type", "application/json"));
+		
+		http(builder -> builder.client("apiManager").receive().response(HttpStatus.OK).messageType(MessageType.JSON)
+			.validate("$.*.apiId", "${apiId}"));
+		
 		echo("####### Re-Importing same API: '${apiName}' - Without applications subscriptions and mode replace #######");
-		createVariable(ImportTestAction.API_DEFINITION,  "/com/axway/apim/test/files/basic/petstore2.json");
+		createVariable(ImportTestAction.API_DEFINITION,  "/com/axway/apim/test/files/basic/petstore.json");
 		createVariable(ImportTestAction.API_CONFIG,  "/com/axway/apim/test/files/basic/4_flexible-status-config.json");
 		createVariable("state", "published");
 		createVariable("orgName", "${orgName}");

modules/apis/src/test/resources/com/axway/apim/test/files/applications/1_api-with-1-org-some-apps.json

@@ -2,7 +2,7 @@
    "name":"${apiName}",
    "path":"${apiPath}",
    "state":"${state}",
-   "version":"1.0.1",
+   "version":"${version}",
    "organization":"API Development ${orgNumber}",
    "clientOrganizations":[
       "${orgName2}"