Improve method names (m-o)

3 files changed, 6 insertions, 6 deletions

diff --git a/test/benchmarks/src/scala/collection/parallel/benchmarks/parallel_array/SequentialOps.scala b/test/benchmarks/src/scala/collection/parallel/benchmarks/parallel_array/SequentialOps.scala
index ba32036002..9300851b5f 100644
--- a/test/benchmarks/src/scala/collection/parallel/benchmarks/parallel_array/SequentialOps.scala
+++ b/test/benchmarks/src/scala/collection/parallel/benchmarks/parallel_array/SequentialOps.scala
@@ -425,7 +425,7 @@ trait SequentialOps[T] {
   }
   
   def sequentialDiff(sq: Seq[T], sz: Int) = {
-    val occmap = occurences(sq)
+    val occmap = occurrences(sq)
     val b = new collection.mutable.ArrayBuffer[T]
     
     var i = 0
@@ -442,7 +442,7 @@ trait SequentialOps[T] {
   }
   
   def sequentialIntersect(sq: Seq[T], sz: Int) = {
-    val occmap = occurences(sq)
+    val occmap = occurrences(sq)
     val b = new collection.mutable.ArrayBuffer[T]
     
     var i = 0
@@ -461,7 +461,7 @@ trait SequentialOps[T] {
     res
   }
   
-  private def occurences(sq: Seq[T]) = {
+  private def occurrences(sq: Seq[T]) = {
     val occmap = new collection.mutable.HashMap[T, Int] { override def default(k: T) = 0 }
     for (elem <- sq.iterator) occmap(elem) += 1
     occmap
diff --git a/test/files/run/finally.check b/test/files/run/finally.check
index 901a797426..b0f2293d11 100644
--- a/test/files/run/finally.check
+++ b/test/files/run/finally.check
@@ -29,7 +29,7 @@ body
 in finally
 java.lang.Exception
 ----------------------------------------
-Running nestedFinalies
+Running nestedFinallyBlocks
 in finally 1
 in finally 2
 ----------------------------------------
diff --git a/test/files/run/finally.scala b/test/files/run/finally.scala
index b66354ca03..467c9e5868 100644
--- a/test/files/run/finally.scala
+++ b/test/files/run/finally.scala
@@ -94,7 +94,7 @@ object Test extends App {
   }
 
   // nested finally blocks with return value
-  def nestedFinalies: Int =
+  def nestedFinallyBlocks: Int =
     try {
       try {
         return 10
@@ -123,5 +123,5 @@ object Test extends App {
   test(throwBody, "throwBody")
   test(retFinally, "retFinally")
   test(throwFinally, "throwFinally")
-  test(nestedFinalies, "nestedFinalies")
+  test(nestedFinallyBlocks, "nestedFinallyBlocks")
 }