Skip to content

refactor: Consolidate test source code to eliminate DRY violations #1683

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
thomhurst merged 2 commits into from
Dec 30, 2025
Merged

refactor: Consolidate test source code to eliminate DRY violations #1683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31cca72
refactor: consolidate test source code to eliminate DRY violations
thomhurst Dec 30, 2025
4b03fd9
fix: Exclude null Items from JSON serialization in test model
thomhurst Dec 30, 2025
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
183 changes: 55 additions & 128 deletions ...alyzers/ModularPipelines.Analyzers.Test/ModularPipelinesAnalyzersAsyncModulesUnitTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,181 +7,108 @@ namespace ModularPipelines.Analyzers.Test;
[TestClass]
public class ModularPipelinesAnalyzersAsyncModulesUnitTests
{
private const string BadModuleSource = @"
#nullable enable
using System;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using System.Collections.Generic;
using ModularPipelines.Context;
using ModularPipelines.Models;
using ModularPipelines.Options;
using ModularPipelines.Modules;
using ModularPipelines.Attributes;

namespace ModularPipelines.Examples.Modules;
private const string BadModuleSource = $@"
{TestSourceConstants.StandardModuleHeaderWithOptions}

public class Module1 : Module<CommandResult>
{
{|#0:protected override Task<CommandResult?> ExecuteAsync(IPipelineContext context, CancellationToken cancellationToken)
{
{{
{{|#0:protected override Task<CommandResult?> ExecuteAsync(IPipelineContext context, CancellationToken cancellationToken)
{{
return ExecuteCommand(context);
}|}
}}|}}

private async Task<CommandResult?> ExecuteCommand(IPipelineContext context)
{
{{
return await context.Command.ExecuteCommandLineTool(new CommandLineToolOptions(""git""));
}
}
}}
}}
";

private const string BadModuleSource2 = @"
#nullable enable
using System;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using System.Collections.Generic;
using ModularPipelines.Context;
using ModularPipelines.Models;
using ModularPipelines.Options;
using ModularPipelines.Modules;
using ModularPipelines.Attributes;

namespace ModularPipelines.Examples.Modules;

private const string BadModuleSource2 = $@"
{TestSourceConstants.StandardModuleHeaderWithOptions}

public class Module1 : Module<string>
{
{|#0:protected override Task<string?> ExecuteAsync(IPipelineContext context, CancellationToken cancellationToken)
{
{{
{{|#0:protected override Task<string?> ExecuteAsync(IPipelineContext context, CancellationToken cancellationToken)
{{
if (1 + ""n"" == ""1n"")
{
{{
return ExecuteCommand(context);
}
}}

return Task.FromResult<string?>(""Foo!"");
}|}
}}|}}

private async Task<string?> ExecuteCommand(IPipelineContext context)
{
{{
await Task.Yield();
return ""Foo!"";
}
}
}}
}}
";

private const string GoodModuleSource = @"
#nullable enable
using System;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using System.Collections.Generic;
using ModularPipelines.Context;
using ModularPipelines.Models;
using ModularPipelines.Options;
using ModularPipelines.Modules;
using ModularPipelines.Attributes;

namespace ModularPipelines.Examples.Modules;
private const string GoodModuleSource = $@"
{TestSourceConstants.StandardModuleHeaderWithOptions}

public class Module1 : Module<CommandResult>
{
{{
protected override async Task<CommandResult?> ExecuteAsync(IPipelineContext context, CancellationToken cancellationToken)
{
{{
return await ExecuteCommand(context);
}
}}

private async Task<CommandResult?> ExecuteCommand(IPipelineContext context)
{
{{
return await context.Command.ExecuteCommandLineTool(new CommandLineToolOptions(""git""));
}
}
}}
}}
";

private const string GoodModuleSource2 = @"
#nullable enable
using System;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using System.Collections.Generic;
using ModularPipelines.Context;
using ModularPipelines.Models;
using ModularPipelines.Options;
using ModularPipelines.Modules;
using ModularPipelines.Attributes;

namespace ModularPipelines.Examples.Modules;

private const string GoodModuleSource2 = $@"
{TestSourceConstants.StandardModuleHeaderWithOptions}

public class Module1 : Module<string>
{
{{
protected override Task<string?> ExecuteAsync(IPipelineContext context, CancellationToken cancellationToken)
{
{{
return Task.FromResult<string?>(""Foo"");
}
}
}}
}}
";

private const string GoodModuleSource3 = @"
#nullable enable
using System;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using System.Collections.Generic;
using ModularPipelines.Context;
using ModularPipelines.Extensions;
using ModularPipelines.Models;
using ModularPipelines.Options;
using ModularPipelines.Modules;
using ModularPipelines.Attributes;

namespace ModularPipelines.Examples.Modules;

private const string GoodModuleSource3 = $@"
{TestSourceConstants.StandardModuleHeaderWithExtensions}

public class Module1 : Module<string>
{
{{
protected override Task<string?> ExecuteAsync(IPipelineContext context, CancellationToken cancellationToken)
{
{{
return ""Foo"".AsTask<string?>();
}
}
}}
}}
";

private const string BadModuleSource2Fixed = @"
#nullable enable
using System;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using System.Collections.Generic;
using ModularPipelines.Context;
using ModularPipelines.Models;
using ModularPipelines.Options;
using ModularPipelines.Modules;
using ModularPipelines.Attributes;

namespace ModularPipelines.Examples.Modules;

private const string BadModuleSource2Fixed = $@"
{TestSourceConstants.StandardModuleHeaderWithOptions}

public class Module1 : Module<string>
{
{|#0:protected override async Task<string?> ExecuteAsync(IPipelineContext context, CancellationToken cancellationToken)
{
{{
{{|#0:protected override async Task<string?> ExecuteAsync(IPipelineContext context, CancellationToken cancellationToken)
{{
if (1 + ""n"" == ""1n"")
{
{{
return await ExecuteCommand(context);
}
}}

return ""Foo!"";
}|}
}}|}}

private async Task<string?> ExecuteCommand(IPipelineContext context)
{
{{
await Task.Yield();
return ""Foo!"";
}
}
}}
}}
";

[TestMethod]
Expand Down
Loading
Loading