Skip to content
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

DO NOT MERGE - Update Finos.Fdc3 to 2.1 beta 1 #836

Closed
wants to merge 1 commit into from
Closed

DO NOT MERGE - Update Finos.Fdc3 to 2.1 beta 1 #836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<PackageVersion Include="coverlet.collector" Version="6.0.0" />
<PackageVersion Include="coverlet.msbuild" Version="6.0.0" />
<PackageVersion Include="CommunityToolkit.HighPerformance" Version="8.3.2" />
<PackageVersion Include="Finos.Fdc3" Version="2.0.0" />
<PackageVersion Include="Finos.Fdc3.NewtonsoftJson" Version="2.0.0" />
<PackageVersion Include="Finos.Fdc3.AppDirectory" Version="2.0.0" />
<PackageVersion Include="Finos.Fdc3" Version="2.1.0-beta.1" />
<PackageVersion Include="Finos.Fdc3.NewtonsoftJson" Version="2.1.0-beta.1" />
<PackageVersion Include="Finos.Fdc3.AppDirectory" Version="2.1.0-beta.1" />
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
<PackageVersion Include="FluentAssertions.Json" Version="6.1.0" />
<PackageVersion Include="Google.Protobuf" Version="3.27.3" />
Expand Down
8 changes: 4 additions & 4 deletions .../DesktopAgent/test/MorganStanley.ComposeUI.DesktopAgent.Tests/Channels/ChannelTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public async void CallingGetCurrentContextOnNewChannelReturnsNull(string? contex
public void NewChannelCanHandleContext()
{
var context = GetContext();
new Action(() => Channel.HandleBroadcast(context)).Should().NotThrow();
new System.Action(() => Channel.HandleBroadcast(context)).Should().NotThrow();
}

[Fact]
Expand Down Expand Up @@ -71,7 +71,7 @@ public async void BroadcastedChannelCanHandleBroadcast()
{
await PreBroadcastContext();
var context = GetContext();
new Action(() => Channel.HandleBroadcast(context)).Should().NotThrow();
new System.Action(() => Channel.HandleBroadcast(context)).Should().NotThrow();
}

[Fact]
Expand All @@ -94,7 +94,7 @@ public async void BroadcastedChannelUpdatesLatestBroadcastForType()
public async void BroadcastedChannelCanHandleDifferentBroadcast()
{
await PreBroadcastContext();
new Action(() => Channel.HandleBroadcast(GetDifferentContext())).Should().NotThrow();
new System.Action(() => Channel.HandleBroadcast(GetDifferentContext())).Should().NotThrow();
}

[Fact]
Expand All @@ -120,7 +120,7 @@ public async void ChannelWithDifferentBroadcastsReturnsAppropriateContext()
private int _counter;
private MessageBuffer ContextType => MessageBuffer.Factory.CreateJson(new GetCurrentContextRequest { ContextType = new Contact().Type });
private MessageBuffer OtherContextType => MessageBuffer.Factory.CreateJson(new GetCurrentContextRequest { ContextType = new Email(null).Type });
private MessageBuffer GetContext() => MessageBuffer.Factory.CreateJson(new Contact(new ContactID() { Email = $"test{_counter}@test.org", FdsId = $"test{_counter++}" }, "Testy Tester"));
private MessageBuffer GetContext() => MessageBuffer.Factory.CreateJson(new Contact(new ContactID() { Email = $"test{_counter}@test.org", FDS_ID = $"test{_counter++}" }, "Testy Tester"));
private MessageBuffer DifferentContextType => MessageBuffer.Factory.CreateJson(new GetCurrentContextRequest { ContextType = new Currency().Type });
private MessageBuffer GetDifferentContext() => MessageBuffer.Factory.CreateJson(new Currency(new CurrencyID() { CURRENCY_ISOCODE = "HUF" }));

Expand Down
2 changes: 1 addition & 1 deletion ...fdc3/dotnet/DesktopAgent/test/MorganStanley.ComposeUI.DesktopAgent.Tests/EndToEndTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1763,7 +1763,7 @@ private MessageBuffer GetContext()
{
return MessageBuffer.Factory.CreateJson(
new Contact(
new ContactID {Email = $"test{_counter}@test.org", FdsId = $"test{_counter++}"},
new ContactID {Email = $"test{_counter}@test.org", FDS_ID = $"test{_counter++}"},
name: "Testy Tester"), _options);
}
}
Loading