3 files changed, 141 insertions, 0 deletions
diff --git a/test/files/run/t9030.scala b/test/files/run/t9030.scala
new file mode 100644
index 0000000000..48d24e5b54
--- /dev/null
+++ b/test/files/run/t9030.scala
@@ -0,0 +1,19 @@
+object Test extends App {
+
+  // For these methods, the compiler emits calls to BoxesRuntime.equalsNumNum/equalsNumChar/equalsNumObject directly
+
+  def numNum(a: java.lang.Number, b: java.lang.Number) = assert(a == b)
+  def numChar(a: java.lang.Number, b: java.lang.Character) = assert(a == b)
+  def numObject(a: java.lang.Number, b: java.lang.Object) = assert(a == b)
+
+  // The compiler doesn't use equalsCharObject directly, but still adding an example for completeness
+
+  def charObject(a: java.lang.Character, b: java.lang.Object) = assert(a == b)
+
+  numNum(new Integer(1), new Integer(1))
+  numChar(new Integer(97), new Character('a'))
+  numObject(new Integer(1), new Integer(1))
+  numObject(new Integer(97), new Character('a'))
+
+  charObject(new Character('a'), new Integer(97))
+}
diff --git a/test/junit/scala/collection/mutable/ArrayBufferTest.scala b/test/junit/scala/collection/mutable/ArrayBufferTest.scala
new file mode 100644
index 0000000000..8c83164027
--- /dev/null
+++ b/test/junit/scala/collection/mutable/ArrayBufferTest.scala
@@ -0,0 +1,36 @@
+package scala.collection.mutable
+
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+import org.junit.{Assert, Test}
+
+import scala.tools.testing.AssertUtil
+
+/* Test for SI-9043 */
+@RunWith(classOf[JUnit4])
+class ArrayBufferTest {
+  @Test
+  def testInsertAll: Unit = {
+    val traver = ArrayBuffer(2, 4, 5, 7)
+    val testSeq = List(1, 3, 6, 9)
+
+    def insertAt(x: Int) = {
+      val clone = traver.clone()
+      clone.insertAll(x, testSeq)
+      clone
+    }
+
+    // Just insert some at position 0
+    Assert.assertEquals(ArrayBuffer(1, 3, 6, 9, 2, 4, 5, 7), insertAt(0))
+
+    // Insert in the middle
+    Assert.assertEquals(ArrayBuffer(2, 4, 1, 3, 6, 9, 5, 7), insertAt(2))
+
+    // No strange last position weirdness
+    Assert.assertEquals(ArrayBuffer(2, 4, 5, 7, 1, 3, 6, 9), insertAt(traver.size))
+
+    // Overflow is caught
+    AssertUtil.assertThrows[IndexOutOfBoundsException] { insertAt(-1) }
+    AssertUtil.assertThrows[IndexOutOfBoundsException] { insertAt(traver.size + 10) }
+  }
+}
diff --git a/test/junit/scala/io/SourceTest.scala b/test/junit/scala/io/SourceTest.scala
new file mode 100644
index 0000000000..3138a4589c
--- /dev/null
+++ b/test/junit/scala/io/SourceTest.scala
@@ -0,0 +1,86 @@
+
+package scala.io
+
+import org.junit.Test
+import org.junit.Assert._
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+
+import scala.tools.testing.AssertUtil._
+
+import java.io.{ Console => _, _ }
+
+@RunWith(classOf[JUnit4])
+class SourceTest {
+
+  private implicit val `our codec` = Codec.UTF8
+  private val charSet = Codec.UTF8.charSet.name
+
+  private def sampler = """
+    |Big-endian and little-endian approaches aren't
+    |readily interchangeable in general, because the
+    |laws of arithmetic send signals leftward from
+    |the bits that are "least significant."
+    |""".stripMargin.trim
+
+  private def in = new ByteArrayInputStream(sampler.getBytes)
+
+  @Test def canIterateLines() = {
+    assertEquals(sampler.lines.size, (Source fromString sampler).getLines.size)
+  }
+  @Test def canCustomizeReporting() = {
+    class CapitalReporting(is: InputStream) extends BufferedSource(is) {
+      override def report(pos: Int, msg: String, out: PrintStream): Unit = {
+        out print f"$pos%04x: ${msg.toUpperCase}"
+      }
+      class OffsetPositioner extends Positioner(null) {
+        override def next(): Char = {
+          ch = iter.next()
+          pos = pos + 1
+          ch
+        }
+      }
+      withPositioning(new OffsetPositioner)
+    }
+    val s = new CapitalReporting(in)
+    // skip to next line and report an error
+    do {
+      val c = s.next()
+    } while (s.ch != '\n')
+    s.next()
+    val out = new ByteArrayOutputStream
+    val ps  = new PrintStream(out, true, charSet)
+    s.reportError(s.pos, "That doesn't sound right.", ps)
+    assertEquals("0030: THAT DOESN'T SOUND RIGHT.", out.toString(charSet))
+  }
+  @Test def canAltCustomizeReporting() = {
+    class CapitalReporting(is: InputStream)(implicit codec: Codec) extends Source {
+      override val iter = {
+        val r = new InputStreamReader(is, codec.decoder)
+        Iterator continually (codec wrap r.read()) takeWhile (_ != -1) map (_.toChar)
+      }
+      override def report(pos: Int, msg: String, out: PrintStream): Unit = {
+        out print f"$pos%04x: ${msg.toUpperCase}"
+      }
+      private[this] var _pos: Int = _
+      override def pos = _pos
+      private[this] var _ch: Char = _
+      override def ch = _ch
+      override def next = {
+        _ch = iter.next()
+        _pos += 1
+        _ch
+      }
+    }
+    val s = new CapitalReporting(in)
+    // skip to next line and report an error
+    do {
+      val c = s.next()
+    } while (s.ch != '\n')
+    s.next()
+    val out = new ByteArrayOutputStream
+    val ps  = new PrintStream(out, true, charSet)
+    s.reportError(s.pos, "That doesn't sound right.", ps)
+    assertEquals("0030: THAT DOESN'T SOUND RIGHT.", out.toString(charSet))
+  }
+}