From b4448a666e419c573048f24edb18004627fd5780 Mon Sep 17 00:00:00 2001
From: Manos Koukoutos <emmanouil.koukoutos@epfl.ch>
Date: Mon, 17 Aug 2015 14:51:32 +0200
Subject: [PATCH] Tests in different packages
---
.../LeonTestSuiteWithProgram.scala | 2 +-
.../scala/leon/integration}/TestSilentReporter.scala | 3 ++-
.../evaluators/CodegenEvaluatorSuite.scala | 11 ++++-------
.../evaluators/EvaluatorSuite.scala | 6 ++++--
.../helpers/ExpressionsDSL.scala | 2 +-
.../{test => integration}/helpers/WithLikelyEq.scala | 2 +-
.../purescala/DataGenSuite.scala | 6 ++++--
.../{test => integration}/purescala/DefOpsSuite.scala | 3 ++-
.../purescala/ExprOpsSuite.scala | 6 ++++--
.../purescala/InliningSuite.scala | 6 ++++--
.../purescala/SimplifyPathsSuite.scala | 2 +-
.../solvers/EnumerationSolverSuite.scala | 2 +-
.../solvers/FairZ3SolverTests.scala | 2 +-
.../solvers/LeonSolverSuite.scala | 3 ++-
.../solvers/ModelEnumerationSuite.scala | 6 ++++--
.../solvers/TimeoutSolverSuite.scala | 2 +-
.../solvers/UnrollingSolverSuite.scala | 2 +-
.../leon/{test => regression}/LeonTestSuite.scala | 5 +----
.../scala/leon/regression}/TestSilentReporter.scala | 3 ++-
.../frontends/FrontEndsSuite.scala | 4 ++--
.../{test => regression}/repair/RepairSuite.scala | 5 +++--
.../synthesis/StablePrintingSuite.scala | 5 ++---
.../synthesis/SynthesisRegressionSuite.scala | 5 +++--
.../synthesis/SynthesisSuite.scala | 5 +++--
.../termination/TerminationSuite.scala | 4 ++--
.../testcases/TestCasesCompile.scala | 4 ++--
.../verification/LibraryVerificationSuite.scala | 6 +++---
.../verification/PureScalaVerificationSuite.scala | 3 ++-
.../verification/VerificationSuite.scala | 7 +++----
.../verification/XLangVerificationSuite.scala | 4 ++--
30 files changed, 68 insertions(+), 58 deletions(-)
rename src/integration/scala/leon/{test => integration}/LeonTestSuiteWithProgram.scala (98%)
rename src/{regression/scala/leon/test => integration/scala/leon/integration}/TestSilentReporter.scala (93%)
rename src/integration/scala/leon/{test => integration}/evaluators/CodegenEvaluatorSuite.scala (97%)
rename src/integration/scala/leon/{test => integration}/evaluators/EvaluatorSuite.scala (98%)
rename src/integration/scala/leon/{test => integration}/helpers/ExpressionsDSL.scala (98%)
rename src/integration/scala/leon/{test => integration}/helpers/WithLikelyEq.scala (98%)
rename src/integration/scala/leon/{test => integration}/purescala/DataGenSuite.scala (93%)
rename src/integration/scala/leon/{test => integration}/purescala/DefOpsSuite.scala (97%)
rename src/integration/scala/leon/{test => integration}/purescala/ExprOpsSuite.scala (92%)
rename src/integration/scala/leon/{test => integration}/purescala/InliningSuite.scala (83%)
rename src/integration/scala/leon/{test => integration}/purescala/SimplifyPathsSuite.scala (98%)
rename src/integration/scala/leon/{test => integration}/solvers/EnumerationSolverSuite.scala (95%)
rename src/integration/scala/leon/{test => integration}/solvers/FairZ3SolverTests.scala (98%)
rename src/integration/scala/leon/{test => integration}/solvers/LeonSolverSuite.scala (96%)
rename src/integration/scala/leon/{test => integration}/solvers/ModelEnumerationSuite.scala (97%)
rename src/integration/scala/leon/{test => integration}/solvers/TimeoutSolverSuite.scala (98%)
rename src/integration/scala/leon/{test => integration}/solvers/UnrollingSolverSuite.scala (97%)
rename src/regression/scala/leon/{test => regression}/LeonTestSuite.scala (97%)
rename src/{integration/scala/leon/test => regression/scala/leon/regression}/TestSilentReporter.scala (93%)
rename src/regression/scala/leon/{test => regression}/frontends/FrontEndsSuite.scala (95%)
rename src/regression/scala/leon/{test => regression}/repair/RepairSuite.scala (92%)
rename src/regression/scala/leon/{test => regression}/synthesis/StablePrintingSuite.scala (97%)
rename src/regression/scala/leon/{test => regression}/synthesis/SynthesisRegressionSuite.scala (94%)
rename src/regression/scala/leon/{test => regression}/synthesis/SynthesisSuite.scala (98%)
rename src/regression/scala/leon/{test => regression}/termination/TerminationSuite.scala (97%)
rename src/regression/scala/leon/{test => regression}/testcases/TestCasesCompile.scala (94%)
rename src/regression/scala/leon/{test => regression}/verification/LibraryVerificationSuite.scala (84%)
rename src/regression/scala/leon/{test => regression}/verification/PureScalaVerificationSuite.scala (96%)
rename src/regression/scala/leon/{test => regression}/verification/VerificationSuite.scala (95%)
rename src/regression/scala/leon/{test => regression}/verification/XLangVerificationSuite.scala (96%)
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 17d65364d..27c29f038 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 a303d35a9..6c639f74a 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 bddf8da58..29f4a78a8 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 dfc824f13..6465d764a 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 08ab65881..5725bd7c1 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 aee9e7671..7425bba66 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 2ca61596f..bb9fe8fe9 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 663c533eb..b477d07ac 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 47ac7e4c0..abd4bf93d 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 79c08ba35..4faeb0970 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 b538c2492..7ebbe8951 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 561e4d24e..593245826 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 32b038322..f89ecfd13 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 994232803..6344fc937 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 2025437ed..41a236fa9 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 0bdb5e99c..6a44bc17c 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 c681dfd5e..d9e4d8bb9 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 1fcfc36ea..d7cea9415 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 a303d35a9..e774c419d 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 28ca16b40..1662e0eb6 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 405058dea..d236ee4a1 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 d602a05a2..405500dc6 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 255781935..590f5d7a9 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 e949f139d..d0c7ecc93 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 83186d8ac..7adffa0b1 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 7c4f348b3..2064eb4b2 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 a8acb56bb..ca3e20ca8 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 92166de3c..541056449 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 24aba3273..de6b01ea4 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 121120374..64c7a1161 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
--
GitLab