Resolve conflicts

featurevisor · Oct 4, 2023 · 851996f · 851996f
2 parents f100fae + 7dd5e0a
commit 851996f
Showing 1 changed file with 5 additions and 15 deletions.
diff --git a/src/main/kotlin/com/featurevisor/types/Types.kt b/src/main/kotlin/com/featurevisor/types/Types.kt
@@ -295,6 +295,7 @@ data class ParsedFeature(
  */
 data class FeatureAssertion(
     val description: String?,
+    val environment: EnvironmentKey,
     // bucket weight: 0 to 100
     val at: Weight,
     val context: Context,
@@ -319,18 +320,7 @@ data class TestSegment(
     val assertions: List<SegmentAssertion>,
 )
 
-data class Test(
-    val description: String?,
-
-    // needed for feature testing
-    val tag: String?,
-    val environment: EnvironmentKey?,
-    val features: List<TestFeature>?,
-
-    // needed for segment testing
-    val segments: List<TestSegment>?,
-)
-
-data class Spec(
-    val tests: List<Test>,
-)
+sealed class Test {
+    data class Feature(val value: TestFeature) : Test()
+    data class Segment(val value: TestSegment) : Test()
+}