Fix the unit test

Author: habarthierry-hue

default.ps1

@@ -44,6 +44,8 @@ task pack -depends compile {
 	exec { dotnet pack $source_dir\CaseManagement.CMMN\CaseManagement.CMMN.csproj -c $config --no-build $versionSuffix --output $result_dir }
 	exec { dotnet pack $source_dir\CaseManagement.CMMN.AspNetCore\CaseManagement.CMMN.AspNetCore.csproj -c $config --no-build $versionSuffix --output $result_dir }
 	exec { dotnet pack $source_dir\CaseManagement.CMMN.AspNet\CaseManagement.CMMN.AspNet.csproj -c $config --no-build $versionSuffix --output $result_dir }
+	exec { dotnet pack $source_dir\CaseManagement.Gateway.Website\CaseManagement.Gateway.Website.csproj -c $config --no-build $versionSuffix --output $result_dir }
+	exec { dotnet pack $source_dir\CaseManagement.Gateway.Website.AspNetCore\CaseManagement.Gateway.Website.AspNetCore.csproj -c $config --no-build $versionSuffix --output $result_dir }
 }
 
 task test {

src/CaseManagement.CMMN/CasePlanInstance/Processors/Listeners/CriteriaListener.cs

@@ -1,6 +1,7 @@
 using CaseManagement.CMMN.CasePlanInstance.Exceptions;
 using CaseManagement.CMMN.Domains;
 using CaseManagement.CMMN.Domains.Events;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
@@ -32,17 +33,33 @@ public ListenEntryCriteriaResult(Task task, CriterionListener listener)
         public static void ListenEntryCriterias(ProcessorParameter parameter, CancellationToken cancellationToken)
         {
             var planItemDefinition = parameter.CaseDefinition.GetElement(parameter.CaseElementInstance.CasePlanElementId);
-            var entryCriterion = planItemDefinition.EntryCriterions.ToList();
-            if (!entryCriterion.Any())
+            var entryCriterion = planItemDefinition.EntryCriterions;
+            var casePlanElementType = parameter.CaseElementInstance.CasePlanElementType;
+            if (!entryCriterion.Any() || entryCriterion.Any(c => parameter.CaseInstance.IsCriteriaSatisfied(c, parameter.CaseElementInstance.Version)))
             {
                 return;
             }
 
-            if (entryCriterion.Any(c => parameter.CaseInstance.IsCriteriaSatisfied(c, parameter.CaseElementInstance.Version)))
+            if (!parameter.CaseElementInstance.IsTaskOrStage() && casePlanElementType != CaseElementTypes.Milestone)
             {
                 return;
             }
 
+            if (casePlanElementType == CaseElementTypes.Milestone)
+            {
+                if (parameter.CaseElementInstance.State != Enum.GetName(typeof(MilestoneStates), MilestoneStates.Available))
+                {
+                    return;
+                }
+            }
+            else   
+            {
+                if (parameter.CaseElementInstance.State != Enum.GetName(typeof(TaskStates), TaskStates.Available))
+                {
+                    return;
+                }
+            }
+
             var criterionListener = new CriterionListener(parameter, cancellationToken, entryCriterion);
             criterionListener.Listen();
         }

src/CaseManagement.CMMN/CasePlanInstance/Processors/ProcessorParameter.cs

@@ -12,7 +12,7 @@ public ProcessorParameter(CasePlanAggregate caseDefinition, Domains.CasePlanInst
         }
 
         public CasePlanAggregate CaseDefinition { get; set; }
-        public Domains.CasePlanInstanceAggregate CaseInstance { get; set; }
+        public CasePlanInstanceAggregate CaseInstance { get; set; }
         public CaseElementInstance CaseElementInstance { get; set; }
     }
 }

src/CaseManagement.CMMN/Domains/CasePlanInstance/CasePlanInstanceAggregate.cs

@@ -131,13 +131,24 @@ public bool IsRepetitionRuleSatisfied(string planItemId, CasePlanAggregate workf
 
         public bool IsManualActivationRuleSatisfied(string id, CasePlanAggregate workflowDefinition)
         {
-            var planItemDef = GetWorkflowElementDefinition(id, workflowDefinition);
-            if (planItemDef == null || planItemDef.ActivationRule != ActivationRuleTypes.ManualActivation || planItemDef.ManualActivationRule == null)
+            var casePlanElementInstance = GetWorkflowElementInstance(id);
+            var casePlanElement = GetWorkflowElementDefinition(id, workflowDefinition);
+            if (!casePlanElementInstance.IsTaskOrStage())
             {
                 return false;
             }
 
-            if (planItemDef.ManualActivationRule.Expression != null && !ExpressionParser.IsValid(planItemDef.ManualActivationRule.Expression.Body, this))
+            if (casePlanElementInstance.State != Enum.GetName(typeof(TaskStates), TaskStates.Available))
+            {
+                return false;
+            }
+
+            if (casePlanElement == null || casePlanElement.ActivationRule != ActivationRuleTypes.ManualActivation || casePlanElement.ManualActivationRule == null)
+            {
+                return false;
+            }
+
+            if (casePlanElement.ManualActivationRule.Expression != null && !ExpressionParser.IsValid(casePlanElement.ManualActivationRule.Expression.Body, this))
             {
                 return false;
             }
@@ -357,7 +368,7 @@ public void MakeTransitionStart(string elementId)
                     return;
                 }
 
-                if (!elt.IsTaskOrStage() && elt.State != Enum.GetName(typeof(TaskStates), TaskStates.Available))
+                if (!elt.IsTaskOrStage() || elt.State != Enum.GetName(typeof(TaskStates), TaskStates.Available))
                 {
                     return;
                 }