Rework IntegrationTestAttribute to allow for multiple instances, carr…

…y a flag whether it can be run on CI, don't yield the trait if it can't.
Gremlinq · Jun 19, 2024 · 2b51d3e · 2b51d3e
1 parent 08fd58e
commit 2b51d3e
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 16 deletions.
diff --git a/test/Providers.GremlinServer.Tests/IntegrationAndDeserializationTests.cs b/test/Providers.GremlinServer.Tests/IntegrationAndDeserializationTests.cs
@@ -4,7 +4,8 @@
 
 namespace ExRam.Gremlinq.Providers.GremlinServer.Tests
 {
-    [IntegrationTest("Windows", "Linux")]
+    [IntegrationTest("Linux")]
+    [IntegrationTest("Windows", false)]
     public sealed class IntegrationAndDeserializationTests : QueryExecutionTest, IClassFixture<GremlinServerContainerFixture>
     {
         public IntegrationAndDeserializationTests(GremlinServerContainerFixture fixture) : base(

diff --git a/test/Providers.GremlinServer.Tests/IntegrationTests.cs b/test/Providers.GremlinServer.Tests/IntegrationTests.cs
@@ -11,7 +11,8 @@
 
 namespace ExRam.Gremlinq.Providers.GremlinServer.Tests
 {
-    [IntegrationTest("Windows", "Linux")]
+    [IntegrationTest("Linux")]
+    [IntegrationTest("Windows", false)]
     public sealed class IntegrationTests : QueryExecutionTest, IClassFixture<GremlinServerContainerFixture>
     {
         public IntegrationTests(GremlinServerContainerFixture fixture) : base(

diff --git a/test/Providers.GremlinServer.Tests/IntegrationWithoutProjectionTests.cs b/test/Providers.GremlinServer.Tests/IntegrationWithoutProjectionTests.cs
@@ -4,7 +4,8 @@
 
 namespace ExRam.Gremlinq.Providers.GremlinServer.Tests
 {
-    [IntegrationTest("Windows", "Linux")]
+    [IntegrationTest("Linux")]
+    [IntegrationTest("Windows", false)]
     public sealed class IntegrationWithoutProjectionTests : QueryExecutionTest, IClassFixture<GremlinServerWithoutProjectionContainerFixture>
     {
         public IntegrationWithoutProjectionTests(GremlinServerWithoutProjectionContainerFixture fixture) : base(

diff --git a/test/Providers.GremlinServer.Tests/PasswordSecuredIntegrationTests.cs b/test/Providers.GremlinServer.Tests/PasswordSecuredIntegrationTests.cs
@@ -4,7 +4,8 @@
 
 namespace ExRam.Gremlinq.Providers.GremlinServer.Tests
 {
-    [IntegrationTest("Windows", "Linux")]
+    [IntegrationTest("Linux")]
+    [IntegrationTest("Windows", false)]
     public sealed class PasswordSecuredIntegrationTests : QueryExecutionTest, IClassFixture<PasswordSecuredGremlinServerContainerFixture>
     {
         public PasswordSecuredIntegrationTests(PasswordSecuredGremlinServerContainerFixture fixture) : base(

diff --git a/test/Providers.GremlinServer.Tests/WrongPasswordIntegrationTests.cs b/test/Providers.GremlinServer.Tests/WrongPasswordIntegrationTests.cs
@@ -13,7 +13,8 @@
 
 namespace ExRam.Gremlinq.Providers.GremlinServer.Tests
 {
-    [IntegrationTest("Windows", "Linux")]
+    [IntegrationTest("Linux")]
+    [IntegrationTest("Windows", false)]
     public sealed class WrongPasswordIntegrationTests : GremlinqTestBase, IClassFixture<WrongPasswordGremlinServerContainerFixture>
     {
         public sealed class WrongPasswordGremlinServerContainerFixture : DockerfileTestContainerFixture
@@ -22,7 +23,6 @@ public WrongPasswordGremlinServerContainerFixture() : base("PasswordSecureGremli
             {
             }
 
-
             protected override async Task<IGremlinQuerySource> TransformQuerySource(IContainer container, IGremlinQuerySource g) => g
                 .UseGremlinServer<Vertex, Edge>(_ => _
                     .At(new UriBuilder("ws", container.Hostname, container.GetMappedPublicPort(8182)).Uri)

diff --git a/test/Providers.JanusGraph.Tests/IntegrationTests.cs b/test/Providers.JanusGraph.Tests/IntegrationTests.cs
@@ -6,7 +6,8 @@
 
 namespace ExRam.Gremlinq.Providers.JanusGraph.Tests
 {
-    [IntegrationTest("Windows", "Linux")]
+    [IntegrationTest("Linux")]
+    [IntegrationTest("Windows", false)]
     public sealed class IntegrationTests : QueryExecutionTest, IClassFixture<JanusGraphContainerFixture>
     {
         public new sealed class Verifier : JTokenExecutingVerifier

diff --git a/test/Providers.Neptune.Tests/IntegrationTests.cs b/test/Providers.Neptune.Tests/IntegrationTests.cs
@@ -4,7 +4,8 @@
 
 namespace ExRam.Gremlinq.Providers.Neptune.Tests
 {
-    [IntegrationTest("Windows", "Linux")]
+    [IntegrationTest("Linux")]
+    [IntegrationTest("Windows", false)]
     public sealed class IntegrationTests : QueryExecutionTest, IClassFixture<NeptuneContainerFixture>
     {
         public IntegrationTests(NeptuneContainerFixture fixture) : base(

diff --git a/test/Tests.Infrastructure/Traits/IntegrationTestAttribute.cs b/test/Tests.Infrastructure/Traits/IntegrationTestAttribute.cs
@@ -3,14 +3,15 @@
 namespace ExRam.Gremlinq.Tests.Infrastructure
 {
     [TraitDiscoverer("ExRam.Gremlinq.Tests.Infrastructure.IntegrationTestDiscoverer", "ExRam.Gremlinq.Tests.Infrastructure")]
-    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = true)]
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = true, Inherited = true)]
     public sealed class IntegrationTestAttribute : Attribute, ITraitAttribute
     {
-        public IntegrationTestAttribute(params string[] validPlatforms)
+        public IntegrationTestAttribute(string validPlatform, bool canRunOnCI = true)
         {
-            ValidPlatforms = validPlatforms;
+            ValidPlatform = validPlatform;
         }
 
-        public string[] ValidPlatforms { get; }
+        public bool CanRunOnCI { get; }
+        public string ValidPlatform { get; }
     }
 }
diff --git a/test/Tests.Infrastructure/Traits/IntegrationTestDiscoverer.cs b/test/Tests.Infrastructure/Traits/IntegrationTestDiscoverer.cs
@@ -6,14 +6,16 @@ public class IntegrationTestDiscoverer : ITraitDiscoverer
     {
         public IEnumerable<KeyValuePair<string, string>> GetTraits(IAttributeInfo traitAttribute)
         {
+            var isCi = bool.TryParse(Environment.GetEnvironmentVariable("CI"), out var ci)
+                ? ci
+                : false;
+
             yield return new KeyValuePair<string, string>("Category", "IntegrationTest");
 
             if (traitAttribute is ReflectionAttributeInfo { Attribute: IntegrationTestAttribute integrationTestAttribute })
             {
-                foreach (var validPlatform in integrationTestAttribute.ValidPlatforms)
-                {
-                    yield return new KeyValuePair<string, string>("ValidPlatform", validPlatform);
-                }
+                if (integrationTestAttribute.CanRunOnCI || !isCi)
+                    yield return new KeyValuePair<string, string>("ValidPlatform", integrationTestAttribute.ValidPlatform);
             }
         }
     }