fix: move runtime init to fixture

sergey-tihon · Dec 11, 2023 · d225322 · d225322
1 parent ec1eb19
commit d225322
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 11 deletions.
diff --git a/tests/Stanford.NLP.CoreNLP.Tests/Fixtures/IkvmCollection.cs b/tests/Stanford.NLP.CoreNLP.Tests/Fixtures/IkvmCollection.cs
@@ -0,0 +1,8 @@
+using Xunit;
+
+namespace Stanford.NLP.CoreNLP.Tests.Fixtures;
+
+[CollectionDefinition(nameof(IkvmCollection))]
+public class IkvmCollection : ICollectionFixture<IkvmFixture>
+{
+}
diff --git a/tests/Stanford.NLP.CoreNLP.Tests/Fixtures/IkvmFixture.cs b/tests/Stanford.NLP.CoreNLP.Tests/Fixtures/IkvmFixture.cs
@@ -0,0 +1,10 @@
+namespace Stanford.NLP.CoreNLP.Tests.Fixtures;
+
+public class IkvmFixture
+{
+    public IkvmFixture ()
+    {
+        // IKVM issue - https://github.com/ikvmnet/ikvm/issues/423
+        _ = new java.lang.Object();
+    }
+}
diff --git a/tests/Stanford.NLP.CoreNLP.Tests/Samples/CoreNlpTests.cs b/tests/Stanford.NLP.CoreNLP.Tests/Samples/CoreNlpTests.cs
@@ -10,13 +10,15 @@
 using edu.stanford.nlp.util;
 using java.io;
 using java.util;
+using Stanford.NLP.CoreNLP.Tests.Fixtures;
 using Stanford.NLP.CoreNLP.Tests.Helpers;
 using Xunit;
 using Xunit.Abstractions;
 using Assert = Xunit.Assert;
 
 namespace Stanford.NLP.CoreNLP.Tests.Samples;
 
+[Collection(nameof(IkvmCollection))]
 public class CoreNlpTests
 {
     private readonly ITestOutputHelper _testOutputHelper;

diff --git a/tests/Stanford.NLP.CoreNLP.Tests/Samples/CorefTests.cs b/tests/Stanford.NLP.CoreNLP.Tests/Samples/CorefTests.cs
@@ -6,12 +6,14 @@
 using edu.stanford.nlp.pipeline;
 using edu.stanford.nlp.util;
 using java.util;
+using Stanford.NLP.CoreNLP.Tests.Fixtures;
 using Stanford.NLP.CoreNLP.Tests.Helpers;
 using Xunit;
 using Xunit.Abstractions;
 
 namespace Stanford.NLP.CoreNLP.Tests.Samples;
 
+[Collection(nameof(IkvmCollection))]
 public class CorefTests
 {
     private readonly ITestOutputHelper _testOutputHelper;
@@ -25,10 +27,6 @@ public CorefTests(ITestOutputHelper testOutputHelper)
     [Fact]
     public void CorefTest()
     { 
-        // Black magic - https://github.com/ikvmnet/ikvm-maven/issues/46#issuecomment-1849085463
-        // This is the first test to run (with sequential test execution), so it affect all other tests as well
-        var _ = new java.lang.Object();
-
         var document =
             new Annotation("Barack Obama was born in Hawaii.  He is the president. Obama was elected in 2008.");
         var props = new Properties();

diff --git a/tests/Stanford.NLP.CoreNLP.Tests/Samples/SUTimeTests.cs b/tests/Stanford.NLP.CoreNLP.Tests/Samples/SUTimeTests.cs
@@ -5,12 +5,14 @@
 using edu.stanford.nlp.time;
 using edu.stanford.nlp.util;
 using java.util;
+using Stanford.NLP.CoreNLP.Tests.Fixtures;
 using Stanford.NLP.CoreNLP.Tests.Helpers;
 using Xunit;
 using Xunit.Abstractions;
 
 namespace Stanford.NLP.CoreNLP.Tests.Samples;
 
+[Collection(nameof(IkvmCollection))]
 public class SUTimeTests
 {
     private readonly ITestOutputHelper _testOutputHelper;

diff --git a/tests/Stanford.NLP.CoreNLP.Tests/Samples/SimpleNlpTests.cs b/tests/Stanford.NLP.CoreNLP.Tests/Samples/SimpleNlpTests.cs
@@ -2,11 +2,13 @@
 using edu.stanford.nlp.ie.machinereading.structure;
 using edu.stanford.nlp.simple;
 using java.util;
+using Stanford.NLP.CoreNLP.Tests.Fixtures;
 using Stanford.NLP.CoreNLP.Tests.Helpers;
 using Xunit;
 
 namespace Stanford.NLP.CoreNLP.Tests.Samples;
 
+[Collection(nameof(IkvmCollection))]
 public class SimpleNlpTests : IDisposable
 {
     private readonly string _currentDir;

diff --git a/tests/Stanford.NLP.CoreNLP.Tests/Samples/StanfordServer.cs b/tests/Stanford.NLP.CoreNLP.Tests/Samples/StanfordServer.cs
@@ -4,11 +4,13 @@
 using edu.stanford.nlp.util;
 using java.lang;
 using java.util;
+using Stanford.NLP.CoreNLP.Tests.Fixtures;
 using Xunit;
 using Xunit.Abstractions;
 
 namespace Stanford.NLP.CoreNLP.Tests.Samples;
 
+[Collection(nameof(IkvmCollection))]
 public class StanfordServer
 {
     private readonly ITestOutputHelper _testOutputHelper;

diff --git a/tests/Stanford.NLP.CoreNLP.Tests/Stanford.NLP.CoreNLP.Tests.csproj b/tests/Stanford.NLP.CoreNLP.Tests/Stanford.NLP.CoreNLP.Tests.csproj
@@ -8,7 +8,7 @@
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="IKVM" Version="8.7.3"/>
-        <PackageReference Include="IKVM.Maven.Sdk" Version="1.6.2" PrivateAssets="all"/>
+        <PackageReference Include="IKVM.Maven.Sdk" Version="1.6.3" PrivateAssets="all"/>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
         <PackageReference Include="xunit" Version="2.6.3"/>
         <PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
@@ -19,7 +19,4 @@
     <ItemGroup>
         <MavenReference Include="edu.stanford.nlp:stanford-corenlp" Version="4.5.5"/>
     </ItemGroup>
-    <ItemGroup>
-        <Content Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
-    </ItemGroup>
 </Project>
diff --git a/tests/Stanford.NLP.CoreNLP.Tests/xunit.runner.json b/tests/Stanford.NLP.CoreNLP.Tests/xunit.runner.json