From a22146070d9378db531cbe8f6df1a651174a2759 Mon Sep 17 00:00:00 2001 From: Lukas Sommer Date: Mon, 13 May 2019 17:16:26 +0200 Subject: [PATCH 1/2] Fix test: Wait for directory watcher update before checking for core; --- .../filemgmt/FileAssetManagerTest.scala | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/src/test/scala/tapasco/filemgmt/FileAssetManagerTest.scala b/src/test/scala/tapasco/filemgmt/FileAssetManagerTest.scala index a716511f..d409b657 100644 --- a/src/test/scala/tapasco/filemgmt/FileAssetManagerTest.scala +++ b/src/test/scala/tapasco/filemgmt/FileAssetManagerTest.scala @@ -22,10 +22,12 @@ * @authors J. Korinth, TU Darmstadt (jk@esa.cs.tu-darmstadt.de) **/ package de.tu_darmstadt.cs.esa.tapasco.filemgmt -import de.tu_darmstadt.cs.esa.tapasco.base._ -import de.tu_darmstadt.cs.esa.tapasco.base.json._ -import org.scalatest._ -import java.nio.file._ +import de.tu_darmstadt.cs.esa.tapasco.base._ +import de.tu_darmstadt.cs.esa.tapasco.base.json._ +import org.scalatest._ +import java.nio.file._ + +import de.tu_darmstadt.cs.esa.tapasco.util.Listener class FileAssetManagerSpec extends FlatSpec with Matchers { private final val TAPASCO_HOME = Paths.get(sys.env("TAPASCO_HOME")).toAbsolutePath.normalize @@ -69,12 +71,19 @@ class FileAssetManagerSpec extends FlatSpec with Matchers { Files.createFile(zip) val t = Target(FileAssetManager.entities.architectures.toSeq.head, FileAssetManager.entities.platforms.toSeq.head) val core = Core(cf, zip, "Test", 42, "0.0.1", t, None, None) + var updated : Boolean = false + val listener = new Listener[FileAssetManager.Event] { + override def update(e: FileAssetManager.Event): Unit = updated.synchronized{updated=true} + } + FileAssetManager.addListener(listener) Core.to(core, cf) - + while(!updated){ + Thread.sleep(FS_SLEEP) + } assert(FileAssetManager.entities.cores.size == 1) val c = FileAssetManager.entities.cores.toSeq.head assert(c equals core) - + FileAssetManager.remListener(listener) cf.toFile().deleteOnExit() zip.toFile().deleteOnExit() p.toFile().deleteOnExit() From 361edd251ebe00aecd51120168d3cee7afc911b1 Mon Sep 17 00:00:00 2001 From: Lukas Sommer Date: Mon, 13 May 2019 17:16:51 +0200 Subject: [PATCH 2/2] Use correct TaPaSCo version number in build.sbt; --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index ad62d7bb..8797c150 100644 --- a/build.sbt +++ b/build.sbt @@ -1,4 +1,4 @@ -val tapascoVersion = "2018.1-SNAPSHOT" +val tapascoVersion = "2018.2" organization := "de.tu_darmstadt.esa.cs"