From 2eea666f00f1d7d0a1c82ac06b23b4594237741c Mon Sep 17 00:00:00 2001
From: rathnapandi <rnatarajan@axway.com>
Date: Mon, 7 Oct 2024 12:46:07 -0700
Subject: [PATCH] - Fix integration test

---
 .../test/applications/ApplicationExportTestIT.java  |  2 +-
 .../java/com/axway/apim/test/ImportTestAction.java  | 13 ++++++-------
 .../files/applications/1_api-with-0-org-1-app.json  |  3 ++-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/apis/src/test/java/com/axway/apim/export/test/applications/ApplicationExportTestIT.java b/modules/apis/src/test/java/com/axway/apim/export/test/applications/ApplicationExportTestIT.java
index e3e9f9acf..262b2481a 100644
--- a/modules/apis/src/test/java/com/axway/apim/export/test/applications/ApplicationExportTestIT.java
+++ b/modules/apis/src/test/java/com/axway/apim/export/test/applications/ApplicationExportTestIT.java
@@ -60,7 +60,7 @@ public void run(@Optional @CitrusResource TestContext context) throws IOExceptio
         // ############## Creating Test-Application 1 #################
         variable("app1Name", "Consuming Test App ${apiNumber} ${orgNumber}");
         $(http().client(apiManager).send().post("/applications").message().header("Content-Type", "application/json")
-            .body("{\"name\":\"${app1Name}\",\"apis\":[],\"organizationId\":\"${orgId}\"}"));
+            .body("{\"name\":\"${app1Name}\",\"apis\":[],\"organizationId\":\"${orgId3}\"}"));
 
         $(http().client(apiManager).receive().response(HttpStatus.CREATED).message().type(MessageType.JSON).extract(fromBody()
             .expression("$.id", "consumingTestApp1Id")
diff --git a/modules/apis/src/test/java/com/axway/apim/test/ImportTestAction.java b/modules/apis/src/test/java/com/axway/apim/test/ImportTestAction.java
index 0740c4dc8..457ec7a37 100644
--- a/modules/apis/src/test/java/com/axway/apim/test/ImportTestAction.java
+++ b/modules/apis/src/test/java/com/axway/apim/test/ImportTestAction.java
@@ -49,8 +49,8 @@ public void doExecute(TestContext context) {
             apiDefinition = origApiDefinition;
         }
         String configFile = replaceDynamicContentInFile(origConfigFile, context, createTempFilename(origConfigFile));
-        LOG.info("Using Replaced Swagger-File: " + apiDefinition);
-        LOG.info("Using Replaced configFile-File: " + configFile);
+        LOG.info("Using Replaced Swagger-File: {}", apiDefinition);
+        LOG.info("Using Replaced configFile-File: {}", configFile);
         int expectedReturnCode = 0;
         try {
             expectedReturnCode = Integer.parseInt(context.getVariable("expectedReturnCode"));
@@ -119,7 +119,7 @@ public void doExecute(TestContext context) {
             // This creates the dynamic staging config file! (For testing, we also support reading out of a file directly)
             replaceDynamicContentInFile(stageConfigFile, context, replacedStagedConfig);
         }
-        copyImagesAndCertificates(origConfigFile, context);
+        copyImagesAndCertificates(origConfigFile);
 
         List<String> args = new ArrayList<>();
         if (useEnvironmentOnly) {
@@ -138,8 +138,7 @@ public void doExecute(TestContext context) {
             if (useApiAdmin) {
                 LOG.info("API-Manager import is using user: '" + context.replaceDynamicContentInString("${apiManagerUser}") + "'");
                 args.add(context.replaceDynamicContentInString("${apiManagerUser}"));
-            }
-            else {
+            } else {
                 LOG.info("API-Manager import is using user: '" + context.replaceDynamicContentInString("${oadminUsername1}") + "'");
                 args.add(context.replaceDynamicContentInString("${oadminUsername1}"));
             }
@@ -262,7 +261,7 @@ private File createTestDirectory(TestContext context) {
         return testDir;
     }
 
-    private void copyImagesAndCertificates(String origConfigFile, TestContext context) {
+    private void copyImagesAndCertificates(String origConfigFile) {
         File sourceDir = new File(origConfigFile).getParentFile();
         if (!sourceDir.exists()) {
             sourceDir = new File(ImportTestAction.class.getResource(origConfigFile).getFile()).getParentFile();
@@ -272,7 +271,7 @@ private void copyImagesAndCertificates(String origConfigFile, TestContext contex
         }
         FileFilter filter = new WildcardFileFilter("*.crt", "*.jpg", "*.png", "*.pem", "*.md");
         try {
-            LOG.info("Copy certificates and images from source: " + sourceDir + " into test-dir: '" + testDir + "' (Filter: \"*.crt\", \"*.jpg\", \"*.png\", \"*.pem\", \"*.md\")");
+            LOG.info("Copy certificates and images from source: {} into test-dir: {} (Filter: \"*.crt\", \"*.jpg\", \"*.png\", \"*.pem\", \"*.md\")", sourceDir, testDir);
             FileUtils.copyDirectory(sourceDir, testDir, filter);
         } catch (IOException e) {
             e.printStackTrace();
diff --git a/modules/apis/src/test/resources/test/export/files/applications/1_api-with-0-org-1-app.json b/modules/apis/src/test/resources/test/export/files/applications/1_api-with-0-org-1-app.json
index b50d33006..6a7216e81 100644
--- a/modules/apis/src/test/resources/test/export/files/applications/1_api-with-0-org-1-app.json
+++ b/modules/apis/src/test/resources/test/export/files/applications/1_api-with-0-org-1-app.json
@@ -4,7 +4,8 @@
    "state":"${state}",
    "version":"1.0.1",
    "organization":"API Development ${orgNumber}",
+  "clientOrganizations" : [ "API Development 5172" ],
    "applications":[
       { "name":"${consumingTestAppName}" }
    ]
-}
\ No newline at end of file
+}