Skip to content

Commit d6c8992

Browse files
TaritsynTaritsyn
committed
Updated unit tests
1 parent ae499e7 commit d6c8992

File tree

18 files changed

+294
-42
lines changed

18 files changed

+294
-42
lines changed

‎build.cmd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ set local_nuget_package_manager=.nuget\NuGet.exe
1111
set package_dir=packages
1212

1313
if not exist %package_dir%\NUnit.Runners (
14-
%local_nuget_package_manager% install NUnit.Runners -Version 3.4.1 -O %package_dir% -ExcludeVersion -NoCache
14+
%local_nuget_package_manager% install NUnit.Runners -Version 3.5.0 -O %package_dir% -ExcludeVersion -NoCache
1515
)
1616

1717
PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = '';& '%~dp0build.ps1' %*; exit $LASTEXITCODE"

‎build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ localNugetPackageManager=.nuget/NuGet.exe
1010
packageDir=packages
1111

1212
if test ! -d $packageDir/NUnit.Runners; then
13-
mono $localNugetPackageManager install NUnit.Runners -Version 3.4.1 -O $packageDir% -ExcludeVersion -NoCache
13+
mono $localNugetPackageManager install NUnit.Runners -Version 3.5.0 -O $packageDir% -ExcludeVersion -NoCache
1414
fi
1515

1616
koreBuildZip="https://github.com/aspnet/KoreBuild/archive/1.0.0.zip"

‎test/MsieJavaScriptEngine.Test.Auto.Net4/MsieJavaScriptEngine.Test.Auto.Net40.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
<Prefer32Bit>false</Prefer32Bit>
3535
</PropertyGroup>
3636
<ItemGroup>
37-
<Reference Include="nunit.framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
38-
<HintPath>..\..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll</HintPath>
37+
<Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
38+
<HintPath>..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
3939
<Private>True</Private>
4040
</Reference>
4141
<Reference Include="System" />
@@ -51,9 +51,6 @@
5151
<Name>MsieJavaScriptEngine.Test.Common.Net40</Name>
5252
</ProjectReference>
5353
</ItemGroup>
54-
<ItemGroup>
55-
<None Include="packages.config" />
56-
</ItemGroup>
5754
<ItemGroup>
5855
<Compile Include="..\MsieJavaScriptEngine.Test.Auto\CommonTests.cs">
5956
<Link>CommonTests.cs</Link>
@@ -71,6 +68,9 @@
7168
<ItemGroup>
7269
<Folder Include="Properties\" />
7370
</ItemGroup>
71+
<ItemGroup>
72+
<None Include="packages.config" />
73+
</ItemGroup>
7474
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
7575
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
7676
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

‎test/MsieJavaScriptEngine.Test.Auto.Net4/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="NUnit" version="3.4.1" targetFramework="net45" />
3+
<package id="NUnit" version="3.5.0" targetFramework="net45" />
44
</packages>

‎test/MsieJavaScriptEngine.Test.ChakraActiveScript.Net4/MsieJavaScriptEngine.Test.ChakraActiveScript.Net40.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,13 @@
3434
<Prefer32Bit>false</Prefer32Bit>
3535
</PropertyGroup>
3636
<ItemGroup>
37-
<Reference Include="nunit.framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
38-
<HintPath>..\..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll</HintPath>
37+
<Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
38+
<HintPath>..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
3939
<Private>True</Private>
4040
</Reference>
4141
<Reference Include="System" />
4242
<Reference Include="System.Core" />
4343
</ItemGroup>
44-
<ItemGroup>
45-
<None Include="packages.config" />
46-
</ItemGroup>
4744
<ItemGroup>
4845
<ProjectReference Include="..\..\src\MsieJavaScriptEngine.Net4\MsieJavaScriptEngine.Net40.csproj">
4946
<Project>{d672bc49-c454-4975-bd25-a555b9bdd793}</Project>
@@ -71,6 +68,9 @@
7168
<ItemGroup>
7269
<Folder Include="Properties\" />
7370
</ItemGroup>
71+
<ItemGroup>
72+
<None Include="packages.config" />
73+
</ItemGroup>
7474
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
7575
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
7676
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

‎test/MsieJavaScriptEngine.Test.ChakraActiveScript.Net4/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="NUnit" version="3.4.1" targetFramework="net45" />
3+
<package id="NUnit" version="3.5.0" targetFramework="net45" />
44
</packages>

‎test/MsieJavaScriptEngine.Test.ChakraActiveScript/CommonTests.cs‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,41 @@ protected override MsieJsEngine CreateJsEngine()
1818

1919
return jsEngine;
2020
}
21+
22+
#region Mapping errors
23+
24+
[Test]
25+
public override void MappingRuntimeErrorDuringEvaluationOfExpressionIsCorrect()
26+
{
27+
// Arrange
28+
const string input = @"var $variable1 = 611;
29+
var _variable2 = 711;
30+
var @variable3 = 678;
31+
32+
$variable1 + _variable2 - variable3;";
33+
34+
JsRuntimeException exception = null;
35+
36+
// Act
37+
using (var jsEngine = CreateJsEngine())
38+
{
39+
try
40+
{
41+
int result = jsEngine.Evaluate<int>(input);
42+
}
43+
catch (JsRuntimeException e)
44+
{
45+
exception = e;
46+
}
47+
}
48+
49+
// Assert
50+
Assert.NotNull(exception);
51+
Assert.IsNotEmpty(exception.Message);
52+
Assert.AreEqual(3, exception.LineNumber);
53+
Assert.AreEqual(15, exception.ColumnNumber);
54+
}
55+
56+
#endregion
2157
}
2258
}

‎test/MsieJavaScriptEngine.Test.ChakraEdgeJsRt.Net4/MsieJavaScriptEngine.Test.ChakraEdgeJsRt.Net40.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,13 @@
3434
<Prefer32Bit>false</Prefer32Bit>
3535
</PropertyGroup>
3636
<ItemGroup>
37-
<Reference Include="nunit.framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
38-
<HintPath>..\..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll</HintPath>
37+
<Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
38+
<HintPath>..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
3939
<Private>True</Private>
4040
</Reference>
4141
<Reference Include="System" />
4242
<Reference Include="System.Core" />
4343
</ItemGroup>
44-
<ItemGroup>
45-
<None Include="packages.config" />
46-
</ItemGroup>
4744
<ItemGroup>
4845
<ProjectReference Include="..\..\src\MsieJavaScriptEngine.Net4\MsieJavaScriptEngine.Net40.csproj">
4946
<Project>{d672bc49-c454-4975-bd25-a555b9bdd793}</Project>
@@ -71,6 +68,9 @@
7168
<ItemGroup>
7269
<Folder Include="Properties\" />
7370
</ItemGroup>
71+
<ItemGroup>
72+
<None Include="packages.config" />
73+
</ItemGroup>
7474
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
7575
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
7676
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

‎test/MsieJavaScriptEngine.Test.ChakraEdgeJsRt.Net4/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="NUnit" version="3.4.1" targetFramework="net45" />
3+
<package id="NUnit" version="3.5.0" targetFramework="net45" />
44
</packages>

‎test/MsieJavaScriptEngine.Test.ChakraIeJsRt.Net4/MsieJavaScriptEngine.Test.ChakraIeJsRt.Net40.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,13 @@
3434
<Prefer32Bit>false</Prefer32Bit>
3535
</PropertyGroup>
3636
<ItemGroup>
37-
<Reference Include="nunit.framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
38-
<HintPath>..\..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll</HintPath>
37+
<Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
38+
<HintPath>..\..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
3939
<Private>True</Private>
4040
</Reference>
4141
<Reference Include="System" />
4242
<Reference Include="System.Core" />
4343
</ItemGroup>
44-
<ItemGroup>
45-
<None Include="packages.config" />
46-
</ItemGroup>
4744
<ItemGroup>
4845
<ProjectReference Include="..\..\src\MsieJavaScriptEngine.Net4\MsieJavaScriptEngine.Net40.csproj">
4946
<Project>{d672bc49-c454-4975-bd25-a555b9bdd793}</Project>
@@ -71,6 +68,9 @@
7168
<ItemGroup>
7269
<Folder Include="Properties\" />
7370
</ItemGroup>
71+
<ItemGroup>
72+
<None Include="packages.config" />
73+
</ItemGroup>
7474
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
7575
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
7676
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

0 commit comments

Comments
 (0)