diff --git a/src/integration/scala/leon/test/LeonTestSuiteWithProgram.scala b/src/integration/scala/leon/integration/LeonTestSuiteWithProgram.scala
similarity index 98%
rename from src/integration/scala/leon/test/LeonTestSuiteWithProgram.scala
rename to src/integration/scala/leon/integration/LeonTestSuiteWithProgram.scala
index 17d65364de16d2a37b26be4a6ca147ac5c5ccb41..27c29f038799a950dc0f8f1d32cf3c8effbf451c 100644
--- a/src/integration/scala/leon/test/LeonTestSuiteWithProgram.scala
+++ b/src/integration/scala/leon/integration/LeonTestSuiteWithProgram.scala
@@ -1,6 +1,6 @@
/* Copyright 2009-2015 EPFL, Lausanne */
-package leon.test
+package leon.integration
import leon._
import leon.purescala.Definitions.Program
diff --git a/src/regression/scala/leon/test/TestSilentReporter.scala b/src/integration/scala/leon/integration/TestSilentReporter.scala
similarity index 93%
rename from src/regression/scala/leon/test/TestSilentReporter.scala
rename to src/integration/scala/leon/integration/TestSilentReporter.scala
index a303d35a99ed6a76d2068a9a279fb5ec664e5d38..6c639f74ac9fb7a5c8ec0c7387e7b8ec13173220 100644
--- a/src/regression/scala/leon/test/TestSilentReporter.scala
+++ b/src/integration/scala/leon/integration/TestSilentReporter.scala
@@ -1,6 +1,7 @@
/* Copyright 2009-2015 EPFL, Lausanne */
-package leon.test
+package leon.integration
+
import leon.DefaultReporter
class TestSilentReporter extends DefaultReporter(Set()) {
diff --git a/src/integration/scala/leon/test/evaluators/CodegenEvaluatorSuite.scala b/src/integration/scala/leon/integration/evaluators/CodegenEvaluatorSuite.scala
similarity index 97%
rename from src/integration/scala/leon/test/evaluators/CodegenEvaluatorSuite.scala
rename to src/integration/scala/leon/integration/evaluators/CodegenEvaluatorSuite.scala
index bddf8da587782f2c9bd2b2b535b6b11c31f9cbae..29f4a78a860ae1496e662866e449833d56498302 100644
--- a/src/integration/scala/leon/test/evaluators/CodegenEvaluatorSuite.scala
+++ b/src/integration/scala/leon/integration/evaluators/CodegenEvaluatorSuite.scala
@@ -1,12 +1,9 @@
/* Copyright 2009-2015 EPFL, Lausanne */
-package leon.test.evaluators
+package leon.integration.evaluators
-import leon._
-import leon.evaluators._
-
-import leon.utils.{TemporaryInputPhase, PreprocessingPhase}
-import leon.frontends.scalac.ExtractionPhase
+import leon.evaluators._
+import leon.integration.LeonTestSuiteWithProgram
import leon.purescala.Common._
import leon.purescala.Definitions._
@@ -18,7 +15,7 @@ import leon.purescala.Constructors._
import leon.codegen._
-class CodegenEvaluatorSuite extends leon.test.LeonTestSuiteWithProgram {
+class CodegenEvaluatorSuite extends LeonTestSuiteWithProgram {
val sources = List("""
import leon.lang._
diff --git a/src/integration/scala/leon/test/evaluators/EvaluatorSuite.scala b/src/integration/scala/leon/integration/evaluators/EvaluatorSuite.scala
similarity index 98%
rename from src/integration/scala/leon/test/evaluators/EvaluatorSuite.scala
rename to src/integration/scala/leon/integration/evaluators/EvaluatorSuite.scala
index dfc824f132602c3bd7492fe3c67a26defb3c3a7c..6465d764afe9c192ab7f3c8e4a303a9419f94b92 100644
--- a/src/integration/scala/leon/test/evaluators/EvaluatorSuite.scala
+++ b/src/integration/scala/leon/integration/evaluators/EvaluatorSuite.scala
@@ -1,8 +1,10 @@
/* Copyright 2009-2015 EPFL, Lausanne */
-package leon.test.allEvaluators
+package leon.integration.evaluators
import leon._
+import leon.integration.LeonTestSuiteWithProgram
+import leon.integration.helpers.ExpressionsDSL
import leon.test._
import leon.evaluators._
@@ -18,7 +20,7 @@ import leon.purescala.Extractors._
import leon.purescala.Constructors._
import leon.codegen._
-class EvaluatorSuite extends LeonTestSuiteWithProgram with helpers.ExpressionsDSL {
+class EvaluatorSuite extends LeonTestSuiteWithProgram with ExpressionsDSL {
val sources = List(
"""|object CaseClasses {
diff --git a/src/integration/scala/leon/test/helpers/ExpressionsDSL.scala b/src/integration/scala/leon/integration/helpers/ExpressionsDSL.scala
similarity index 98%
rename from src/integration/scala/leon/test/helpers/ExpressionsDSL.scala
rename to src/integration/scala/leon/integration/helpers/ExpressionsDSL.scala
index 08ab658815eb5cd51ef5b821261d5484ba878112..5725bd7c1e85db8e20dcdbd56bb058ba531f7b13 100644
--- a/src/integration/scala/leon/test/helpers/ExpressionsDSL.scala
+++ b/src/integration/scala/leon/integration/helpers/ExpressionsDSL.scala
@@ -1,4 +1,4 @@
-package leon.test.helpers
+package leon.integration.helpers
import org.scalatest.Assertions
diff --git a/src/integration/scala/leon/test/helpers/WithLikelyEq.scala b/src/integration/scala/leon/integration/helpers/WithLikelyEq.scala
similarity index 98%
rename from src/integration/scala/leon/test/helpers/WithLikelyEq.scala
rename to src/integration/scala/leon/integration/helpers/WithLikelyEq.scala
index aee9e7671d5f0d64e4e81bd0a6b82c6b514b2e20..7425bba66fa0c29c2076f508805b4c14222d40db 100644
--- a/src/integration/scala/leon/test/helpers/WithLikelyEq.scala
+++ b/src/integration/scala/leon/integration/helpers/WithLikelyEq.scala
@@ -1,6 +1,6 @@
/* Copyright 2009-2015 EPFL, Lausanne */
-package leon.test.helpers
+package leon.integration.helpers
import org.scalatest.Assertions
diff --git a/src/integration/scala/leon/test/purescala/DataGenSuite.scala b/src/integration/scala/leon/integration/purescala/DataGenSuite.scala
similarity index 93%
rename from src/integration/scala/leon/test/purescala/DataGenSuite.scala
rename to src/integration/scala/leon/integration/purescala/DataGenSuite.scala
index 2ca61596f85e5422721a73b1a7ea1fd894622425..bb9fe8fe9df66e73d0c72de6caaee439d998be45 100644
--- a/src/integration/scala/leon/test/purescala/DataGenSuite.scala
+++ b/src/integration/scala/leon/integration/purescala/DataGenSuite.scala
@@ -1,7 +1,9 @@
/* Copyright 2009-2015 EPFL, Lausanne */
-package leon.test.purescala
+package leon.integration.purescala
+import leon.integration.LeonTestSuiteWithProgram
+import leon.integration.helpers.ExpressionsDSL
import leon.test._
import leon.utils.{TemporaryInputPhase, PreprocessingPhase}
import leon.frontends.scalac.ExtractionPhase
@@ -14,7 +16,7 @@ import leon.datagen._
import leon.evaluators._
-class DataGenSuite extends LeonTestSuiteWithProgram with helpers.ExpressionsDSL {
+class DataGenSuite extends LeonTestSuiteWithProgram with ExpressionsDSL {
val sources = List(
"""|import leon.lang._
|object Program {
diff --git a/src/integration/scala/leon/test/purescala/DefOpsSuite.scala b/src/integration/scala/leon/integration/purescala/DefOpsSuite.scala
similarity index 97%
rename from src/integration/scala/leon/test/purescala/DefOpsSuite.scala
rename to src/integration/scala/leon/integration/purescala/DefOpsSuite.scala
index 663c533eb7adb4f8953f449d2032fe13b897dd70..b477d07ac60c1242ca7e1dff208d447fcc1e35d0 100644
--- a/src/integration/scala/leon/test/purescala/DefOpsSuite.scala
+++ b/src/integration/scala/leon/integration/purescala/DefOpsSuite.scala
@@ -1,7 +1,8 @@
/* Copyright 2009-2015 EPFL, Lausanne */
-package leon.test.purescala
+package leon.integration.purescala
+import leon.integration.LeonTestSuiteWithProgram
import leon.test._
import leon._
diff --git a/src/integration/scala/leon/test/purescala/ExprOpsSuite.scala b/src/integration/scala/leon/integration/purescala/ExprOpsSuite.scala
similarity index 92%
rename from src/integration/scala/leon/test/purescala/ExprOpsSuite.scala
rename to src/integration/scala/leon/integration/purescala/ExprOpsSuite.scala
index 47ac7e4c0299a365028cc71e83f4e18bb585f470..abd4bf93d4989c9a042dae363d204a7883fc9221 100644
--- a/src/integration/scala/leon/test/purescala/ExprOpsSuite.scala
+++ b/src/integration/scala/leon/integration/purescala/ExprOpsSuite.scala
@@ -1,7 +1,9 @@
/* Copyright 2009-2015 EPFL, Lausanne */
-package leon.test.purescala
+package leon.integration.purescala
+import leon.integration.LeonTestSuiteWithProgram
+import leon.integration.helpers.ExpressionsDSL
import leon.test._
import leon._
@@ -13,7 +15,7 @@ import leon.purescala.DefOps._
import leon.purescala.Common._
import leon.utils._
-class ExprOpsSuite extends LeonTestSuiteWithProgram with helpers.ExpressionsDSL {
+class ExprOpsSuite extends LeonTestSuiteWithProgram with ExpressionsDSL {
val sources = List(
"""object Casts1 {
diff --git a/src/integration/scala/leon/test/purescala/InliningSuite.scala b/src/integration/scala/leon/integration/purescala/InliningSuite.scala
similarity index 83%
rename from src/integration/scala/leon/test/purescala/InliningSuite.scala
rename to src/integration/scala/leon/integration/purescala/InliningSuite.scala
index 79c08ba355bb15df88aae5c7ce20e1b085d4395f..4faeb09703419d0ac12305c5646eae366275b6e0 100644
--- a/src/integration/scala/leon/test/purescala/InliningSuite.scala
+++ b/src/integration/scala/leon/integration/purescala/InliningSuite.scala
@@ -1,11 +1,13 @@
/* Copyright 2009-2015 EPFL, Lausanne */
-package leon.test.purescala
+package leon.integration.purescala
+import leon.integration.LeonTestSuiteWithProgram
+import leon.integration.helpers.ExpressionsDSL
import leon.test._
import leon.purescala.Expressions._
-class InliningSuite extends LeonTestSuiteWithProgram with helpers.ExpressionsDSL {
+class InliningSuite extends LeonTestSuiteWithProgram with ExpressionsDSL {
val sources = List(
"""|
|import leon.lang._
diff --git a/src/integration/scala/leon/test/purescala/SimplifyPathsSuite.scala b/src/integration/scala/leon/integration/purescala/SimplifyPathsSuite.scala
similarity index 98%
rename from src/integration/scala/leon/test/purescala/SimplifyPathsSuite.scala
rename to src/integration/scala/leon/integration/purescala/SimplifyPathsSuite.scala
index b538c2492035542c32ba8ec51d1347bc98152753..7ebbe89513942bb7c139383ac2fcaae5e9a8e8bd 100644
--- a/src/integration/scala/leon/test/purescala/SimplifyPathsSuite.scala
+++ b/src/integration/scala/leon/integration/purescala/SimplifyPathsSuite.scala
@@ -1,6 +1,6 @@
/* Copyright 2009-2015 EPFL, Lausanne */
-package leon.test.purescala
+package leon.integration.purescala
import leon.test._
diff --git a/src/integration/scala/leon/test/solvers/EnumerationSolverSuite.scala b/src/integration/scala/leon/integration/solvers/EnumerationSolverSuite.scala
similarity index 95%
rename from src/integration/scala/leon/test/solvers/EnumerationSolverSuite.scala
rename to src/integration/scala/leon/integration/solvers/EnumerationSolverSuite.scala
index 561e4d24ec7e889ab426cf9dfef805cb16cab7e7..59324582603c4460234f3a493766791a34ba27d9 100644
--- a/src/integration/scala/leon/test/solvers/EnumerationSolverSuite.scala
+++ b/src/integration/scala/leon/integration/solvers/EnumerationSolverSuite.scala
@@ -1,6 +1,6 @@
/* Copyright 2009-2015 EPFL, Lausanne */
-package leon.test.solvers
+package leon.integration.solvers
import leon.test._
import leon.solvers._
diff --git a/src/integration/scala/leon/test/solvers/FairZ3SolverTests.scala b/src/integration/scala/leon/integration/solvers/FairZ3SolverTests.scala
similarity index 98%
rename from src/integration/scala/leon/test/solvers/FairZ3SolverTests.scala
rename to src/integration/scala/leon/integration/solvers/FairZ3SolverTests.scala
index 32b038322907b284aa2cf9b19a455f69f25ff685..f89ecfd13746390086b6566573e8a45c8391ebd6 100644
--- a/src/integration/scala/leon/test/solvers/FairZ3SolverTests.scala
+++ b/src/integration/scala/leon/integration/solvers/FairZ3SolverTests.scala
@@ -1,6 +1,6 @@
/* Copyright 2009-2015 EPFL, Lausanne */
-package leon.test.solvers
+package leon.integration.solvers
import leon.test._
import leon.purescala.Common._
diff --git a/src/integration/scala/leon/test/solvers/LeonSolverSuite.scala b/src/integration/scala/leon/integration/solvers/LeonSolverSuite.scala
similarity index 96%
rename from src/integration/scala/leon/test/solvers/LeonSolverSuite.scala
rename to src/integration/scala/leon/integration/solvers/LeonSolverSuite.scala
index 994232803347955255efc26f624b023e71e9786e..6344fc9372bb60ee0de17479f5e1052ab062710e 100644
--- a/src/integration/scala/leon/test/solvers/LeonSolverSuite.scala
+++ b/src/integration/scala/leon/integration/solvers/LeonSolverSuite.scala
@@ -1,5 +1,6 @@
-package leon.test.solvers
+package leon.integration.solvers
+import leon.integration.LeonTestSuiteWithProgram
import leon.test._
import leon.purescala.Common._
import leon.purescala.Definitions._
diff --git a/src/integration/scala/leon/test/solvers/ModelEnumerationSuite.scala b/src/integration/scala/leon/integration/solvers/ModelEnumerationSuite.scala
similarity index 97%
rename from src/integration/scala/leon/test/solvers/ModelEnumerationSuite.scala
rename to src/integration/scala/leon/integration/solvers/ModelEnumerationSuite.scala
index 2025437ed2a2fbebd566ab442129f16b2f1020e8..41a236fa9835c9037e1a5c73758b142b345e8cff 100644
--- a/src/integration/scala/leon/test/solvers/ModelEnumerationSuite.scala
+++ b/src/integration/scala/leon/integration/solvers/ModelEnumerationSuite.scala
@@ -1,7 +1,9 @@
/* Copyright 2009-2015 EPFL, Lausanne */
-package leon.test.purescala
+package leon.integration.solvers
+import leon.integration.LeonTestSuiteWithProgram
+import leon.integration.helpers.ExpressionsDSL
import leon.test._
import leon._
import leon.solvers._
@@ -10,7 +12,7 @@ import leon.purescala.Common._
import leon.evaluators._
import leon.purescala.Expressions._
-class ModelEnumeratorSuite extends LeonTestSuiteWithProgram with helpers.ExpressionsDSL {
+class ModelEnumeratorSuite extends LeonTestSuiteWithProgram with ExpressionsDSL {
val sources = List(
"""|import leon.lang._
|import leon.annotation._
diff --git a/src/integration/scala/leon/test/solvers/TimeoutSolverSuite.scala b/src/integration/scala/leon/integration/solvers/TimeoutSolverSuite.scala
similarity index 98%
rename from src/integration/scala/leon/test/solvers/TimeoutSolverSuite.scala
rename to src/integration/scala/leon/integration/solvers/TimeoutSolverSuite.scala
index 0bdb5e99c0770562ae9ddc2f2c805d58a578fb99..6a44bc17c014148462b9405558f0769acd113cc6 100644
--- a/src/integration/scala/leon/test/solvers/TimeoutSolverSuite.scala
+++ b/src/integration/scala/leon/integration/solvers/TimeoutSolverSuite.scala
@@ -1,6 +1,6 @@
/* Copyright 2009-2015 EPFL, Lausanne */
-package leon.test.solvers
+package leon.integration.solvers
import leon._
import leon.test._
diff --git a/src/integration/scala/leon/test/solvers/UnrollingSolverSuite.scala b/src/integration/scala/leon/integration/solvers/UnrollingSolverSuite.scala
similarity index 97%
rename from src/integration/scala/leon/test/solvers/UnrollingSolverSuite.scala
rename to src/integration/scala/leon/integration/solvers/UnrollingSolverSuite.scala
index c681dfd5e09e30a305ad3f685f28ad402f7b05b2..d9e4d8bb969138727a9fcbde103d709813f88c5e 100644
--- a/src/integration/scala/leon/test/solvers/UnrollingSolverSuite.scala
+++ b/src/integration/scala/leon/integration/solvers/UnrollingSolverSuite.scala
@@ -1,6 +1,6 @@
/* Copyright 2009-2015 EPFL, Lausanne */
-package leon.test.solvers
+package leon.integration.solvers
import leon.test._
import leon.LeonContext
diff --git a/src/regression/scala/leon/test/LeonTestSuite.scala b/src/regression/scala/leon/regression/LeonTestSuite.scala
similarity index 97%
rename from src/regression/scala/leon/test/LeonTestSuite.scala
rename to src/regression/scala/leon/regression/LeonTestSuite.scala
index 1fcfc36ead3cb88ff8ce224e6f1b84d8f4b6684b..d7cea941507cf6720de5fdcdae9a6ef2cd6837ff 100644
--- a/src/regression/scala/leon/test/LeonTestSuite.scala
+++ b/src/regression/scala/leon/regression/LeonTestSuite.scala
@@ -1,9 +1,8 @@
/* Copyright 2009-2015 EPFL, Lausanne */
-package leon.test
+package leon.regression
import leon._
-import leon.LeonContext
import leon.utils._
import scala.io.Source
@@ -46,8 +45,6 @@ trait LeonTestSuite extends FunSuite with Timeouts with BeforeAndAfterEach {
def testWithTimeout(name: String, timeout: Span)(body: => Unit) {
super.test(name) {
- val id = testIdentifier(name)
-
failAfter(timeout) {
try {
body
diff --git a/src/integration/scala/leon/test/TestSilentReporter.scala b/src/regression/scala/leon/regression/TestSilentReporter.scala
similarity index 93%
rename from src/integration/scala/leon/test/TestSilentReporter.scala
rename to src/regression/scala/leon/regression/TestSilentReporter.scala
index a303d35a99ed6a76d2068a9a279fb5ec664e5d38..e774c419d95063d3ff14dcb3f3cd0a66e14dca3c 100644
--- a/src/integration/scala/leon/test/TestSilentReporter.scala
+++ b/src/regression/scala/leon/regression/TestSilentReporter.scala
@@ -1,6 +1,7 @@
/* Copyright 2009-2015 EPFL, Lausanne */
-package leon.test
+package leon.regression
+
import leon.DefaultReporter
class TestSilentReporter extends DefaultReporter(Set()) {
diff --git a/src/regression/scala/leon/test/frontends/FrontEndsSuite.scala b/src/regression/scala/leon/regression/frontends/FrontEndsSuite.scala
similarity index 95%
rename from src/regression/scala/leon/test/frontends/FrontEndsSuite.scala
rename to src/regression/scala/leon/regression/frontends/FrontEndsSuite.scala
index 28ca16b40368ad6b8a1b9ef80f2ccf123e1842f5..1662e0eb655666e47cedce9300656fb808564046 100644
--- a/src/regression/scala/leon/test/frontends/FrontEndsSuite.scala
+++ b/src/regression/scala/leon/regression/frontends/FrontEndsSuite.scala
@@ -1,9 +1,9 @@
/* Copyright 2009-2015 EPFL, Lausanne */
-package leon.test.frontends
+package leon.regression.frontends
import leon._
-import test.LeonTestSuite
+import leon.regression.LeonTestSuite
import purescala.Definitions.Program
import java.io.File
diff --git a/src/regression/scala/leon/test/repair/RepairSuite.scala b/src/regression/scala/leon/regression/repair/RepairSuite.scala
similarity index 92%
rename from src/regression/scala/leon/test/repair/RepairSuite.scala
rename to src/regression/scala/leon/regression/repair/RepairSuite.scala
index 405058dea72e43d63f8e31f8e41d60a972a84108..d236ee4a15925e3093edd3bee55e9bf3ee4ffbb9 100644
--- a/src/regression/scala/leon/test/repair/RepairSuite.scala
+++ b/src/regression/scala/leon/regression/repair/RepairSuite.scala
@@ -1,6 +1,7 @@
/* Copyright 2009-2015 EPFL, Lausanne */
-package leon.test.repair
+package leon.regression
+package repair
import leon.test._
import leon._
@@ -8,7 +9,7 @@ import leon.utils._
import leon.frontends.scalac.ExtractionPhase
import leon.repair._
-class RepairSuite extends LeonTestSuite {
+class RepairSuite extends regression.LeonTestSuite {
val pipeline = ExtractionPhase andThen
PreprocessingPhase andThen
RepairPhase
diff --git a/src/regression/scala/leon/test/synthesis/StablePrintingSuite.scala b/src/regression/scala/leon/regression/synthesis/StablePrintingSuite.scala
similarity index 97%
rename from src/regression/scala/leon/test/synthesis/StablePrintingSuite.scala
rename to src/regression/scala/leon/regression/synthesis/StablePrintingSuite.scala
index d602a05a2d81881c463c52a8f0d2ef8695f1fcfb..405500dc6e4e7d7778b1680e5f9577b0618eea03 100644
--- a/src/regression/scala/leon/test/synthesis/StablePrintingSuite.scala
+++ b/src/regression/scala/leon/regression/synthesis/StablePrintingSuite.scala
@@ -1,7 +1,6 @@
/* Copyright 2009-2015 EPFL, Lausanne */
-package leon
-package test
+package leon.regression
package synthesis
import leon._
@@ -16,7 +15,7 @@ import scala.io.Source
import java.io.File
-class StablePrintingSuite extends LeonTestSuite {
+class StablePrintingSuite extends regression.LeonTestSuite {
private def forEachFileIn(path : String)(block : File => Unit) {
val fs = filesInResourceDir(path, _.endsWith(".scala"))
diff --git a/src/regression/scala/leon/test/synthesis/SynthesisRegressionSuite.scala b/src/regression/scala/leon/regression/synthesis/SynthesisRegressionSuite.scala
similarity index 94%
rename from src/regression/scala/leon/test/synthesis/SynthesisRegressionSuite.scala
rename to src/regression/scala/leon/regression/synthesis/SynthesisRegressionSuite.scala
index 255781935cfc2864b82938fa999b58aabdab941d..590f5d7a960655386794d428d6bc91cb0ba76ddd 100644
--- a/src/regression/scala/leon/test/synthesis/SynthesisRegressionSuite.scala
+++ b/src/regression/scala/leon/regression/synthesis/SynthesisRegressionSuite.scala
@@ -1,6 +1,7 @@
/* Copyright 2009-2015 EPFL, Lausanne */
-package leon.test.synthesis
+package leon.regression.synthesis
+
import leon.test._
import leon._
@@ -9,7 +10,7 @@ import leon.synthesis._
import java.io.File
-class SynthesisRegressionSuite extends LeonTestSuite {
+class SynthesisRegressionSuite extends regression.LeonTestSuite {
private def forEachFileIn(path : String)(block : File => Unit) {
val fs = filesInResourceDir(path, _.endsWith(".scala"))
diff --git a/src/regression/scala/leon/test/synthesis/SynthesisSuite.scala b/src/regression/scala/leon/regression/synthesis/SynthesisSuite.scala
similarity index 98%
rename from src/regression/scala/leon/test/synthesis/SynthesisSuite.scala
rename to src/regression/scala/leon/regression/synthesis/SynthesisSuite.scala
index e949f139d7a97b3071d1c40fa898ebc06079fc63..d0c7ecc93e15dc86980485cb433f7f4da34be5a4 100644
--- a/src/regression/scala/leon/test/synthesis/SynthesisSuite.scala
+++ b/src/regression/scala/leon/regression/synthesis/SynthesisSuite.scala
@@ -1,6 +1,7 @@
/* Copyright 2009-2015 EPFL, Lausanne */
-package leon.test.synthesis
+package leon.regression.synthesis
+
import leon.test._
import leon._
import leon.synthesis._
@@ -8,7 +9,7 @@ import leon.synthesis.graph._
import leon.synthesis.utils._
import leon.utils.PreprocessingPhase
-class SynthesisSuite extends LeonTestSuite {
+class SynthesisSuite extends regression.LeonTestSuite {
private var counter : Int = 0
private def nextInt() : Int = {
counter += 1
diff --git a/src/regression/scala/leon/test/termination/TerminationSuite.scala b/src/regression/scala/leon/regression/termination/TerminationSuite.scala
similarity index 97%
rename from src/regression/scala/leon/test/termination/TerminationSuite.scala
rename to src/regression/scala/leon/regression/termination/TerminationSuite.scala
index 83186d8ac71a67be0898f14c40cabe81ceeb52af..7adffa0b1910c9ed0b8d9cc66693e4dc5e914b34 100644
--- a/src/regression/scala/leon/test/termination/TerminationSuite.scala
+++ b/src/regression/scala/leon/regression/termination/TerminationSuite.scala
@@ -1,6 +1,6 @@
/* Copyright 2009-2015 EPFL, Lausanne */
-package leon.test.termination
+package leon.regression.termination
import leon._
import leon.test._
@@ -9,7 +9,7 @@ import leon.termination._
import java.io.File
-class TerminationSuite extends LeonTestSuite {
+class TerminationSuite extends regression.LeonTestSuite {
private var counter : Int = 0
private def nextInt() : Int = {
counter += 1
diff --git a/src/regression/scala/leon/test/testcases/TestCasesCompile.scala b/src/regression/scala/leon/regression/testcases/TestCasesCompile.scala
similarity index 94%
rename from src/regression/scala/leon/test/testcases/TestCasesCompile.scala
rename to src/regression/scala/leon/regression/testcases/TestCasesCompile.scala
index 7c4f348b3991ee2e5cce9d76e16e58df64e7f909..2064eb4b203d6ba92afb355b2eddeb62fddd89a6 100644
--- a/src/regression/scala/leon/test/testcases/TestCasesCompile.scala
+++ b/src/regression/scala/leon/regression/testcases/TestCasesCompile.scala
@@ -1,10 +1,10 @@
/* Copyright 2009-2015 EPFL, Lausanne */
-package leon.test.testcases
+package leon.regression.testcases
import leon._
+import leon.regression.LeonTestSuite
import org.scalatest.time.SpanSugar._
-import test.LeonTestSuite
import java.io.File
import org.scalatest.ParallelTestExecution
diff --git a/src/regression/scala/leon/test/verification/LibraryVerificationSuite.scala b/src/regression/scala/leon/regression/verification/LibraryVerificationSuite.scala
similarity index 84%
rename from src/regression/scala/leon/test/verification/LibraryVerificationSuite.scala
rename to src/regression/scala/leon/regression/verification/LibraryVerificationSuite.scala
index a8acb56bb51cd88156dd3dd79bd81c0cfc6d279d..ca3e20ca8c27cd3a7d0a441068af16ae5e6fb03b 100644
--- a/src/regression/scala/leon/test/verification/LibraryVerificationSuite.scala
+++ b/src/regression/scala/leon/regression/verification/LibraryVerificationSuite.scala
@@ -1,14 +1,14 @@
/* Copyright 2009-2015 EPFL, Lausanne */
-package leon.test.verification
+package leon.regression
+package verification
import leon._
-import leon.test._
import leon.frontends.scalac.ExtractionPhase
import leon.utils.PreprocessingPhase
import leon.verification.AnalysisPhase
-class LibraryVerificationSuite extends LeonTestSuite {
+class LibraryVerificationSuite extends regression.LeonTestSuite {
test("Verify the library") {
val pipeline = ExtractionPhase andThen
PreprocessingPhase andThen
diff --git a/src/regression/scala/leon/test/verification/PureScalaVerificationSuite.scala b/src/regression/scala/leon/regression/verification/PureScalaVerificationSuite.scala
similarity index 96%
rename from src/regression/scala/leon/test/verification/PureScalaVerificationSuite.scala
rename to src/regression/scala/leon/regression/verification/PureScalaVerificationSuite.scala
index 92166de3c720261d19ef8d914d3c3f1be918ce32..541056449db2188e84a79f2f86ae6fd553ef7b45 100644
--- a/src/regression/scala/leon/test/verification/PureScalaVerificationSuite.scala
+++ b/src/regression/scala/leon/regression/verification/PureScalaVerificationSuite.scala
@@ -1,6 +1,7 @@
/* Copyright 2009-2015 EPFL, Lausanne */
-package leon.test.verification
+package leon.regression
+package verification
import leon._
import leon.verification.AnalysisPhase
diff --git a/src/regression/scala/leon/test/verification/VerificationSuite.scala b/src/regression/scala/leon/regression/verification/VerificationSuite.scala
similarity index 95%
rename from src/regression/scala/leon/test/verification/VerificationSuite.scala
rename to src/regression/scala/leon/regression/verification/VerificationSuite.scala
index 24aba32735ef80cf489df0a745815c6b65b76bbf..de6b01ea44ba5412f81c8044d3ee205832a6443c 100644
--- a/src/regression/scala/leon/test/verification/VerificationSuite.scala
+++ b/src/regression/scala/leon/regression/verification/VerificationSuite.scala
@@ -1,10 +1,9 @@
/* Copyright 2009-2015 EPFL, Lausanne */
-package leon.test.verification
+package leon.regression
+package verification
import leon._
-import leon.test._
-import leon.verification.VCStatus._
import leon.verification.VerificationReport
import leon.purescala.Definitions.Program
@@ -15,7 +14,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 VerificationSuite extends LeonTestSuite {
+trait VerificationSuite extends regression.LeonTestSuite {
val optionVariants: List[List[String]]
val testDir: String
diff --git a/src/regression/scala/leon/test/verification/XLangVerificationSuite.scala b/src/regression/scala/leon/regression/verification/XLangVerificationSuite.scala
similarity index 96%
rename from src/regression/scala/leon/test/verification/XLangVerificationSuite.scala
rename to src/regression/scala/leon/regression/verification/XLangVerificationSuite.scala
index 12112037487a59689afce69e1c454ace5efb223e..64c7a1161dcccb349138721457fe4773c9556f5d 100644
--- a/src/regression/scala/leon/test/verification/XLangVerificationSuite.scala
+++ b/src/regression/scala/leon/regression/verification/XLangVerificationSuite.scala
@@ -1,6 +1,6 @@
/* Copyright 2009-2015 EPFL, Lausanne */
-package leon.test.verification
+package leon.regression.verification
import leon._
import leon.test._
@@ -14,7 +14,7 @@ import _root_.smtlib.interpreters._
import java.io.File
-class XLangVerificationSuite extends LeonTestSuite {
+class XLangVerificationSuite extends regression.LeonTestSuite {
private var counter : Int = 0
private def nextInt() : Int = {
counter += 1