Skip to content

Commit

Permalink
Don't resolve imports for normalization unit and simple suites
Browse files Browse the repository at this point in the history
  • Loading branch information
TimWSpence committed Apr 15, 2020
1 parent 970bfd5 commit 823171e
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,15 @@ abstract class ExprOperationAcceptanceSuite(transformation: Expr => Expr) extend
def compare(result: Expr, expected: Expr): Boolean = result.sameStructure(expected) && result.equivalent(expected)
}

class CachingTypeCheckingSuite(val base: String) extends ExprOperationAcceptanceSuite(Expr.Util.typeCheck(_)) with CachedResolvingInput
class TypeCheckingSuite(val base: String) extends ExprOperationAcceptanceSuite(Expr.Util.typeCheck(_)) with ResolvingInput
class CachingTypeCheckingSuite(val base: String)
extends ExprOperationAcceptanceSuite(Expr.Util.typeCheck(_))
with CachedResolvingInput
class TypeCheckingSuite(val base: String)
extends ExprOperationAcceptanceSuite(Expr.Util.typeCheck(_))
with ResolvingInput
class AlphaNormalizationSuite(val base: String) extends ExprOperationAcceptanceSuite(_.alphaNormalize) with ParsingInput
class NormalizationSuite(val base: String) extends ExprOperationAcceptanceSuite(_.normalize) with CachedResolvingInput
class NormalizationUSuite(val base: String) extends ExprOperationAcceptanceSuite(_.normalize) with ParsingInput

class HashingSuite(val base: String) extends SuccessSuite[Expr, String] with ResolvingInput {
def makeExpectedPath(inputPath: String): String = inputPath.dropRight(7) + "B.hash"
Expand All @@ -117,7 +122,9 @@ class ParsingSuite(val base: String) extends SuccessSuite[Expr, Array[Byte]] wit
def compare(result: Array[Byte], expected: Array[Byte]): Boolean = result.sameElements(expected)
}

abstract class ExprDecodingAcceptanceSuite(transformation: Expr => Expr) extends SuccessSuite[Expr, Expr] with ParsingInput {
abstract class ExprDecodingAcceptanceSuite(transformation: Expr => Expr)
extends SuccessSuite[Expr, Expr]
with ParsingInput {
def makeExpectedPath(inputPath: String): String = inputPath.dropRight(8) + "B.dhall"

override def isInputFileName(fileName: String): Boolean = fileName.endsWith("A.dhallb")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ import org.http4s.client.blaze._
import scala.concurrent.ExecutionContext.global
import scala.io.Source

class ImportResolutionSuite(val base: String) extends ExprOperationAcceptanceSuite(_.normalize) with CachedResolvingInput {
class ImportResolutionSuite(val base: String)
extends ExprOperationAcceptanceSuite(_.normalize)
with CachedResolvingInput {

setEnv("DHALL_TEST_VAR", "6 * 7") //Yes, this is SUPER hacky but the JVM doesn't really support setting env vars

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package org.dhallj.tests.acceptance

class NormalizationSimpleSuite extends NormalizationSuite("normalization/success/simple")
class NormalizationSimpleSuite extends NormalizationUSuite("normalization/success/simple")
class NormalizationRegressionSuite extends NormalizationSuite("normalization/success/regression")
class NormalizationUnitSuite extends NormalizationSuite("normalization/success/unit")
class NormalizationUnitSuite extends NormalizationUSuite("normalization/success/unit")
class NormalizationSimplificationsSuite extends NormalizationSuite("normalization/success/simplifications")
class NormalizationOtherSuite extends NormalizationSuite("normalization/success")
class NormalizationHTAccessSuite extends NormalizationSuite("normalization/success/haskell-tutorial/access")
Expand Down Expand Up @@ -45,7 +45,6 @@ class BinaryDecodingFailureUnitSuite extends BinaryDecodingFailureSuite("binary-
class ImportResolutionSuccessSuite extends ImportResolutionSuite("import/success")
class ImportResolutionSuccessUnitSuite extends ImportResolutionSuite("import/success/unit") {
//Normalize uses a relative path which isn't compatible with our current method of reading classpath resources
//Alternative type error - open question on semantics
override def ignored = Set("Normalize")
}
class ImportResolutionSuccessUnitAsLocationSuite extends ImportResolutionSuite("import/success/unit/asLocation") {
Expand Down

0 comments on commit 823171e

Please sign in to comment.