Merge branch 'cheeseng-cs-feature-insertion-order-set' into feature-insertion-order-set

Author: bvenners

project/GenScalaTestJS.scala

@@ -263,7 +263,8 @@ object GenScalaTestJS {
         "StreamlinedXmlEqualitySpec.scala",    // skipped because use scala.xml
         "StreamlinedXmlNormMethodsSpec.scala", // skipped because use scala.xml
         "StreamlinedXmlSpec.scala",            // skipped because use scala.xml
-        "SuiteSuite.scala"         // skipped because it depends on java reflection
+        "SuiteSuite.scala",          // skipped because it depends on java reflection
+        "MatchersSerializableSpec.scala"   // skipped because testing java serialization
       )) ++
     copyDir("scalatest-test/src/test/scala/org/scalatest/concurrent", "org/scalatest/concurrent", targetDir,
       List(

project/plugins.sbt

@@ -2,4 +2,4 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.3")
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.7.0")
 
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.9")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.10")

project/scalatest.scala

@@ -184,7 +184,7 @@ object ScalatestBuild extends Build {
 
   def scalatestJSLibraryDependencies =
     Seq(
-      "org.scala-js" %% "scalajs-test-interface" % "0.6.9"
+      "org.scala-js" %% "scalajs-test-interface" % "0.6.10"
     )
 
   def scalatestTestOptions =
@@ -626,9 +626,9 @@ object ScalatestBuild extends Build {
         }.taskValue
       },
       sourceGenerators in Test <+=
-        (baseDirectory, sourceManaged in Test, version, scalaVersion) map genFiles("gengen", "GenGen.scala")(GenGen.genTest),
+        (baseDirectory, sourceManaged in Test, version, scalaVersion) map genFiles("gengen", "GenGen.scala")(GenGen.genTest)/*,
       sourceGenerators in Test <+=
-        (baseDirectory, sourceManaged in Test, version, scalaVersion) map genFiles("genmatchers", "GenMustMatchersTests.scala")(GenMustMatchersTests.genTestForScalaJS)
+        (baseDirectory, sourceManaged in Test, version, scalaVersion) map genFiles("genmatchers", "GenMustMatchersTests.scala")(GenMustMatchersTests.genTestForScalaJS)*/
     ).dependsOn(scalatestJS % "test", commonTestJS % "test").enablePlugins(ScalaJSPlugin)
 
   lazy val scalatestApp = Project("scalatestApp", file("."))

scalatest-test/src/test/scala/org/scalatest/InsertionOrderSetSpec.scala

@@ -18,16 +18,34 @@ package org.scalatest
 class InsertionOrderSetSpec extends FunSpec with Matchers {
   describe("An InsertionOrderSet") {
     it("should offer an apply method in the companion object") {
-      InsertionOrderSet(List(1, 2, 3)) shouldEqual (new InsertionOrderSet(List(1, 2, 3)))
+      InsertionOrderSet(List(1, 2, 3)) shouldBe (InsertionOrderSet(List(1, 2, 3)))
     }
     it("should ensure duplicates can't be passed to the constructor") {
-      InsertionOrderSet(List(1, 2, 3, 3)) shouldEqual InsertionOrderSet(List(1, 2, 3))
+      InsertionOrderSet(List(1, 2, 3, 3)) shouldBe InsertionOrderSet(List(1, 2, 3))
     }
     it("should ensure duplicates can't be added") {
-      InsertionOrderSet(List(1, 2, 3)) + 3 shouldEqual InsertionOrderSet(List(1, 2, 3))
+      InsertionOrderSet(List(1, 2, 3)) + 3 shouldBe InsertionOrderSet(List(1, 2, 3))
     }
     it("should ensure non-duplicates can be added") {
-      InsertionOrderSet(List(1, 2, 3)) + 4 shouldEqual InsertionOrderSet(List(1, 2, 3, 4))
+      InsertionOrderSet(List(1, 2, 3)) + 4 shouldBe InsertionOrderSet(List(1, 2, 3, 4))
+    }
+    it("should return Iterator that iterates elements in the order they were inserted") {
+      val set = InsertionOrderSet(List(2, 1, 3))
+      val itr = set.iterator
+      itr.next shouldBe 2
+      itr.next shouldBe 1
+      itr.next shouldBe 3
+    }
+    it("should return true when contains is called with element it contains") {
+      val set = InsertionOrderSet(List(2, 1, 3))
+      set.contains(1) shouldBe true
+    }
+    it("should return false when contains is called with element it contains") {
+      val set = InsertionOrderSet(List(2, 1, 3))
+      set.contains(6) shouldBe false
+    }
+    it("should remove element passed in from -") {
+      InsertionOrderSet(List(2, 1, 3)) - 1 shouldBe InsertionOrderSet(List(2, 3))
     }
   }
 }

scalatest-test/src/test/scala/org/scalatest/ShouldBeAnySpec.scala

@@ -217,12 +217,15 @@ class ShouldBeAnySpec extends FunSpec with Checkers with ReturnsNormallyThrowsAs
       }
       assert(e.message == Some("!!! test [1] !!! was not equal to !!! test [2] !!!"))
     }
+
+    // SKIP-SCALATESTJS-START
     it("should produce TestFailedExceptions that can be serialized") {
       import scala.util.Try
       val result = Try(1 shouldBe 2)
       val baos = new java.io.ByteArrayOutputStream
       val oos = new java.io.ObjectOutputStream(baos)
       oos.writeObject(result) // Should not throw an exeption
     }
+    // SKIP-SCALATESTJS-END
   }
 }

scalatest/src/main/scala/org/scalatest/AsyncEngine.scala

@@ -751,7 +751,7 @@ private[scalatest] sealed abstract class AsyncSuperEngine[T](concurrentBundleMod
 
     val testLeaf = TestLeaf(currentBranch, testName, testText, testFun, testLocation, Some(pos), duration)
     testsMap += (testName -> testLeaf)
-    testNamesList ::= testName
+    testNamesList = testNamesList :+ testName
     currentBranch.subNodes ::= testLeaf
 
     val tagNames = Set[String]() ++ testTags.map(_.name)

scalatest/src/main/scala/org/scalatest/AsyncFeatureSpecLike.scala

@@ -314,7 +314,7 @@ trait AsyncFeatureSpecLike extends AsyncTestSuite with AsyncTestRegistration wit
    */
   // override def testNames: Set[String] = ListSet(atomic.get.testsList.map(_.testName): _*)
   override def testNames: Set[String] = {
-    new InsertionOrderSet(atomic.get.testNamesList)
+    InsertionOrderSet(atomic.get.testNamesList)
   }
 
   override def run(testName: Option[String], args: Args): Status = {

scalatest/src/main/scala/org/scalatest/AsyncFlatSpecLike.scala

@@ -1804,7 +1804,7 @@ import resultOfStringPassedToVerb.verb
    * </pre>
    */
   override def testNames: Set[String] = {
-    new InsertionOrderSet(atomic.get.testNamesList)
+    InsertionOrderSet(atomic.get.testNamesList)
   }
 
   override def run(testName: Option[String], args: Args): Status = {

scalatest/src/main/scala/org/scalatest/AsyncFreeSpecLike.scala

@@ -515,7 +515,7 @@ trait AsyncFreeSpecLike extends AsyncTestSuite with AsyncTestRegistration with I
    * </pre>
    */
   override def testNames: Set[String] = {
-    new InsertionOrderSet(atomic.get.testNamesList)
+    InsertionOrderSet(atomic.get.testNamesList)
   }
 
   override def run(testName: Option[String], args: Args): Status = {

scalatest/src/main/scala/org/scalatest/AsyncFunSpecLike.scala

@@ -403,7 +403,7 @@ trait AsyncFunSpecLike extends AsyncTestSuite with AsyncTestRegistration with In
    */
   override def testNames: Set[String] = {
     // I'm returning a ListSet here so that they tests will be run in registration order
-    new InsertionOrderSet(atomic.get.testNamesList)
+    InsertionOrderSet(atomic.get.testNamesList)
   }
 
   /**

scalatest/src/main/scala/org/scalatest/AsyncFunSuiteLike.scala

@@ -143,7 +143,7 @@ trait AsyncFunSuiteLike extends AsyncTestSuite with AsyncTestRegistration with I
    * </p>
    */
   override def testNames: Set[String] = {
-    new InsertionOrderSet(atomic.get.testNamesList)
+    InsertionOrderSet(atomic.get.testNamesList)
   }
 
   /**

scalatest/src/main/scala/org/scalatest/AsyncWordSpecLike.scala

@@ -1170,7 +1170,7 @@ one error found
    * </pre>
    */
   override def testNames: Set[String] = {
-    new InsertionOrderSet(atomic.get.testNamesList)
+    InsertionOrderSet(atomic.get.testNamesList)
   }
 
   override def run(testName: Option[String], args: Args): Status = {

scalatest/src/main/scala/org/scalatest/Engine.scala

@@ -673,7 +673,7 @@ private[scalatest] sealed abstract class SuperEngine[T](concurrentBundleModMessa
 
     val testLeaf = TestLeaf(currentBranch, testName, testText, testFun, testLocation, pos, duration, informer)
     testsMap += (testName -> testLeaf)
-    testNamesList ::= testName
+    testNamesList = testNamesList :+ testName
     currentBranch.subNodes ::= testLeaf
 
     val tagNames = Set[String]() ++ testTags.map(_.name)

scalatest/src/main/scala/org/scalatest/FeatureSpecLike.scala

@@ -339,7 +339,7 @@ trait FeatureSpecLike extends TestSuite with TestRegistration with Informing wit
    */
   // override def testNames: Set[String] = ListSet(atomic.get.testsList.map(_.testName): _*)
   override def testNames: Set[String] = {
-    new InsertionOrderSet(atomic.get.testNamesList)
+    InsertionOrderSet(atomic.get.testNamesList)
   }
 
   override def run(testName: Option[String], args: Args): Status = {

scalatest/src/main/scala/org/scalatest/FlatSpecLike.scala

@@ -1787,7 +1787,7 @@ import resultOfStringPassedToVerb.verb
    * </pre>
    */
   override def testNames: Set[String] = {
-    new InsertionOrderSet(atomic.get.testNamesList)
+    InsertionOrderSet(atomic.get.testNamesList)
   }
 
   override def run(testName: Option[String], args: Args): Status = {

scalatest/src/main/scala/org/scalatest/FreeSpecLike.scala

@@ -513,7 +513,7 @@ trait FreeSpecLike extends TestSuite with TestRegistration with Informing with N
    * </pre>
    */
   override def testNames: Set[String] = {
-    new InsertionOrderSet(atomic.get.testNamesList)
+    InsertionOrderSet(atomic.get.testNamesList)
   }
 
   override def run(testName: Option[String], args: Args): Status = {

scalatest/src/main/scala/org/scalatest/FunSpecLike.scala

@@ -427,7 +427,7 @@ trait FunSpecLike extends TestSuite with TestRegistration with Informing with No
    * </pre>
    */
   override def testNames: Set[String] = {
-    new InsertionOrderSet(atomic.get.testNamesList)
+    InsertionOrderSet(atomic.get.testNamesList)
   }
 
   /**

scalatest/src/main/scala/org/scalatest/FunSuiteLike.scala

@@ -161,7 +161,7 @@ trait FunSuiteLike extends TestSuite with TestRegistration with Informing with N
   * </p>
   */
   override def testNames: Set[String] = {
-    new InsertionOrderSet(atomic.get.testNamesList)
+    InsertionOrderSet(atomic.get.testNamesList)
   }
 
   /**

scalatest/src/main/scala/org/scalatest/InsertionOrderSet.scala

@@ -17,12 +17,12 @@ package org.scalatest
 
 private[scalatest] class InsertionOrderSet[A](elements: List[A]) extends Set[A] {
 
-  val list = elements.distinct.reverse
+  val list = elements.distinct
 
   def contains(key: A): Boolean = list.contains(key)
   def iterator: Iterator[A] = list.iterator
-  def +(elem: A) = new InsertionOrderSet[A](list :+ elem)
-  def -(elem: A) = new InsertionOrderSet[A](list.filter(_ != elem))
+  def +(elem: A) = InsertionOrderSet[A](list :+ elem)
+  def -(elem: A) = InsertionOrderSet[A](list.filter(_ != elem))
 }
 
 private[scalatest] object InsertionOrderSet {

scalatest/src/main/scala/org/scalatest/PropSpecLike.scala

@@ -161,7 +161,7 @@ trait PropSpecLike extends TestSuite with TestRegistration with Informing with N
   * </p>
   */
   override def testNames: Set[String] = {
-    new InsertionOrderSet(atomic.get.testNamesList)
+    InsertionOrderSet(atomic.get.testNamesList)
   }
 
   /**

scalatest/src/main/scala/org/scalatest/WordSpecLike.scala

@@ -1184,7 +1184,7 @@ one error found
    * </pre>
    */
   override def testNames: Set[String] = {
-    new InsertionOrderSet(atomic.get.testNamesList)
+    InsertionOrderSet(atomic.get.testNamesList)
   }
 
   override def run(testName: Option[String], args: Args): Status = {

scalatest/src/main/scala/org/scalatest/fixture/AsyncFeatureSpecLike.scala

@@ -299,7 +299,7 @@ trait AsyncFeatureSpecLike extends AsyncTestSuite with AsyncTestRegistration wit
    */
   //override def testNames: Set[String] = ListSet(atomic.get.testsList.map(_.testName): _*)
   override def testNames: Set[String] = {
-    new InsertionOrderSet(atomic.get.testNamesList)
+    InsertionOrderSet(atomic.get.testNamesList)
   }
 
   override def run(testName: Option[String], args: Args): Status = {

scalatest/src/main/scala/org/scalatest/fixture/AsyncFlatSpecLike.scala

@@ -2172,7 +2172,7 @@ import resultOfStringPassedToVerb.verb
    * @return the <code>Set</code> of test names
    */
   override def testNames: Set[String] = {
-    new InsertionOrderSet(atomic.get.testNamesList)
+    InsertionOrderSet(atomic.get.testNamesList)
   }
 
   override def run(testName: Option[String], args: Args): Status = {

scalatest/src/main/scala/org/scalatest/fixture/AsyncFreeSpecLike.scala

@@ -584,7 +584,7 @@ trait AsyncFreeSpecLike extends AsyncTestSuite with AsyncTestRegistration with I
    * @return the <code>Set</code> of test names
    */
   override def testNames: Set[String] = {
-    new InsertionOrderSet(atomic.get.testNamesList)
+    InsertionOrderSet(atomic.get.testNamesList)
   }
 
   override def run(testName: Option[String], args: Args): Status = {

scalatest/src/main/scala/org/scalatest/fixture/AsyncFunSpecLike.scala

@@ -529,7 +529,7 @@ trait AsyncFunSpecLike extends AsyncTestSuite with AsyncTestRegistration with In
    * @return the <code>Set</code> of test names
    */
   override def testNames: Set[String] = {
-    new InsertionOrderSet(atomic.get.testNamesList)
+    InsertionOrderSet(atomic.get.testNamesList)
   }
 
   override def run(testName: Option[String], args: Args): Status = {

scalatest/src/main/scala/org/scalatest/fixture/AsyncFunSuiteLike.scala

@@ -185,7 +185,7 @@ trait AsyncFunSuiteLike extends AsyncTestSuite with AsyncTestRegistration with I
    * @return the <code>Set</code> of test names
    */
   override def testNames: Set[String] = {
-    new InsertionOrderSet(atomic.get.testNamesList)
+    InsertionOrderSet(atomic.get.testNamesList)
   }
 
   /**

scalatest/src/main/scala/org/scalatest/fixture/AsyncWordSpecLike.scala

@@ -1241,7 +1241,7 @@ trait AsyncWordSpecLike extends AsyncTestSuite with AsyncTestRegistration with S
    * @return the <code>Set</code> of test names
    */
   override def testNames: Set[String] = {
-    new InsertionOrderSet(atomic.get.testNamesList)
+    InsertionOrderSet(atomic.get.testNamesList)
   }
 
   override def run(testName: Option[String], args: Args): Status = {

scalatest/src/main/scala/org/scalatest/fixture/FeatureSpecLike.scala

@@ -338,7 +338,7 @@ trait FeatureSpecLike extends TestSuite with TestRegistration with Informing wit
    */
   //override def testNames: Set[String] = ListSet(atomic.get.testsList.map(_.testName): _*)
   override def testNames: Set[String] = {
-    new InsertionOrderSet(atomic.get.testNamesList)
+    InsertionOrderSet(atomic.get.testNamesList)
   }
 
   override def run(testName: Option[String], args: Args): Status = {

scalatest/src/main/scala/org/scalatest/fixture/FlatSpecLike.scala

@@ -2199,7 +2199,7 @@ import resultOfStringPassedToVerb.verb
    * @return the <code>Set</code> of test names
    */
   override def testNames: Set[String] = {
-    new InsertionOrderSet(atomic.get.testNamesList)
+    InsertionOrderSet(atomic.get.testNamesList)
   }
 
   override def run(testName: Option[String], args: Args): Status = {

scalatest/src/main/scala/org/scalatest/fixture/FreeSpecLike.scala

@@ -608,7 +608,7 @@ trait FreeSpecLike extends TestSuite with TestRegistration with Informing with N
    * @return the <code>Set</code> of test names
    */
   override def testNames: Set[String] = {
-    new InsertionOrderSet(atomic.get.testNamesList)
+    InsertionOrderSet(atomic.get.testNamesList)
   }
 
   override def run(testName: Option[String], args: Args): Status = {

scalatest/src/main/scala/org/scalatest/fixture/FunSpecLike.scala

@@ -571,7 +571,7 @@ trait FunSpecLike extends TestSuite with TestRegistration with Informing with No
    * @return the <code>Set</code> of test names
    */
   override def testNames: Set[String] = {
-    new InsertionOrderSet(atomic.get.testNamesList)
+    InsertionOrderSet(atomic.get.testNamesList)
   }
 
   override def run(testName: Option[String], args: Args): Status = {

scalatest/src/main/scala/org/scalatest/fixture/FunSuiteLike.scala

@@ -218,7 +218,7 @@ trait FunSuiteLike extends TestSuite with TestRegistration with Informing with N
    * @return the <code>Set</code> of test names
    */
   override def testNames: Set[String] = {
-    new InsertionOrderSet(atomic.get.testNamesList)
+    InsertionOrderSet(atomic.get.testNamesList)
   }
 
   /**

scalatest/src/main/scala/org/scalatest/fixture/PropSpecLike.scala

@@ -196,7 +196,7 @@ trait PropSpecLike extends TestSuite with TestRegistration with Informing with N
    * @return the <code>Set</code> of test names
    */
   override def testNames: Set[String] = {
-    new InsertionOrderSet(atomic.get.testNamesList)
+    InsertionOrderSet(atomic.get.testNamesList)
   }
 
   /**

scalatest/src/main/scala/org/scalatest/fixture/SpecLike.scala

@@ -273,7 +273,7 @@ trait SpecLike extends TestSuite with Informing with Notifying with Alerting wit
    */
   override def testNames: Set[String] = {
     ensureScopesAndTestsRegistered()
-    new InsertionOrderSet(atomic.get.testNamesList)
+    InsertionOrderSet(atomic.get.testNamesList)
   }
 
   /**

scalatest/src/main/scala/org/scalatest/fixture/WordSpecLike.scala

@@ -1285,7 +1285,7 @@ trait WordSpecLike extends TestSuite with TestRegistration with ShouldVerb with
    * @return the <code>Set</code> of test names
    */
   override def testNames: Set[String] = {
-    new InsertionOrderSet(atomic.get.testNamesList)
+    InsertionOrderSet(atomic.get.testNamesList)
   }
 
   override def run(testName: Option[String], args: Args): Status = {

scalatest/src/main/scala/org/scalatest/path/FreeSpecLike.scala

@@ -459,7 +459,7 @@ trait FreeSpecLike extends org.scalatest.Suite with OneInstancePerTest with Info
    */
   final override def testNames: Set[String] = {
     ensureTestResultsRegistered(thisSuite)
-    new InsertionOrderSet(atomic.get.testNamesList)
+    InsertionOrderSet(atomic.get.testNamesList)
   }
 
   /**

scalatest/src/main/scala/org/scalatest/path/FunSpecLike.scala

@@ -458,7 +458,7 @@ trait FunSpecLike extends org.scalatest.Suite with OneInstancePerTest with Infor
    */
   final override def testNames: Set[String] = {
     ensureTestResultsRegistered(thisSuite)
-    new InsertionOrderSet(atomic.get.testNamesList)
+    InsertionOrderSet(atomic.get.testNamesList)
   }
 
   /**

scalatest/src/main/scala/org/scalatest/refspec/RefSpecLike.scala

@@ -246,7 +246,7 @@ trait RefSpecLike extends TestSuite with Informing with Notifying with Alerting
    */
   override def testNames: Set[String] = {
     ensureScopesAndTestsRegistered()
-    new InsertionOrderSet(atomic.get.testNamesList)
+    InsertionOrderSet(atomic.get.testNamesList)
   }
 
   /**