diff options
author | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-08-23 00:38:58 -0700 |
---|---|---|
committer | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-08-23 00:38:58 -0700 |
commit | d0f49fe7a282f6516e7a2621693c11ceb06b91b1 (patch) | |
tree | eaefc7e0c22076a1860a693a6fd336021d665355 /test | |
parent | 79f4d775f9aab0e5c3e6af2ea078366ad4774929 (diff) | |
parent | bc621bad33cc897f43f2b30d1c8afe1912919cfe (diff) | |
download | scala-d0f49fe7a282f6516e7a2621693c11ceb06b91b1.tar.gz scala-d0f49fe7a282f6516e7a2621693c11ceb06b91b1.tar.bz2 scala-d0f49fe7a282f6516e7a2621693c11ceb06b91b1.zip |
Merge pull request #1172 from Blaisorblade/topic/deprecated-conversion
JavaConversions: Restore source compatibility with 2.9
Diffstat (limited to 'test')
-rw-r--r-- | test/files/neg/javaConversions-2.10-ambiguity.check | 6 | ||||
-rw-r--r-- | test/files/neg/javaConversions-2.10-ambiguity.scala | 10 | ||||
-rw-r--r-- | test/files/pos/javaConversions-2.10-regression.scala | 17 |
3 files changed, 33 insertions, 0 deletions
diff --git a/test/files/neg/javaConversions-2.10-ambiguity.check b/test/files/neg/javaConversions-2.10-ambiguity.check new file mode 100644 index 0000000000..c064a22964 --- /dev/null +++ b/test/files/neg/javaConversions-2.10-ambiguity.check @@ -0,0 +1,6 @@ +javaConversions-2.10-ambiguity.scala:8: error: type mismatch; + found : scala.collection.concurrent.Map[String,String] + required: scala.collection.mutable.ConcurrentMap[String,String] + assertType[mutable.ConcurrentMap[String, String]](a) + ^ +one error found diff --git a/test/files/neg/javaConversions-2.10-ambiguity.scala b/test/files/neg/javaConversions-2.10-ambiguity.scala new file mode 100644 index 0000000000..e856846a29 --- /dev/null +++ b/test/files/neg/javaConversions-2.10-ambiguity.scala @@ -0,0 +1,10 @@ +import collection.{JavaConversions, mutable, concurrent} +import JavaConversions._ +import java.util.concurrent.{ConcurrentHashMap => CHM} + +object Bar { + def assertType[T](t: T) = t + val a = new CHM[String, String]() += (("", "")) + assertType[mutable.ConcurrentMap[String, String]](a) +} +// vim: set et: diff --git a/test/files/pos/javaConversions-2.10-regression.scala b/test/files/pos/javaConversions-2.10-regression.scala new file mode 100644 index 0000000000..e1b81015ba --- /dev/null +++ b/test/files/pos/javaConversions-2.10-regression.scala @@ -0,0 +1,17 @@ +import collection.{JavaConversions, mutable, concurrent} +import JavaConversions._ +import java.util.concurrent.{ConcurrentHashMap => CHM} + +object Foo { + def buildCache2_9_simple[K <: AnyRef, V <: AnyRef]: mutable.ConcurrentMap[K, V] = + asScalaConcurrentMap(new CHM()) + + def buildCache2_9_implicit[K <: AnyRef, V <: AnyRef]: mutable.ConcurrentMap[K, V] = + new CHM[K, V]() +} + +object Bar { + def assertType[T](t: T) = t + val a = new CHM[String, String]() += (("", "")) + assertType[concurrent.Map[String, String]](a) +} |