From ee6af2c06d794c448fb954a7c97e13939036f79d Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Thu, 5 May 2016 23:59:30 -0400 Subject: [PATCH] Remove trait-super test from sbt/sbt --- .../sbt-test/source-dependencies/trait-super/A.scala | 6 ------ .../sbt-test/source-dependencies/trait-super/B.scala | 6 ------ .../source-dependencies/trait-super/Main.scala | 10 ---------- .../source-dependencies/trait-super/changes/B2.scala | 6 ------ .../source-dependencies/trait-super/changes/B3.scala | 6 ------ .../sbt-test/source-dependencies/trait-super/test | 12 ------------ 6 files changed, 46 deletions(-) delete mode 100644 sbt/src/sbt-test/source-dependencies/trait-super/A.scala delete mode 100644 sbt/src/sbt-test/source-dependencies/trait-super/B.scala delete mode 100644 sbt/src/sbt-test/source-dependencies/trait-super/Main.scala delete mode 100644 sbt/src/sbt-test/source-dependencies/trait-super/changes/B2.scala delete mode 100644 sbt/src/sbt-test/source-dependencies/trait-super/changes/B3.scala delete mode 100644 sbt/src/sbt-test/source-dependencies/trait-super/test diff --git a/sbt/src/sbt-test/source-dependencies/trait-super/A.scala b/sbt/src/sbt-test/source-dependencies/trait-super/A.scala deleted file mode 100644 index 52ad7e6a0..000000000 --- a/sbt/src/sbt-test/source-dependencies/trait-super/A.scala +++ /dev/null @@ -1,6 +0,0 @@ -trait A { - def x: Int -} -class E extends A { - def x = 19 -} diff --git a/sbt/src/sbt-test/source-dependencies/trait-super/B.scala b/sbt/src/sbt-test/source-dependencies/trait-super/B.scala deleted file mode 100644 index cba4cc427..000000000 --- a/sbt/src/sbt-test/source-dependencies/trait-super/B.scala +++ /dev/null @@ -1,6 +0,0 @@ -trait B extends A { - abstract override def x = 1 -} -trait C extends A { - abstract override def x = 3 -} diff --git a/sbt/src/sbt-test/source-dependencies/trait-super/Main.scala b/sbt/src/sbt-test/source-dependencies/trait-super/Main.scala deleted file mode 100644 index 37d821d9d..000000000 --- a/sbt/src/sbt-test/source-dependencies/trait-super/Main.scala +++ /dev/null @@ -1,10 +0,0 @@ -class X extends E with C with B - -object Main { - - def main(args: Array[String]): Unit = { - val x = new X - val expected = args(0).toInt - assert(x.x == expected, "Expected " + expected + ", got " + x.x) - } -} diff --git a/sbt/src/sbt-test/source-dependencies/trait-super/changes/B2.scala b/sbt/src/sbt-test/source-dependencies/trait-super/changes/B2.scala deleted file mode 100644 index c89acd3ae..000000000 --- a/sbt/src/sbt-test/source-dependencies/trait-super/changes/B2.scala +++ /dev/null @@ -1,6 +0,0 @@ -trait B extends A { - abstract override def x = super.x + 2 -} -trait C extends A { - abstract override def x = 3 -} diff --git a/sbt/src/sbt-test/source-dependencies/trait-super/changes/B3.scala b/sbt/src/sbt-test/source-dependencies/trait-super/changes/B3.scala deleted file mode 100644 index 2a7ba55ec..000000000 --- a/sbt/src/sbt-test/source-dependencies/trait-super/changes/B3.scala +++ /dev/null @@ -1,6 +0,0 @@ -trait B extends A { - abstract override def x = super.x + 2 -} -trait C extends A { - abstract override def x = super.x -} diff --git a/sbt/src/sbt-test/source-dependencies/trait-super/test b/sbt/src/sbt-test/source-dependencies/trait-super/test deleted file mode 100644 index 19cb22fd2..000000000 --- a/sbt/src/sbt-test/source-dependencies/trait-super/test +++ /dev/null @@ -1,12 +0,0 @@ -# This test verifies that adding/removing calls to super in traits properly -# recompiles subclasses. super calls introduce accessors that are not in -# the public API, so this is not picked up by the usual API change detection. - -> run 1 - -$ copy-file changes/B2.scala B.scala -> run 5 - -$ copy-file changes/B3.scala B.scala -> run 21 -