diff options
author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2013-05-11 01:41:56 -0700 |
---|---|---|
committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2013-05-11 01:41:56 -0700 |
commit | 1ee5cc49107ae14a5ef6ca24c5da88b618b28e18 (patch) | |
tree | 01522c00d68046bf00fd17e42d23c9cb314f0145 /test/files/run | |
parent | ece84b704e20c76efab15d82b565544ec350c950 (diff) | |
parent | b2c67b328daeaf51eacdb0333db85a7287b5fe1f (diff) | |
download | scala-1ee5cc49107ae14a5ef6ca24c5da88b618b28e18.tar.gz scala-1ee5cc49107ae14a5ef6ca24c5da88b618b28e18.tar.bz2 scala-1ee5cc49107ae14a5ef6ca24c5da88b618b28e18.zip |
Merge pull request #2456 from paulp/pr/jdk8-210x
SI-7398 Add support for java8 default methods
Diffstat (limited to 'test/files/run')
-rw-r--r-- | test/files/run/t5527.check | 2 | ||||
-rw-r--r-- | test/files/run/t5603.check | 2 | ||||
-rw-r--r-- | test/files/run/t6028.check | 2 | ||||
-rw-r--r-- | test/files/run/t6288.check | 2 | ||||
-rw-r--r-- | test/files/run/t6440.check | 2 | ||||
-rw-r--r-- | test/files/run/t6555.check | 2 | ||||
-rw-r--r-- | test/files/run/t7398.scala | 31 | ||||
-rw-r--r-- | test/files/run/typetags_without_scala_reflect_typetag_lookup.check | 2 | ||||
-rw-r--r-- | test/files/run/typetags_without_scala_reflect_typetag_manifest_interop.check | 2 |
9 files changed, 39 insertions, 8 deletions
diff --git a/test/files/run/t5527.check b/test/files/run/t5527.check index 1518168c51..36bee9bb55 100644 --- a/test/files/run/t5527.check +++ b/test/files/run/t5527.check @@ -1,4 +1,4 @@ -[[syntax trees at end of parser]] // newSource1 +[[syntax trees at end of parser]] // newSource1.scala package <empty> { object UselessComments extends scala.AnyRef { def <init>() = { diff --git a/test/files/run/t5603.check b/test/files/run/t5603.check index 5127d3c1c7..3f19a0a4b1 100644 --- a/test/files/run/t5603.check +++ b/test/files/run/t5603.check @@ -1,4 +1,4 @@ -[[syntax trees at end of parser]] // newSource1 +[[syntax trees at end of parser]] // newSource1.scala [0:241]package [0:0]<empty> { [0:82]abstract trait Greeting extends [15:82][83]scala.AnyRef { [15]def $init$() = [15]{ diff --git a/test/files/run/t6028.check b/test/files/run/t6028.check index 94013efd36..613d25b075 100644 --- a/test/files/run/t6028.check +++ b/test/files/run/t6028.check @@ -1,4 +1,4 @@ -[[syntax trees at end of lambdalift]] // newSource1 +[[syntax trees at end of lambdalift]] // newSource1.scala package <empty> { class T extends Object { <paramaccessor> val T$$classParam: Int = _; diff --git a/test/files/run/t6288.check b/test/files/run/t6288.check index e6467edc95..e940975e44 100644 --- a/test/files/run/t6288.check +++ b/test/files/run/t6288.check @@ -1,4 +1,4 @@ -[[syntax trees at end of patmat]] // newSource1 +[[syntax trees at end of patmat]] // newSource1.scala [7]package [7]<empty> { [7]object Case3 extends [13][106]scala.AnyRef { [13]def <init>(): [13]Case3.type = [13]{ diff --git a/test/files/run/t6440.check b/test/files/run/t6440.check index 69c253eab4..806279fb74 100644 --- a/test/files/run/t6440.check +++ b/test/files/run/t6440.check @@ -1,4 +1,4 @@ -pos: source-newSource1,line-9,offset=109 bad symbolic reference. A signature in U.class refers to term pack1 +pos: source-newSource1.scala,line-9,offset=109 bad symbolic reference. A signature in U.class refers to term pack1 in package <root> which is not available. It may be completely missing from the current classpath, or the version on the classpath might be incompatible with the version used when compiling U.class. ERROR diff --git a/test/files/run/t6555.check b/test/files/run/t6555.check index 04117b7c2f..a18a8e8023 100644 --- a/test/files/run/t6555.check +++ b/test/files/run/t6555.check @@ -1,4 +1,4 @@ -[[syntax trees at end of specialize]] // newSource1 +[[syntax trees at end of specialize]] // newSource1.scala package <empty> { class Foo extends Object { def <init>(): Foo = { diff --git a/test/files/run/t7398.scala b/test/files/run/t7398.scala new file mode 100644 index 0000000000..e4090f7db3 --- /dev/null +++ b/test/files/run/t7398.scala @@ -0,0 +1,31 @@ +import scala.tools.partest._ + +object Test extends CompilerTest { + import global._ + + def javaVersion = scala.util.Properties.javaVersion + def isJavaEight = javaVersion startsWith "1.8" + // This way we auto-pass on non-java8 since there's nothing to check + override lazy val units = { + val res: List[CompilationUnit] = if (isJavaEight) javaCompilationUnits(global)(defaultMethodSource) else Nil + val word = if (isJavaEight) "Attempting" else "Skipping" + log(s"$word java8-specific test under java version $javaVersion") + res + } + + private def defaultMethodSource = """ +public interface Iterator<E> { + boolean hasNext(); + E next(); + default void remove() { + throw new UnsupportedOperationException("remove"); + } + default void forEachRemaining(Consumer<? super E> action) { + throw new UnsupportedOperationException("forEachRemaining"); + } +} + """ + + // We're only checking we can parse it. + def check(source: String, unit: global.CompilationUnit): Unit = () +} diff --git a/test/files/run/typetags_without_scala_reflect_typetag_lookup.check b/test/files/run/typetags_without_scala_reflect_typetag_lookup.check index 8c558ced60..84e5435afe 100644 --- a/test/files/run/typetags_without_scala_reflect_typetag_lookup.check +++ b/test/files/run/typetags_without_scala_reflect_typetag_lookup.check @@ -1,2 +1,2 @@ -pos: source-newSource1,line-9,offset=466 could not find implicit value for evidence parameter of type reflect.runtime.package.universe.TypeTag[Int] ERROR +pos: source-newSource1.scala,line-9,offset=466 could not find implicit value for evidence parameter of type reflect.runtime.package.universe.TypeTag[Int] ERROR diff --git a/test/files/run/typetags_without_scala_reflect_typetag_manifest_interop.check b/test/files/run/typetags_without_scala_reflect_typetag_manifest_interop.check index acfecce628..8c9d07d836 100644 --- a/test/files/run/typetags_without_scala_reflect_typetag_manifest_interop.check +++ b/test/files/run/typetags_without_scala_reflect_typetag_manifest_interop.check @@ -1,2 +1,2 @@ -pos: source-newSource1,line-9,offset=479 No Manifest available for App.this.T. ERROR +pos: source-newSource1.scala,line-9,offset=479 No Manifest available for App.this.T. ERROR |