Unit-Test Bugfixing

Author: Chris Wiechmann

modules/apim-adapter/src/main/java/com/axway/apim/adapter/APIManagerAdapter.java

@@ -133,6 +133,9 @@ public static synchronized APIManagerAdapter getInstance() throws AppException {
 			APIManagerAdapter.instance = new APIManagerAdapter();
 			if(!TestIndicator.getInstance().isTestRunning()) {
 				LOG.info("Successfully connected to API-Manager (" + getApiManagerVersion() + ") on: " + CommandParameters.getInstance().getAPIManagerURL());
+			} else {
+				APIManagerAdapter.apiManagerVersion = "7.7.0";
+				LOG.info("Successfully connected to MOCKED API-Manager (" + getApiManagerVersion() + ")");
 			}
 		}
 		return APIManagerAdapter.instance;

modules/apim-adapter/src/main/java/com/axway/apim/api/model/Organization.java

@@ -161,13 +161,12 @@ public String getIsTrial() {
 	public void setIsTrial(String isTrial) {
 		this.isTrial = isTrial;
 	}
-
+	
 	@Override
 	public boolean equals(Object other) {
 		if(other == null) return false;
 		if(other instanceof Organization) {
-			Organization otherOrg = (Organization)other;
-			return StringUtils.equals(otherOrg.getName(), this.getName());
+			return StringUtils.equals(((Organization)other).getName(), this.getName());
 		}
 		return false;
 	}

modules/users/src/main/java/com/axway/apim/users/lib/UserExportCLIOptions.java

@@ -22,6 +22,11 @@ public UserExportCLIOptions(String[] args) throws ParseException {
 		option.setArgName("*Mark*");
 		options.addOption(option);
 
+		option = new  Option("email", true, "Filter users with the specified Email-Address. You may use wildcards at the end or beginning.");
+		option.setRequired(false);
+		option.setArgName("*@axway.com*");
+		options.addOption(option);
+		
 		option = new  Option("type", true, "Filter users with specific type. External users are managed in external system such as LDAP");
 		option.setRequired(false);
 		option.setArgName("internal|external");