summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorSeth Tisue <seth@tisue.net>2015-07-01 18:20:46 -0400
committerSeth Tisue <seth@tisue.net>2015-07-01 18:20:46 -0400
commit4fe9fdc4cfde60e02805f4079cf74682c4550de6 (patch)
tree16c4e8f79a75e664eb268da88259c921e2b837a2 /test
parent495fdb8119c1941bc210a9b0a186d63971002e22 (diff)
parent3fc4dd8b9656cf7e2947a4b0be2b0aab7261bd22 (diff)
downloadscala-4fe9fdc4cfde60e02805f4079cf74682c4550de6.tar.gz
scala-4fe9fdc4cfde60e02805f4079cf74682c4550de6.tar.bz2
scala-4fe9fdc4cfde60e02805f4079cf74682c4550de6.zip
Merge pull request #4596 from janekdb/2.11.x-typos-p-r
Fix 27 typos (p-r)
Diffstat (limited to 'test')
-rw-r--r--test/disabled/pos/spec-List.scala2
-rw-r--r--test/files/jvm/innerClassEnclMethodJavaReflection.scala2
-rw-r--r--test/files/neg/t8675b.scala2
-rw-r--r--test/files/pos/t8111.scala6
-rw-r--r--test/files/run/t1987b/cce_test.scala2
-rw-r--r--test/files/run/t8893b.scala2
-rw-r--r--test/files/scalacheck/quasiquotes/ErrorProps.scala2
7 files changed, 9 insertions, 9 deletions
diff --git a/test/disabled/pos/spec-List.scala b/test/disabled/pos/spec-List.scala
index b31e035c1b..6bed08ae8a 100644
--- a/test/disabled/pos/spec-List.scala
+++ b/test/disabled/pos/spec-List.scala
@@ -438,7 +438,7 @@ case object Nil extends List[Nothing] {
throw new NoSuchElementException("head of empty list")
override def tail: List[Nothing] =
throw new NoSuchElementException("tail of empty list")
- // Removal of equals method here might lead to an infinite recusion similar to IntMap.equals.
+ // Removal of equals method here might lead to an infinite recursion similar to IntMap.equals.
override def equals(that: Any) = that match {
case that1: Seq[_] => that1.isEmpty
case _ => false
diff --git a/test/files/jvm/innerClassEnclMethodJavaReflection.scala b/test/files/jvm/innerClassEnclMethodJavaReflection.scala
index ee39cb43bf..a4d64d0b67 100644
--- a/test/files/jvm/innerClassEnclMethodJavaReflection.scala
+++ b/test/files/jvm/innerClassEnclMethodJavaReflection.scala
@@ -8,7 +8,7 @@ object Test extends App {
// Some classes in scala-compiler.jar have references to jline / ant classes, which seem to be
// not on the classpath. We just skip over those classes.
// PENDING: for now we also allow missing $anonfun classes: the optimizer may eliminate some closures
- // that are refferred to in EnclosingClass attributes. SI-9136
+ // that are referred to in EnclosingClass attributes. SI-9136
val allowedMissingPackages = Set("jline", "org.apache.tools.ant", "$anonfun")
def ok(t: Throwable) = {
diff --git a/test/files/neg/t8675b.scala b/test/files/neg/t8675b.scala
index 2c5015b1d0..bffed2141c 100644
--- a/test/files/neg/t8675b.scala
+++ b/test/files/neg/t8675b.scala
@@ -13,7 +13,7 @@ object Test {
// in the backend.
//
// This error is itself a regression (or at least a change) in 2.11.0-M7,
- // specifically in SI-7944. The type paramaters to the implicit view
+ // specifically in SI-7944. The type parameters to the implicit view
// `EngineTools1` are undetermined, and are now treated as type variables
// in the expected type of the closure argument to `withFilter`.
for (path: List[Any] <- (null : Engine1).asRequirement.pathsIncludingSelf.toList) {
diff --git a/test/files/pos/t8111.scala b/test/files/pos/t8111.scala
index 0d63a16ba4..09463ce697 100644
--- a/test/files/pos/t8111.scala
+++ b/test/files/pos/t8111.scala
@@ -7,10 +7,10 @@ trait T {
foo((u: Unit) => ma)
foo(0, (u: Any) => ma) apply ()
- // crash due to side effects on the onwer of the symbol in the
+ // crash due to side effects on the owner of the symbol in the
// qualifier or arguments of the application during an abandoned
- // names/defaults transform. The code type checkes because of
- // autp-tupling which promotes and empty parmater list to `(): Unit`
+ // names/defaults transform. The code type checks because of
+ // auto-tupling which promotes an empty parameter list to `(): Unit`
foo((u: Any) => ma)()
{{(u: Any) => ma}; this}.foo(0)()
diff --git a/test/files/run/t1987b/cce_test.scala b/test/files/run/t1987b/cce_test.scala
index 4f9acf0264..e131df7956 100644
--- a/test/files/run/t1987b/cce_test.scala
+++ b/test/files/run/t1987b/cce_test.scala
@@ -1,5 +1,5 @@
package scales.xml
-//import scales.xml._ // using another pacakge and importing doesn't CCE
+//import scales.xml._ // using another package and importing doesn't CCE
object CCE_Test {
def main(args: Array[String]): Unit = {
diff --git a/test/files/run/t8893b.scala b/test/files/run/t8893b.scala
index 19120871aa..066425aab6 100644
--- a/test/files/run/t8893b.scala
+++ b/test/files/run/t8893b.scala
@@ -5,7 +5,7 @@ object Test {
def tick(i : Int): Unit =
if (i == 0) ()
else if (i == 42) {
- tick(0) /*not in tail posiiton*/
+ tick(0) /*not in tail position*/
tick(i - 1)
} else tick(i - 1)
diff --git a/test/files/scalacheck/quasiquotes/ErrorProps.scala b/test/files/scalacheck/quasiquotes/ErrorProps.scala
index 2cba07abf2..0c24149372 100644
--- a/test/files/scalacheck/quasiquotes/ErrorProps.scala
+++ b/test/files/scalacheck/quasiquotes/ErrorProps.scala
@@ -162,7 +162,7 @@ object ErrorProps extends QuasiquoteProperties("errors") {
q"$n"
""")
- property("SI-8211: check unbound placeholder paremeters") = fails(
+ property("SI-8211: check unbound placeholder parameters") = fails(
"unbound placeholder parameter",
"""
q"_"