Adapted TestPolicyRules2.

Evolveum · Dec 5, 2017 · 588d792 · 588d792
1 parent 22a4b38
commit 588d792
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 40 deletions.
diff --git a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules2.java b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules2.java
@@ -854,8 +854,8 @@ public void test300ModifyInducement() throws Exception {
 			TestUtil.displayThen(TEST_NAME);
 			System.out.println("Expected exception: " + e);
 			e.printStackTrace(System.out);
-			if (!e.getMessage().contains("Role \"Immutable inducements\" is to be modified")) {
-				fail("Exception message was not as expected: " + e.getMessage());
+			if (!getTranslatedMessage(e).contains("Role \"Immutable inducements\" is to be modified")) {
+				fail("Exception message was not as expected: " + getTranslatedMessage(e));
 			}
 		}
 	}
@@ -943,8 +943,8 @@ public void test330AddInducement() throws Exception {
 			TestUtil.displayThen(TEST_NAME);
 			System.out.println("Expected exception: " + e);
 			e.printStackTrace(System.out);
-			if (!e.getMessage().contains("Role \"No inducements add or delete\" is to be modified")) {
-				fail("Exception message was not as expected: " + e.getMessage());
+			if (!getTranslatedMessage(e).contains("Role \"No inducements add or delete\" is to be modified")) {
+				fail("Exception message was not as expected: " + getTranslatedMessage(e));
 			}
 		}
 	}
@@ -978,8 +978,8 @@ public void test340AddInducementViaExpression() throws Exception {
 			TestUtil.displayThen(TEST_NAME);
 			System.out.println("Expected exception: " + e);
 			e.printStackTrace(System.out);
-			if (!e.getMessage().contains("Role \"No inducements add or delete (expression)\" is to be modified")) {
-				fail("Exception message was not as expected: " + e.getMessage());
+			if (!getTranslatedMessage(e).contains("Role \"No inducements add or delete (expression)\" is to be modified")) {
+				fail("Exception message was not as expected: " + getTranslatedMessage(e));
 			}
 		}
 	}

diff --git a/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java b/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
@@ -22,6 +22,7 @@
 
 import com.evolveum.icf.dummy.resource.DummyResource;
 import com.evolveum.midpoint.common.Clock;
+import com.evolveum.midpoint.common.LocalizationService;
 import com.evolveum.midpoint.common.crypto.CryptoUtil;
 import com.evolveum.midpoint.common.refinery.RefinedAttributeDefinition;
 import com.evolveum.midpoint.common.refinery.RefinedObjectClassDefinition;
@@ -91,15 +92,7 @@
 import com.evolveum.midpoint.test.util.TestUtil;
 import com.evolveum.midpoint.tools.testng.CurrentTestResultHolder;
 import com.evolveum.midpoint.util.*;
-import com.evolveum.midpoint.util.exception.CommonException;
-import com.evolveum.midpoint.util.exception.CommunicationException;
-import com.evolveum.midpoint.util.exception.ConfigurationException;
-import com.evolveum.midpoint.util.exception.ExpressionEvaluationException;
-import com.evolveum.midpoint.util.exception.ObjectAlreadyExistsException;
-import com.evolveum.midpoint.util.exception.ObjectNotFoundException;
-import com.evolveum.midpoint.util.exception.SchemaException;
-import com.evolveum.midpoint.util.exception.SecurityViolationException;
-import com.evolveum.midpoint.util.exception.SystemException;
+import com.evolveum.midpoint.util.exception.*;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
@@ -134,15 +127,7 @@
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
 import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.Set;
+import java.util.*;
 import java.util.function.BiConsumer;
 import java.util.stream.Collectors;
 
@@ -177,28 +162,19 @@ public abstract class AbstractIntegrationTest extends AbstractTestNGSpringContex
 
 	private CachingStatistics lastResourceCacheStats;
 
-	@Autowired(required = true)
+	@Autowired
 	@Qualifier("cacheRepositoryService")
 	protected RepositoryService repositoryService;
 	protected static Set<Class> initializedClasses = new HashSet<Class>();
 	private long lastDummyResourceGroupMembersReadCount;
 	private long lastDummyResourceWriteOperationCount;
 
-	@Autowired(required = true)
-	protected TaskManager taskManager;
-
-	@Autowired(required = true)
-	protected Protector protector;
-
-	@Autowired(required = true)
-	protected Clock clock;
-
-	@Autowired(required = true)
-	protected PrismContext prismContext;
-
-	@Autowired(required = true)
-	protected MatchingRuleRegistry matchingRuleRegistry;
-
+	@Autowired protected TaskManager taskManager;
+	@Autowired protected Protector protector;
+	@Autowired protected Clock clock;
+	@Autowired protected PrismContext prismContext;
+	@Autowired protected MatchingRuleRegistry matchingRuleRegistry;
+	@Autowired protected LocalizationService localizationService;
 
 	// Controllers for embedded OpenDJ and Derby. The abstract test will configure it, but
 	// it will not start
@@ -2193,4 +2169,12 @@ protected ItemPath getMetadataPath(QName propName) {
 	protected boolean isOsUnix() {
 		return SystemUtils.IS_OS_UNIX;
 	}
+
+	protected String getTranslatedMessage(CommonException e) {
+		if (e.getUserFriendlyMessage() != null) {
+			return localizationService.translate(e.getUserFriendlyMessage(), Locale.US);
+		} else {
+			return e.getMessage();
+		}
+	}
 }