Skip to content

Commit 198399b

Browse files
ptupitsynptupitsyn
committed
IGNITE-7279 .NET: Compile on Linux
This closes apache#3271
1 parent f1a853d commit 198399b

25 files changed

+212
-191
lines changed

‎modules/platforms/dotnet/Apache.Ignite.Core.Tests.DotNetCore/Apache.Ignite.Core.Tests.DotNetCore.csproj

+34-6
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,29 @@
1717
</PropertyGroup>
1818

1919
<ItemGroup>
20+
<Compile Include="..\Apache.Ignite.Core.Tests\ApiParity\BinaryParityTest.cs" Link="ApiParity\BinaryParityTest.cs" />
21+
<Compile Include="..\Apache.Ignite.Core.Tests\ApiParity\CacheAffinityParityTest.cs" Link="ApiParity\CacheAffinityParityTest.cs" />
22+
<Compile Include="..\Apache.Ignite.Core.Tests\ApiParity\CacheConfigurationParityTest.cs" Link="ApiParity\CacheConfigurationParityTest.cs" />
23+
<Compile Include="..\Apache.Ignite.Core.Tests\ApiParity\CacheMetricsParityTest.cs" Link="ApiParity\CacheMetricsParityTest.cs" />
24+
<Compile Include="..\Apache.Ignite.Core.Tests\ApiParity\CacheParityTest.cs" Link="ApiParity\CacheParityTest.cs" />
25+
<Compile Include="..\Apache.Ignite.Core.Tests\ApiParity\ClientConnectorConfigurationParityTest.cs" Link="ApiParity\ClientConnectorConfigurationParityTest.cs" />
26+
<Compile Include="..\Apache.Ignite.Core.Tests\ApiParity\ClusterMetricsParityTest.cs" Link="ApiParity\ClusterMetricsParityTest.cs" />
27+
<Compile Include="..\Apache.Ignite.Core.Tests\ApiParity\ClusterParityTest.cs" Link="ApiParity\ClusterParityTest.cs" />
28+
<Compile Include="..\Apache.Ignite.Core.Tests\ApiParity\ComputeParityTest.cs" Link="ApiParity\ComputeParityTest.cs" />
29+
<Compile Include="..\Apache.Ignite.Core.Tests\ApiParity\DataRegionConfigurationParityTest.cs" Link="ApiParity\DataRegionConfigurationParityTest.cs" />
30+
<Compile Include="..\Apache.Ignite.Core.Tests\ApiParity\DataRegionMetricsParityTest.cs" Link="ApiParity\DataRegionMetricsParityTest.cs" />
31+
<Compile Include="..\Apache.Ignite.Core.Tests\ApiParity\DataStorageConfigurationParityTest.cs" Link="ApiParity\DataStorageConfigurationParityTest.cs" />
32+
<Compile Include="..\Apache.Ignite.Core.Tests\ApiParity\DataStorageMetricsParityTest.cs" Link="ApiParity\DataStorageMetricsParityTest.cs" />
33+
<Compile Include="..\Apache.Ignite.Core.Tests\ApiParity\EventsParityTest.cs" Link="ApiParity\EventsParityTest.cs" />
34+
<Compile Include="..\Apache.Ignite.Core.Tests\ApiParity\IgniteConfigurationParityTest.cs" Link="ApiParity\IgniteConfigurationParityTest.cs" />
35+
<Compile Include="..\Apache.Ignite.Core.Tests\ApiParity\IgniteParityTest.cs" Link="ApiParity\IgniteParityTest.cs" />
36+
<Compile Include="..\Apache.Ignite.Core.Tests\ApiParity\MessagingParityTest.cs" Link="ApiParity\MessagingParityTest.cs" />
37+
<Compile Include="..\Apache.Ignite.Core.Tests\ApiParity\ParityTest.cs" Link="ApiParity\ParityTest.cs" />
38+
<Compile Include="..\Apache.Ignite.Core.Tests\ApiParity\QueryEntityConfigurationParityTest.cs" Link="ApiParity\QueryEntityConfigurationParityTest.cs" />
39+
<Compile Include="..\Apache.Ignite.Core.Tests\ApiParity\ServicesParityTest.cs" Link="ApiParity\ServicesParityTest.cs" />
40+
<Compile Include="..\Apache.Ignite.Core.Tests\ApiParity\StreamerParityTest.cs" Link="ApiParity\StreamerParityTest.cs" />
41+
<Compile Include="..\Apache.Ignite.Core.Tests\ApiParity\TransactionMetricsParityTest.cs" Link="ApiParity\TransactionMetricsParityTest.cs" />
42+
<Compile Include="..\Apache.Ignite.Core.Tests\ApiParity\TransactionsParityTest.cs" Link="ApiParity\TransactionsParityTest.cs" />
2043
<Compile Include="..\Apache.Ignite.Core.Tests\AssertExtensions.cs" Link="Common\AssertExtensions.cs" />
2144
<Compile Include="..\Apache.Ignite.Core.Tests\BinaryConfigurationTest.cs" Link="Binary\BinaryConfigurationTest.cs" />
2245
<Compile Include="..\Apache.Ignite.Core.Tests\Binary\BinaryDateTimeTest.cs" Link="Binary\BinaryDateTimeTest.cs" />
@@ -75,9 +98,15 @@
7598
<Compile Include="..\Apache.Ignite.Core.Tests\DataStructures\AtomicReferenceTest.cs" Link="DataStructures\AtomicReferenceTest.cs" />
7699
<Compile Include="..\Apache.Ignite.Core.Tests\DataStructures\AtomicSequenceTest.cs" Link="DataStructures\AtomicSequenceTest.cs" />
77100
<Compile Include="..\Apache.Ignite.Core.Tests\EventsTestLocalListeners.cs" Link="Common\EventsTestLocalListeners.cs" />
101+
<Compile Include="..\Apache.Ignite.Core.Tests\IgniteConfigurationTest.cs" Link="Common\IgniteConfigurationTest.cs" />
78102
<Compile Include="..\Apache.Ignite.Core.Tests\IgniteTestBase.cs" Link="Common\IgniteTestBase.cs" />
79103
<Compile Include="..\Apache.Ignite.Core.Tests\Log\CustomLoggerTest.cs" Link="Log\CustomLoggerTest.cs" />
80104
<Compile Include="..\Apache.Ignite.Core.Tests\MessagingTest.cs" Link="Common\MessagingTest.cs" />
105+
<Compile Include="..\Apache.Ignite.Core.Tests\Plugin\PluginTest.cs" Link="Plugin\PluginTest.cs" />
106+
<Compile Include="..\Apache.Ignite.Core.Tests\Plugin\TestIgnitePlugin.cs" Link="Plugin\TestIgnitePlugin.cs" />
107+
<Compile Include="..\Apache.Ignite.Core.Tests\Plugin\TestIgnitePluginConfiguration.cs" Link="Plugin\TestIgnitePluginConfiguration.cs" />
108+
<Compile Include="..\Apache.Ignite.Core.Tests\Plugin\TestIgnitePluginException.cs" Link="Plugin\TestIgnitePluginException.cs" />
109+
<Compile Include="..\Apache.Ignite.Core.Tests\Plugin\TestIgnitePluginProvider.cs" Link="Plugin\TestIgnitePluginProvider.cs" />
81110
<Compile Include="..\Apache.Ignite.Core.Tests\Query\BinarizablePerson.cs" Link="Cache\Query\BinarizablePerson.cs" />
82111
<Compile Include="..\Apache.Ignite.Core.Tests\TestUtils.Common.cs" Link="Common\TestUtils.Common.cs" />
83112
</ItemGroup>
@@ -110,17 +139,14 @@
110139
</ItemGroup>
111140

112141
<ItemGroup>
113-
<PackageReference Include="Apache.Ignite" Version="0.0.1-test" />
114-
<PackageReference Include="Apache.Ignite.Linq" Version="0.0.1-test" />
115-
<PackageReference Include="Apache.Ignite.Schema" Version="0.0.1-test" />
116-
<PackageReference Include="Apache.Ignite.NLog" Version="0.0.1-test" />
117-
<PackageReference Include="Apache.Ignite.log4net" Version="0.0.1-test" />
118142
<PackageReference Include="log4net" Version="2.0.5" />
119143
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
120-
<PackageReference Include="NLog" Version="4.4.12" />
121144
<PackageReference Include="NUnit" Version="3.8.1" />
122145
<PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />
123146
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.4.0" />
147+
148+
<ProjectReference Include="..\Apache.Ignite.Core\Apache.Ignite.Core.DotNetCore.csproj" />
149+
<ProjectReference Include="..\Apache.Ignite.Linq\Apache.Ignite.Linq.DotNetCore.csproj" />
124150
</ItemGroup>
125151

126152
<ItemGroup>
@@ -132,6 +158,8 @@
132158
<Folder Include="Config\Client\" />
133159
<Folder Include="Log\" />
134160
<Folder Include="DataStructures\" />
161+
<Folder Include="ApiParity\" />
162+
<Folder Include="Plugin\" />
135163
<Folder Include="ThinClient\Cache\" />
136164
</ItemGroup>
137165

‎modules/platforms/dotnet/Apache.Ignite.Core.Tests.DotNetCore/Apache.Ignite.Core.Tests.DotNetCore.sln

-25
This file was deleted.

‎modules/platforms/dotnet/Apache.Ignite.Core.Tests.DotNetCore/Common/IgnitionStartTest.cs

+3
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@ public void TestIgniteStartsFromAppConfig()
6363
// 2) Note that System.Configuration.ConfigurationManager NuGet package has to be installed.
6464
var configPath = Path.Combine(Path.GetDirectoryName(GetType().Assembly.Location), "app.config");
6565

66+
// Force test classpath.
67+
TestUtils.GetTestConfiguration();
68+
6669
using (var ignite = Ignition.StartFromApplicationConfiguration("igniteConfiguration", configPath))
6770
{
6871
var cache = ignite.GetCache<int, int>(ignite.GetCacheNames().Single());

‎modules/platforms/dotnet/Apache.Ignite.Core.Tests.DotNetCore/Common/TestUtils.DotNetCore.cs

+2
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ public static IgniteConfiguration GetTestConfiguration(string name = null)
3333
{
3434
TestLogger.Instance.Info("GetTestConfiguration: " + GetTestName());
3535

36+
Environment.SetEnvironmentVariable("IGNITE_NATIVE_TEST_CLASSPATH", "true");
37+
3638
return new IgniteConfiguration
3739
{
3840
DiscoverySpi = GetStaticDiscovery(),

‎modules/platforms/dotnet/Apache.Ignite.Core.Tests.DotNetCore/README.txt

-17
This file was deleted.

‎modules/platforms/dotnet/Apache.Ignite.Core.Tests.DotNetCore/dotnet-test-windows.bat

-32
This file was deleted.

‎modules/platforms/dotnet/Apache.Ignite.Core.Tests.DotNetCore/dotnet-test-wsl.bat

-34
This file was deleted.

‎modules/platforms/dotnet/Apache.Ignite.Core.Tests.DotNetCore/nuget.config

-41
This file was deleted.

‎modules/platforms/dotnet/Apache.Ignite.Core.Tests/ApiParity/ParityTest.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,10 @@ public static void CheckInterfaceParity(string javaFilePath,
9595
/// </summary>
9696
private static string GetFullPath(string javaFilePath)
9797
{
98+
javaFilePath = javaFilePath.Replace('\\', Path.DirectorySeparatorChar);
99+
98100
var path = Path.Combine(IgniteHome.Resolve(null), javaFilePath);
99-
Assert.IsTrue(File.Exists(path));
101+
Assert.IsTrue(File.Exists(path), path);
100102

101103
return path;
102104
}

0 commit comments

Comments
 (0)