FluentMockServerSettings (#21)

examples/WireMock.Net.ConsoleApplication/Program.cs

@@ -16,7 +16,12 @@ namespace WireMock.Net.ConsoleApplication
             string url2 = "http://localhost:9091/";
             string url3 = "https://localhost:9443/";
 
-            var server = FluentMockServer.StartWithAdminInterface(url1, url2, url3);
+            var server = FluentMockServer.Start(new FluentMockServerSettings
+            {
+                Urls = new [] { url1, url2, url3 },
+                StartAdminInterface = true,
+                ReadStaticMappings = true
+            });
             Console.WriteLine("FluentMockServer listening at {0}", string.Join(" and ", server.Urls));
 
             server.SetBasicAuthentication("a", "b");

src/WireMock.Net.StandAlone/Program.cs

@@ -16,6 +16,12 @@ namespace WireMock.Net.StandAlone
 
             [SwitchArgument('p', "AllowPartialMapping", true, Description = "Allow Partial Mapping (default set to true).", Optional = true)]
             public bool AllowPartialMapping { get; set; }
+
+            [SwitchArgument('s', "StartAdminInterface", true, Description = "Start the AdminInterface (default set to true).", Optional = true)]
+            public bool StartAdminInterface { get; set; }
+
+            [SwitchArgument('r', "ReadStaticMappings", true, Description = "Read StaticMappings from ./__admin/mappings (default set to true).", Optional = true)]
+            public bool ReadStaticMappings { get; set; }
         }
 
         static void Main(params string[] args)
@@ -31,7 +37,12 @@ namespace WireMock.Net.StandAlone
                 if (!options.Urls.Any())
                     options.Urls.Add("http://localhost:9090/");
 
-                var server = FluentMockServer.StartWithAdminInterface(options.Urls.ToArray());
+                var server = FluentMockServer.Start(new FluentMockServerSettings
+                {
+                    Urls = options.Urls.ToArray(),
+                    StartAdminInterface = options.StartAdminInterface,
+                    ReadStaticMappings = options.ReadStaticMappings
+                });
 
                 if (options.AllowPartialMapping)
                     server.AllowPartialMapping();

src/WireMock.Net/Server/FluentMockServer.Admin.cs

@@ -66,11 +66,16 @@ namespace WireMock.Server
             Check.NotNull(filename, nameof(filename));
 
             string filenameWithoutExtension = Path.GetFileNameWithoutExtension(filename);
-            Guid guid;
+            Guid guidFromFilename;
-            if (!Guid.TryParse(filenameWithoutExtension, out guid))
-                guid = Guid.NewGuid();
 
-            DeserializeAndAddMapping(File.ReadAllText(filename), guid);
+            if (Guid.TryParse(filenameWithoutExtension, out guidFromFilename))
+            {
+                DeserializeAndAddMapping(File.ReadAllText(filename), guidFromFilename);
+            }
+            else
+            {
+                DeserializeAndAddMapping(File.ReadAllText(filename));
+            }
         }
 
         private void InitAdmin()

src/WireMock.Net/Server/FluentMockServer.cs

@@ -19,7 +19,7 @@ namespace WireMock.Server
     /// <summary>
     /// The fluent mock server.
     /// </summary>
-    public partial class FluentMockServer
+    public partial class FluentMockServer : IDisposable
     {
         private readonly TinyHttpServer _httpServer;
 
@@ -112,6 +112,19 @@ namespace WireMock.Server
             }
         }
 
+        /// <summary>
+        /// Starts the specified settings.
+        /// </summary>
+        /// <param name="settings">The FluentMockServerSettings.</param>
+        /// <returns>The <see cref="FluentMockServer"/>.</returns>
+        [PublicAPI]
+        public static FluentMockServer Start(FluentMockServerSettings settings)
+        {
+            Check.NotNull(settings, nameof(settings));
+
+            return new FluentMockServer(settings);
+        }
+
         /// <summary>
         /// Start this FluentMockServer.
         /// </summary>
@@ -119,14 +132,13 @@ namespace WireMock.Server
         /// <param name="ssl">The SSL support.</param>
         /// <returns>The <see cref="FluentMockServer"/>.</returns>
         [PublicAPI]
-        public static FluentMockServer Start(int port = 0, bool ssl = false)
+        public static FluentMockServer Start([CanBeNull] int? port = 0, bool ssl = false)
         {
-            Check.Condition(port, p => p >= 0, nameof(port));
+            return new FluentMockServer(new FluentMockServerSettings
-
+            {
-            if (port == 0)
+                Port = port,
-                port = PortUtil.FindFreeTcpPort();
+                UseSSL = ssl
-
+            });
-            return new FluentMockServer(false, port, ssl);
         }
 
         /// <summary>
@@ -139,7 +151,10 @@ namespace WireMock.Server
         {
             Check.NotEmpty(urls, nameof(urls));
 
-            return new FluentMockServer(false, urls);
+            return new FluentMockServer(new FluentMockServerSettings
+            {
+                Urls = urls
+            });
         }
 
         /// <summary>
@@ -149,14 +164,14 @@ namespace WireMock.Server
         /// <param name="ssl">The SSL support.</param>
         /// <returns>The <see cref="FluentMockServer"/>.</returns>
         [PublicAPI]
-        public static FluentMockServer StartWithAdminInterface(int port = 0, bool ssl = false)
+        public static FluentMockServer StartWithAdminInterface(int? port = 0, bool ssl = false)
         {
-            Check.Condition(port, p => p >= 0, nameof(port));
+            return new FluentMockServer(new FluentMockServerSettings
-
+            {
-            if (port == 0)
+                Port = port,
-                port = PortUtil.FindFreeTcpPort();
+                UseSSL = ssl,
-
+                StartAdminInterface = true
-            return new FluentMockServer(true, port, ssl);
+            });
         }
 
         /// <summary>
@@ -169,7 +184,57 @@ namespace WireMock.Server
         {
             Check.NotEmpty(urls, nameof(urls));
 
-            return new FluentMockServer(true, urls);
+            return new FluentMockServer(new FluentMockServerSettings
+            {
+                Urls = urls,
+                StartAdminInterface = true
+            });
+        }
+
+        /// <summary>
+        /// Start this FluentMockServer with the admin interface and read static mappings.
+        /// </summary>
+        /// <param name="urls">The urls.</param>
+        /// <returns>The <see cref="FluentMockServer"/>.</returns>
+        [PublicAPI]
+        public static FluentMockServer StartWithAdminInterfaceAndReadStaticMappings(params string[] urls)
+        {
+            Check.NotEmpty(urls, nameof(urls));
+
+            return new FluentMockServer(new FluentMockServerSettings
+            {
+                Urls = urls,
+                StartAdminInterface = true,
+                ReadStaticMappings = true
+            });
+        }
+
+        private FluentMockServer(FluentMockServerSettings settings)
+        {
+            if (settings.Urls != null)
+            {
+                Urls = settings.Urls;
+            }
+            else
+            {
+                int port = settings.Port > 0 ? settings.Port.Value : PortUtil.FindFreeTcpPort();
+                Urls = new[] { (settings.UseSSL == true ? "https" : "http") + "://localhost:" + port + "/" };
+            }
+
+            _httpServer = new TinyHttpServer(HandleRequestAsync, Urls);
+            Ports = _httpServer.Ports;
+
+            _httpServer.Start();
+
+            if (settings.StartAdminInterface == true)
+            {
+                InitAdmin();
+            }
+
+            if (settings.ReadStaticMappings == true)
+            {
+                ReadStaticMappings();
+            }
         }
 
         /// <summary>
@@ -184,27 +249,6 @@ namespace WireMock.Server
                 .RespondWith(new DynamicResponseProvider(request => new ResponseMessage { StatusCode = 404, Body = "No matching mapping found" }));
         }
 
-        private FluentMockServer(bool startAdminInterface, int port, bool ssl) : this(startAdminInterface, (ssl ? "https" : "http") + "://localhost:" + port + "/")
-        {
-        }
-
-        private FluentMockServer(bool startAdminInterface, params string[] urls)
-        {
-            Urls = urls;
-
-            _httpServer = new TinyHttpServer(HandleRequestAsync, urls);
-            Ports = _httpServer.Ports;
-
-            _httpServer.Start();
-
-            if (startAdminInterface)
-            {
-                InitAdmin();
-            }
-
-            ReadStaticMappings();
-        }
-
         /// <summary>
         /// Stop this server.
         /// </summary>
@@ -214,6 +258,17 @@ namespace WireMock.Server
             _httpServer.Stop();
         }
 
+        /// <summary>
+        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
+        /// </summary>
+        public void Dispose()
+        {
+            if (_httpServer != null && _httpServer.IsStarted)
+            {
+                _httpServer.Stop();
+            }
+        }
+
         /// <summary>
         /// Resets LogEntries and Mappings.
         /// </summary>

src/WireMock.Net/Server/FluentMockServerSettings.cs

@@ -0,0 +1,48 @@
+namespace WireMock.Server
+{
+    /// <summary>
+    /// FluentMockServerSettings
+    /// </summary>
+    public class FluentMockServerSettings
+    {
+        /// <summary>
+        /// Gets or sets the port.
+        /// </summary>
+        /// <value>
+        /// The port.
+        /// </value>
+        public int? Port { get; set; }
+
+        /// <summary>
+        /// Gets or sets the use SSL.
+        /// </summary>
+        /// <value>
+        /// The use SSL.
+        /// </value>
+        public bool? UseSSL { get; set; }
+
+        /// <summary>
+        /// Gets or sets the start admin interface.
+        /// </summary>
+        /// <value>
+        /// The start admin interface.
+        /// </value>
+        public bool? StartAdminInterface { get; set; }
+
+        /// <summary>
+        /// Gets or sets the read static mappings.
+        /// </summary>
+        /// <value>
+        /// The read static mappings.
+        /// </value>
+        public bool? ReadStaticMappings { get; set; }
+
+        /// <summary>
+        /// Gets or sets the urls.
+        /// </summary>
+        /// <value>
+        /// The urls.
+        /// </value>
+        public string[] Urls { get; set; }
+    }
+}

test/WireMock.Net.Tests/FluentMockServerTests.cs

@@ -19,6 +19,51 @@ namespace WireMock.Net.Tests
     {
         private FluentMockServer _server;
 
+        [Test]
+        public void FluentMockServer_ReadStaticMapping_WithNonGuidFilename()
+        {
+            var guid = Guid.Parse("04ee4872-9efd-4770-90d3-88d445265d0d");
+            string title = "documentdb_root_title";
+
+            _server = FluentMockServer.Start();
+
+            _server.ReadStaticMapping("./__admin/mappings/documentdb_root.json");
+
+            var mappings = _server.Mappings.ToArray();
+            Check.That(mappings).HasSize(1);
+
+            Check.That(mappings.First().RequestMatcher).IsNotNull();
+            Check.That(mappings.First().Provider).IsNotNull();
+            Check.That(mappings.First().Guid).Equals(guid);
+            Check.That(mappings.First().Title).Equals(title);
+        }
+
+        [Test]
+        public void FluentMockServer_ReadStaticMapping_WithGuidFilename()
+        {
+            string guid = "00000002-ee28-4f29-ae63-1ac9b0802d86";
+
+            _server = FluentMockServer.Start();
+            _server.ReadStaticMapping("./__admin/mappings/" + guid + ".json");
+
+            var mappings = _server.Mappings.ToArray();
+            Check.That(mappings).HasSize(1);
+
+            Check.That(mappings.First().RequestMatcher).IsNotNull();
+            Check.That(mappings.First().Provider).IsNotNull();
+            Check.That(mappings.First().Guid).Equals(Guid.Parse(guid));
+            Check.That(mappings.First().Title).IsNullOrEmpty();
+        }
+
+        [Test]
+        public void FluentMockServer_ReadStaticMappings()
+        {
+            _server = FluentMockServer.Start(new FluentMockServerSettings { ReadStaticMappings = true });
+
+            var mappings = _server.Mappings.ToArray();
+            Check.That(mappings).HasSize(2);
+        }
+
         [Test]
         public void FluentMockServer_Admin_Mappings_Get()
         {

test/WireMock.Net.Tests/__admin/mappings/00000002-ee28-4f29-ae63-1ac9b0802d86.json

@@ -0,0 +1,50 @@
+{
+  "Guid": "00000002-ee28-4f29-ae63-1ac9b0802d86",
+  "Priority": 0,
+  "Request": {
+    "Path": {
+      "Matchers": [
+        {
+          "Name": "ExactMatcher",
+          "Pattern": "/dbs"
+        }
+      ]
+    },
+    "Methods": [
+      "post"
+    ],
+    "Body": {
+      "Matcher": {
+        "Name": "WildcardMatcher",
+        "Pattern": "*db-abc*"
+      }
+    }
+  },
+  "Response": {
+    "StatusCode": 200,
+    "Body": "{\"_rid\":\"\",\"Databases\":[{\"id\":\"db-abc\",\"_rid\":\"hBYWAA==\",\"_self\":\"dbs/hBYWAA==/\",\"_etag\":\"\\\"00008e00-0000-0000-0000-58b94f910000\\\"\",\"_colls\":\"colls/\",\"_users\":\"users/\",\"_ts\":1488539514}],\"_count\":1}",
+    "BodyEncoding": {
+      "CodePage": 65001,
+      "EncodingName": "Unicode (UTF-8)",
+      "WebName": "utf-8"
+    },
+    "UseTransformer": false,
+    "Headers": {
+      "x-ms-schemaversion": "1.3",
+      "Date": "Mon, 06 Mar 2017 10:56:43 GMT",
+      "x-ms-activity-id": "5e39429d-7fcc-4b75-93d6-519b7c582772",
+      "x-ms-item-count": "1",
+      "x-ms-resource-usage": "databases=1;",
+      "x-ms-gatewayversion": "version=1.11.164.3",
+      "x-ms-xp-role": "2",
+      "x-ms-session-token": "0:25908",
+      "x-ms-serviceversion": "version=1.11.150.2",
+      "Strict-Transport-Security": "max-age=31536000",
+      "Server": "Microsoft-HTTPAPI/2.0",
+      "x-ms-last-state-change-utc": "Fri, 24 Feb 2017 11:35:16.053 GMT",
+      "Content-Type": "application/json",
+      "x-ms-request-charge": "4.68",
+      "x-ms-resource-quota": "databases=100;"
+    }
+  }
+}

test/WireMock.Net.Tests/__admin/mappings/documentdb_root.json

@@ -0,0 +1,42 @@
+{
+  "Guid": "04ee4872-9efd-4770-90d3-88d445265d0d",
+  "Title": "documentdb_root_title",
+  "Priority": 0,
+  "Request": {
+    "Path": {
+      "Matchers": [
+        {
+          "Name": "ExactMatcher",
+          "Pattern": "/"
+        }
+      ]
+    },
+    "Methods": [
+      "get"
+    ],
+    "Body": {}
+  },
+  "Response": {
+    "StatusCode": 200,
+    "Body": "{\"_self\":\"\",\"id\":\"abc\",\"_rid\":\"abc.documents.azure.com\",\"media\":\"//media/\",\"addresses\":\"//addresses/\",\"_dbs\":\"//dbs/\",\"writableLocations\":[{\"name\":\"West Europe\",\"databaseAccountEndpoint\":\"http://localhost:9090/\"}],\"readableLocations\":[{\"name\":\"West Europe\",\"databaseAccountEndpoint\":\"http://localhost:9090/\"}],\"userReplicationPolicy\":{\"asyncReplication\":false,\"minReplicaSetSize\":3,\"maxReplicasetSize\":4},\"userConsistencyPolicy\":{\"defaultConsistencyLevel\":\"Session\"},\"systemReplicationPolicy\":{\"minReplicaSetSize\":3,\"maxReplicasetSize\":4},\"readPolicy\":{\"primaryReadCoefficient\":1,\"secondaryReadCoefficient\":1},\"queryEngineConfiguration\":\"{\\\"maxSqlQueryInputLength\\\":30720,\\\"maxJoinsPerSqlQuery\\\":5,\\\"maxLogicalAndPerSqlQuery\\\":500,\\\"maxLogicalOrPerSqlQuery\\\":500,\\\"maxUdfRefPerSqlQuery\\\":2,\\\"maxInExpressionItemsCount\\\":8000,\\\"queryMaxInMemorySortDocumentCount\\\":500,\\\"maxQueryRequestTimeoutFraction\\\":0.9,\\\"sqlAllowNonFiniteNumbers\\\":false,\\\"sqlAllowAggregateFunctions\\\":true,\\\"sqlAllowSubQuery\\\":false,\\\"allowNewKeywords\\\":true,\\\"sqlAllowLike\\\":false,\\\"maxSpatialQueryCells\\\":12,\\\"spatialMaxGeometryPointCount\\\":256,\\\"sqlAllowTop\\\":true,\\\"enableSpatialIndexing\\\":true}\"}",
+    "BodyEncoding": {
+      "CodePage": 65001,
+      "EncodingName": "Unicode (UTF-8)",
+      "WebName": "utf-8"
+    },
+    "UseTransformer": false,
+    "Headers": {
+      "x-ms-databaseaccount-reserved-mb": "0",
+      "x-ms-databaseaccount-consumed-mb": "0",
+      "Strict-Transport-Security": "max-age=31536000",
+      "x-ms-max-media-storage-usage-mb": "2048",
+      "x-ms-gatewayversion": "version=1.11.164.3",
+      "x-ms-media-storage-usage-mb": "0",
+      "x-ms-databaseaccount-provisioned-mb": "0",
+      "Content-Location": "http://localhost:9090/",
+      "Date": "Mon, 06 Mar 2017 10:56:40 GMT",
+      "Content-Type": "application/json",
+      "Server": "Microsoft-HTTPAPI/2.0"
+    }
+  }
+}