Index: Riskeer/Common/src/Riskeer.Common.IO/HydraRing/HydraulicBoundaryDataHelper.cs
===================================================================
diff -u -rf0c911a3278aefcaa5422ca8e722b2f24a4bd71d -r4f2570b8d954cecd70679e38858e03774eca6d3d
--- Riskeer/Common/src/Riskeer.Common.IO/HydraRing/HydraulicBoundaryDataHelper.cs (.../HydraulicBoundaryDataHelper.cs) (revision f0c911a3278aefcaa5422ca8e722b2f24a4bd71d)
+++ Riskeer/Common/src/Riskeer.Common.IO/HydraRing/HydraulicBoundaryDataHelper.cs (.../HydraulicBoundaryDataHelper.cs) (revision 4f2570b8d954cecd70679e38858e03774eca6d3d)
@@ -109,15 +109,15 @@
}
///
- /// Validates whether the version of a hydraulic boundary database matches the version of the corresponding database file.
+ /// Checks whether the version of a hydraulic boundary database matches the version of the corresponding database file.
/// The hydraulic boundary database to check the version of.
/// true if the provided hydraulic boundary database matches the version of the corresponding database
/// file, false otherwise.
/// Thrown when no connection could be created with the hydraulic boundary
/// database.
/// Thrown when is null.
///
- public static bool ValidateVersion(HydraulicBoundaryDatabase hydraulicBoundaryDatabase)
+ public static bool IsCorrectVersion(HydraulicBoundaryDatabase hydraulicBoundaryDatabase)
{
if (hydraulicBoundaryDatabase == null)
{
Index: Riskeer/Common/src/Riskeer.Common.Service/HydraulicBoundaryDataConnectionValidator.cs
===================================================================
diff -u -rcac6dbcf6d2346c5655d15f5d05f562ee075c58c -r4f2570b8d954cecd70679e38858e03774eca6d3d
--- Riskeer/Common/src/Riskeer.Common.Service/HydraulicBoundaryDataConnectionValidator.cs (.../HydraulicBoundaryDataConnectionValidator.cs) (revision cac6dbcf6d2346c5655d15f5d05f562ee075c58c)
+++ Riskeer/Common/src/Riskeer.Common.Service/HydraulicBoundaryDataConnectionValidator.cs (.../HydraulicBoundaryDataConnectionValidator.cs) (revision 4f2570b8d954cecd70679e38858e03774eca6d3d)
@@ -65,7 +65,7 @@
return string.Format(Resources.Hydraulic_boundary_database_connection_failed_0_, validationProblem);
}
- if (!HydraulicBoundaryDataHelper.ValidateVersion(hydraulicBoundaryDatabase))
+ if (!HydraulicBoundaryDataHelper.IsCorrectVersion(hydraulicBoundaryDatabase))
{
return string.Format(Resources.Hydraulic_boundary_database_mismatching_version_in_file_0_, hydraulicBoundaryDatabase.FilePath);
}
Index: Riskeer/Common/test/Riskeer.Common.IO.Test/HydraRing/HydraulicBoundaryDataHelperTest.cs
===================================================================
diff -u -rf0c911a3278aefcaa5422ca8e722b2f24a4bd71d -r4f2570b8d954cecd70679e38858e03774eca6d3d
--- Riskeer/Common/test/Riskeer.Common.IO.Test/HydraRing/HydraulicBoundaryDataHelperTest.cs (.../HydraulicBoundaryDataHelperTest.cs) (revision f0c911a3278aefcaa5422ca8e722b2f24a4bd71d)
+++ Riskeer/Common/test/Riskeer.Common.IO.Test/HydraRing/HydraulicBoundaryDataHelperTest.cs (.../HydraulicBoundaryDataHelperTest.cs) (revision 4f2570b8d954cecd70679e38858e03774eca6d3d)
@@ -159,24 +159,24 @@
}
[Test]
- public void ValidateVersion_HydraulicBoundaryDatabaseNull_ThrowsArgumentNullException()
+ public void IsCorrectVersion_HydraulicBoundaryDatabaseNull_ThrowsArgumentNullException()
{
// Call
- void Call() => HydraulicBoundaryDataHelper.ValidateVersion(null);
+ void Call() => HydraulicBoundaryDataHelper.IsCorrectVersion(null);
// Assert
string parameter = Assert.Throws(Call).ParamName;
Assert.AreEqual("hydraulicBoundaryDatabase", parameter);
}
[Test]
- public void ValidateVersion_HrdFileWithInvalidPathChars_ThrowsCriticalFileReadException()
+ public void IsCorrectVersion_HrdFileWithInvalidPathChars_ThrowsCriticalFileReadException()
{
// Setup
string hrdFilePath = Path.Combine(testDataPath, "complete.sqlite").Replace('c', Path.GetInvalidPathChars()[0]);
// Call
- void Test() => HydraulicBoundaryDataHelper.ValidateVersion(new HydraulicBoundaryDatabase
+ void Test() => HydraulicBoundaryDataHelper.IsCorrectVersion(new HydraulicBoundaryDatabase
{
FilePath = hrdFilePath
});
@@ -186,7 +186,7 @@
}
[Test]
- public void ValidateVersion_EqualVersion_ReturnsTrue()
+ public void IsCorrectVersion_EqualVersion_ReturnsTrue()
{
// Setup
var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
@@ -196,14 +196,14 @@
};
// Call
- bool isEqual = HydraulicBoundaryDataHelper.ValidateVersion(hydraulicBoundaryDatabase);
+ bool isEqual = HydraulicBoundaryDataHelper.IsCorrectVersion(hydraulicBoundaryDatabase);
// Assert
Assert.IsTrue(isEqual);
}
[Test]
- public void ValidateVersion_DifferentVersions_ReturnsFalse()
+ public void IsCorrectVersion_DifferentVersions_ReturnsFalse()
{
// Setup
var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase
@@ -213,7 +213,7 @@
};
// Call
- bool isEqual = HydraulicBoundaryDataHelper.ValidateVersion(hydraulicBoundaryDatabase);
+ bool isEqual = HydraulicBoundaryDataHelper.IsCorrectVersion(hydraulicBoundaryDatabase);
// Assert
Assert.IsFalse(isEqual);