From 4f6e38c805c8bdfe56d0770391b876c57b41a497 Mon Sep 17 00:00:00 2001 From: Ethan Atkins Date: Wed, 17 Apr 2019 21:48:02 -0700 Subject: [PATCH] Remove unneeded test This isn't testing anything useful after the refactoring that removed the implicit FileTree.Repository. --- sbt/src/sbt-test/nio/inputs/build.sbt | 43 ------------------- .../nio/inputs/src/main/scala/bar/Bar.scala | 3 -- .../nio/inputs/src/main/scala/foo/Foo.scala | 3 -- sbt/src/sbt-test/nio/inputs/test | 3 -- 4 files changed, 52 deletions(-) delete mode 100644 sbt/src/sbt-test/nio/inputs/build.sbt delete mode 100644 sbt/src/sbt-test/nio/inputs/src/main/scala/bar/Bar.scala delete mode 100644 sbt/src/sbt-test/nio/inputs/src/main/scala/foo/Foo.scala delete mode 100644 sbt/src/sbt-test/nio/inputs/test diff --git a/sbt/src/sbt-test/nio/inputs/build.sbt b/sbt/src/sbt-test/nio/inputs/build.sbt deleted file mode 100644 index a6f9069a0..000000000 --- a/sbt/src/sbt-test/nio/inputs/build.sbt +++ /dev/null @@ -1,43 +0,0 @@ -import java.nio.file.Path - -import sbt.Keys._ -import sbt.nio.file._ -import sbt.nio.Keys._ - -val allInputs = taskKey[Seq[File]]("") -val allInputsExplicit = taskKey[Seq[File]]("") - -val checkInputs = inputKey[Unit]("") -val checkInputsExplicit = inputKey[Unit]("") - -allInputs := (Compile / unmanagedSources / allFiles).value.map(_.toFile) - -checkInputs := { - val res = allInputs.value - val scala = (Compile / scalaSource).value - val expected = Def.spaceDelimited("").parsed.map(scala / _).toSet - assert(res.toSet == expected) -} - -// In this test we override the FileTree.Repository used by the all method. -allInputsExplicit := { - val files = scala.collection.mutable.Set.empty[File] - val underlying = fileTreeView.value - val view: FileTreeView[(Path, FileAttributes)] = new FileTreeView[(Path, FileAttributes)] { - override def list(path: Path): Seq[(Path, FileAttributes)] = { - val res = underlying.list(path) - files ++= res.map(_._1.toFile) - res - } - } - val include = (Compile / unmanagedSources / includeFilter).value - view.list((Compile / unmanagedSources / fileInputs).value) - files.filter(include.accept).toSeq -} - -checkInputsExplicit := { - val res = allInputsExplicit.value - val scala = (Compile / scalaSource).value - val expected = Def.spaceDelimited("").parsed.map(scala / _).toSet - assert(res.toSet == expected) -} diff --git a/sbt/src/sbt-test/nio/inputs/src/main/scala/bar/Bar.scala b/sbt/src/sbt-test/nio/inputs/src/main/scala/bar/Bar.scala deleted file mode 100644 index f51e51890..000000000 --- a/sbt/src/sbt-test/nio/inputs/src/main/scala/bar/Bar.scala +++ /dev/null @@ -1,3 +0,0 @@ -package bar - -object Bar \ No newline at end of file diff --git a/sbt/src/sbt-test/nio/inputs/src/main/scala/foo/Foo.scala b/sbt/src/sbt-test/nio/inputs/src/main/scala/foo/Foo.scala deleted file mode 100644 index 5c464310a..000000000 --- a/sbt/src/sbt-test/nio/inputs/src/main/scala/foo/Foo.scala +++ /dev/null @@ -1,3 +0,0 @@ -package foo - -object Foo diff --git a/sbt/src/sbt-test/nio/inputs/test b/sbt/src/sbt-test/nio/inputs/test deleted file mode 100644 index a8082a1f3..000000000 --- a/sbt/src/sbt-test/nio/inputs/test +++ /dev/null @@ -1,3 +0,0 @@ -> checkInputs foo/Foo.scala bar/Bar.scala - -> checkInputsExplicit foo/Foo.scala bar/Bar.scala