Fix issue #119 - Now all configuration fields are handled

Added new unit-test and improved existing integration test

Author: Chris Wiechmann

modules/apim-adapter/src/main/java/com/axway/apim/adapter/apis/APIManagerConfigAdapter.java

@@ -48,7 +48,11 @@ public APIManagerConfigAdapter() {}
 	Map<Boolean, Config> managerConfig = new HashMap<Boolean, Config>();
 
 
-	private static enum ConfigFields {
+	/**
+	 * Config fields that are introduced with a certain API-Manager version. 
+	 * This list is mainly used to filter out fields, when using an older API-Manager version.
+	 */
+	protected static enum ConfigFields {
 		version77 ("7.7.0", new String[] {"userNameRegex", "apiImportTimeout", "apiImportMimeValidation", "apiImportEditable", "lockUserAccount" }),
 		version762 ("7.6.2", new String[] {
 				"changePasswordOnFirstLogin", "passwordExpiryEnabled", "passwordLifetimeDays", "applicationScopeRestrictions", "strictCertificateChecking", 
@@ -70,11 +74,11 @@ public String getManagerVersion() {
 		public static String[] getIgnoredFields() {
 			String[] restrictedFields = new String[] {};
 			for(ConfigFields fields : values()) {
-				restrictedFields = ArrayUtils.addAll(restrictedFields, fields.ignoreFields);
 				// Add all ignore fields until we reached the used API-Manager version
 				if(APIManagerAdapter.hasAPIManagerVersion(fields.getManagerVersion())) {
 					break;
 				}
+				restrictedFields = ArrayUtils.addAll(restrictedFields, fields.ignoreFields);
 			}
 			return restrictedFields;
 		}

modules/apim-adapter/src/test/java/com/axway/apim/adapter/apis/APIManagerConfigAdapterTest.java

@@ -0,0 +1,24 @@
+package com.axway.apim.adapter.apis;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import com.axway.apim.adapter.APIManagerAdapter;
+
+public class APIManagerConfigAdapterTest {
+	
+	@Test
+	public void testCorrectFieldsAreIgnored() {
+		APIManagerAdapter.apiManagerVersion = "7.7.20200930";
+		String[] ignoreFields = APIManagerConfigAdapter.ConfigFields.getIgnoredFields();
+		// No field should be ignored for the Sept-Release
+		Assert.assertNotNull(ignoreFields);
+		Assert.assertEquals(ignoreFields.length, 0);
+		
+		APIManagerAdapter.apiManagerVersion = "7.6.2";
+		ignoreFields = APIManagerConfigAdapter.ConfigFields.getIgnoredFields();
+		Assert.assertNotNull(ignoreFields);
+		// Five config fields, based on all known fields are not supported by an API-Manager 7.6.2
+		Assert.assertEquals(ignoreFields.length, 5);
+	}
+}

modules/settings/src/test/java/com/axway/apim/setup/it/tests/ImportAndExportConfigTestIT.java

@@ -5,6 +5,7 @@
 import org.testng.annotations.Parameters;
 import org.testng.annotations.Test;
 
+import com.axway.apim.adapter.APIManagerAdapter;
 import com.axway.apim.lib.errorHandling.AppException;
 import com.axway.apim.setup.it.ExportManagerConfigTestAction;
 import com.axway.apim.setup.it.ImportManagerConfigTestAction;
@@ -55,9 +56,16 @@ public void runUpdateConfiguration(@Optional @CitrusResource TestContext context
 
 		echo("####### Validate configuration has been applied #######");
 		http(builder -> builder.client("apiManager").send().get("/config").header("Content-Type", "application/json"));
-		
-		http(builder -> builder.client("apiManager").receive().response(HttpStatus.OK).messageType(MessageType.JSON)
-				.validate("$.portalName", "${portalName}"));
+		if(APIManagerAdapter.hasAPIManagerVersion("7.7.20200130")) {
+			http(builder -> builder.client("apiManager").receive().response(HttpStatus.OK).messageType(MessageType.JSON)
+					.validate("$.portalName", "${portalName}")
+					.validate("$.apiImportEditable", "true")
+					);
+		} else {
+			http(builder -> builder.client("apiManager").receive().response(HttpStatus.OK).messageType(MessageType.JSON)
+					.validate("$.portalName", "${portalName}"));
+		}
+
 
 		echo("####### Import configuration #######");
 		createVariable(PARAM_CONFIGFILE,  PACKAGE + "apimanager-config.json");