aboutsummaryrefslogtreecommitdiff
path: root/bridge/src/sbt-test/source-dependencies/added
diff options
context:
space:
mode:
Diffstat (limited to 'bridge/src/sbt-test/source-dependencies/added')
-rw-r--r--bridge/src/sbt-test/source-dependencies/added/changes/A1.scala6
-rw-r--r--bridge/src/sbt-test/source-dependencies/added/changes/A2.scala6
-rw-r--r--bridge/src/sbt-test/source-dependencies/added/changes/A3.scala6
-rw-r--r--bridge/src/sbt-test/source-dependencies/added/changes/B1.scala6
-rw-r--r--bridge/src/sbt-test/source-dependencies/added/changes/B2.scala6
-rw-r--r--bridge/src/sbt-test/source-dependencies/added/project/DottyInjectedPlugin.scala17
-rw-r--r--bridge/src/sbt-test/source-dependencies/added/test28
7 files changed, 0 insertions, 75 deletions
diff --git a/bridge/src/sbt-test/source-dependencies/added/changes/A1.scala b/bridge/src/sbt-test/source-dependencies/added/changes/A1.scala
deleted file mode 100644
index a58c253c0..000000000
--- a/bridge/src/sbt-test/source-dependencies/added/changes/A1.scala
+++ /dev/null
@@ -1,6 +0,0 @@
-package example
-
-object A
-{
- val x: Int = 3
-} \ No newline at end of file
diff --git a/bridge/src/sbt-test/source-dependencies/added/changes/A2.scala b/bridge/src/sbt-test/source-dependencies/added/changes/A2.scala
deleted file mode 100644
index 48ac8e5b6..000000000
--- a/bridge/src/sbt-test/source-dependencies/added/changes/A2.scala
+++ /dev/null
@@ -1,6 +0,0 @@
-package example
-
-object A
-{
- val x: Int = B.y
-} \ No newline at end of file
diff --git a/bridge/src/sbt-test/source-dependencies/added/changes/A3.scala b/bridge/src/sbt-test/source-dependencies/added/changes/A3.scala
deleted file mode 100644
index ec450b67e..000000000
--- a/bridge/src/sbt-test/source-dependencies/added/changes/A3.scala
+++ /dev/null
@@ -1,6 +0,0 @@
-package example
-
-object A
-{
- val x: String = B.y
-} \ No newline at end of file
diff --git a/bridge/src/sbt-test/source-dependencies/added/changes/B1.scala b/bridge/src/sbt-test/source-dependencies/added/changes/B1.scala
deleted file mode 100644
index 9b5cc4ee9..000000000
--- a/bridge/src/sbt-test/source-dependencies/added/changes/B1.scala
+++ /dev/null
@@ -1,6 +0,0 @@
-package example
-
-object B
-{
- val y: String = "4"
-} \ No newline at end of file
diff --git a/bridge/src/sbt-test/source-dependencies/added/changes/B2.scala b/bridge/src/sbt-test/source-dependencies/added/changes/B2.scala
deleted file mode 100644
index fc8c53c9c..000000000
--- a/bridge/src/sbt-test/source-dependencies/added/changes/B2.scala
+++ /dev/null
@@ -1,6 +0,0 @@
-package example
-
-object B
-{
- val y: Int = 5
-} \ No newline at end of file
diff --git a/bridge/src/sbt-test/source-dependencies/added/project/DottyInjectedPlugin.scala b/bridge/src/sbt-test/source-dependencies/added/project/DottyInjectedPlugin.scala
deleted file mode 100644
index 3433779b6..000000000
--- a/bridge/src/sbt-test/source-dependencies/added/project/DottyInjectedPlugin.scala
+++ /dev/null
@@ -1,17 +0,0 @@
-import sbt._
-import Keys._
-
-object DottyInjectedPlugin extends AutoPlugin {
- override def requires = plugins.JvmPlugin
- override def trigger = allRequirements
-
- override val projectSettings = Seq(
- scalaVersion := "0.1-SNAPSHOT",
- scalaOrganization := "ch.epfl.lamp",
- scalacOptions += "-language:Scala2",
- scalaBinaryVersion := "2.11",
- autoScalaLibrary := false,
- libraryDependencies ++= Seq("org.scala-lang" % "scala-library" % "2.11.5"),
- scalaCompilerBridgeSource := ("ch.epfl.lamp" % "dotty-bridge" % "0.1.1-SNAPSHOT" % "component").sources()
- )
-}
diff --git a/bridge/src/sbt-test/source-dependencies/added/test b/bridge/src/sbt-test/source-dependencies/added/test
deleted file mode 100644
index a1ab31849..000000000
--- a/bridge/src/sbt-test/source-dependencies/added/test
+++ /dev/null
@@ -1,28 +0,0 @@
-# This test checks that when a source file included in a partial recompilation adds a dependency on
-# a file not included in the partial recompilation, the dependency is properly recorded.
-
-# B and A are independent, so both should compile successfully
-$ copy-file changes/A1.scala src/main/scala/A.scala
-$ copy-file changes/B1.scala src/main/scala/B.scala
-> compile
-
-
-# A now depends on B and to check that it was recompiled, we mismatch the types, which should fail
-$ copy-file changes/A2.scala src/main/scala/A.scala
--> compile
-
-
-# We now correct the type so that it compiles successfully and this should introduce a dependency from A to B
-$ copy-file changes/A3.scala src/main/scala/A.scala
-> compile
-
-
-# If the dependency from A to B was properly introduced, changing the type of B.y to Int should make
-# the following statement in A a compiler error:
-# val x: String = B.y
-$ copy-file changes/B2.scala src/main/scala/B.scala
--> compile
-
-# verify this was the correct result by doing a clean+compile
-> clean
--> compile