Merge branch 'master' of github.com:Evolveum/midpoint

Evolveum · Oct 17, 2015 · c370b5a · c370b5a
2 parents 3858d90 + 0bc8f16
commit c370b5a
Show file tree

Hide file tree

Showing 6 changed files with 435 additions and 404 deletions.
diff --git a/.../provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfUtil.java b/.../provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfUtil.java
@@ -432,7 +432,9 @@ private static String createMessageFromAllExceptions(String prefix, Throwable ex
 	private static void addAllExceptionsToMessage(StringBuilder sb, Throwable ex) {
 		sb.append(ex.getClass().getName());
 		sb.append("(");
-		sb.append(ex.getMessage());
+		// Make sure that no non-printable chars shall pass
+		// e.g. AD LDAP produces non-printable chars in the messages
+		sb.append(ex.getMessage().replaceAll("\\p{C}", "?"));
 		sb.append(")");
 		if (ex.getCause() != null) {
 			sb.append("->");

diff --git a/...pl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestConnectorDiscovery.java b/...pl/src/test/java/com/evolveum/midpoint/provisioning/test/impl/TestConnectorDiscovery.java
@@ -94,7 +94,7 @@ public void test001Connectors() throws SchemaException {
 			ProvisioningTestUtil.assertConnectorSchemaSanity(conn, prismContext);
 		}
 
-		assertEquals("Unexpected number of connectors found", 5, connectors.size());
+		assertEquals("Unexpected number of connectors found", 6, connectors.size());
 	}
 
 	@Test
@@ -114,7 +114,7 @@ public void testListConnectors() throws Exception{
 			System.out.println("-----\n");
 		}
 
-		assertEquals("Unexpected number of connectors found", 5, connectors.size());
+		assertEquals("Unexpected number of connectors found", 6, connectors.size());
 	}
 
 	@Test

diff --git a/...isioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/ucf/TestUcfDummy.java b/...isioning-impl/src/test/java/com/evolveum/midpoint/provisioning/test/ucf/TestUcfDummy.java
@@ -250,7 +250,7 @@ public void test010ListConnectors() throws CommunicationException {
 
 		System.out.println("---------------------------------------------------------------------");
 
-		assertEquals("Unexpected number of connectors discovered", 5, connectors.size());
+		assertEquals("Unexpected number of connectors discovered", 6, connectors.size());
 	}
 
 	@Test