From 3a6b6aadc0dfe302a2cdcb3791201d15141172aa Mon Sep 17 00:00:00 2001
From: Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com>
Date: Wed, 23 Dec 2015 14:17:47 +0100
Subject: [PATCH] Add scripted (functional test) for #2324.

Add a test that shows the scenario described in #2324 is handled correctly
now.
---
 .../private-public-both-modified/build.sbt    | 25 +++++++++++++++++++
 .../changes/A1.scala                          |  5 ++++
 .../src/main/scala/A.scala                    |  5 ++++
 .../src/main/scala/B.scala                    |  4 +++
 .../private-public-both-modified/test         |  9 +++++++
 5 files changed, 48 insertions(+)
 create mode 100644 sbt/src/sbt-test/compiler-project/private-public-both-modified/build.sbt
 create mode 100644 sbt/src/sbt-test/compiler-project/private-public-both-modified/changes/A1.scala
 create mode 100644 sbt/src/sbt-test/compiler-project/private-public-both-modified/src/main/scala/A.scala
 create mode 100644 sbt/src/sbt-test/compiler-project/private-public-both-modified/src/main/scala/B.scala
 create mode 100644 sbt/src/sbt-test/compiler-project/private-public-both-modified/test

diff --git a/sbt/src/sbt-test/compiler-project/private-public-both-modified/build.sbt b/sbt/src/sbt-test/compiler-project/private-public-both-modified/build.sbt
new file mode 100644
index 000000000..0b0718fb0
--- /dev/null
+++ b/sbt/src/sbt-test/compiler-project/private-public-both-modified/build.sbt
@@ -0,0 +1,25 @@
+/* Performs checks related to compilations:
+ *  a) checks in which compilation given set of files was recompiled
+ *  b) checks overall number of compilations performed
+ */
+TaskKey[Unit]("check-compilations") := {
+  val analysis = (compile in Compile).value
+  val srcDir = (scalaSource in Compile).value
+  def relative(f: java.io.File): java.io.File =  f.relativeTo(srcDir) getOrElse f
+  val allCompilations = analysis.compilations.allCompilations
+  val recompiledFiles: Seq[Set[java.io.File]] = allCompilations map { c =>
+    val recompiledFiles = analysis.apis.internal.collect {
+      case (file, api) if api.compilation.startTime == c.startTime => relative(file)
+    }
+    recompiledFiles.toSet
+  }
+  def recompiledFilesInIteration(iteration: Int, fileNames: Set[String]) = {
+    val files = fileNames.map(new java.io.File(_))
+    assert(recompiledFiles(iteration) == files, "%s != %s".format(recompiledFiles(iteration), files))
+  }
+  assert(allCompilations.size == 2)
+  // B.scala is just compiled at the beginning
+  recompiledFilesInIteration(0, Set("B.scala"))
+  // A.scala is changed and recompiled
+  recompiledFilesInIteration(1, Set("A.scala"))
+}
diff --git a/sbt/src/sbt-test/compiler-project/private-public-both-modified/changes/A1.scala b/sbt/src/sbt-test/compiler-project/private-public-both-modified/changes/A1.scala
new file mode 100644
index 000000000..742f1dfb1
--- /dev/null
+++ b/sbt/src/sbt-test/compiler-project/private-public-both-modified/changes/A1.scala
@@ -0,0 +1,5 @@
+object A {
+  private def foo: String = "1"
+  def bar: String = "29"
+  def xyz: Int = 101
+}
diff --git a/sbt/src/sbt-test/compiler-project/private-public-both-modified/src/main/scala/A.scala b/sbt/src/sbt-test/compiler-project/private-public-both-modified/src/main/scala/A.scala
new file mode 100644
index 000000000..9f2751ab6
--- /dev/null
+++ b/sbt/src/sbt-test/compiler-project/private-public-both-modified/src/main/scala/A.scala
@@ -0,0 +1,5 @@
+object A {
+  private def foo: Int = 1
+  def bar: Int = 29
+  def xyz: Int = 101
+}
diff --git a/sbt/src/sbt-test/compiler-project/private-public-both-modified/src/main/scala/B.scala b/sbt/src/sbt-test/compiler-project/private-public-both-modified/src/main/scala/B.scala
new file mode 100644
index 000000000..b601a4efe
--- /dev/null
+++ b/sbt/src/sbt-test/compiler-project/private-public-both-modified/src/main/scala/B.scala
@@ -0,0 +1,4 @@
+class B {
+  private def foo: Int = 1
+  def baz(): Unit = println(foo, A.xyz)
+}
diff --git a/sbt/src/sbt-test/compiler-project/private-public-both-modified/test b/sbt/src/sbt-test/compiler-project/private-public-both-modified/test
new file mode 100644
index 000000000..f344849a6
--- /dev/null
+++ b/sbt/src/sbt-test/compiler-project/private-public-both-modified/test
@@ -0,0 +1,9 @@
+# Test for https://github.com/sbt/sbt/issues/2324
+# introduces first compile iteration
+> compile
+# change signature of a private `A.foo` method
+$ copy-file changes/A1.scala src/main/scala/A.scala
+# it should recompile just A.scala because changes to `A.foo` can't affect B
+> compile
+# check if there are only two compile iterations performed
+> check-compilations