Merge pull request #2923 from retronym/ticket/7825

SI-7825 Consider DEFAULTMETHOD when refchecking concreteness

2 files changed, 36 insertions, 4 deletions

diff --git a/test/files/run/t7398.scala b/test/files/run/t7398.scala
index dd59697b71..493c4dcf40 100644
--- a/test/files/run/t7398.scala
+++ b/test/files/run/t7398.scala
@@ -3,11 +3,9 @@ import scala.tools.partest._
 object Test extends CompilerTest {
   import global._
 
-  // This way we auto-pass on non-java8 since there's nothing to check
-  override lazy val units: List[CompilationUnit]  = testUnderJavaAtLeast("1.8") {
+  override lazy val units: List[CompilationUnit] = {
+    // This test itself does not depend on JDK8.
     javaCompilationUnits(global)(defaultMethodSource)
-  } otherwise {
-    Nil
   }
 
   private def defaultMethodSource = """
diff --git a/test/files/run/t7825.scala b/test/files/run/t7825.scala
new file mode 100644
index 0000000000..65ca06fdfc
--- /dev/null
+++ b/test/files/run/t7825.scala
@@ -0,0 +1,34 @@
+import scala.tools.partest._
+
+object Test extends CompilerTest {
+  import global._
+
+  override lazy val units: List[CompilationUnit] = {
+    // We can test this on JDK6.
+    javaCompilationUnits(global)(defaultMethodSource) ++ compilationUnits(global)(scalaExtendsDefault)
+  }
+
+  private def defaultMethodSource = """
+public interface Iterator<E> {
+    boolean hasNext();
+    E next();
+    default void remove() {
+        throw new UnsupportedOperationException("remove");
+    }
+}
+  """
+
+  private def scalaExtendsDefault = """
+object Test {
+  object X extends Iterator[String] {
+    def hasNext = true
+    def next = "!"
+  }
+}
+  """
+
+  // We're only checking we that the Scala compilation unit passes refchecks
+  // No further checks are needed here.
+  def check(source: String, unit: global.CompilationUnit): Unit = {
+  }
+}