Skip to content

Commit 2f1651f

Browse files
TaritsynTaritsyn
committed
Reorganized a files in unit tests
1 parent e77f558 commit 2f1651f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+149
-191
lines changed

‎JavaScriptEngineSwitcher.NoSamples.sln‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{0C281F46-F1D
3838
EndProject
3939
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{53B43213-2E66-42C2-8476-600A2FD2DA75}"
4040
EndProject
41-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SharedFiles", "SharedFiles", "{958A803E-3A62-4E29-9866-9DCE451943BC}"
42-
ProjectSection(SolutionItems) = preProject
43-
test\SharedFiles\declinationOfMinutes.js = test\SharedFiles\declinationOfMinutes.js
44-
test\SharedFiles\link.txt = test\SharedFiles\link.txt
45-
test\SharedFiles\square.js = test\SharedFiles\square.js
46-
EndProjectSection
47-
EndProject
4841
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JavaScriptEngineSwitcher.Core", "src\JavaScriptEngineSwitcher.Core\JavaScriptEngineSwitcher.Core.csproj", "{13559975-F99D-4B93-BF46-227C0B6E0DFB}"
4942
EndProject
5043
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JavaScriptEngineSwitcher.Extensions.MsDependencyInjection", "src\JavaScriptEngineSwitcher.Extensions.MsDependencyInjection\JavaScriptEngineSwitcher.Extensions.MsDependencyInjection.csproj", "{5B693A49-BEC2-4532-ADFE-80C4AA930E27}"
@@ -164,7 +157,6 @@ Global
164157
HideSolutionNode = FALSE
165158
EndGlobalSection
166159
GlobalSection(NestedProjects) = preSolution
167-
{958A803E-3A62-4E29-9866-9DCE451943BC} = {53B43213-2E66-42C2-8476-600A2FD2DA75}
168160
{13559975-F99D-4B93-BF46-227C0B6E0DFB} = {0C281F46-F1D2-4A1C-8560-375EDA65D680}
169161
{5B693A49-BEC2-4532-ADFE-80C4AA930E27} = {0C281F46-F1D2-4A1C-8560-375EDA65D680}
170162
{B3C4AA95-2227-47DD-B58C-22FA589CB28D} = {0C281F46-F1D2-4A1C-8560-375EDA65D680}

‎test/JavaScriptEngineSwitcher.Tests/ChakraCore/InteropTests.cs‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ protected override string EngineName
2525
public void MappingCompilationErrorDuringRecursiveEvaluationOfFilesIsCorrect()
2626
{
2727
// Arrange
28-
const string directoryPath = "Files/recursiveEvaluation/compilationError";
29-
const string input = "require('index').calculateResult();";
28+
const string directoryPath = "Files/recursive-evaluation/compilation-error";
29+
const string input = "evaluateFile('index').calculateResult();";
3030

3131
// Act
3232
JsCompilationException exception = null;
@@ -35,15 +35,15 @@ public void MappingCompilationErrorDuringRecursiveEvaluationOfFilesIsCorrect()
3535
{
3636
try
3737
{
38-
Func<string, object> loadModule = path => {
38+
Func<string, object> evaluateFile = path => {
3939
string absolutePath = Path.Combine(directoryPath, $"{path}.js");
4040
string code = File.ReadAllText(absolutePath);
4141
object result = jsEngine.Evaluate(code, absolutePath);
4242

4343
return result;
4444
};
4545

46-
jsEngine.EmbedHostObject("require", loadModule);
46+
jsEngine.EmbedHostObject("evaluateFile", evaluateFile);
4747
double output = jsEngine.Evaluate<double>(input);
4848
}
4949
catch (JsCompilationException e)
@@ -67,8 +67,8 @@ public void MappingCompilationErrorDuringRecursiveEvaluationOfFilesIsCorrect()
6767
public void MappingRuntimeErrorDuringRecursiveEvaluationOfFilesIsCorrect()
6868
{
6969
// Arrange
70-
const string directoryPath = "Files/recursiveEvaluation/runtimeError";
71-
const string input = "require('index').calculateResult();";
70+
const string directoryPath = "Files/recursive-evaluation/runtime-error";
71+
const string input = "evaluateFile('index').calculateResult();";
7272

7373
// Act
7474
JsRuntimeException exception = null;
@@ -77,15 +77,15 @@ public void MappingRuntimeErrorDuringRecursiveEvaluationOfFilesIsCorrect()
7777
{
7878
try
7979
{
80-
Func<string, object> loadModule = path => {
80+
Func<string, object> evaluateFile = path => {
8181
string absolutePath = Path.Combine(directoryPath, $"{path}.js");
8282
string code = File.ReadAllText(absolutePath);
8383
object result = jsEngine.Evaluate(code, absolutePath);
8484

8585
return result;
8686
};
8787

88-
jsEngine.EmbedHostObject("require", loadModule);
88+
jsEngine.EmbedHostObject("evaluateFile", evaluateFile);
8989
double output = jsEngine.Evaluate<double>(input);
9090
}
9191
catch (JsRuntimeException e)
@@ -115,8 +115,8 @@ public void MappingRuntimeErrorDuringRecursiveEvaluationOfFilesIsCorrect()
115115
public void MappingHostErrorDuringRecursiveEvaluationOfFilesIsCorrect()
116116
{
117117
// Arrange
118-
const string directoryPath = "Files/recursiveEvaluation/hostError";
119-
const string input = "require('index').calculateResult();";
118+
const string directoryPath = "Files/recursive-evaluation/host-error";
119+
const string input = "evaluateFile('index').calculateResult();";
120120

121121
// Act
122122
JsRuntimeException exception = null;
@@ -125,15 +125,15 @@ public void MappingHostErrorDuringRecursiveEvaluationOfFilesIsCorrect()
125125
{
126126
try
127127
{
128-
Func<string, object> loadModule = path => {
128+
Func<string, object> evaluateFile = path => {
129129
string absolutePath = Path.Combine(directoryPath, $"{path}.js");
130130
string code = File.ReadAllText(absolutePath);
131131
object result = jsEngine.Evaluate(code, absolutePath);
132132

133133
return result;
134134
};
135135

136-
jsEngine.EmbedHostObject("require", loadModule);
136+
jsEngine.EmbedHostObject("evaluateFile", evaluateFile);
137137
double output = jsEngine.Evaluate<double>(input);
138138
}
139139
catch (JsRuntimeException e)
@@ -151,7 +151,7 @@ public void MappingHostErrorDuringRecursiveEvaluationOfFilesIsCorrect()
151151
Assert.Equal("index.js", exception.DocumentName);
152152
Assert.Equal(6, exception.LineNumber);
153153
Assert.Equal(3, exception.ColumnNumber);
154-
Assert.Equal(" var math = require('./match'),", exception.SourceFragment);
154+
Assert.Equal(" var math = evaluateFile('./match'),", exception.SourceFragment);
155155
Assert.Equal(
156156
" at calculateResult (index.js:6:3)" + Environment.NewLine +
157157
" at Global code (Script Document:1:1)",
@@ -163,7 +163,7 @@ public void MappingHostErrorDuringRecursiveEvaluationOfFilesIsCorrect()
163163
public void MappingCompilationErrorDuringRecursiveExecutionOfFilesIsCorrect()
164164
{
165165
// Arrange
166-
const string directoryPath = "Files/recursiveExecution/compilationError";
166+
const string directoryPath = "Files/recursive-execution/compilation-error";
167167
const string variableName = "num";
168168

169169
// Act
@@ -177,7 +177,7 @@ public void MappingCompilationErrorDuringRecursiveExecutionOfFilesIsCorrect()
177177

178178
jsEngine.SetVariableValue("directoryPath", directoryPath);
179179
jsEngine.EmbedHostObject("executeFile", executeFile);
180-
jsEngine.ExecuteFile(Path.Combine(directoryPath, "mainFile.js"));
180+
jsEngine.ExecuteFile(Path.Combine(directoryPath, "main-file.js"));
181181

182182
int output = jsEngine.GetVariableValue<int>(variableName);
183183
}
@@ -192,7 +192,7 @@ public void MappingCompilationErrorDuringRecursiveExecutionOfFilesIsCorrect()
192192
Assert.Equal("Compilation error", exception.Category);
193193
Assert.Equal("Invalid character", exception.Description);
194194
Assert.Equal("SyntaxError", exception.Type);
195-
Assert.Equal("secondFile.js", exception.DocumentName);
195+
Assert.Equal("second-file.js", exception.DocumentName);
196196
Assert.Equal(1, exception.LineNumber);
197197
Assert.Equal(6, exception.ColumnNumber);
198198
Assert.Equal("num -# 3;", exception.SourceFragment);
@@ -202,7 +202,7 @@ public void MappingCompilationErrorDuringRecursiveExecutionOfFilesIsCorrect()
202202
public void MappingRuntimeErrorDuringRecursiveExecutionOfFilesIsCorrect()
203203
{
204204
// Arrange
205-
const string directoryPath = "Files/recursiveExecution/runtimeError";
205+
const string directoryPath = "Files/recursive-execution/runtime-error";
206206
const string variableName = "num";
207207

208208
// Act
@@ -216,7 +216,7 @@ public void MappingRuntimeErrorDuringRecursiveExecutionOfFilesIsCorrect()
216216

217217
jsEngine.SetVariableValue("directoryPath", directoryPath);
218218
jsEngine.EmbedHostObject("executeFile", executeFile);
219-
jsEngine.ExecuteFile(Path.Combine(directoryPath, "mainFile.js"));
219+
jsEngine.ExecuteFile(Path.Combine(directoryPath, "main-file.js"));
220220

221221
int output = jsEngine.GetVariableValue<int>(variableName);
222222
}
@@ -231,14 +231,14 @@ public void MappingRuntimeErrorDuringRecursiveExecutionOfFilesIsCorrect()
231231
Assert.Equal("Runtime error", exception.Category);
232232
Assert.Equal("'nuм' is not defined", exception.Description);
233233
Assert.Equal("ReferenceError", exception.Type);
234-
Assert.Equal("secondFile.js", exception.DocumentName);
234+
Assert.Equal("second-file.js", exception.DocumentName);
235235
Assert.Equal(1, exception.LineNumber);
236236
Assert.Equal(1, exception.ColumnNumber);
237237
Assert.Equal("nuм -= 3;", exception.SourceFragment);
238238
Assert.Equal(
239-
" at Global code (secondFile.js:1:1)" + Environment.NewLine +
240-
" at Global code (firstFile.js:2:1)" + Environment.NewLine +
241-
" at Global code (mainFile.js:2:1)",
239+
" at Global code (second-file.js:1:1)" + Environment.NewLine +
240+
" at Global code (first-file.js:2:1)" + Environment.NewLine +
241+
" at Global code (main-file.js:2:1)",
242242
exception.CallStack
243243
);
244244
}
@@ -247,7 +247,7 @@ public void MappingRuntimeErrorDuringRecursiveExecutionOfFilesIsCorrect()
247247
public void MappingHostErrorDuringRecursiveExecutionOfFilesIsCorrect()
248248
{
249249
// Arrange
250-
const string directoryPath = "Files/recursiveExecution/hostError";
250+
const string directoryPath = "Files/recursive-execution/host-error";
251251
const string variableName = "num";
252252

253253
// Act
@@ -261,7 +261,7 @@ public void MappingHostErrorDuringRecursiveExecutionOfFilesIsCorrect()
261261

262262
jsEngine.SetVariableValue("directoryPath", directoryPath);
263263
jsEngine.EmbedHostObject("executeFile", executeFile);
264-
jsEngine.ExecuteFile(Path.Combine(directoryPath, "mainFile.js"));
264+
jsEngine.ExecuteFile(Path.Combine(directoryPath, "main-file.js"));
265265

266266
int output = jsEngine.GetVariableValue<int>(variableName);
267267
}
@@ -279,16 +279,16 @@ public void MappingHostErrorDuringRecursiveExecutionOfFilesIsCorrect()
279279
exception.Description
280280
);
281281
Assert.Equal("Error", exception.Type);
282-
Assert.Equal("firstFile.js", exception.DocumentName);
282+
Assert.Equal("first-file.js", exception.DocumentName);
283283
Assert.Equal(2, exception.LineNumber);
284284
Assert.Equal(1, exception.ColumnNumber);
285285
Assert.Equal(
286-
"executeFile(directoryPath + \"/secondFile.jsx\");",
286+
"executeFile(directoryPath + \"/second-file.jsx\");",
287287
exception.SourceFragment
288288
);
289289
Assert.Equal(
290-
" at Global code (firstFile.js:2:1)" + Environment.NewLine +
291-
" at Global code (mainFile.js:2:1)",
290+
" at Global code (first-file.js:2:1)" + Environment.NewLine +
291+
" at Global code (main-file.js:2:1)",
292292
exception.CallStack
293293
);
294294
}

‎test/JavaScriptEngineSwitcher.Tests/ChakraCore/PrecompilationTests.cs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public void MappingRuntimeErrorDuringExecutionOfPrecompiledCodeIsCorrect()
8888
{
8989
try
9090
{
91-
IPrecompiledScript precompiledScript = jsEngine.Precompile(input, "getItem.js");
91+
IPrecompiledScript precompiledScript = jsEngine.Precompile(input, "get-item.js");
9292
jsEngine.Execute(precompiledScript);
9393
}
9494
catch (JsRuntimeException e)
@@ -102,14 +102,14 @@ public void MappingRuntimeErrorDuringExecutionOfPrecompiledCodeIsCorrect()
102102
Assert.Equal("Runtime error", exception.Category);
103103
Assert.Equal("Unable to get property '5' of undefined or null reference", exception.Description);
104104
Assert.Equal("TypeError", exception.Type);
105-
Assert.Equal("getItem.js", exception.DocumentName);
105+
Assert.Equal("get-item.js", exception.DocumentName);
106106
Assert.Equal(2, exception.LineNumber);
107107
Assert.Equal(2, exception.ColumnNumber);
108108
Assert.Equal(" var item = items[itemIndex];", exception.SourceFragment);
109109
Assert.Equal(
110-
" at getItem (getItem.js:2:2)" + Environment.NewLine +
111-
" at Anonymous function (getItem.js:9:3)" + Environment.NewLine +
112-
" at Global code (getItem.js:7:2)",
110+
" at getItem (get-item.js:2:2)" + Environment.NewLine +
111+
" at Anonymous function (get-item.js:9:3)" + Environment.NewLine +
112+
" at Global code (get-item.js:7:2)",
113113
exception.CallStack
114114
);
115115
}
@@ -128,14 +128,14 @@ public void GenerationOfCompilationErrorMessageIsCorrect()
128128
charIndex
129129
;
130130
131-
for (charIndex = 0; charIndex < length; charIndex++)
131+
for (charIndex = 0; charIndex < length; charIndex++)
132132
result += possible.charAt(Math.floor(Math.random() * possible.length));
133133
}
134134
135135
return result;
136136
}";
137137
string targetOutput = "SyntaxError: 'return' statement outside of function" + Environment.NewLine +
138-
" at makeId.js:11:2 -> return result;"
138+
" at make-id.js:11:2 -> return result;"
139139
;
140140

141141
IPrecompiledScript precompiledScript = null;
@@ -146,7 +146,7 @@ public void GenerationOfCompilationErrorMessageIsCorrect()
146146
{
147147
try
148148
{
149-
precompiledScript = jsEngine.Precompile(input, "makeId.js");
149+
precompiledScript = jsEngine.Precompile(input, "make-id.js");
150150
}
151151
catch (JsCompilationException e)
152152
{
@@ -177,10 +177,10 @@ public void GenerationOfRuntimeErrorMessageIsCorrect()
177177
return getFullName(firstName, lastName);
178178
})(getFullName);";
179179
string targetOutput = "ReferenceError: 'middleName' is not defined" + Environment.NewLine +
180-
" at getFullName (getFullName.js:2:2) -> var fullName = firstName + ' ' + middleName + " +
180+
" at getFullName (get-full-name.js:2:2) -> var fullName = firstName + ' ' + middleName + " +
181181
"' ' + lastName;" + Environment.NewLine +
182-
" at Anonymous function (getFullName.js:12:2)" + Environment.NewLine +
183-
" at Global code (getFullName.js:7:2)"
182+
" at Anonymous function (get-full-name.js:12:2)" + Environment.NewLine +
183+
" at Global code (get-full-name.js:7:2)"
184184
;
185185

186186
JsRuntimeException exception = null;
@@ -190,7 +190,7 @@ public void GenerationOfRuntimeErrorMessageIsCorrect()
190190
{
191191
try
192192
{
193-
IPrecompiledScript precompiledScript = jsEngine.Precompile(input, "getFullName.js");
193+
IPrecompiledScript precompiledScript = jsEngine.Precompile(input, "get-full-name.js");
194194
jsEngine.Execute(precompiledScript);
195195
}
196196
catch (JsRuntimeException e)

‎test/JavaScriptEngineSwitcher.Tests/CommonTestsBase.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System;
2-
using System.IO;
32
using System.Reflection;
43
using System.Threading;
54

@@ -9,7 +8,7 @@
98

109
namespace JavaScriptEngineSwitcher.Tests
1110
{
12-
public abstract class CommonTestsBase : FileSystemTestsBase
11+
public abstract class CommonTestsBase : TestsBase
1312
{
1413
#region Evaluation of scripts
1514

@@ -183,7 +182,7 @@ public virtual void ExecutionOfCodeIsCorrect()
183182
public virtual void ExecutionOfFileIsCorrect()
184183
{
185184
// Arrange
186-
string filePath = Path.GetFullPath(Path.Combine(_baseDirectoryPath, "../SharedFiles/square.js"));
185+
const string filePath = "Files/square.js";
187186
const string input = "square(6);";
188187
const int targetOutput = 36;
189188

‎test/JavaScriptEngineSwitcher.Tests/FileSystemTestsBase.cs‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

test/SharedFiles/declinationOfMinutes.js renamed to test/JavaScriptEngineSwitcher.Tests/Files/declination-of-minutes.js

File renamed without changes.

test/SharedFiles/link.txt renamed to test/JavaScriptEngineSwitcher.Tests/Files/link.txt

File renamed without changes.

test/JavaScriptEngineSwitcher.Tests/Files/recursiveEvaluation/runtimeError/index.js renamed to test/JavaScriptEngineSwitcher.Tests/Files/recursive-evaluation/compilation-error/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
/*global require */
1+
/*global evaluateFile */
22
(function () {
33
'use strict';
44

55
function calculateResult() {
6-
var math = require('./math'),
6+
var math = evaluateFile('./math'),
77
result = math.sum(math.cube(5), math.square(2), math.PI)
88
;
99

test/JavaScriptEngineSwitcher.Tests/Files/recursiveEvaluation/compilationError/math.js renamed to test/JavaScriptEngineSwitcher.Tests/Files/recursive-evaluation/compilation-error/math.js

File renamed without changes.

test/JavaScriptEngineSwitcher.Tests/Files/recursiveEvaluation/noError/index.js renamed to test/JavaScriptEngineSwitcher.Tests/Files/recursive-evaluation/host-error/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
/*global require */
1+
/*global evaluateFile */
22
(function () {
33
'use strict';
44

55
function calculateResult() {
6-
var math = require('./math'),
6+
var math = evaluateFile('./match'),
77
result = math.sum(math.cube(5), math.square(2), math.PI)
88
;
99

0 commit comments

Comments
 (0)