starred/WireMock.Net
1
0
Fork 0
mirror of https://github.com/wiremock/WireMock.Net.git synced 2026-01-15 06:43:37 +01:00
Code Issues 32 Packages Projects Releases 10 Wiki Activity

Add TimesInSameState to MappingModel (#1345)

Browse Source 
* Add TimesInSameState to MappingModel

* fix tests
This commit is contained in:
Stef Heyenrath
2025-08-11 08:46:18 +02:00
committed by GitHub
parent a5558777e2
commit faffc56484
11 changed files with 102 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/WireMock.Net.Abstractions/Admin/Mappings/MappingModel.cs
View File

@@ -56,6 +56,11 @@ public class MappingModel
/// In case the value is null state will not be changed.
/// </summary>
public string? SetStateTo { get; set; }
/// <summary>
/// The number of times this match should be matched before the state will be changed to the specified one.
/// </summary>
public int? TimesInSameState { get; set; }
/// <summary>
/// The request model.
@@ -86,7 +91,7 @@ public class MappingModel
/// Fire and forget for webhooks.
/// </summary>
public bool? UseWebhooksFireAndForget { get; set; }
/// <summary>
/// Data Object which can be used when WithTransformer is used.
/// e.g. lookup a path in this object using

2
src/WireMock.Net.Minimal/IMapping.cs
View File

@@ -68,7 +68,7 @@ public interface IMapping
/// <summary>
/// The number of times this match should be matched before the state will be changed to the next state.
/// </summary>
int? StateTimes { get; }
int? TimesInSameState { get; }
/// <summary>
/// The RequestMatcher.

4
src/WireMock.Net.Minimal/Mapping.cs
View File

@@ -43,7 +43,7 @@ public class Mapping : IMapping
public string? NextState { get; }
/// <inheritdoc />
public int? StateTimes { get; }
public int? TimesInSameState { get; }
/// <inheritdoc />
public IRequestMatcher RequestMatcher { get; }
@@ -137,7 +137,7 @@ public class Mapping : IMapping
Scenario = scenario;
ExecutionConditionState = executionConditionState;
NextState = nextState;
StateTimes = stateTimes;
TimesInSameState = stateTimes;
Webhooks = webhooks;
UseWebhooksFireAndForget = useWebhooksFireAndForget;
TimeSettings = timeSettings;

2
src/WireMock.Net.Minimal/Owin/WireMockMiddleware.cs
View File

@@ -299,7 +299,7 @@ namespace WireMock.Owin
scenario.Counter++;
// Only if the number of times this state is executed equals the required StateTimes, proceed to next state and reset the counter to 0
if (scenario.Counter == (mapping.StateTimes ?? 1))
if (scenario.Counter == (mapping.TimesInSameState ?? 1))
{
scenario.NextState = mapping.NextState;
scenario.Counter = 0;

1
src/WireMock.Net.Minimal/Serialization/MappingConverter.cs
View File

@@ -267,6 +267,7 @@ internal class MappingConverter(MatcherMapper mapper)
Scenario = mapping.Scenario,
WhenStateIs = mapping.ExecutionConditionState,
SetStateTo = mapping.NextState,
TimesInSameState = !string.IsNullOrWhiteSpace(mapping.NextState) ? mapping.TimesInSameState : null,
Data = mapping.Data,
Probability = mapping.Probability,
Request = new RequestModel

2
src/WireMock.Net.Minimal/Server/WireMockServer.ConvertMapping.cs
View File

@@ -97,7 +97,7 @@ public partial class WireMockServer
if (!string.IsNullOrEmpty(mappingModel.SetStateTo))
{
respondProvider = respondProvider.WillSetStateTo(mappingModel.SetStateTo!);
respondProvider = respondProvider.WillSetStateTo(mappingModel.SetStateTo!, mappingModel.TimesInSameState);
}
}

25
test/WireMock.Net.Tests/MappingBuilderTests.GetMappings.verified.txt
View File

@@ -165,5 +165,30 @@
]
},
Response: {}
},
{
Guid: 98fae52e-76df-47d9-876f-2ee32e931005,
UpdatedAt: 2023-01-14 15:16:17,
Scenario: To do list,
SetStateTo: TodoList State Started,
TimesInSameState: 2,
Request: {
Path: {
Matchers: [
{
Name: WildcardMatcher,
Pattern: /todo/items,
IgnoreCase: false
}
]
},
Methods: [
GET
]
},
Response: {
BodyDestination: SameAsSource,
Body: Buy milk
}
}
]

10
test/WireMock.Net.Tests/MappingBuilderTests.ToCSharpCode_Builder.verified.txt
View File

@@ -66,3 +66,13 @@ builder
.RespondWith(Response.Create()
);
builder
.Given(Request.Create()
.UsingMethod("GET")
.WithPath(new WildcardMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, "/todo/items", false, WireMock.Matchers.MatchOperator.Or))
)
.WithGuid("98fae52e-76df-47d9-876f-2ee32e931005")
.RespondWith(Response.Create()
.WithBody("Buy milk")
);

10
test/WireMock.Net.Tests/MappingBuilderTests.ToCSharpCode_Server.verified.txt
View File

@@ -66,3 +66,13 @@ server
.RespondWith(Response.Create()
);
server
.Given(Request.Create()
.UsingMethod("GET")
.WithPath(new WildcardMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, "/todo/items", false, WireMock.Matchers.MatchOperator.Or))
)
.WithGuid("98fae52e-76df-47d9-876f-2ee32e931005")
.RespondWith(Response.Create()
.WithBody("Buy milk")
);

25
test/WireMock.Net.Tests/MappingBuilderTests.ToJson.verified.txt
View File

@@ -161,5 +161,30 @@
}
]
}
},
{
Guid: 98fae52e-76df-47d9-876f-2ee32e931005,
UpdatedAt: 2023-01-14T15:16:17,
Scenario: To do list,
SetStateTo: TodoList State Started,
TimesInSameState: 2,
Request: {
Path: {
Matchers: [
{
Name: WildcardMatcher,
Pattern: /todo/items,
IgnoreCase: false
}
]
},
Methods: [
GET
]
},
Response: {
BodyDestination: SameAsSource,
Body: Buy milk
}
}
]

30
test/WireMock.Net.Tests/MappingBuilderTests.cs
View File

@@ -34,6 +34,7 @@ public class MappingBuilderTests
private static readonly DateTime UtcNow = new(2023, 1, 14, 15, 16, 17);
private readonly Mock<IFileSystemHandler> _fileSystemHandlerMock;
private readonly int _numMappings;
private readonly MappingBuilder _sut;
@@ -104,11 +105,20 @@ public class MappingBuilderTests
).RespondWith(Response.Create());
_sut.Given(Request.Create()
.WithPath("/regex")
.WithParam("foo", new RegexMatcher(".*"))
.UsingGet()
)
.RespondWith(Response.Create());
.WithPath("/regex")
.WithParam("foo", new RegexMatcher(".*"))
.UsingGet()
).RespondWith(Response.Create());
_sut.Given(Request.Create()
.WithPath("/todo/items")
.UsingGet())
.InScenario("To do list")
.WillSetStateTo("TodoList State Started", 2)
.RespondWith(Response.Create()
.WithBody("Buy milk"));
_numMappings = _sut.GetMappings().Length;
}
[Fact]
@@ -197,9 +207,9 @@ public class MappingBuilderTests
_sut.SaveMappingsToFolder(null);
// Verify
_fileSystemHandlerMock.Verify(fs => fs.GetMappingFolder(), Times.Exactly(5));
_fileSystemHandlerMock.Verify(fs => fs.FolderExists(mappingFolder), Times.Exactly(5));
_fileSystemHandlerMock.Verify(fs => fs.WriteMappingFile(It.IsAny<string>(), It.IsAny<string>()), Times.Exactly(5));
_fileSystemHandlerMock.Verify(fs => fs.GetMappingFolder(), Times.Exactly(_numMappings));
_fileSystemHandlerMock.Verify(fs => fs.FolderExists(mappingFolder), Times.Exactly(_numMappings));
_fileSystemHandlerMock.Verify(fs => fs.WriteMappingFile(It.IsAny<string>(), It.IsAny<string>()), Times.Exactly(_numMappings));
_fileSystemHandlerMock.VerifyNoOtherCalls();
}
@@ -215,8 +225,8 @@ public class MappingBuilderTests
// Verify
_fileSystemHandlerMock.Verify(fs => fs.GetMappingFolder(), Times.Never);
_fileSystemHandlerMock.Verify(fs => fs.FolderExists(path), Times.Exactly(5));
_fileSystemHandlerMock.Verify(fs => fs.WriteMappingFile(It.IsAny<string>(), It.IsAny<string>()), Times.Exactly(5));
_fileSystemHandlerMock.Verify(fs => fs.FolderExists(path), Times.Exactly(_numMappings));
_fileSystemHandlerMock.Verify(fs => fs.WriteMappingFile(It.IsAny<string>(), It.IsAny<string>()), Times.Exactly(_numMappings));
_fileSystemHandlerMock.VerifyNoOtherCalls();
}
}