From 3c51b93bd85282cfff7eedb63738fc9bd8859a46 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Mon, 15 Apr 2013 14:12:15 -0400 Subject: [PATCH] test case for a plain override modifier change. Ref #726. --- sbt/src/sbt-test/source-dependencies/override/A.scala | 3 +++ sbt/src/sbt-test/source-dependencies/override/B.scala | 3 +++ sbt/src/sbt-test/source-dependencies/override/C.scala | 3 +++ sbt/src/sbt-test/source-dependencies/override/D.scala | 1 + sbt/src/sbt-test/source-dependencies/override/changes/B2.scala | 3 +++ sbt/src/sbt-test/source-dependencies/override/test | 3 +++ 6 files changed, 16 insertions(+) create mode 100644 sbt/src/sbt-test/source-dependencies/override/A.scala create mode 100644 sbt/src/sbt-test/source-dependencies/override/B.scala create mode 100644 sbt/src/sbt-test/source-dependencies/override/C.scala create mode 100644 sbt/src/sbt-test/source-dependencies/override/D.scala create mode 100644 sbt/src/sbt-test/source-dependencies/override/changes/B2.scala create mode 100644 sbt/src/sbt-test/source-dependencies/override/test diff --git a/sbt/src/sbt-test/source-dependencies/override/A.scala b/sbt/src/sbt-test/source-dependencies/override/A.scala new file mode 100644 index 000000000..43b95b9e9 --- /dev/null +++ b/sbt/src/sbt-test/source-dependencies/override/A.scala @@ -0,0 +1,3 @@ +trait A { + def x: Int +} diff --git a/sbt/src/sbt-test/source-dependencies/override/B.scala b/sbt/src/sbt-test/source-dependencies/override/B.scala new file mode 100644 index 000000000..c7569ba51 --- /dev/null +++ b/sbt/src/sbt-test/source-dependencies/override/B.scala @@ -0,0 +1,3 @@ +trait B extends A { + override def x = 2 +} \ No newline at end of file diff --git a/sbt/src/sbt-test/source-dependencies/override/C.scala b/sbt/src/sbt-test/source-dependencies/override/C.scala new file mode 100644 index 000000000..24d656d4a --- /dev/null +++ b/sbt/src/sbt-test/source-dependencies/override/C.scala @@ -0,0 +1,3 @@ +trait C extends A { + def x = 5 +} \ No newline at end of file diff --git a/sbt/src/sbt-test/source-dependencies/override/D.scala b/sbt/src/sbt-test/source-dependencies/override/D.scala new file mode 100644 index 000000000..1f0d0a274 --- /dev/null +++ b/sbt/src/sbt-test/source-dependencies/override/D.scala @@ -0,0 +1 @@ +trait D extends C with B \ No newline at end of file diff --git a/sbt/src/sbt-test/source-dependencies/override/changes/B2.scala b/sbt/src/sbt-test/source-dependencies/override/changes/B2.scala new file mode 100644 index 000000000..f314e6a46 --- /dev/null +++ b/sbt/src/sbt-test/source-dependencies/override/changes/B2.scala @@ -0,0 +1,3 @@ +trait B extends A { + def x = 2 +} \ No newline at end of file diff --git a/sbt/src/sbt-test/source-dependencies/override/test b/sbt/src/sbt-test/source-dependencies/override/test new file mode 100644 index 000000000..43f805d4e --- /dev/null +++ b/sbt/src/sbt-test/source-dependencies/override/test @@ -0,0 +1,3 @@ +> compile +$ copy-file changes/B2.scala B.scala +-> compile \ No newline at end of file