Skip to content

Update tests to remove generator version before verifying #105

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
ChrisPulman merged 2 commits into from
Nov 5, 2024
Merged

Update tests to remove generator version before verifying #105

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
c2f2b45
Update tests
ChrisPulman Nov 4, 2024
38a84c8
Update tests to remove Generator version
ChrisPulman Nov 4, 2024
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
1 change: 0 additions & 1 deletion ...ObservableMethods#ReactiveUI.SourceGenerators.ObservableAsPropertyAttribute.g.verified.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ namespace ReactiveUI.SourceGenerators;
/// ObservableAsPropertyAttribute.
/// </summary>
/// <seealso cref="Attribute" />
[global::System.CodeDom.Compiler.GeneratedCode("ReactiveUI.SourceGenerators.ObservableAsPropertyGenerator", "1.1.0.0")]
[AttributeUsage(AttributeTargets.Field | AttributeTargets.Property | AttributeTargets.Method, AllowMultiple = false, Inherited = false)]
internal sealed class ObservableAsPropertyAttribute : Attribute
{
Expand Down
2 changes: 0 additions & 2 deletions ...eratorTests.FromObservableMethods#TestVM.ObservableAsPropertyFromObservable.g.verified.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ namespace TestNs
/// </summary>
public partial class TestVM
{
[global::System.CodeDom.Compiler.GeneratedCode("ReactiveUI.SourceGenerators.ObservableAsPropertyGenerator", "1.1.0.0")]
/// <inheritdoc cref="Test2Property"/>
private int _test2Property;

Expand All @@ -23,7 +22,6 @@ public partial class TestVM
[global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
public int Test2Property { get => _test2Property = _test2PropertyHelper?.Value ?? _test2Property; }

[global::System.CodeDom.Compiler.GeneratedCode("ReactiveUI.SourceGenerators.ObservableAsPropertyGenerator", "1.1.0.0")]
[global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
protected void InitializeOAPH()
{
Expand Down
1 change: 0 additions & 1 deletion ...leMethodsWithName#ReactiveUI.SourceGenerators.ObservableAsPropertyAttribute.g.verified.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ namespace ReactiveUI.SourceGenerators;
/// ObservableAsPropertyAttribute.
/// </summary>
/// <seealso cref="Attribute" />
[global::System.CodeDom.Compiler.GeneratedCode("ReactiveUI.SourceGenerators.ObservableAsPropertyGenerator", "1.1.0.0")]
[AttributeUsage(AttributeTargets.Field | AttributeTargets.Property | AttributeTargets.Method, AllowMultiple = false, Inherited = false)]
internal sealed class ObservableAsPropertyAttribute : Attribute
{
Expand Down
2 changes: 0 additions & 2 deletions ...sts.FromObservableMethodsWithName#TestVM.ObservableAsPropertyFromObservable.g.verified.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ namespace TestNs
/// </summary>
public partial class TestVM
{
[global::System.CodeDom.Compiler.GeneratedCode("ReactiveUI.SourceGenerators.ObservableAsPropertyGenerator", "1.1.0.0")]
/// <inheritdoc cref="Test3Property"/>
private int _test3Property;

Expand All @@ -23,7 +22,6 @@ public partial class TestVM
[global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
public int Test3Property { get => _test3Property = _test3PropertyHelper?.Value ?? _test3Property; }

[global::System.CodeDom.Compiler.GeneratedCode("ReactiveUI.SourceGenerators.ObservableAsPropertyGenerator", "1.1.0.0")]
[global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
protected void InitializeOAPH()
{
Expand Down
1 change: 0 additions & 1 deletion ...romObservableProp#ReactiveUI.SourceGenerators.ObservableAsPropertyAttribute.g.verified.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ namespace ReactiveUI.SourceGenerators;
/// ObservableAsPropertyAttribute.
/// </summary>
/// <seealso cref="Attribute" />
[global::System.CodeDom.Compiler.GeneratedCode("ReactiveUI.SourceGenerators.ObservableAsPropertyGenerator", "1.1.0.0")]
[AttributeUsage(AttributeTargets.Field | AttributeTargets.Property | AttributeTargets.Method, AllowMultiple = false, Inherited = false)]
internal sealed class ObservableAsPropertyAttribute : Attribute
{
Expand Down
2 changes: 0 additions & 2 deletions ...GeneratorTests.FromObservableProp#TestVM.ObservableAsPropertyFromObservable.g.verified.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ namespace TestNs
/// </summary>
public partial class TestVM
{
[global::System.CodeDom.Compiler.GeneratedCode("ReactiveUI.SourceGenerators.ObservableAsPropertyGenerator", "1.1.0.0")]
/// <inheritdoc cref="Test1Property"/>
private int _test1Property;

Expand All @@ -23,7 +22,6 @@ public partial class TestVM
[global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
public int Test1Property { get => _test1Property = _test1PropertyHelper?.Value ?? _test1Property; }

[global::System.CodeDom.Compiler.GeneratedCode("ReactiveUI.SourceGenerators.ObservableAsPropertyGenerator", "1.1.0.0")]
[global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
protected void InitializeOAPH()
{
Expand Down
1 change: 0 additions & 1 deletion ...tiesWithAttribute#ReactiveUI.SourceGenerators.ObservableAsPropertyAttribute.g.verified.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ namespace ReactiveUI.SourceGenerators;
/// ObservableAsPropertyAttribute.
/// </summary>
/// <seealso cref="Attribute" />
[global::System.CodeDom.Compiler.GeneratedCode("ReactiveUI.SourceGenerators.ObservableAsPropertyGenerator", "1.1.0.0")]
[AttributeUsage(AttributeTargets.Field | AttributeTargets.Property | AttributeTargets.Method, AllowMultiple = false, Inherited = false)]
internal sealed class ObservableAsPropertyAttribute : Attribute
{
Expand Down
2 changes: 0 additions & 2 deletions ...ObservablePropertiesWithAttribute#TestVM.ObservableAsPropertyFromObservable.g.verified.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ namespace TestNs
/// </summary>
public partial class TestVM
{
[global::System.CodeDom.Compiler.GeneratedCode("ReactiveUI.SourceGenerators.ObservableAsPropertyGenerator", "1.1.0.0")]
/// <inheritdoc cref="Test5Property"/>
private int _test5Property;

Expand All @@ -24,7 +23,6 @@ public partial class TestVM
[global::System.Text.Json.Serialization.JsonIncludeAttribute()]
public int Test5Property { get => _test5Property = _test5PropertyHelper?.Value ?? _test5Property; }

[global::System.CodeDom.Compiler.GeneratedCode("ReactiveUI.SourceGenerators.ObservableAsPropertyGenerator", "1.1.0.0")]
[global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
protected void InitializeOAPH()
{
Expand Down
1 change: 0 additions & 1 deletion ...ropertiesWithName#ReactiveUI.SourceGenerators.ObservableAsPropertyAttribute.g.verified.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ namespace ReactiveUI.SourceGenerators;
/// ObservableAsPropertyAttribute.
/// </summary>
/// <seealso cref="Attribute" />
[global::System.CodeDom.Compiler.GeneratedCode("ReactiveUI.SourceGenerators.ObservableAsPropertyGenerator", "1.1.0.0")]
[AttributeUsage(AttributeTargets.Field | AttributeTargets.Property | AttributeTargets.Method, AllowMultiple = false, Inherited = false)]
internal sealed class ObservableAsPropertyAttribute : Attribute
{
Expand Down
2 changes: 0 additions & 2 deletions ....FromObservablePropertiesWithName#TestVM.ObservableAsPropertyFromObservable.g.verified.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ namespace TestNs
/// </summary>
public partial class TestVM
{
[global::System.CodeDom.Compiler.GeneratedCode("ReactiveUI.SourceGenerators.ObservableAsPropertyGenerator", "1.1.0.0")]
/// <inheritdoc cref="Test4Property"/>
private int _test4Property;

Expand All @@ -23,7 +22,6 @@ public partial class TestVM
[global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
public int Test4Property { get => _test4Property = _test4PropertyHelper?.Value ?? _test4Property; }

[global::System.CodeDom.Compiler.GeneratedCode("ReactiveUI.SourceGenerators.ObservableAsPropertyGenerator", "1.1.0.0")]
[global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
protected void InitializeOAPH()
{
Expand Down
1 change: 0 additions & 1 deletion ...orTests.FromField#ReactiveUI.SourceGenerators.ObservableAsPropertyAttribute.g.verified.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ namespace ReactiveUI.SourceGenerators;
/// ObservableAsPropertyAttribute.
/// </summary>
/// <seealso cref="Attribute" />
[global::System.CodeDom.Compiler.GeneratedCode("ReactiveUI.SourceGenerators.ObservableAsPropertyGenerator", "1.1.0.0")]
[AttributeUsage(AttributeTargets.Field | AttributeTargets.Property | AttributeTargets.Method, AllowMultiple = false, Inherited = false)]
internal sealed class ObservableAsPropertyAttribute : Attribute
{
Expand Down
1 change: 0 additions & 1 deletion ...erator.Tests/OAPH/OAPGeneratorTests.FromField#TestVM.ObservableAsProperties.g.verified.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ namespace TestNs
/// <inheritdoc/>
public partial class TestVM
{
[global::System.CodeDom.Compiler.GeneratedCode("ReactiveUI.SourceGenerators.ObservableAsPropertyGenerator", "1.1.0.0")]
/// <inheritdoc cref="_test1Helper"/>
private readonly ReactiveUI.ObservableAsPropertyHelper<int> _test1Helper;

Expand Down
1 change: 0 additions & 1 deletion ...ts.NamedFromField#ReactiveUI.SourceGenerators.ObservableAsPropertyAttribute.g.verified.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ namespace ReactiveUI.SourceGenerators;
/// ObservableAsPropertyAttribute.
/// </summary>
/// <seealso cref="Attribute" />
[global::System.CodeDom.Compiler.GeneratedCode("ReactiveUI.SourceGenerators.ObservableAsPropertyGenerator", "1.1.0.0")]
[AttributeUsage(AttributeTargets.Field | AttributeTargets.Property | AttributeTargets.Method, AllowMultiple = false, Inherited = false)]
internal sealed class ObservableAsPropertyAttribute : Attribute
{
Expand Down
1 change: 0 additions & 1 deletion ...r.Tests/OAPH/OAPGeneratorTests.NamedFromField#TestVM.ObservableAsProperties.g.verified.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ namespace TestNs
/// <inheritdoc/>
public partial class TestVM
{
[global::System.CodeDom.Compiler.GeneratedCode("ReactiveUI.SourceGenerators.ObservableAsPropertyGenerator", "1.1.0.0")]
/// <inheritdoc cref="_test2Helper"/>
private readonly ReactiveUI.ObservableAsPropertyHelper<int> _test2Helper;

Expand Down
1 change: 0 additions & 1 deletion ...ReadOnlyFromField#ReactiveUI.SourceGenerators.ObservableAsPropertyAttribute.g.verified.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ namespace ReactiveUI.SourceGenerators;
/// ObservableAsPropertyAttribute.
/// </summary>
/// <seealso cref="Attribute" />
[global::System.CodeDom.Compiler.GeneratedCode("ReactiveUI.SourceGenerators.ObservableAsPropertyGenerator", "1.1.0.0")]
[AttributeUsage(AttributeTargets.Field | AttributeTargets.Property | AttributeTargets.Method, AllowMultiple = false, Inherited = false)]
internal sealed class ObservableAsPropertyAttribute : Attribute
{
Expand Down
1 change: 0 additions & 1 deletion ...s/OAPH/OAPGeneratorTests.NonReadOnlyFromField#TestVM.ObservableAsProperties.g.verified.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ namespace TestNs
/// <inheritdoc/>
public partial class TestVM
{
[global::System.CodeDom.Compiler.GeneratedCode("ReactiveUI.SourceGenerators.ObservableAsPropertyGenerator", "1.1.0.0")]
/// <inheritdoc cref="_test2Helper"/>
private readonly ReactiveUI.ObservableAsPropertyHelper<int> _test2Helper;

Expand Down
1 change: 0 additions & 1 deletion ...activeProperiesWithAttributes#ReactiveUI.SourceGenerators.ReactiveAttribute.g.verified.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ namespace ReactiveUI.SourceGenerators;
/// ReactiveAttribute.
/// </summary>
/// <seealso cref="Attribute" />
[global::System.CodeDom.Compiler.GeneratedCode("ReactiveUI.SourceGenerators.ReactiveGenerator", "1.1.0.0")]
[AttributeUsage(AttributeTargets.Field, AllowMultiple = false, Inherited = false)]
internal sealed class ReactiveAttribute : Attribute
{
Expand Down
1 change: 0 additions & 1 deletion ...eactiveGeneratorTests.FromReactiveProperiesWithAttributes#TestVM.Properties.g.verified.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ namespace TestNs
/// </summary>
public partial class TestVM
{
[global::System.CodeDom.Compiler.GeneratedCode("ReactiveUI.SourceGenerators.ReactiveGenerator", "1.1.0.0")]
/// <inheritdoc cref="_test3"/>
[global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
[global::System.Runtime.Serialization.DataMemberAttribute()]
Expand Down
1 change: 0 additions & 1 deletion ...rTests.FromReactiveProperties#ReactiveUI.SourceGenerators.ReactiveAttribute.g.verified.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ namespace ReactiveUI.SourceGenerators;
/// ReactiveAttribute.
/// </summary>
/// <seealso cref="Attribute" />
[global::System.CodeDom.Compiler.GeneratedCode("ReactiveUI.SourceGenerators.ReactiveGenerator", "1.1.0.0")]
[AttributeUsage(AttributeTargets.Field, AllowMultiple = false, Inherited = false)]
internal sealed class ReactiveAttribute : Attribute
{
Expand Down
1 change: 0 additions & 1 deletion ...ts/REACTIVE/ReactiveGeneratorTests.FromReactiveProperties#TestVM.Properties.g.verified.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ namespace TestNs
/// </summary>
public partial class TestVM
{
[global::System.CodeDom.Compiler.GeneratedCode("ReactiveUI.SourceGenerators.ReactiveGenerator", "1.1.0.0")]
/// <inheritdoc cref="_test1"/>
[global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
public int Test1
Expand Down
1 change: 0 additions & 1 deletion ...mReactivePropertiesWithAccess#ReactiveUI.SourceGenerators.ReactiveAttribute.g.verified.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ namespace ReactiveUI.SourceGenerators;
/// ReactiveAttribute.
/// </summary>
/// <seealso cref="Attribute" />
[global::System.CodeDom.Compiler.GeneratedCode("ReactiveUI.SourceGenerators.ReactiveGenerator", "1.1.0.0")]
[AttributeUsage(AttributeTargets.Field, AllowMultiple = false, Inherited = false)]
internal sealed class ReactiveAttribute : Attribute
{
Expand Down
1 change: 0 additions & 1 deletion ...E/ReactiveGeneratorTests.FromReactivePropertiesWithAccess#TestVM.Properties.g.verified.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ namespace TestNs
/// </summary>
public partial class TestVM
{
[global::System.CodeDom.Compiler.GeneratedCode("ReactiveUI.SourceGenerators.ReactiveGenerator", "1.1.0.0")]
/// <inheritdoc cref="_test2"/>
[global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
public int Test2
Expand Down
1 change: 0 additions & 1 deletion ...omReactiveAsyncCommand#ReactiveUI.SourceGenerators.ReactiveCommandAttribute.g.verified.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ namespace ReactiveUI.SourceGenerators;
/// ReativeCommandAttribute.
/// </summary>
/// <seealso cref="Attribute" />
[global::System.CodeDom.Compiler.GeneratedCode("ReactiveUI.SourceGenerators.ReactiveCommandGenerator", "1.1.0.0")]
[AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = false)]
internal sealed class ReactiveCommandAttribute : Attribute
{
Expand Down
1 change: 0 additions & 1 deletion ...ncCommandWithParameter#ReactiveUI.SourceGenerators.ReactiveCommandAttribute.g.verified.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ namespace ReactiveUI.SourceGenerators;
/// ReativeCommandAttribute.
/// </summary>
/// <seealso cref="Attribute" />
[global::System.CodeDom.Compiler.GeneratedCode("ReactiveUI.SourceGenerators.ReactiveCommandGenerator", "1.1.0.0")]
[AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = false)]
internal sealed class ReactiveCommandAttribute : Attribute
{
Expand Down
1 change: 0 additions & 1 deletion ...ts.FromReactiveCommand#ReactiveUI.SourceGenerators.ReactiveCommandAttribute.g.verified.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ namespace ReactiveUI.SourceGenerators;
/// ReativeCommandAttribute.
/// </summary>
/// <seealso cref="Attribute" />
[global::System.CodeDom.Compiler.GeneratedCode("ReactiveUI.SourceGenerators.ReactiveCommandGenerator", "1.1.0.0")]
[AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = false)]
internal sealed class ReactiveCommandAttribute : Attribute
{
Expand Down
1 change: 0 additions & 1 deletion ...veCommandWithParameter#ReactiveUI.SourceGenerators.ReactiveCommandAttribute.g.verified.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ namespace ReactiveUI.SourceGenerators;
/// ReativeCommandAttribute.
/// </summary>
/// <seealso cref="Attribute" />
[global::System.CodeDom.Compiler.GeneratedCode("ReactiveUI.SourceGenerators.ReactiveCommandGenerator", "1.1.0.0")]
[AttributeUsage(AttributeTargets.Method, AllowMultiple = false, Inherited = false)]
internal sealed class ReactiveCommandAttribute : Attribute
{
Expand Down
13 changes: 8 additions & 5 deletions src/ReactiveUI.SourceGenerator.Tests/UnitTests/OAPFromObservableGeneratorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for full license information.

using Microsoft.CodeAnalysis;
using ReactiveUI.SourceGenerators;
using Xunit.Abstractions;

Expand Down Expand Up @@ -41,7 +42,7 @@ public partial class TestVM : ReactiveObject
var driver = TestHelper.TestPass(sourceCode);

// Assert: Verify the generated code.
return Verify(driver).UseDirectory(TestHelper.VerifiedFilePath());
return VerifyGenerator(driver);
}

/// <summary>
Expand Down Expand Up @@ -71,7 +72,7 @@ public partial class TestVM : ReactiveObject
var driver = TestHelper.TestPass(sourceCode);

// Assert: Verify the generated code.
return Verify(driver).UseDirectory(TestHelper.VerifiedFilePath());
return VerifyGenerator(driver);
}

/// <summary>
Expand Down Expand Up @@ -101,7 +102,7 @@ public partial class TestVM : ReactiveObject
var driver = TestHelper.TestPass(sourceCode);

// Assert: Verify the generated code.
return Verify(driver).UseDirectory(TestHelper.VerifiedFilePath());
return VerifyGenerator(driver);
}

/// <summary>
Expand Down Expand Up @@ -131,7 +132,7 @@ public partial class TestVM : ReactiveObject
var driver = TestHelper.TestPass(sourceCode);

// Assert: Verify the generated code.
return Verify(driver).UseDirectory(TestHelper.VerifiedFilePath());
return VerifyGenerator(driver);
}

/// <summary>
Expand Down Expand Up @@ -165,6 +166,8 @@ public partial class TestVM : ReactiveObject
var driver = TestHelper.TestPass(sourceCode);

// Assert: Verify the generated code.
return Verify(driver).UseDirectory(TestHelper.VerifiedFilePath());
return VerifyGenerator(driver);
}

private SettingsTask VerifyGenerator(GeneratorDriver driver) => Verify(driver).UseDirectory(TestHelper.VerifiedFilePath()).ScrubLinesContaining("[global::System.CodeDom.Compiler.GeneratedCode(\"");
}
9 changes: 6 additions & 3 deletions src/ReactiveUI.SourceGenerator.Tests/UnitTests/OAPGeneratorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for full license information.

using Microsoft.CodeAnalysis;
using ReactiveUI.SourceGenerators;
using Xunit.Abstractions;

Expand Down Expand Up @@ -41,7 +42,7 @@ public partial class TestVM : ReactiveObject
var driver = TestHelper.TestPass(sourceCode);

// Assert: Verify the generated code.
return Verify(driver).UseDirectory(TestHelper.VerifiedFilePath());
return VerifyGenerator(driver);
}

/// <summary>
Expand Down Expand Up @@ -71,7 +72,7 @@ public partial class TestVM : ReactiveObject
var driver = TestHelper.TestPass(sourceCode);

// Assert: Verify the generated code.
return Verify(driver).UseDirectory(TestHelper.VerifiedFilePath());
return VerifyGenerator(driver);
}

/// <summary>
Expand Down Expand Up @@ -101,6 +102,8 @@ public partial class TestVM : ReactiveObject
var driver = TestHelper.TestPass(sourceCode);

// Assert: Verify the generated code.
return Verify(driver).UseDirectory(TestHelper.VerifiedFilePath());
return VerifyGenerator(driver);
}

private SettingsTask VerifyGenerator(GeneratorDriver driver) => Verify(driver).UseDirectory(TestHelper.VerifiedFilePath()).ScrubLinesContaining("[global::System.CodeDom.Compiler.GeneratedCode(\"");
}
11 changes: 7 additions & 4 deletions src/ReactiveUI.SourceGenerator.Tests/UnitTests/ReactiveCMDGeneratorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for full license information.

using Microsoft.CodeAnalysis;
using ReactiveUI.SourceGenerators;
using Xunit.Abstractions;

Expand Down Expand Up @@ -42,7 +43,7 @@ public partial class TestVM : ReactiveObject
var driver = TestHelper.TestPass(sourceCode);

// Assert: Verify the generated code.
return Verify(driver).UseDirectory(TestHelper.VerifiedFilePath());
return VerifyGenerator(driver);
}

/// <summary>
Expand Down Expand Up @@ -74,7 +75,7 @@ public partial class TestVM : ReactiveObject
var driver = TestHelper.TestPass(sourceCode);

// Assert: Verify the generated code.
return Verify(driver).UseDirectory(TestHelper.VerifiedFilePath());
return VerifyGenerator(driver);
}

/// <summary>
Expand Down Expand Up @@ -108,7 +109,7 @@ private async Task Test1()
var driver = TestHelper.TestPass(sourceCode);

// Assert: Verify the generated code.
return Verify(driver).UseDirectory(TestHelper.VerifiedFilePath());
return VerifyGenerator(driver);
}

/// <summary>
Expand Down Expand Up @@ -143,6 +144,8 @@ private async Task Test3(string baseString)
var driver = TestHelper.TestPass(sourceCode);

// Assert: Verify the generated code.
return Verify(driver).UseDirectory(TestHelper.VerifiedFilePath());
return VerifyGenerator(driver);
}

private SettingsTask VerifyGenerator(GeneratorDriver driver) => Verify(driver).UseDirectory(TestHelper.VerifiedFilePath()).ScrubLinesContaining("[global::System.CodeDom.Compiler.GeneratedCode(\"");
}
Loading