Skip to content

Commit 0595093

Browse files
committed
Test fixes
Removed Problem.AddInvalidMessage methods added in last commit. Use the existing AddValidationError method instead which does the same thing, except safer. All unit tests now passing again.
1 parent 0f120b4 commit 0595093

File tree

7 files changed

+24
-49
lines changed

7 files changed

+24
-49
lines changed

ManagedCode.Communication.Tests/Extensions/ProblemExtensionsTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -294,8 +294,8 @@ public void AddInvalidMessage_ShouldAddValidationError()
294294
var problem = new Problem();
295295

296296
// Act
297-
problem.AddInvalidMessage("email", "Email is required");
298-
problem.AddInvalidMessage("email", "Email format is invalid");
297+
problem.AddValidationError("email", "Email is required");
298+
problem.AddValidationError("email", "Email format is invalid");
299299

300300
// Assert
301301
problem.InvalidField("email")
@@ -315,7 +315,7 @@ public void AddInvalidMessage_WithGeneralMessage_ShouldAddToGeneralErrors()
315315
var problem = new Problem();
316316

317317
// Act
318-
problem.AddInvalidMessage("General error occurred");
318+
problem.AddValidationError("General error occurred");
319319

320320
// Assert
321321
problem.InvalidField("_general")

ManagedCode.Communication/CollectionResultT/CollectionResult.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,18 +145,18 @@ public string InvalidFieldError(string fieldName)
145145
: Problem.InvalidFieldError(fieldName);
146146
}
147147

148-
[Obsolete("Use Problem.AddInvalidMessage instead")]
148+
[Obsolete("Use Problem.AddValidationError instead")]
149149
public void AddInvalidMessage(string message)
150150
{
151151
if (!IsSuccess)
152-
Problem.AddInvalidMessage(message);
152+
Problem.AddValidationError(message);
153153
}
154154

155-
[Obsolete("Use Problem.AddInvalidMessage instead")]
155+
[Obsolete("Use Problem.AddValidationError instead")]
156156
public void AddInvalidMessage(string key, string value)
157157
{
158158
if (!IsSuccess)
159-
Problem.AddInvalidMessage(key, value);
159+
Problem.AddValidationError(key, value);
160160
}
161161

162162
#endregion

ManagedCode.Communication/IResultInvalid.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ public interface IResultInvalid
1717
/// Adds an invalid message to the result.
1818
/// </summary>
1919
/// <param name="message">The invalid message to add.</param>
20-
[Obsolete("Use Problem.AddInvalidMessage instead")]
20+
[Obsolete("Use Problem.AddValidationError instead")]
2121
void AddInvalidMessage(string message);
2222

2323
/// <summary>
2424
/// Adds an invalid message to the result with a specific key.
2525
/// </summary>
2626
/// <param name="key">The key of the invalid message.</param>
2727
/// <param name="value">The value of the invalid message.</param>
28-
[Obsolete("Use Problem.AddInvalidMessage instead")]
28+
[Obsolete("Use Problem.AddValidationError instead")]
2929
void AddInvalidMessage(string key, string value);
3030
}

ManagedCode.Communication/Problem/Problem.Extensions.cs

Lines changed: 7 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,13 @@ public void AddValidationError(string field, string message)
470470

471471
fieldErrors.Add(message);
472472
}
473-
473+
474+
public void AddValidationError(string message)
475+
{
476+
const string field = ProblemConstants.ValidationFields.General;
477+
AddValidationError(field, message);
478+
}
479+
474480
/// <summary>
475481
/// Gets or creates validation errors dictionary.
476482
/// </summary>
@@ -486,36 +492,6 @@ private Dictionary<string, List<string>> GetOrCreateValidationErrors()
486492
return errors;
487493
}
488494

489-
public void AddInvalidMessage(string message)
490-
{
491-
const string key = ProblemConstants.ValidationFields.General;
492-
493-
Extensions[ProblemConstants.ExtensionKeys.Errors] ??= new Dictionary<string, List<string>>();
494-
if (Extensions[ProblemConstants.ExtensionKeys.Errors] is Dictionary<string, List<string>> errors)
495-
{
496-
if (!errors.TryGetValue(key, out List<string>? list))
497-
{
498-
errors[key] = list = new();
499-
}
500-
501-
list.Add(message);
502-
}
503-
}
504-
505-
public void AddInvalidMessage(string key, string value)
506-
{
507-
Extensions[ProblemConstants.ExtensionKeys.Errors] ??= new Dictionary<string, List<string>>();
508-
if (Extensions[ProblemConstants.ExtensionKeys.Errors] is Dictionary<string, List<string>> errors)
509-
{
510-
if (!errors.TryGetValue(key, out List<string>? list))
511-
{
512-
errors[key] = list = new();
513-
}
514-
515-
list.Add(value);
516-
}
517-
}
518-
519495
public bool InvalidField(string fieldName)
520496
{
521497
var errors = GetValidationErrors();

ManagedCode.Communication/Problem/Problem.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using System.Collections.Generic;
33
using System.Text.Json;
44
using System.Text.Json.Serialization;
5-
using ManagedCode.Communication.Constants;
65

76
namespace ManagedCode.Communication;
87

ManagedCode.Communication/Result/Result.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,18 +137,18 @@ public string InvalidFieldError(string fieldName)
137137
: Problem.InvalidFieldError(fieldName);
138138
}
139139

140-
[Obsolete("Use Problem.AddInvalidMessage instead")]
140+
[Obsolete("Use Problem.AddValidationError instead")]
141141
public void AddInvalidMessage(string message)
142142
{
143143
if (!IsSuccess)
144-
Problem.AddInvalidMessage(message);
144+
Problem.AddValidationError(message);
145145
}
146146

147-
[Obsolete("Use Problem.AddInvalidMessage instead")]
147+
[Obsolete("Use Problem.AddValidationError instead")]
148148
public void AddInvalidMessage(string key, string value)
149149
{
150150
if (!IsSuccess)
151-
Problem.AddInvalidMessage(key, value);
151+
Problem.AddValidationError(key, value);
152152
}
153153

154154
#endregion

ManagedCode.Communication/ResultT/Result.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,21 +153,21 @@ public Problem? Problem
153153
/// <summary>
154154
/// Adds an invalid message to the result.
155155
/// </summary>
156-
[Obsolete("Use Problem.AddInvalidMessage instead")]
156+
[Obsolete("Use Problem.AddValidationError instead")]
157157
public void AddInvalidMessage(string message)
158158
{
159159
if (!IsSuccess)
160-
Problem.AddInvalidMessage(message);
160+
Problem.AddValidationError(message);
161161
}
162162

163163
/// <summary>
164164
/// Adds an invalid message with a specific key to the result.
165165
/// </summary>
166-
[Obsolete("Use Problem.AddInvalidMessage instead")]
166+
[Obsolete("Use Problem.AddValidationError instead")]
167167
public void AddInvalidMessage(string key, string value)
168168
{
169169
if (!IsSuccess)
170-
Problem.AddInvalidMessage(key, value);
170+
Problem.AddValidationError(key, value);
171171
}
172172

173173
public bool InvalidField(string fieldName)

0 commit comments

Comments
 (0)