FIxed issue with Entity Equality

Ginger/GingerCoreCommon/Actions/Act.cs

@@ -2066,7 +2066,7 @@ public virtual void DoNewActionSetup()
 
         public override void PrepareItemToBeCopied()
         {
-            this.IsSharedRepositoryInstance = TargetFrameworkHelper.Helper.IsSharedRepositoryItem(this);
+            this.IsSharedRepositoryInstance = TargetFrameworkHelper.Helper?.IsSharedRepositoryItem(this) ?? false;
         }
 
         public override string GetItemType()
@@ -2116,7 +2116,7 @@ public bool AreEqual(object obj)
                 return false;
             }
 
-            return Equals(obj as Act);
+            return AreEqual(obj as Act);
         }
 
     }

Ginger/GingerCoreCommon/Actions/ActInputValue.cs

@@ -239,7 +239,9 @@ public bool AreEqual(ActInputValue other)
             }
 
             return this.Param == other.Param &&
-                    this.Value == other.Value;
+                ((this.Value == null && string.IsNullOrEmpty(other.Value))
+                || this.Value == other.Value);
+
         }
 
         /// <summary>

Ginger/GingerCoreCommon/Repository/BusinessFlowLib/Activity.cs

@@ -1246,7 +1246,7 @@ public virtual string ActivityType
 
         public override void PrepareItemToBeCopied()
         {
-            this.IsSharedRepositoryInstance = TargetFrameworkHelper.Helper.IsSharedRepositoryItem(this);
+            this.IsSharedRepositoryInstance = TargetFrameworkHelper.Helper?.IsSharedRepositoryItem(this) ?? false;
         }
 
         public override string GetItemType()
@@ -1290,8 +1290,8 @@ public bool AreEqual(Activity other)
                 return false;
             }
 
-            if (this.ActivityName != other.ActivityName || this.TargetApplication != other.TargetApplication ||
-                   this.Type != other.Type || this.ActivitiesGroupID != other.ActivitiesGroupID)
+            if (ActivityName != other.ActivityName || TargetApplication != other.TargetApplication ||
+                   Type != other.Type || (other.ActivitiesGroupID != null && ActivitiesGroupID != other.ActivitiesGroupID))
             {
                 return false;
             }

Ginger/GingerCoreCommon/Repository/BusinessFlowLib/BusinessFlow.cs

@@ -2050,21 +2050,11 @@ public bool AreEqual(BusinessFlow other)
         {
             if (other == null || this.Name != other.Name
                  || this.Activities.Count != other.Activities.Count
-                 || this.Variables.Count != other.Variables.Count
-                 || this.TargetApplications.Count != other.TargetApplications.Count)
+                 || this.Variables.Count != other.Variables.Count)
             {
                 return false;
             }
 
-            for (int i = 0; i < this.TargetApplications.Count; i++)
-            {
-                if (!other.TargetApplications.Any(f => f.Name.Equals(this.TargetApplications[i].Name)
-                        && f.Guid.Equals(this.TargetApplications[i].Guid)))
-                {
-                    return false;
-                }
-            }
-
             for (int i = 0; i < this.Variables.Count; i++)
             {
                 if (!this.Variables[i].AreEqual(other.Variables[i]))
@@ -2073,6 +2063,8 @@ public bool AreEqual(BusinessFlow other)
                 }
             }
 
+            LoadLinkedActivities();
+
             for (int i = 0; i < this.Activities.Count; i++)
             {
                 if (!this.Activities[i].AreEqual(other.Activities[i]))

Ginger/GingerCoreCommon/Repository/SolutionRepository.cs

@@ -690,12 +690,13 @@ public string CreateRepositoryItemFileName(RepositoryItemBase repositoryItemBase
                         filefullPath = filefullPath.Replace(Nameex, "");
                     }
                     counter++;
+
                     Nameex = "~" + counter;
                     filefullPath = filefullPath.Replace(ext, Nameex + ext);
 
                     if (counter > 100)
                     {
-                        throw new Exception("cannot find unique file after 100 tries");
+                        counter = Random.Shared.Next(minValue: 101, maxValue: 10000);
                     }
                 }
 

Ginger/GingerCoreCommon/VariablesLib/VariableBase.cs

@@ -736,7 +736,7 @@ public bool AreEqual(object obj)
                 return false;
             }
 
-            return Equals(obj as VariableBase);
+            return AreEqual(obj as VariableBase);
         }
     }
 }

Ginger/GingerCoreCommonTest/EqualityTests/ActivityTests.cs

@@ -0,0 +1,125 @@
+using Amdocs.Ginger.Repository;
+using GingerCore;
+using GingerCore.Actions;
+using GingerCore.Variables;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace GingerCoreCommonTest.Repository;
+[TestClass]
+public class ActivityEqualityTests
+{
+    [TestMethod]
+    public void AreEqual_SameProperties_ReturnsTrue()
+    {
+        // Arrange
+        var activity1 = new Activity
+        {
+            ActivityName = "Search and Buy iPhone 15 Device",
+            TargetApplication = "Brain_3UK_Self Service",
+            Type = eSharedItemType.Regular,
+            ActivitiesGroupID = null,
+            Acts = [new ActDummy()],
+            Variables = [new VariableString()]
+        };
+
+        var activity2 = new Activity
+        {
+            ActivityName = "Search and Buy iPhone 15 Device",
+            TargetApplication = "Brain_3UK_Self Service",
+            Type = eSharedItemType.Regular,
+            ActivitiesGroupID = null,
+            Acts = [new ActDummy()],
+            Variables = [new VariableString()]
+        };
+
+        // Act
+        var result = activity1.AreEqual(activity2);
+
+        // Assert
+        Assert.IsTrue(result);
+    }
+
+    [TestMethod]
+    public void AreEqual_DifferentActivityName_ReturnsFalse()
+    {
+        // Arrange
+        var activity1 = new Activity { ActivityName = "TestActivity1" };
+        var activity2 = new Activity { ActivityName = "TestActivity2" };
+
+        // Act
+        var result = activity1.AreEqual(activity2);
+
+        // Assert
+        Assert.IsFalse(result);
+    }
+
+    [TestMethod]
+    public void AreEqual_DifferentTargetApplication_ReturnsFalse()
+    {
+        // Arrange
+        var activity1 = new Activity { TargetApplication = "TestApp1" };
+        var activity2 = new Activity { TargetApplication = "TestApp2" };
+
+        // Act
+        var result = activity1.AreEqual(activity2);
+
+        // Assert
+        Assert.IsFalse(result);
+    }
+
+    [TestMethod]
+    public void AreEqual_DifferentType_ReturnsFalse()
+    {
+        // Arrange
+        var activity1 = new Activity { Type = eSharedItemType.Regular };
+        var activity2 = new Activity { Type = eSharedItemType.Link };
+
+        // Act
+        var result = activity1.AreEqual(activity2);
+
+        // Assert
+        Assert.IsFalse(result);
+    }
+
+    [TestMethod]
+    public void AreEqual_DifferentActivitiesGroupID_ReturnsFalse()
+    {
+        // Arrange
+        var activity1 = new Activity { ActivitiesGroupID = "Group1" };
+        var activity2 = new Activity { ActivitiesGroupID = "Group2" };
+
+        // Act
+        var result = activity1.AreEqual(activity2);
+
+        // Assert
+        Assert.IsFalse(result);
+    }
+
+    [TestMethod]
+    public void AreEqual_DifferentActsCount_ReturnsFalse()
+    {
+        // Arrange
+        var activity1 = new Activity { Acts = [new ActDummy()] };
+        var activity2 = new Activity { Acts = [new ActDummy(), new ActDummy()] };
+
+        // Act
+        var result = activity1.AreEqual(activity2);
+
+        // Assert
+        Assert.IsFalse(result);
+    }
+
+    [TestMethod]
+    public void AreEqual_DifferentVariablesCount_ReturnsFalse()
+    {
+        // Arrange
+        var activity1 = new Activity { Variables = [new VariableString()] };
+        var activity2 = new Activity { Variables = [new VariableString(), new VariableString()] };
+
+        // Act
+        var result = activity1.AreEqual(activity2);
+
+        // Assert
+        Assert.IsFalse(result);
+    }
+}

Ginger/GingerCoreCommonTest/EqualityTests/BusinessFlowTests.cs

@@ -0,0 +1,63 @@
+using GingerCore;
+using GingerCore.Platforms;
+using GingerCore.Variables;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+
+namespace GingerCoreCommonTest.Repository
+{
+    [TestClass]
+    public class BusinessFlowEqualityTests
+    {
+        [TestMethod]
+        public void ArAeEqual_ShouldReturnTrue_WhenBusinessFlowsAreEqual()
+        {
+            // Arrange
+            var businessFlow1 = CreateBusinessFlow("TestFlow");
+            var businessFlow2 = CreateBusinessFlow("TestFlow");
+
+            // Act
+            var result = businessFlow1.AreEqual(businessFlow2);
+
+            // Assert
+            Assert.IsTrue(result);
+        }
+
+        [TestMethod]
+        public void ArAeEqual_ShouldReturnFalse_WhenBusinessFlowsAreNotEqual()
+        {
+            // Arrange
+            var businessFlow1 = CreateBusinessFlow("TestFlow1");
+            var businessFlow2 = CreateBusinessFlow("TestFlow2");
+
+            // Act
+            var result = businessFlow1.AreEqual(businessFlow2);
+
+            // Assert
+            Assert.IsFalse(result);
+        }
+
+        private BusinessFlow CreateBusinessFlow(string name)
+        {
+            return new BusinessFlow
+            {
+                Name = name,
+                Activities =
+                [
+                    new Activity { ActivityName = "Activity1" },
+                    new Activity { ActivityName = "Activity2" }
+                ],
+                Variables =
+                [
+                    new VariableString { Name = "Variable1" },
+                    new VariableString { Name = "Variable2" }
+                ],
+                TargetApplications =
+                [
+                    new TargetApplication { AppName = "Target1", Guid = Guid.NewGuid() },
+                    new TargetApplication { AppName = "Target2", Guid = Guid.NewGuid() }
+                ]
+            };
+        }
+    }
+}

Ginger/GingerCoreCommonTest/GingerCoreCommonTest.csproj

@@ -28,6 +28,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Folder Include="EqualityTests\" />
     <Folder Include="TestResources\" />
   </ItemGroup>