这是indexloc提供的服务，不要输入任何密码
Skip to content

parameterize kernel rendering tests based on language #517

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
merged 2 commits into from
Oct 9, 2019
Merged

parameterize kernel rendering tests based on language #517

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
d8e7ee4
parameterize kernel rendering tests based on language
brettfo Oct 9, 2019
d94942a
add F# kernel helper functions
brettfo Oct 9, 2019
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: 1 addition & 0 deletions MLS.Agent/CommandLine/CommandLineParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,6 +545,7 @@ private static IKernel CreateKernel(string defaultKernelName)
.UseXplot(),
new FSharpKernel()
.UseDefaultRendering()
.UseKernelHelpers()
.UseXplot()
}
.UseDefaultMagicCommands()
Expand Down
12 changes: 12 additions & 0 deletions Microsoft.DotNet.Interactive.FSharp/FSharpKernelHelpers.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

namespace Microsoft.DotNet.Interactive.FSharp

open Microsoft.DotNet.Interactive

module FSharpKernelHelpers =
let display (value: obj) =
Kernel.display value
let Javascript (content: string) =
Kernel.Javascript content
1 change: 1 addition & 0 deletions Microsoft.DotNet.Interactive.FSharp/Microsoft.DotNet.Interactive.FSharp.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

<ItemGroup>
<Compile Include="FSharpKernel.fs" />
<Compile Include="FSharpKernelHelpers.fs" />
<Compile Include="FSharpPocketViewTags.fs" />
</ItemGroup>

Expand Down
100 changes: 71 additions & 29 deletions ...ests/Kernel/CSharpKernelRenderingTests.cs → ...ts/Kernel/LanguageKernelRenderingTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

using System;
using System.Linq;
using System.Reactive.Linq;
using System.Threading.Tasks;
using FluentAssertions;
using FluentAssertions.Extensions;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.DotNet.Interactive;
using Microsoft.DotNet.Interactive.Commands;
using Microsoft.DotNet.Interactive.Events;
Expand All @@ -16,23 +15,31 @@
using Xunit.Abstractions;
using static Pocket.Logger;

#pragma warning disable 8509
namespace WorkspaceServer.Tests.Kernel
{
public class CSharpKernelRenderingTests : LanguageKernelTestBase
public class LanguageKernelRenderingTests : LanguageKernelTestBase
{
public CSharpKernelRenderingTests(ITestOutputHelper output) : base(output)
public LanguageKernelRenderingTests(ITestOutputHelper output) : base(output)
{
}

[Theory]
[InlineData("b(123) // PocketView", "<b>123</b>")]
[InlineData("new[] { 1, 2, 3, 4 } // sequence", "<table>")]
[InlineData("new[] { new { a = 123 }, new { a = 456 } } // sequence of anonymous objects", "<table>")]
// PocketView
[InlineData(Language.CSharp, "b(123)", "<b>123</b>")]
[InlineData(Language.FSharp, "b.innerHTML(123)", "<b>123</b>")]
// sequence
[InlineData(Language.CSharp, "new[] { 1, 2, 3, 4 }", "<table>")]
[InlineData(Language.FSharp, "[1; 2; 3; 4]", "<table>")]
// sequence of anonymous objects
[InlineData(Language.CSharp, "new[] { new { a = 123 }, new { a = 456 } }", "<table>")]
[InlineData(Language.FSharp, "[{| a = 123 |}; {| a = 456 |}]", "<table>")]
public async Task Default_rendering_is_HTML(
Language language,
string submission,
string expectedContent)
{
var kernel = CreateKernel();
var kernel = CreateKernel(language);

var result = await kernel.SendAsync(new SubmitCode(submission));

Expand All @@ -53,14 +60,18 @@ public async Task Default_rendering_is_HTML(
}

[Theory]
[InlineData("div(123).ToString()", "<div>123</div>")]
[InlineData("display(div(123).ToString());", "<div>123</div>")]
[InlineData("\"hi\"", "hi")]
[InlineData(Language.CSharp, "div(123).ToString()", "<div>123</div>")]
[InlineData(Language.FSharp, "div.innerHTML(123).ToString()", "<div>123</div>")]
[InlineData(Language.CSharp, "display(div(123).ToString());", "<div>123</div>")]
[InlineData(Language.FSharp, "display(div.innerHTML(123).ToString())", "<div>123</div>")]
[InlineData(Language.CSharp, "\"hi\"", "hi")]
[InlineData(Language.FSharp, "\"hi\"", "hi")]
public async Task String_is_rendered_as_plain_text(
Language language,
string submission,
string expectedContent)
{
var kernel = CreateKernel();
var kernel = CreateKernel(language);

var result = await kernel.SendAsync(new SubmitCode(submission));

Expand All @@ -78,12 +89,20 @@ public async Task String_is_rendered_as_plain_text(
v.Value.ToString().Contains(expectedContent));
}

[Fact]
public async Task Display_helper_can_be_called_without_specifying_class_name()
[Theory]
[InlineData(Language.CSharp)]
[InlineData(Language.FSharp)]
public async Task Display_helper_can_be_called_without_specifying_class_name(Language language)
{
var kernel = CreateKernel();
var kernel = CreateKernel(language);

var submission = language switch
{
Language.CSharp => "display(b(\"hi!\"));",
Language.FSharp => "display(b.innerHTML(\"hi!\"));",
};

await kernel.SendAsync(new SubmitCode("display(b(\"hi!\"));"));
await kernel.SendAsync(new SubmitCode(submission));

var formatted =
KernelEvents
Expand All @@ -98,13 +117,20 @@ public async Task Display_helper_can_be_called_without_specifying_class_name()
v.Value.ToString().Contains("<b>hi!</b>"));
}

[Fact]
public async Task Displayed_value_can_be_updated()
[Theory]
[InlineData(Language.CSharp)]
[InlineData(Language.FSharp)]
public async Task Displayed_value_can_be_updated(Language language)
{
var kernel = CreateKernel();
var kernel = CreateKernel(language);

await kernel.SendAsync(new SubmitCode("var d = display(b(\"hello\")); d.Update(b(\"world\"));"));
var submission = language switch
{
Language.CSharp => "var d = display(b(\"hello\")); d.Update(b(\"world\"));",
Language.FSharp => "let d = display(b.innerHTML(\"hello\"))\nd.Update(b.innerHTML(\"world\"))",
};

await kernel.SendAsync(new SubmitCode(submission));

KernelEvents
.OrderBy(e => e.Timestamp)
Expand All @@ -128,12 +154,20 @@ public async Task Displayed_value_can_be_updated()
v.Value.ToString().Contains("<b>world</b>"));
}

[Fact]
public async Task Value_display_and_update_are_in_right_order()
[Theory]
[InlineData(Language.CSharp)]
[InlineData(Language.FSharp)]
public async Task Value_display_and_update_are_in_right_order(Language language)
{
var kernel = CreateKernel();
var kernel = CreateKernel(language);

var submission = language switch
{
Language.CSharp => "var d = display(b(\"hello\")); d.Update(b(\"world\"));",
Language.FSharp => "let d = display(b.innerHTML(\"hello\"))\nd.Update(b.innerHTML(\"world\"))",
};

await kernel.SendAsync(new SubmitCode("var d = display(b(\"hello\")); d.Update(b(\"world\"));"));
await kernel.SendAsync(new SubmitCode(submission));

var valueEvents =
KernelEvents
Expand All @@ -146,14 +180,22 @@ public async Task Value_display_and_update_are_in_right_order()
valueEvents.Last().Should().BeOfType<DisplayedValueUpdated>();
}

[Fact]
public async Task Javascript_helper_emits_string_as_content_within_a_script_element()
[Theory]
[InlineData(Language.CSharp)]
[InlineData(Language.FSharp)]
public async Task Javascript_helper_emits_string_as_content_within_a_script_element(Language language)
{
var kernel = CreateKernel();
var kernel = CreateKernel(language);

var scriptContent = "alert('Hello World!');";

await kernel.SendAsync(new SubmitCode($@"Javascript(""{scriptContent}"");"));
var submission = language switch
{
Language.CSharp => $@"Javascript(""{scriptContent}"");",
Language.FSharp => $@"Javascript(""{scriptContent}"")",
};

await kernel.SendAsync(new SubmitCode(submission));

var formatted =
KernelEvents
Expand Down
2 changes: 1 addition & 1 deletion WorkspaceServer.Tests/Kernel/LanguageKernelTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ private KernelBase CreateLanguageKernel(Language language)
{
var kernelBase = language switch
{
Language.FSharp => (KernelBase) new FSharpKernel().UseDefaultRendering(),
Language.FSharp => (KernelBase) new FSharpKernel().UseDefaultRendering().UseKernelHelpers(),
Language.CSharp => new CSharpKernel().UseDefaultRendering().UseExtendDirective().UseKernelHelpers(),
_ => throw new InvalidOperationException("Unknown language specified")
};
Expand Down
11 changes: 11 additions & 0 deletions WorkspaceServer/Kernel/FSharpKernelExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,17 @@ public static FSharpKernel UseDefaultRendering(
return kernel;
}

public static FSharpKernel UseKernelHelpers(
this FSharpKernel kernel)
{
Task.Run(() =>
kernel.SendAsync(new SubmitCode($@"
open {typeof(FSharpKernelHelpers).FullName}
"))).Wait();

return kernel;
}

private static string ReferenceFromType(Type type)
{
return $@"#r ""{type.Assembly.Location.Replace("\\", "\\\\")}""";
Expand Down