Index: Riskeer/Common/test/Riskeer.Common.Data.TestUtil/CommonCloneAssert.cs
===================================================================
diff -u -r654b5e06e3a5e8cd121092ca40e1e1b405ddbce4 -r7eaa0116d2daa5cfb492223dfa5be16ad5be63f5
--- Riskeer/Common/test/Riskeer.Common.Data.TestUtil/CommonCloneAssert.cs (.../CommonCloneAssert.cs) (revision 654b5e06e3a5e8cd121092ca40e1e1b405ddbce4)
+++ Riskeer/Common/test/Riskeer.Common.Data.TestUtil/CommonCloneAssert.cs (.../CommonCloneAssert.cs) (revision 7eaa0116d2daa5cfb492223dfa5be16ad5be63f5)
@@ -363,6 +363,20 @@
/// The cloned object.
/// Thrown when and
/// are not clones.
+ public static void AreClones(ICalculation original, ICalculation clone)
+ {
+ AreClones((ICalculationBase) original, clone);
+ CoreCloneAssert.AreObjectClones(original.Comments, clone.Comments, AreClones);
+ }
+
+ ///
+ /// Method that asserts whether and
+ /// are clones.
+ ///
+ /// The original object.
+ /// The cloned object.
+ /// Thrown when and
+ /// are not clones.
private static void AreClones(ICalculationBase original, ICalculationBase clone)
{
Assert.AreEqual(original.Name, clone.Name);
Index: Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/PipingCloneAssert.cs
===================================================================
diff -u -rfc485da07b4e72ca041d014eef9a280446d2a751 -r7eaa0116d2daa5cfb492223dfa5be16ad5be63f5
--- Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/PipingCloneAssert.cs (.../PipingCloneAssert.cs) (revision fc485da07b4e72ca041d014eef9a280446d2a751)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/PipingCloneAssert.cs (.../PipingCloneAssert.cs) (revision 7eaa0116d2daa5cfb492223dfa5be16ad5be63f5)
@@ -125,10 +125,9 @@
/// The cloned object.
/// Thrown when and
/// are not clones.
- public static void AreClones(IPipingCalculation original, IPipingCalculation clone)
+ public static void AreClones(PipingCalculation original, PipingCalculation clone)
{
- Assert.AreEqual(original.Name, clone.Name);
- CoreCloneAssert.AreObjectClones(original.Comments, clone.Comments, CommonCloneAssert.AreClones);
+ CommonCloneAssert.AreClones(original, clone);
CoreCloneAssert.AreObjectClones(original.InputParameters, clone.InputParameters, AreClones);
}
@@ -142,7 +141,8 @@
/// are not clones.
public static void AreClones(SemiProbabilisticPipingCalculation original, SemiProbabilisticPipingCalculation clone)
{
- AreClones((IPipingCalculation) original, clone);
+ CommonCloneAssert.AreClones(original, clone);
+ CoreCloneAssert.AreObjectClones(original.InputParameters, clone.InputParameters, AreClones);
CoreCloneAssert.AreObjectClones(original.Output, clone.Output, AreClones);
}
@@ -156,7 +156,8 @@
/// are not clones.
public static void AreClones(ProbabilisticPipingCalculation original, ProbabilisticPipingCalculation clone)
{
- AreClones((IPipingCalculation) original, clone);
+ CommonCloneAssert.AreClones(original, clone);
+ CoreCloneAssert.AreObjectClones(original.InputParameters, clone.InputParameters, AreClones);
CoreCloneAssert.AreObjectClones(original.Output, clone.Output, AreClones);
}