starred/WireMock.Net
1
0
Fork 0
mirror of https://github.com/wiremock/WireMock.Net.git synced 2026-04-18 15:10:17 +02:00
Code Issues 32 Packages Projects Releases 10 Wiki Activity

FixNullRef (#295) (#297)

Browse Source
This commit is contained in:
Stef Heyenrath
2019-07-15 17:00:52 +02:00
committed by GitHub
parent 4bcc27ff01
commit 1db2bc7c89
7 changed files with 97 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Directory.Build.props
View File

@@ -4,7 +4,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<VersionPrefix>1.0.21</VersionPrefix> <VersionPrefix>1.0.22</VersionPrefix>
</PropertyGroup> </PropertyGroup>
<Choose> <Choose>

2
GitHubReleaseNotes.txt
View File

@@ -1,3 +1,3 @@
https://github.com/StefH/GitHubReleaseNotes https://github.com/StefH/GitHubReleaseNotes
GitHubReleaseNotes.exe --output CHANGELOG.md --skip-empty-releases --version 1.0.21.0 GitHubReleaseNotes.exe --output CHANGELOG.md --skip-empty-releases --version 1.0.22.0

46
src/WireMock.Net/Server/FluentMockServer.Admin.cs
View File

@@ -131,18 +131,18 @@ namespace WireMock.Server
{ {
if (folder == null) if (folder == null)
{ {
folder = _fileSystemHandler.GetMappingFolder(); folder = _settings.FileSystemHandler.GetMappingFolder();
} }
if (!_fileSystemHandler.FolderExists(folder)) if (!_settings.FileSystemHandler.FolderExists(folder))
{ {
_logger.Info("The Static Mapping folder '{0}' does not exist, reading Static MappingFiles will be skipped.", folder); _settings.Logger.Info("The Static Mapping folder '{0}' does not exist, reading Static MappingFiles will be skipped.", folder);
return; return;
} }
foreach (string filename in _fileSystemHandler.EnumerateFiles(folder).OrderBy(f => f)) foreach (string filename in _settings.FileSystemHandler.EnumerateFiles(folder).OrderBy(f => f))
{ {
_logger.Info("Reading Static MappingFile : '{0}'", filename); _settings.Logger.Info("Reading Static MappingFile : '{0}'", filename);
try try
{ {
@@ -150,7 +150,7 @@ namespace WireMock.Server
} }
catch catch
{ {
_logger.Error("Static MappingFile : '{0}' could not be read. This file will be skipped.", filename); _settings.Logger.Error("Static MappingFile : '{0}' could not be read. This file will be skipped.", filename);
} }
} }
} }
@@ -172,28 +172,28 @@ namespace WireMock.Server
return; return;
} }
_logger.Info("Watching folder '{0}' for new, updated and deleted MappingFiles.", folder); _settings.Logger.Info("Watching folder '{0}' for new, updated and deleted MappingFiles.", folder);
var watcher = new EnhancedFileSystemWatcher(folder, "*.json", EnhancedFileSystemWatcherTimeoutMs); var watcher = new EnhancedFileSystemWatcher(folder, "*.json", EnhancedFileSystemWatcherTimeoutMs);
watcher.Created += (sender, args) => watcher.Created += (sender, args) =>
{ {
_logger.Info("MappingFile created : '{0}', reading file.", args.FullPath); _settings.Logger.Info("MappingFile created : '{0}', reading file.", args.FullPath);
if (!ReadStaticMappingAndAddOrUpdate(args.FullPath)) if (!ReadStaticMappingAndAddOrUpdate(args.FullPath))
{ {
_logger.Error("Unable to read MappingFile '{0}'.", args.FullPath); _settings.Logger.Error("Unable to read MappingFile '{0}'.", args.FullPath);
} }
}; };
watcher.Changed += (sender, args) => watcher.Changed += (sender, args) =>
{ {
_logger.Info("MappingFile updated : '{0}', reading file.", args.FullPath); _settings.Logger.Info("MappingFile updated : '{0}', reading file.", args.FullPath);
if (!ReadStaticMappingAndAddOrUpdate(args.FullPath)) if (!ReadStaticMappingAndAddOrUpdate(args.FullPath))
{ {
_logger.Error("Unable to read MappingFile '{0}'.", args.FullPath); _settings.Logger.Error("Unable to read MappingFile '{0}'.", args.FullPath);
} }
}; };
watcher.Deleted += (sender, args) => watcher.Deleted += (sender, args) =>
{ {
_logger.Info("MappingFile deleted : '{0}'", args.FullPath); _settings.Logger.Info("MappingFile deleted : '{0}'", args.FullPath);
string filenameWithoutExtension = Path.GetFileNameWithoutExtension(args.FullPath); string filenameWithoutExtension = Path.GetFileNameWithoutExtension(args.FullPath);
if (Guid.TryParse(filenameWithoutExtension, out Guid guidFromFilename)) if (Guid.TryParse(filenameWithoutExtension, out Guid guidFromFilename))
@@ -220,7 +220,7 @@ namespace WireMock.Server
string filenameWithoutExtension = Path.GetFileNameWithoutExtension(path); string filenameWithoutExtension = Path.GetFileNameWithoutExtension(path);
if (FileHelper.TryReadMappingFileWithRetryAndDelay(_fileSystemHandler, path, out string value)) if (FileHelper.TryReadMappingFileWithRetryAndDelay(_settings.FileSystemHandler, path, out string value))
{ {
var mappingModels = DeserializeObjectToArray<MappingModel>(JsonConvert.DeserializeObject(value)); var mappingModels = DeserializeObjectToArray<MappingModel>(JsonConvert.DeserializeObject(value));
foreach (var mappingModel in mappingModels) foreach (var mappingModel in mappingModels)
@@ -361,7 +361,7 @@ namespace WireMock.Server
if (mapping == null) if (mapping == null)
{ {
_logger.Warn("HttpStatusCode set to 404 : Mapping not found"); _settings.Logger.Warn("HttpStatusCode set to 404 : Mapping not found");
return ResponseMessageBuilder.Create("Mapping not found", 404); return ResponseMessageBuilder.Create("Mapping not found", 404);
} }
@@ -405,12 +405,12 @@ namespace WireMock.Server
{ {
if (folder == null) if (folder == null)
{ {
folder = _fileSystemHandler.GetMappingFolder(); folder = _settings.FileSystemHandler.GetMappingFolder();
} }
if (!_fileSystemHandler.FolderExists(folder)) if (!_settings.FileSystemHandler.FolderExists(folder))
{ {
_fileSystemHandler.CreateFolder(folder); _settings.FileSystemHandler.CreateFolder(folder);
} }
var model = MappingConverter.ToMappingModel(mapping); var model = MappingConverter.ToMappingModel(mapping);
@@ -418,9 +418,9 @@ namespace WireMock.Server
string path = Path.Combine(folder, filename); string path = Path.Combine(folder, filename);
_logger.Info("Saving Mapping file {0}", filename); _settings.Logger.Info("Saving Mapping file {0}", filename);
_fileSystemHandler.WriteMappingFile(path, JsonConvert.SerializeObject(model, _jsonSerializerSettings)); _settings.FileSystemHandler.WriteMappingFile(path, JsonConvert.SerializeObject(model, _jsonSerializerSettings));
} }
private static string SanitizeFileName(string name, char replaceChar = '_') private static string SanitizeFileName(string name, char replaceChar = '_')
@@ -460,12 +460,12 @@ namespace WireMock.Server
} }
catch (ArgumentException a) catch (ArgumentException a)
{ {
_logger.Error("HttpStatusCode set to 400 {0}", a); _settings.Logger.Error("HttpStatusCode set to 400 {0}", a);
return ResponseMessageBuilder.Create(a.Message, 400); return ResponseMessageBuilder.Create(a.Message, 400);
} }
catch (Exception e) catch (Exception e)
{ {
_logger.Error("HttpStatusCode set to 500 {0}", e); _settings.Logger.Error("HttpStatusCode set to 500 {0}", e);
return ResponseMessageBuilder.Create(e.ToString(), 500); return ResponseMessageBuilder.Create(e.ToString(), 500);
} }
} }
@@ -540,7 +540,7 @@ namespace WireMock.Server
if (entry == null) if (entry == null)
{ {
_logger.Warn("HttpStatusCode set to 404 : Request not found"); _settings.Logger.Warn("HttpStatusCode set to 404 : Request not found");
return ResponseMessageBuilder.Create("Request not found", 404); return ResponseMessageBuilder.Create("Request not found", 404);
} }
@@ -683,7 +683,7 @@ namespace WireMock.Server
if (pathOrUrlRequired && !pathOrUrlmatchersValid) if (pathOrUrlRequired && !pathOrUrlmatchersValid)
{ {
_logger.Error("Path or Url matcher is missing for this mapping, this mapping will not be added."); _settings.Logger.Error("Path or Url matcher is missing for this mapping, this mapping will not be added.");
return null; return null;
} }

30
src/WireMock.Net/Server/FluentMockServer.AdminFiles.cs
View File

@@ -16,13 +16,13 @@ namespace WireMock.Server
{ {
string filename = GetFileNameFromRequestMessage(requestMessage); string filename = GetFileNameFromRequestMessage(requestMessage);
string mappingFolder = _fileSystemHandler.GetMappingFolder(); string mappingFolder = _settings.FileSystemHandler.GetMappingFolder();
if (!_fileSystemHandler.FolderExists(mappingFolder)) if (!_settings.FileSystemHandler.FolderExists(mappingFolder))
{ {
_fileSystemHandler.CreateFolder(mappingFolder); _settings.FileSystemHandler.CreateFolder(mappingFolder);
} }
_fileSystemHandler.WriteFile(filename, requestMessage.BodyAsBytes); _settings.FileSystemHandler.WriteFile(filename, requestMessage.BodyAsBytes);
return ResponseMessageBuilder.Create("File created"); return ResponseMessageBuilder.Create("File created");
} }
@@ -31,13 +31,13 @@ namespace WireMock.Server
{ {
string filename = GetFileNameFromRequestMessage(requestMessage); string filename = GetFileNameFromRequestMessage(requestMessage);
if (!_fileSystemHandler.FileExists(filename)) if (!_settings.FileSystemHandler.FileExists(filename))
{ {
_logger.Info("The file '{0}' does not exist, updating file will be skipped.", filename); _settings.Logger.Info("The file '{0}' does not exist, updating file will be skipped.", filename);
return ResponseMessageBuilder.Create("File is not found", 404); return ResponseMessageBuilder.Create("File is not found", 404);
} }
_fileSystemHandler.WriteFile(filename, requestMessage.BodyAsBytes); _settings.FileSystemHandler.WriteFile(filename, requestMessage.BodyAsBytes);
return ResponseMessageBuilder.Create("File updated"); return ResponseMessageBuilder.Create("File updated");
} }
@@ -46,13 +46,13 @@ namespace WireMock.Server
{ {
string filename = GetFileNameFromRequestMessage(requestMessage); string filename = GetFileNameFromRequestMessage(requestMessage);
if (!_fileSystemHandler.FileExists(filename)) if (!_settings.FileSystemHandler.FileExists(filename))
{ {
_logger.Info("The file '{0}' does not exist.", filename); _settings.Logger.Info("The file '{0}' does not exist.", filename);
return ResponseMessageBuilder.Create("File is not found", 404); return ResponseMessageBuilder.Create("File is not found", 404);
} }
byte[] bytes = _fileSystemHandler.ReadFile(filename); byte[] bytes = _settings.FileSystemHandler.ReadFile(filename);
var response = new ResponseMessage var response = new ResponseMessage
{ {
StatusCode = 200, StatusCode = 200,
@@ -82,9 +82,9 @@ namespace WireMock.Server
{ {
string filename = GetFileNameFromRequestMessage(requestMessage); string filename = GetFileNameFromRequestMessage(requestMessage);
if (!_fileSystemHandler.FileExists(filename)) if (!_settings.FileSystemHandler.FileExists(filename))
{ {
_logger.Info("The file '{0}' does not exist.", filename); _settings.Logger.Info("The file '{0}' does not exist.", filename);
return ResponseMessageBuilder.Create(404); return ResponseMessageBuilder.Create(404);
} }
@@ -95,13 +95,13 @@ namespace WireMock.Server
{ {
string filename = GetFileNameFromRequestMessage(requestMessage); string filename = GetFileNameFromRequestMessage(requestMessage);
if (!_fileSystemHandler.FileExists(filename)) if (!_settings.FileSystemHandler.FileExists(filename))
{ {
_logger.Info("The file '{0}' does not exist.", filename); _settings.Logger.Info("The file '{0}' does not exist.", filename);
return ResponseMessageBuilder.Create("File is not deleted", 404); return ResponseMessageBuilder.Create("File is not deleted", 404);
} }
_fileSystemHandler.DeleteFile(filename); _settings.FileSystemHandler.DeleteFile(filename);
return ResponseMessageBuilder.Create("File deleted."); return ResponseMessageBuilder.Create("File deleted.");
} }

18
src/WireMock.Net/Server/FluentMockServer.cs
View File

@@ -27,8 +27,6 @@ namespace WireMock.Server
{ {
private const int ServerStartDelayInMs = 100; private const int ServerStartDelayInMs = 100;
private readonly IWireMockLogger _logger;
private readonly IFileSystemHandler _fileSystemHandler;
private readonly IFluentMockServerSettings _settings; private readonly IFluentMockServerSettings _settings;
private readonly IOwinSelfHost _httpServer; private readonly IOwinSelfHost _httpServer;
private readonly IWireMockMiddlewareOptions _options = new WireMockMiddlewareOptions(); private readonly IWireMockMiddlewareOptions _options = new WireMockMiddlewareOptions();
@@ -187,13 +185,13 @@ namespace WireMock.Server
private FluentMockServer(IFluentMockServerSettings settings) private FluentMockServer(IFluentMockServerSettings settings)
{ {
_settings = settings; _settings = settings;
settings.Logger = settings.Logger ?? new WireMockNullLogger();
_logger = settings.Logger; // Set default values if not provided
_fileSystemHandler = settings.FileSystemHandler ?? new LocalFileSystemHandler(); _settings.Logger = settings.Logger ?? new WireMockNullLogger();
_settings.FileSystemHandler = settings.FileSystemHandler ?? new LocalFileSystemHandler();
_logger.Info("WireMock.Net by Stef Heyenrath (https://github.com/WireMock-Net/WireMock.Net)"); _settings.Logger.Info("WireMock.Net by Stef Heyenrath (https://github.com/WireMock-Net/WireMock.Net)");
_logger.Debug("WireMock.Net server settings {0}", JsonConvert.SerializeObject(settings, Formatting.Indented)); _settings.Logger.Debug("WireMock.Net server settings {0}", JsonConvert.SerializeObject(settings, Formatting.Indented));
if (settings.Urls != null) if (settings.Urls != null)
{ {
@@ -205,10 +203,10 @@ namespace WireMock.Server
Urls = new[] { $"{(settings.UseSSL == true ? "https" : "http")}://localhost:{port}" }; Urls = new[] { $"{(settings.UseSSL == true ? "https" : "http")}://localhost:{port}" };
} }
_options.FileSystemHandler = _fileSystemHandler; _options.FileSystemHandler = _settings.FileSystemHandler;
_options.PreWireMockMiddlewareInit = settings.PreWireMockMiddlewareInit; _options.PreWireMockMiddlewareInit = settings.PreWireMockMiddlewareInit;
_options.PostWireMockMiddlewareInit = settings.PostWireMockMiddlewareInit; _options.PostWireMockMiddlewareInit = settings.PostWireMockMiddlewareInit;
_options.Logger = _logger; _options.Logger = _settings.Logger;
#if USE_ASPNETCORE #if USE_ASPNETCORE
_httpServer = new AspNetCoreSelfHost(_options, Urls); _httpServer = new AspNetCoreSelfHost(_options, Urls);
@@ -371,7 +369,7 @@ namespace WireMock.Server
[PublicAPI] [PublicAPI]
public void AllowPartialMapping(bool allow = true) public void AllowPartialMapping(bool allow = true)
{ {
_logger.Info("AllowPartialMapping is set to {0}", allow); _settings.Logger.Info("AllowPartialMapping is set to {0}", allow);
_options.AllowPartialMapping = allow; _options.AllowPartialMapping = allow;
} }

6
test/WireMock.Net.Tests/FluentMockServerTests.cs
View File

@@ -175,9 +175,11 @@ namespace WireMock.Net.Tests
} }
[Theory] [Theory]
[InlineData("GET")]
[InlineData("TRACE")]
[InlineData("DELETE")] [InlineData("DELETE")]
#if !NET452
[InlineData("TRACE")]
[InlineData("GET")]
#endif
public async Task FluentMockServer_Should_exclude_body_for_methods_where_body_is_definitely_disallowed(string method) public async Task FluentMockServer_Should_exclude_body_for_methods_where_body_is_definitely_disallowed(string method)
{ {
// Assign // Assign

45
test/WireMock.Net.Tests/ResponseBuilders/ResponseWithBodyFromFileTests.cs Normal file
View File

@@ -0,0 +1,45 @@
using FluentAssertions;
using System.IO;
using System.Net;
using System.Net.Http;
using System.Threading.Tasks;
using WireMock.RequestBuilders;
using WireMock.ResponseBuilders;
using WireMock.Server;
using Xunit;
namespace WireMock.Net.Tests.ResponseBuilders
{
public class ResponseWithBodyFromFileTests
{
[Fact]
public async Task Response_ProvideResponse_WithBodyFromFile()
{
// Arrange
var server = FluentMockServer.Start();
string path = Path.Combine(Directory.GetCurrentDirectory(), "__admin", "mappings", "MyXmlResponse.xml");
server
.Given(
Request
.Create()
.UsingGet()
.WithPath("/v1/content")
)
.RespondWith(
Response
.Create()
.WithStatusCode(HttpStatusCode.OK)
.WithHeader("Content-Type", "application/xml")
.WithBodyFromFile(path)
);
// Act
var response = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + "/v1/content");
// Assert
response.Should().Contain("<hello>world</hello>");
}
}
}