Add GraphEnvironmentTrait

Package.swift

@@ -161,7 +161,7 @@ let openGraphShimsTarget = Target.target(
 
 // MARK: - Test Targets
 
-let openGraphTestTarget = Target.testTarget(
+let openGraphTestsTarget = Target.testTarget(
     name: "OpenGraphTests",
     dependencies: [
         "OpenGraph",
@@ -170,15 +170,15 @@ let openGraphTestTarget = Target.testTarget(
     cSettings: sharedCSettings,
     swiftSettings: sharedSwiftSettings
 )
-let openGraphSPITestTarget = Target.testTarget(
+let openGraphCxxTestsTarget = Target.testTarget(
     name: "OpenGraphCxxTests",
     dependencies: [
         "OpenGraphCxx",
     ],
     exclude: ["README.md"],
     swiftSettings: sharedSwiftSettings + [.interoperabilityMode(.Cxx)]
 )
-let openGraphShimsTestTarget = Target.testTarget(
+let openGraphShimsTestsTarget = Target.testTarget(
     name: "OpenGraphShimsTests",
     dependencies: [
         "OpenGraphShims",
@@ -187,7 +187,7 @@ let openGraphShimsTestTarget = Target.testTarget(
     cSettings: sharedCSettings,
     swiftSettings: sharedSwiftSettings
 )
-let openGraphCompatibilityTestTarget = Target.testTarget(
+let openGraphCompatibilityTestsTarget = Target.testTarget(
     name: "OpenGraphCompatibilityTests",
     dependencies: [
         .product(name: "Numerics", package: "swift-numerics"),
@@ -212,11 +212,11 @@ let package = Package(
         openGraphTarget,
         openGraphSPITarget,
         openGraphShimsTarget,
-        
-        openGraphTestTarget,
-        openGraphSPITestTarget,
-        openGraphShimsTestTarget,
-        openGraphCompatibilityTestTarget,
+
+        openGraphTestsTarget,
+        openGraphCxxTestsTarget,
+        openGraphShimsTestsTarget,
+        openGraphCompatibilityTestsTarget,
     ],
     cxxLanguageStandard: .cxx20
 )
@@ -268,9 +268,9 @@ if attributeGraphCondition {
 
 let compatibilityTestCondition = envEnable("OPENGRAPH_COMPATIBILITY_TEST")
 if compatibilityTestCondition && attributeGraphCondition {
-    openGraphCompatibilityTestTarget.addCompatibilitySettings()
+    openGraphCompatibilityTestsTarget.addCompatibilitySettings()
 } else {
-    openGraphCompatibilityTestTarget.dependencies.append("OpenGraph")
+    openGraphCompatibilityTestsTarget.dependencies.append("OpenGraph")
 }
 
 extension [Platform] {

Tests/OpenGraphCompatibilityTests/Attribute/Attribute/AnyAttributeCompatibilityTests.swift

@@ -8,9 +8,9 @@ import Testing
 // swift-testing framework will crash here on Linux
 // Report to upstream for investigation when we bump to 5.10
 #if canImport(Darwin)
-//@Suite(.disabled(if: !compatibilityTestEnabled, "Attribute is not implemented"))
-@Suite(.disabled("Skip flaky CI tests after #154 temporary, See more info on #157"))
-final class AnyAttributeCompatibilityTests: AttributeTestBase {
+//@Suite(.disabled(if: !compatibilityTestEnabled, "Attribute is not implemented"), .graphScope)
+@Suite(.disabled("Skip flaky CI tests after #154 temporary, See more info on #157"), .graphScope)
+struct AnyAttributeCompatibilityTests {
     @Test
     func constantValue() throws {
         let attributeNil = AnyAttribute.nil

Tests/OpenGraphCompatibilityTests/Attribute/Attribute/AttributeCompatibilityTests.swift

@@ -5,8 +5,9 @@
 import Testing
 
 #if canImport(Darwin)
-@Suite(.disabled(if: !compatibilityTestEnabled, "Attribute is not implemented"))
-final class AttributeCompatibilityTests: AttributeTestBase {
+@MainActor
+@Suite(.disabled(if: !compatibilityTestEnabled, "Attribute is not implemented"), .graphScope)
+struct AttributeCompatibilityTests {
     @Test
     func initWithValue() {
         let intAttribute = Attribute(value: 0)

Tests/OpenGraphCompatibilityTests/Attribute/Attribute/ExternalCompatibilityTests.swift

@@ -8,8 +8,9 @@ import Testing
 // swift-testing framework will crash here on Linux
 // Report to upstream for investigation when we bump to 5.10
 #if canImport(Darwin)
-@Suite(.disabled(if: !compatibilityTestEnabled, "Attribute is not implemented"))
-final class ExternalCompatibilityTests: AttributeTestBase {
+@MainActor
+@Suite(.disabled(if: !compatibilityTestEnabled, "Attribute is not implemented"), .graphScope)
+struct ExternalCompatibilityTests {
     @Test
     func example() throws {
         let type = External<Int>.self

Tests/OpenGraphCompatibilityTests/Attribute/Attribute/FocusCompatibilityTests.swift

@@ -5,8 +5,9 @@
 import Testing
 
 #if canImport(Darwin)
-@Suite(.disabled(if: !compatibilityTestEnabled, "Attribute is not implemented"))
-final class FocusCompatibilityTests: AttributeTestBase {
+@MainActor
+@Suite(.disabled(if: !compatibilityTestEnabled, "Attribute is not implemented"), .graphScope)
+struct FocusCompatibilityTests {
     struct Demo {
         var a: Int
         var b: Double

Tests/OpenGraphCompatibilityTests/Attribute/Indirect/IndirectAttributeCompatibilityTests.swift

@@ -5,8 +5,9 @@
 import Testing
 
 #if canImport(Darwin)
-@Suite(.disabled(if: !compatibilityTestEnabled, "IndirectAttribute is not implemented"))
-final class IndirectAttributeCompatibilityTests: AttributeTestBase {
+@MainActor
+@Suite(.disabled(if: !compatibilityTestEnabled, "IndirectAttribute is not implemented"), .graphScope)
+struct IndirectAttributeCompatibilityTests {
     @Test
     func basic() {
         let source = Attribute(value: 0)

Tests/OpenGraphCompatibilityTests/Attribute/Optional/AnyOptionalAttributeCompatibilityTests.swift

@@ -5,8 +5,9 @@
 import Testing
 
 #if canImport(Darwin)
-@Suite(.disabled(if: !compatibilityTestEnabled, "AnyOptionalAttribute is not implemented"))
-final class AnyOptionalAttributeCompatibilityTests: AttributeTestBase {
+@MainActor
+@Suite(.disabled(if: !compatibilityTestEnabled, "AnyOptionalAttribute is not implemented"), .graphScope)
+struct AnyOptionalAttributeCompatibilityTests {
     @Test
     func basicInit() {
         let o1 = AnyOptionalAttribute()

Tests/OpenGraphCompatibilityTests/Attribute/Optional/OptionalAttributeCompatibilityTests.swift

@@ -5,8 +5,9 @@
 import Testing
 
 #if canImport(Darwin)
+@MainActor
 @Suite(.disabled(if: !compatibilityTestEnabled, "OptionalAttribute is not implemented"))
-final class OptionalAttributeCompatibilityTests: AttributeTestBase {
+struct OptionalAttributeCompatibilityTests {
     @Test
     func basicInit() {
         let ao1 = AnyOptionalAttribute()

Tests/OpenGraphCompatibilityTests/Attribute/Rule/MapCompatibilityTests.swift

@@ -4,8 +4,9 @@
 
 import Testing
 
-@Suite(.disabled(if: !compatibilityTestEnabled))
-final class MapCompatibilityTests: AttributeTestBase {
+@MainActor
+@Suite(.disabled(if: !compatibilityTestEnabled), .graphScope)
+struct MapCompatibilityTests {
     @Test
     func description() throws {
         let map = Map(.init(value: 2)) { $0.description }

Tests/OpenGraphCompatibilityTests/Attribute/Weak/AnyWeakAttributeCompatibilityTests.swift

@@ -5,9 +5,9 @@
 import Testing
 
 #if canImport(Darwin)
-
-@Suite(.enabled(if: compatibilityTestEnabled))
-final class AnyWeakAttributeCompatibilityTests: AttributeTestBase {
+@MainActor
+@Suite(.enabled(if: compatibilityTestEnabled), .graphScope)
+struct AnyWeakAttributeCompatibilityTests {
     @Test
     func basic() {
         let w1 = AnyWeakAttribute(nil)

Tests/OpenGraphCompatibilityTests/Attribute/Weak/WeakAttributeCompatibilityTests.swift

@@ -5,8 +5,9 @@
 import Testing
 
 #if canImport(Darwin)
-@Suite(.enabled(if: compatibilityTestEnabled))
-final class WeakAttributeCompatibilityTests: AttributeTestBase {
+@MainActor
+@Suite(.enabled(if: compatibilityTestEnabled), .graphScope)
+struct WeakAttributeCompatibilityTests {
     @Test
     func initTest() {
         let _ = WeakAttribute<Int>()

Tests/OpenGraphCompatibilityTests/Graph/SubgraphCompatibilityTests.swift

@@ -4,7 +4,8 @@
 
 import Testing
 
-@Suite(.enabled(if: compatibilityTestEnabled))
+@MainActor
+@Suite(.enabled(if: compatibilityTestEnabled), .graphScope)
 struct SubgraphCompatibilityTests {
     @Test
     func shouldRecordTree() {

Tests/OpenGraphCompatibilityTests/OpenGraphTestsSupport

@@ -0,0 +1 @@
+../OpenGraphTestsSupport/

Tests/OpenGraphShimsTests/Export.swift

@@ -0,0 +1,5 @@
+//
+//  Export.swift
+//  OpenGraphShimsTests
+
+@_exported import OpenGraphShims

Tests/OpenGraphShimsTests/MetadataDebugTests.swift

@@ -1,6 +1,6 @@
 //
 //  MetadataDebugTests.swift
-//  OpenGraphTests
+//  OpenGraphShimsTests
 
 @_spi(Debug) import OpenGraphShims
 import Testing

Tests/OpenGraphShimsTests/OpenGraphTestsSupport

@@ -0,0 +1 @@
+../OpenGraphTestsSupport/