diff options
author | Paul Phillips <paulp@improving.org> | 2013-05-19 12:35:45 -0700 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2013-05-19 12:35:45 -0700 |
commit | 28f26fc5ee4b97657373334d910173961a91d275 (patch) | |
tree | 4ddcb529684f504d44e017f8aebf441d32865844 | |
parent | 16e92f48e7b075d8addf037953b5696a497258c6 (diff) | |
parent | b6757e11a1970480a60741235fc86f01d8957e07 (diff) | |
download | scala-28f26fc5ee4b97657373334d910173961a91d275.tar.gz scala-28f26fc5ee4b97657373334d910173961a91d275.tar.bz2 scala-28f26fc5ee4b97657373334d910173961a91d275.zip |
Merge pull request #2566 from paulp/pr/nondeterminism
An attempt to make tests deterministic.
4 files changed, 8 insertions, 3 deletions
diff --git a/src/interactive/scala/tools/nsc/interactive/CompilerControl.scala b/src/interactive/scala/tools/nsc/interactive/CompilerControl.scala index c38c7c8257..d036a6e853 100644 --- a/src/interactive/scala/tools/nsc/interactive/CompilerControl.scala +++ b/src/interactive/scala/tools/nsc/interactive/CompilerControl.scala @@ -297,6 +297,11 @@ trait CompilerControl { self: Global => def implicitlyAdded = false private def accessible_s = if (accessible) "" else "[inaccessible] " + def forceInfoString = { + definitions.fullyInitializeSymbol(sym) + definitions.fullyInitializeType(tpe) + infoString + } def infoString = s"$accessible_s${sym.defStringSeenAs(tpe)}" } diff --git a/src/interactive/scala/tools/nsc/interactive/tests/core/CoreTestDefs.scala b/src/interactive/scala/tools/nsc/interactive/tests/core/CoreTestDefs.scala index 08d84af8f5..e28bf20745 100644 --- a/src/interactive/scala/tools/nsc/interactive/tests/core/CoreTestDefs.scala +++ b/src/interactive/scala/tools/nsc/interactive/tests/core/CoreTestDefs.scala @@ -27,7 +27,7 @@ private[tests] trait CoreTestDefs reporter.println("retrieved %d members".format(members.size)) compiler ask { () => val filtered = members.filterNot(member => (member.sym.name string_== "getClass") || member.sym.isConstructor) - reporter println (filtered.map(_.infoString).sorted mkString "\n") + reporter println (filtered.map(_.forceInfoString).sorted mkString "\n") } } } diff --git a/test/files/presentation/ide-bug-1000531.check b/test/files/presentation/ide-bug-1000531.check index 980bb0a25d..be8805330a 100644 --- a/test/files/presentation/ide-bug-1000531.check +++ b/test/files/presentation/ide-bug-1000531.check @@ -7,7 +7,7 @@ retrieved 124 members [inaccessible] protected[package lang] def clone(): Object [inaccessible] protected[package lang] def finalize(): Unit [inaccessible] protected[this] def reversed: List[B] -class GroupedIterator[B <: <?>] extends AbstractIterator[Seq[B]] with Iterator[Seq[B]] +class GroupedIterator[B >: A] extends AbstractIterator[Seq[B]] with Iterator[Seq[B]] def +(other: String): String def ++[B >: B](that: => scala.collection.GenTraversableOnce[B]): Iterator[B] def ->[B](y: B): (java.util.Iterator[B], B) diff --git a/test/files/presentation/implicit-member.check b/test/files/presentation/implicit-member.check index 92d8e38abe..acf7e1a0fd 100644 --- a/test/files/presentation/implicit-member.check +++ b/test/files/presentation/implicit-member.check @@ -15,7 +15,7 @@ def formatted(fmtstr: String): String def hashCode(): Int def toString(): String def →[B](y: B): (Implicit.type, B) -final class AppliedImplicit[A <: <?>] extends AnyRef +final class AppliedImplicit[A] extends AnyRef final def !=(x$1: Any): Boolean final def !=(x$1: AnyRef): Boolean final def ##(): Int |