From a41b1c87fed762cc68a1b76b7e1164c6acbbefff Mon Sep 17 00:00:00 2001 From: Manos Koukoutos <emmanouil.koukoutos@epfl.ch> Date: Tue, 23 Jun 2015 17:04:05 +0200 Subject: [PATCH] All test suites names now end in -Suite --- src/test/scala/leon/test/LeonTests.scala | 36 +++++++++---------- ...{CodeGenTests.scala => CodeGenSuite.scala} | 2 +- ...ests.scala => DefaultEvaluatorSuite.scala} | 2 +- ...uatorsTests.scala => EvaluatorSuite.scala} | 2 +- ...ontEndsTest.scala => FrontEndsSuite.scala} | 2 +- ...{ImportsTests.scala => ImportsSuite.scala} | 2 +- .../{DataGen.scala => DataGenSuite.scala} | 2 +- .../{DefOpsTests.scala => DefOpsSuite.scala} | 2 +- ...nTests.scala => TransformationSuite.scala} | 2 +- ...ts.scala => TreeNormalizationsSuite.scala} | 2 +- ...{TreeOpsTests.scala => TreeOpsSuite.scala} | 2 +- .../{TreeTests.scala => TreeTestsSuite.scala} | 2 +- ...sts.scala => EnumerationSolverSuite.scala} | 2 +- ...erTests.scala => TimeoutSolverSuite.scala} | 2 +- ...Tests.scala => UnrollingSolverSuite.scala} | 2 +- ...egression.scala => TerminationSuite.scala} | 2 +- .../{Streams.scala => StreamsSuite.scala} | 2 +- ...n.scala => LibraryVerificationSuite.scala} | 2 +- ...Regression.scala => NewSolversSuite.scala} | 2 +- ...scala => PureScalaVerificationSuite.scala} | 2 +- ...gression.scala => VerificationSuite.scala} | 2 +- ...ion.scala => XLangVerificationSuite.scala} | 2 +- 22 files changed, 39 insertions(+), 39 deletions(-) rename src/test/scala/leon/test/codegen/{CodeGenTests.scala => CodeGenSuite.scala} (99%) rename src/test/scala/leon/test/evaluators/{DefaultEvaluatorTests.scala => DefaultEvaluatorSuite.scala} (99%) rename src/test/scala/leon/test/evaluators/{EvaluatorsTests.scala => EvaluatorSuite.scala} (99%) rename src/test/scala/leon/test/frontends/{FrontEndsTest.scala => FrontEndsSuite.scala} (96%) rename src/test/scala/leon/test/frontends/{ImportsTests.scala => ImportsSuite.scala} (97%) rename src/test/scala/leon/test/purescala/{DataGen.scala => DataGenSuite.scala} (99%) rename src/test/scala/leon/test/purescala/{DefOpsTests.scala => DefOpsSuite.scala} (98%) rename src/test/scala/leon/test/purescala/{TransformationTests.scala => TransformationSuite.scala} (97%) rename src/test/scala/leon/test/purescala/{TreeNormalizationsTests.scala => TreeNormalizationsSuite.scala} (97%) rename src/test/scala/leon/test/purescala/{TreeOpsTests.scala => TreeOpsSuite.scala} (98%) rename src/test/scala/leon/test/purescala/{TreeTests.scala => TreeTestsSuite.scala} (95%) rename src/test/scala/leon/test/solvers/{EnumerationSolverTests.scala => EnumerationSolverSuite.scala} (95%) rename src/test/scala/leon/test/solvers/{TimeoutSolverTests.scala => TimeoutSolverSuite.scala} (97%) rename src/test/scala/leon/test/solvers/{UnrollingSolverTests.scala => UnrollingSolverSuite.scala} (97%) rename src/test/scala/leon/test/termination/{TerminationRegression.scala => TerminationSuite.scala} (98%) rename src/test/scala/leon/test/utils/{Streams.scala => StreamsSuite.scala} (97%) rename src/test/scala/leon/test/verification/{LibraryVerificationRegression.scala => LibraryVerificationSuite.scala} (91%) rename src/test/scala/leon/test/verification/{NewSolversRegression.scala => NewSolversSuite.scala} (93%) rename src/test/scala/leon/test/verification/{PureScalaVerificationRegression.scala => PureScalaVerificationSuite.scala} (94%) rename src/test/scala/leon/test/verification/{VerificationRegression.scala => VerificationSuite.scala} (98%) rename src/test/scala/leon/test/verification/{XLangVerificationRegression.scala => XLangVerificationSuite.scala} (98%) diff --git a/src/test/scala/leon/test/LeonTests.scala b/src/test/scala/leon/test/LeonTests.scala index 27672ef35..6e943463e 100644 --- a/src/test/scala/leon/test/LeonTests.scala +++ b/src/test/scala/leon/test/LeonTests.scala @@ -22,42 +22,42 @@ class LeonAllTests extends Suites( ) class LeonFunTests extends Suites( - new FrontEndsTest, + new FrontEndsSuite, new RepairSuite, - new TerminationRegression, + new TerminationSuite, new StablePrintingSuite, new SynthesisSuite, new SynthesisRegressionSuite, - new LibraryVerificationRegression, - new PureScalaVerificationRegression, - new XLangVerificationRegression + new LibraryVerificationSuite, + new PureScalaVerificationSuite, + new XLangVerificationSuite ) class LeonUnitTests extends Suites( - new CodeGenTests, + new CodeGenSuite, - new ImportsTests, + new ImportsSuite, - new Streams, + new StreamsSuite, - new DefOpsTests, + new DefOpsSuite, new LikelyEqSuite, - new TransformationTests, - new TreeNormalizationsTests, - new TreeOpsTests, - new TreeTests, + new TransformationSuite, + new TreeNormalizationsSuite, + new TreeOpsSuite, + new TreeTestsSuite, - new EnumerationSolverTests, - new TimeoutSolverTests, - new UnrollingSolverTests, + new EnumerationSolverSuite, + new TimeoutSolverSuite, + new UnrollingSolverSuite, new AlgebraSuite, new LinearEquationsSuite, - new DefaultEvaluatorTests, - new EvaluatorsTests + new DefaultEvaluatorSuite, + new EvaluatorSuite ) diff --git a/src/test/scala/leon/test/codegen/CodeGenTests.scala b/src/test/scala/leon/test/codegen/CodeGenSuite.scala similarity index 99% rename from src/test/scala/leon/test/codegen/CodeGenTests.scala rename to src/test/scala/leon/test/codegen/CodeGenSuite.scala index 88f1481f7..6ad41d65a 100644 --- a/src/test/scala/leon/test/codegen/CodeGenTests.scala +++ b/src/test/scala/leon/test/codegen/CodeGenSuite.scala @@ -17,7 +17,7 @@ import EvaluationResults._ * - Add the test name and expected result in the result variable. * Make sure the relative order of the tests matches that of code */ -class CodeGenTests extends test.LeonTestSuite { +class CodeGenSuite extends test.LeonTestSuite { case class TestCase( name : String, diff --git a/src/test/scala/leon/test/evaluators/DefaultEvaluatorTests.scala b/src/test/scala/leon/test/evaluators/DefaultEvaluatorSuite.scala similarity index 99% rename from src/test/scala/leon/test/evaluators/DefaultEvaluatorTests.scala rename to src/test/scala/leon/test/evaluators/DefaultEvaluatorSuite.scala index ad359346a..7286ef382 100644 --- a/src/test/scala/leon/test/evaluators/DefaultEvaluatorTests.scala +++ b/src/test/scala/leon/test/evaluators/DefaultEvaluatorSuite.scala @@ -10,7 +10,7 @@ import leon.purescala.Expressions._ import leon.purescala.Types._ import leon.purescala.Constructors._ -class DefaultEvaluatorTests extends leon.test.LeonTestSuite { +class DefaultEvaluatorSuite extends leon.test.LeonTestSuite { private implicit lazy val leonContext: LeonContext = createLeonContext() private val emptyProgram = Program.empty diff --git a/src/test/scala/leon/test/evaluators/EvaluatorsTests.scala b/src/test/scala/leon/test/evaluators/EvaluatorSuite.scala similarity index 99% rename from src/test/scala/leon/test/evaluators/EvaluatorsTests.scala rename to src/test/scala/leon/test/evaluators/EvaluatorSuite.scala index 1f00e411f..d1957bcf3 100644 --- a/src/test/scala/leon/test/evaluators/EvaluatorsTests.scala +++ b/src/test/scala/leon/test/evaluators/EvaluatorSuite.scala @@ -15,7 +15,7 @@ import leon.purescala.Types._ import leon.purescala.Extractors._ import leon.purescala.Constructors._ -class EvaluatorsTests extends leon.test.LeonTestSuite { +class EvaluatorSuite extends leon.test.LeonTestSuite { private implicit lazy val leonContext = testContext private val evaluatorConstructors : List[(LeonContext,Program)=>Evaluator] = List( diff --git a/src/test/scala/leon/test/frontends/FrontEndsTest.scala b/src/test/scala/leon/test/frontends/FrontEndsSuite.scala similarity index 96% rename from src/test/scala/leon/test/frontends/FrontEndsTest.scala rename to src/test/scala/leon/test/frontends/FrontEndsSuite.scala index 76370b47e..28ca16b40 100644 --- a/src/test/scala/leon/test/frontends/FrontEndsTest.scala +++ b/src/test/scala/leon/test/frontends/FrontEndsSuite.scala @@ -7,7 +7,7 @@ import test.LeonTestSuite import purescala.Definitions.Program import java.io.File -class FrontEndsTest extends LeonTestSuite { +class FrontEndsSuite extends LeonTestSuite { // Hard-code output directory, for Eclipse purposes val pipeFront = frontends.scalac.ExtractionPhase andThen utils.PreprocessingPhase diff --git a/src/test/scala/leon/test/frontends/ImportsTests.scala b/src/test/scala/leon/test/frontends/ImportsSuite.scala similarity index 97% rename from src/test/scala/leon/test/frontends/ImportsTests.scala rename to src/test/scala/leon/test/frontends/ImportsSuite.scala index e01c786ab..8d1cdbbdb 100644 --- a/src/test/scala/leon/test/frontends/ImportsTests.scala +++ b/src/test/scala/leon/test/frontends/ImportsSuite.scala @@ -9,7 +9,7 @@ import purescala.ScalaPrinter import frontends.scalac._ import utils._ -class ImportsTests extends LeonTestSuite { +class ImportsSuite extends LeonTestSuite { private def parseStrings(strs : List[String]) : Program = { val reporter = new DefaultReporter(Set()) diff --git a/src/test/scala/leon/test/purescala/DataGen.scala b/src/test/scala/leon/test/purescala/DataGenSuite.scala similarity index 99% rename from src/test/scala/leon/test/purescala/DataGen.scala rename to src/test/scala/leon/test/purescala/DataGenSuite.scala index 8fcc97be2..2ba0bf017 100644 --- a/src/test/scala/leon/test/purescala/DataGen.scala +++ b/src/test/scala/leon/test/purescala/DataGenSuite.scala @@ -14,7 +14,7 @@ import leon.datagen._ import leon.evaluators._ -class DataGen extends LeonTestSuite { +class DataGenSuite extends LeonTestSuite { private def parseString(str : String) : Program = { val pipeline = TemporaryInputPhase andThen ExtractionPhase andThen PreprocessingPhase diff --git a/src/test/scala/leon/test/purescala/DefOpsTests.scala b/src/test/scala/leon/test/purescala/DefOpsSuite.scala similarity index 98% rename from src/test/scala/leon/test/purescala/DefOpsTests.scala rename to src/test/scala/leon/test/purescala/DefOpsSuite.scala index a7b04bf85..245c1191f 100644 --- a/src/test/scala/leon/test/purescala/DefOpsTests.scala +++ b/src/test/scala/leon/test/purescala/DefOpsSuite.scala @@ -70,7 +70,7 @@ private [purescala] object DefOpsHelper extends LeonTestSuite { lazy val fooC = program.lookup("foo.bar.baz.Foo.fooC") } -class DefOpsTests extends LeonTestSuite { +class DefOpsSuite extends LeonTestSuite { import DefOpsHelper._ test("Find base definition"){ diff --git a/src/test/scala/leon/test/purescala/TransformationTests.scala b/src/test/scala/leon/test/purescala/TransformationSuite.scala similarity index 97% rename from src/test/scala/leon/test/purescala/TransformationTests.scala rename to src/test/scala/leon/test/purescala/TransformationSuite.scala index a8227173d..9e8cefb61 100644 --- a/src/test/scala/leon/test/purescala/TransformationTests.scala +++ b/src/test/scala/leon/test/purescala/TransformationSuite.scala @@ -13,7 +13,7 @@ import leon.purescala.ExprOps._ import leon.solvers.z3.UninterpretedZ3Solver import leon.solvers._ -class TransformationTests extends LeonTestSuite { +class TransformationSuite extends LeonTestSuite { val pipeline = ExtractionPhase andThen PreprocessingPhase diff --git a/src/test/scala/leon/test/purescala/TreeNormalizationsTests.scala b/src/test/scala/leon/test/purescala/TreeNormalizationsSuite.scala similarity index 97% rename from src/test/scala/leon/test/purescala/TreeNormalizationsTests.scala rename to src/test/scala/leon/test/purescala/TreeNormalizationsSuite.scala index e7ecc6b72..fc11c8a09 100644 --- a/src/test/scala/leon/test/purescala/TreeNormalizationsTests.scala +++ b/src/test/scala/leon/test/purescala/TreeNormalizationsSuite.scala @@ -9,7 +9,7 @@ import leon.purescala.Types._ import leon.purescala.Expressions._ import leon.purescala.TreeNormalizations._ -class TreeNormalizationsTests extends LeonTestSuite with WithLikelyEq { +class TreeNormalizationsSuite extends LeonTestSuite with WithLikelyEq { def i(x: Int) = InfiniteIntegerLiteral(x) val xId = FreshIdentifier("x", IntegerType) diff --git a/src/test/scala/leon/test/purescala/TreeOpsTests.scala b/src/test/scala/leon/test/purescala/TreeOpsSuite.scala similarity index 98% rename from src/test/scala/leon/test/purescala/TreeOpsTests.scala rename to src/test/scala/leon/test/purescala/TreeOpsSuite.scala index 88116db6b..b73eec580 100644 --- a/src/test/scala/leon/test/purescala/TreeOpsTests.scala +++ b/src/test/scala/leon/test/purescala/TreeOpsSuite.scala @@ -8,7 +8,7 @@ import leon.purescala.Expressions._ import leon.purescala.Types._ import leon.purescala.ExprOps._ -class TreeOpsTests extends LeonTestSuite with WithLikelyEq { +class TreeOpsSuite extends LeonTestSuite with WithLikelyEq { test("Path-aware simplifications") { // TODO actually testing something here would be better, sorry diff --git a/src/test/scala/leon/test/purescala/TreeTests.scala b/src/test/scala/leon/test/purescala/TreeTestsSuite.scala similarity index 95% rename from src/test/scala/leon/test/purescala/TreeTests.scala rename to src/test/scala/leon/test/purescala/TreeTestsSuite.scala index 0918457c4..933ba02dc 100644 --- a/src/test/scala/leon/test/purescala/TreeTests.scala +++ b/src/test/scala/leon/test/purescala/TreeTestsSuite.scala @@ -9,7 +9,7 @@ import leon.purescala.Constructors._ import leon.purescala.Expressions._ import leon.purescala.Types._ -class TreeTests extends LeonTestSuite { +class TreeTestsSuite extends LeonTestSuite { test("And- and Or- simplifications") { val x = Variable(FreshIdentifier("x", BooleanType)) diff --git a/src/test/scala/leon/test/solvers/EnumerationSolverTests.scala b/src/test/scala/leon/test/solvers/EnumerationSolverSuite.scala similarity index 95% rename from src/test/scala/leon/test/solvers/EnumerationSolverTests.scala rename to src/test/scala/leon/test/solvers/EnumerationSolverSuite.scala index 3fac22582..cfe8ab17c 100644 --- a/src/test/scala/leon/test/solvers/EnumerationSolverTests.scala +++ b/src/test/scala/leon/test/solvers/EnumerationSolverSuite.scala @@ -9,7 +9,7 @@ import leon.purescala.Definitions._ import leon.purescala.Expressions._ import leon.purescala.Types._ -class EnumerationSolverTests extends LeonTestSuite { +class EnumerationSolverSuite extends LeonTestSuite { private def check(sf: SolverFactory[Solver], e: Expr): Option[Boolean] = { val s = sf.getNewSolver() s.assertCnstr(e) diff --git a/src/test/scala/leon/test/solvers/TimeoutSolverTests.scala b/src/test/scala/leon/test/solvers/TimeoutSolverSuite.scala similarity index 97% rename from src/test/scala/leon/test/solvers/TimeoutSolverTests.scala rename to src/test/scala/leon/test/solvers/TimeoutSolverSuite.scala index d319b0f2f..6c7c8ab71 100644 --- a/src/test/scala/leon/test/solvers/TimeoutSolverTests.scala +++ b/src/test/scala/leon/test/solvers/TimeoutSolverSuite.scala @@ -11,7 +11,7 @@ import leon.purescala.Definitions._ import leon.purescala.Expressions._ import leon.purescala.Types._ -class TimeoutSolverTests extends LeonTestSuite { +class TimeoutSolverSuite extends LeonTestSuite { private class IdioticSolver(val context : LeonContext, val program: Program) extends Solver with Interruptible{ val name = "Idiotic" val description = "Loops" diff --git a/src/test/scala/leon/test/solvers/UnrollingSolverTests.scala b/src/test/scala/leon/test/solvers/UnrollingSolverSuite.scala similarity index 97% rename from src/test/scala/leon/test/solvers/UnrollingSolverTests.scala rename to src/test/scala/leon/test/solvers/UnrollingSolverSuite.scala index 121101041..c6cfc6838 100644 --- a/src/test/scala/leon/test/solvers/UnrollingSolverTests.scala +++ b/src/test/scala/leon/test/solvers/UnrollingSolverSuite.scala @@ -11,7 +11,7 @@ import leon.solvers._ import leon.solvers.z3._ import leon.solvers.combinators._ -class UnrollingSolverTests extends LeonTestSuite { +class UnrollingSolverSuite extends LeonTestSuite { private val fx : Identifier = FreshIdentifier("x", IntegerType) private val fres : Identifier = FreshIdentifier("res", IntegerType) diff --git a/src/test/scala/leon/test/termination/TerminationRegression.scala b/src/test/scala/leon/test/termination/TerminationSuite.scala similarity index 98% rename from src/test/scala/leon/test/termination/TerminationRegression.scala rename to src/test/scala/leon/test/termination/TerminationSuite.scala index 829fad97b..83186d8ac 100644 --- a/src/test/scala/leon/test/termination/TerminationRegression.scala +++ b/src/test/scala/leon/test/termination/TerminationSuite.scala @@ -9,7 +9,7 @@ import leon.termination._ import java.io.File -class TerminationRegression extends LeonTestSuite { +class TerminationSuite extends LeonTestSuite { private var counter : Int = 0 private def nextInt() : Int = { counter += 1 diff --git a/src/test/scala/leon/test/utils/Streams.scala b/src/test/scala/leon/test/utils/StreamsSuite.scala similarity index 97% rename from src/test/scala/leon/test/utils/Streams.scala rename to src/test/scala/leon/test/utils/StreamsSuite.scala index 3201301e6..ac0ab2e22 100644 --- a/src/test/scala/leon/test/utils/Streams.scala +++ b/src/test/scala/leon/test/utils/StreamsSuite.scala @@ -6,7 +6,7 @@ import leon.test._ import leon.purescala.Common._ import leon.utils.StreamUtils._ -class Streams extends LeonTestSuite { +class StreamsSuite extends LeonTestSuite { test("Cartesian Product 1") { val s1 = FreshIdentifier("B", alwaysShowUniqueID = true) #:: FreshIdentifier("B", alwaysShowUniqueID = true) #:: diff --git a/src/test/scala/leon/test/verification/LibraryVerificationRegression.scala b/src/test/scala/leon/test/verification/LibraryVerificationSuite.scala similarity index 91% rename from src/test/scala/leon/test/verification/LibraryVerificationRegression.scala rename to src/test/scala/leon/test/verification/LibraryVerificationSuite.scala index 4a2228c47..a8acb56bb 100644 --- a/src/test/scala/leon/test/verification/LibraryVerificationRegression.scala +++ b/src/test/scala/leon/test/verification/LibraryVerificationSuite.scala @@ -8,7 +8,7 @@ import leon.frontends.scalac.ExtractionPhase import leon.utils.PreprocessingPhase import leon.verification.AnalysisPhase -class LibraryVerificationRegression extends LeonTestSuite { +class LibraryVerificationSuite extends LeonTestSuite { test("Verify the library") { val pipeline = ExtractionPhase andThen PreprocessingPhase andThen diff --git a/src/test/scala/leon/test/verification/NewSolversRegression.scala b/src/test/scala/leon/test/verification/NewSolversSuite.scala similarity index 93% rename from src/test/scala/leon/test/verification/NewSolversRegression.scala rename to src/test/scala/leon/test/verification/NewSolversSuite.scala index 90c8631f4..2dcf2e2b4 100644 --- a/src/test/scala/leon/test/verification/NewSolversRegression.scala +++ b/src/test/scala/leon/test/verification/NewSolversSuite.scala @@ -10,7 +10,7 @@ import leon.verification.AnalysisPhase // This is because we compile all tests from each folder separately. // This class is currently NOT in LeonAllTests -class NewSolversRegression extends VerificationRegression { +class NewSolversSuite extends VerificationSuite { val testDir = "regression/verification/newsolvers/" val pipeFront = xlang.NoXLangFeaturesChecking diff --git a/src/test/scala/leon/test/verification/PureScalaVerificationRegression.scala b/src/test/scala/leon/test/verification/PureScalaVerificationSuite.scala similarity index 94% rename from src/test/scala/leon/test/verification/PureScalaVerificationRegression.scala rename to src/test/scala/leon/test/verification/PureScalaVerificationSuite.scala index 3bd1b82d4..92166de3c 100644 --- a/src/test/scala/leon/test/verification/PureScalaVerificationRegression.scala +++ b/src/test/scala/leon/test/verification/PureScalaVerificationSuite.scala @@ -9,7 +9,7 @@ import _root_.smtlib.interpreters._ // If you add another regression test, make sure it contains one object whose name matches the file name // This is because we compile all tests from each folder separately. -class PureScalaVerificationRegression extends VerificationRegression { +class PureScalaVerificationSuite extends VerificationSuite { val testDir = "regression/verification/purescala/" val pipeFront = xlang.NoXLangFeaturesChecking diff --git a/src/test/scala/leon/test/verification/VerificationRegression.scala b/src/test/scala/leon/test/verification/VerificationSuite.scala similarity index 98% rename from src/test/scala/leon/test/verification/VerificationRegression.scala rename to src/test/scala/leon/test/verification/VerificationSuite.scala index 55030f871..24aba3273 100644 --- a/src/test/scala/leon/test/verification/VerificationRegression.scala +++ b/src/test/scala/leon/test/verification/VerificationSuite.scala @@ -15,7 +15,7 @@ import org.scalatest.{Reporter => TestReporter, _} // If you add another regression test, make sure it contains one object whose name matches the file name // This is because we compile all tests from each folder separately. -trait VerificationRegression extends LeonTestSuite { +trait VerificationSuite extends LeonTestSuite { val optionVariants: List[List[String]] val testDir: String diff --git a/src/test/scala/leon/test/verification/XLangVerificationRegression.scala b/src/test/scala/leon/test/verification/XLangVerificationSuite.scala similarity index 98% rename from src/test/scala/leon/test/verification/XLangVerificationRegression.scala rename to src/test/scala/leon/test/verification/XLangVerificationSuite.scala index 84c10b3e7..7cb6c0ab9 100644 --- a/src/test/scala/leon/test/verification/XLangVerificationRegression.scala +++ b/src/test/scala/leon/test/verification/XLangVerificationSuite.scala @@ -14,7 +14,7 @@ import _root_.smtlib.interpreters._ import java.io.File -class XLangVerificationRegression extends LeonTestSuite { +class XLangVerificationSuite extends LeonTestSuite { private var counter : Int = 0 private def nextInt() : Int = { counter += 1 -- GitLab