TestPolicyRules, TestPasswordAuthenticationEvaluator: cosmetics/cleanup

Evolveum · Feb 26, 2020 · 7629f70 · 7629f70
1 parent a002155
commit 7629f70
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 45 deletions.
diff --git a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestPolicyRules.java
@@ -72,11 +72,6 @@ public void initSystem(Task initTask, OperationResult initResult) throws Excepti
         assumeAssignmentPolicy(AssignmentPolicyEnforcementType.FULL);
 
         InternalMonitor.reset();
-//        InternalMonitor.setTraceShadowFetchOperation(true);
-
-//        DebugUtil.setPrettyPrintBeansAs(PrismContext.LANG_YAML);
-
-//        setPredefinedTestMethodTracing(MODEL_LOGGING);
     }
 
     @Test
@@ -105,7 +100,6 @@ public void test005JackAttemptAssignRoleJudge() throws Exception {
         TestUtil.assertSuccess(result);
 
         dumpPolicyRules(context);
-        //dumpPolicySituations(context);
 
         assertEvaluatedTargetPolicyRules(context, 7);
         assertTargetTriggers(context, PolicyConstraintKindType.OBJECT_STATE, 2);
@@ -141,7 +135,6 @@ public void test007JackAttemptAssignRoleJudgeAsOwner() throws Exception {
         TestUtil.assertSuccess(result);
 
         dumpPolicyRules(context);
-        //dumpPolicySituations(context);
 
         assertEvaluatedTargetPolicyRules(context, 4);
         assertTargetTriggers(context, PolicyConstraintKindType.ASSIGNMENT_MODIFICATION, 0);
@@ -239,10 +232,6 @@ public void test100AssignRoleMutinierToJack() throws Exception {
 
         assertAssignAccountToJack(context);
 
-//        DeltaSetTriple<EvaluatedAssignmentImpl<UserType>> evaluatedAssignmentTriple =
-//                (DeltaSetTriple)context.getEvaluatedAssignmentTriple();
-//        display("Output evaluatedAssignmentTriple", evaluatedAssignmentTriple);
-
         dumpPolicyRules(context);
         dumpPolicySituations(context);
         assertEvaluatedTargetPolicyRules(context, 7);
@@ -276,10 +265,6 @@ public void test110AssignRolePirateToJack() throws Exception {
 
         assertAssignAccountToJack(context);
 
-//        DeltaSetTriple<EvaluatedAssignmentImpl<UserType>> evaluatedAssignmentTriple =
-//                (DeltaSetTriple)context.getEvaluatedAssignmentTriple();
-//        display("Output evaluatedAssignmentTriple", evaluatedAssignmentTriple);
-
         dumpPolicyRules(context);
         dumpPolicySituations(context);
         assertEvaluatedTargetPolicyRules(context, 7);
@@ -323,10 +308,6 @@ public void test112AssignRolePirateWithExceptionToJack() throws Exception {
 
         assertAssignAccountToJack(context);
 
-//        DeltaSetTriple<EvaluatedAssignmentImpl<UserType>> evaluatedAssignmentTriple =
-//                (DeltaSetTriple)context.getEvaluatedAssignmentTriple();
-//        display("Output evaluatedAssignmentTriple", evaluatedAssignmentTriple);
-
         dumpPolicyRules(context);
         dumpPolicySituations(context);
         List<EvaluatedPolicyRule> evaluatedRules = assertEvaluatedTargetPolicyRules(context, 7);
@@ -366,17 +347,9 @@ public void test120AssignRoleConstableToJack() throws Exception {
 
         display("Output context", context);
 
-//        DeltaSetTriple<EvaluatedAssignmentImpl<UserType>> evaluatedAssignmentTriple =
-//                (DeltaSetTriple)context.getEvaluatedAssignmentTriple();
-//        display("Output evaluatedAssignmentTriple", evaluatedAssignmentTriple);
-
         dumpPolicyRules(context);
         dumpPolicySituations(context);
         assertEvaluatedTargetPolicyRules(context, 8);
-        // conflicting assignment was pruned, so the exclusion is no longer present here
-//        EvaluatedExclusionTrigger trigger = (EvaluatedExclusionTrigger) assertTriggeredTargetPolicyRule(context, null, PolicyConstraintKindType.EXCLUSION, 1, true);
-//        assertNotNull("No conflicting assignment in trigger", trigger.getConflictingAssignment());
-//        assertEquals("Wrong conflicting assignment in trigger", ROLE_JUDGE_OID, trigger.getConflictingAssignment().getTarget().getOid());
 
         ObjectDelta<UserType> focusSecondaryDelta = context.getFocusContext().getSecondaryDelta();
         PrismAsserts.assertIsModify(focusSecondaryDelta);
@@ -497,9 +470,6 @@ public void test210AssignRoleEmployeeToJack() throws Exception {
         result.computeStatus();
         TestUtil.assertSuccess(result);
 
-//        DeltaSetTriple<EvaluatedAssignmentImpl<?>> evaluatedAssignmentTriple = context.getEvaluatedAssignmentTriple();
-        //display("Output evaluatedAssignmentTriple", evaluatedAssignmentTriple);
-
         dumpPolicyRules(context);
         dumpPolicySituations(context);
 
@@ -541,9 +511,6 @@ public void test220AssignRoleEngineerToJack() throws Exception {
         result.computeStatus();
         TestUtil.assertSuccess(result);
 
-//        DeltaSetTriple<EvaluatedAssignmentImpl<?>> evaluatedAssignmentTriple = context.getEvaluatedAssignmentTriple();
-        //display("Output evaluatedAssignmentTriple", evaluatedAssignmentTriple);
-
         dumpPolicyRules(context);
         dumpPolicySituations(context);
 
@@ -646,7 +613,6 @@ public void test400AssignRoleLocalized() throws Exception {
         TestUtil.assertSuccess(result);
 
         dumpPolicyRules(context);
-        //dumpPolicySituations(context);
 
         Locale SLOVAK = Locale.forLanguageTag("sk-SK");
         assertNotNull("No Slovak locale", SLOVAK);

diff --git a/...t/java/com/evolveum/midpoint/model/impl/security/TestPasswordAuthenticationEvaluator.java b/...t/java/com/evolveum/midpoint/model/impl/security/TestPasswordAuthenticationEvaluator.java
@@ -15,22 +15,15 @@
 import com.evolveum.midpoint.schema.constants.SchemaConstants;
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.task.api.Task;
-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.PolicyViolationException;
-import com.evolveum.midpoint.util.exception.SchemaException;
-import com.evolveum.midpoint.util.exception.SecurityViolationException;
+import com.evolveum.midpoint.util.exception.*;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.AbstractCredentialType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.CredentialsType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
 import com.evolveum.prism.xml.ns._public.types_3.ProtectedStringType;
 
-public class TestPasswordAuthenticationEvaluator extends TestAbstractAuthenticationEvaluator<String, PasswordAuthenticationContext, AuthenticationEvaluator<PasswordAuthenticationContext>>{
+public class TestPasswordAuthenticationEvaluator extends TestAbstractAuthenticationEvaluator<String, PasswordAuthenticationContext, AuthenticationEvaluator<PasswordAuthenticationContext>> {
 
-    @Autowired(required=true)
+    @Autowired
     private AuthenticationEvaluator<PasswordAuthenticationContext> passwordAuthenticationEvaluator;
 
     @Override
@@ -80,7 +73,11 @@ private ProtectedStringType getGuybrushPassword() {
     }
 
     @Override
-    public void modifyUserCredential(Task task, OperationResult result) throws ObjectNotFoundException, SchemaException, ExpressionEvaluationException, CommunicationException, ConfigurationException, ObjectAlreadyExistsException, PolicyViolationException, SecurityViolationException {
+    public void modifyUserCredential(Task task, OperationResult result)
+            throws ObjectNotFoundException, SchemaException, ExpressionEvaluationException,
+            CommunicationException, ConfigurationException, ObjectAlreadyExistsException,
+            PolicyViolationException, SecurityViolationException {
+
         modifyUserReplace(USER_GUYBRUSH_OID, SchemaConstants.PATH_PASSWORD_VALUE, task, result, getGuybrushPassword());
     }