diff --git a/.gitignore b/.gitignore index 18e5f91..9f39915 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ output/* AspectedRouting.sln.DotSettings AspectedRouting.sln.DotSettings.user +.DS_Store \ No newline at end of file diff --git a/AspectedRouting/Program.cs b/AspectedRouting/Program.cs index 7dd1039..a6b4c49 100644 --- a/AspectedRouting/Program.cs +++ b/AspectedRouting/Program.cs @@ -216,12 +216,13 @@ namespace AspectedRouting Console.WriteLine("\n\n\n------------------------"); } - private static void Main(string[] args) + private static int Main(string[] args) { var errMessage = MainWithError(args); - if (errMessage != null) { - Console.WriteLine(errMessage); - } + if (errMessage == null) return 0; + + Console.WriteLine(errMessage); + return 1; } public static string MainWithError(string[] args) diff --git a/AspectedRouting/Tests/AspectTestSuite.cs b/AspectedRouting/Tests/AspectTestSuite.cs index dd1fb5d..ff5f54e 100644 --- a/AspectedRouting/Tests/AspectTestSuite.cs +++ b/AspectedRouting/Tests/AspectTestSuite.cs @@ -108,7 +108,7 @@ namespace AspectedRouting.Tests } - var doesMatch = (actual is double d && Math.Abs(double.Parse(test.expected) - d) < 0.0001) + var doesMatch = (actual is double d && Math.Abs(double.Parse(test.expected, NumberStyles.Any, CultureInfo.InvariantCulture) - d) < 0.0001) || actual.ToString().Equals(test.expected); if (!doesMatch) { diff --git a/AspectedRouting/Tests/ProfileTestSuite.cs b/AspectedRouting/Tests/ProfileTestSuite.cs index 344ab43..6807300 100644 --- a/AspectedRouting/Tests/ProfileTestSuite.cs +++ b/AspectedRouting/Tests/ProfileTestSuite.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Globalization; using System.Linq; using AspectedRouting.Language; using AspectedRouting.Language.Expression; @@ -68,13 +69,13 @@ namespace AspectedRouting.Tests var speed = 0.0; if (!string.IsNullOrEmpty(testData[2])) { - speed = double.Parse(testData[2]); + speed = double.Parse(testData[2], NumberStyles.Any, CultureInfo.InvariantCulture); } var weight = 0.0; if (!string.IsNullOrEmpty(testData[3])) { - weight = double.Parse(testData[3]); + weight = double.Parse(testData[3], NumberStyles.Any, CultureInfo.InvariantCulture); }