-
Notifications
You must be signed in to change notification settings - Fork 57
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #164 from Filipedguy/main
Fix duplicate operation when multiple types of the same assembly are used in AssemblyMarkerTypes
- Loading branch information
Showing
7 changed files
with
99 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| using Saunter.Attributes; | ||
|
|
||
| namespace Saunter.Tests.MarkerTypeTests | ||
| { | ||
| [AsyncApi] | ||
| [Channel("asw.sample_service.anothersample", Description = "Another sample events.")] | ||
| [PublishOperation(OperationId = "AnotherSampleMessagePublisher", Summary = "Publish another sample.")] | ||
| public class AnotherSamplePublisher | ||
| { | ||
| [Message(typeof(AnotherSampleMesssage))] | ||
| public void PublishTenantCreated(AnotherSampleMesssage @event) { } | ||
| } | ||
|
|
||
| [AsyncApi] | ||
| [Channel("asw.sample_service.sample", Description = "Sample events.")] | ||
| [SubscribeOperation(OperationId = "SampleMessageConsumer", Summary = "Consume sample messages.")] | ||
| public class SampleConsumer | ||
| { | ||
| [Message(typeof(SampleMessage))] | ||
| public void SubscribeSampleMessage(SampleMessage evnt) { } | ||
| } | ||
|
|
||
| public class SampleMessage { } | ||
| public class AnotherSampleMesssage { } | ||
| } |
13 changes: 13 additions & 0 deletions
13
Saunter.Tests.MarkerTypeTests/Saunter.Tests.MarkerTypeTests.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>net6.0</TargetFramework> | ||
| <ImplicitUsings>enable</ImplicitUsings> | ||
| <Nullable>enable</Nullable> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\src\Saunter\Saunter.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
38 changes: 38 additions & 0 deletions
38
test/Saunter.Tests/Generation/DocumentProviderTests/AsyncApiTypesTests.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| using Microsoft.Extensions.DependencyInjection; | ||
| using Microsoft.Extensions.Options; | ||
| using Saunter.AsyncApiSchema.v2; | ||
| using Saunter.Attributes; | ||
| using Saunter.Tests.MarkerTypeTests; | ||
| using Shouldly; | ||
| using Xunit; | ||
|
|
||
| namespace Saunter.Tests.Generation.DocumentProviderTests | ||
| { | ||
| public class AsyncApiTypesTests | ||
| { | ||
| [Fact] | ||
| public void GetDocument_GeneratesDocumentWithMultipleMessagesPerChannel() | ||
| { | ||
| var services = new ServiceCollection() as IServiceCollection; | ||
| services.AddAsyncApiSchemaGeneration(o => | ||
| { | ||
| o.AsyncApi = new AsyncApiDocument | ||
| { | ||
| Info = new Info(GetType().FullName, "1.0.0") | ||
| }; | ||
| o.AssemblyMarkerTypes = new[] { typeof(AnotherSamplePublisher), typeof(SampleConsumer) }; | ||
| }); | ||
|
|
||
| using (var serviceprovider = services.BuildServiceProvider()) | ||
| { | ||
| var documentProvider = serviceprovider.GetRequiredService<IAsyncApiDocumentProvider>(); | ||
| var options = serviceprovider.GetRequiredService<IOptions<AsyncApiOptions>>().Value; | ||
| var document = documentProvider.GetDocument(options, options.AsyncApi); | ||
|
|
||
| document.ShouldNotBeNull(); | ||
| } | ||
| } | ||
|
|
||
|
|
||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters