Skip to content

AB#16 Fixing Code Quality Warnings - part 4. #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BlaiseD merged 3 commits into from
Feb 4, 2026
Merged

AB#16 Fixing Code Quality Warnings - part 4. #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf68ac0
AB#16 Fixing Code Quality Warnings - part 4.
BlaiseD Feb 4, 2026
61feeba
AB#16 Fixing Code Quality Warnings - part 4 (fixing false positive fo…
BlaiseD Feb 4, 2026
ab286f8
AB#16 Remove trace listeners during test.
BlaiseD Feb 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...ow.ComponentModel.Serialization/ComponentModel/Serialization/MarkupExtensionSerializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ protected internal sealed override string SerializeToString(WorkflowMarkupSerial
}
else
{
writer.WriteString(argType.FullName);
writer.WriteString(argType?.FullName ?? string.Empty);
}
}
else
Expand Down
24 changes: 9 additions & 15 deletions ...low.ComponentModel.Serialization/ComponentModel/Serialization/WorkflowMarkupSerializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ internal void SerializeContents(WorkflowMarkupSerializationManager serialization
{
writer.WriteValue(obj);
}
// For Key properties, we don;t want to get the extended properties
// For Key properties, we don't want to get the extended properties
if (!dictionaryKey)
properties.AddRange(serializationManager.GetExtendedProperties(obj));
}
Expand Down Expand Up @@ -586,24 +586,18 @@ internal void SerializeContents(WorkflowMarkupSerializationManager serialization
}
}

if (properties != null)
foreach (PropertyInfo propInfo in properties)
{
foreach (PropertyInfo propInfo in properties)
{
// Do not serialize properties that have corresponding dynamic properties.
if (propInfo != null && !allProperties.ContainsKey(propInfo.Name))
allProperties.Add(propInfo.Name, propInfo);
}
// Do not serialize properties that have corresponding dynamic properties.
if (propInfo != null && !allProperties.ContainsKey(propInfo.Name))
allProperties.Add(propInfo.Name, propInfo);
}

if (events != null)
foreach (EventInfo eventInfo in events)
{
foreach (EventInfo eventInfo in events)
{
// Do not serialize events that have corresponding dynamic properties.
if (eventInfo != null && !allProperties.ContainsKey(eventInfo.Name))
allProperties.Add(eventInfo.Name, eventInfo);
}
// Do not serialize events that have corresponding dynamic properties.
if (eventInfo != null && !allProperties.ContainsKey(eventInfo.Name))
allProperties.Add(eventInfo.Name, eventInfo);
}

using (ContentProperty contentProperty = new(serializationManager, serializer, obj))
Expand Down
1 change: 1 addition & 0 deletions Workflow.ComponentModel.Serialization.Tests/ComponentModel/Design/HelpersTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ public void CreateXmlWriter_WithInvalidType_ReturnsNull()
public void CreateXmlWriter_WithNull_ReturnsNull()
{
// Arrange
System.Diagnostics.Trace.Listeners.Clear();
object? nullOutput = null;

// Act
Expand Down
10 changes: 5 additions & 5 deletions ...ponentModel.Serialization.Tests/ComponentModel/SynchronizationHandlesTypeConverterTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ public void ConvertFrom_UnescapesCommas()
string input = "handle\\,with\\,commas, normalHandle";

// Act
var result = _converter.ConvertFrom(null, CultureInfo.InvariantCulture, input) as ICollection<string>;
var result = _converter.ConvertFrom(null, CultureInfo.InvariantCulture, input) as ICollection<string> ?? Array.Empty<string>();

// Assert
Assert.NotNull(result);
Expand All @@ -201,7 +201,7 @@ public void ConvertFrom_TrimsWhitespace()
string input = " handle1 , handle2 ";

// Act
var result = _converter.ConvertFrom(null, CultureInfo.InvariantCulture, input) as ICollection<string>;
var result = _converter.ConvertFrom(null, CultureInfo.InvariantCulture, input) as ICollection<string> ?? Array.Empty<string>();

// Assert
Assert.NotNull(result);
Expand All @@ -217,7 +217,7 @@ public void ConvertFrom_HandlesNewlineDelimiters()
string input = "handle1\r\nhandle2\nhandle3";

// Act
var result = _converter.ConvertFrom(null, CultureInfo.InvariantCulture, input) as ICollection<string>;
var result = _converter.ConvertFrom(null, CultureInfo.InvariantCulture, input) as ICollection<string> ?? Array.Empty<string>();

// Assert
Assert.NotNull(result);
Expand All @@ -234,7 +234,7 @@ public void ConvertFrom_RemovesDuplicates()
string input = "handle1, handle2, handle1, handle3";

// Act
var result = _converter.ConvertFrom(null, CultureInfo.InvariantCulture, input) as ICollection<string>;
var result = _converter.ConvertFrom(null, CultureInfo.InvariantCulture, input) as ICollection<string> ?? Array.Empty<string>();

// Assert
Assert.NotNull(result);
Expand All @@ -248,7 +248,7 @@ public void ConvertFrom_SkipsEmptyEntries()
string input = "handle1, ,handle2, ";

// Act
var result = _converter.ConvertFrom(null, CultureInfo.InvariantCulture, input) as ICollection<string>;
var result = _converter.ConvertFrom(null, CultureInfo.InvariantCulture, input) as ICollection<string> ?? Array.Empty<string>();

// Assert
Assert.NotNull(result);
Expand Down