From e5d526a1b708e7212588b07fc659cd89062d7703 Mon Sep 17 00:00:00 2001
From: Nicolas Voirol <voirol.nicolas@gmail.com>
Date: Mon, 3 Oct 2016 15:53:11 +0200
Subject: [PATCH] More on TIP parser tests
---
src/it/scala/inox/ResourceUtils.scala | 22 ++++++++++++----------
src/it/scala/inox/tip/TIPTestSuite.scala | 2 +-
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/it/scala/inox/ResourceUtils.scala b/src/it/scala/inox/ResourceUtils.scala
index 3297b44f6..c43039166 100644
--- a/src/it/scala/inox/ResourceUtils.scala
+++ b/src/it/scala/inox/ResourceUtils.scala
@@ -14,17 +14,19 @@ trait ResourceUtils {
val resourcesDir = "src/it/resources"
def resourceFiles(dir: String, filter: String => Boolean = (s: String) => true, recursive: Boolean = false): Seq[File] = {
- val baseDir = new File(getClass.getResource(s"/$dir").getPath)
-
- def rec(f: File): Seq[File] = Option(f.listFiles()).getOrElse(Array()).flatMap { f =>
- if (f.isDirectory) {
- if (recursive) rec(f)
- else Nil
- } else {
- List(f)
+ Option(getClass.getResource(s"/$dir")).toSeq.flatMap { url =>
+ val baseDir = new File(url.getPath)
+
+ def rec(f: File): Seq[File] = Option(f.listFiles()).getOrElse(Array()).flatMap { f =>
+ if (f.isDirectory) {
+ if (recursive) rec(f)
+ else Nil
+ } else {
+ List(f)
+ }
}
- }
- rec(baseDir).filter(f => filter(f.getPath)).toSeq.sortBy(_.getPath)
+ rec(baseDir).filter(f => filter(f.getPath)).toSeq.sortBy(_.getPath)
+ }
}
}
diff --git a/src/it/scala/inox/tip/TIPTestSuite.scala b/src/it/scala/inox/tip/TIPTestSuite.scala
index 19f91fe85..bed25e0b8 100644
--- a/src/it/scala/inox/tip/TIPTestSuite.scala
+++ b/src/it/scala/inox/tip/TIPTestSuite.scala
@@ -9,7 +9,7 @@ import org.scalatest.concurrent._
import solvers._
import utils._
-trait TIPTestSuite extends InoxTestSuite with ResourceUtils {
+class TIPTestSuite extends InoxTestSuite with ResourceUtils {
val tipDir = "tip-benchmarks"
--
GitLab