[query] Move is.hail.check to test code

hail-is · Feb 4, 2025 · b632b66 · b632b66
1 parent 8f40db1
commit b632b66
Show file tree

Hide file tree

Showing 52 changed files with 725 additions and 978 deletions.
diff --git a/hail/build.mill b/hail/build.mill
@@ -140,10 +140,12 @@ trait HailModule extends ScalaModule with ScalafmtModule with ScalafixModule { o
 
     override def ivyDeps: T[Agg[Dep]] =
       super.ivyDeps() ++ outer.compileIvyDeps() ++ Agg(
-        ivy"org.scalatest::scalatest:3.2.18",
-        ivy"org.scalatest::scalatest-shouldmatchers:3.2.18",
-        ivy"org.scalatestplus::testng-7-9:3.2.18.0",
-        ivy"org.testng:testng:7.9.0",
+        ivy"org.scalacheck::scalacheck:1.18.1",
+        ivy"org.scalatest::scalatest:3.2.19",
+        ivy"org.scalatest::scalatest-shouldmatchers:3.2.19",
+        ivy"org.scalatestplus::scalacheck-1-18:3.2.19.0",
+        ivy"org.scalatestplus::testng-7-10:3.2.19.0",
+        ivy"org.testng:testng:7.10.0",
         ivy"org.mockito::mockito-scala:1.17.31",
       )
 

diff --git a/hail/hail/src/is/hail/check/Arbitrary.scala b/hail/hail/src/is/hail/check/Arbitrary.scala
diff --git a/hail/hail/src/is/hail/check/Prop.scala b/hail/hail/src/is/hail/check/Prop.scala
diff --git a/hail/hail/src/is/hail/types/physical/PArray.scala b/hail/hail/src/is/hail/types/physical/PArray.scala
@@ -1,8 +1,5 @@
 package is.hail.types.physical
 
-import is.hail.annotations.Annotation
-import is.hail.backend.HailStateManager
-import is.hail.check.Gen
 import is.hail.types.virtual.TArray
 
 trait PArrayIterator {
@@ -17,7 +14,4 @@ abstract class PArray extends PArrayBackedContainer {
   final protected[physical] val elementRequired = elementType.required
 
   def elementIterator(aoff: Long, length: Int): PArrayIterator
-
-  override def genNonmissingValue(sm: HailStateManager): Gen[IndexedSeq[Annotation]] =
-    Gen.buildableOf[Array](elementType.genValue(sm)).map(x => x: IndexedSeq[Annotation])
 }
diff --git a/hail/hail/src/is/hail/types/physical/PBaseStruct.scala b/hail/hail/src/is/hail/types/physical/PBaseStruct.scala
@@ -1,9 +1,8 @@
 package is.hail.types.physical
 
 import is.hail.annotations._
-import is.hail.asm4s.{Code, _}
+import is.hail.asm4s._
 import is.hail.backend.HailStateManager
-import is.hail.check.Gen
 import is.hail.expr.ir.EmitCodeBuilder
 import is.hail.types.physical.stypes.interfaces.SBaseStructValue
 import is.hail.utils._
@@ -144,10 +143,4 @@ abstract class PBaseStruct extends PType {
   override def loadCheapSCode(cb: EmitCodeBuilder, addr: Code[Long]): SBaseStructValue
 
   override lazy val containsPointers: Boolean = types.exists(_.containsPointers)
-
-  override def genNonmissingValue(sm: HailStateManager): Gen[Annotation] =
-    if (types.isEmpty) {
-      Gen.const(Annotation.empty)
-    } else
-      Gen.uniformSequence(types.map(t => t.genValue(sm))).map(a => Annotation(a: _*))
 }
diff --git a/hail/hail/src/is/hail/types/physical/PDict.scala b/hail/hail/src/is/hail/types/physical/PDict.scala
@@ -1,8 +1,5 @@
 package is.hail.types.physical
 
-import is.hail.annotations._
-import is.hail.backend.HailStateManager
-import is.hail.check.Gen
 import is.hail.types.physical.stypes.interfaces.SContainer
 import is.hail.types.virtual.TDict
 
@@ -15,7 +12,4 @@ abstract class PDict extends PContainer {
   def sType: SContainer
 
   def elementType: PStruct
-
-  override def genNonmissingValue(sm: HailStateManager): Gen[Annotation] =
-    Gen.buildableOf2[Map](Gen.zip(keyType.genValue(sm), valueType.genValue(sm)))
 }
diff --git a/hail/hail/src/is/hail/types/physical/PSet.scala b/hail/hail/src/is/hail/types/physical/PSet.scala
@@ -1,13 +1,7 @@
 package is.hail.types.physical
 
-import is.hail.annotations._
-import is.hail.backend.HailStateManager
-import is.hail.check.Gen
 import is.hail.types.virtual.TSet
 
 abstract class PSet extends PContainer {
   lazy val virtualType: TSet = TSet(elementType.virtualType)
-
-  override def genNonmissingValue(sm: HailStateManager): Gen[Annotation] =
-    Gen.buildableOf[Set](elementType.genValue(sm))
 }