Merge branch 'cheeseng-3.1.x-cherry-pick-20171024' into 3.1.x

Author: bvenners

.travis.yml

@@ -1,13 +1,19 @@
 language: scala
 scala:
-  - 2.11.8
   - 2.10.6
-  - 2.12.0
+  - 2.11.11
+  - 2.12.4
+  - 2.13.0-M2
+addons:
+  apt:
+    packages:
+      - openjdk-6-jdk
+
 jdk:
-  - oraclejdk7
   - openjdk6
   - oraclejdk8
 
+dist: trusty
 sudo: false
 
 env:
@@ -46,10 +52,14 @@ env:
 
 matrix:
   exclude:
-    - scala: "2.12.0"
-      jdk: oraclejdk7
-    - scala: "2.12.0"
+    - scala: "2.13.0-M2"
+      jdk: openjdk6
+    - scala: "2.12.4"
       jdk: openjdk6
+    - scala: "2.11.11"
+      jdk: oraclejdk8
+    - scala: "2.10.6"
+      jdk: oraclejdk8
 
 branches:
   only:

README.md

@@ -118,8 +118,8 @@ With Sonatype credentials and GPG file in place, you can now publish to Sonatype
 
 To publish scalactic, scalatest and scalatest-app (for Scala and Scala-js, version 2.11 and 2.10, and make sure you're on Java 6) to Sonatype, use the following command:
 
-  `$ sbt clean publishSigned "project scalatestAppJS" clean publishSigned ++2.10.6 "project scalatestApp" clean publishSigned "project scalatestAppJS" clean publishSigned`
+  `$ sbt clean publishSigned ++2.11.11 "project scalatestAppJS" clean publishSigned ++2.10.6 "project scalatestApp" clean publishSigned "project scalatestAppJS" clean publishSigned`
 
 To publish scalactic, scalatest and scalatest-app (for Scala and Scala-js, version 2.12 and 2.13, and make sure you're on Java 8) to Sonatype, use the following command:
 
-  `$ sbt ++2.12.0 clean publishSigned "project scalatestAppJS" clean publishSigned ++2.13.0-M2 clean publishSigned "project scalatestAppJS" clean publishSigned`
+  `$ sbt clean publishSigned "project scalatestAppJS" clean publishSigned ++2.13.0-M2 clean publishSigned "project scalatestAppJS" clean publishSigned`

examples/src/test/scala/org/scalatest/examples/asynctimelimitedtests/ExampleSpec.scala

@@ -19,6 +19,8 @@ import org.scalatest.AsyncFunSpec
 import org.scalatest.concurrent.AsyncTimeLimitedTests
 import org.scalatest.time.SpanSugar._
 
+import scala.concurrent.Future
+
 class ExampleSpec extends AsyncFunSpec with AsyncTimeLimitedTests {
 
   // Note: You may need to either write 200.millis or (200 millis), or
@@ -28,12 +30,32 @@ class ExampleSpec extends AsyncFunSpec with AsyncTimeLimitedTests {
 
   describe("An asynchronous time-limited test") {
     it("should succeed if it completes within the time limit") {
-      Thread.sleep(100)
-      succeed
+      Future {
+        // Your code should run here, the following is just an example
+        // code of filling a buffer and assert its content that should
+        // not take more than 200 millis
+        val buffer = new StringBuilder
+        buffer.append("test")
+        assert(buffer.toString == "test")
+      }
     }
     it("should fail if it is taking too darn long") {
-      Thread.sleep(300)
-      succeed
+      Future {
+        // Your code should run here, the following is just an example
+        // code of filling buffer in loop that will take more than 200 millis
+        val startTime = scala.compat.Platform.currentTime
+        var stop = false
+        val buffer = new StringBuilder
+        while (!stop) {
+          for (i <- 1 to 100)
+            buffer.append(i.toString)
+          if ((scala.compat.Platform.currentTime - startTime) > 200)
+            stop = true
+          else
+            buffer.clear()
+        }
+        assert(buffer.length == 5050)
+      }
     }
   }
 }

examples/src/test/scala/org/scalatest/examples/timelimitedtests/ExampleSignalerSpec.scala

@@ -27,10 +27,28 @@ class ExampleSignalerSpec extends FunSpec with TimeLimitedTests {
 
   describe("A time-limited test") {
     it("should succeed if it completes within the time limit") {
-      Thread.sleep(100)
+      // Your code should run here, the following is just an example
+      // code of filling a buffer and assert its content that should
+      // not take more than 200 millis
+      val buffer = new StringBuilder
+      buffer.append("test")
+      assert(buffer.toString == "test")
     }
     it("should fail if it is taking too darn long") {
-      Thread.sleep(300)
+      // Your code should run here, the following is just an example
+      // code of filling buffer in loop that will take more than 200 millis
+      val startTime = scala.compat.Platform.currentTime
+      var stop = false
+      val buffer = new StringBuilder
+      while (!stop) {
+        for (i <- 1 to 100)
+          buffer.append(i.toString)
+        if ((scala.compat.Platform.currentTime - startTime) > 200)
+          stop = true
+        else
+          buffer.clear()
+      }
+      assert(buffer.length == 5050)
     }
   }
 }

examples/src/test/scala/org/scalatest/examples/timelimitedtests/ExampleSpec.scala

@@ -28,10 +28,28 @@ class ExampleSpec extends FunSpec with TimeLimitedTests {
 
   describe("A time-limited test") {
     it("should succeed if it completes within the time limit") {
-      Thread.sleep(100)
+      // Your code should run here, the following is just an example
+      // code of filling a buffer and assert its content that should
+      // not take more than 200 millis
+      val buffer = new StringBuilder
+      buffer.append("test")
+      assert(buffer.toString == "test")
     }
     it("should fail if it is taking too darn long") {
-      Thread.sleep(300)
+      // Your code should run here, the following is just an example
+      // code of filling buffer in loop that will take more than 200 millis
+      val startTime = scala.compat.Platform.currentTime
+      var stop = false
+      val buffer = new StringBuilder
+      while (!stop) {
+        for (i <- 1 to 100)
+          buffer.append(i.toString)
+        if ((scala.compat.Platform.currentTime - startTime) > 200)
+          stop = true
+        else
+          buffer.clear()
+      }
+      assert(buffer.length == 5050)
     }
   }
 }

project/GenCompatibleClasses.scala

@@ -2,7 +2,7 @@ import java.io.{FileWriter, BufferedWriter, File}
 
 object GenCompatibleClasses {
 
-  def genMain(targetDir: File, version: String, scalaVersion: String) {
+  def genMain(targetDir: File, version: String, scalaVersion: String): Seq[File] = {
     targetDir.mkdirs()
     val listCellRendererClass = Class.forName("javax.swing.ListCellRenderer")
     val isJava7 = listCellRendererClass.getTypeParameters.length > 0
@@ -13,23 +13,25 @@ object GenCompatibleClasses {
         "EventHolderDefaultListModel" -> "private[tools] class EventHolderDefaultListModel extends DefaultListModel"
       )
 
-    java6Classes.foreach { case (name, cls) =>
-      val file = new File(targetDir, name + ".scala")
-      val bw = new BufferedWriter(new FileWriter(file))
-      try {
-        bw.write("package org.scalatest.tools\n")
-        bw.write("import javax.swing._\n")
-        if (isJava7)
-          bw.write(cls + "[EventHolder]")
-        else
-          bw.write(cls)
+    val java6ClassesFiles =
+      java6Classes.map { case (name, cls) =>
+        val file = new File(targetDir, name + ".scala")
+        val bw = new BufferedWriter(new FileWriter(file))
+        try {
+          bw.write("package org.scalatest.tools\n")
+          bw.write("import javax.swing._\n")
+          if (isJava7)
+            bw.write(cls + "[EventHolder]")
+          else
+            bw.write(cls)
+        }
+        finally {
+          bw.flush()
+          bw.close()
+        }
+        println("Generated " + file.getAbsolutePath)
+        file
       }
-      finally {
-        bw.flush()
-        bw.close()
-      }
-      println("Generated " + file.getAbsolutePath)
-    }
 
     val file = new File(targetDir, "EventHolderListCellRenderer.scala")
     val bw = new BufferedWriter(new FileWriter(file))
@@ -63,6 +65,8 @@ object GenCompatibleClasses {
       bw.flush()
       bw.close()
     }
+
+    java6ClassesFiles.toSeq ++ Seq(file)
   }
 
   def main(args: Array[String]) {