test passing on mac and windows

2025-10-31 22:45:28 +08:00 · 2017-01-17 10:20:49 +00:00
parent b873300e82
commit a8878b4a19
11 changed files with 40 additions and 6 deletions
--- a/build-and-run-tests.bat
+++ b/build-and-run-tests.bat
--- a/build.bat
+++ b/build.bat
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -0,0 +1,3 @@
+Routes:
+- Downstream: http://localhost:51879/
+  Upstream: /heee
--- a/run-tests.bat
+++ b/run-tests.bat
--- a/src/Ocelot/project.json
+++ b/src/Ocelot/project.json
@@ -30,7 +30,8 @@
    "CacheManager.Microsoft.Extensions.Logging": "0.9.2"
  },
  "runtimes": {
-    "win10-x64": {}
+    "win10-x64": {},
+    "osx.10.11-x64":{}
  },
  "frameworks": {
    "netcoreapp1.4": {
--- a/test/Ocelot.AcceptanceTests/TestConfiguration.cs
+++ b/test/Ocelot.AcceptanceTests/TestConfiguration.cs
@@ -1,8 +1,34 @@
 namespace Ocelot.AcceptanceTests
 {
+    using System.Runtime.InteropServices;
+
    public static class TestConfiguration
    {
        public static double Version => 1.4;
-        public static string ConfigurationPath => $"./bin/Debug/netcoreapp{Version}/win10-x64/configuration.json";
+        //public static string Runtime => "win10-x64";
+        public static string ConfigurationPath => GetConfigurationPath();
+
+        public static string GetConfigurationPath()
+        {
+            var osArchitecture = RuntimeInformation.OSArchitecture.ToString();
+            
+            var oSDescription = string.Empty;
+
+            if(RuntimeInformation.OSDescription.ToLower().Contains("darwin"))
+            {
+                oSDescription = "osx.10.11";
+            }
+
+            if(RuntimeInformation.OSDescription.ToLower().Contains("windows"))
+            {
+                oSDescription = "win10";
+            }
+
+            var runTime = $"{oSDescription}-{osArchitecture}".ToLower();
+
+            var configPath = $"./bin/Debug/netcoreapp{Version}/{runTime}/configuration.json";
+
+            return configPath;
+        }
    }
 }
--- a/test/Ocelot.AcceptanceTests/configuration.json
+++ b/test/Ocelot.AcceptanceTests/configuration.json
--- a/test/Ocelot.AcceptanceTests/project.json
+++ b/test/Ocelot.AcceptanceTests/project.json
@@ -35,7 +35,8 @@
    "TestStack.BDDfy": "4.3.2"
  },
  "runtimes": {
-    "win10-x64": {}
+    "win10-x64": {},
+    "osx.10.11-x64":{}
  },
  "frameworks": {
    "netcoreapp1.4": {
--- a/test/Ocelot.Benchmarks/project.json
+++ b/test/Ocelot.Benchmarks/project.json
@@ -9,7 +9,8 @@
    "BenchmarkDotNet": "0.10.1"
  },
  "runtimes": {
-    "win10-x64": {}
+    "win10-x64": {},
+    "osx.10.11-x64":{}
  },
  "frameworks": {
    "netcoreapp1.4": {
--- a/test/Ocelot.ManualTest/project.json
+++ b/test/Ocelot.ManualTest/project.json
@@ -19,7 +19,8 @@
    "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final"
  },
  "runtimes": {
-    "win10-x64": {}
+    "win10-x64": {},
+    "osx.10.11-x64":{}
  },
  "frameworks": {
    "netcoreapp1.4": {
--- a/test/Ocelot.UnitTests/project.json
+++ b/test/Ocelot.UnitTests/project.json
@@ -27,7 +27,8 @@
    "Microsoft.DotNet.InternalAbstractions": "1.0.0"
  },
  "runtimes": {
-    "win10-x64": {}
+    "win10-x64": {},
+    "osx.10.11-x64":{}
  },
  "frameworks": {
    "netcoreapp1.4": {