Fix scala-js/scala-js#3420: Make timeout tests less restrictive

Originally they were written to test our own implementation of
`setTimeout` for Rhino. Now they are just a means to run things
after returning to the event loop once, so we can reduce them
significantly.

Author: gzm0

js-envs-test-kit/src/main/scala/org/scalajs/jsenv/test/TimeoutComTests.scala

@@ -19,6 +19,7 @@ private[test] class TimeoutComTests(config: JSEnvSuiteConfig) {
 
   @Test
   def delayedInitTest: Unit = {
+    val deadline = 100.millis.fromNow
     val run = kit.start(s"""
       setTimeout(function() {
         scalajsCom.init(function(msg) {
@@ -28,9 +29,6 @@ private[test] class TimeoutComTests(config: JSEnvSuiteConfig) {
     """, RunConfig())
 
     try {
-      // Deadline only starts now. Execution must happen asynchronously.
-      val deadline = 100.millis.fromNow
-
       run.run.send("Hello World")
       assertEquals("Got: Hello World", run.waitNextMessage())
       assertTrue("Execution took too little time", deadline.isOverdue())
@@ -49,7 +47,7 @@ private[test] class TimeoutComTests(config: JSEnvSuiteConfig) {
 
     try {
       for (i <- 1 to 10) {
-        val deadline = 190.millis.fromNow // give some slack
+        val deadline = 200.millis.fromNow
         run.run.send(s"Hello World: $i")
         assertEquals(s"Got: Hello World: $i", run.waitNextMessage())
         assertTrue("Execution took too little time", deadline.isOverdue())
@@ -61,14 +59,19 @@ private[test] class TimeoutComTests(config: JSEnvSuiteConfig) {
 
   @Test
   def intervalSendTest: Unit = {
+    val deadline = 250.millis.fromNow
+
     val run = kit.start(s"""
       scalajsCom.init(function(msg) {});
-      var interval = setInterval(scalajsCom.send, 50, "Hello");
-      setTimeout(clearInterval, 295, interval);
+      var sent = 0
+      var interval = setInterval(function () {
+        scalajsCom.send("Hello");
+        sent++;
+        if (sent >= 5) clearInterval(interval);
+      }, 50);
     """, RunConfig())
 
     try {
-      val deadline = 245.millis.fromNow
       for (i <- 1 to 5)
         assertEquals("Hello", run.waitNextMessage())
 

js-envs-test-kit/src/main/scala/org/scalajs/jsenv/test/TimeoutRunTests.scala

@@ -38,110 +38,22 @@ private[test] class TimeoutRunTests(config: JSEnvSuiteConfig, withCom: Boolean)
 
   }
 
-  @Test
-  def clearTimeoutTest: Unit = {
-
-    val deadline = 300.millis.fromNow
-
-    """
-    var c = setTimeout(function() { console.log("1"); }, 200);
-    setTimeout(function() {
-      console.log("2");
-      clearTimeout(c);
-    }, 100);
-    setTimeout(function() { console.log("3"); }, 300);
-    setTimeout(function() { console.log("4"); },   0);
-    """ hasOutput
-    """|4
-       |2
-       |3
-       |""".stripMargin
-
-    assertTrue("Execution took too little time", deadline.isOverdue())
-
-  }
-
-  @Test // #2368
-  def timeoutSingleArgTest: Unit = {
-    """
-    setTimeout(function() { console.log("ok"); });
-    """ hasOutput "ok\n"
-  }
-
-  @Test
-  def timeoutArgTest: Unit = {
-
-    val deadline = 300.millis.fromNow
-
-    """
-    setTimeout(function(a, b) { console.log("1" + a + b); }, 200, "foo", "bar");
-    setTimeout(function() { console.log("2"); }, 100);
-    setTimeout(function(msg) { console.log(msg); }, 300, "Hello World");
-    setTimeout(function() { console.log("4"); },   0);
-    """ hasOutput
-    """|4
-       |2
-       |1foobar
-       |Hello World
-       |""".stripMargin
-
-    assertTrue("Execution took too little time", deadline.isOverdue())
-
-  }
-
   @Test
   def intervalTest: Unit = {
+    val deadline = 100.millis.fromNow
 
-    val deadline = 1.second.fromNow
-
+    // We rely on the test kit to terminate the test after 5 iterations.
     """
-    var i1 = setInterval(function() { console.log("each 2200"); }, 2200);
-    var i2 = setInterval(function() { console.log("each 3100"); }, 3100);
-    var i3 = setInterval(function() { console.log("each 1300"); }, 1300);
-
-    setTimeout(function() {
-      clearInterval(i1);
-      clearInterval(i2);
-      clearInterval(i3);
-    }, 10000);
+    setInterval(function() { console.log("tick"); }, 20);
     """ hasOutput
-    """|each 1300
-       |each 2200
-       |each 1300
-       |each 3100
-       |each 1300
-       |each 2200
-       |each 1300
-       |each 3100
-       |each 1300
-       |each 2200
-       |each 1300
-       |each 2200
-       |each 1300
-       |each 3100
+    """|tick
+       |tick
+       |tick
+       |tick
+       |tick
        |""".stripMargin
 
      assertTrue("Execution took too little time", deadline.isOverdue())
 
   }
-
-  @Test
-  def intervalSelfClearTest: Unit = {
-
-    val deadline = 100.millis.fromNow
-
-    """
-    var c = 0;
-    var i = setInterval(function() {
-      c++;
-      console.log(c.toString());
-      if (c >= 10)
-        clearInterval(i);
-    }, 10);
-    """ hasOutput (1 to 10).map(_ + "\n").mkString
-
-    assertTrue("Execution took too little time", deadline.isOverdue())
-
-  }
-
 }