Browse Source

Fix script engine.

pull/998/head
Sebastian 3 years ago
parent
commit
a6179e1636
  1. 5
      backend/src/Squidex.Domain.Apps.Core.Operations/Scripting/JintScriptEngine.cs
  2. 4
      backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/AtlasTextIndexFixture.cs
  3. 6
      backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/AzureTextIndexFixture.cs
  4. 4
      backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/ElasticSearchTextIndexFixture.cs
  5. 4
      backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/MongoTextIndexFixture.cs
  6. 4
      backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/OpenSearchTextIndexFixture.cs

5
backend/src/Squidex.Domain.Apps.Core.Operations/Scripting/JintScriptEngine.cs

@ -168,7 +168,10 @@ public sealed class JintScriptEngine : IScriptEngine, IScriptDescriptor
{ {
var program = parser.Parse(script); var program = parser.Parse(script);
return engine.Evaluate(program); lock (engine)
{
return engine.Evaluate(program);
}
} }
catch (ArgumentException ex) catch (ArgumentException ex)
{ {

4
backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/AtlasTextIndexFixture.cs

@ -24,8 +24,8 @@ public sealed class AtlasTextIndexFixture : IAsyncLifetime
{ {
TestUtils.SetupBson(); TestUtils.SetupBson();
var mongoClient = MongoClientFactory.Create(TestConfig.Configuration["atlas:configuration"]); var mongoClient = MongoClientFactory.Create(TestConfig.Configuration["atlas:configuration"]!);
var mongoDatabase = mongoClient.GetDatabase(TestConfig.Configuration["atlas:database"]); var mongoDatabase = mongoClient.GetDatabase(TestConfig.Configuration["atlas:database"]!);
var options = TestConfig.Configuration.GetSection("atlas").Get<AtlasOptions>()!; var options = TestConfig.Configuration.GetSection("atlas").Get<AtlasOptions>()!;

6
backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/AzureTextIndexFixture.cs

@ -17,9 +17,9 @@ public sealed class AzureTextIndexFixture : IAsyncLifetime
public AzureTextIndexFixture() public AzureTextIndexFixture()
{ {
Index = new AzureTextIndex( Index = new AzureTextIndex(
TestConfig.Configuration["azureText:serviceEndpoint"], TestConfig.Configuration["azureText:serviceEndpoint"]!,
TestConfig.Configuration["azureText:apiKey"], TestConfig.Configuration["azureText:apiKey"]!,
TestConfig.Configuration["azureText:indexName"]); TestConfig.Configuration["azureText:indexName"]!);
} }
public Task InitializeAsync() public Task InitializeAsync()

4
backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/ElasticSearchTextIndexFixture.cs

@ -18,8 +18,8 @@ public sealed class ElasticSearchTextIndexFixture : IAsyncLifetime
public ElasticSearchTextIndexFixture() public ElasticSearchTextIndexFixture()
{ {
Index = new ElasticSearchTextIndex( Index = new ElasticSearchTextIndex(
new ElasticSearchClient(TestConfig.Configuration["elastic:configuration"]), new ElasticSearchClient(TestConfig.Configuration["elastic:configuration"]!),
TestConfig.Configuration["elastic:indexName"], TestConfig.Configuration["elastic:indexName"]!,
TestUtils.DefaultSerializer); TestUtils.DefaultSerializer);
} }

4
backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/MongoTextIndexFixture.cs

@ -20,8 +20,8 @@ public sealed class MongoTextIndexFixture : IAsyncLifetime
{ {
TestUtils.SetupBson(); TestUtils.SetupBson();
var mongoClient = MongoClientFactory.Create(TestConfig.Configuration["mongoDb:configuration"]); var mongoClient = MongoClientFactory.Create(TestConfig.Configuration["mongoDb:configuration"]!);
var mongoDatabase = mongoClient.GetDatabase(TestConfig.Configuration["mongodb:database"]); var mongoDatabase = mongoClient.GetDatabase(TestConfig.Configuration["mongodb:database"]!);
Index = new MongoTextIndex(mongoDatabase); Index = new MongoTextIndex(mongoDatabase);
} }

4
backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/OpenSearchTextIndexFixture.cs

@ -18,8 +18,8 @@ public sealed class OpenSearchTextIndexFixture : IAsyncLifetime
public OpenSearchTextIndexFixture() public OpenSearchTextIndexFixture()
{ {
Index = new ElasticSearchTextIndex( Index = new ElasticSearchTextIndex(
new OpenSearchClient(TestConfig.Configuration["elastic:configuration"]), new OpenSearchClient(TestConfig.Configuration["elastic:configuration"]!),
TestConfig.Configuration["elastic:indexName"], TestConfig.Configuration["elastic:indexName"]!,
TestUtils.DefaultSerializer); TestUtils.DefaultSerializer);
} }

Loading…
Cancel
Save