Merge pull request #4924 from ShaneDelmore/SI-9452

SI-9452: Extend BigDecimal with Ordered for java interop

3 files changed, 23 insertions, 1 deletions

diff --git a/test/files/run/numbereq.scala b/test/files/run/numbereq.scala
index 7ce4b23cf8..1f12d0643e 100644
--- a/test/files/run/numbereq.scala
+++ b/test/files/run/numbereq.scala
@@ -1,6 +1,7 @@
 object Test {
   def mkNumbers(x: Int): List[AnyRef] = {
-    val base = List(
+    //Use explicit AnyRef to workaround known limitation of type inference with F-Bounds
+    val base = List[AnyRef](
       BigDecimal(x),
       BigInt(x),
       new java.lang.Double(x.toDouble),
diff --git a/test/junit/scala/math/BigDecimalTest.scala b/test/junit/scala/math/BigDecimalTest.scala
index a9e2481f37..5de02cbe0c 100644
--- a/test/junit/scala/math/BigDecimalTest.scala
+++ b/test/junit/scala/math/BigDecimalTest.scala
@@ -260,4 +260,9 @@ class BigDecimalTest {
     testPrecision()
     testRounded()
   }
+
+  @Test
+  def testIsComparable() {
+    assert(BigDecimal(0.1).isInstanceOf[java.lang.Comparable[_]])
+  }
 }
diff --git a/test/junit/scala/math/BigIntTest.scala b/test/junit/scala/math/BigIntTest.scala
new file mode 100644
index 0000000000..5a5694a775
--- /dev/null
+++ b/test/junit/scala/math/BigIntTest.scala
@@ -0,0 +1,16 @@
+package scala.math
+
+import java.math.{BigInteger => BI, MathContext => MC}
+
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+
+@RunWith(classOf[JUnit4])
+class BigIntTest {
+
+  @Test
+  def testIsComparable() {
+    assert(BigInt(1).isInstanceOf[java.lang.Comparable[_]])
+  }
+}