diff --git a/src/test/scala/leon/test/LeonTests.scala b/src/test/scala/leon/test/LeonTests.scala
index 27672ef35370bbf8d7fc87cc3dd85cabe86c0188..6e943463e02066c115ae6bf9980c6f66682fc4e3 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 88f1481f7504446530f5eee853ab6fe3e6bb5dce..6ad41d65a0ea6429b33a6abcae02bfaded189027 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 ad359346a3e842df1cc621be793cfba3557dfde7..7286ef382207a01c049976d0706d1691c9ce6f3d 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 1f00e411f8864613f38903512334388c898b2fea..d1957bcf38fa885b2d66b8411f30d9ffb420852b 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 76370b47efd3f69b133127d9596deaa15a2b65b3..28ca16b40368ad6b8a1b9ef80f2ccf123e1842f5 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 e01c786abef801f03c873d18b71a413578703e5f..8d1cdbbdb6a4cca0f5fe182226622d26afe86133 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 8fcc97be203a6c575695817bd23914cb676e72a1..2ba0bf0178f5589d1b4c8e07004a46232ca94633 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 a7b04bf85e65e07f641e05bdc9aa69cf9c94348f..245c1191fac5b801a8c7bb122749a5ae278161f9 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 a8227173dd838685775e51edbe78ea9fe5dfeff4..9e8cefb6165c487591b2f30afa1afcf505f68a74 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 e7ecc6b727baee15949f8c122df130f36a31efd5..fc11c8a0911d937e3c81195bbca99490eb31ee39 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 88116db6b61ce9389dd319a56372e1f043a377a8..b73eec580ce50ed4dbde963b3ddeffe6db50d2d7 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 0918457c463a3b188ab5ae385910cc6d32f4d2ff..933ba02dc4397850965c14d5dbf22ee8f5fe3f97 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 3fac225829de17efcd76c8f9f112a6d0acfd8e8c..cfe8ab17cea7ba0a5311cb3459bd4f514c9e1e35 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 d319b0f2f1efb2b344afb24928b9212a64f646ee..6c7c8ab714577313aa3ded7119136b71eb6b280b 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 121101041a2fc6cfde07820341998f116b0b24f4..c6cfc68388636b381e696a01b59f002ffad492d8 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 829fad97b28253c73be78c44dd5d6a9ed99cebb5..83186d8ac71a67be0898f14c40cabe81ceeb52af 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 3201301e641f36df96d1e148f5ff1f4c3f4d7224..ac0ab2e226bddd0f0fd6272783f74845abb94a78 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 4a2228c47e895dcd0d9332ca969a2a8bd8db32bf..a8acb56bb51cd88156dd3dd79bd81c0cfc6d279d 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 90c8631f4fb62d17a4d8024aaca4f34ad12a366b..2dcf2e2b4b5c16649cfcd070bfc4990360b78ede 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 3bd1b82d4936b1c31c97eff4b3bbb66449a8ad57..92166de3c720261d19ef8d914d3c3f1be918ce32 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 55030f8713ca386c79b0359345f6db9cc84561ba..24aba32735ef80cf489df0a745815c6b65b76bbf 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 84c10b3e721e8cb322c1e8dc8737f6ca9d9b7ba7..7cb6c0ab99e7021dcdfb8bb21d0cd123840329b1 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